From 7367b6f1659c3bd283eb527895ecce0f29e64b84 Mon Sep 17 00:00:00 2001 From: Dakota Date: Sun, 6 Oct 2024 18:29:38 -0500 Subject: [PATCH] v2.0 - amber remnant blocks --- .../block/AmberRemnantStairsBlock.java | 10 + .../garnished/registry/GarnishedBlocks.java | 26 +++ .../blockstates/amber_remnant_block.json | 7 + .../blockstates/amber_remnant_slab.json | 13 ++ .../blockstates/amber_remnant_stairs.json | 209 ++++++++++++++++++ .../blockstates/amber_remnant_wall.json | 90 ++++++++ .../assets/garnished/lang/en_ca.json | 7 + .../assets/garnished/lang/en_us.json | 7 + .../models/block/amber_remnant_block.json | 6 + .../models/block/amber_remnant_slab.json | 8 + .../models/block/amber_remnant_slab_top.json | 8 + .../models/block/amber_remnant_stairs.json | 8 + .../block/amber_remnant_stairs_inner.json | 8 + .../block/amber_remnant_stairs_outer.json | 8 + .../block/amber_remnant_wall_inventory.json | 6 + .../models/block/amber_remnant_wall_post.json | 6 + .../models/block/amber_remnant_wall_side.json | 6 + .../block/amber_remnant_wall_side_tall.json | 6 + .../models/item/amber_remnant_block.json | 3 + .../models/item/amber_remnant_slab.json | 3 + .../models/item/amber_remnant_stairs.json | 3 + .../models/item/amber_remnant_wall.json | 3 + .../textures/block/amber_remnant_block.png | Bin 0 -> 298 bytes .../recipes/amber_remnant_block.json | 15 ++ .../recipes/amber_remnant_from_block.json | 12 + .../amber_remnant/base_from_stonecutting.json | 8 + .../amber_remnant/slab_from_stonecutting.json | 8 + .../stairs_from_stonecutting.json | 8 + .../amber_remnant/wall_from_stonecutting.json | 8 + .../tags/blocks/amber_remnant_blocks.json | 8 + .../data/minecraft/tags/blocks/slabs.json | 4 +- .../data/minecraft/tags/blocks/stairs.json | 4 +- .../data/minecraft/tags/blocks/walls.json | 4 +- .../data/minecraft/tags/items/slabs.json | 4 +- .../data/minecraft/tags/items/stairs.json | 4 +- .../data/minecraft/tags/items/walls.json | 4 +- 36 files changed, 536 insertions(+), 6 deletions(-) create mode 100644 src/main/java/net/dakotapride/garnished/block/AmberRemnantStairsBlock.java create mode 100644 src/main/resources/assets/garnished/blockstates/amber_remnant_block.json create mode 100644 src/main/resources/assets/garnished/blockstates/amber_remnant_slab.json create mode 100644 src/main/resources/assets/garnished/blockstates/amber_remnant_stairs.json create mode 100644 src/main/resources/assets/garnished/blockstates/amber_remnant_wall.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_block.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_slab.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_slab_top.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_stairs.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_stairs_inner.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_stairs_outer.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_wall_inventory.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_wall_post.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_wall_side.json create mode 100644 src/main/resources/assets/garnished/models/block/amber_remnant_wall_side_tall.json create mode 100644 src/main/resources/assets/garnished/models/item/amber_remnant_block.json create mode 100644 src/main/resources/assets/garnished/models/item/amber_remnant_slab.json create mode 100644 src/main/resources/assets/garnished/models/item/amber_remnant_stairs.json create mode 100644 src/main/resources/assets/garnished/models/item/amber_remnant_wall.json create mode 100644 src/main/resources/assets/garnished/textures/block/amber_remnant_block.png create mode 100644 src/main/resources/data/garnished/recipes/amber_remnant_block.json create mode 100644 src/main/resources/data/garnished/recipes/amber_remnant_from_block.json create mode 100644 src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/base_from_stonecutting.json create mode 100644 src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/slab_from_stonecutting.json create mode 100644 src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/stairs_from_stonecutting.json create mode 100644 src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/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/block/AmberRemnantStairsBlock.java b/src/main/java/net/dakotapride/garnished/block/AmberRemnantStairsBlock.java new file mode 100644 index 00000000..5eca9aa3 --- /dev/null +++ b/src/main/java/net/dakotapride/garnished/block/AmberRemnantStairsBlock.java @@ -0,0 +1,10 @@ +package net.dakotapride.garnished.block; + +import net.dakotapride.garnished.registry.GarnishedBlocks; +import net.minecraft.world.level.block.StairBlock; + +public class AmberRemnantStairsBlock extends StairBlock { + public AmberRemnantStairsBlock(Properties properties) { + super(GarnishedBlocks.AMBER_REMNANT_BLOCK.get().defaultBlockState(), properties); + } +} diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java index d12dc222..be3984c7 100644 --- a/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java +++ b/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java @@ -12,6 +12,7 @@ import net.dakotapride.garnished.block.AbyssalStoneSlabBlock; import net.dakotapride.garnished.block.AbyssalStoneStairsBlock; import net.dakotapride.garnished.block.AbyssalStoneWallBlock; +import net.dakotapride.garnished.block.AmberRemnantStairsBlock; import net.dakotapride.garnished.block.BokChoyPlantBlock; import net.dakotapride.garnished.block.CarnotiteStairsBlock; import net.dakotapride.garnished.block.DragonStoneStairsBlock; @@ -1626,6 +1627,31 @@ public static BlockEntry masticsmoothwall(String colour0) { .initialProperties(() -> Blocks.STONE) .properties(p -> p.explosionResistance(12.0F)).register(); + public static final BlockEntry AMBER_REMNANT_BLOCK = + REGISTRATE.block("amber_remnant_block", Block::new) + .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) + .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) + .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) + .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 ANNIVERSARY_CAKE = REGISTRATE.block("anniversary_cake", AnniversaryCakeBlock::new) .blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov))) diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_block.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_block.json new file mode 100644 index 00000000..f35ccde6 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/amber_remnant_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "garnished:block/amber_remnant_block" + } + } +} diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_slab.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_slab.json new file mode 100644 index 00000000..b5522fe5 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/amber_remnant_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "garnished:block/amber_remnant_slab" + }, + "type=double": { + "model": "garnished:block/amber_remnant_block" + }, + "type=top": { + "model": "garnished:block/amber_remnant_slab_top" + } + } +} diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_stairs.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_stairs.json new file mode 100644 index 00000000..6e9c4162 --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/amber_remnant_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "garnished:block/amber_remnant_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "garnished:block/amber_remnant_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "garnished:block/amber_remnant_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "garnished:block/amber_remnant_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "garnished:block/amber_remnant_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "garnished:block/amber_remnant_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "garnished:block/amber_remnant_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "garnished:block/amber_remnant_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "garnished:block/amber_remnant_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "garnished:block/amber_remnant_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "garnished:block/amber_remnant_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "garnished:block/amber_remnant_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "garnished:block/amber_remnant_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "garnished:block/amber_remnant_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_wall.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_wall.json new file mode 100644 index 00000000..77b243bb --- /dev/null +++ b/src/main/resources/assets/garnished/blockstates/amber_remnant_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "garnished:block/amber_remnant_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "garnished:block/amber_remnant_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/lang/en_ca.json b/src/main/resources/assets/garnished/lang/en_ca.json index bf1dc49a..8d42a3a3 100644 --- a/src/main/resources/assets/garnished/lang/en_ca.json +++ b/src/main/resources/assets/garnished/lang/en_ca.json @@ -351,6 +351,13 @@ "block.garnished.sepia_sign": "Sepia Sign", "block.garnished.sepia_hanging_sign": "Sepia Hanging Sign", + "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", + "item.garnished.baklava": "Baklava", "item.garnished.slime_drop": "Slime Drop", "item.garnished.slime_drop_red": "Red Mastic Covered 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 d7efe947..60a80e0c 100644 --- a/src/main/resources/assets/garnished/lang/en_us.json +++ b/src/main/resources/assets/garnished/lang/en_us.json @@ -351,6 +351,13 @@ "block.garnished.sepia_sign": "Sepia Sign", "block.garnished.sepia_hanging_sign": "Sepia Hanging Sign", + "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", + "item.garnished.baklava": "Baklava", "item.garnished.slime_drop": "Slime Drop", "item.garnished.slime_drop_red": "Red Mastic Covered Slime Drop", diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_block.json b/src/main/resources/assets/garnished/models/block/amber_remnant_block.json new file mode 100644 index 00000000..17b31d6e --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "garnished:block/amber_remnant_block" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_slab.json b/src/main/resources/assets/garnished/models/block/amber_remnant_slab.json new file mode 100644 index 00000000..49ecf15f --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "garnished:block/amber_remnant_block", + "side": "garnished:block/amber_remnant_block", + "top": "garnished:block/amber_remnant_block" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_slab_top.json b/src/main/resources/assets/garnished/models/block/amber_remnant_slab_top.json new file mode 100644 index 00000000..850fb4c7 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "garnished:block/amber_remnant_block", + "side": "garnished:block/amber_remnant_block", + "top": "garnished:block/amber_remnant_block" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_stairs.json b/src/main/resources/assets/garnished/models/block/amber_remnant_stairs.json new file mode 100644 index 00000000..154d4922 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "garnished:block/amber_remnant_block", + "side": "garnished:block/amber_remnant_block", + "top": "garnished:block/amber_remnant_block" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_stairs_inner.json b/src/main/resources/assets/garnished/models/block/amber_remnant_stairs_inner.json new file mode 100644 index 00000000..150b9cc3 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "garnished:block/amber_remnant_block", + "side": "garnished:block/amber_remnant_block", + "top": "garnished:block/amber_remnant_block" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_stairs_outer.json b/src/main/resources/assets/garnished/models/block/amber_remnant_stairs_outer.json new file mode 100644 index 00000000..b9b206af --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "garnished:block/amber_remnant_block", + "side": "garnished:block/amber_remnant_block", + "top": "garnished:block/amber_remnant_block" + } +} diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_wall_inventory.json b/src/main/resources/assets/garnished/models/block/amber_remnant_wall_inventory.json new file mode 100644 index 00000000..02e9444e --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "garnished:block/amber_remnant_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_wall_post.json b/src/main/resources/assets/garnished/models/block/amber_remnant_wall_post.json new file mode 100644 index 00000000..1c2454c0 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "garnished:block/amber_remnant_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_wall_side.json b/src/main/resources/assets/garnished/models/block/amber_remnant_wall_side.json new file mode 100644 index 00000000..378e96fb --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "garnished:block/amber_remnant_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/block/amber_remnant_wall_side_tall.json b/src/main/resources/assets/garnished/models/block/amber_remnant_wall_side_tall.json new file mode 100644 index 00000000..b20a0774 --- /dev/null +++ b/src/main/resources/assets/garnished/models/block/amber_remnant_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "garnished:block/amber_remnant_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/garnished/models/item/amber_remnant_block.json b/src/main/resources/assets/garnished/models/item/amber_remnant_block.json new file mode 100644 index 00000000..14b87c1a --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/amber_remnant_block.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/amber_remnant_block" +} diff --git a/src/main/resources/assets/garnished/models/item/amber_remnant_slab.json b/src/main/resources/assets/garnished/models/item/amber_remnant_slab.json new file mode 100644 index 00000000..f17998c9 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/amber_remnant_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/amber_remnant_slab" +} diff --git a/src/main/resources/assets/garnished/models/item/amber_remnant_stairs.json b/src/main/resources/assets/garnished/models/item/amber_remnant_stairs.json new file mode 100644 index 00000000..b04fd414 --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/amber_remnant_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/amber_remnant_stairs" +} diff --git a/src/main/resources/assets/garnished/models/item/amber_remnant_wall.json b/src/main/resources/assets/garnished/models/item/amber_remnant_wall.json new file mode 100644 index 00000000..18ca300d --- /dev/null +++ b/src/main/resources/assets/garnished/models/item/amber_remnant_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "garnished:block/amber_remnant_wall_inventory" +} 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 new file mode 100644 index 0000000000000000000000000000000000000000..e151d77e89d03793a52bc72562af843ef9079a38 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF)vomaH>>`?n|XP5*#2g>r732{Y%G3iYMX(I zISV`@iy0XB4uLSEsD@VqP;io`i(`nyW!^J}d`%7lZV&Abx>@&BFqi~dKNgdErFfW8 zYzMv$pP;FvI%!t;!tJa@pMuDNP%WI~IE`n^9Q0blURRhiYxSt)C~RDE$6r5vg7_ oMeg}igIa^LH&*(j#((|IEZ?YYaYwwb6X-eyPgg&ebxsLQ07m_AEdT%j literal 0 HcmV?d00001 diff --git a/src/main/resources/data/garnished/recipes/amber_remnant_block.json b/src/main/resources/data/garnished/recipes/amber_remnant_block.json new file mode 100644 index 00000000..9802d606 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/amber_remnant_block.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "garnished:amber_remnant" + } + }, + "result": { + "item": "garnished:amber_remnant_block" + } +} diff --git a/src/main/resources/data/garnished/recipes/amber_remnant_from_block.json b/src/main/resources/data/garnished/recipes/amber_remnant_from_block.json new file mode 100644 index 00000000..05a32288 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/amber_remnant_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "garnished:amber_remnant_block" + } + ], + "result": { + "item": "garnished:amber_remnant", + "count": 4 + } +} diff --git a/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/base_from_stonecutting.json b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/base_from_stonecutting.json new file mode 100644 index 00000000..facd8f6f --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/base_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "garnished:amber_remnant_blocks" + }, + "result": "garnished:amber_remnant_block" +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/slab_from_stonecutting.json b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/slab_from_stonecutting.json new file mode 100644 index 00000000..94cde887 --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/slab_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "garnished:amber_remnant_blocks" + }, + "result": "garnished:amber_remnant_slab" +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/stairs_from_stonecutting.json b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/stairs_from_stonecutting.json new file mode 100644 index 00000000..067bda5e --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/stairs_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "garnished:amber_remnant_blocks" + }, + "result": "garnished:amber_remnant_stairs" +} \ No newline at end of file diff --git a/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/wall_from_stonecutting.json b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/wall_from_stonecutting.json new file mode 100644 index 00000000..ff1adb3d --- /dev/null +++ b/src/main/resources/data/garnished/recipes/stone_cutting/amber_remnant/wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "garnished:amber_remnant_blocks" + }, + "result": "garnished:amber_remnant_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..571ca9a3 --- /dev/null +++ b/src/main/resources/data/garnished/tags/blocks/amber_remnant_blocks.json @@ -0,0 +1,8 @@ +{ + "values": [ + "garnished:amber_remnant_block", + "garnished:amber_remnant_slab", + "garnished:amber_remnant_stairs", + "garnished:amber_remnant_wall" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index 1c495a54..e91e439e 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -14,6 +14,8 @@ "garnished:unstable_stone_brick_slab", "garnished:smooth_unstable_stone_slab", + "garnished:amber_remnant_slab", + "garnished:zultanite_slab", "garnished:polished_zultanite_slab", "garnished:zultanite_brick_slab", @@ -83,4 +85,4 @@ "garnished:brown_zultanite_brick_slab", "garnished:smooth_brown_zultanite_slab" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index 6996449f..7c5d29d0 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -14,6 +14,8 @@ "garnished:unstable_stone_brick_stairs", "garnished:smooth_unstable_stone_stairs", + "garnished:amber_remnant_stairs", + "garnished:zultanite_stairs", "garnished:polished_zultanite_stairs", "garnished:zultanite_brick_stairs", @@ -83,4 +85,4 @@ "garnished:brown_zultanite_brick_stairs", "garnished:smooth_brown_zultanite_stairs" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json index 93ea95f9..6b7d893c 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -14,6 +14,8 @@ "garnished:unstable_stone_brick_wall", "garnished:smooth_unstable_stone_wall", + "garnished:amber_remnant_wall", + "garnished:zultanite_wall", "garnished:polished_zultanite_wall", "garnished:zultanite_brick_wall", @@ -83,4 +85,4 @@ "garnished:brown_zultanite_brick_wall", "garnished:smooth_brown_zultanite_wall" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json index 1c495a54..e91e439e 100644 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -14,6 +14,8 @@ "garnished:unstable_stone_brick_slab", "garnished:smooth_unstable_stone_slab", + "garnished:amber_remnant_slab", + "garnished:zultanite_slab", "garnished:polished_zultanite_slab", "garnished:zultanite_brick_slab", @@ -83,4 +85,4 @@ "garnished:brown_zultanite_brick_slab", "garnished:smooth_brown_zultanite_slab" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json index 6996449f..7c5d29d0 100644 --- a/src/main/resources/data/minecraft/tags/items/stairs.json +++ b/src/main/resources/data/minecraft/tags/items/stairs.json @@ -14,6 +14,8 @@ "garnished:unstable_stone_brick_stairs", "garnished:smooth_unstable_stone_stairs", + "garnished:amber_remnant_stairs", + "garnished:zultanite_stairs", "garnished:polished_zultanite_stairs", "garnished:zultanite_brick_stairs", @@ -83,4 +85,4 @@ "garnished:brown_zultanite_brick_stairs", "garnished:smooth_brown_zultanite_stairs" ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/minecraft/tags/items/walls.json b/src/main/resources/data/minecraft/tags/items/walls.json index 93ea95f9..6b7d893c 100644 --- a/src/main/resources/data/minecraft/tags/items/walls.json +++ b/src/main/resources/data/minecraft/tags/items/walls.json @@ -14,6 +14,8 @@ "garnished:unstable_stone_brick_wall", "garnished:smooth_unstable_stone_wall", + "garnished:amber_remnant_wall", + "garnished:zultanite_wall", "garnished:polished_zultanite_wall", "garnished:zultanite_brick_wall", @@ -83,4 +85,4 @@ "garnished:brown_zultanite_brick_wall", "garnished:smooth_brown_zultanite_wall" ] -} \ No newline at end of file +}