From 007e8714fa7a9eb1f085e467bd3e0e2b93dab272 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 12 Jun 2017 10:47:38 +0100 Subject: [PATCH] Improvements to cables. --- src/main/java/techreborn/init/ModBlocks.java | 6 ++++- .../techreborn/itemblocks/ItemBlockCable.java | 27 +++++++++++++++++++ .../assets/techreborn/blockstates/cable.json | 5 ++-- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 src/main/java/techreborn/itemblocks/ItemBlockCable.java diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 589534393..08f062060 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -47,6 +47,7 @@ import techreborn.blocks.transformers.BlockHVTransformer; import techreborn.blocks.transformers.BlockLVTransformer; import techreborn.blocks.transformers.BlockMVTransformer; import techreborn.itemblocks.*; +import techreborn.parts.powerCables.EnumCableType; import techreborn.tiles.*; import techreborn.tiles.cable.TileCable; import techreborn.tiles.fusionReactor.TileEntityFusionController; @@ -210,9 +211,12 @@ public class ModBlocks { GameRegistry.registerTileEntity(TilePlayerDectector.class, "TilePlayerDectectorTR"); CABLE = new BlockCable(); - registerBlock(CABLE,"cable"); + registerBlock(CABLE, ItemBlockCable.class, "cable"); GameRegistry.registerTileEntity(TileCable.class, "TileCableTR"); Core.proxy.registerCustomBlockStateLocation(CABLE, "cable"); + for (EnumCableType cableType : EnumCableType.values()) { + Core.proxy.registerSubBlockInventoryLocation(CABLE, cableType.ordinal(), "techreborn:cable", "inventory");//"type=" + cableType.getName().toLowerCase()); + } MACHINE_CASINGS = new BlockMachineCasing(Material.ROCK); registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machinecasing"); diff --git a/src/main/java/techreborn/itemblocks/ItemBlockCable.java b/src/main/java/techreborn/itemblocks/ItemBlockCable.java new file mode 100644 index 000000000..2407390ce --- /dev/null +++ b/src/main/java/techreborn/itemblocks/ItemBlockCable.java @@ -0,0 +1,27 @@ +package techreborn.itemblocks; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import techreborn.parts.powerCables.EnumCableType; + +/** + * Created by modmuss50 on 12/06/2017. + */ +public class ItemBlockCable extends ItemBlock { + + public ItemBlockCable(Block block) { + super(block); + } + + public int getMetadata(int damage) + { + return damage; + } + + + public String getUnlocalizedName(ItemStack stack) + { + return super.getUnlocalizedName() + "." + EnumCableType.values()[stack.getItemDamage()].getName(); + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/cable.json b/src/main/resources/assets/techreborn/blockstates/cable.json index b1aebb696..e988eb310 100644 --- a/src/main/resources/assets/techreborn/blockstates/cable.json +++ b/src/main/resources/assets/techreborn/blockstates/cable.json @@ -4,8 +4,8 @@ "transform": "forge:default-block", "model": "techreborn:cable_thin", "textures": { - "cable": "techreborn:block/cable", - "particle": "#cable" + "cable": "techreborn:block/blocks/cables/copper_cable", + "particle": "techreborn:block/blocks/cables/copper_cable" } }, "variants": { @@ -14,6 +14,7 @@ "transform": "forge:default-block", "model": "techreborn:cable", "textures": { + "cable": "techreborn:blocks/cables/copper_cable" } } ],