Rename rubber slab and stair. Fixes #2834

This commit is contained in:
modmuss50 2022-05-21 19:38:23 +01:00
parent 23375b5cd3
commit 5a0d017cd0
31 changed files with 118 additions and 118 deletions

View file

@ -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

View file

@ -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);

View file

@ -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);

View file

@ -110,8 +110,8 @@ public class TRContent {
public static Block RUBBER_LEAVES;
public static Block RUBBER_LOG;
public static TagKey<Item> 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;

View file

@ -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 }
}
}

View file

@ -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" }
}
}

View file

@ -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 }
}
}

View file

@ -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",

View file

@ -1,3 +0,0 @@
{
"parent": "techreborn:block/rubber/rubber_plank_slab"
}

View file

@ -1,3 +0,0 @@
{
"parent": "techreborn:block/rubber/rubber_plank_stair"
}

View file

@ -0,0 +1,3 @@
{
"parent": "techreborn:block/rubber/rubber_slab"
}

View file

@ -0,0 +1,3 @@
{
"parent": "techreborn:block/rubber/rubber_stair"
}

View file

@ -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",

View file

@ -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",

View file

@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"techreborn:rubber_plank_slab"
"techreborn:rubber_slab"
]
}

View file

@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"techreborn:rubber_plank_stair"
"techreborn:rubber_stair"
]
}

View file

@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"techreborn:rubber_plank_slab"
"techreborn:rubber_slab"
]
}

View file

@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"techreborn:rubber_plank_stair"
"techreborn:rubber_stair"
]
}

View file

@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"techreborn:rubber_plank_slab"
"techreborn:rubber_slab"
]
}

View file

@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"techreborn:rubber_plank_stair"
"techreborn:rubber_stair"
]
}

View file

@ -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"
}
}
},

View file

@ -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"
}
}
},

View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "techreborn:rubber_plank_slab"
"name": "techreborn:rubber_slab"
}
],
"conditions": [

View file

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "techreborn:rubber_plank_stair"
"name": "techreborn:rubber_stair"
}
],
"conditions": [

View file

@ -9,7 +9,7 @@
}
},
"result": {
"item": "techreborn:rubber_plank_slab",
"item": "techreborn:rubber_slab",
"count": 6
}
}

View file

@ -11,7 +11,7 @@
}
},
"result": {
"item": "techreborn:rubber_plank_stair",
"item": "techreborn:rubber_stair",
"count": 4
}
}