From 0d74c209af146894d6e338b9761ef0f16172f0fe Mon Sep 17 00:00:00 2001 From: Dakota Date: Wed, 9 Oct 2024 14:25:14 -0500 Subject: [PATCH] v2.0 - more decorative options! --- .../item/tab/GarnishedCreativeModeTab.java | 13 ++ .../garnished/mixin/ItemStackMixin.java | 2 +- .../garnished/registry/GarnishedBlocks.java | 51 +++++ .../garnished/registry/GarnishedCT.java | 1 + .../registry/GarnishedFoodValues.java | 31 +-- .../blockstates/amber_remnant_brick_slab.json | 13 ++ .../amber_remnant_brick_stairs.json | 209 ++++++++++++++++++ .../blockstates/amber_remnant_brick_wall.json | 90 ++++++++ .../blockstates/amber_remnant_bricks.json | 7 + .../packed_polar_bear_hide_block.json | 7 + .../blockstates/polar_bear_hide_block.json | 7 + .../assets/garnished/lang/en_ca.json | 6 + .../assets/garnished/lang/en_us.json | 6 + .../models/block/amber_remnant_bricks.json | 6 + .../block/amber_remnant_bricks_slab.json | 8 + .../block/amber_remnant_bricks_slab_top.json | 8 + .../block/amber_remnant_bricks_stairs.json | 8 + .../amber_remnant_bricks_stairs_inner.json | 8 + .../amber_remnant_bricks_stairs_outer.json | 8 + .../amber_remnant_bricks_wall_inventory.json | 6 + .../block/amber_remnant_bricks_wall_post.json | 6 + .../block/amber_remnant_bricks_wall_side.json | 6 + .../amber_remnant_bricks_wall_side_tall.json | 6 + .../block/packed_polar_bear_hide_block.json | 6 + .../models/block/polar_bear_hide_block.json | 6 + .../models/item/amber_remnant_brick_slab.json | 3 + .../item/amber_remnant_brick_stairs.json | 3 + .../models/item/amber_remnant_brick_wall.json | 3 + .../models/item/amber_remnant_bricks.json | 3 + .../item/packed_polar_bear_hide_block.json | 3 + .../models/item/polar_bear_hide_block.json | 3 + .../textures/block/amber_remnant_block.png | Bin 298 -> 285 bytes .../block/amber_remnant_block_connected.png | Bin 0 -> 3523 bytes .../textures/block/amber_remnant_bricks.png | Bin 0 -> 207 bytes .../numbing_parchment_block_connected.png | Bin 2060 -> 3566 bytes .../textures/block/packed_polar_bear_hide.png | Bin 0 -> 215 bytes .../textures/block/polar_bear_hide_block.png | Bin 0 -> 255 bytes .../garnished/textures/item/amber_remnant.png | Bin 301 -> 295 bytes .../garnished/textures/item/rosy_cocktail.png | Bin 332 -> 332 bytes .../textures/item/shattered_amber_remnant.png | Bin 283 -> 275 bytes .../textures/item/sinopia_rock_sweet.png | Bin 412 -> 412 bytes .../textures/item/stew_of_the_damned.png | Bin 360 -> 360 bytes .../blocks/amber_remnant_brick_slab.json | 20 ++ .../blocks/amber_remnant_brick_stairs.json | 20 ++ .../blocks/amber_remnant_brick_wall.json | 20 ++ .../blocks/amber_remnant_bricks.json | 20 ++ .../blocks/packed_polar_bear_hide_block.json | 20 ++ .../blocks/polar_bear_hide_block.json | 20 ++ .../recipes/packed_polar_bear_hide_block.json | 16 ++ .../recipes/polar_bear_hide_block.json | 15 ++ .../polar_bear_hide_block_from_packed.json | 12 + .../recipes/polar_bear_hide_from_block.json | 12 + .../amber_remnant/amber_remnant_bricks.json | 17 ++ .../amber_remnant_bricks_slab.json | 16 ++ .../amber_remnant_bricks_stairs.json | 18 ++ .../amber_remnant_bricks_wall.json | 17 ++ .../amber_remnant/amber_remnant_slab.json | 2 +- .../amber_remnant/amber_remnant_stairs.json | 2 +- .../amber_remnant/amber_remnant_wall.json | 2 +- .../bricks_from_stonecutting.json | 8 + .../bricks_slab_from_stonecutting.json | 8 + .../bricks_stairs_from_stonecutting.json | 8 + .../bricks_wall_from_stonecutting.json | 8 + .../tags/blocks/amber_remnant_blocks.json | 12 + .../tags/items/amber_remnant_blocks.json | 6 +- .../tags/blocks/mineable/pickaxe.json | 7 +- .../data/minecraft/tags/blocks/slabs.json | 1 + .../data/minecraft/tags/blocks/stairs.json | 1 + .../data/minecraft/tags/blocks/walls.json | 1 + .../data/minecraft/tags/items/slabs.json | 1 + .../data/minecraft/tags/items/stairs.json | 1 + .../data/minecraft/tags/items/walls.json | 1 + 72 files changed, 831 insertions(+), 24 deletions(-) create mode 100644 src/main/resources/assets/garnished/blockstates/amber_remnant_brick_slab.json create mode 100644 src/main/resources/assets/garnished/blockstates/amber_remnant_brick_stairs.json create mode 100644 src/main/resources/assets/garnished/blockstates/amber_remnant_brick_wall.json create mode 100644 src/main/resources/assets/garnished/blockstates/amber_remnant_bricks.json create mode 100644 src/main/resources/assets/garnished/blockstates/packed_polar_bear_hide_block.json create mode 100644 src/main/resources/assets/garnished/blockstates/polar_bear_hide_block.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_bricks.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_bricks_slab.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_bricks_slab_top.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs_inner.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs_outer.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_inventory.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_post.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_side.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_side_tall.json create mode 100644 src/main/resources/assets/garnished/models/block/packed_polar_bear_hide_block.json create mode 100644 src/main/resources/assets/garnished/models/block/polar_bear_hide_block.json create mode 100644 src/main/resources/assets/garnished/models/item/amber_remnant_brick_slab.json create mode 100644 src/main/resources/assets/garnished/models/item/amber_remnant_brick_stairs.json create mode 100644 src/main/resources/assets/garnished/models/item/amber_remnant_brick_wall.json create mode 100644 src/main/resources/assets/garnished/models/item/amber_remnant_bricks.json create mode 100644 src/main/resources/assets/garnished/models/item/packed_polar_bear_hide_block.json create mode 100644 src/main/resources/assets/garnished/models/item/polar_bear_hide_block.json create mode 100644 src/main/resources/assets/garnished/textures/block/amber_remnant_block_connected.png create mode 100644 src/main/resources/assets/garnished/textures/block/amber_remnant_bricks.png create mode 100644 src/main/resources/assets/garnished/textures/block/packed_polar_bear_hide.png create mode 100644 src/main/resources/assets/garnished/textures/block/polar_bear_hide_block.png create mode 100644 src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_slab.json create mode 100644 src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_stairs.json create mode 100644 src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_wall.json create mode 100644 src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_bricks.json create mode 100644 src/main/resources/data/garnished/loot_tables/blocks/packed_polar_bear_hide_block.json create mode 100644 src/main/resources/data/garnished/loot_tables/blocks/polar_bear_hide_block.json create mode 100644 src/main/resources/data/garnished/recipes/packed_polar_bear_hide_block.json create mode 100644 src/main/resources/data/garnished/recipes/polar_bear_hide_block.json create mode 100644 src/main/resources/data/garnished/recipes/polar_bear_hide_block_from_packed.json create mode 100644 src/main/resources/data/garnished/recipes/polar_bear_hide_from_block.json create mode 100644 src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks.json create mode 100644 src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_slab.json create mode 100644 src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_stairs.json create mode 100644 src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_wall.json create mode 100644 src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_from_stonecutting.json create mode 100644 src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_slab_from_stonecutting.json create mode 100644 src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_stairs_from_stonecutting.json create mode 100644 src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_wall_from_stonecutting.json create mode 100644 src/main/resources/data/garnished/tags/blocks/amber_remnant_blocks.json diff --git a/src/main/java/net/dakotapride/garnished/item/tab/GarnishedCreativeModeTab.java b/src/main/java/net/dakotapride/garnished/item/tab/GarnishedCreativeModeTab.java index 75d3a5d8..06171373 100644 --- a/src/main/java/net/dakotapride/garnished/item/tab/GarnishedCreativeModeTab.java +++ b/src/main/java/net/dakotapride/garnished/item/tab/GarnishedCreativeModeTab.java @@ -868,6 +868,19 @@ public void fillItemList(NonNullList output) { output.add(GarnishedBlocks.NUMBING_PARCHMENT_BLOCK.asStack()); output.add(GarnishedBlocks.NUMBING_PARCHMENT_CARPET.asStack()); + output.add(GarnishedBlocks.POLAR_BEAR_HIDE_BLOCK.asStack()); + output.add(GarnishedBlocks.PACKED_POLAR_BEAR_HIDE_BLOCK.asStack()); + + output.add(GarnishedBlocks.AMBER_REMNANT_BLOCK.asStack()); + output.add(GarnishedBlocks.AMBER_REMNANT_SLAB.asStack()); + output.add(GarnishedBlocks.AMBER_REMNANT_STAIRS.asStack()); + output.add(GarnishedBlocks.AMBER_REMNANT_WALL.asStack()); + + output.add(GarnishedBlocks.AMBER_REMNANT_BRICKS.asStack()); + output.add(GarnishedBlocks.AMBER_REMNANT_BRICK_SLAB.asStack()); + output.add(GarnishedBlocks.AMBER_REMNANT_BRICK_STAIRS.asStack()); + output.add(GarnishedBlocks.AMBER_REMNANT_BRICK_WALL.asStack()); + output.add(GarnishedBlocks.SEPIA_FUNGUS.asStack()); output.add(GarnishedBlocks.SOUL_ROOTS.asStack()); output.add(GarnishedBlocks.INCANDESCENT_LILY.asStack()); diff --git a/src/main/java/net/dakotapride/garnished/mixin/ItemStackMixin.java b/src/main/java/net/dakotapride/garnished/mixin/ItemStackMixin.java index 40447c1f..ce448178 100644 --- a/src/main/java/net/dakotapride/garnished/mixin/ItemStackMixin.java +++ b/src/main/java/net/dakotapride/garnished/mixin/ItemStackMixin.java @@ -39,7 +39,7 @@ private void finishUsingItem(Level level, LivingEntity entity, CallbackInfoRetur // Sugar High functionality GarnishedFoodValues.hasSugarHigh = entity.hasEffect(GarnishedEffects.SUGAR_HIGH); // Freezing functionality - GarnishedFoodValues.hasFreezing = entity.hasEffect(GarnishedEffects.FREEZING); + GarnishedFoodValues.hasFreezing = entity.hasEffect(GarnishedEffects.FREEZING) || entity.isFreezing(); // Hunger functionality GarnishedFoodValues.hasHunger = entity.hasEffect(MobEffects.HUNGER); // Levitation functionality diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java index e9cedcbc..2aadff9f 100644 --- a/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java +++ b/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java @@ -2,6 +2,7 @@ import com.simibubi.create.content.decoration.palettes.ConnectedGlassPaneBlock; import com.simibubi.create.content.decoration.palettes.WindowBlock; +import com.simibubi.create.foundation.block.connected.SimpleCTBehaviour; import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.CreateRegistrate; import com.tterrag.registrate.util.entry.BlockEntry; @@ -89,6 +90,7 @@ import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.material.PushReaction; +import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; import static net.dakotapride.garnished.registry.GarnishedCT.woodenWindowBlock; import static net.dakotapride.garnished.registry.GarnishedCT.woodenWindowPaneBlock; @@ -1625,29 +1627,78 @@ public static BlockEntry masticsmoothwall(String colour0) { public static final BlockEntry AMBER_REMNANT_BLOCK = REGISTRATE.block("amber_remnant_block", Block::new) + .onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.AMBER_REMNANT_BLOCK))) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); public static final BlockEntry AMBER_REMNANT_SLAB = REGISTRATE.block("amber_remnant_slab", SlabBlock::new) + .onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.AMBER_REMNANT_BLOCK))) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); public static final BlockEntry AMBER_REMNANT_STAIRS = REGISTRATE.block("amber_remnant_stairs", AmberRemnantStairsBlock::new) + .onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.AMBER_REMNANT_BLOCK))) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); public static final BlockEntry AMBER_REMNANT_WALL = REGISTRATE.block("amber_remnant_wall", WallBlock::new) + .onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.AMBER_REMNANT_BLOCK))) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) .simpleItem() .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); + public static final BlockEntry AMBER_REMNANT_BRICKS = + REGISTRATE.block("amber_remnant_bricks", Block::new) + //.onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.AMBER_REMNANT_BLOCK))) + .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) + .simpleItem() + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.explosionResistance(12.0F)).register(); + public static final BlockEntry AMBER_REMNANT_BRICK_SLAB = + REGISTRATE.block("amber_remnant_brick_slab", SlabBlock::new) + //.onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.AMBER_REMNANT_BLOCK))) + .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) + .simpleItem() + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.explosionResistance(12.0F)).register(); + public static final BlockEntry AMBER_REMNANT_BRICK_STAIRS = + REGISTRATE.block("amber_remnant_brick_stairs", AmberRemnantStairsBlock::new) + //.onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.AMBER_REMNANT_BLOCK))) + .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) + .simpleItem() + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.explosionResistance(12.0F)).register(); + public static final BlockEntry AMBER_REMNANT_BRICK_WALL = + REGISTRATE.block("amber_remnant_brick_wall", WallBlock::new) + //.onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.AMBER_REMNANT_BLOCK))) + .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) + .simpleItem() + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.explosionResistance(12.0F)).register(); + + public static final BlockEntry POLAR_BEAR_HIDE_BLOCK = + REGISTRATE.block("polar_bear_hide_block", Block::new) + //.onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.AMBER_REMNANT_BLOCK))) + .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) + .simpleItem() + .initialProperties(() -> Blocks.WHITE_WOOL) + .properties(p -> p.explosionResistance(1200.0F)).register(); + + public static final BlockEntry PACKED_POLAR_BEAR_HIDE_BLOCK = + REGISTRATE.block("packed_polar_bear_hide_block", Block::new) + //.onRegister(connectedTextures(() -> new SimpleCTBehaviour(GarnishedCT.AMBER_REMNANT_BLOCK))) + .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) + .simpleItem() + .initialProperties(() -> Blocks.WHITE_WOOL) + .properties(p -> p.explosionResistance(1200.0F)).register(); + public static final BlockEntry ANNIVERSARY_CAKE = REGISTRATE.block("anniversary_cake", AnniversaryCakeBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedCT.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedCT.java index d61e5cbd..cd6bef5d 100644 --- a/src/main/java/net/dakotapride/garnished/registry/GarnishedCT.java +++ b/src/main/java/net/dakotapride/garnished/registry/GarnishedCT.java @@ -115,6 +115,7 @@ private static CTSpriteShiftEntry vertical(String name) { public static final CTSpriteShiftEntry SEPIA_WINDOW = vertical("sepia_window"); public static final CTSpriteShiftEntry NUT_WINDOW_PANE = vertical("nut_window"); public static final CTSpriteShiftEntry SEPIA_WINDOW_PANE = vertical("sepia_window"); + public static final CTSpriteShiftEntry AMBER_REMNANT_BLOCK = omni("amber_remnant_block"); //public static final CTSpriteShiftEntry NUMBING_PARCHMENT = omni("numbing_parchment_block"); private static SpriteShiftEntry get(String originalLocation, String targetLocation) { diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedFoodValues.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedFoodValues.java index 38706970..0c8f3f56 100644 --- a/src/main/java/net/dakotapride/garnished/registry/GarnishedFoodValues.java +++ b/src/main/java/net/dakotapride/garnished/registry/GarnishedFoodValues.java @@ -24,15 +24,15 @@ public enum GarnishedFoodValues implements IGarnishedUtilities { // Nether // Most nether foods cannot be under 6 nutrition value // Most nether foods cannot be under 0.40 saturation value (40% of the nutrition value) - // A hard limit on most overworld foods for nutrition is set at 12 - // A hard limit on most overworld foods for saturation is set at 0.85 (85% of the nutrition value) + // A hard limit on most nether foods for nutrition is set at 12 + // A hard limit on most nether foods for saturation is set at 0.85 (85% of the nutrition value) NETHER_MIN(6, 0.40f), NETHER_MAX(12, 0.80f), // End // Most end foods cannot be under 10 nutrition value // Most end foods cannot be under 0.55 saturation value (55% of the nutrition value) - // A hard limit on most overworld foods for nutrition is set at 16 - // A hard limit on most overworld foods for saturation is set at 1.00 (100% of the nutrition value) + // A hard limit on most end foods for nutrition is set at 16 + // A hard limit on most end foods for saturation is set at 1.00 (100% of the nutrition value) END_MIN(10, 0.55f), END_MAX(16, 1.00f); @@ -59,11 +59,11 @@ private static int mod(float value, boolean isSaturation) { public static final FoodProperties.Builder GENERIC_BOTTLED_FOOD_OR_DRINK = generic(3, 0.20f); - public static final FoodProperties GENERIC_BOTTLED_FOOD_OR_DRINK_build = generic(3, 0.20f).build(); + public static final FoodProperties GENERIC_BOTTLED_FOOD_OR_DRINK_build = GENERIC_BOTTLED_FOOD_OR_DRINK.build(); public static final FoodProperties.Builder GENERIC_STEW_OR_BREW = generic(8, 0.60f); - public static final FoodProperties GENERIC_STEW_OR_BREW_build = generic(8, 0.60f).build(); + public static final FoodProperties GENERIC_STEW_OR_BREW_build = GENERIC_STEW_OR_BREW.build(); public static final FoodProperties.Builder GENERIC_COOKIE = generic(4, 0.20f); - public static final FoodProperties GENERIC_COOKIE_build = generic(4, 0.20f).build(); + public static final FoodProperties GENERIC_COOKIE_build = GENERIC_COOKIE.build(); // Overworld public static final FoodProperties UNGARNISHED_NUT = ow_min().effect(new MobEffectInstance(MobEffects.CONFUSION, 240), 1.0f).build(); @@ -148,9 +148,12 @@ private static int mod(float value, boolean isSaturation) { public static final FoodProperties MUESLI = generic(OVERWORLD_MAX.nutrition, 0.60f).build(); public static final FoodProperties GENERIC_DRIED_KELP = generic(2, 0.30f).fast().build(); public static final FoodProperties DRIED_DULSE_KELP = generic(4, GENERIC_DRIED_KELP.getSaturationModifier()).fast().build(); - public static final FoodProperties VAST_BREW = generic(4, 0.30f).fast().build(); - public static final FoodProperties VERMILION_STEW = generic(6, 0.40f).build(); - public static final FoodProperties GALVANIC_HAUNTING = ow_max().build(); + public static final FoodProperties VAST_BREW = generic(6, 0.30f) + .effect(new MobEffectInstance(MobEffects.WATER_BREATHING, tick * 20, 0), 0.50f).build(); + public static final FoodProperties VERMILION_STEW = generic(7, 0.40f) + .effect(new MobEffectInstance(MobEffects.WATER_BREATHING, tick * 20, 0), 0.75f).build(); + public static final FoodProperties GALVANIC_HAUNTING = ow_max() + .effect(new MobEffectInstance(MobEffects.WATER_BREATHING, tick * 20, 0), 1.0f).build(); public static final FoodProperties BEWILDERED_PASTRY = generic(6, 0.40f) .effect(new MobEffectInstance(MobEffects.DOLPHINS_GRACE, tick * 20, 0), 0.65f).build(); // 65% chance of occurring public static final FoodProperties INCENDIARY_STEW = ow_max().build(); // Explodes on consumption - 100% chance of occurring @@ -171,8 +174,8 @@ private static int mod(float value, boolean isSaturation) { public static final FoodProperties VENERABLE_DELICACY = ow_max() .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 1.0f).build(); // 100% chance of occurring public static final FoodProperties ICY_MASTIC_CHUNK = ow_min() - .effect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 100, 2), 1.0f) - .effect(new MobEffectInstance(MobEffects.REGENERATION, 160, 1), 1.0f).fast().build(); + .effect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 100, 2), 1.0f) // 100% chance of occurring + .effect(new MobEffectInstance(MobEffects.REGENERATION, 160, 1), 1.0f).fast().build(); // 100% chance of occurring public static final FoodProperties CASHEW_SORBET_SCOOP = generic(2, 0.10f) .effect(GarnishedFoodValues.triggerRegenerationFromSugarHigh(), 0.65f).fast().build(); // 65% chance of occurring public static final FoodProperties CASHEW_SORBET_DELIGHT = generic(8, 0.40f) @@ -270,7 +273,7 @@ private static int mod(float value, boolean isSaturation) { .effect(GarnishedFoodValues.triggerSlowFallingFromLevitation(), 0.80f).build(); // 80% chance of occurring public static final FoodProperties SHELLED_DUMPLING = end_min() .effect(GarnishedFoodValues.triggerSlowFallingFromLevitation(), 0.50f).build(); // 50% chance of occurring - // Exempt due to already providing an effect - negative or positive + // Exempt due to already providing an effect - negative or positive public static final FoodProperties BOTTLED_ENDER_JELLY = GENERIC_BOTTLED_FOOD_OR_DRINK .effect(new MobEffectInstance(GarnishedEffects.COGNATE, cognate_dur / 2, 1), 0.50f).build(); // 50% chance of occurring public static final FoodProperties COSMIC_BREW = end_min() @@ -383,9 +386,9 @@ public static MobEffectInstance triggerSlowFallingFromLevitation() { public static MobEffectInstance triggerResistanceOrWeaknessFromRaids() { if (hasBadOmen) { + // Do collect 200 dollars, and do pass GO :) return new MobEffectInstance(MobEffects.WEAKNESS, tick * 36, 1); } else { - // Do collect 200 dollars, and do pass GO :) return new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, tick * 36, 1); } } diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_brick_slab.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_brick_slab.json new file mode 100644 index 00000000..eda0a1ba --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/amber_remnant_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "garnished:block/amber_remnant_bricks_slab" + }, + "type=double": { + "model": "garnished:block/amber_remnant_bricks" + }, + "type=top": { + "model": "garnished:block/amber_remnant_bricks_slab_top" + } + } +} diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_brick_stairs.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_brick_stairs.json new file mode 100644 index 00000000..34575b08 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/amber_remnant_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "garnished:block/amber_remnant_bricks_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "garnished:block/amber_remnant_bricks_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "garnished:block/amber_remnant_bricks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "garnished:block/amber_remnant_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "garnished:block/amber_remnant_bricks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "garnished:block/amber_remnant_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "garnished:block/amber_remnant_bricks_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "garnished:block/amber_remnant_bricks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "garnished:block/amber_remnant_bricks_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_brick_wall.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_brick_wall.json new file mode 100644 index 00000000..5a6904d3 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/amber_remnant_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "garnished:block/amber_remnant_bricks_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_bricks_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_bricks_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_bricks_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_bricks_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_bricks_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_bricks_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_bricks_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_bricks_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_bricks.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_bricks.json new file mode 100644 index 00000000..5005fb31 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/amber_remnant_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "garnished:block/amber_remnant_bricks" + } + } +} diff --git a/src/main/resources/assets/garnished/blockstates/packed_polar_bear_hide_block.json b/src/main/resources/assets/garnished/blockstates/packed_polar_bear_hide_block.json new file mode 100644 index 00000000..63237708 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/packed_polar_bear_hide_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "garnished:block/packed_polar_bear_hide_block" + } + } +} diff --git a/src/main/resources/assets/garnished/blockstates/polar_bear_hide_block.json b/src/main/resources/assets/garnished/blockstates/polar_bear_hide_block.json new file mode 100644 index 00000000..767d29c6 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/polar_bear_hide_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "garnished:block/polar_bear_hide_block" + } + } +} diff --git a/src/main/resources/assets/garnished/lang/en_ca.json b/src/main/resources/assets/garnished/lang/en_ca.json index d7a8e2a5..30a1ffec 100644 --- a/src/main/resources/assets/garnished/lang/en_ca.json +++ b/src/main/resources/assets/garnished/lang/en_ca.json @@ -315,12 +315,18 @@ "block.garnished.sepia_window": "Sepia Window", "block.garnished.sepia_window_pane": "Sepia Window Pane", + "block.garnished.polar_bear_hide_block": "Block of Polar Bear Hide", + "block.garnished.packed_polar_bear_hide_block": "Block of Packed Polar Bear Hide", "block.garnished.numbing_parchment_block": "Block of Numbing Parchment", "block.garnished.numbing_parchment_carpet": "Numbing Clothe", "block.garnished.amber_remnant_block": "Block of Amber Remnant", "block.garnished.amber_remnant_slab": "Amber Remnant Slab", "block.garnished.amber_remnant_stairs": "Amber Remnant Stairs", "block.garnished.amber_remnant_wall": "Amber Remnant Wall", + "block.garnished.amber_remnant_bricks": "Amber Remnant Bricks", + "block.garnished.amber_remnant_brick_slab": "Amber Remnant Brick Slab", + "block.garnished.amber_remnant_brick_stairs": "Amber Remnant Brick Stairs", + "block.garnished.amber_remnant_brick_wall": "Amber Remnant Brick Wall", "item.garnished.baklava": "Baklava", "item.garnished.slime_drop": "Slime Drop", diff --git a/src/main/resources/assets/garnished/lang/en_us.json b/src/main/resources/assets/garnished/lang/en_us.json index f8374d12..8f10e844 100644 --- a/src/main/resources/assets/garnished/lang/en_us.json +++ b/src/main/resources/assets/garnished/lang/en_us.json @@ -315,12 +315,18 @@ "block.garnished.sepia_window": "Sepia Window", "block.garnished.sepia_window_pane": "Sepia Window Pane", + "block.garnished.polar_bear_hide_block": "Block of Polar Bear Hide", + "block.garnished.packed_polar_bear_hide_block": "Block of Packed Polar Bear Hide", "block.garnished.numbing_parchment_block": "Block of Numbing Parchment", "block.garnished.numbing_parchment_carpet": "Numbing Clothe", "block.garnished.amber_remnant_block": "Block of Amber Remnant", "block.garnished.amber_remnant_slab": "Amber Remnant Slab", "block.garnished.amber_remnant_stairs": "Amber Remnant Stairs", "block.garnished.amber_remnant_wall": "Amber Remnant Wall", + "block.garnished.amber_remnant_bricks": "Amber Remnant Bricks", + "block.garnished.amber_remnant_brick_slab": "Amber Remnant Brick Slab", + "block.garnished.amber_remnant_brick_stairs": "Amber Remnant Brick Stairs", + "block.garnished.amber_remnant_brick_wall": "Amber Remnant Brick Wall", "item.garnished.baklava": "Baklava", "item.garnished.slime_drop": "Slime Drop", diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_bricks.json b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks.json new file mode 100644 index 00000000..9748d7e5 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "garnished:block/amber_remnant_bricks" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_slab.json b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_slab.json new file mode 100644 index 00000000..3b25dd70 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "garnished:block/amber_remnant_bricks", + "side": "garnished:block/amber_remnant_bricks", + "top": "garnished:block/amber_remnant_bricks" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_slab_top.json b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_slab_top.json new file mode 100644 index 00000000..9d9c0259 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "garnished:block/amber_remnant_bricks", + "side": "garnished:block/amber_remnant_bricks", + "top": "garnished:block/amber_remnant_bricks" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs.json b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs.json new file mode 100644 index 00000000..434d16cc --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "garnished:block/amber_remnant_bricks", + "side": "garnished:block/amber_remnant_bricks", + "top": "garnished:block/amber_remnant_bricks" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs_inner.json b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs_inner.json new file mode 100644 index 00000000..9d260cfc --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "garnished:block/amber_remnant_bricks", + "side": "garnished:block/amber_remnant_bricks", + "top": "garnished:block/amber_remnant_bricks" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs_outer.json b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs_outer.json new file mode 100644 index 00000000..4d7781ac --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "garnished:block/amber_remnant_bricks", + "side": "garnished:block/amber_remnant_bricks", + "top": "garnished:block/amber_remnant_bricks" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_inventory.json b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_inventory.json new file mode 100644 index 00000000..7f0d6eda --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "garnished:block/amber_remnant_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_post.json b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_post.json new file mode 100644 index 00000000..9a38b063 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "garnished:block/amber_remnant_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_side.json b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_side.json new file mode 100644 index 00000000..ed01690d --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "garnished:block/amber_remnant_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_side_tall.json b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_side_tall.json new file mode 100644 index 00000000..09eb5b8a --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_bricks_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "garnished:block/amber_remnant_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/packed_polar_bear_hide_block.json b/src/main/resources/assets/garnished/models/block/packed_polar_bear_hide_block.json new file mode 100644 index 00000000..bbc79294 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/packed_polar_bear_hide_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "garnished:block/packed_polar_bear_hide" + } +} diff --git a/src/main/resources/assets/garnished/models/block/polar_bear_hide_block.json b/src/main/resources/assets/garnished/models/block/polar_bear_hide_block.json new file mode 100644 index 00000000..518ea439 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/polar_bear_hide_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "garnished:block/polar_bear_hide_block" + } +} diff --git a/src/main/resources/assets/garnished/models/item/amber_remnant_brick_slab.json b/src/main/resources/assets/garnished/models/item/amber_remnant_brick_slab.json new file mode 100644 index 00000000..9de33ccb --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/amber_remnant_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/amber_remnant_bricks_slab" +} diff --git a/src/main/resources/assets/garnished/models/item/amber_remnant_brick_stairs.json b/src/main/resources/assets/garnished/models/item/amber_remnant_brick_stairs.json new file mode 100644 index 00000000..bc781985 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/amber_remnant_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/amber_remnant_bricks_stairs" +} diff --git a/src/main/resources/assets/garnished/models/item/amber_remnant_brick_wall.json b/src/main/resources/assets/garnished/models/item/amber_remnant_brick_wall.json new file mode 100644 index 00000000..43e9b331 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/amber_remnant_brick_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/amber_remnant_bricks_wall_inventory" +} diff --git a/src/main/resources/assets/garnished/models/item/amber_remnant_bricks.json b/src/main/resources/assets/garnished/models/item/amber_remnant_bricks.json new file mode 100644 index 00000000..4ec33884 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/amber_remnant_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/amber_remnant_bricks" +} diff --git a/src/main/resources/assets/garnished/models/item/packed_polar_bear_hide_block.json b/src/main/resources/assets/garnished/models/item/packed_polar_bear_hide_block.json new file mode 100644 index 00000000..56b77620 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/packed_polar_bear_hide_block.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/packed_polar_bear_hide_block" +} diff --git a/src/main/resources/assets/garnished/models/item/polar_bear_hide_block.json b/src/main/resources/assets/garnished/models/item/polar_bear_hide_block.json new file mode 100644 index 00000000..ed439a89 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/polar_bear_hide_block.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/polar_bear_hide_block" +} diff --git a/src/main/resources/assets/garnished/textures/block/amber_remnant_block.png b/src/main/resources/assets/garnished/textures/block/amber_remnant_block.png index e151d77e89d03793a52bc72562af843ef9079a38..e3ae42575a44cedecfca61e2bde1ff0d2b681d77 100644 GIT binary patch delta 228 zcmV<^JXY+ICi7FHnv`B5$B2X5nnn%w1`Ir`L#v9j7Y2U}}+5#deIasj4n_93gqM zL{j)rn#R<&$G)YSwY-p+JLlSYY&CZsyFg@uu*X4jNv4=_b)}Z4UEwB%4TbZOWFY(Y rI9Vrllpg2hFnuu1*r`lqU-kO~AAu`4+!v0C00000NkvXXu0mjf{v&01 diff --git a/src/main/resources/assets/garnished/textures/block/amber_remnant_block_connected.png b/src/main/resources/assets/garnished/textures/block/amber_remnant_block_connected.png new file mode 100644 index 0000000000000000000000000000000000000000..4850cbe4b272e0e8731edd5506cabd4940c69178 GIT binary patch literal 3523 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/garnished/textures/block/numbing_parchment_block_connected.png b/src/main/resources/assets/garnished/textures/block/numbing_parchment_block_connected.png index ab31a71ba50ace4977df59ab3201bcb5610c46d5..9e76e82f4da35614f9db0e3f1d85d99ba0c966fa 100644 GIT binary patch delta 3517 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 IO;Pdx2R!@mh5!Hn literal 2060 zcma)7dpOf=AOC4;PN6(rlEYq<%JVo}^1iGb7By1BNaQf5sCb%Y^46TaIi$zxDJ`cd z1dTm2{LK z2-@!I;_L-vifk#sz+W(VO9X@*-V1#MsvXc>02}#8)JYTsJ299u;8fZD958tdHJ_|kOpZX$gBPb{hf_*US>D~&I99_ zmYGrTsJODBI>gN^E5i27*)y&uj$0qH1*~tH3d(`l9p~kak^avQGC8Ph4UQ?|T>S75 zq{@&jIp(Fxa0r6yxjLh~6M~lgm-EXGs2dwt-G5){daiHcB~Mz~q+=RY=I9}g9UT2Q zT4O!#v2XkMYikZxHIuP}?ttLnkjca(;`ICsai@NhbW{Ov^KhLnibGN!$laasc1-v* zkaXHeJg#7k(_z z1kBG!xn6IozGj*RKVtnEo&ln+tw%%YTEED<)GkMYja#gij~S1a7rwV{XF{10|->k~`U6`8u{ zMzsKK#`*B)3enC3FEmoMwNkZz94u!IIM}Cy6Far!knD5+3)jFP593 z#q1TU6%nI+2}E|;LYd|D&P~bJJ@CGFC-6(;m`D~nAWo80%CMw0Irx0EpHhI>AUL`A zpN0w|qQc|WZA^hB&8TLgF0bwBp`WHxF}|eeV7o?3T)=^ndh{mfa7jwwX(#)8syK8( z#Zs)Sk<L+#RN@=c0{Trg;4Q;9o^Zls57G?FF5$SA2uD znjf*W^JMei1&NVMx+69lAL1wRaakw#^vUkamX^}rBY3j|e&#qomQ&KbCszg-lFi-K zlMnf#n1LPPpFIrw_fmG{eVa)GwFe_9?8HA*O+>E>zEn#2#l=ItY_d}^FSRnU$5Rcv zVES^p4#RrwV31JBlO}ZRe>v@v9j#Gi;UwBRXPAJShfSvta(II8mlu&I2I0|?i9!r3gsSm`M{BP=vg*0Pf+aYQl#-uvnM-2!d{1&hhf%PP z8p0)j+NEbmIM(ttl5~>)>T71;mvB48l_JKo{y7lw^Hm6SyYq>oJ|L@wxA7&$=z`w4 zVZxA*t}f)^`!1UOFjz4C0$ld~P@NH(y~`26HTqhxN1OiYpcK=VV3&d}>I5kmk{E8o zu#u98VpWk2zUFIFUrVH~?%5a_%dbuy+xXV<-jZ$W%Q;4)vw)%-3R>9dc1~hXZ@L&1 zfd{~j{$9D=U1D)^mm3SFPTywDxzuTyYHuE-rUJhiCOJ*Ck@|vgb+`$GxywdpZ3ucx z8gxN3v3R<9qN9q7RjYoY!6)RnImk@2iU|9<6ZfBD0(O4-8<;}2++Cn2HR2YL;WTr4 zZDTg*w8D{Hj}zS&)?ry?C&4^NdCEB~*vRocfvteFlPjl${gZwy^{2ihtar~OjvFn8 z@!(irVY?C_ouTkd&EC9esJ)h@fw^@|GhGGS l$9l0&mEI&$w7$R{wIYB@mfhjrdx`>)UngFMFDtjW^w1DtJAjh;+49GDQ zP6o;(2&5!1J?{Hfq^kP0NY(2s&i7Y>|L;@q)TXTp@5 zr@cR3^Ph2#+fAC^te9u6;5*)SpR(j;ohfy*lwuFvsB)~7KX`|8y0%tM`|_14%qL$P xedhWok$z!ecKyAquk$CTrcbGN&Ye}q_;UdtlTE}$6QBziJYD@<);T3K0RX4bVI=?n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/garnished/textures/item/amber_remnant.png b/src/main/resources/assets/garnished/textures/item/amber_remnant.png index dbd3725d839d02c97ec965a5b5400a04023473f6..15eaf35b6e69ad8d6e5c40744d80023324595b16 100644 GIT binary patch delta 238 zcmZ3>w47;zW4&U4Pl#)+p-h4d|KVDv>r;bP#2I_@vcKDsJjGq(|CO@;uct9EFuW9V z2nJHzB|(0{|KWha%b)QRP?)p8BeIx*f$tCqGm2_>H2?)GJY5_^G=fXdMe-e1;9&`{ zdEENrAN#upDt}jma4UYEF#W3iNB(Q+M%9~&Z!$d;({GvVv#5`UVW+UhbdEI>DswL^ zv}2#MbG-`V-g7g>Dv#tkD6f#yTFDqZYdY5{Q}+vQTd)2MMJLA}%)qPR-13H4i)78&qol`;+0HKOy00000 delta 244 zcmZ3^w3catW4%g%Pl#)kxqO_W;QnT}%d^9lrkHsOaT>F+yxNsM(O3Kb&8q+JW->4^ zEZ*rC4y1TWg8YL2BLIWY{d4Dl;+zE@k;M!Qe1}1p@p%4<6rf<0r;B5VMsR6gAm3pF z4(H}Zr$c|=TRY#b^^xjQs%SX7YJTny_G?0woBpLZCO*>N;S=gS(O1esz`9{ec7ux2 zxi+a4mk*eH;|y&G-9NEIO^rEY;gttod;-e~cT8}TZxULn^ZUf@R^^#{4$b-6@X6#y l@$ZIDt7i+F|8Tp?Ei&xN9&lFf=sR zT?A6xB|(0{|KWha%b)QRP?)p8BeIx*f$tCqGm2_>H2?)uJY5_^G=gK#-R3)>z`=Z> zDEP^L`w9m$)7OVD$@$7Wn$GQD%C{kS#j{%nk`DiHnAbnEn)yyh9!F5Tsnjp$8?s!h z?rAJL~&bFR>^59{WEqy)5|1&9v#m+qRmG)z4Q=?O^wP$RRgBJbfY1LIzJ) KKbLh*2~7Z(>|BNb delta 226 zcmbQtG@EIHW4%g%Pl#)rqF|M|yr&T7{${t!v%`$pSYGW)|9`XU|GSw>Q_Lp%YBMk} zG>IB;0x6!7Aiv=M2*4n8|J*sCIA?)JWHAE+-(e7DJf6QI1t^%|>Ealo5ggkW&Bvg~ z!Q8FTb?^T^?jzyb&F9=bcquHWK-_=7ncSUiol-AL@@l)GWu>hE*TMq=h?=0h?Zf23GwYVcm1@_OQXdrpIwuDI`0{F97=uI@?zCh7)OKPl o5OGfrQ#lDzED$gu2><{9+Ol6Zk*YTe!TbhtD*?M9u o5OGfrQ#lDzED$gu2><{9VssIvk*YTe!vFvd!vV){sAQ4reRX&r`~Uy| diff --git a/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_slab.json b/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_slab.json new file mode 100644 index 00000000..3fca9aac --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_slab.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:amber_remnant_brick_slab" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_stairs.json b/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_stairs.json new file mode 100644 index 00000000..d5fed711 --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:amber_remnant_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_wall.json b/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_wall.json new file mode 100644 index 00000000..50c9c8af --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_brick_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:amber_remnant_brick_wall" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_bricks.json b/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_bricks.json new file mode 100644 index 00000000..34d7cb2b --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/amber_remnant_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:amber_remnant_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/packed_polar_bear_hide_block.json b/src/main/resources/data/garnished/loot_tables/blocks/packed_polar_bear_hide_block.json new file mode 100644 index 00000000..07bdac51 --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/packed_polar_bear_hide_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:packed_polar_bear_hide_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/garnished/loot_tables/blocks/polar_bear_hide_block.json b/src/main/resources/data/garnished/loot_tables/blocks/polar_bear_hide_block.json new file mode 100644 index 00000000..801dc4c7 --- /dev/null +++ b/src/main/resources/data/garnished/loot_tables/blocks/polar_bear_hide_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 0, + "entries": [ + { + "type": "minecraft:item", + "name": "garnished:polar_bear_hide_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/garnished/recipes/packed_polar_bear_hide_block.json b/src/main/resources/data/garnished/recipes/packed_polar_bear_hide_block.json new file mode 100644 index 00000000..ca32dfeb --- /dev/null +++ b/src/main/resources/data/garnished/recipes/packed_polar_bear_hide_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "garnished:polar_bear_hide_block" + } + }, + "result": { + "item": "garnished:packed_polar_bear_hide_block", + "count": 4 + } +} diff --git a/src/main/resources/data/garnished/recipes/polar_bear_hide_block.json b/src/main/resources/data/garnished/recipes/polar_bear_hide_block.json new file mode 100644 index 00000000..e3e4b511 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/polar_bear_hide_block.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "garnished:polar_bear_hide" + } + }, + "result": { + "item": "garnished:polar_bear_hide_block" + } +} diff --git a/src/main/resources/data/garnished/recipes/polar_bear_hide_block_from_packed.json b/src/main/resources/data/garnished/recipes/polar_bear_hide_block_from_packed.json new file mode 100644 index 00000000..e4341426 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/polar_bear_hide_block_from_packed.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "garnished:packed_polar_bear_hide_block" + } + ], + "result": { + "item": "garnished:polar_bear_hide_block", + "count": 1 + } +} diff --git a/src/main/resources/data/garnished/recipes/polar_bear_hide_from_block.json b/src/main/resources/data/garnished/recipes/polar_bear_hide_from_block.json new file mode 100644 index 00000000..1da11870 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/polar_bear_hide_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "garnished:polar_bear_hide_block" + } + ], + "result": { + "item": "garnished:polar_bear_hide", + "count": 4 + } +} diff --git a/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks.json b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks.json new file mode 100644 index 00000000..ebb2aff7 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "amber_remnant_variants", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "garnished:amber_remnant_block" + } + }, + "result": { + "item": "garnished:amber_remnant_bricks", + "count": 4 + } +} diff --git a/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_slab.json b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_slab.json new file mode 100644 index 00000000..2cdc193c --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "amber_remnant_variants", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "garnished:amber_remnant_bricks" + } + }, + "result": { + "item": "garnished:amber_remnant_brick_slab", + "count": 6 + } +} diff --git a/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_stairs.json b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_stairs.json new file mode 100644 index 00000000..7fc5cbd4 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "amber_remnant_variants", + "pattern": [ + "# ", + "## ", + "###" + ], + "key": { + "#": { + "item": "garnished:amber_remnant_bricks" + } + }, + "result": { + "item": "garnished:amber_remnant_brick_stairs", + "count": 4 + } +} diff --git a/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_wall.json b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_wall.json new file mode 100644 index 00000000..d190f1a2 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_bricks_wall.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "amber_remnant_variants", + "pattern": [ + "###", + "###" + ], + "key": { + "#": { + "item": "garnished:amber_remnant_bricks" + } + }, + "result": { + "item": "garnished:amber_remnant_brick_wall", + "count": 6 + } +} diff --git a/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_slab.json b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_slab.json index f0a6104d..7b183e82 100644 --- a/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_slab.json +++ b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_slab.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "carnotite_variants", + "group": "amber_remnant_variants", "pattern": [ "###" ], diff --git a/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_stairs.json b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_stairs.json index 6ef3a082..22d6261a 100644 --- a/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_stairs.json +++ b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_stairs.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "carnotite_variants", + "group": "amber_remnant_variants", "pattern": [ "# ", "## ", diff --git a/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_wall.json b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_wall.json index f2c6539f..7e5b0db8 100644 --- a/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_wall.json +++ b/src/main/resources/data/garnished/recipes/stone/amber_remnant/amber_remnant_wall.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "group": "carnotite_variants", + "group": "amber_remnant_variants", "pattern": [ "###", "###" diff --git a/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_from_stonecutting.json b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_from_stonecutting.json new file mode 100644 index 00000000..58d16f27 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "garnished:amber_remnant_blocks" + }, + "result": "garnished:amber_remnant_bricks" +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_slab_from_stonecutting.json b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_slab_from_stonecutting.json new file mode 100644 index 00000000..93eecc28 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_slab_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "garnished:amber_remnant_blocks" + }, + "result": "garnished:amber_remnant_brick_slab" +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_stairs_from_stonecutting.json b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_stairs_from_stonecutting.json new file mode 100644 index 00000000..a6d932ab --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_stairs_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "garnished:amber_remnant_blocks" + }, + "result": "garnished:amber_remnant_brick_stairs" +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_wall_from_stonecutting.json b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_wall_from_stonecutting.json new file mode 100644 index 00000000..1d205d18 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/bricks_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "garnished:amber_remnant_blocks" + }, + "result": "garnished:amber_remnant_brick_wall" +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/tags/blocks/amber_remnant_blocks.json b/src/main/resources/data/garnished/tags/blocks/amber_remnant_blocks.json new file mode 100644 index 00000000..358b6654 --- /dev/null +++ b/src/main/resources/data/garnished/tags/blocks/amber_remnant_blocks.json @@ -0,0 +1,12 @@ +{ + "values": [ + "garnished:amber_remnant_block", + "garnished:amber_remnant_slab", + "garnished:amber_remnant_stairs", + "garnished:amber_remnant_wall", + "garnished:amber_remnant_bricks", + "garnished:amber_remnant_brick_slab", + "garnished:amber_remnant_brick_stairs", + "garnished:amber_remnant_brick_wall" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/tags/items/amber_remnant_blocks.json b/src/main/resources/data/garnished/tags/items/amber_remnant_blocks.json index 571ca9a3..358b6654 100644 --- a/src/main/resources/data/garnished/tags/items/amber_remnant_blocks.json +++ b/src/main/resources/data/garnished/tags/items/amber_remnant_blocks.json @@ -3,6 +3,10 @@ "garnished:amber_remnant_block", "garnished:amber_remnant_slab", "garnished:amber_remnant_stairs", - "garnished:amber_remnant_wall" + "garnished:amber_remnant_wall", + "garnished:amber_remnant_bricks", + "garnished:amber_remnant_brick_slab", + "garnished:amber_remnant_brick_stairs", + "garnished:amber_remnant_brick_wall" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 5dbe3059..ebf92c2c 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -6,13 +6,10 @@ "#garnished:stone_types/unstable_stone", "#garnished:stone_types/ritualistic_stone", "#garnished:stone_types/dragon_stone", + "#garnished:amber_remnant_blocks", "garnished:garnish_compound_block", "garnished:salt_compound_block", "garnished:ethereal_compound_block", - "garnished:senile_bone_block", - "garnished:amber_remnant_block", - "garnished:amber_remnant_slab", - "garnished:amber_remnant_stairs", - "garnished:amber_remnant_wall" + "garnished:senile_bone_block" ] } diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index e5794b09..193c2f2c 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -15,6 +15,7 @@ "garnished:smooth_unstable_stone_slab", "garnished:amber_remnant_slab", + "garnished:amber_remnant_brick_slab", "garnished:zultanite_slab", "garnished:polished_zultanite_slab", diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index d99dccf4..06aa027a 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -15,6 +15,7 @@ "garnished:smooth_unstable_stone_stairs", "garnished:amber_remnant_stairs", + "garnished:amber_remnant_brick_stairs", "garnished:zultanite_stairs", "garnished:polished_zultanite_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json index 1f05ef31..d4846267 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -15,6 +15,7 @@ "garnished:smooth_unstable_stone_wall", "garnished:amber_remnant_wall", + "garnished:amber_remnant_brick_wall", "garnished:zultanite_wall", "garnished:polished_zultanite_wall", diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json index e5794b09..193c2f2c 100644 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -15,6 +15,7 @@ "garnished:smooth_unstable_stone_slab", "garnished:amber_remnant_slab", + "garnished:amber_remnant_brick_slab", "garnished:zultanite_slab", "garnished:polished_zultanite_slab", diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json index d99dccf4..06aa027a 100644 --- a/src/main/resources/data/minecraft/tags/items/stairs.json +++ b/src/main/resources/data/minecraft/tags/items/stairs.json @@ -15,6 +15,7 @@ "garnished:smooth_unstable_stone_stairs", "garnished:amber_remnant_stairs", + "garnished:amber_remnant_brick_stairs", "garnished:zultanite_stairs", "garnished:polished_zultanite_stairs", diff --git a/src/main/resources/data/minecraft/tags/items/walls.json b/src/main/resources/data/minecraft/tags/items/walls.json index 1f05ef31..d4846267 100644 --- a/src/main/resources/data/minecraft/tags/items/walls.json +++ b/src/main/resources/data/minecraft/tags/items/walls.json @@ -15,6 +15,7 @@ "garnished:smooth_unstable_stone_wall", "garnished:amber_remnant_wall", + "garnished:amber_remnant_brick_wall", "garnished:zultanite_wall", "garnished:polished_zultanite_wall",