> Why does Git make me do these? arghhh...

Merge branch 'master' of https://github.com/draknyte1/GTplusplus

# Conflicts:
#	src/Java/gtPlusPlus/core/material/ALLOY.java
#	src/Java/gtPlusPlus/core/material/ELEMENT.java
#	src/Java/gtPlusPlus/core/material/Material.java
#	src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java

3 files changed, 184 insertions, 29 deletions

diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
index 687a5afa3b..2e6c9c5c84 100644
--- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
@@ -1,9 +1,12 @@
 package gtPlusPlus.xmod.growthcraft.fishtrap;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.item.ItemStack;
@@ -11,30 +14,62 @@ import net.minecraft.item.ItemStack;
 public class FishTrapHandler {
 
 	private static final String[] fishTypes = {"fish", "junk", "treasure"};
+	private static Object mFishingRegistry;
+	private static Growthcraft_Old mHandler;
+	
+	public static Object getFishingRegistry(){
+		if (mFishingRegistry != null){
+			return mFishingRegistry;
+		}
+		else {
+			return setFishTrapRegistry();
+		}
+	}
+
+	private final static Object setFishTrapRegistry(){
+		Class mFishingRegistryClass;
+		try {
+			mFishingRegistryClass = Class.forName("growthcraft.api.fishtrap.FishTrapRegistry");
+			final Method mFishingRegistryMethod = mFishingRegistryClass.getDeclaredMethod("getInstance", null);
+			mFishingRegistry = mFishingRegistryMethod.invoke(null);
+			if (mFishingRegistry != null){
+				return mFishingRegistry;
+			}
+		}
+		catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+		}
+		return null;
+	}
 
 	protected static void addFish(final String lootType, final ItemStack lootStack, final int lootChance){
 
+		if (mFishingRegistry == null){
+			setFishTrapRegistry();
+		}
+		if (mHandler == null){
+			mHandler = new Growthcraft_Old();
+		}
+		
 		final String GCVersion = LoadedMods.getModVersion("Growthcraft");
-
 		final String[] versionString = GCVersion.split("//.");
 
 		if (LoadedMods.getModVersion("Growthcraft").contains("2.3.1") || versionString[1].equals("3")){
 			if (lootType.equals(fishTypes[0])){
-				Growthcraft_Old.addTrapFish(lootStack, lootChance);
-				Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as an extra Fish for Growthcraft Fishtraps.");
+				mHandler.addTrapFish(lootStack, lootChance);
+				Logger.INFO("Added "+lootStack.getDisplayName()+" as an extra Fish for Growthcraft Fishtraps.");
 			}
 			else if (lootType.equals(fishTypes[1])){
-				Growthcraft_Old.addTrapJunk(lootStack, lootChance);
-				Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as extra Junk for Growthcraft Fishtraps.");
+				mHandler.addTrapJunk(lootStack, lootChance);
+				Logger.INFO("Added "+lootStack.getDisplayName()+" as extra Junk for Growthcraft Fishtraps.");
 			}
 			else if (lootType.equals(fishTypes[2])){
-				Growthcraft_Old.addTrapTreasure(lootStack, lootChance);
-				Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as extra Treasure for Growthcraft Fishtraps.");
+				mHandler.addTrapTreasure(lootStack, lootChance);
+				Logger.INFO("Added "+lootStack.getDisplayName()+" as extra Treasure for Growthcraft Fishtraps.");
 			}
 			else {
 				return;
 			}
-		}
+		}/*
 		else if (LoadedMods.getModVersion("Growthcraft").contains("2.7.2")){
 			if (lootType.equals(fishTypes[0])){
 				Growthcraft_New.addTrapFish(lootStack, lootChance);
@@ -51,10 +86,10 @@ public class FishTrapHandler {
 			else {
 				return;
 			}
-		}
+		}*/
 
 		else {
-			Utils.LOG_INFO("Extra Fish loot for Growthcraft Fishtraps disabled. Found V."+LoadedMods.getModVersion("Growthcraft"));
+			Logger.INFO("Extra Fish loot for Growthcraft Fishtraps disabled. Found V."+LoadedMods.getModVersion("Growthcraft"));
 		}
 
 	}
diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java
index 4405709888..3b6b46d630 100644
--- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java
@@ -1,24 +1,84 @@
 package gtPlusPlus.xmod.growthcraft.fishtrap;
 
