$ Fixed an ArrayOutOfBounds issue when generating Fish Trap loot.

$ Fixed Fish Trap and Rainforest oak Sapling recipes only generating when Thaumcraft was not installed.

2 files changed, 24 insertions, 20 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index b5f4bbc50f..992f004fe7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -4,6 +4,7 @@ import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.recipe.RecipeUtils;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
@@ -81,23 +82,26 @@ public class RECIPES_General {
 			GT_ModHandler.addPulverisationRecipe(ItemUtils.getSimpleStack(ModItems.shardTerra), ItemUtils.getSimpleStack(ModItems.dustTerra, 2));
 			GT_ModHandler.addPulverisationRecipe(ItemUtils.getSimpleStack(ModItems.shardAqua), ItemUtils.getSimpleStack(ModItems.dustAqua, 2));
 			
-			
-			//Rainforest oak Sapling
-			RecipeUtils.recipeBuilder(
-					"stickWood", "stickWood", "stickWood",
-					"stickWood", "treeSapling", "stickWood",
-					"stickWood", "dustBone", "stickWood",
-					ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest));
-			
-			//Iron bars
-			ItemStack ironBars = ItemUtils.getItemStack("minecraft:iron_bars", 1);
-			//Fish Trap
-			RecipeUtils.recipeBuilder(
-					ironBars, ironBars, ironBars,
-					ironBars, "frameGtWroughtIron", ironBars,
-					ironBars, ironBars, ironBars,
-					ItemUtils.getSimpleStack(ModBlocks.blockFishTrap));
-			
+		}
+		
+		//Rainforest oak Sapling
+		if (RecipeUtils.recipeBuilder(
+				"stickWood", "stickWood", "stickWood",
+				"stickWood", "treeSapling", "stickWood",
+				"stickWood", "dustBone", "stickWood",
+				ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))){
+		Utils.LOG_INFO("Added a recipe for Rainforest oak Saplings.");	
+		}
+		
+		//Iron bars
+		ItemStack ironBars = ItemUtils.getItemStack("minecraft:iron_bars", 1);
+		//Fish Trap
+		if (RecipeUtils.recipeBuilder(
+				ironBars, ironBars, ironBars,
+				ironBars, "frameGtWroughtIron", ironBars,
+				ironBars, ironBars, ironBars,
+				ItemUtils.getSimpleStack(ModBlocks.blockFishTrap))){
+		Utils.LOG_INFO("Added a recipe for the Fish Trap.");	
 		}
 
 	}
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
index f6dc0e7368..d27f350e4f 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
@@ -133,15 +133,15 @@ public class TileEntityFishTrap extends TileEntity{
 		//Pam Fish
 		else if (lootWeight <= 70){
 			if (LoadedMods.PamsHarvestcraft){
-				loot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(prefix+harvestcraftFish[MathUtils.randInt(0, harvestcraftFish.length)]+suffix, 1);
+				loot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(prefix+harvestcraftFish[MathUtils.randInt(0, harvestcraftFish.length)-1]+suffix, 1);
 			}
 			else {
-				loot = ItemUtils.getSimpleStack(minecraftFish[MathUtils.randInt(0, minecraftFish.length)], 1);
+				loot = ItemUtils.getSimpleStack(minecraftFish[MathUtils.randInt(0, minecraftFish.length)-1], 1);
 			}
 		}
 		//Minecraft Fish
 		else if (lootWeight <= 100){
-			loot = ItemUtils.getSimpleStack(minecraftFish[MathUtils.randInt(0, minecraftFish.length)], 1);
+			loot = ItemUtils.getSimpleStack(minecraftFish[MathUtils.randInt(0, minecraftFish.length)-1], 1);
 		}
 		else {
 			loot = ItemUtils.getSimpleStack(Blocks.diamond_ore);