From f38b87996af3109a49beddfbbf243a414b746693 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 20 Aug 2019 23:59:18 +0300 Subject: [PATCH] Rubber fence and fence gate. Some work on #1739 --- .../blocks/misc/BlockRubberPlankSlab.java | 38 --------- .../java/techreborn/events/ModRegistry.java | 26 +++++- src/main/java/techreborn/init/TRContent.java | 2 + .../techreborn/blockstates/rubber_fence.json | 17 ++++ .../blockstates/rubber_fence_gate.json | 20 +++++ .../techreborn/blockstates/rubber_leaves.json | 2 +- .../techreborn/blockstates/rubber_log.json | 48 +++++------ .../blockstates/rubber_plank_slab.json | 6 +- .../blockstates/rubber_plank_stair.json | 80 +++++++++---------- .../techreborn/blockstates/rubber_planks.json | 2 +- .../blockstates/rubber_sapling.json | 2 +- .../assets/techreborn/lang/en_us.json | 2 + .../block/rubber/rubber_fence_gate.json | 6 ++ .../block/rubber/rubber_fence_gate_open.json | 6 ++ .../block/rubber/rubber_fence_gate_wall.json | 6 ++ .../rubber/rubber_fence_gate_wall_open.json | 6 ++ .../block/rubber/rubber_fence_inventory.json | 6 ++ .../block/rubber/rubber_fence_post.json | 6 ++ .../block/rubber/rubber_fence_side.json | 6 ++ .../block/{ => rubber}/rubber_leaves.json | 0 .../models/block/{ => rubber}/rubber_log.json | 0 .../{ => rubber}/rubber_log_with_sap.json | 0 .../block/{ => rubber}/rubber_plank_slab.json | 0 .../{ => rubber}/rubber_plank_slab_top.json | 0 .../{ => rubber}/rubber_plank_stair.json | 0 .../rubber_plank_stair_inner.json | 0 .../rubber_plank_stair_outer.json | 0 .../block/{ => rubber}/rubber_planks.json | 0 .../block/{ => rubber}/rubber_sapling.json | 0 .../techreborn/models/item/rubber_fence.json | 3 + .../models/item/rubber_fence_gate.json | 3 + .../techreborn/models/item/rubber_leaves.json | 2 +- .../techreborn/models/item/rubber_log.json | 2 +- .../models/item/rubber_plank_slab.json | 2 +- .../models/item/rubber_plank_stair.json | 2 +- .../techreborn/models/item/rubber_planks.json | 2 +- .../data/minecraft/tags/blocks/fences.json | 7 ++ .../data/minecraft/tags/blocks/slabs.json | 6 ++ .../minecraft/tags/blocks/wooden_fences.json | 6 ++ .../minecraft/tags/blocks/wooden_slabs.json | 6 ++ .../minecraft/tags/blocks/wooden_stairs.json | 6 ++ .../data/minecraft/tags/items/fences.json | 7 ++ .../data/minecraft/tags/items/slabs.json | 6 ++ .../minecraft/tags/items/wooden_fences.json | 6 ++ .../minecraft/tags/items/wooden_slabs.json | 6 ++ .../minecraft/tags/items/wooden_stairs.json | 6 ++ 46 files changed, 249 insertions(+), 116 deletions(-) delete mode 100644 src/main/java/techreborn/blocks/misc/BlockRubberPlankSlab.java create mode 100644 src/main/resources/assets/techreborn/blockstates/rubber_fence.json create mode 100644 src/main/resources/assets/techreborn/blockstates/rubber_fence_gate.json create mode 100644 src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate.json create mode 100644 src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_open.json create mode 100644 src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_wall.json create mode 100644 src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_wall_open.json create mode 100644 src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_inventory.json create mode 100644 src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_post.json create mode 100644 src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_side.json rename src/main/resources/assets/techreborn/models/block/{ => rubber}/rubber_leaves.json (100%) rename src/main/resources/assets/techreborn/models/block/{ => rubber}/rubber_log.json (100%) rename src/main/resources/assets/techreborn/models/block/{ => rubber}/rubber_log_with_sap.json (100%) rename src/main/resources/assets/techreborn/models/block/{ => rubber}/rubber_plank_slab.json (100%) rename src/main/resources/assets/techreborn/models/block/{ => rubber}/rubber_plank_slab_top.json (100%) rename src/main/resources/assets/techreborn/models/block/{ => rubber}/rubber_plank_stair.json (100%) rename src/main/resources/assets/techreborn/models/block/{ => rubber}/rubber_plank_stair_inner.json (100%) rename src/main/resources/assets/techreborn/models/block/{ => rubber}/rubber_plank_stair_outer.json (100%) rename src/main/resources/assets/techreborn/models/block/{ => rubber}/rubber_planks.json (100%) rename src/main/resources/assets/techreborn/models/block/{ => rubber}/rubber_sapling.json (100%) create mode 100644 src/main/resources/assets/techreborn/models/item/rubber_fence.json create mode 100644 src/main/resources/assets/techreborn/models/item/rubber_fence_gate.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/fences.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/slabs.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_fences.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json create mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json create mode 100644 src/main/resources/data/minecraft/tags/items/fences.json create mode 100644 src/main/resources/data/minecraft/tags/items/slabs.json create mode 100644 src/main/resources/data/minecraft/tags/items/wooden_fences.json create mode 100644 src/main/resources/data/minecraft/tags/items/wooden_slabs.json create mode 100644 src/main/resources/data/minecraft/tags/items/wooden_stairs.json diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberPlankSlab.java b/src/main/java/techreborn/blocks/misc/BlockRubberPlankSlab.java deleted file mode 100644 index 7ceab34b5..000000000 --- a/src/main/java/techreborn/blocks/misc/BlockRubberPlankSlab.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.misc; - -import net.fabricmc.fabric.api.block.FabricBlockSettings; -import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; -import net.minecraft.block.SlabBlock; -import net.minecraft.sound.BlockSoundGroup; - -public class BlockRubberPlankSlab extends SlabBlock { - - public BlockRubberPlankSlab() { - super(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE).strength(2.0F, 15.0F).sounds(BlockSoundGroup.WOOD).build()); - } -} diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index 59af653d5..94044629a 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -24,9 +24,16 @@ package techreborn.events; +import net.fabricmc.fabric.api.block.FabricBlockSettings; +import net.minecraft.block.FenceBlock; +import net.minecraft.block.FenceGateBlock; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.block.SlabBlock; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; +import net.minecraft.sound.BlockSoundGroup; import reborncore.RebornRegistry; import techreborn.TechReborn; import techreborn.blocks.misc.BlockComputerCube; @@ -36,7 +43,6 @@ import techreborn.blocks.misc.BlockReinforcedGlass; import techreborn.blocks.misc.BlockRubberLeaves; import techreborn.blocks.misc.BlockRubberLog; import techreborn.blocks.misc.BlockRubberPlank; -import techreborn.blocks.misc.BlockRubberPlankSlab; import techreborn.blocks.misc.BlockRubberPlankStair; import techreborn.blocks.misc.BlockRubberSapling; import techreborn.config.TechRebornConfig; @@ -107,9 +113,23 @@ public class ModRegistry { RebornRegistry.registerBlock(TRContent.RUBBER_LOG = InitUtils.setup(new BlockRubberLog(), "rubber_log"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_PLANKS = InitUtils.setup(new BlockRubberPlank(), "rubber_planks"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_SAPLING = InitUtils.setup(new BlockRubberSapling(), "rubber_sapling"), itemGroup); - RebornRegistry.registerBlock(TRContent.RUBBER_PLANK_SLAB = InitUtils.setup(new BlockRubberPlankSlab(), "rubber_plank_slab"), itemGroup); + RebornRegistry.registerBlock( + TRContent.RUBBER_PLANK_SLAB = InitUtils + .setup(new SlabBlock(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE) + .strength(2.0F, 15.0F).sounds(BlockSoundGroup.WOOD).build()), "rubber_plank_slab"), + itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_PLANK_STAIR = InitUtils.setup(new BlockRubberPlankStair(), "rubber_plank_stair"), itemGroup); - + RebornRegistry.registerBlock( + TRContent.RUBBER_FENCE = InitUtils + .setup(new FenceBlock(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE) + .strength(2.0F, 15.0F).sounds(BlockSoundGroup.WOOD).build()), "rubber_fence"), + itemGroup); + RebornRegistry.registerBlock( + TRContent.RUBBER_FENCE_GATE = InitUtils + .setup(new FenceGateBlock(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE) + .strength(2.0F, 15.0F).sounds(BlockSoundGroup.WOOD).build()), "rubber_fence_gate"), + itemGroup); + TechReborn.LOGGER.debug("TechReborns Blocks Loaded"); } diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 413419477..ee914b939 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -86,6 +86,8 @@ public class TRContent { public static Block RUBBER_PLANK_STAIR; public static Block RUBBER_PLANKS; public static Block RUBBER_SAPLING; + public static Block RUBBER_FENCE; + public static Block RUBBER_FENCE_GATE; // Armor public static Item CLOAKING_DEVICE; diff --git a/src/main/resources/assets/techreborn/blockstates/rubber_fence.json b/src/main/resources/assets/techreborn/blockstates/rubber_fence.json new file mode 100644 index 000000000..c42e7492c --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/rubber_fence.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "techreborn:block/rubber/rubber_fence_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "techreborn:block/rubber/rubber_fence_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "techreborn:block/rubber/rubber_fence_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "techreborn:block/rubber/rubber_fence_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "techreborn:block/rubber/rubber_fence_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/techreborn/blockstates/rubber_fence_gate.json b/src/main/resources/assets/techreborn/blockstates/rubber_fence_gate.json new file mode 100644 index 000000000..0949e1e24 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/rubber_fence_gate.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "techreborn:block/rubber/rubber_fence_gate", "uvlock": true }, + "facing=west,in_wall=false,open=false": { "model": "techreborn:block/rubber/rubber_fence_gate", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=false": { "model": "techreborn:block/rubber/rubber_fence_gate", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=false": { "model": "techreborn:block/rubber/rubber_fence_gate", "uvlock": true, "y": 270 }, + "facing=south,in_wall=false,open=true": { "model": "techreborn:block/rubber/rubber_fence_gate_open", "uvlock": true }, + "facing=west,in_wall=false,open=true": { "model": "techreborn:block/rubber/rubber_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=true": { "model": "techreborn:block/rubber/rubber_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=true": { "model": "techreborn:block/rubber/rubber_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=false": { "model": "techreborn:block/rubber/rubber_fence_gate_wall", "uvlock": true }, + "facing=west,in_wall=true,open=false": { "model": "techreborn:block/rubber/rubber_fence_gate_wall", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=false": { "model": "techreborn:block/rubber/rubber_fence_gate_wall", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=false": { "model": "techreborn:block/rubber/rubber_fence_gate_wall", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=true": { "model": "techreborn:block/rubber/rubber_fence_gate_wall_open", "uvlock": true }, + "facing=west,in_wall=true,open=true": { "model": "techreborn:block/rubber/rubber_fence_gate_wall_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=true": { "model": "techreborn:block/rubber/rubber_fence_gate_wall_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=true": { "model": "techreborn:block/rubber/rubber_fence_gate_wall_open", "uvlock": true, "y": 270 } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/rubber_leaves.json b/src/main/resources/assets/techreborn/blockstates/rubber_leaves.json index e26f44adf..1575a3a20 100644 --- a/src/main/resources/assets/techreborn/blockstates/rubber_leaves.json +++ b/src/main/resources/assets/techreborn/blockstates/rubber_leaves.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "techreborn:block/rubber_leaves" } + "": { "model": "techreborn:block/rubber/rubber_leaves" } } } diff --git a/src/main/resources/assets/techreborn/blockstates/rubber_log.json b/src/main/resources/assets/techreborn/blockstates/rubber_log.json index 6858501fd..e9869badc 100644 --- a/src/main/resources/assets/techreborn/blockstates/rubber_log.json +++ b/src/main/resources/assets/techreborn/blockstates/rubber_log.json @@ -1,28 +1,28 @@ { "variants": { - "axis=y,facing=east,hassap=false": { "model": "techreborn:block/rubber_log" }, - "axis=z,facing=east,hassap=false": { "model": "techreborn:block/rubber_log", "x": 90 }, - "axis=x,facing=east,hassap=false": { "model": "techreborn:block/rubber_log", "x": 90, "y": 90 }, - "axis=y,facing=south,hassap=false": { "model": "techreborn:block/rubber_log" }, - "axis=z,facing=south,hassap=false": { "model": "techreborn:block/rubber_log", "x": 90 }, - "axis=x,facing=south,hassap=false": { "model": "techreborn:block/rubber_log", "x": 90, "y": 90 }, - "axis=y,facing=west,hassap=false": { "model": "techreborn:block/rubber_log" }, - "axis=z,facing=west,hassap=false": { "model": "techreborn:block/rubber_log", "x": 90 }, - "axis=x,facing=west,hassap=false": { "model": "techreborn:block/rubber_log", "x": 90, "y": 90 }, - "axis=y,facing=north,hassap=false": { "model": "techreborn:block/rubber_log" }, - "axis=z,facing=north,hassap=false": { "model": "techreborn:block/rubber_log", "x": 90 }, - "axis=x,facing=north,hassap=false": { "model": "techreborn:block/rubber_log", "x": 90, "y": 90 }, - "axis=y,facing=east,hassap=true": { "model": "techreborn:block/rubber_log_with_sap", "y": 90 }, - "axis=z,facing=east,hassap=true": { "model": "techreborn:block/rubber_log", "x": 90 }, - "axis=x,facing=east,hassap=true": { "model": "techreborn:block/rubber_log", "x": 90, "y": 90 }, - "axis=y,facing=south,hassap=true": { "model": "techreborn:block/rubber_log_with_sap", "y": 180 }, - "axis=z,facing=south,hassap=true": { "model": "techreborn:block/rubber_log", "x": 90 }, - "axis=x,facing=south,hassap=true": { "model": "techreborn:block/rubber_log", "x": 90, "y": 90 }, - "axis=y,facing=west,hassap=true": { "model": "techreborn:block/rubber_log_with_sap", "y": 270 }, - "axis=z,facing=west,hassap=true": { "model": "techreborn:block/rubber_log", "x": 90 }, - "axis=x,facing=west,hassap=true": { "model": "techreborn:block/rubber_log", "x": 90, "y": 90 }, - "axis=y,facing=north,hassap=true": { "model": "techreborn:block/rubber_log_with_sap" }, - "axis=z,facing=north,hassap=true": { "model": "techreborn:block/rubber_log", "x": 90 }, - "axis=x,facing=north,hassap=true": { "model": "techreborn:block/rubber_log", "x": 90, "y": 90 } + "axis=y,facing=east,hassap=false": { "model": "techreborn:block/rubber/rubber_log" }, + "axis=z,facing=east,hassap=false": { "model": "techreborn:block/rubber/rubber_log", "x": 90 }, + "axis=x,facing=east,hassap=false": { "model": "techreborn:block/rubber/rubber_log", "x": 90, "y": 90 }, + "axis=y,facing=south,hassap=false": { "model": "techreborn:block/rubber/rubber_log" }, + "axis=z,facing=south,hassap=false": { "model": "techreborn:block/rubber/rubber_log", "x": 90 }, + "axis=x,facing=south,hassap=false": { "model": "techreborn:block/rubber/rubber_log", "x": 90, "y": 90 }, + "axis=y,facing=west,hassap=false": { "model": "techreborn:block/rubber/rubber_log" }, + "axis=z,facing=west,hassap=false": { "model": "techreborn:block/rubber/rubber_log", "x": 90 }, + "axis=x,facing=west,hassap=false": { "model": "techreborn:block/rubber/rubber_log", "x": 90, "y": 90 }, + "axis=y,facing=north,hassap=false": { "model": "techreborn:block/rubber/rubber_log" }, + "axis=z,facing=north,hassap=false": { "model": "techreborn:block/rubber/rubber_log", "x": 90 }, + "axis=x,facing=north,hassap=false": { "model": "techreborn:block/rubber/rubber_log", "x": 90, "y": 90 }, + "axis=y,facing=east,hassap=true": { "model": "techreborn:block/rubber/rubber_log_with_sap", "y": 90 }, + "axis=z,facing=east,hassap=true": { "model": "techreborn:block/rubber/rubber_log", "x": 90 }, + "axis=x,facing=east,hassap=true": { "model": "techreborn:block/rubber/rubber_log", "x": 90, "y": 90 }, + "axis=y,facing=south,hassap=true": { "model": "techreborn:block/rubber/rubber_log_with_sap", "y": 180 }, + "axis=z,facing=south,hassap=true": { "model": "techreborn:block/rubber/rubber_log", "x": 90 }, + "axis=x,facing=south,hassap=true": { "model": "techreborn:block/rubber/rubber_log", "x": 90, "y": 90 }, + "axis=y,facing=west,hassap=true": { "model": "techreborn:block/rubber/rubber_log_with_sap", "y": 270 }, + "axis=z,facing=west,hassap=true": { "model": "techreborn:block/rubber/rubber_log", "x": 90 }, + "axis=x,facing=west,hassap=true": { "model": "techreborn:block/rubber/rubber_log", "x": 90, "y": 90 }, + "axis=y,facing=north,hassap=true": { "model": "techreborn:block/rubber/rubber_log_with_sap" }, + "axis=z,facing=north,hassap=true": { "model": "techreborn:block/rubber/rubber_log", "x": 90 }, + "axis=x,facing=north,hassap=true": { "model": "techreborn:block/rubber/rubber_log", "x": 90, "y": 90 } } } diff --git a/src/main/resources/assets/techreborn/blockstates/rubber_plank_slab.json b/src/main/resources/assets/techreborn/blockstates/rubber_plank_slab.json index 5f5015fe2..d08e190d9 100644 --- a/src/main/resources/assets/techreborn/blockstates/rubber_plank_slab.json +++ b/src/main/resources/assets/techreborn/blockstates/rubber_plank_slab.json @@ -1,7 +1,7 @@ { "variants": { - "type=bottom": { "model": "techreborn:block/rubber_plank_slab" }, - "type=top": { "model": "techreborn:block/rubber_plank_slab_top" }, - "type=double": { "model": "techreborn:block/rubber_planks" } + "type=bottom": { "model": "techreborn:block/rubber/rubber_plank_slab" }, + "type=top": { "model": "techreborn:block/rubber/rubber_plank_slab_top" }, + "type=double": { "model": "techreborn:block/rubber/rubber_planks" } } } diff --git a/src/main/resources/assets/techreborn/blockstates/rubber_plank_stair.json b/src/main/resources/assets/techreborn/blockstates/rubber_plank_stair.json index 21e4f24d4..7feabc8c8 100644 --- a/src/main/resources/assets/techreborn/blockstates/rubber_plank_stair.json +++ b/src/main/resources/assets/techreborn/blockstates/rubber_plank_stair.json @@ -1,44 +1,44 @@ { "variants": { - "facing=east,half=bottom,shape=straight": { "model": "techreborn:block/rubber_plank_stair" }, - "facing=west,half=bottom,shape=straight": { "model": "techreborn:block/rubber_plank_stair", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "techreborn:block/rubber_plank_stair", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "techreborn:block/rubber_plank_stair", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber_plank_stair_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber_plank_stair_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber_plank_stair_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber_plank_stair_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber_plank_stair_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber_plank_stair_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber_plank_stair_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber_plank_stair_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber_plank_stair_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber_plank_stair_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber_plank_stair_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber_plank_stair_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber_plank_stair_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber_plank_stair_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber_plank_stair_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber_plank_stair_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "techreborn:block/rubber_plank_stair", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "techreborn:block/rubber_plank_stair", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "techreborn:block/rubber_plank_stair", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "techreborn:block/rubber_plank_stair", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "techreborn:block/rubber_plank_stair_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "techreborn:block/rubber_plank_stair_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "techreborn:block/rubber_plank_stair_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "techreborn:block/rubber_plank_stair_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "techreborn:block/rubber_plank_stair_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "techreborn:block/rubber_plank_stair_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "techreborn:block/rubber_plank_stair_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "techreborn:block/rubber_plank_stair_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "techreborn:block/rubber_plank_stair_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "techreborn:block/rubber_plank_stair_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "techreborn:block/rubber_plank_stair_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "techreborn:block/rubber_plank_stair_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "techreborn:block/rubber_plank_stair_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "techreborn:block/rubber_plank_stair_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "techreborn:block/rubber_plank_stair_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "techreborn:block/rubber_plank_stair_inner", "x": 180, "y": 270, "uvlock": true } + "facing=east,half=bottom,shape=straight": { "model": "techreborn:block/rubber/rubber_plank_stair" }, + "facing=west,half=bottom,shape=straight": { "model": "techreborn:block/rubber/rubber_plank_stair", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "techreborn:block/rubber/rubber_plank_stair", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "techreborn:block/rubber/rubber_plank_stair", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber/rubber_plank_stair_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber/rubber_plank_stair_outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber/rubber_plank_stair_inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber/rubber_plank_stair_inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "techreborn:block/rubber/rubber_plank_stair", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "techreborn:block/rubber/rubber_plank_stair", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "techreborn:block/rubber/rubber_plank_stair", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "techreborn:block/rubber/rubber_plank_stair", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "techreborn:block/rubber/rubber_plank_stair_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "techreborn:block/rubber/rubber_plank_stair_inner", "x": 180, "y": 270, "uvlock": true } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/rubber_planks.json b/src/main/resources/assets/techreborn/blockstates/rubber_planks.json index 3bcdb9d5b..71c8cc1e5 100644 --- a/src/main/resources/assets/techreborn/blockstates/rubber_planks.json +++ b/src/main/resources/assets/techreborn/blockstates/rubber_planks.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "techreborn:block/rubber_planks" } + "": { "model": "techreborn:block/rubber/rubber_planks" } } } diff --git a/src/main/resources/assets/techreborn/blockstates/rubber_sapling.json b/src/main/resources/assets/techreborn/blockstates/rubber_sapling.json index 1ae6ca301..92e1bd297 100644 --- a/src/main/resources/assets/techreborn/blockstates/rubber_sapling.json +++ b/src/main/resources/assets/techreborn/blockstates/rubber_sapling.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "techreborn:block/rubber_sapling" } + "": { "model": "techreborn:block/rubber/rubber_sapling" } } } diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index b0cbab78c..8d627d5e9 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -88,6 +88,8 @@ "block.techreborn.rubber_plank_stair": "Rubber Plank Stair", "block.techreborn.rubber_leaves": "Rubber Leaves", "block.techreborn.rubber_sapling": "Rubber Sapling", + "block.techreborn.rubber_fence": "Rubber Fence", + "block.techreborn.rubber_fence_gate": "Rubber Fence Gate", "block.techreborn.refined_iron_fence": "Iron Fence", "block.techreborn.reinforced_glass": "Reinforced Glass", diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate.json new file mode 100644 index 000000000..b59b9987c --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_open.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_open.json new file mode 100644 index 000000000..17f1da748 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_wall.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_wall.json new file mode 100644 index 000000000..f4549a217 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_wall_open.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_wall_open.json new file mode 100644 index 000000000..230fe3edc --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_inventory.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_inventory.json new file mode 100644 index 000000000..124354d63 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_post.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_post.json new file mode 100644 index 000000000..0f93f9c3e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_side.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_side.json new file mode 100644 index 000000000..717b6d6ac --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_fence_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber_leaves.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_leaves.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/rubber_leaves.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_leaves.json diff --git a/src/main/resources/assets/techreborn/models/block/rubber_log.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_log.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/rubber_log.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_log.json diff --git a/src/main/resources/assets/techreborn/models/block/rubber_log_with_sap.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_log_with_sap.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/rubber_log_with_sap.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_log_with_sap.json diff --git a/src/main/resources/assets/techreborn/models/block/rubber_plank_slab.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_slab.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/rubber_plank_slab.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_slab.json diff --git a/src/main/resources/assets/techreborn/models/block/rubber_plank_slab_top.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_slab_top.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/rubber_plank_slab_top.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_slab_top.json diff --git a/src/main/resources/assets/techreborn/models/block/rubber_plank_stair.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/rubber_plank_stair.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair.json diff --git a/src/main/resources/assets/techreborn/models/block/rubber_plank_stair_inner.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair_inner.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/rubber_plank_stair_inner.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair_inner.json diff --git a/src/main/resources/assets/techreborn/models/block/rubber_plank_stair_outer.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair_outer.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/rubber_plank_stair_outer.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair_outer.json diff --git a/src/main/resources/assets/techreborn/models/block/rubber_planks.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_planks.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/rubber_planks.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_planks.json diff --git a/src/main/resources/assets/techreborn/models/block/rubber_sapling.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_sapling.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/rubber_sapling.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_sapling.json diff --git a/src/main/resources/assets/techreborn/models/item/rubber_fence.json b/src/main/resources/assets/techreborn/models/item/rubber_fence.json new file mode 100644 index 000000000..2bafa3333 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/rubber_fence.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/rubber/rubber_fence_inventory" +} diff --git a/src/main/resources/assets/techreborn/models/item/rubber_fence_gate.json b/src/main/resources/assets/techreborn/models/item/rubber_fence_gate.json new file mode 100644 index 000000000..4026eb852 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/rubber_fence_gate.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/rubber/rubber_fence_gate" +} diff --git a/src/main/resources/assets/techreborn/models/item/rubber_leaves.json b/src/main/resources/assets/techreborn/models/item/rubber_leaves.json index 38f688faf..408cf861e 100644 --- a/src/main/resources/assets/techreborn/models/item/rubber_leaves.json +++ b/src/main/resources/assets/techreborn/models/item/rubber_leaves.json @@ -1,3 +1,3 @@ { - "parent": "techreborn:block/rubber_leaves" + "parent": "techreborn:block/rubber/rubber_leaves" } diff --git a/src/main/resources/assets/techreborn/models/item/rubber_log.json b/src/main/resources/assets/techreborn/models/item/rubber_log.json index deadfacd0..409448ef8 100644 --- a/src/main/resources/assets/techreborn/models/item/rubber_log.json +++ b/src/main/resources/assets/techreborn/models/item/rubber_log.json @@ -1,3 +1,3 @@ { - "parent": "techreborn:block/rubber_log" + "parent": "techreborn:block/rubber/rubber_log" } diff --git a/src/main/resources/assets/techreborn/models/item/rubber_plank_slab.json b/src/main/resources/assets/techreborn/models/item/rubber_plank_slab.json index b946d3f7a..b219a9904 100644 --- a/src/main/resources/assets/techreborn/models/item/rubber_plank_slab.json +++ b/src/main/resources/assets/techreborn/models/item/rubber_plank_slab.json @@ -1,3 +1,3 @@ { - "parent": "techreborn:block/rubber_plank_slab" + "parent": "techreborn:block/rubber/rubber_plank_slab" } diff --git a/src/main/resources/assets/techreborn/models/item/rubber_plank_stair.json b/src/main/resources/assets/techreborn/models/item/rubber_plank_stair.json index c548d0146..8bf8327f2 100644 --- a/src/main/resources/assets/techreborn/models/item/rubber_plank_stair.json +++ b/src/main/resources/assets/techreborn/models/item/rubber_plank_stair.json @@ -1,3 +1,3 @@ { - "parent": "techreborn:block/rubber_plank_stair" + "parent": "techreborn:block/rubber/rubber_plank_stair" } diff --git a/src/main/resources/assets/techreborn/models/item/rubber_planks.json b/src/main/resources/assets/techreborn/models/item/rubber_planks.json index 2f93abece..3992928ec 100644 --- a/src/main/resources/assets/techreborn/models/item/rubber_planks.json +++ b/src/main/resources/assets/techreborn/models/item/rubber_planks.json @@ -1,3 +1,3 @@ { - "parent": "techreborn:block/rubber_planks" + "parent": "techreborn:block/rubber/rubber_planks" } diff --git a/src/main/resources/data/minecraft/tags/blocks/fences.json b/src/main/resources/data/minecraft/tags/blocks/fences.json new file mode 100644 index 000000000..cdadcd5bf --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/fences.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_fence", + "techreborn:refined_iron_fence" + ] +} \ 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 new file mode 100644 index 000000000..88a723351 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_plank_slab" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json b/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json new file mode 100644 index 000000000..feeede5eb --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_fence" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json b/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json new file mode 100644 index 000000000..88a723351 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_plank_slab" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json b/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json new file mode 100644 index 000000000..9e5f0c9f6 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_plank_stair" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/fences.json b/src/main/resources/data/minecraft/tags/items/fences.json new file mode 100644 index 000000000..cdadcd5bf --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/fences.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_fence", + "techreborn:refined_iron_fence" + ] +} \ 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 new file mode 100644 index 000000000..88a723351 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_plank_slab" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_fences.json b/src/main/resources/data/minecraft/tags/items/wooden_fences.json new file mode 100644 index 000000000..feeede5eb --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/wooden_fences.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_fence" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_slabs.json b/src/main/resources/data/minecraft/tags/items/wooden_slabs.json new file mode 100644 index 000000000..88a723351 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/wooden_slabs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_plank_slab" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_stairs.json b/src/main/resources/data/minecraft/tags/items/wooden_stairs.json new file mode 100644 index 000000000..9e5f0c9f6 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/wooden_stairs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "techreborn:rubber_plank_stair" + ] +} \ No newline at end of file