$ Fixed a bug when using older versions of GT.

+ Did Fish Stuff.

5 files changed, 307 insertions, 49 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
index a36e541c4a..110ae4e79d 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
@@ -99,65 +99,73 @@ public class RECIPES_Old_Circuits  implements IOreRecipeRegistrator {
 		generateTradeRecipes();
 		return true;
 	}
+	
+	private static boolean setItemList(ItemList Set, GregtechItemList Get) {
+		try{
+			Set.set(Get.get(1));
+			return true;
+		}
+		catch (Throwable t) {}
+		return false;
+	}
 
 	private static boolean removeNewCircuits(){
 		Logger.INFO("[Old Feature - Circuits] Overriding .28+ circuit values in the GT5u Itemlist with values from GT++.");
 
-		ItemList.Circuit_Primitive.set(GregtechItemList.Old_Circuit_Primitive.get(1));
-		ItemList.Circuit_Basic.set(GregtechItemList.Old_Circuit_Basic.get(1));
-		if (ItemList.valueOf("Circuit_Integrated_Good") != null){
-			ItemList.valueOf("Circuit_Integrated_Good").set(GregtechItemList.Old_Circuit_Good.get(1));
-		}
-		ItemList.Circuit_Good.set(GregtechItemList.Old_Circuit_Good.get(1));
-		ItemList.Circuit_Advanced.set(GregtechItemList.Old_Circuit_Advanced.get(1));
-		//ItemList.Circuit_Data.set(GregtechItemList.Old_Circuit_Data.get(1));
-		ItemList.Circuit_Elite.set(GregtechItemList.Old_Circuit_Elite.get(1));
-		ItemList.Circuit_Master.set(GregtechItemList.Old_Circuit_Master.get(1));
-		ItemList.Circuit_Ultimate.set(GregtechItemList.Old_Circuit_Ultimate.get(1));
+		setItemList(ItemList.Circuit_Primitive, GregtechItemList.Old_Circuit_Primitive);
+		setItemList(ItemList.Circuit_Basic, GregtechItemList.Old_Circuit_Basic);
+		setItemList(ItemList.valueOf("Circuit_Integrated_Good"), GregtechItemList.Old_Circuit_Good); //New
 		
+		setItemList(ItemList.Circuit_Good, GregtechItemList.Old_Circuit_Good);
+		setItemList(ItemList.Circuit_Advanced, GregtechItemList.Old_Circuit_Advanced);
+		//ItemList.Circuit_Data, GregtechItemList.Old_Circuit_Data);
+		setItemList(ItemList.Circuit_Elite, GregtechItemList.Old_Circuit_Elite);
+		setItemList(ItemList.Circuit_Master, GregtechItemList.Old_Circuit_Master);
+		setItemList(ItemList.Circuit_Ultimate, GregtechItemList.Old_Circuit_Ultimate);
+
 		/**
 		 * Try Set New circuits to have old replacements
 		 */
-				
+
 		//Basic
-		ItemList.valueOf("Circuit_Microprocessor").set(GregtechItemList.Old_Circuit_Basic.get(1));		
+		setItemList(ItemList.valueOf("Circuit_Microprocessor"), GregtechItemList.Old_Circuit_Basic);	//NEW	
 		//Good
-		ItemList.valueOf("Circuit_Integrated").set(GregtechItemList.Old_Circuit_Good.get(1));		
+		setItemList(ItemList.valueOf("Circuit_Integrated"), GregtechItemList.Old_Circuit_Good);		
 		//Advanced
-		ItemList.valueOf("Circuit_Nanoprocessor").set(GregtechItemList.Old_Circuit_Advanced.get(1));		
+		setItemList(ItemList.valueOf("Circuit_Nanoprocessor"), GregtechItemList.Old_Circuit_Advanced);		
 		//Data
-		ItemList.valueOf("Circuit_Quantumprocessor").set(GregtechItemList.Old_Circuit_Data.get(1));
-		ItemList.valueOf("Circuit_Nanocomputer").set(GregtechItemList.Old_Circuit_Data.get(1));	
+		setItemList(ItemList.valueOf("Circuit_Quantumprocessor"), GregtechItemList.Old_Circuit_Data);
+		setItemList(ItemList.valueOf("Circuit_Nanocomputer"), GregtechItemList.Old_Circuit_Data);	
 		//Elite
-		ItemList.valueOf("Circuit_Crystalprocessor").set(GregtechItemList.Old_Circuit_Elite.get(1));
-		ItemList.valueOf("Circuit_Quantumcomputer").set(GregtechItemList.Old_Circuit_Elite.get(1));
-		ItemList.valueOf("Circuit_Elitenanocomputer").set(GregtechItemList.Old_Circuit_Elite.get(1));		
+		setItemList(ItemList.valueOf("Circuit_Crystalprocessor"), GregtechItemList.Old_Circuit_Elite);
+		setItemList(ItemList.valueOf("Circuit_Quantumcomputer"), GregtechItemList.Old_Circuit_Elite);
+		setItemList(ItemList.valueOf("Circuit_Elitenanocomputer"), GregtechItemList.Old_Circuit_Elite);		
 		//Master
-		ItemList.valueOf("Circuit_Neuroprocessor").set(GregtechItemList.Old_Circuit_Master.get(1));
-		ItemList.valueOf("Circuit_Masterquantumcomputer").set(GregtechItemList.Old_Circuit_Master.get(1));	
+		setItemList(ItemList.valueOf("Circuit_Neuroprocessor"), GregtechItemList.Old_Circuit_Master);
+		setItemList(ItemList.valueOf("Circuit_Masterquantumcomputer"), GregtechItemList.Old_Circuit_Master);	
 		//Ultimate
-		ItemList.valueOf("Circuit_Wetwarecomputer").set(GregtechItemList.Old_Circuit_Ultimate.get(1));
-		ItemList.valueOf("Circuit_Ultimatecrystalcomputer").set(GregtechItemList.Old_Circuit_Ultimate.get(1));
-		ItemList.valueOf("Circuit_Quantummainframe").set(GregtechItemList.Old_Circuit_Ultimate.get(1));	
+		setItemList(ItemList.valueOf("Circuit_Wetwarecomputer"), GregtechItemList.Old_Circuit_Ultimate);
+		setItemList(ItemList.valueOf("Circuit_Ultimatecrystalcomputer"), GregtechItemList.Old_Circuit_Ultimate);
+		setItemList(ItemList.valueOf("Circuit_Quantummainframe"), GregtechItemList.Old_Circuit_Ultimate);	
 		//Superconductor
-		ItemList.valueOf("Circuit_Wetwaresupercomputer").set(GregtechItemList.Circuit_IV.get(1));
-		ItemList.valueOf("Circuit_Crystalmainframe").set(GregtechItemList.Circuit_IV.get(1));
+		setItemList(ItemList.valueOf("Circuit_Wetwaresupercomputer"), GregtechItemList.Circuit_IV);
+		setItemList(ItemList.valueOf("Circuit_Crystalmainframe"), GregtechItemList.Circuit_IV);
 		//Infinite
-		ItemList.valueOf("Circuit_Wetwaremainframe").set(GregtechItemList.Circuit_LuV.get(1));		
+		setItemList(ItemList.valueOf("Circuit_Wetwaremainframe"), GregtechItemList.Circuit_LuV);		
 
 		//set data orbs and sticks to their new replacements
-		ItemList.Tool_DataStick.set(GregtechItemList.Old_Tool_DataStick.get(1));
-		ItemList.Tool_DataOrb.set(GregtechItemList.Old_Tool_DataOrb.get(1));
-
-		ItemList.Circuit_Board_Basic.set(GregtechItemList.Old_Circuit_Board_Basic.get(1));
-		ItemList.Circuit_Board_Advanced.set(GregtechItemList.Old_Circuit_Board_Advanced.get(1));
-		ItemList.Circuit_Board_Elite.set(GregtechItemList.Old_Circuit_Board_Elite.get(1));
-		ItemList.Circuit_Parts_Advanced.set(GregtechItemList.Old_Circuit_Parts_Advanced.get(1));
-		ItemList.Circuit_Parts_Wiring_Basic.set(GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1));
-		ItemList.Circuit_Parts_Wiring_Advanced.set(GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(1));
-		ItemList.Circuit_Parts_Wiring_Elite.set(GregtechItemList.Old_Circuit_Parts_Wiring_Elite.get(1));
-		ItemList.Circuit_Parts_Crystal_Chip_Elite.set(GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1));
-		ItemList.Circuit_Parts_Crystal_Chip_Master.set(GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(1));
+		setItemList(ItemList.Tool_DataStick, GregtechItemList.Old_Tool_DataStick);
+		setItemList(ItemList.Tool_DataOrb, GregtechItemList.Old_Tool_DataOrb);
+
+		setItemList(ItemList.Circuit_Board_Basic, GregtechItemList.Old_Circuit_Board_Basic);
+		setItemList(ItemList.Circuit_Board_Advanced, GregtechItemList.Old_Circuit_Board_Advanced);
+		setItemList(ItemList.Circuit_Board_Elite, GregtechItemList.Old_Circuit_Board_Elite);
+		setItemList(ItemList.Circuit_Parts_Advanced, GregtechItemList.Old_Circuit_Parts_Advanced);
+		setItemList(ItemList.Circuit_Parts_Wiring_Basic, GregtechItemList.Old_Circuit_Parts_Wiring_Basic);
+		setItemList(ItemList.Circuit_Parts_Wiring_Advanced, GregtechItemList.Old_Circuit_Parts_Wiring_Advanced);
+		setItemList(ItemList.Circuit_Parts_Wiring_Elite, GregtechItemList.Old_Circuit_Parts_Wiring_Elite);
+		setItemList(ItemList.Circuit_Parts_Crystal_Chip_Elite, GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite);
+		setItemList(ItemList.Circuit_Parts_Crystal_Chip_Master, GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master);
 
 		return true;
 	}
