diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech')
50 files changed, 124 insertions, 158 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java index dd38f1ab26..5919a71b25 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java @@ -20,10 +20,9 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.metatileentity.implementations.MTEMultiBlockBase; import gregtech.api.objects.GTRenderedTexture; -import gregtech.common.Pollution; +import gregtech.common.pollution.Pollution; import gtPlusPlus.core.item.general.ItemAirFilter; import gtPlusPlus.core.lib.GTPPCore; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -31,21 +30,6 @@ public class MTEHatchMufflerAdvanced extends MTEHatchMuffler implements IAddGreg protected int SLOT_FILTER = 0; - @Override - public void onConfigLoad() { - super.onConfigLoad(); - try { - int a1 = GTMod.gregtechproxy.mPollutionSmogLimit; - if (a1 > 0) { - mPollutionSmogLimit = a1; - } - } catch (Throwable t) { - mPollutionSmogLimit = 500000; - } - } - - private int mPollutionSmogLimit = 500000; - public MTEHatchMufflerAdvanced(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, 1, new String[] { "" }); } @@ -271,8 +255,8 @@ public class MTEHatchMufflerAdvanced extends MTEHatchMuffler implements IAddGreg boolean chk1 = ran1 * 100.0F < (float) this.calculatePollutionReduction(100); boolean chk2; boolean chk3; - int aPollutionAmount = PollutionUtils.getPollution(getBaseMetaTileEntity()); - if (aPollutionAmount >= mPollutionSmogLimit) { + int aPollutionAmount = Pollution.getPollution(getBaseMetaTileEntity()); + if (aPollutionAmount >= GTMod.gregtechproxy.mPollutionSmogLimit) { ran2 = GTPPCore.RANDOM.nextFloat(); ran3 = GTPPCore.RANDOM.nextFloat(); chk2 = ran2 * 100.0F < (float) this.calculatePollutionReduction(100); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java index 40678f203f..e7480e0f12 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java @@ -21,10 +21,10 @@ import gregtech.api.metatileentity.implementations.MTEBasicTank; import gregtech.api.recipe.RecipeMap; import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; -import gtPlusPlus.core.config.Configuration; +import gregtech.common.pollution.Pollution; +import gregtech.common.pollution.PollutionConfig; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements RecipeMapWorkable { @@ -33,19 +33,19 @@ public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements public MTERocketFuelGeneratorBase(final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription, final ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures); - pollMin = (int) (Configuration.pollution.baseMinPollutionPerSecondRocketFuelGenerator - * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); - pollMax = (int) (Configuration.pollution.baseMaxPollutionPerSecondRocketFuelGenerator - * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMin = (int) (PollutionConfig.baseMinPollutionPerSecondRocketFuelGenerator + * PollutionConfig.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMax = (int) (PollutionConfig.baseMaxPollutionPerSecondRocketFuelGenerator + * PollutionConfig.pollutionReleasedByTierRocketFuelGenerator[mTier]); } public MTERocketFuelGeneratorBase(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); - pollMin = (int) (Configuration.pollution.baseMinPollutionPerSecondRocketFuelGenerator - * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); - pollMax = (int) (Configuration.pollution.baseMaxPollutionPerSecondRocketFuelGenerator - * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMin = (int) (PollutionConfig.baseMinPollutionPerSecondRocketFuelGenerator + * PollutionConfig.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMax = (int) (PollutionConfig.baseMaxPollutionPerSecondRocketFuelGenerator + * PollutionConfig.pollutionReleasedByTierRocketFuelGenerator[mTier]); } @Override @@ -233,7 +233,7 @@ public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) { int aSafeFloor = (int) Math.max(((tFluidAmountToUse * tConsumed) / 3), 1); this.mFluid.amount -= aSafeFloor; - PollutionUtils.addPollution(getBaseMetaTileEntity(), 10 * getPollution()); + Pollution.addPollution(getBaseMetaTileEntity(), 10 * getPollution()); } } } @@ -247,7 +247,7 @@ public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements if (aBaseMetaTileEntity.addStackToSlot(this.getOutputSlot(), tEmptyContainer)) { aBaseMetaTileEntity.increaseStoredEnergyUnits(tFuelValue, true); aBaseMetaTileEntity.decrStackSize(this.getInputSlot(), 1); - PollutionUtils.addPollution(getBaseMetaTileEntity(), getPollution() / 2); + Pollution.addPollution(getBaseMetaTileEntity(), getPollution() / 2); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java index c16cec179e..97167ca798 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java @@ -23,6 +23,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GTItemStack; import gregtech.api.objects.GTRenderedTexture; import gregtech.api.util.GTOreDictUnificator; +import gregtech.common.pollution.PollutionConfig; import gregtech.common.tileentities.boilers.MTEBoiler; import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; @@ -232,8 +233,8 @@ public class MTEBoilerBase extends MTEBoiler { @Override protected int getPollution() { - return (int) (Configuration.pollution.basePollutionPerSecondBoiler - * Configuration.pollution.pollutionReleasedByTierBoiler[this.tier]); + return (int) (PollutionConfig.basePollutionPerSecondBoiler + * PollutionConfig.pollutionReleasedByTierBoiler[this.tier]); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java index e1fc5c57f0..b89a6092dc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java @@ -18,7 +18,7 @@ import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTModHandler; -import gtPlusPlus.core.config.Configuration; +import gregtech.common.pollution.PollutionConfig; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -161,7 +161,7 @@ public class MTEGeothermalGenerator extends MTEBasicGenerator { @Override public int getPollution() { - return (int) (Configuration.pollution.basePollutionPerSecondGeothermalGenerator - * Configuration.pollution.pollutionReleasedByTierGeothermalGenerator[mTier]); + return (int) (PollutionConfig.basePollutionPerSecondGeothermalGenerator + * PollutionConfig.pollutionReleasedByTierGeothermalGenerator[mTier]); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java index 9f70912cad..ddad318ccf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java @@ -18,11 +18,11 @@ import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; +import gregtech.common.pollution.Pollution; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import tectech.util.TTUtility; @@ -147,7 +147,7 @@ public class MTERTGenerator extends MTEBasicGenerator { } } if ((tProducedEU > 0L) && (getPollution() > 0)) { - PollutionUtils + Pollution .addPollution(aBaseMetaTileEntity, (int) (tProducedEU * getPollution() / 500 * this.mTier + 1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java index d499093247..3e22764a6e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java @@ -17,9 +17,9 @@ import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTUtility; +import gregtech.common.pollution.PollutionConfig; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; public class MTESemiFluidGenerator extends MTEBasicGenerator { @@ -38,8 +38,8 @@ public class MTESemiFluidGenerator extends MTEBasicGenerator { @Override public int getPollution() { - return (int) (Configuration.pollution.basePollutionPerSecondSemiFluidGenerator - * Configuration.pollution.pollutionReleasedByTierSemiFluidGenerator[this.mTier]); + return (int) (PollutionConfig.basePollutionPerSecondSemiFluidGenerator + * PollutionConfig.pollutionReleasedByTierSemiFluidGenerator[this.mTier]); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java index 5a42319548..2dde10f187 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java @@ -21,7 +21,6 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.GTMod; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; @@ -37,12 +36,12 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTUtility; import gregtech.common.items.IDMetaTool01; import gregtech.common.items.MetaGeneratedTool01; +import gregtech.common.pollution.Pollution; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.general.ItemAirFilter; import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -54,7 +53,6 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { protected boolean mHasPollution = false; protected int SLOT_ROTOR = 5; protected int SLOT_FILTER = 6; - protected static boolean mPollutionEnabled = true; protected boolean mSaveRotor = false; @@ -76,12 +74,10 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent), new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB)); - mPollutionEnabled = GTMod.gregtechproxy.mPollution; } public MTEAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 2, aDescription, aTextures, 2, 0); - mPollutionEnabled = GTMod.gregtechproxy.mPollution; } @Override @@ -105,13 +101,6 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { "High Efficiency: Removes full pollution, Turbine takes 100% dmg", "Turbine Rotor will not break in LE mode", "Insert an equal tier Conveyor Module to enable automation"); - if (!mPollutionEnabled) { - String[] B = new String[] { "===============================================", - "Pollution is disabled, scrubbers will now have a bonus use", - "They are now able to remove ALL lingering pollution as GT ignores it", "and it will linger forever!", - "===============================================", }; - A = ArrayUtils.addAll(A, B); - } return A; } @@ -239,15 +228,6 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { Logger .INFO("Has Pollution? " + mHasPollution + ", Current Pollution: " + mCurrentPollution); - // Only check every 30s. - if (!isIdle && aTick % (20L * 30) == 0L) { - mPollutionEnabled = GTMod.gregtechproxy.mPollution; - // Clear out pollution if it's disabled, because I am a nice gal. - if (!GTMod.gregtechproxy.mPollution) { - PollutionUtils.nullifyPollution(this.getBaseMetaTileEntity()); - } - } - // Use a Turbine if (hasRotor(stackRotor) && hasAirFilter(stackFilter)) { Logger.INFO("Found Turbine."); @@ -352,7 +332,7 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { public int getCurrentChunkPollution() { int mCurrentChunkPollution = 0; if (this.mTier < 7) { - mCurrentChunkPollution = PollutionUtils.getPollution(getBaseMetaTileEntity()); + mCurrentChunkPollution = Pollution.getPollution(getBaseMetaTileEntity()); } else { ArrayList<Chunk> aSurrounding = new ArrayList<>(); World aWorld = this.getBaseMetaTileEntity() @@ -388,7 +368,7 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { } public int getPollutionInChunk(Chunk aChunk) { - int mCurrentChunkPollution = PollutionUtils.getPollution(aChunk); + int mCurrentChunkPollution = Pollution.getPollution(aChunk); mHasPollution = mCurrentChunkPollution > 0; return mCurrentChunkPollution; } @@ -565,7 +545,7 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { if (this.mTier < 7) { int startPollution = getCurrentChunkPollution(); Logger.INFO("Current Chunk Pollution: " + startPollution); - PollutionUtils.removePollution(this.getBaseMetaTileEntity(), toRemove); + Pollution.addPollution(this.getBaseMetaTileEntity(), -toRemove); int after = getCu |