From c74367258e8a2a60392234d2a1a13e0a19433795 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 19 Sep 2024 23:05:17 +0200 Subject: migrate GT++ config to GTNHLib (#3193) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz --- .../java/gtPlusPlus/xmod/gregtech/HandlerGT.java | 2 - .../implementations/base/GTPPMultiBlockBase.java | 4 +- .../generators/MTERocketFuelGeneratorBase.java | 17 +- .../common/blocks/textures/TexturesGtBlock.java | 4 +- .../tileentities/generators/MTEBoilerBase.java | 11 +- .../generators/MTEGeothermalGenerator.java | 5 +- .../generators/MTESemiFluidGenerator.java | 5 +- .../basic/MTEAtmosphericReconditioner.java | 9 +- .../machines/basic/MTEPollutionCreator.java | 3 +- .../machines/basic/MTEPollutionDetector.java | 3 +- .../machines/multi/misc/MTEAmazonPackager.java | 4 +- .../processing/MTEIndustrialAlloySmelter.java | 3 +- .../multi/processing/MTEIndustrialArcFurnace.java | 3 +- .../multi/processing/MTEIndustrialCentrifuge.java | 3 +- .../multi/processing/MTEIndustrialChisel.java | 3 +- .../multi/processing/MTEIndustrialCokeOven.java | 3 +- .../processing/MTEIndustrialCuttingMachine.java | 3 +- .../multi/processing/MTEIndustrialDehydrator.java | 3 +- .../multi/processing/MTEIndustrialExtruder.java | 3 +- .../multi/processing/MTEIndustrialFluidHeater.java | 3 +- .../multi/processing/MTEIndustrialForgeHammer.java | 3 +- .../multi/processing/MTEIndustrialMacerator.java | 3 +- .../multi/processing/MTEIndustrialMixer.java | 3 +- .../MTEIndustrialMolecularTransformer.java | 3 +- .../processing/MTEIndustrialMultiMachine.java | 7 +- .../multi/processing/MTEIndustrialPlatePress.java | 5 +- .../multi/processing/MTEIndustrialSifter.java | 3 +- .../processing/MTEIndustrialThermalCentrifuge.java | 3 +- .../processing/MTEIndustrialVacuumFreezer.java | 3 +- .../multi/processing/MTEIndustrialWashPlant.java | 5 +- .../multi/processing/MTEIndustrialWireMill.java | 3 +- .../machines/multi/processing/MTEIsaMill.java | 3 +- .../processing/MTENuclearSaltProcessingPlant.java | 3 +- .../multi/processing/MTEndustrialElectrolyzer.java | 3 +- .../advanced/MTEAdvDistillationTower.java | 5 +- .../multi/processing/advanced/MTEAdvEBF.java | 3 +- .../advanced/MTEAdvImplosionCompressor.java | 3 +- .../multi/production/MTEAlloyBlastSmelter.java | 3 +- .../machines/multi/production/MTEAutoCrafter.java | 3 +- .../machines/multi/production/MTECyclotron.java | 3 +- .../multi/production/MTEElementalDuplicator.java | 3 +- .../multi/production/MTEFrothFlotationCell.java | 3 +- .../multi/production/MTEIndustrialFishingPond.java | 3 +- .../multi/production/MTEIndustrialRockBreaker.java | 3 +- .../production/MTELargeSemifluidGenerator.java | 3 +- .../multi/production/MTEMassFabricator.java | 3 +- .../machines/multi/production/MTERefinery.java | 3 +- .../multi/production/MTEThermalBoiler.java | 3 +- .../machines/multi/production/MTETreeFarm.java | 3 +- .../multi/production/algae/MTEAlgaePondBase.java | 3 +- .../production/turbines/MTELargerTurbineBase.java | 3 +- ...chMetaTileEntity_PowerSubStationController.java | 4 +- .../registration/gregtech/Gregtech4Content.java | 12 +- .../registration/gregtech/GregtechConduits.java | 11 +- .../gregtech/GregtechCustomHatches.java | 224 ++++++++++++++------- .../registration/gregtech/GregtechDehydrator.java | 4 +- .../gregtech/GregtechEnergyBuffer.java | 9 - .../GregtechGeothermalThermalGenerator.java | 5 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 5 +- .../gregtech/GregtechIndustrialCentrifuge.java | 5 +- .../gregtech/GregtechIndustrialCokeOven.java | 5 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 6 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 5 +- .../gregtech/GregtechIndustrialExtruder.java | 5 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 5 +- .../gregtech/GregtechIndustrialMacerator.java | 5 +- .../gregtech/GregtechIndustrialMassFabricator.java | 7 +- .../gregtech/GregtechIndustrialMixer.java | 5 +- .../gregtech/GregtechIndustrialMultiMachine.java | 5 +- .../gregtech/GregtechIndustrialPlatePress.java | 5 +- .../gregtech/GregtechIndustrialSifter.java | 5 +- .../GregtechIndustrialThermalCentrifuge.java | 5 +- .../gregtech/GregtechIndustrialTreeFarm.java | 9 +- .../gregtech/GregtechIndustrialWashPlant.java | 5 +- .../gregtech/GregtechIndustrialWiremill.java | 5 +- .../registration/gregtech/GregtechLFTR.java | 4 +- .../GregtechNuclearSaltProcessingPlant.java | 16 +- .../gregtech/GregtechPollutionDevices.java | 152 +++++++------- .../gregtech/GregtechPowerSubStation.java | 5 +- .../gregtech/GregtechQuantumForceTransformer.java | 14 +- .../gregtech/GregtechRedstoneButtonPanel.java | 8 +- .../gregtech/GregtechRedstoneCircuitBlock.java | 8 +- .../gregtech/GregtechRedstoneLamp.java | 7 +- .../gregtech/GregtechRedstoneStrengthDisplay.java | 17 +- .../gregtech/GregtechRedstoneStrengthScale.java | 8 +- .../gregtech/GregtechRocketFuelGenerator.java | 6 +- .../gregtech/GregtechSimpleWasher.java | 179 ++++++++-------- .../gregtech/GregtechTieredFluidTanks.java | 5 +- .../gregtech/GregtechTreeFarmerTE.java | 6 +- .../registration/gregtech/GregtechWaterPump.java | 6 +- 90 files changed, 520 insertions(+), 479 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HandlerGT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HandlerGT.java index 286da597c8..3cec3139d7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HandlerGT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HandlerGT.java @@ -15,7 +15,6 @@ import gtPlusPlus.everglades.gen.gt.WorldGen_GT; import gtPlusPlus.recipes.CokeAndPyrolyseOven; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.util.GTPPConfig; import gtPlusPlus.xmod.gregtech.common.MetaGTProxy; import gtPlusPlus.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; @@ -31,7 +30,6 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits; public class HandlerGT { public static GTConfig mMaterialProperties = null; - public static GTPPConfig sCustomWorldgenFile = null; public static final List sWorldgenListEverglades = new ArrayList<>(); public static MetaGeneratedTool sMetaGeneratedToolInstance; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java index 627443245f..ef3cb3ba48 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java @@ -79,11 +79,11 @@ import gtPlusPlus.GTplusplus; import gtPlusPlus.GTplusplus.INIT_PHASE; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; +import gtPlusPlus.core.config.ASMConfiguration; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.PreloaderCore; -import gtPlusPlus.preloader.asm.AsmConfig; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchInputBattery; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchOutputBattery; @@ -383,7 +383,7 @@ public abstract class GTPPMultiBlockBase mCustomiconMap = new ArrayList<>(); /* 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 b3a367bcaf..c16cec179e 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 @@ -24,6 +24,7 @@ import gregtech.api.objects.GTItemStack; import gregtech.api.objects.GTRenderedTexture; import gregtech.api.util.GTOreDictUnificator; import gregtech.common.tileentities.boilers.MTEBoiler; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; @@ -37,14 +38,14 @@ public class MTEBoilerBase extends MTEBoiler { aID, "electricboiler." + tier + ".tier.single", aNameRegional, - "Produces " + (GTPPCore.ConfigSwitches.boilerSteamPerSecond * tier) + "L of Steam per second"); - this.steamPerSecond = (GTPPCore.ConfigSwitches.boilerSteamPerSecond * tier); + "Produces " + (Configuration.machines.boilerSteamPerSecond * tier) + "L of Steam per second"); + this.steamPerSecond = (Configuration.machines.boilerSteamPerSecond * tier); this.tier = tier; } public MTEBoilerBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); - this.steamPerSecond = (GTPPCore.ConfigSwitches.boilerSteamPerSecond * aTier); + this.steamPerSecond = (Configuration.machines.boilerSteamPerSecond * aTier); this.tier = aTier; } @@ -231,8 +232,8 @@ public class MTEBoilerBase extends MTEBoiler { @Override protected int getPollution() { - return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondBoiler - * GTPPCore.ConfigSwitches.pollutionReleasedByTierBoiler[this.tier]); + return (int) (Configuration.pollution.basePollutionPerSecondBoiler + * Configuration.pollution.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 4fac228f4f..e84f4763cf 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,6 +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 gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -160,7 +161,7 @@ public class MTEGeothermalGenerator extends MTEBasicGenerator { @Override public int getPollution() { - return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondGeothermalGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierGeothermalGenerator[mTier]); + return (int) (Configuration.pollution.basePollutionPerSecondGeothermalGenerator + * Configuration.pollution.pollutionReleasedByTierGeothermalGenerator[mTier]); } } 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 a639ffbeab..4cbc1205f8 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 @@ -19,6 +19,7 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTUtility; 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 { @@ -37,8 +38,8 @@ public class MTESemiFluidGenerator extends MTEBasicGenerator { @Override public int getPollution() { - return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierSemiFluidGenerator[this.mTier]); + return (int) (Configuration.pollution.basePollutionPerSecondSemiFluidGenerator + * Configuration.pollution.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 67a0c349e9..6988d2f43b 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,6 +21,7 @@ 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; @@ -75,12 +76,12 @@ 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 = PollutionUtils.isPollutionEnabled(); + mPollutionEnabled = GTMod.gregtechproxy.mPollution; } public MTEAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 2, aDescription, aTextures, 2, 0); - mPollutionEnabled = PollutionUtils.isPollutionEnabled(); + mPollutionEnabled = GTMod.gregtechproxy.mPollution; } @Override @@ -240,9 +241,9 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { // Only check every 30s. if (!isIdle && aTick % (20L * 30) == 0L) { - mPollutionEnabled = PollutionUtils.isPollutionEnabled(); + mPollutionEnabled = GTMod.gregtechproxy.mPollution; // Clear out pollution if it's disabled, because I am a nice gal. - if (!PollutionUtils.isPollutionEnabled()) { + if (!GTMod.gregtechproxy.mPollution) { PollutionUtils.nullifyPollution(this.getBaseMetaTileEntity()); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java index b87403d17e..2521fb703f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java @@ -6,6 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import gregtech.GTMod; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -270,7 +271,7 @@ public class MTEPollutionCreator extends GTPPMetaTileEntity { public int pollutionMultiplier = 1; private void showPollution(final World worldIn, final EntityPlayer playerIn) { - if (!PollutionUtils.isPollutionEnabled()) { + if (!GTMod.gregtechproxy.mPollution) { PlayerUtils.messagePlayer(playerIn, "This block is useless, Pollution is disabled."); } else { addPollution(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java index 6d599b60b9..747663f4cb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java @@ -6,6 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import gregtech.GTMod; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -270,7 +271,7 @@ public class MTEPollutionDetector extends GTPPMetaTileEntity { } private void showPollution(final World worldIn, final EntityPlayer playerIn) { - if (!PollutionUtils.isPollutionEnabled()) { + if (!GTMod.gregtechproxy.mPollution) { PlayerUtils.messagePlayer(playerIn, "This block is useless, Pollution is disabled."); } else { PlayerUtils.messagePlayer(playerIn, "This chunk contains " + getCurrentChunkPollution() + " pollution."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java index 9f0b6d6be9..387475d4f2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java @@ -42,7 +42,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -168,7 +168,7 @@ public class MTEAmazonPackager extends GTPPMultiBlockBase imp @Override public int getPollutionPerSecond(ItemStack arg0) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiPackager; + return Configuration.pollution.pollutionPerSecondMultiPackager; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java index db36800f42..031e8cfe11 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java @@ -34,6 +34,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -93,7 +94,7 @@ public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialChisel; + return Configuration.pollution.pollutionPerSecondMultiIndustrialChisel; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java index 552f90d855..afca39266c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java @@ -31,6 +31,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -198,7 +199,7 @@ public class MTEIndustrialCokeOven extends GTPPMultiBlockBase i @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMixer; + return Configuration.pollution.pollutionPerSecondMultiIndustrialMixer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java index 4ffd484163..818ab3674a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java @@ -28,6 +28,7 @@ import gregtech.api.recipe.RecipeMap; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -224,7 +225,7 @@ public class MTEIndustrialMolecularTransformer extends GTPPMultiBlockBase { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal; + return Configuration.pollution.pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal; } case MACHINEMODE_FLUID -> { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid; + return Configuration.pollution.pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid; } default -> { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc; + return Configuration.pollution.pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc; } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java index f41ebdd292..75d3e6df6f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java @@ -42,6 +42,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -192,8 +193,8 @@ public class MTEIndustrialPlatePress extends GTPPMultiBlockBase @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialSifter; + return Configuration.pollution.pollutionPerSecondMultiIndustrialSifter; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java index b494d0bfa7..c212fbadd2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java @@ -30,6 +30,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -161,7 +162,7 @@ public class MTEIndustrialThermalCentrifuge extends GTPPMultiBlockBase implements ISurvi @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIsaMill; + return Configuration.pollution.pollutionPerSecondMultiIsaMill; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java index 139ea00d82..86e1c9e624 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java @@ -32,6 +32,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -67,7 +68,7 @@ public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase implements ISurviva @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvEBF; + return Configuration.pollution.pollutionPerSecondMultiAdvEBF; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java index 109022932d..5590185fb7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java @@ -26,6 +26,7 @@ import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -155,7 +156,7 @@ public class MTEAdvImplosionCompressor extends GTPPMultiBlockBase implement @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAutoCrafter; + return Configuration.pollution.pollutionPerSecondMultiAutoCrafter; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java index 051daee9a3..7f1098b8ac 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java @@ -39,6 +39,7 @@ import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.chemistry.IonParticles; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; @@ -296,7 +297,7 @@ public class MTECyclotron extends GTPPMultiBlockBase implements IS @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiCyclotron; + return Configuration.pollution.pollutionPerSecondMultiCyclotron; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java index e115fe5af1..a241238e42 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java @@ -36,6 +36,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchElementalDataOrbHolder; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -312,7 +313,7 @@ public class MTEElementalDuplicator extends GTPPMultiBlockBase