diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 48c0e5e1..8653e9d6 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -238,6 +238,7 @@ StorageMetals.Steel.name=Block of Steel StorageMetals.Ender.name=Block of Solid Ender tile.decoration.stonetorch.name=Torch +tile.decoration.stoneladder.name=Ladder tile.CraftingStation.name=Crafting Station block.glass.pure.name=Clear Glass diff --git a/resources/assets/tinker/textures/blocks/ladder.png b/resources/assets/tinker/textures/blocks/ladder_stone.png similarity index 100% rename from resources/assets/tinker/textures/blocks/ladder.png rename to resources/assets/tinker/textures/blocks/ladder_stone.png diff --git a/src/tconstruct/blocks/StoneLadder.java b/src/tconstruct/blocks/StoneLadder.java new file mode 100644 index 00000000..fe31026f --- /dev/null +++ b/src/tconstruct/blocks/StoneLadder.java @@ -0,0 +1,36 @@ +package tconstruct.blocks; + +import net.minecraft.block.BlockLadder; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.util.Icon; + +public class StoneLadder extends BlockLadder { + + // Override ladder material + public final Material blockMaterial = Material.rock; + + private Icon icon; + + // Use the normally protected constructor + public StoneLadder(int id) + { + super(id); + this.setUnlocalizedName("decoration.stoneladder"); + this.setCreativeTab(CreativeTabs.tabDecorations); + } + + @Override + public void registerIcons(IconRegister register) + { + icon = register.registerIcon("tinker:ladder_stone"); + } + + @Override + public Icon getIcon(int meta, int side) + { + return icon; + } + +} diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index bebcd075..75e37a26 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -140,6 +140,7 @@ public class TContent implements IFuelHandler //Decoration public static Block stoneTorch; + public static Block stoneLadder; public static Block multiBrick; public static Block multiBrickFancy; @@ -707,6 +708,8 @@ public class TContent implements IFuelHandler //Decoration stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch"); GameRegistry.registerBlock(stoneTorch, "decoration.stonetorch"); + stoneLadder = new StoneLadder(PHConstruct.stoneLadder).setUnlocalizedName("decoration.stoneladder"); + GameRegistry.registerBlock(stoneLadder, "decoration.stoneladder"); multiBrick = new MultiBrick(PHConstruct.multiBrick).setUnlocalizedName("Decoration.Brick"); GameRegistry.registerBlock(multiBrick, MultiBrickItem.class, "decoration.multibrick"); diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index e40de758..7f054c50 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -88,6 +88,7 @@ public class PHConstruct multiBrick = config.getBlock("Multi Brick", 1481).getInt(1481); stoneTorch = config.getBlock("Stone Torch", 1484).getInt(1484); + stoneLadder = config.getBlock("Stone Ladder", 1479).getInt(1479); oreBerry = config.getBlock("Ore Berry One", 1485).getInt(1485); oreBerrySecond = config.getBlock("Ore Berry Two", 1486).getInt(1486); @@ -473,6 +474,7 @@ public class PHConstruct //Decoration public static int stoneTorch; + public static int stoneLadder; public static int multiBrick; public static int multiBrickFancy; public static int redstoneBallRepeater;