-import growthcraft.api.fishtrap.FishTrapEntry;
-import growthcraft.api.fishtrap.FishTrapRegistry;
+import java.lang.reflect.*;
+
 import net.minecraft.item.ItemStack;
 
 public class Growthcraft_New {
 
-	public static void addTrapJunk(final ItemStack loot, final int lootChance){
-		FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance));
-
+	Method addTrapJunk;
+	Method addTrapTreasure;
+	Method addTrapFish;
+	Object FishTrapRegistryO;
+	
+	public Growthcraft_New(){
+		setFishTrapRegistry();
+	}
+	
+	void setFishTrapRegistry(){
+		try {
+			Class<?> FishTrapRegistryClass = Class.forName("gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler.mFishingRegistry");
+			Class<?> FishTrapEntry = Class.forName("growthcraft.api.fishtrap.FishTrapEntry");
+			if (FishTrapRegistryClass.isInstance(FishTrapHandler.getFishingRegistry())){
+				addTrapJunk = FishTrapRegistryClass.getDeclaredMethod("addTrapJunk", FishTrapEntry);
+				addTrapTreasure = FishTrapRegistryClass.getDeclaredMethod("addTrapTreasure", FishTrapEntry);
+				addTrapFish = FishTrapRegistryClass.getDeclaredMethod("addTrapFish", FishTrapEntry);
+				FishTrapRegistryO = FishTrapHandler.getFishingRegistry();
+			}
+		}
+		catch (ClassNotFoundException | NoSuchMethodException | SecurityException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private Object createFishTrapEntry(ItemStack loot, int chance){
+		try {
+			Class<?> FishTrapEntry = Class.forName("growthcraft.api.fishtrap.FishTrapEntry");
+			Object o = FishTrapEntry.getConstructor(ItemStack.class, int.class);
+			if (FishTrapEntry != null){
+				Constructor[] constructors = FishTrapEntry.getDeclaredConstructors();
+				constructors[0].setAccessible(true);
+				Object x = constructors[0].newInstance(loot, chance);
+				if (x != null){
+					return x;
+				}				
+			}
+		}
+		catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
+		
+		return null;
+	}
+	
+	private boolean invoke(Method m, ItemStack o, int p){
+		try {
+			Object I = createFishTrapEntry(o, p);
+			m.invoke(FishTrapRegistryO, I);
+			return true;
+		}
+		catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
+		return false;
 	}
 
-	public static void addTrapTreasure(final ItemStack loot, final int lootChance){
-		FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance));
+	public void addTrapJunk(final ItemStack loot, final int lootChance){
+		//FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance));
+		if (addTrapJunk != null){
+			invoke(addTrapJunk, loot, lootChance);
+		}
 
 	}
 
-	public static void addTrapFish(final ItemStack loot, final int lootChance){
-		FishTrapRegistry.instance().addTrapFish(new FishTrapEntry(loot, lootChance));
+	public void addTrapTreasure(final ItemStack loot, final int lootChance){
+		//FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance));
+		if (addTrapTreasure != null){
+			invoke(addTrapTreasure, loot, lootChance);
+		}
+	}
 
+	public void addTrapFish(final ItemStack loot, final int lootChance){
+		//FishTrapRegistry.instance().addTrapFish(new FishTrapEntry(loot, lootChance));
+		if (addTrapFish != null){
+			invoke(addTrapFish, loot, lootChance);
+		}
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java
index f988abd53a..62fe2f29cb 100644
--- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java
@@ -1,24 +1,84 @@
 package gtPlusPlus.xmod.growthcraft.fishtrap;
 
-import growthcraft.api.fishtrap.FishTrapEntry;
-import growthcraft.api.fishtrap.FishTrapRegistry;
+import java.lang.reflect.*;
+
 import net.minecraft.item.ItemStack;
 
 public class Growthcraft_Old {
 
-	public static void addTrapJunk(final ItemStack loot, final int lootChance){
-		FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance));
-
+	Method addTrapJunk;
+	Method addTrapTreasure;
+	Method addTrapFish;
+	Object FishTrapRegistryO;
+	
+	public Growthcraft_Old(){
+		setFishTrapRegistry();
+	}
+	
+	void setFishTrapRegistry(){
+		try {
+			Class<?> FishTrapRegistryClass = Class.forName("gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler.mFishingRegistry");
+			Class<?> FishTrapEntry = Class.forName("growthcraft.api.fishtrap.FishTrapEntry");
+			if (FishTrapRegistryClass.isInstance(FishTrapHandler.getFishingRegistry())){
+				addTrapJunk = FishTrapRegistryClass.getDeclaredMethod("addTrapJunk", FishTrapEntry);
+				addTrapTreasure = FishTrapRegistryClass.getDeclaredMethod("addTrapTreasure", FishTrapEntry);
+				addTrapFish = FishTrapRegistryClass.getDeclaredMethod("addTrapFish", FishTrapEntry);
+				FishTrapRegistryO = FishTrapHandler.getFishingRegistry();
+			}
+		}
+		catch (ClassNotFoundException | NoSuchMethodException | SecurityException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	private Object createFishTrapEntry(ItemStack loot, int chance){
+		try {
+			Class<?> FishTrapEntry = Class.forName("growthcraft.api.fishtrap.FishTrapEntry");
+			Object o = FishTrapEntry.getConstructor(ItemStack.class, int.class);
+			if (FishTrapEntry != null){
+				Constructor[] constructors = FishTrapEntry.getDeclaredConstructors();
+				constructors[0].setAccessible(true);
+				Object x = constructors[0].newInstance(loot, chance);
+				if (x != null){
+					return x;
+				}				
+			}
+		}
+		catch (ClassNotFoundException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
+		
+		return null;
+	}
+	
+	private boolean invoke(Method m, ItemStack o, int p){
+		try {
+			Object I = createFishTrapEntry(o, p);
+			m.invoke(FishTrapRegistryO, I);
+			return true;
+		}
+		catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
+		return false;
 	}
 
-	public static void addTrapTreasure(final ItemStack loot, final int lootChance){
-		FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance));
+	public void addTrapJunk(final ItemStack loot, final int lootChance){
+		//FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance));
+		if (addTrapJunk != null){
+			invoke(addTrapJunk, loot, lootChance);
+		}
 
 	}
 
-	public static void addTrapFish(final ItemStack loot, final int lootChance){
-		FishTrapRegistry.instance().addTrapFish(new FishTrapEntry(loot, lootChance));
+	public void addTrapTreasure(final ItemStack loot, final int lootChance){
+		//FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance));
+		if (addTrapTreasure != null){
+			invoke(addTrapTreasure, loot, lootChance);
+		}
+	}
 
+	public void addTrapFish(final ItemStack loot, final int lootChance){
+		//FishTrapRegistry.instance().addTrapFish(new FishTrapEntry(loot, lootChance));
+		if (addTrapFish != null){
+			invoke(addTrapFish, loot, lootChance);
+		}
 	}
 
 }