From e42ab62e2aa3a2329165fc3da4cb2cbdfa8490ba Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Sun, 1 Dec 2013 21:58:35 -0500 Subject: [PATCH] Begin work on copper and tin ore and ingots :) --- common/mekanism/common/block/BlockOre.java | 14 +++++++------- common/mekanism/common/item/ItemBlockOre.java | 8 ++++++++ common/mekanism/common/item/ItemIngot.java | 4 ++-- resources/assets/mekanism/lang/en_US.lang | 4 ++++ .../assets/mekanism/textures/blocks/CopperOre.png | Bin 0 -> 561 bytes .../assets/mekanism/textures/blocks/TinOre.png | Bin 0 -> 553 bytes .../mekanism/textures/items/CopperIngot.png | Bin 0 -> 328 bytes .../assets/mekanism/textures/items/TinIngot.png | Bin 0 -> 328 bytes 8 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 resources/assets/mekanism/textures/blocks/CopperOre.png create mode 100644 resources/assets/mekanism/textures/blocks/TinOre.png create mode 100644 resources/assets/mekanism/textures/items/CopperIngot.png create mode 100644 resources/assets/mekanism/textures/items/TinIngot.png diff --git a/common/mekanism/common/block/BlockOre.java b/common/mekanism/common/block/BlockOre.java index 717dde07d..fc5646399 100644 --- a/common/mekanism/common/block/BlockOre.java +++ b/common/mekanism/common/block/BlockOre.java @@ -15,6 +15,8 @@ import cpw.mods.fml.relauncher.SideOnly; /** * Block class for handling multiple ore block IDs. * 0: Osmium Ore + * 1: Copper Ore + * 2: Tin Ore * @author AidanBrady * */ @@ -35,19 +37,15 @@ public class BlockOre extends Block public void registerIcons(IconRegister register) { icons[0] = register.registerIcon("mekanism:OsmiumOre"); + icons[1] = register.registerIcon("mekanism:CopperOre"); + icons[2] = register.registerIcon("mekanism:TinOre"); } @Override @SideOnly(Side.CLIENT) public Icon getIcon(int side, int meta) { - switch(meta) - { - case 0: - return icons[0]; - } - - return null; + return icons[meta]; } @Override @@ -61,5 +59,7 @@ public class BlockOre extends Block public void getSubBlocks(int i, CreativeTabs creativetabs, List list) { list.add(new ItemStack(i, 1, 0)); + list.add(new ItemStack(i, 1, 1)); + list.add(new ItemStack(i, 1, 2)); } } diff --git a/common/mekanism/common/item/ItemBlockOre.java b/common/mekanism/common/item/ItemBlockOre.java index 18174650f..703487692 100644 --- a/common/mekanism/common/item/ItemBlockOre.java +++ b/common/mekanism/common/item/ItemBlockOre.java @@ -16,6 +16,8 @@ import net.minecraft.util.Icon; /** * Item class for handling multiple ore block IDs. * 0: Osmium Ore + * 1: Copper Ore + * 2: Tin Ore * @author AidanBrady * */ @@ -71,6 +73,12 @@ public class ItemBlockOre extends ItemBlock case 0: name = "OsmiumOre"; break; + case 1: + name = "CopperOre"; + break; + case 2: + name = "TinOre"; + break; default: name = "Unknown"; break; diff --git a/common/mekanism/common/item/ItemIngot.java b/common/mekanism/common/item/ItemIngot.java index 033776a96..90464dbd5 100644 --- a/common/mekanism/common/item/ItemIngot.java +++ b/common/mekanism/common/item/ItemIngot.java @@ -11,7 +11,7 @@ import net.minecraft.util.Icon; public class ItemIngot extends ItemMekanism { public Icon[] icons = new Icon[256]; - public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze", "Glowstone", "Steel"}; + public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze", "Glowstone", "Steel", "Copper", "Tin"}; public ItemIngot(int id) { @@ -38,7 +38,7 @@ public class ItemIngot extends ItemMekanism @Override public void getSubItems(int id, CreativeTabs tabs, List itemList) { - for (int counter = 0; counter <= 4; ++counter) + for (int counter = 0; counter <= 6; ++counter) { itemList.add(new ItemStack(this, 1, counter)); } diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang index 9539a800c..729cba48e 100644 --- a/resources/assets/mekanism/lang/en_US.lang +++ b/resources/assets/mekanism/lang/en_US.lang @@ -63,6 +63,8 @@ tile.MachineBlock2.RotaryCondensentrator.name=Rotary Condensentrator //Ore Block tile.OreBlock.OsmiumOre.name=Osmium Ore +tile.OreBlock.CopperOre.name=Copper Ore +tile.OreBlock.TinOre.name=Tin Ore //Transmitters tile.Transmitter.PressurizedTube.name=Pressurized Tube @@ -113,6 +115,8 @@ item.osmiumIngot.name=Osmium Ingot item.bronzeIngot.name=Bronze Ingot item.glowstoneIngot.name=Glowstone Ingot item.steelIngot.name=Steel Ingot +item.copperIngot.name=Copper Ingot +item.tinIngot.name=Tin Ingot //Gasses gas.hydrogen=Hydrogen diff --git a/resources/assets/mekanism/textures/blocks/CopperOre.png b/resources/assets/mekanism/textures/blocks/CopperOre.png new file mode 100644 index 0000000000000000000000000000000000000000..c49ac6a6529cceb5587be065d0fcfe3ed1ec1c04 GIT binary patch literal 561 zcmV-10?z%3P)Qk2b8Yeid#Ryt$Ua5-Cf-J1%gY5Zh{CM z0tOeUQRq@Tq$h9>c}Aza-X$b?d3w%0=bqOX3J)?@X$PjyZzI@G*tu3-D^@r;MRWW<2YA3=%6Rkql zMiW&JNmYfn$5l zlq6$X^LT%H(rw|Mh}iRPnj`(bu)Q58Il}D6s-Fne{Y0#3TfYYS{r;}(%%<}|)vxKP zNYz!!U^r<=P<8q9|6oEu1oSn zFdq0#fyH0*Y_+wsAu0btIJ3ZZw%hiVGv||fy}a`F{sF-AV<*)g2*(3yHQ$>v7JbHd z%%@IgX{S`$!b^c>f;3m9R$INd?oY~n(v;1ffqK0@i#xN~eqh~i8MBpc@9a7rdF}TD zorbF1mx84Cs&r$0&FKd=9h=pvla64f;lhbX?$&A8p81j((R8$Zz+Tmv7Kd#uLq!z!Uo_$f%pd4M3nL|evsG#xJfGucw9YzhG2l}mIi;6CJ)d;T0qsJ-wi-vvLBO_a_$whpVYE5 a$ph|>iylW1=LE3;0000+Tmv7Kd#uLq!z!Uo_$f%pd4M3nL|evsG#xJfGucw9YzhG2l}mIi;6CJ)d;T0qsJ-wi-vvLBO_a_$whpVYE5 a$ph|>iylW1=LE3;0000