> 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

1 files changed, 69 insertions, 9 deletions

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);
+		}
 	}
 
 }