+ Added a returnLargestNumber function to MathUtils.java

+ Wrote up some really bad version parsing code, will replace with a Regex function later.
% Changed Growthcraft FishTrap handling to support newer versions.

2 files changed, 47 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
index 472c4c6a1f..30c799d49b 100644
--- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
@@ -13,7 +13,12 @@ public class FishTrapHandler {
 	private static final String[] fishTypes = {"fish", "junk", "treasure"};
 
 	protected static void addFish(String lootType, ItemStack lootStack, int lootChance){
-		if (LoadedMods.getModVersion("Growthcraft").contains("2.3.1")){
+		
+		String GCVersion = LoadedMods.getModVersion("Growthcraft");
+		
+		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.");
@@ -30,6 +35,23 @@ public class FishTrapHandler {
 				return;
 			}
 		}
+		else if (LoadedMods.getModVersion("Growthcraft").contains("2.7.2")){
+			if (lootType.equals(fishTypes[0])){
+				Growthcraft_New.addTrapFish(lootStack, lootChance);
+				Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as an extra Fish for Growthcraft Fishtraps.");
+			}
+			else if (lootType.equals(fishTypes[1])){
+				Growthcraft_New.addTrapJunk(lootStack, lootChance);
+				Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as extra Junk for Growthcraft Fishtraps.");
+			}
+			else if (lootType.equals(fishTypes[2])){
+				Growthcraft_New.addTrapTreasure(lootStack, lootChance);
+				Utils.LOG_INFO("Added "+lootStack.getDisplayName()+" as extra Treasure for Growthcraft Fishtraps.");
+			}
+			else {
+				return;
+			}
+		}
 		
 		else {
 			Utils.LOG_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
new file mode 100644
index 0000000000..5b744623c7
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java
@@ -0,0 +1,24 @@
+package gtPlusPlus.xmod.growthcraft.fishtrap;
+
+import growthcraft.api.fishtrap.FishTrapEntry;
+import growthcraft.api.fishtrap.FishTrapRegistry;
+import net.minecraft.item.ItemStack;
+
+public class Growthcraft_New {
+
+	public static void addTrapJunk(ItemStack loot, int lootChance){
+	    FishTrapRegistry.instance().addTrapJunk(new FishTrapEntry(loot, lootChance));
+
+	}
+
+	public static void addTrapTreasure(ItemStack loot, int lootChance){
+	    FishTrapRegistry.instance().addTrapTreasure(new FishTrapEntry(loot, lootChance));
+
+	}
+
+	public static void addTrapFish(ItemStack loot, int lootChance){
+		FishTrapRegistry.instance().addTrapFish(new FishTrapEntry(loot, lootChance));
+
+	}
+
+}