add recipe for YOTTank

2 files changed, 63 insertions, 3 deletions

diff --git a/src/main/java/GoodGenerator/Items/MyItemBlocks.java b/src/main/java/GoodGenerator/Items/MyItemBlocks.java
index 1ecee2031f..c4a71f6834 100644
--- a/src/main/java/GoodGenerator/Items/MyItemBlocks.java
+++ b/src/main/java/GoodGenerator/Items/MyItemBlocks.java
@@ -1,6 +1,7 @@
 package GoodGenerator.Items;
 
 import GoodGenerator.Blocks.RegularBlock.TEBlock;
+import GoodGenerator.util.CharExchanger;
 import GoodGenerator.util.DescTextLocalization;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -76,7 +77,7 @@ public class MyItemBlocks extends ItemBlock {
             cap.append(" 1000000");
             for (int i = 0; i < p_77624_1_.getItemDamage(); i++) cap.append("00");
             cap.append(" L");
-            p_77624_3_.add(DescTextLocalization.addText("YOTTankCell.tooltip", 1)[0] + cap.toString());
+            p_77624_3_.add(DescTextLocalization.addText("YOTTankCell.tooltip", 1)[0] + CharExchanger.formatNumber(cap.toString()));
         }
     }
 }
diff --git a/src/main/java/GoodGenerator/Items/MyItems.java b/src/main/java/GoodGenerator/Items/MyItems.java
index bfd1d5b661..a795ea00a1 100644
--- a/src/main/java/GoodGenerator/Items/MyItems.java
+++ b/src/main/java/GoodGenerator/Items/MyItems.java
@@ -8,6 +8,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -15,13 +16,26 @@ import java.util.List;
 
 public class MyItems extends Item {
 
-        private final String tex;
+        @SideOnly(Side.CLIENT)
+        protected IIcon[] texture;
+        private String tex;
+        private String[] textureNames;
+        private String Name;
         private List<String> tooltips = new ArrayList<>();
 
         public MyItems(String name, CreativeTabs Tab){
                 this.setUnlocalizedName(name);
                 this.setCreativeTab(Tab);
                 this.tex = name;
+                this.Name = name;
+        }
+
+        public MyItems(String name, CreativeTabs Tab, String[] textures){
+                this.setUnlocalizedName(name);
+                this.setCreativeTab(Tab);
+                this.setHasSubtypes(true);
+                this.textureNames = textures;
+                this.Name = name;
         }
 
         public MyItems(String name, String tooltip, CreativeTabs Tab) {
@@ -29,6 +43,7 @@ public class MyItems extends Item {
                 this.setCreativeTab(Tab);
                 this.tex = name;
                 this.tooltips.add(tooltip);
+                this.Name = name;
         }
 
         public MyItems(String name, String[] tooltip, CreativeTabs Tab) {
@@ -36,11 +51,55 @@ public class MyItems extends Item {
                 this.setCreativeTab(Tab);
                 this.tex = name;
                 this.tooltips = Arrays.asList(tooltip);
+                this.Name = name;
+        }
+
+        @Override
+        @SideOnly(Side.CLIENT)
+        public IIcon getIconFromDamage(int meta) {
+                if (this.texture == null || this.texture.length < 1) return this.itemIcon;
+                else return meta < this.texture.length ? this.texture[meta] : this.texture[0];
+        }
+
+        @Override
+        public int getMetadata(int aMeta) {
+                return aMeta;
         }
 
+        @Override
         @SideOnly(Side.CLIENT)
         public void registerIcons(IIconRegister iconRegister) {
-                this.itemIcon = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":" + this.tex);
+                if (this.textureNames == null || this.textureNames.length < 1) {
+                        this.itemIcon = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":" + this.tex);
+                }
+                else {
+                        this.texture = new IIcon[this.textureNames.length];
+                        for (int i = 0; i < this.textureNames.length; ++i) {
+                                this.texture[i] = iconRegister.registerIcon(this.textureNames[i]);
+                        }
+                }
+        }
+
+        @Override
+        public String getUnlocalizedName(ItemStack p_77667_1_) {
+                if (this.texture == null || this.texture.length < 1){
+                        return "item." + this.Name;
+                }
+                else {
+                        return "item." + this.Name + "." + p_77667_1_.getItemDamage();
+                }
+        }
+
+        @Override
+        @SideOnly(Side.CLIENT)
+        @SuppressWarnings("unchecked")
+        public void getSubItems(Item item, CreativeTabs tab, List list) {
+                if (this.texture == null || this.texture.length < 1) list.add(new ItemStack(item, 1, 0));
+                else {
+                        for (int i = 0; i < this.texture.length; ++i) {
+                                list.add(new ItemStack(item, 1, i));
+                        }
+                }
         }
 
         @SideOnly(Side.CLIENT)