From d2db53f6f2a8bf488358d46c8bba267b68939000 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 13 Mar 2019 14:57:49 +0300 Subject: [PATCH] More rubber stuff --- .../blocks/BlockRubberPlankSlab.java | 4 +--- .../events/RegistryEventHandler.java | 2 +- src/main/java/techreborn/init/TRContent.java | 2 +- .../blockstates/rubber_plank_slab.json | 24 ++++--------------- .../models/block/rubber_plank_slab.json | 8 +++++++ .../models/block/rubber_plank_slab_top.json | 8 +++++++ .../models/item/rubber_plank_slab.json | 3 +++ 7 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 src/main/resources/assets/techreborn/models/block/rubber_plank_slab.json create mode 100644 src/main/resources/assets/techreborn/models/block/rubber_plank_slab_top.json create mode 100644 src/main/resources/assets/techreborn/models/item/rubber_plank_slab.json diff --git a/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java b/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java index 921b8de49..8ecf9c2d4 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java @@ -34,11 +34,9 @@ import reborncore.client.models.RebornModelRegistry; import techreborn.TechReborn; public class BlockRubberPlankSlab extends BlockSlab { - public final String name; - public BlockRubberPlankSlab(String name) { + public BlockRubberPlankSlab() { super(Block.Properties.create(Material.WOOD, MaterialColor.OBSIDIAN).hardnessAndResistance(2.0F, 15.0F).sound(SoundType.WOOD)); - this.name = name; RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); } } diff --git a/src/main/java/techreborn/events/RegistryEventHandler.java b/src/main/java/techreborn/events/RegistryEventHandler.java index 343d54dd4..c05026ffe 100644 --- a/src/main/java/techreborn/events/RegistryEventHandler.java +++ b/src/main/java/techreborn/events/RegistryEventHandler.java @@ -108,7 +108,7 @@ public class RegistryEventHandler { RebornRegistry.registerBlock(TRContent.RUBBER_SAPLING = InitUtils.setup(new BlockRubberSapling(), "rubber_sapling"), ItemBlockRubberSapling.class, "rubber_sapling"); - RebornRegistry.registerBlockNoItem(TRContent.RUBBER_LOG_SLAB = InitUtils.setup(new BlockRubberPlankSlab("rubber_plank"), "rubber_plank_slab")); + RebornRegistry.registerBlock(TRContent.RUBBER_PLANK_SLAB = InitUtils.setup(new BlockRubberPlankSlab(), "rubber_plank_slab"), new Item.Properties().group(TechReborn.ITEMGROUP)); RebornRegistry.registerBlock(TRContent.RUBBER_PLANK_STAIR = InitUtils.setup(new BlockRubberPlankStair(), "rubber_plank_stair"), new Item.Properties().group(TechReborn.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 bc0cf4e46..e41af2e82 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -67,7 +67,7 @@ public class TRContent { public static Block REINFORCED_GLASS; public static Block RUBBER_LEAVES; public static Block RUBBER_LOG; - public static Block RUBBER_LOG_SLAB; + public static Block RUBBER_PLANK_SLAB; public static Block RUBBER_PLANK_STAIR; public static Block RUBBER_PLANKS; public static Block RUBBER_SAPLING; 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 99c03d14b..5f5015fe2 100644 --- a/src/main/resources/assets/techreborn/blockstates/rubber_plank_slab.json +++ b/src/main/resources/assets/techreborn/blockstates/rubber_plank_slab.json @@ -1,21 +1,7 @@ { - "forge_marker": 1, - "defaults": { - "model": "half_slab", - "textures": { - "top": "techreborn:blocks/rubber_planks", - "bottom": "techreborn:blocks/rubber_planks", - "side": "techreborn:blocks/rubber_planks" + "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" } } - }, - "variants": { - "inventory": { "transform": "forge:default-block" }, - "half": { - "top": { "model": "upper_slab" }, - "bottom": { "model": "half_slab" } - }, - "variant": { - "default": {} - } - } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/techreborn/models/block/rubber_plank_slab.json b/src/main/resources/assets/techreborn/models/block/rubber_plank_slab.json new file mode 100644 index 000000000..b635f204a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/rubber_plank_slab.json @@ -0,0 +1,8 @@ +{ + "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_plank_slab_top.json b/src/main/resources/assets/techreborn/models/block/rubber_plank_slab_top.json new file mode 100644 index 000000000..9a3a53c2b --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/rubber_plank_slab_top.json @@ -0,0 +1,8 @@ +{ + "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/item/rubber_plank_slab.json b/src/main/resources/assets/techreborn/models/item/rubber_plank_slab.json new file mode 100644 index 000000000..b946d3f7a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/rubber_plank_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/rubber_plank_slab" +}