% Raised the Hardness of Fish Traps. Closes #410.

$ Mild improvements to pollution devices. Fixes #417.
> Closes #409. (Issue fixed, forgot to close.)

4 files changed, 251 insertions, 82 deletions

diff --git a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java
index 8e5f8a33f5..b5e78f23ef 100644
--- a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java
+++ b/src/Java/gtPlusPlus/core/block/machine/FishTrap.java
@@ -50,6 +50,7 @@ public class FishTrap extends BlockContainer implements ITileTooltip
 	{
 		super(Material.iron);
 		this.setBlockName("blockFishTrap");
+		this.setHardness(5f);
 		this.setCreativeTab(AddToCreativeTab.tabMachines);
 		GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockFishTrap");
 		LanguageRegistry.addName(this, "Fish Catcher");
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index d4f217bbfd..dde785cee6 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -10,18 +10,22 @@ import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
 import gregtech.common.GT_Proxy;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.chunk.Chunk;
 
 public class PollutionUtils {
 
 	private static boolean mIsPollutionEnabled = true;
 
+	private static Method mAddPollution;
+	private static Method mAddPollution2;
+
+	private static Method mGetPollution;
+	private static Method mGetPollution2;
+
 	static {
 		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) {
 			mIsPollutionEnabled = mPollution();
-		}
-		else {
+		} else {
 			mIsPollutionEnabled = false;
 		}
 	}
@@ -42,65 +46,123 @@ public class PollutionUtils {
 
 	public static boolean addPollution(IGregTechTileEntity te, int pollutionValue) {
 		if (mIsPollutionEnabled)
-		try {
-			Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
-			if (GT_Pollution != null) {
-				Method addPollution = GT_Pollution.getMethod("addPollution", IGregTechTileEntity.class, int.class);
-				if (addPollution != null) {
-					addPollution.invoke(null, te, pollutionValue);
-					return true;
+			try {
+				if (te == null) {
+					return false;
 				}
+				if (mAddPollution != null) {
+					mAddPollution.invoke(null, te, pollutionValue);
+				}
+				Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
+				if (GT_Pollution != null) {
+					Method addPollution = GT_Pollution.getMethod("addPollution", IGregTechTileEntity.class, int.class);
+					if (addPollution != null) {
+						mAddPollution = addPollution;
+						addPollution.invoke(null, te, pollutionValue);
+						return true;
+					}
+				}
+			} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
+					| IllegalArgumentException | InvocationTargetException e) {
 			}
-		} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
-				| IllegalArgumentException | InvocationTargetException e) {
-		}
 		return false;
 	}
 
-	public static int getPollution(IGregTechTileEntity te) {
+	public static boolean addPollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) {
 		if (mIsPollutionEnabled)
-		try {
-			Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
-			if (GT_Pollution != null) {
-				Method addPollution = GT_Pollution.getMethod("getPollution", IGregTechTileEntity.class);
-				if (addPollution != null) {
-					return (int) addPollution.invoke(null, te);
+			try {
+				if (aTileOfSomeSort == null) {
+					return false;
 				}
+				IHasWorldObjectAndCoords j = (IHasWorldObjectAndCoords) aTileOfSomeSort;
+				Chunk c = j.getWorld().getChunkFromBlockCoords(j.getXCoord(), j.getZCoord());
+				return addPollution(c, pollutionValue);
+			} catch (SecurityException | IllegalArgumentException e) {
 			}
-		} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
-				| IllegalArgumentException | InvocationTargetException e) {
-		}
-		return 0;
+		return false;
 	}
 
-	public static boolean addPollution(Object aTileOfSomeSort, int pollutionValue) {
+	public static boolean addPollution(Chunk aChunk, int pollutionValue) {
 		if (mIsPollutionEnabled)
-		try {
-			Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
-			if (GT_Pollution != null) {
-				Method addPollution = GT_Pollution.getMethod("addPollution", Chunk.class, int.class);
-				if (addPollution != null) {
-					IHasWorldObjectAndCoords j = (IHasWorldObjectAndCoords) aTileOfSomeSort;
-					if (j != null) {
-						Chunk c = j.getWorld().getChunkFromBlockCoords(j.getXCoord(), j.getZCoord());
-						addPollution.invoke(null, c, pollutionValue);
+			try {
+				if (aChunk == null) {
+					return false;
+				}
+				if (mAddPollution2 != null) {
+					mAddPollution2.invoke(null, aChunk, pollutionValue);
+					return true;
+				}
+				Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
+				if (GT_Pollution != null) {
+					Method addPollution = GT_Pollution.getMethod("addPollution", Chunk.class, int.class);
+					if (addPollution != null) {
+						mAddPollution2 = addPollution;
+						mAddPollution2.invoke(null, aChunk, pollutionValue);
 						return true;
-					} else {
-						TileEntity t = (TileEntity) aTileOfSomeSort;
-						if (t != null) {
-							Chunk c = t.getWorldObj().getChunkFromBlockCoords(t.xCoord, t.zCoord);
-							addPollution.invoke(null, c, pollutionValue);
-							return true;
-						}
 					}
-
 				}
+			} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
+					| IllegalArgumentException | InvocationTargetException e) {
 			}
-		} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
-				| IllegalArgumentException | InvocationTargetException e) {
-		}
 		return false;
+	}
+
+	public static boolean removePollution(IGregTechTileEntity te, int pollutionValue) {
+		return addPollution(te, -pollutionValue);
+	}
+
+	public static boolean removePollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) {
+		return addPollution(aTileOfSomeSort, -pollutionValue);
+	}
+
+	public static boolean removePollution(Chunk aChunk, int pollutionValue) {
+		return addPollution(aChunk, -pollutionValue);
+	}
+
+	public static int getPollution(IGregTechTileEntity te) {
+		if (mIsPollutionEnabled)
+			try {
+				if (te == null) {
+					return 0;
+				}
+				if (mGetPollution != null) {
+					mGetPollution.invoke(null, te);
+				}
+				Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
+				if (GT_Pollution != null) {
+					Method addPollution = GT_Pollution.getMethod("getPollution", IGregTechTileEntity.class);
+					if (addPollution != null) {
+						mGetPollution = addPollution;
+						return (int) addPollution.invoke(null, te);
+					}
+				}
+			} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
+					| IllegalArgumentException | InvocationTargetException e) {
+			}
+		return 0;
+	}
 
+	public static int getPollution(Chunk te) {
+		if (mIsPollutionEnabled)
+			try {
+				if (te == null) {
+					return 0;
+				}
+				if (mGetPollution2 != null) {
+					mGetPollution2.invoke(null, te);
+				}
+				Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
+				if (GT_Pollution != null) {
+					Method addPollution = GT_Pollution.getMethod("getPollution", Chunk.class);
+					if (addPollution != null) {
+						mGetPollution2 = addPollution;
+						return (int) addPollution.invoke(null, te);
+					}
+				}
+			} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
+					| IllegalArgumentException | InvocationTargetException e) {
+			}
+		return 0;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
index fad09027c4..022dcaaef2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
@@ -18,7 +18,6 @@ import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.general.ItemAirFilter;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
@@ -30,6 +29,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
 
 public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_BasicMachine {
 
@@ -42,9 +43,6 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 	
 	protected boolean mSaveRotor = false;
 
-	private int mDamageFactorLow = 5;
-	private float mDamageFactorHigh =  (float) 0.6000000238418579;
-
 	public GregtechMetaAtmosphericReconditioner(int aID, String aName, String aNameRegional, int aTier) {
 		super(aID, aName, aNameRegional, aTier, 2, "Making sure you don't live in Gwalior - Uses 2A", 2, 0, "Recycler.png", "", 
 				new ITexture[]{
@@ -67,21 +65,30 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 		super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName, aNEIName);
 	}*/
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
 		return new GregtechMetaAtmosphericReconditioner(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public String[] getDescription() {
+		
+		boolean highTier = this.mTier >= 7;
+		
+		
 		return new String[]{
 				this.mDescription,
+				highTier ? "Will attempt to remove 1/4 pollution from 8 surrounding chunks" : "",
+						highTier ? "If these chunks are not loaded, they will be ignored" : "",
 				"Requires a turbine rotor and an Air Filter [T1/T2] to run.",
 				"The turbine rotor must be manually inserted/replaced",
 				"Can be configured with a soldering iron to change modes",
 				"Low Efficiency: Removes half pollution, Turbine takes 50% dmg",
 				"High Efficiency: Removes full pollution, Turbine takes 100% dmg",
 				"Turbine Rotor will not break in LE mode",
+				
 				};
 	}
 
@@ -288,11 +295,48 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 
 
 	public int getCurrentChunkPollution(){
-		return getCurrentChunkPollution(this.getBaseMetaTileEntity());
+		int mCurrentChunkPollution = 0;
+		if (this.mTier < 7) {
+			mCurrentChunkPollution = PollutionUtils.getPollution(getBaseMetaTileEntity());			
+		}
+		else {
+			AutoMap<Chunk> aSurrounding = new AutoMap<Chunk>();				
+			World aWorld = this.getBaseMetaTileEntity().getWorld();
+			int xPos = this.getBaseMetaTileEntity().getXCoord();
+			int zPos = this.getBaseMetaTileEntity().getZCoord();
+			Chunk a1 = aWorld.getChunkFromBlockCoords(xPos-32, zPos-32);
+			Chunk a2 = aWorld.getChunkFromBlockCoords(xPos-32, zPos);
+			Chunk a3 = aWorld.getChunkFromBlockCoords(xPos-32, zPos+32);
+			Chunk b1 = aWorld.getChunkFromBlockCoords(xPos, zPos-32);
+			Chunk b2 = aWorld.getChunkFromBlockCoords(xPos, zPos);
+			Chunk b3 = aWorld.getChunkFromBlockCoords(xPos, zPos+32);
+			Chunk c1 = aWorld.getChunkFromBlockCoords(xPos+32, zPos-32);
+			Chunk c2 = aWorld.getChunkFromBlockCoords(xPos+32, zPos);
+			Chunk c3 = aWorld.getChunkFromBlockCoords(xPos+32, zPos+32);
+			aSurrounding.put(a1);		
+			aSurrounding.put(a2);		
+			aSurrounding.put(a3);		
+			aSurrounding.put(b1);		
+			aSurrounding.put(b2);		
+			aSurrounding.put(b3);		
+			aSurrounding.put(c1);		
+			aSurrounding.put(c2);		
+			aSurrounding.put(c3);			
+			for (Chunk r : aSurrounding) {
+				mCurrentChunkPollution += getPollutionInChunk(r);
+			}			
+		}		
+		if (mCurrentChunkPollution > 0){
+			mHasPollution = true;
+		}
+		else {
+			mHasPollution = false;
+		}
+		return mCurrentChunkPollution;		
 	}
 
-	public int getCurrentChunkPollution(IGregTechTileEntity aBaseMetaTileEntity){
-		int mCurrentChunkPollution = PollutionUtils.getPollution(aBaseMetaTileEntity);
+	public int getPollutionInChunk(Chunk aChunk){
+		int mCurrentChunkPollution = PollutionUtils.getPollution(aChunk);
 		if (mCurrentChunkPollution > 0){
 			mHasPollution = true;
 		}
@@ -301,7 +345,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 		}
 		return mCurrentChunkPollution;
 	}
-
+	
 	public boolean hasRotor(ItemStack rotorStack){
 		if(rotorStack != null){ 
 			if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool  && rotorStack.getItemDamage() >= 170 && rotorStack.getItemDamage() <= 179){
@@ -432,14 +476,92 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 	}
 
 	public boolean removePollution(int toRemove){
+		
+		if (this == null || this.getBaseMetaTileEntity() == null || this.getBaseMetaTileEntity().getWorld() == null) {
+			return false;
+		}
+		
+		if (this.mTier < 7) {
+			int startPollution = getCurrentChunkPollution();
+			PollutionUtils.removePollution(this.getBaseMetaTileEntity(), toRemove);
+			int after = getCurrentChunkPollution();
+			return (after<startPollution);	
+		}
+		else {
+			int chunksWithRemoval = 0;
+			int totalRemoved = 0;			
+			AutoMap<Chunk> aSurrounding = new AutoMap<Chunk>();
+			Chunk aThisChunk = this.getBaseMetaTileEntity().getWorld().getChunkFromBlockCoords(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getZCoord());
+			int mainChunkX = aThisChunk.xPosition;
+			int mainChunkZ = aThisChunk.zPosition;			
+			
+			World aWorld = this.getBaseMetaTileEntity().getWorld();
+			int xPos = this.getBaseMetaTileEntity().getXCoord();
+			int zPos = this.getBaseMetaTileEntity().getZCoord();
+
+			Chunk a1 = aWorld.getChunkFromBlockCoords(xPos-32, zPos-32);
+			Chunk a2 = aWorld.getChunkFromBlockCoords(xPos-32, zPos);
+			Chunk a3 = aWorld.getChunkFromBlockCoords(xPos-32, zPos+32);
+			Chunk b1 = aWorld.getChunkFromBlockCoords(xPos, zPos-32);
+			Chunk b2 = aWorld.getChunkFromBlockCoords(xPos, zPos);
+			Chunk b3 = aWorld.getChunkFromBlockCoords(xPos, zPos+32);
+			Chunk c1 = aWorld.getChunkFromBlockCoords(xPos+32, zPos-32);
+			Chunk c2 = aWorld.getChunkFromBlockCoords(xPos+32, zPos);
+			Chunk c3 = aWorld.getChunkFromBlockCoords(xPos+32, zPos+32);
+
+			aSurrounding.put(a1);		
+			aSurrounding.put(a2);		
+			aSurrounding.put(a3);		
+			aSurrounding.put(b1);		
+			aSurrounding.put(b2);		
+			aSurrounding.put(b3);		
+			aSurrounding.put(c1);		
+			aSurrounding.put(c2);		
+			aSurrounding.put(c3);			
+			
+			for (Chunk r : aSurrounding) {
+				if (!r.isChunkLoaded) {
+					continue;
+				}
+				
+				int startPollution = getPollutionInChunk(r);
+				if (startPollution == 0) {
+					continue;
+				}
+								
+				Logger.WARNING("Trying to remove pollution from chunk "+r.xPosition+", "+r.zPosition+" | "+startPollution);
+				int after = 0;
+				boolean isMainChunk = r.isAtLocation(mainChunkX, mainChunkZ);
+				
+				int removal = Math.max(0, !isMainChunk ? (toRemove/4) : toRemove);
+				if (removePollution(r, removal)) {
+					chunksWithRemoval++;
+					after = getPollutionInChunk(r);
+				}
+				else {
+					after = 0;
+				}
+				if (startPollution - after > 0) {
+					totalRemoved += (startPollution - after);
+				}
+				Logger.WARNING("Removed "+(startPollution - after)+" pollution from chunk "+r.xPosition+", "+r.zPosition+" | "+after);				
+			}
+			return totalRemoved > 0 && chunksWithRemoval > 0;	
+		}
+	}
+	
+	public boolean removePollution(Chunk aChunk, int toRemove){
 		int before = getCurrentChunkPollution();
-		PollutionUtils.addPollution(this.getBaseMetaTileEntity(), -toRemove);
+		PollutionUtils.removePollution(aChunk, toRemove);
 		int after = getCurrentChunkPollution();
 		return (after<before);	
 	}
 
 
 	public boolean hasAirFilter(ItemStack filter){
+		if (filter == null) {
+			return false;
+		}		
 		if (filter.getItem() instanceof ItemAirFilter){
 			return true;
 		}		
@@ -448,13 +570,13 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 
 	public boolean damageAirFilter(){
 		ItemStack filter = this.mInventory[this.SLOT_FILTER];
+		if (filter == null) {
+			return false;
+		}
 		
 		boolean creativeRotor = false;
 		ItemStack rotorStack = this.mInventory[SLOT_ROTOR];
-		if (rotorStack == null) {
-			return false;
-		}
-		else {				
+		if (rotorStack != null) {			
 			if(rotorStack.getItem() instanceof GT_MetaGenerated_Tool_01) {
 				Materials t1 = GT_MetaGenerated_Tool.getPrimaryMaterial(rotorStack);
 				Materials t2 = GT_MetaGenerated_Tool.getSecondaryMaterial(rotorStack);
@@ -467,9 +589,6 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 		if (creativeRotor) {
 			return true;
 		}
-		if (filter == null) {
-			return false;
-		}
 		
 
 		if (filter.getItem() instanceof ItemAirFilter){
@@ -560,6 +679,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 		int mAirSides = getFreeSpaces();
 		int reduction = 0;
 		
+		try {
 		long tVoltage = maxEUInput();
 		byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
 		reduction += (((Math.max((tTier-2), 1)*2)*50)*mAirSides); 
@@ -567,6 +687,10 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 		reduction = GT_Utility.safeInt(((long)reduction/100)*this.mOptimalAirFlow);
 		
 		aTooltipSuper.put("Maximum pollution removed per second: "+reduction);	
+		}
+		catch (Throwable t) {
+			aTooltipSuper.put("Maximum pollution removed per second: "+mPollutionReduction);
+		}
 		aTooltipSuper.put("Air Sides: "+mAirSides);		
 		return aTooltipSuper.toArray();
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
index 0309f876b5..c7f63e3bc2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
@@ -117,7 +117,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
 
 	@Override
 	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-		if (pollutionMultiplier >= 9){
+		if (pollutionMultiplier > 99){
 			pollutionMultiplier = 1;
 		}
 		else {
@@ -354,27 +354,9 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
 		super.onPostTick(aBaseMetaTileEntity, aTick);
 		if (this.getBaseMetaTileEntity().isServerSide()) {
 			//TickTimer - 20 times a second
-			if (this.mTickTimer >= 0 || this.mTickTimer <= 19){
-				this.mTickTimer++;
-			}
-			else {
-				this.mTickTimer = 0;
-				//Perform pollution update once a second
+			this.mTickTimer++;			
+			if (mTickTimer % 20 == 0){
 				this.mCurrentPollution = getCurrentChunkPollution();
-				this.mSecondTimer++;
-			}
-			//Update Pollution array once a minute
-			if (this.mSecondTimer >= 60){
-				Utils.sendServerMessage("Udating Average of pollution array. Using Array slot"+this.mArrayPos);
-				this.mSecondTimer = 0;
-				if (this.mArrayPos<this.mAveragePollutionArray.length){
-					this.mAveragePollutionArray[this.mArrayPos] = this.mCurrentPollution;
-					this.mArrayPos++;
-				}
-				else if (this.mArrayPos==this.mAveragePollutionArray.length){
-					this.mAveragePollutionArray[this.mArrayPos] = this.mCurrentPollution;
-					this.mArrayPos = 0;
-				}
 			}
 		}		
 	}