diff --git a/src/generated/resources/data/botania/loot_tables/blocks/dreamwood_fence.json b/src/generated/resources/data/botania/loot_tables/blocks/dreamwood_fence.json new file mode 100644 index 000000000..1496e3de0 --- /dev/null +++ b/src/generated/resources/data/botania/loot_tables/blocks/dreamwood_fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "botania:dreamwood_fence" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/loot_tables/blocks/dreamwood_fence_gate.json b/src/generated/resources/data/botania/loot_tables/blocks/dreamwood_fence_gate.json new file mode 100644 index 000000000..bdfcfebb8 --- /dev/null +++ b/src/generated/resources/data/botania/loot_tables/blocks/dreamwood_fence_gate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "botania:dreamwood_fence_gate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/loot_tables/blocks/livingwood_fence.json b/src/generated/resources/data/botania/loot_tables/blocks/livingwood_fence.json new file mode 100644 index 000000000..35e41edf8 --- /dev/null +++ b/src/generated/resources/data/botania/loot_tables/blocks/livingwood_fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "botania:livingwood_fence" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/botania/loot_tables/blocks/livingwood_fence_gate.json b/src/generated/resources/data/botania/loot_tables/blocks/livingwood_fence_gate.json new file mode 100644 index 000000000..b27c8b503 --- /dev/null +++ b/src/generated/resources/data/botania/loot_tables/blocks/livingwood_fence_gate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "botania:livingwood_fence_gate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/fences.json b/src/generated/resources/data/minecraft/tags/blocks/fences.json new file mode 100644 index 000000000..5c5820fc9 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/fences.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:dreamwood_fence", + "botania:livingwood_fence" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/fences.json b/src/generated/resources/data/minecraft/tags/items/fences.json new file mode 100644 index 000000000..5c5820fc9 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/fences.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:dreamwood_fence", + "botania:livingwood_fence" + ] +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 51fe0d3a3..25b0c9b7d 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -12,6 +12,8 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.block.FenceBlock; +import net.minecraft.block.FenceGateBlock; import net.minecraft.block.RotatedPillarBlock; import net.minecraft.block.SlabBlock; import net.minecraft.block.SoundType; @@ -35,6 +37,8 @@ import static vazkii.botania.common.block.ModBlocks.register; import static vazkii.botania.common.lib.LibBlockNames.SLAB_SUFFIX; import static vazkii.botania.common.lib.LibBlockNames.STAIR_SUFFIX; import static vazkii.botania.common.lib.LibBlockNames.WALL_SUFFIX; +import static vazkii.botania.common.lib.LibBlockNames.FENCE_SUFFIX; +import static vazkii.botania.common.lib.LibBlockNames.FENCE_GATE_SUFFIX; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) @@ -44,6 +48,8 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.LIVING_WOOD + STAIR_SUFFIX) public static Block livingwoodStairs; @ObjectHolder(LibBlockNames.LIVING_WOOD + SLAB_SUFFIX) public static Block livingwoodSlab; @ObjectHolder(LibBlockNames.LIVING_WOOD + WALL_SUFFIX) public static Block livingwoodWall; + @ObjectHolder(LibBlockNames.LIVING_WOOD + FENCE_SUFFIX) public static Block livingwoodFence; + @ObjectHolder(LibBlockNames.LIVING_WOOD + FENCE_GATE_SUFFIX) public static Block livingwoodFenceGate; @ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS + STAIR_SUFFIX) public static Block livingwoodPlankStairs; @ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS + SLAB_SUFFIX) public static Block livingwoodPlankSlab; @ObjectHolder(LibBlockNames.LIVING_ROCK + STAIR_SUFFIX) public static Block livingrockStairs; @@ -54,6 +60,8 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.DREAM_WOOD + STAIR_SUFFIX) public static Block dreamwoodStairs; @ObjectHolder(LibBlockNames.DREAM_WOOD + SLAB_SUFFIX) public static Block dreamwoodSlab; @ObjectHolder(LibBlockNames.DREAM_WOOD + WALL_SUFFIX) public static Block dreamwoodWall; + @ObjectHolder(LibBlockNames.DREAM_WOOD + FENCE_SUFFIX) public static Block dreamwoodFence; + @ObjectHolder(LibBlockNames.DREAM_WOOD + FENCE_GATE_SUFFIX) public static Block dreamwoodFenceGate; @ObjectHolder(LibBlockNames.DREAM_WOOD_PLANKS + STAIR_SUFFIX) public static Block dreamwoodPlankStairs; @ObjectHolder(LibBlockNames.DREAM_WOOD_PLANKS + SLAB_SUFFIX) public static Block dreamwoodPlankSlab; @@ -233,6 +241,8 @@ public final class ModFluffBlocks { register(r, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)), LibBlockNames.LIVING_WOOD + STAIR_SUFFIX); register(r, new SlabBlock(Block.Properties.from(base)), LibBlockNames.LIVING_WOOD + SLAB_SUFFIX); register(r, new WallBlock(Block.Properties.from(base)), LibBlockNames.LIVING_WOOD + WALL_SUFFIX); + register(r, new FenceBlock(Block.Properties.from(base)), LibBlockNames.LIVING_WOOD + FENCE_SUFFIX); + register(r, new FenceGateBlock(Block.Properties.from(base)), LibBlockNames.LIVING_WOOD + FENCE_GATE_SUFFIX); base = r.getValue(prefix(LibBlockNames.LIVING_WOOD_PLANKS)); register(r, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)), LibBlockNames.LIVING_WOOD_PLANKS + STAIR_SUFFIX); @@ -251,6 +261,8 @@ public final class ModFluffBlocks { register(r, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)), LibBlockNames.DREAM_WOOD + STAIR_SUFFIX); register(r, new SlabBlock(Block.Properties.from(base)), LibBlockNames.DREAM_WOOD + SLAB_SUFFIX); register(r, new WallBlock(Block.Properties.from(base)), LibBlockNames.DREAM_WOOD + WALL_SUFFIX); + register(r, new FenceBlock(Block.Properties.from(base)), LibBlockNames.DREAM_WOOD + FENCE_SUFFIX); + register(r, new FenceGateBlock(Block.Properties.from(base)), LibBlockNames.DREAM_WOOD + FENCE_GATE_SUFFIX); base = r.getValue(prefix(LibBlockNames.DREAM_WOOD_PLANKS)); register(r, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)), LibBlockNames.DREAM_WOOD_PLANKS + STAIR_SUFFIX); @@ -321,6 +333,8 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(livingwoodStairs, props).setRegistryName(livingwoodStairs.getRegistryName())); r.register(new ItemBlockMod(livingwoodSlab, props).setRegistryName(livingwoodSlab.getRegistryName())); r.register(new ItemBlockMod(livingwoodWall, props).setRegistryName(livingwoodWall.getRegistryName())); + r.register(new ItemBlockMod(livingwoodFence, props).setRegistryName(livingwoodFence.getRegistryName())); + r.register(new ItemBlockMod(livingwoodFenceGate, props).setRegistryName(livingwoodFenceGate.getRegistryName())); r.register(new ItemBlockMod(livingwoodPlankStairs, props).setRegistryName(livingwoodPlankStairs.getRegistryName())); r.register(new ItemBlockMod(livingwoodPlankSlab, props).setRegistryName(livingwoodPlankSlab.getRegistryName())); @@ -335,6 +349,8 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(dreamwoodStairs, props).setRegistryName(dreamwoodStairs.getRegistryName())); r.register(new ItemBlockMod(dreamwoodSlab, props).setRegistryName(dreamwoodSlab.getRegistryName())); r.register(new ItemBlockMod(dreamwoodWall, props).setRegistryName(dreamwoodWall.getRegistryName())); + r.register(new ItemBlockMod(dreamwoodFence, props).setRegistryName(dreamwoodFence.getRegistryName())); + r.register(new ItemBlockMod(dreamwoodFenceGate, props).setRegistryName(dreamwoodFenceGate.getRegistryName())); r.register(new ItemBlockMod(dreamwoodPlankStairs, props).setRegistryName(dreamwoodPlankStairs.getRegistryName())); r.register(new ItemBlockMod(dreamwoodPlankSlab, props).setRegistryName(dreamwoodPlankSlab.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index d151506c9..29e880e34 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -481,6 +481,8 @@ public final class BotaniaCreativeTab extends ItemGroup { addItem(ModFluffBlocks.livingwoodStairs); addItem(ModFluffBlocks.livingwoodSlab); addItem(ModFluffBlocks.livingwoodWall); + addItem(ModFluffBlocks.livingwoodFence); + addItem(ModFluffBlocks.livingwoodFenceGate); addItem(ModFluffBlocks.livingwoodPlankStairs); addItem(ModFluffBlocks.livingwoodPlankSlab); addItem(ModBlocks.livingrockBrick); @@ -495,6 +497,8 @@ public final class BotaniaCreativeTab extends ItemGroup { addItem(ModFluffBlocks.dreamwoodStairs); addItem(ModFluffBlocks.dreamwoodSlab); addItem(ModFluffBlocks.dreamwoodWall); + addItem(ModFluffBlocks.dreamwoodFence); + addItem(ModFluffBlocks.dreamwoodFenceGate); addItem(ModFluffBlocks.dreamwoodPlankStairs); addItem(ModFluffBlocks.dreamwoodPlankSlab); addItem(ModFluffBlocks.shimmerwoodPlankStairs); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index e8d3a0902..9623e6930 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -149,6 +149,8 @@ public final class LibBlockNames { public static final String SLAB_SUFFIX = "_slab"; public static final String STAIR_SUFFIX = "_stairs"; public static final String WALL_SUFFIX = "_wall"; + public static final String FENCE_SUFFIX = "_fence"; + public static final String FENCE_GATE_SUFFIX = "_fence_gate"; public static final ResourceLocation SUBTILE_PUREDAISY = prefix("pure_daisy"); public static final ResourceLocation SUBTILE_MANASTAR = prefix("manastar"); diff --git a/src/main/java/vazkii/botania/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java index 2eb95404c..ed172e80c 100644 --- a/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -1,6 +1,7 @@ package vazkii.botania.data; import net.minecraft.block.Block; +import net.minecraft.block.FenceBlock; import net.minecraft.block.SlabBlock; import net.minecraft.block.StairsBlock; import net.minecraft.block.WallBlock; @@ -8,7 +9,6 @@ import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; import net.minecraft.item.DyeColor; import net.minecraft.tags.BlockTags; -import net.minecraft.tags.Tag; import vazkii.botania.common.block.BlockFloatingSpecialFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibMisc; @@ -45,6 +45,10 @@ public class BlockTagProvider extends BlockTagsProvider { .sorted(Comparator.comparing(Block::getRegistryName)) .toArray(Block[]::new)); + getBuilder(BlockTags.FENCES).add(registry.stream().filter(botania) + .filter(b -> b instanceof FenceBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); getBuilder(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS).add( Arrays.stream(DyeColor.values()) diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index bf95ab724..10a999be7 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -25,6 +25,7 @@ public class ItemTagProvider extends ItemTagsProvider { this.copy(BlockTags.SLABS, ItemTags.SLABS); this.copy(BlockTags.STAIRS, ItemTags.STAIRS); this.copy(BlockTags.WALLS, ItemTags.WALLS); + this.copy(BlockTags.FENCES, ItemTags.FENCES); this.copy(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS, ModTags.Items.MUNDANE_FLOATING_FLOWERS); this.copy(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS, ModTags.Items.SPECIAL_FLOATING_FLOWERS); diff --git a/src/main/resources/assets/botania/blockstates/dreamwood_fence.json b/src/main/resources/assets/botania/blockstates/dreamwood_fence.json new file mode 100644 index 000000000..79c48f1c6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood_fence.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { + "apply": { "model": "botania:block/fences/dreamwood_fence_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:block/fences/dreamwood_fence_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:block/fences/dreamwood_fence_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:block/fences/dreamwood_fence_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:block/fences/dreamwood_fence_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/dreamwood_fence_gate.json b/src/main/resources/assets/botania/blockstates/dreamwood_fence_gate.json new file mode 100644 index 000000000..53d0beee4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/dreamwood_fence_gate.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate", "uvlock": true }, + "facing=west,in_wall=false,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate", "uvlock": true, "y": 270 }, + "facing=south,in_wall=false,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_open", "uvlock": true }, + "facing=west,in_wall=false,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall", "uvlock": true }, + "facing=west,in_wall=true,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=false": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall_open", "uvlock": true }, + "facing=west,in_wall=true,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=true": { "model": "botania:block/fence_gates/dreamwood_fence_gate_wall_open", "uvlock": true, "y": 270 } + } +} diff --git a/src/main/resources/assets/botania/blockstates/livingwood_fence.json b/src/main/resources/assets/botania/blockstates/livingwood_fence.json new file mode 100644 index 000000000..3b18634e1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood_fence.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { + "apply": { "model": "botania:block/fences/livingwood_fence_post" } + }, + { "when": { "north": "true" }, + "apply": { "model": "botania:block/fences/livingwood_fence_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "botania:block/fences/livingwood_fence_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "botania:block/fences/livingwood_fence_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "botania:block/fences/livingwood_fence_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/livingwood_fence_gate.json b/src/main/resources/assets/botania/blockstates/livingwood_fence_gate.json new file mode 100644 index 000000000..95df9fd6a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/livingwood_fence_gate.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate", "uvlock": true }, + "facing=west,in_wall=false,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate", "uvlock": true, "y": 270 }, + "facing=south,in_wall=false,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_open", "uvlock": true }, + "facing=west,in_wall=false,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall", "uvlock": true }, + "facing=west,in_wall=true,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=false": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall_open", "uvlock": true }, + "facing=west,in_wall=true,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=true": { "model": "botania:block/fence_gates/livingwood_fence_gate_wall_open", "uvlock": true, "y": 270 } + } +} diff --git a/src/main/resources/assets/botania/lang/de_de.json b/src/main/resources/assets/botania/lang/de_de.json index ccb4a44f7..aeb16d72d 100644 --- a/src/main/resources/assets/botania/lang/de_de.json +++ b/src/main/resources/assets/botania/lang/de_de.json @@ -405,6 +405,10 @@ "block.botania.livingrock_wall": "Lebesteinmauer", "block.botania.livingwood_wall": "Lebeholzmauer", "block.botania.dreamwood_wall": "Traumholzmauer", + "block.botania.livingwood_fence": "Lebeholzzaun", + "block.botania.dreamwood_fence": "Traumholzzaun", + "block.botania.livingwood_fence_gate": "Lebeholzzauntor", + "block.botania.dreamwood_fence_gate": "Traumholzzauntor", "block.botania.mana_bomb": "Manastorm-Ladung", "block.botania.white_buried_petals": "Vergrabenes Weißes Blütenblatt", "block.botania.orange_buried_petals": "Vergrabenes Oranges Blütenblatt", diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index 1b14f02d5..0727a9305 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -829,6 +829,10 @@ "block.botania.livingrock_wall": "Livingrock Wall", "block.botania.livingwood_wall": "Livingwood Wall", "block.botania.dreamwood_wall": "Dreamwood Wall", + "block.botania.livingwood_fence": "Livingwood Fence", + "block.botania.dreamwood_fence": "Dreamwood Fence", + "block.botania.livingwood_fence_gate": "Livingwood Fence Gate", + "block.botania.dreamwood_fence_gate": "Dreamwood Fence Gate", "block.botania.metamorphic_forest_cobblestone_wall": "Metamorphic Forest Cobblestone Wall", "block.botania.metamorphic_plains_cobblestone_wall": "Metamorphic Plains Cobblestone Wall", "block.botania.metamorphic_mountain_cobblestone_wall": "Metamorphic Mountain Cobblestone Wall", diff --git a/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate.json b/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate.json new file mode 100644 index 000000000..4e460fe72 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "botania:blocks/dreamwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_open.json b/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_open.json new file mode 100644 index 000000000..db4053dfe --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "botania:blocks/dreamwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_wall.json b/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_wall.json new file mode 100644 index 000000000..d79acf8e0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "botania:blocks/dreamwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_wall_open.json b/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_wall_open.json new file mode 100644 index 000000000..819e07e52 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fence_gates/dreamwood_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "botania:blocks/dreamwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate.json b/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate.json new file mode 100644 index 000000000..dfd40611d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_open.json b/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_open.json new file mode 100644 index 000000000..7b68e86ed --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_wall.json b/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_wall.json new file mode 100644 index 000000000..c461d68c8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_wall_open.json b/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_wall_open.json new file mode 100644 index 000000000..9b688b90a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fence_gates/livingwood_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fences/dreamwood_fence_post.json b/src/main/resources/assets/botania/models/block/fences/dreamwood_fence_post.json new file mode 100644 index 000000000..70577f18f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fences/dreamwood_fence_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "botania:blocks/dreamwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fences/dreamwood_fence_side.json b/src/main/resources/assets/botania/models/block/fences/dreamwood_fence_side.json new file mode 100644 index 000000000..eb095fb9f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fences/dreamwood_fence_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "botania:blocks/dreamwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fences/livingwood_fence_post.json b/src/main/resources/assets/botania/models/block/fences/livingwood_fence_post.json new file mode 100644 index 000000000..997b67f4b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fences/livingwood_fence_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fences/livingwood_fence_side.json b/src/main/resources/assets/botania/models/block/fences/livingwood_fence_side.json new file mode 100644 index 000000000..fe24b312e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/fences/livingwood_fence_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood_fence.json b/src/main/resources/assets/botania/models/item/dreamwood_fence.json new file mode 100644 index 000000000..d0e5209dc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dreamwood_fence.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "botania:blocks/dreamwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwood_fence_gate.json b/src/main/resources/assets/botania/models/item/dreamwood_fence_gate.json new file mode 100644 index 000000000..1c4488790 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dreamwood_fence_gate.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/fence_gates/dreamwood_fence_gate" +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_fence.json b/src/main/resources/assets/botania/models/item/livingwood_fence.json new file mode 100644 index 000000000..f9f97e141 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_fence.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "botania:blocks/livingwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwood_fence_gate.json b/src/main/resources/assets/botania/models/item/livingwood_fence_gate.json new file mode 100644 index 000000000..01de6cb09 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwood_fence_gate.json @@ -0,0 +1,3 @@ +{ + "parent": "botania:block/fence_gates/livingwood_fence_gate" +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dreamwood_fence.json b/src/main/resources/data/botania/recipes/dreamwood_fence.json new file mode 100644 index 000000000..7cd3a1371 --- /dev/null +++ b/src/main/resources/data/botania/recipes/dreamwood_fence.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "botania:dreamwood_fence", + "count": 3 + }, + "pattern": [ + "BSB", + "BSB" + ], + "type": "minecraft:crafting_shaped", + "key": { + "B": { + "item": "botania:dreamwood_planks" + }, + "S": { + "tag": "forge:rods/wooden" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dreamwood_fence_gate.json b/src/main/resources/data/botania/recipes/dreamwood_fence_gate.json new file mode 100644 index 000000000..1c6009831 --- /dev/null +++ b/src/main/resources/data/botania/recipes/dreamwood_fence_gate.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "botania:dreamwood_fence_gate", + "count": 3 + }, + "pattern": [ + "SBS", + "SBS" + ], + "type": "minecraft:crafting_shaped", + "key": { + "B": { + "item": "botania:dreamwood_planks" + }, + "S": { + "tag": "forge:rods/wooden" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood_fence.json b/src/main/resources/data/botania/recipes/livingwood_fence.json new file mode 100644 index 000000000..893eaae04 --- /dev/null +++ b/src/main/resources/data/botania/recipes/livingwood_fence.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "botania:livingwood_fence", + "count": 3 + }, + "pattern": [ + "BSB", + "BSB" + ], + "type": "minecraft:crafting_shaped", + "key": { + "B": { + "item": "botania:livingwood_planks" + }, + "S": { + "tag": "forge:rods/wooden" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwood_fence_gate.json b/src/main/resources/data/botania/recipes/livingwood_fence_gate.json new file mode 100644 index 000000000..9a69f2314 --- /dev/null +++ b/src/main/resources/data/botania/recipes/livingwood_fence_gate.json @@ -0,0 +1,19 @@ +{ + "result": { + "item": "botania:livingwood_fence_gate", + "count": 3 + }, + "pattern": [ + "SBS", + "SBS" + ], + "type": "minecraft:crafting_shaped", + "key": { + "B": { + "item": "botania:livingwood_planks" + }, + "S": { + "tag": "forge:rods/wooden" + } + } +} \ No newline at end of file