diff --git a/src/Java/gtPlusPlus/plugin/fishing/item/BaseFish.java b/src/Java/gtPlusPlus/plugin/fishing/item/BaseFish.java
index b395240663..8ec03e500a 100644
--- a/src/Java/gtPlusPlus/plugin/fishing/item/BaseFish.java
+++ b/src/Java/gtPlusPlus/plugin/fishing/item/BaseFish.java
@@ -1,5 +1,117 @@
 package gtPlusPlus.plugin.fishing.item;
 
-public class BaseFish {
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.plugin.fishing.misc.BaseFishTypes;
 
-}
+import java.util.List;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.potion.PotionHelper;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class BaseFish extends ItemFood
+{
+    private final boolean isCooked;
+
+    public BaseFish(boolean cooked)
+    {
+        super(0, 0.0F, false);
+        this.isCooked = cooked;
+    }
+
+    public int func_150905_g(ItemStack p_150905_1_)
+    {
+        BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_150905_1_);
+        return this.isCooked && fishtype.isCooked() ? fishtype.func_150970_e() : fishtype.func_150975_c();
+    }
+
+    public float func_150906_h(ItemStack p_150906_1_)
+    {
+        BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_150906_1_);
+        return this.isCooked && fishtype.isCooked() ? fishtype.func_150977_f() : fishtype.func_150967_d();
+    }
+
+    /**
+     * Returns a string representing what this item does to a potion.
+     */
+    public String getPotionEffect(ItemStack p_150896_1_)
+    {
+        return BaseFishTypes.getFishTypeFromStackDamage(p_150896_1_) == BaseFishTypes.PUFFERFISH ? PotionHelper.field_151423_m : null;
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister p_94581_1_)
+    {
+        BaseFishTypes[] afishtype = BaseFishTypes.values();
+        int i = afishtype.length;
+
+        for (int j = 0; j < i; ++j)
+        {
+            BaseFishTypes fishtype = afishtype[j];
+            fishtype.func_150968_a(p_94581_1_);
+        }
+    }
+
+    protected void onFoodEaten(ItemStack fish, World world, EntityPlayer player)
+    {
+        BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(fish);
+
+        if (fishtype == BaseFishTypes.PUFFERFISH)
+        {
+            player.addPotionEffect(new PotionEffect(Potion.poison.id, 1200, 3));
+            player.addPotionEffect(new PotionEffect(Potion.hunger.id, 300, 2));
+            player.addPotionEffect(new PotionEffect(Potion.confusion.id, 300, 1));
+        }
+
+        super.onFoodEaten(fish, world, player);
+    }
+
+    /**
+     * Gets an icon index based on an item's damage value
+     */
+    @SideOnly(Side.CLIENT)
+    public IIcon getIconFromDamage(int dmg)
+    {
+        BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromDamageValue(dmg);
+        return this.isCooked && fishtype.isCooked() ? fishtype.func_150979_h() : fishtype.func_150971_g();
+    }
+
+    /**
+     * returns a list of items with the same ID, but different meta (eg: dye returns 16 items)
+     */
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_)
+    {
+        BaseFishTypes[] afishtype = BaseFishTypes.values();
+        int i = afishtype.length;
+
+        for (int j = 0; j < i; ++j)
+        {
+            BaseFishTypes fishtype = afishtype[j];
+
+            if (!this.isCooked || fishtype.isCooked())
+            {
+                p_150895_3_.add(new ItemStack(this, 1, fishtype.getFishID()));
+            }
+        }
+    }
+
+    /**
+     * Returns the unlocalized name of this item. This version accepts an ItemStack so different stacks can have
+     * different names based on their damage or NBT.
+     */
+    public String getUnlocalizedName(ItemStack p_77667_1_)
+    {
+        BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_77667_1_);
+        return this.getUnlocalizedName() + "." + fishtype.getFishName() + "." + (this.isCooked && fishtype.isCooked() ? "cooked" : "raw");
+    }
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java b/src/Java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java
new file mode 100644
index 0000000000..56d5e218af
--- /dev/null
+++ b/src/Java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java
@@ -0,0 +1,138 @@
+package gtPlusPlus.plugin.fishing.misc;
+import java.util.Map;
+
+import com.google.common.collect.Maps;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.plugin.fishing.item.BaseFish;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public enum BaseFishTypes{
+	
+        COD(0, "cod", 2, 0.1F, 5, 0.6F),
+        SALMON(1, "salmon", 2, 0.1F, 6, 0.8F),
+        CLOWNFISH(2, "clownfish", 1, 0.1F),
+        PUFFERFISH(3, "pufferfish", 1, 0.1F);
+	
+	
+	
+	
+        private static final Map<Integer, BaseFishTypes> mFishMap = Maps.newHashMap();
+        private final int mID;
+        private final String mFishName;
+        @SideOnly(Side.CLIENT)
+        private IIcon iicon;
+        @SideOnly(Side.CLIENT)
+        private IIcon iicon2;
+        private final int field_150991_j;
+        private final float field_150992_k;
+        private final int field_150989_l;
+        private final float field_150990_m;
+        private boolean isCooked = false;
+
+        private BaseFishTypes(int p_i45336_3_, String p_i45336_4_, int p_i45336_5_, float p_i45336_6_, int p_i45336_7_, float p_i45336_8_)
+        {
+            this.mID = p_i45336_3_;
+            this.mFishName = p_i45336_4_;
+            this.field_150991_j = p_i45336_5_;
+            this.field_150992_k = p_i45336_6_;
+            this.field_150989_l = p_i45336_7_;
+            this.field_150990_m = p_i45336_8_;
+            this.isCooked = true;
+        }
+
+        private BaseFishTypes(int p_i45337_3_, String p_i45337_4_, int p_i45337_5_, float p_i45337_6_)
+        {
+            this.mID = p_i45337_3_;
+            this.mFishName = p_i45337_4_;
+            this.field_150991_j = p_i45337_5_;
+            this.field_150992_k = p_i45337_6_;
+            this.field_150989_l = 0;
+            this.field_150990_m = 0.0F;
+            this.isCooked = false;
+        }
+
+        public int getFishID()
+        {
+            return this.mID;
+        }
+
+        public String getFishName()
+        {
+            return this.mFishName;
+        }
+
+        public int func_150975_c()
+        {
+            return this.field_150991_j;
+        }
+
+        public float func_150967_d()
+        {
+            return this.field_150992_k;
+        }
+
+        public int func_150970_e()
+        {
+            return this.field_150989_l;
+        }
+
+        public float func_150977_f()
+        {
+            return this.field_150990_m;
+        }
+
+        @SideOnly(Side.CLIENT)
+        public void func_150968_a(IIconRegister p_150968_1_)
+        {
+            this.iicon = p_150968_1_.registerIcon("fish_" + this.mFishName + "_raw");
+
+            if (this.isCooked)
+            {
+                this.iicon2 = p_150968_1_.registerIcon("fish_" + this.mFishName + "_cooked");
+            }
+        }
+
+        @SideOnly(Side.CLIENT)
+        public IIcon func_150971_g()
+        {
+            return this.iicon;
+        }
+
+        @SideOnly(Side.CLIENT)
+        public IIcon func_150979_h()
+        {
+            return this.iicon2;
+        }
+
+        public boolean isCooked()
+        {
+            return this.isCooked;
+        }
+
+        public static BaseFishTypes getFishTypeFromDamageValue(int dmg)
+        {
+            BaseFishTypes fishtype = (BaseFishTypes)mFishMap.get(Integer.valueOf(dmg));
+            return fishtype == null ? COD : fishtype;
+        }
+
+        public static BaseFishTypes getFishTypeFromStackDamage(ItemStack fish)
+        {
+            return fish.getItem() instanceof BaseFish ? getFishTypeFromDamageValue(fish.getItemDamage()) : COD;
+        }
+
+        static
+        {
+            BaseFishTypes[] var0 = values();
+            int var1 = var0.length;
+
+            for (int var2 = 0; var2 < var1; ++var2)
+            {
+                BaseFishTypes var3 = var0[var2];
+                mFishMap.put(Integer.valueOf(var3.getFishID()), var3);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
index cc6a22c372..7debeac3f1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
@@ -30,9 +30,9 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
 		super(aName, aTier, 3, aDescription, aTextures);
 	}
 
-	public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+	/*public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
 		super(aName, aTier, 3, aDescription, aTextures);
-	}
+	}*/
 
 	public boolean isSimpleMachine() {
 		return true;
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
 	}
 
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT_MetaTileEntity_TieredChest(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+		return new GT_MetaTileEntity_TieredChest(this.mName, this.mTier, this.mDescription, this.mTextures);
 	}
 
 	public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java
index b846a21a8c..8b7f1582bc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java
@@ -60,7 +60,7 @@ public class GregtechMiniRaFusion {
 		return false;
 	}
 
-	private static void addFusionReactorRecipe(Materials molten, int amnt, Materials gas, int amnt2, FluidStack plasma, int i, int j, int k) {
+	private static void addFusionReactorRecipe(Materials molten, int amnt, Materials gas, int amnt2, FluidStack plasma, int i, int j, int k) {/*
 		Materials Fusion[] = new Materials[2];
 		int amount[] = new int[2];
 		int emptyAmount = 0;
@@ -163,11 +163,11 @@ public class GregtechMiniRaFusion {
 				) != null){
 			mRecipeCount++;					
 		}
-	}
+	*/}
 
 
 	public static int mRecipeCount = 0;
-	private static void addFusionReactorRecipe(Materials molten, int amnt, Materials gas, int amnt2, Materials output, int amnt3, int i, int j, int k) {
+	private static void addFusionReactorRecipe(Materials molten, int amnt, Materials gas, int amnt2, Materials output, int amnt3, int i, int j, int k) {/*
 		Materials Fusion[] = new Materials[3];
 		int amount[] = new int[3];
 		int emptyAmount = 0;
@@ -291,6 +291,6 @@ public class GregtechMiniRaFusion {
 				) != null){
 			mRecipeCount++;					
 		}
-	}
+	*/}
 	
 }