diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 0f0bc3db..fa8aa6f1 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -88,6 +88,10 @@ block.brick.slime.name=Slime Brick block.brick.blueslime.name=Slime Brick block.brick.endstone.name=Endstone Brick block.brick.obsidian.ingot.name=Obsidian Brick +block.brick.alumite.name=Alumite Brick +block.brick.ardite.name=Ardite Brick +block.brick.cobalt.name=Cobalt Brick +block.brick.manyullyn.name=Manyullyn Brick block.fancybrick.obsidian.name=Fancy Obsidian Brick block.fancybrick.sandstone.name=Fancy Sandstone Brick @@ -105,6 +109,10 @@ block.fancybrick.endstone.name=Fancy Endstone Brick block.fancybrick.obsidian.ingot.name=Fancy Obsidian Brick block.fancybrick.stone.road.name=Stone Road block.fancybrick.stone.name=Fancy Stone Brick +block.fancybrick.alumite.name=Fancy Alumite Brick +block.fancybrick.ardite.name=Fancy Ardite Brick +block.fancybrick.cobalt.name=Fancy Cobalt Brick +block.fancybrick.manyullyn.name=Fancy Manyullyn Brick tile.rail.wood.name=Wooden Rail diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index fba0ad2a..12e996a3 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -122,6 +122,7 @@ public class TinkerTools public static Block craftedSoil; //TODO: Untwine this public static Block multiBrick; public static Block multiBrickFancy; + public static Block multiBrickMetal; // Tool modifiers public static ModFlux modFlux; public static ModLapis modLapis; @@ -593,6 +594,19 @@ public class TinkerTools chiseling.addDetailing(TinkerSmeltery.smeltery, 8, TinkerSmeltery.smeltery, 9, TinkerTools.chisel); chiseling.addDetailing(TinkerSmeltery.smeltery, 9, TinkerSmeltery.smeltery, 10, TinkerTools.chisel); } + + if(TinkerWorld.metalBlock != null) { + // metal bricks + chiseling.addDetailing(TinkerWorld.metalBlock, 8, TinkerTools.multiBrickMetal, 0, TinkerTools.chisel); + chiseling.addDetailing(TinkerWorld.metalBlock, 1, TinkerTools.multiBrickMetal, 1, TinkerTools.chisel); + chiseling.addDetailing(TinkerWorld.metalBlock, 0, TinkerTools.multiBrickMetal, 2, TinkerTools.chisel); + chiseling.addDetailing(TinkerWorld.metalBlock, 2, TinkerTools.multiBrickMetal, 3, TinkerTools.chisel); + // fancy metal bricks + chiseling.addDetailing(TinkerTools.multiBrickMetal, 0, TinkerTools.multiBrickMetal, 4, TinkerTools.chisel); + chiseling.addDetailing(TinkerTools.multiBrickMetal, 1, TinkerTools.multiBrickMetal, 5, TinkerTools.chisel); + chiseling.addDetailing(TinkerTools.multiBrickMetal, 2, TinkerTools.multiBrickMetal, 6, TinkerTools.chisel); + chiseling.addDetailing(TinkerTools.multiBrickMetal, 3, TinkerTools.multiBrickMetal, 7, TinkerTools.chisel); + } } public void vanillaToolRecipes () diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java b/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java new file mode 100644 index 00000000..df7ae4b7 --- /dev/null +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java @@ -0,0 +1,31 @@ +package tconstruct.tools.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; +import tconstruct.blocks.TConstructBlock; + +public class MultiBrickMetal extends TConstructBlock { + static String blockTextures[] = { "brick_alumite", "brick_ardite", "brick_cobalt", "brick_manyullyn", "fancybrick_alumite", "fancybrick_ardite", "fancybrick_cobalt", "fancybrick_manyullyn"}; + + public MultiBrickMetal() + { + super(Material.iron, 10f, blockTextures); + this.setStepSound(Block.soundTypeMetal); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons (IIconRegister iconRegister) + { + this.icons = new IIcon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.registerIcon("tinker:bricks/" + textureNames[i]); + } + } +} diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java new file mode 100644 index 00000000..e673d38d --- /dev/null +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java @@ -0,0 +1,15 @@ +package tconstruct.tools.itemblocks; + +import mantle.blocks.abstracts.MultiItemBlock; +import net.minecraft.block.Block; + +public class MultiBrickMetalItem extends MultiItemBlock { + static String blockTypes[] = { "brick.alumite", "brick.ardite", "brick.cobalt", "brick.manyullyn", "fancybrick.alumite", "fancybrick.ardite", "fancybrick.cobalt", "fancybrick.manyullyn" }; + + public MultiBrickMetalItem(Block b) + { + super(b, "block", blockTypes); + setMaxDamage(0); + setHasSubtypes(true); + } +} diff --git a/src/main/java/tconstruct/world/TinkerWorld.java b/src/main/java/tconstruct/world/TinkerWorld.java index 1ac86f5a..9454ba24 100644 --- a/src/main/java/tconstruct/world/TinkerWorld.java +++ b/src/main/java/tconstruct/world/TinkerWorld.java @@ -135,6 +135,7 @@ public class TinkerWorld TinkerWorld.stoneLadder = new StoneLadder().setBlockName("decoration.stoneladder"); TinkerTools.multiBrick = new MultiBrick().setBlockName("Decoration.Brick"); TinkerTools.multiBrickFancy = new MultiBrickFancy().setBlockName("Decoration.BrickFancy"); + TinkerTools.multiBrickMetal = new MultiBrickMetal().setBlockName("Decoration.BrickMetal"); // Ores String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" }; @@ -195,6 +196,7 @@ public class TinkerWorld GameRegistry.registerBlock(TinkerWorld.stoneLadder, "decoration.stoneladder"); GameRegistry.registerBlock(TinkerTools.multiBrick, MultiBrickItem.class, "decoration.multibrick"); GameRegistry.registerBlock(TinkerTools.multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy"); + GameRegistry.registerBlock(TinkerTools.multiBrickMetal, MultiBrickMetalItem.class, "decoration.multibrickmetal"); // Ores GameRegistry.registerBlock(TinkerWorld.oreBerry, OreberryBushItem.class, "ore.berries.one");