From 99ebf8e09d19c949af4986fa20459c8f87c455ea Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Mon, 10 Jul 2017 00:22:21 +1000
Subject: $ Fixed .09 features trying to work in .08. + Moved lots of things to
 reflection again.

---
 .../GregtechMetaTileEntityGeothermalGenerator.java        |  2 --
 .../basic/GregtechMetaAtmosphericReconditioner.java       | 15 ++++++++-------
 .../machines/basic/GregtechMetaPollutionCreator.java      |  9 ++++-----
 .../machines/basic/GregtechMetaPollutionDetector.java     |  7 +++----
 .../basic/GregtechMetaTileEntity_BasicWasher.java         |  6 +++---
 .../gregtech/common/tools/TOOL_Gregtech_Choocher.java     |  1 -
 6 files changed, 18 insertions(+), 22 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
index b80352321c..681756cd67 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
@@ -135,8 +135,6 @@ extends GT_MetaTileEntity_BasicGenerator
 		return GT_Recipe_Map.sHotFuels;
 	}
 
-
-	@Override
 	public int getPollution() {
 		return 100;
 	}
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 3e321982cb..ba748e13d7 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
@@ -11,11 +11,12 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachin
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Pollution;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gtPlusPlus.core.item.general.ItemAirFilter;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.PollutionUtils;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.api.gui.basic.CONTAINER_PollutionCleaner;
 import gtPlusPlus.xmod.gregtech.api.gui.basic.GUI_PollutionCleaner;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -53,13 +54,13 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 		super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName, aNEIName);
 	}
 
-	public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+	/*public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
 		super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName, aNEIName);
-	}
+	}*/
 
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GregtechMetaAtmosphericReconditioner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
+		return new GregtechMetaAtmosphericReconditioner(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
 	}
 
 	@Override
@@ -184,7 +185,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 										Utils.LOG_WARNING("mPollutionReduction[1]:"+mPollutionReduction);
 
 										//I stole this code
-										mPollutionReduction = (GT_Utility.safeInt((long)mPollutionReduction*this.mBaseEff)/100000)*mAirSides;
+										mPollutionReduction = (MathUtils.safeInt((long)mPollutionReduction*this.mBaseEff)/100000)*mAirSides;
 										//Utils.LOG_WARNING("mPollutionReduction[2]:"+mPollutionReduction);
 										//mPollutionReduction = GT_Utility.safeInt((long)mPollutionReduction*this.mOptimalAirFlow/10000);
 										//Utils.LOG_WARNING("mPollutionReduction[3]:"+mPollutionReduction);
@@ -235,7 +236,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 	}
 
 	public int getCurrentChunkPollution(IGregTechTileEntity aBaseMetaTileEntity){
-		int mCurrentChunkPollution = GT_Pollution.getPollution(aBaseMetaTileEntity);
+		int mCurrentChunkPollution = PollutionUtils.getPollution(aBaseMetaTileEntity);
 		if (mCurrentChunkPollution > 0){
 			mHasPollution = true;
 		}
@@ -336,7 +337,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
 
 	public boolean removePollution(int toRemove){
 		int before = getCurrentChunkPollution();
-		GT_Pollution.addPollution(this.getBaseMetaTileEntity(), -toRemove);
+		PollutionUtils.addPollution(this.getBaseMetaTileEntity(), -toRemove);
 		int after = getCurrentChunkPollution();
 		return (after<before);	
 	}
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 62e9a6adcc..77f139ccd8 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
@@ -1,14 +1,13 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
 
-import gregtech.GT_Mod;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Pollution;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.PollutionUtils;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
@@ -187,7 +186,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
 	public int pollutionMultiplier = 1;
 
 	private void showPollution(final World worldIn, final EntityPlayer playerIn){
-		if(!GT_Mod.gregtechproxy.mPollution){
+		if(!PollutionUtils.mPollution()){
 			PlayerUtils.messagePlayer(playerIn, "This block is useless, Pollution is disabled.");		
 		}
 		else {
@@ -198,7 +197,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
 	}
 
 	private boolean addPollution(){
-        GT_Pollution.addPollution(getBaseMetaTileEntity(), 100000*pollutionMultiplier);
+		PollutionUtils.addPollution(getBaseMetaTileEntity(), 100000*pollutionMultiplier);
 		return true;
 	}
 
@@ -217,7 +216,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
 	}
 
 	public int getCurrentChunkPollution(IGregTechTileEntity aBaseMetaTileEntity){
-		return GT_Pollution.getPollution(aBaseMetaTileEntity);
+		return PollutionUtils.getPollution(aBaseMetaTileEntity);
 	}
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
index 61aacbf69f..4e6647060e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
@@ -1,14 +1,13 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
 
-import gregtech.GT_Mod;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
-import gregtech.common.GT_Pollution;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.PollutionUtils;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
@@ -173,7 +172,7 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
 	}
 
 	private void showPollution(final World worldIn, final EntityPlayer playerIn){
-		if(!GT_Mod.gregtechproxy.mPollution){
+		if(!PollutionUtils.mPollution()){
 			PlayerUtils.messagePlayer(playerIn, "This block is useless, Pollution is disabled.");		
 		}
 		else {
@@ -197,7 +196,7 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
 	}
 
 	public int getCurrentChunkPollution(IGregTechTileEntity aBaseMetaTileEntity){
-		return GT_Pollution.getPollution(aBaseMetaTileEntity);
+		return PollutionUtils.getPollution(aBaseMetaTileEntity);
 	}
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
index f744edb0db..dbc8fb4227 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
@@ -34,9 +34,9 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM
 		super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
 	}
 
-	public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
+	/*public GregtechMetaTileEntity_BasicWasher(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {
 		super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
-	}
+	}*/
 
 	@Override
 	public String[] getDescription() {
@@ -45,7 +45,7 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM
 
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GregtechMetaTileEntity_BasicWasher(this.mName, this.mTier, this.mDescriptionArray, this.mTextures, this.mGUIName, this.mNEIName);
+		return new GregtechMetaTileEntity_BasicWasher(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
index 46bd28d318..490f3d7163 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
@@ -102,7 +102,6 @@ extends GT_Tool {
 		return true;
 	}
 
-	@Override
 	public boolean isWrench(){
 		return true;
 	}
-- 
cgit