diff --git a/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipesProvider.groovy b/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipesProvider.groovy index dbec1b8c7..4464211a9 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipesProvider.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipesProvider.groovy @@ -67,7 +67,7 @@ class IndustrialSawmillRecipesProvider extends TechRebornRecipesProvider { (Items.SPRUCE_STAIRS): Items.SPRUCE_SLAB, (Items.CRIMSON_STAIRS): Items.CRIMSON_SLAB, (Items.WARPED_STAIRS): Items.WARPED_SLAB, - (TRContent.RUBBER_PLANK_STAIR): TRContent.RUBBER_PLANK_SLAB + (TRContent.RUBBER_STAIR): TRContent.RUBBER_SLAB ].each { stairs, slab -> offerIndustrialSawmillRecipe { ingredients stairs @@ -88,7 +88,7 @@ class IndustrialSawmillRecipesProvider extends TechRebornRecipesProvider { (Items.SPRUCE_SLAB): Items.SPRUCE_PRESSURE_PLATE, (Items.CRIMSON_SLAB): Items.CRIMSON_PRESSURE_PLATE, (Items.WARPED_SLAB): Items.WARPED_PRESSURE_PLATE, - (TRContent.RUBBER_PLANK_SLAB): TRContent.RUBBER_PRESSURE_PLATE + (TRContent.RUBBER_SLAB): TRContent.RUBBER_PRESSURE_PLATE ].each { slab, plate -> offerIndustrialSawmillRecipe { ingredients slab diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index dd4db1ea6..3396bec9a 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -99,10 +99,10 @@ public class ModRegistry { RebornRegistry.registerBlock(TRContent.STRIPPED_RUBBER_WOOD = InitUtils.setup(new PillarBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "stripped_rubber_wood"), 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 SlabBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_plank_slab"), itemGroup); + RebornRegistry.registerBlock(TRContent.RUBBER_SLAB = InitUtils.setup(new SlabBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_slab"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_FENCE = InitUtils.setup(new FenceBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_fence"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_FENCE_GATE = InitUtils.setup(new FenceGateBlock(InitUtils.setupRubberBlockSettings(2.0F, 15.0F)), "rubber_fence_gate"), itemGroup); - RebornRegistry.registerBlock(TRContent.RUBBER_PLANK_STAIR = InitUtils.setup(new BlockRubberPlankStair(), "rubber_plank_stair"), itemGroup); + RebornRegistry.registerBlock(TRContent.RUBBER_STAIR = InitUtils.setup(new BlockRubberPlankStair(), "rubber_stair"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_TRAPDOOR = InitUtils.setup(new RubberTrapdoorBlock(), "rubber_trapdoor"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_BUTTON = InitUtils.setup(new RubberButtonBlock(), "rubber_button"), itemGroup); RebornRegistry.registerBlock(TRContent.RUBBER_PRESSURE_PLATE = InitUtils.setup(new RubberPressurePlateBlock(), "rubber_pressure_plate"), itemGroup); diff --git a/src/main/java/techreborn/init/FuelRecipes.java b/src/main/java/techreborn/init/FuelRecipes.java index a3cc1c345..a9d93d82b 100644 --- a/src/main/java/techreborn/init/FuelRecipes.java +++ b/src/main/java/techreborn/init/FuelRecipes.java @@ -40,10 +40,10 @@ public class FuelRecipes { registry.add(TRContent.RUBBER_WOOD, 300); registry.add(TRContent.STRIPPED_RUBBER_WOOD, 300); registry.add(TRContent.RUBBER_PLANKS, 300); - registry.add(TRContent.RUBBER_PLANK_SLAB, 150); + registry.add(TRContent.RUBBER_SLAB, 150); registry.add(TRContent.RUBBER_FENCE, 300); registry.add(TRContent.RUBBER_FENCE_GATE, 300); - registry.add(TRContent.RUBBER_PLANK_STAIR, 300); + registry.add(TRContent.RUBBER_STAIR, 300); registry.add(TRContent.RUBBER_TRAPDOOR, 300); registry.add(TRContent.RUBBER_PRESSURE_PLATE, 300); registry.add(TRContent.RUBBER_DOOR, 200); diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 481fd41f1..9239ef254 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -110,8 +110,8 @@ public class TRContent { public static Block RUBBER_LEAVES; public static Block RUBBER_LOG; public static TagKey RUBBER_LOGS = TagKey.of(Registry.ITEM_KEY, new Identifier(TechReborn.MOD_ID, "rubber_logs")); - public static Block RUBBER_PLANK_SLAB; - public static Block RUBBER_PLANK_STAIR; + public static Block RUBBER_SLAB; + public static Block RUBBER_STAIR; public static Block RUBBER_PLANKS; public static Block RUBBER_SAPLING; public static Block RUBBER_FENCE; diff --git a/src/main/resources/assets/techreborn/blockstates/rubber_plank_stair.json b/src/main/resources/assets/techreborn/blockstates/rubber_plank_stair.json deleted file mode 100644 index 7feabc8c8..000000000 --- a/src/main/resources/assets/techreborn/blockstates/rubber_plank_stair.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "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_plank_slab.json b/src/main/resources/assets/techreborn/blockstates/rubber_slab.json similarity index 62% rename from src/main/resources/assets/techreborn/blockstates/rubber_plank_slab.json rename to src/main/resources/assets/techreborn/blockstates/rubber_slab.json index d08e190d9..d1c02e8fe 100644 --- a/src/main/resources/assets/techreborn/blockstates/rubber_plank_slab.json +++ b/src/main/resources/assets/techreborn/blockstates/rubber_slab.json @@ -1,7 +1,7 @@ { "variants": { - "type=bottom": { "model": "techreborn:block/rubber/rubber_plank_slab" }, - "type=top": { "model": "techreborn:block/rubber/rubber_plank_slab_top" }, + "type=bottom": { "model": "techreborn:block/rubber/rubber_slab" }, + "type=top": { "model": "techreborn:block/rubber/rubber_slab_top" }, "type=double": { "model": "techreborn:block/rubber/rubber_planks" } } } diff --git a/src/main/resources/assets/techreborn/blockstates/rubber_stair.json b/src/main/resources/assets/techreborn/blockstates/rubber_stair.json new file mode 100644 index 000000000..00f7082d6 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/rubber_stair.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "techreborn:block/rubber/rubber_stair" }, + "facing=west,half=bottom,shape=straight": { "model": "techreborn:block/rubber/rubber_stair", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "techreborn:block/rubber/rubber_stair", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "techreborn:block/rubber/rubber_stair", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber/rubber_stair_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber/rubber_stair_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber/rubber_stair_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "techreborn:block/rubber/rubber_stair_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber/rubber_stair_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber/rubber_stair_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber/rubber_stair_outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "techreborn:block/rubber/rubber_stair_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber/rubber_stair_inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber/rubber_stair_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber/rubber_stair_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "techreborn:block/rubber/rubber_stair_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber/rubber_stair_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber/rubber_stair_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber/rubber_stair_inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "techreborn:block/rubber/rubber_stair_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "techreborn:block/rubber/rubber_stair", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "techreborn:block/rubber/rubber_stair", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "techreborn:block/rubber/rubber_stair", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "techreborn:block/rubber/rubber_stair", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "techreborn:block/rubber/rubber_stair_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "techreborn:block/rubber/rubber_stair_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "techreborn:block/rubber/rubber_stair_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "techreborn:block/rubber/rubber_stair_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "techreborn:block/rubber/rubber_stair_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "techreborn:block/rubber/rubber_stair_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "techreborn:block/rubber/rubber_stair_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "techreborn:block/rubber/rubber_stair_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "techreborn:block/rubber/rubber_stair_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "techreborn:block/rubber/rubber_stair_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "techreborn:block/rubber/rubber_stair_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "techreborn:block/rubber/rubber_stair_inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "techreborn:block/rubber/rubber_stair_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "techreborn:block/rubber/rubber_stair_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "techreborn:block/rubber/rubber_stair_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "techreborn:block/rubber/rubber_stair_inner", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index 5c8fad24a..ccbd056a2 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -101,8 +101,8 @@ "block.techreborn.rubber_wood": "Rubber Wood", "block.techreborn.stripped_rubber_wood": "Stripped Rubber Wood", "block.techreborn.rubber_planks": "Rubber Planks", - "block.techreborn.rubber_plank_slab": "Rubber Slab", - "block.techreborn.rubber_plank_stair": "Rubber Stairs", + "block.techreborn.rubber_slab": "Rubber Slab", + "block.techreborn.rubber_stair": "Rubber Stairs", "block.techreborn.rubber_leaves": "Rubber Leaves", "block.techreborn.rubber_sapling": "Rubber Sapling", "block.techreborn.potted_rubber_sapling": "Potted Rubber Sapling", diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_slab.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_slab.json similarity index 96% rename from src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_slab.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_slab.json index b635f204a..411399454 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_slab.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_slab.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "techreborn:block/rubber_planks", - "top": "techreborn:block/rubber_planks", - "side": "techreborn:block/rubber_planks" - } -} +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "techreborn:block/rubber_planks", + "top": "techreborn:block/rubber_planks", + "side": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_slab_top.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_slab_top.json similarity index 96% rename from src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_slab_top.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_slab_top.json index 9a3a53c2b..89ba0ae79 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_slab_top.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_slab_top.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "techreborn:block/rubber_planks", - "top": "techreborn:block/rubber_planks", - "side": "techreborn:block/rubber_planks" - } -} +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "techreborn:block/rubber_planks", + "top": "techreborn:block/rubber_planks", + "side": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_stair.json similarity index 96% rename from src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_stair.json index a65977dcb..0b8aa5d38 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_stair.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "techreborn:block/rubber_planks", - "top": "techreborn:block/rubber_planks", - "side": "techreborn:block/rubber_planks" - } -} +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "techreborn:block/rubber_planks", + "top": "techreborn:block/rubber_planks", + "side": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair_inner.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_stair_inner.json similarity index 96% rename from src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair_inner.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_stair_inner.json index ac05ab2ca..453af311b 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair_inner.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_stair_inner.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "techreborn:block/rubber_planks", - "top": "techreborn:block/rubber_planks", - "side": "techreborn:block/rubber_planks" - } -} +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "techreborn:block/rubber_planks", + "top": "techreborn:block/rubber_planks", + "side": "techreborn:block/rubber_planks" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair_outer.json b/src/main/resources/assets/techreborn/models/block/rubber/rubber_stair_outer.json similarity index 96% rename from src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair_outer.json rename to src/main/resources/assets/techreborn/models/block/rubber/rubber_stair_outer.json index 7f4196e9c..e73419d16 100644 --- a/src/main/resources/assets/techreborn/models/block/rubber/rubber_plank_stair_outer.json +++ b/src/main/resources/assets/techreborn/models/block/rubber/rubber_stair_outer.json @@ -1,8 +1,8 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "techreborn:block/rubber_planks", - "top": "techreborn:block/rubber_planks", - "side": "techreborn:block/rubber_planks" - } -} +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "techreborn:block/rubber_planks", + "top": "techreborn:block/rubber_planks", + "side": "techreborn:block/rubber_planks" + } +} 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 deleted file mode 100644 index b219a9904..000000000 --- a/src/main/resources/assets/techreborn/models/item/rubber_plank_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 deleted file mode 100644 index 8bf8327f2..000000000 --- a/src/main/resources/assets/techreborn/models/item/rubber_plank_stair.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "techreborn:block/rubber/rubber_plank_stair" -} diff --git a/src/main/resources/assets/techreborn/models/item/rubber_slab.json b/src/main/resources/assets/techreborn/models/item/rubber_slab.json new file mode 100644 index 000000000..918b6e4e0 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/rubber_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/rubber/rubber_slab" +} diff --git a/src/main/resources/assets/techreborn/models/item/rubber_stair.json b/src/main/resources/assets/techreborn/models/item/rubber_stair.json new file mode 100644 index 000000000..b0d2ca6f8 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/rubber_stair.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/rubber/rubber_stair" +} diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index a1c7a199e..b605726f4 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "techreborn:rubber_plank_slab", + "techreborn:rubber_slab", "techreborn:advanced_alloy_storage_block_slab", "techreborn:aluminum_storage_block_slab", "techreborn:brass_storage_block_slab", diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index bde44ea01..623470fae 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "techreborn:rubber_plank_stair", + "techreborn:rubber_stair", "techreborn:advanced_alloy_storage_block_stairs", "techreborn:aluminum_storage_block_stairs", "techreborn:brass_storage_block_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json b/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json index 88a723351..39f8a9c3b 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "techreborn:rubber_plank_slab" + "techreborn:rubber_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 index 9e5f0c9f6..8acb8967a 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "techreborn:rubber_plank_stair" + "techreborn:rubber_stair" ] } \ 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 88a723351..39f8a9c3b 100644 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "techreborn:rubber_plank_slab" + "techreborn:rubber_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 9e5f0c9f6..8acb8967a 100644 --- a/src/main/resources/data/minecraft/tags/items/stairs.json +++ b/src/main/resources/data/minecraft/tags/items/stairs.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "techreborn:rubber_plank_stair" + "techreborn:rubber_stair" ] } \ 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 index 88a723351..39f8a9c3b 100644 --- a/src/main/resources/data/minecraft/tags/items/wooden_slabs.json +++ b/src/main/resources/data/minecraft/tags/items/wooden_slabs.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "techreborn:rubber_plank_slab" + "techreborn:rubber_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 index 9e5f0c9f6..8acb8967a 100644 --- a/src/main/resources/data/minecraft/tags/items/wooden_stairs.json +++ b/src/main/resources/data/minecraft/tags/items/wooden_stairs.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "techreborn:rubber_plank_stair" + "techreborn:rubber_stair" ] } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_plank_slab.json b/src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_slab.json similarity index 76% rename from src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_plank_slab.json rename to src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_slab.json index dffd8692c..2a57a0fae 100644 --- a/src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_plank_slab.json +++ b/src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_slab.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "techreborn:crafting_table/misc_block/rubber_plank_slab" + "techreborn:crafting_table/misc_block/rubber_slab" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "techreborn:crafting_table/misc_block/rubber_plank_slab" + "recipe": "techreborn:crafting_table/misc_block/rubber_slab" } } }, diff --git a/src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_plank_stair.json b/src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_stair.json similarity index 76% rename from src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_plank_stair.json rename to src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_stair.json index 8cc002c53..de1a048a6 100644 --- a/src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_plank_stair.json +++ b/src/main/resources/data/techreborn/advancements/recipes/crafting_table/misc_block/rubber_stair.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "techreborn:crafting_table/misc_block/rubber_plank_stair" + "techreborn:crafting_table/misc_block/rubber_stair" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "techreborn:crafting_table/misc_block/rubber_plank_stair" + "recipe": "techreborn:crafting_table/misc_block/rubber_stair" } } }, diff --git a/src/main/resources/data/techreborn/loot_tables/blocks/rubber_plank_slab.json b/src/main/resources/data/techreborn/loot_tables/blocks/rubber_slab.json similarity index 84% rename from src/main/resources/data/techreborn/loot_tables/blocks/rubber_plank_slab.json rename to src/main/resources/data/techreborn/loot_tables/blocks/rubber_slab.json index 50986d6ef..e81b3d7e5 100644 --- a/src/main/resources/data/techreborn/loot_tables/blocks/rubber_plank_slab.json +++ b/src/main/resources/data/techreborn/loot_tables/blocks/rubber_slab.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "techreborn:rubber_plank_slab" + "name": "techreborn:rubber_slab" } ], "conditions": [ diff --git a/src/main/resources/data/techreborn/loot_tables/blocks/rubber_plank_stair.json b/src/main/resources/data/techreborn/loot_tables/blocks/rubber_stair.json similarity index 84% rename from src/main/resources/data/techreborn/loot_tables/blocks/rubber_plank_stair.json rename to src/main/resources/data/techreborn/loot_tables/blocks/rubber_stair.json index 0985ce067..ab5994f45 100644 --- a/src/main/resources/data/techreborn/loot_tables/blocks/rubber_plank_stair.json +++ b/src/main/resources/data/techreborn/loot_tables/blocks/rubber_stair.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "techreborn:rubber_plank_stair" + "name": "techreborn:rubber_stair" } ], "conditions": [ diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_plank_slab.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_slab.json similarity index 80% rename from src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_plank_slab.json rename to src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_slab.json index 67ffaa689..3abdf8865 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_plank_slab.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "techreborn:rubber_plank_slab", + "item": "techreborn:rubber_slab", "count": 6 } } \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_plank_stair.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_stair.json similarity index 81% rename from src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_plank_stair.json rename to src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_stair.json index f66d40521..5b67a45d7 100644 --- a/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_plank_stair.json +++ b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_stair.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "techreborn:rubber_plank_stair", + "item": "techreborn:rubber_stair", "count": 4 } } \ No newline at end of file