+ Enabled placeholder Fishing plugin.

- Disabled Sulfuric Chem rebalance internally, Config option temp. does nothing.
$ Fixed Debug logging for removed recipes.

4 files changed, 70 insertions, 39 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
index b3762dd243..7e816ed3c6 100644
--- a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
+++ b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
@@ -87,9 +87,13 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable {
 	}
 	
 	public synchronized V[] toArray() {		
-		Collection<V> col = this.mInternalMap.values();
-		@SuppressWarnings("unchecked")
-		V[] val = (V[]) col.toArray();		
+		Collection<V> col = this.mInternalMap.values();		
+		V[] val = (V[]) new Object[col.size()];
+		int counter = 0;
+		for (V i : col) {
+			val[counter] = i;
+			counter++;
+		}
 		return val;
 	}
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index 647d0d30b0..c5f50c8b0f 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -17,6 +17,7 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
@@ -523,20 +524,24 @@ public class RecipeUtils {
 		if (m == null) {
 			return new String[] {};
 		}
-		String[] result = new String[10];
-		result[0] = m.toString();
-		result[1] = "Input "+ItemUtils.getArrayStackNames(m.mInputs);
-		result[2] = "Output "+ItemUtils.getArrayStackNames(m.mOutputs);
-		result[3] = "Input "+ItemUtils.getArrayStackNames(m.mFluidInputs);
-		result[4] = "Output "+ItemUtils.getArrayStackNames(m.mFluidOutputs);
-		result[5] = "Can be buffered? "+m.mCanBeBuffered;
-		result[6] = "Duration: "+m.mDuration;
-		result[7] = "EU/t: "+m.mEUt;
-		result[8] = "Is Hidden? "+m.mHidden;
-		result[9] = "Is Enabled? "+m.mEnabled;
-		result[10] = "Special Value: "+m.mSpecialValue;
-		result[11] = "=====================================";		
-		return result;
+		AutoMap<String> result = new AutoMap<String>();
+		result.put(m.toString());
+		result.put("Input "+ItemUtils.getArrayStackNames(m.mInputs));
+		result.put("Output "+ItemUtils.getArrayStackNames(m.mOutputs));
+		result.put("Input "+ItemUtils.getArrayStackNames(m.mFluidInputs));
+		result.put("Output "+ItemUtils.getArrayStackNames(m.mFluidOutputs));
+		result.put("Can be buffered? "+m.mCanBeBuffered);
+		result.put("Duration: "+m.mDuration);
+		result.put("EU/t: "+m.mEUt);
+		result.put("Is Hidden? "+m.mHidden);
+		result.put("Is Enabled? "+m.mEnabled);
+		result.put("Special Value: "+m.mSpecialValue);
+		result.put("=====================================");		
+		String s[] = new String[result.size()];
+		for (int i=0;i<result.size();i++) {
+			s[i] = result.get(i);
+		}		
+		return s;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java b/src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java
index 60c599d191..1a7d6833aa 100644
--- a/src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java
+++ b/src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java
@@ -5,23 +5,30 @@ import gtPlusPlus.plugin.manager.Core_Manager;
 
 public class Core_Fishing implements IPlugin {
 
+	final static Core_Fishing mInstance;
+
+	static {
+		mInstance = new Core_Fishing();
+		mInstance.log("Preparing "+mInstance.getPluginName()+" for use.");
+	}
+	
 	Core_Fishing() {
 		Core_Manager.registerPlugin(this);
 	}
 	
 	@Override
 	public boolean preInit() {
-		return true;
+		return false;
 	}
 
 	@Override
 	public boolean init() {
-		return true;
+		return false;
 	}
 
 	@Override
 	public boolean postInit() {
-		return true;
+		return false;
 	}
 
 	@Override
@@ -31,7 +38,7 @@ public class Core_Fishing implements IPlugin {
 
 	@Override
 	public String getPluginAbbreviation() {
-		return "FISH";
+		return "Fish";
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java b/src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
index cef57bf466..1ff99a3ddb 100644
--- a/src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
+++ b/src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
@@ -18,8 +18,9 @@ public class Core_SulfuricChemistry implements IPlugin {
 
 	final static Core_SulfuricChemistry mInstance;
 	private static boolean shouldLoad = false;
-	
-	private static AutoMap<GT_Recipe>[] mRemovedRecipes = new AutoMap[2];
+
+	private static AutoMap<GT_Recipe> mRemovedRecipes1 = new AutoMap<GT_Recipe>();
+	private static AutoMap<GT_Recipe> mRemovedRecipes2 = new AutoMap<GT_Recipe>();
 
 	static {
 		mInstance = new Core_SulfuricChemistry();
@@ -29,7 +30,7 @@ public class Core_SulfuricChemistry implements IPlugin {
 
 	@Override
 	public boolean preInit() {
-		if (CORE.ConfigSwitches.enableSulfuricAcidFix || CORE.DEVENV) {
+		if (/*CORE.ConfigSwitches.enableSulfuricAcidFix || */CORE.DEVENV) {
 			shouldLoad = true;
 		}
 		if (shouldLoad)
@@ -57,13 +58,20 @@ public class Core_SulfuricChemistry implements IPlugin {
 			
 			if (CORE.DEVENV || CORE.DEBUG) {
 				for (int i=0;i<2;i++) {
-					for (GT_Recipe m : mRemovedRecipes[i]) {
+					for (GT_Recipe m : mRemovedRecipes1) {
 						String[] mInfo = RecipeUtils.getRecipeInfo(m);
 						log("Removed Recipe");
 						for (int r=0;r<mInfo.length;r++) {
 							log(mInfo[r]);
 						}
-					}					
+					}	
+					for (GT_Recipe m : mRemovedRecipes2) {
+						String[] mInfo = RecipeUtils.getRecipeInfo(m);
+						log("Removed Recipe");
+						for (int r=0;r<mInfo.length;r++) {
+							log(mInfo[r]);
+						}
+					}
 				}
 			}			
 			return disabled > 0 && addedNew > 0;
@@ -168,12 +176,13 @@ public class Core_SulfuricChemistry implements IPlugin {
 
 	public int disableSulfurTrioxide() {
 		int mDisabled = 0;		
+		FluidStack mStack = FluidUtils.getFluidStack("sulfurtrioxide", 1);
 		//Single Block Recipes
 		recipe : for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList) {
 			for (ItemStack i : r.mOutputs) {
 				i.stackSize = 1;
 				if (ItemStack.areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
-					mRemovedRecipes[0].put(r);
+					mRemovedRecipes1.put(r);
 					r.mEnabled = false;
 					r.mHidden = true;
 					mDisabled++;
@@ -182,8 +191,9 @@ public class Core_SulfuricChemistry implements IPlugin {
 				continue;
 			}
 			for (FluidStack f : r.mFluidOutputs) {
-				if (FluidStack.areFluidStackTagsEqual(f, Materials.SulfurTrioxide.getFluid(1))) {
-					mRemovedRecipes[0].put(r);
+				f.amount = 1;
+				if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
+					mRemovedRecipes1.put(r);
 					r.mEnabled = false;
 					r.mHidden = true;
 					mDisabled++;
@@ -198,7 +208,7 @@ public class Core_SulfuricChemistry implements IPlugin {
 			for (ItemStack i : r.mOutputs) {
 				i.stackSize = 1;
 				if (ItemStack.areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
-					mRemovedRecipes[0].put(r);
+					mRemovedRecipes1.put(r);
 					r.mEnabled = false;
 					r.mHidden = true;
 					mDisabled++;
@@ -207,8 +217,9 @@ public class Core_SulfuricChemistry implements IPlugin {
 				continue;
 			}
 			for (FluidStack f : r.mFluidOutputs) {
-				if (FluidStack.areFluidStackTagsEqual(f, Materials.SulfurTrioxide.getFluid(1))) {
-					mRemovedRecipes[0].put(r);
+				f.amount = 1;
+				if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
+					mRemovedRecipes1.put(r);
 					r.mEnabled = false;
 					r.mHidden = true;
 					mDisabled++;
@@ -222,13 +233,15 @@ public class Core_SulfuricChemistry implements IPlugin {
 	}
 
 	public int disableSulfuricAcid() {
-		int mDisabled = 0;		
+		int mDisabled = 0;	
+		FluidStack mStack = FluidUtils.getFluidStack("sulfuricacid", 1);	
 		//Single Block Recipes
+		
 		recipe : for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sChemicalRecipes.mRecipeList) {
 			for (ItemStack i : r.mOutputs) {
 				i.stackSize = 1;
 				if (ItemStack.areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 1))) {
-					mRemovedRecipes[1].put(r);
+					mRemovedRecipes2.put(r);
 					r.mEnabled = false;
 					r.mHidden = true;
 					mDisabled++;
@@ -237,8 +250,9 @@ public class Core_SulfuricChemistry implements IPlugin {
 				continue;
 			}
 			for (FluidStack f : r.mFluidOutputs) {
-				if (FluidStack.areFluidStackTagsEqual(f, Materials.SulfuricAcid.getFluid(1))) {
-					mRemovedRecipes[1].put(r);
+				f.amount = 1;
+				if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
+					mRemovedRecipes2.put(r);
 					r.mEnabled = false;
 					r.mHidden = true;
 					mDisabled++;
@@ -253,7 +267,7 @@ public class Core_SulfuricChemistry implements IPlugin {
 			for (ItemStack i : r.mOutputs) {
 				i.stackSize = 1;
 				if (ItemStack.areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 1))) {
-					mRemovedRecipes[1].put(r);
+					mRemovedRecipes2.put(r);
 					r.mEnabled = false;
 					r.mHidden = true;
 					mDisabled++;
@@ -262,8 +276,9 @@ public class Core_SulfuricChemistry implements IPlugin {
 				continue;
 			}
 			for (FluidStack f : r.mFluidOutputs) {
-				if (FluidStack.areFluidStackTagsEqual(f, Materials.SulfuricAcid.getFluid(1))) {
-					mRemovedRecipes[1].put(r);
+				f.amount = 1;
+				if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
+					mRemovedRecipes2.put(r);
 					r.mEnabled = false;
 					r.mHidden = true;
 					mDisabled++;