% Made Rainforest Oaks not rely on BoP.

% Tweaked Fish Catcher loot rates.
% Tweaked Advanced Boiler output rates.

3 files changed, 17 insertions, 9 deletions

diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
index aec4048582..176d65ceac 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
@@ -124,17 +124,17 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
 		if (lootWeight <= 5) {
 			loot = ItemUtils.getSimpleStack(Items.slime_ball);
 		}
-		else if (lootWeight <= 15) {
+		else if (lootWeight <= 10) {
 			loot = ItemUtils.getSimpleStack(Items.bone);
 		}
-		else if (lootWeight <= 25) {
+		else if (lootWeight <= 20) {
 			loot = ItemUtils.getSimpleStack(Blocks.sand);
 		}
-		else if (lootWeight <= 35) {
+		else if (lootWeight <= 30) {
 			loot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(seaweed, 1);
 		}
 		// Pam Fish
-		else if (lootWeight <= 70) {
+		else if (lootWeight <= 60) {
 			if (LoadedMods.PamsHarvestcraft) {
 				loot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
 						prefix + harvestcraftFish[MathUtils.randInt(0, harvestcraftFish.length - 1)] + suffix, 1);
@@ -144,9 +144,17 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
 			}
 		}
 		// Minecraft Fish
-		else if (lootWeight <= 100) {
+		else if (lootWeight <= 99) {
 			loot = ItemUtils.getSimpleStack(minecraftFish[MathUtils.randInt(0, minecraftFish.length - 1)], 1);
 		}
+		else if (lootWeight == 100){
+			if (MathUtils.randInt(0, 1) == 0){
+			loot = ItemUtils.getSimpleStack(Items.emerald);
+			}
+			else {
+				loot = ItemUtils.getSimpleStack(Items.diamond);
+			}
+		}
 		else {
 			loot = ItemUtils.getSimpleStack(Blocks.diamond_ore);
 		}
diff --git a/src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java b/src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java
index 2c109b8834..3ee719be4d 100644
--- a/src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java
+++ b/src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java
@@ -8,9 +8,9 @@ public class HANDLER_BiomesOPlenty {
 	
 	
 	public static void preInit(){
-		if (LoadedMods.BiomesOPlenty){
+		//if (LoadedMods.BiomesOPlenty){
 			BOP_Block_Registrator.run();
-		}
+		//}
 
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
index 1aece5e35d..d90957bcd2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
@@ -28,14 +28,14 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 	public GT_MetaTileEntity_Boiler_Base(int aID, String aNameRegional, int aBoilerTier) {
 		super(aID, "electricboiler." + aBoilerTier + ".tier.single", aNameRegional,
 				"Produces " + (750 + (250 * aBoilerTier)) + "L of Steam per second");
-		this.mSteamPerSecond = (750 + (250 * aBoilerTier));
+		this.mSteamPerSecond = (750 * aBoilerTier);
 		this.mPollutionPerSecond = 20 + (15 * aBoilerTier);
 		this.mBoilerTier = aBoilerTier;
 	}
 
 	public GT_MetaTileEntity_Boiler_Base(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
 		super(aName, aTier, aDescription, aTextures);
-		this.mSteamPerSecond = (750 + (250 * aTier));
+		this.mSteamPerSecond = (750 * aBoilerTier);
 		this.mPollutionPerSecond = 20 + (15 * aTier);
 		this.mBoilerTier = aTier;
 	}