diff options
| author | boubou19 <miisterunknown@gmail.com> | 2024-09-19 23:05:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-19 21:05:17 +0000 |
| commit | c74367258e8a2a60392234d2a1a13e0a19433795 (patch) | |
| tree | 9c7d9d7173a91e7362f92250126a4a65f0920b04 /src/main/java/gtPlusPlus/xmod/gregtech | |
| parent | 0a5c7ecc004444a089edbed28f4ecb136bc21f1f (diff) | |
| download | GT5-Unofficial-c74367258e8a2a60392234d2a1a13e0a19433795.tar.gz GT5-Unofficial-c74367258e8a2a60392234d2a1a13e0a19433795.tar.bz2 GT5-Unofficial-c74367258e8a2a60392234d2a1a13e0a19433795.zip | |
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 <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech')
90 files changed, 520 insertions, 479 deletions
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<WorldGen_GT> 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<T extends MTEExtendedPowerMultiBlockBas public static Method aLogger = null; public void log(String s) { - if (!AsmConfig.disableAllLogging) { + if (!ASMConfiguration.debug.disableAllLogging) { if (PreloaderCore.DEBUG_MODE) { Logger.INFO(s); } else { 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 c81164cacb..ae5e653de0 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,6 +21,7 @@ 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 gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; @@ -32,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) (GTPPCore.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); - pollMax = (int) (GTPPCore.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMin = (int) (Configuration.pollution.baseMinPollutionPerSecondRocketFuelGenerator + * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMax = (int) (Configuration.pollution.baseMaxPollutionPerSecondRocketFuelGenerator + * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); } public MTERocketFuelGeneratorBase(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); - pollMin = (int) (GTPPCore.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); - pollMax = (int) (GTPPCore.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMin = (int) (Configuration.pollution.baseMinPollutionPerSecondRocketFuelGenerator + * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMax = (int) (Configuration.pollution.baseMaxPollutionPerSecondRocketFuelGenerator + * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index f19263bb57..a0ee2891a2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -13,11 +13,11 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.config.Configuration; public class TexturesGtBlock { - private static final boolean mAnimated = GTPPCore.ConfigSwitches.enableAnimatedTextures; + private static final boolean mAnimated = Configuration.visual.enableAnimatedTextures; private static final ArrayList<Runnable> 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<MTEAmazonPackager> 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<MTEIndustrialA @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialAlloySmelter; + return Configuration.pollution.pollutionPerSecondMultiIndustrialAlloySmelter; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java index 256e1219aa..20802032a0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java @@ -44,6 +44,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; @@ -265,7 +266,7 @@ public class MTEIndustrialArcFurnace extends GTPPMultiBlockBase<MTEIndustrialArc @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialArcFurnace; + return Configuration.pollution.pollutionPerSecondMultiIndustrialArcFurnace; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java index 86a971cb5c..b840cd9a08 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java @@ -34,6 +34,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; 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; @@ -186,7 +187,7 @@ public class MTEIndustrialCentrifuge extends GTPPMultiBlockBase<MTEIndustrialCen @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCentrifuge; + return Configuration.pollution.pollutionPerSecondMultiIndustrialCentrifuge; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java index 1dc694e584..40a497fa06 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java @@ -38,6 +38,7 @@ import gregtech.api.util.GTStreamUtil; 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.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchChiselBus; @@ -325,7 +326,7 @@ public class MTEIndustrialChisel extends GTPPMultiBlockBase<MTEIndustrialChisel> @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<MTEIndustrialCokeO @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCokeOven; + return Configuration.pollution.pollutionPerSecondMultiIndustrialCokeOven; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java index 5d80aac3f4..385ca224fc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java @@ -44,6 +44,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; @@ -189,7 +190,7 @@ public class MTEIndustrialCuttingMachine extends GTPPMultiBlockBase<MTEIndustria @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCuttingMachine; + return Configuration.pollution.pollutionPerSecondMultiIndustrialCuttingMachine; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java index 0975c5fa88..eb7e6baa9c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java @@ -50,6 +50,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gtPlusPlus.api.recipe.GTPPRecipeMaps; 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; @@ -187,7 +188,7 @@ public class MTEIndustrialDehydrator extends GTPPMultiBlockBase<MTEIndustrialDeh @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialDehydrator; + return Configuration.pollution.pollutionPerSecondMultiIndustrialDehydrator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java index 0f2b573a2e..69b7330901 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java @@ -29,6 +29,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; @@ -166,7 +167,7 @@ public class MTEIndustrialExtruder extends GTPPMultiBlockBase<MTEIndustrialExtru @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialExtruder; + return Configuration.pollution.pollutionPerSecondMultiIndustrialExtruder; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java index 9c22e81024..8dd62202b3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.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; @@ -174,7 +175,7 @@ public class MTEIndustrialFluidHeater extends GTPPMultiBlockBase<MTEIndustrialFl @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge; + return Configuration.pollution.pollutionPerSecondMultiIndustrialFluidHeater; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java index b809feaa6e..a8bf12bfa0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java @@ -45,6 +45,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; @@ -226,7 +227,7 @@ public class MTEIndustrialForgeHammer extends GTPPMultiBlockBase<MTEIndustrialFo @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialForgeHammer; + return Configuration.pollution.pollutionPerSecondMultiIndustrialForgeHammer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java index 635e5889f5..4df9c8ce78 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java @@ -47,6 +47,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -359,7 +360,7 @@ public class MTEIndustrialMacerator extends GTPPMultiBlockBase<MTEIndustrialMace @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMacerator; + return Configuration.pollution.pollutionPerSecondMultiIndustrialMacerator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java index e733168fca..3526146ab6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java @@ -35,6 +35,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; @@ -187,7 +188,7 @@ public class MTEIndustrialMixer extends GTPPMultiBlockBase<MTEIndustrialMixer> 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<MTEInd @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer; + return Configuration.pollution.pollutionPerSecondMultiMolecularTransformer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java index fae1d920a8..f4df2c3c1c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java @@ -63,6 +63,7 @@ import gregtech.common.tileentities.machines.IDualInputInventory; import gregtech.common.tileentities.machines.MTEHatchCraftingInputME; import gregtech.common.tileentities.machines.MTEHatchInputME; 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.MTEHatchSolidifier; @@ -224,13 +225,13 @@ public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialM public int getPollutionPerSecond(final ItemStack aStack) { switch (machineMode) { case MACHINEMODE_METAL -> { - 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<MTEIndustrialPla @Override public int getPollutionPerSecond(final ItemStack aStack) { if (machineMode == MACHINEMODE_FORMER) - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeForming; - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeBending; + return Configuration.pollution.pollutionPerSecondMultiIndustrialPlatePress_ModeForming; + return Configuration.pollution.pollutionPerSecondMultiIndustrialPlatePress_ModeBending; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java index 6dbd019887..d8ba5e55c7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java @@ -32,6 +32,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; @@ -193,7 +194,7 @@ public class MTEIndustrialSifter extends GTPPMultiBlockBase<MTEIndustrialSifter> @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<MTEIndust @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge; + return Configuration.pollution.pollutionPerSecondMultiIndustrialThermalCentrifuge; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java index b47ccf583f..920859616b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java @@ -35,6 +35,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -215,7 +216,7 @@ public class MTEIndustrialVacuumFreezer extends GTPPMultiBlockBase<MTEIndustrial @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialVacuumFreezer; + return Configuration.pollution.pollutionPerSecondMultiIndustrialVacuumFreezer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java index 35d0867cee..9cca3ec17d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java @@ -59,6 +59,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -248,8 +249,8 @@ public class MTEIndustrialWashPlant extends GTPPMultiBlockBase<MTEIndustrialWash @Override public int getPollutionPerSecond(final ItemStack aStack) { if (machineMode == MACHINEMODE_CHEMBATH) - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath; - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeWasher; + return Configuration.pollution.pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath; + return Configuration.pollution.pollutionPerSecondMultiIndustrialWashPlant_ModeWasher; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java index 292fd1041b..8ceb3e8162 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java @@ -33,6 +33,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; @@ -185,7 +186,7 @@ public class MTEIndustrialWireMill extends GTPPMultiBlockBase<MTEIndustrialWireM @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWireMill; + return Configuration.pollution.pollutionPerSecondMultiIndustrialWireMill; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java index 23e587ef2f..0df9417f32 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java @@ -51,6 +51,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; @@ -400,7 +401,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> 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<MTENuclear @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAutoCrafter; + return Configuration.pollution.pollutionPerSecondNuclearSaltProcessingPlant; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java index 487e22f3f2..e59717127d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java @@ -29,6 +29,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; @@ -152,7 +153,7 @@ public class MTEndustrialElectrolyzer extends GTPPMultiBlockBase<MTEndustrialEle @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialElectrolyzer; + return Configuration.pollution.pollutionPerSecondMultiIndustrialElectrolyzer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java index a5ff70f047..c74eb89a07 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java @@ -53,6 +53,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.MTEHatchOutputME; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -304,8 +305,8 @@ public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillati @Override public int getPollutionPerSecond(ItemStack aStack) { if (this.mMode == Mode.Distillery) - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDistillery; - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDT; + return Configuration.pollution.pollutionPerSecondMultiAdvDistillationTower_ModeDistillery; + return Configuration.pollution.pollutionPerSecondMultiAdvDistillationTower_ModeDT; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java index 4cedf91f0f..af2229f038 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java @@ -49,6 +49,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -254,7 +255,7 @@ public class MTEAdvEBF extends GTPPMultiBlockBase<MTEAdvEBF> 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<MTEAdvImplosio @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvImplosion; + return Configuration.pollution.pollutionPerSecondMultiAdvImplosion; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java index 20c14d1ed2..970f975a70 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java @@ -36,6 +36,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; 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; @@ -212,7 +213,7 @@ public class MTEAlloyBlastSmelter extends GTPPMultiBlockBase<MTEAlloyBlastSmelte @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiABS; + return Configuration.pollution.pollutionPerSecondMultiABS; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java index 41b9abf12e..2fb4a7b5c7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java @@ -30,6 +30,7 @@ import gregtech.api.util.GTRecipe; 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; @@ -79,7 +80,7 @@ public class MTEAutoCrafter extends GTPPMultiBlockBase<MTEAutoCrafter> 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<MTECyclotron> 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<MTEElementalDupli @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer; + return Configuration.pollution.pollutionPerSecondElementalDuplicator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java index 8e052870fa..f4e9bac434 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java @@ -43,6 +43,7 @@ import gregtech.api.util.GTRecipe; 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.core.material.Material; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -181,7 +182,7 @@ public class MTEFrothFlotationCell extends GTPPMultiBlockBase<MTEFrothFlotationC @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiFrothFlotationCell; + return Configuration.pollution.pollutionPerSecondMultiFrothFlotationCell; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java index 9751218aae..4b9b5c0ae4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java @@ -48,6 +48,7 @@ import gregtech.api.util.OverclockCalculator; import gregtech.api.util.ParallelHelper; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -277,7 +278,7 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFi @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialFishingPond; + return Configuration.pollution.pollutionPerSecondMultiIndustrialFishingPond; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java index 0adfa82732..c3bf843fd3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java @@ -45,6 +45,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gregtech.api.util.ParallelHelper; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -342,7 +343,7 @@ public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase<MTEIndustrialRo @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialRockBreaker; + return Configuration.pollution.pollutionPerSecondMultiIndustrialRockBreaker; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java index 141fbff41f..9b4dc8ee47 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java @@ -40,6 +40,7 @@ import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.util.GTRecipe; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -297,7 +298,7 @@ public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase<MTELargeSemif @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiLargeSemiFluidGenerator; + return Configuration.pollution.pollutionPerSecondMultiLargeSemiFluidGenerator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java index 22de5388f9..913a54eea5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java @@ -57,6 +57,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.config.MachineStats; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -220,7 +221,7 @@ public class MTEMassFabricator extends GTPPMultiBlockBase<MTEMassFabricator> imp @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMassFabricator; + return Configuration.pollution.pollutionPerSecondMultiMassFabricator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java index 2160f43546..f7f992e191 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java @@ -31,6 +31,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; @@ -198,7 +199,7 @@ public class MTERefinery extends GTPPMultiBlockBase<MTERefinery> implements ISur @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiRefinery; + return Configuration.pollution.pollutionPerSecondMultiRefinery; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java index 8889cbd501..b98d6ab662 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java @@ -45,6 +45,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.ParallelHelper; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -272,7 +273,7 @@ public class MTEThermalBoiler extends GTPPMultiBlockBase<MTEThermalBoiler> imple @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiThermalBoiler; + return Configuration.pollution.pollutionPerSecondMultiThermalBoiler; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java index 204cd5e6b9..bb5754bef7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java @@ -76,6 +76,7 @@ import gregtech.common.tileentities.machines.MTEHatchInputBusME; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -209,7 +210,7 @@ public class MTETreeFarm extends GTPPMultiBlockBase<MTETreeFarm> implements ISur @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiTreeFarm; + return Configuration.pollution.pollutionPerSecondMultiTreeFarm; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java index 1223158f31..f2f0bcb104 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java @@ -45,6 +45,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -309,7 +310,7 @@ public class MTEAlgaePondBase extends GTPPMultiBlockBase<MTEAlgaePondBase> imple @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAlgaePond; + return Configuration.pollution.pollutionPerSecondMultiAlgaePond; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index 2de926e31f..6e471c2829 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -31,6 +31,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import gregtech.GTMod; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -192,7 +193,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT } private boolean requiresMufflers() { - if (!PollutionUtils.isPollutionEnabled()) { + if (!GTMod.gregtechproxy.mPollution) { return false; } return getPollutionPerSecond(null) > 0; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 162c9b295e..f392bff171 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -69,12 +69,12 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.ASMConfiguration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.MovingAverageLong; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.preloader.asm.AsmConfig; import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -174,7 +174,7 @@ public class GregtechMetaTileEntity_PowerSubStationController } private void checkMachineProblem(String msg) { - if (!AsmConfig.disableAllLogging) { + if (!ASMConfiguration.debug.disableAllLogging) { Logger.INFO("Power Sub-Station problem: " + msg); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index 02141388bb..48874d1d3e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -23,7 +23,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.GT4_Thermal_Boiler; import gregtech.api.GregTechAPI; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTEElectricAutoWorkbench; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator; @@ -115,12 +114,11 @@ public class Gregtech4Content { private static void thermalBoiler() { // Gregtech 4 Thermal Boiler - if (GTPPCore.ConfigSwitches.enableMultiblock_ThermalBoiler) { - Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler."); - GregtechItemList.GT4_Thermal_Boiler.set( - new MTEThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler") - .getStackForm(1L)); - } + Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler."); + GregtechItemList.GT4_Thermal_Boiler.set( + new MTEThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler") + .getStackForm(1L)); + } private static void multiCrafter() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index ec9eff9ebe..b331479028 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -19,7 +19,6 @@ import gregtech.api.metatileentity.implementations.MTEFluid; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.material.MaterialsElements; @@ -41,13 +40,9 @@ public class GregtechConduits { private static int BasePipeHexadecupleID = 30100; public static void run() { - if (GTPPCore.ConfigSwitches.enableCustom_Cables) { - run1(); - } - if (GTPPCore.ConfigSwitches.enableCustom_Pipes) { - run2(); - run3(); - } + run1(); + run2(); + run3(); } private static void run3() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index 2781730229..58d1abc73b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -1,5 +1,12 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_ChiselBus_HV; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_ChiselBus_LV; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_ChiselBus_MV; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_I; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_II; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_III; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_IV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Air_Intake; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Air_Intake_Extreme; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_Cryotheum; @@ -10,17 +17,36 @@ import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_TurbineHousing; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_EV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_HV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_LV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_LuV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_MAX; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_MV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_UV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Reservoir; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_ZPM; +import gregtech.GTMod; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchAirIntakeExtreme; @@ -39,7 +65,7 @@ public class GregtechCustomHatches { public static void run() { Logger.INFO("Gregtech5u Content | Registering Custom Fluid Hatches."); run1(); - if (PollutionUtils.isPollutionEnabled()) { + if (GTMod.gregtechproxy.mPollution) { run2(); } run3(); @@ -116,8 +142,11 @@ public class GregtechCustomHatches { private static void run2() { GregtechItemList.Hatch_Muffler_Adv_LV.set( - (new MTEHatchMufflerAdvanced(30001, "hatch.muffler.adv.tier.01", "Advanced Muffler Hatch (LV)", 1)) - .getStackForm(1L)); + (new MTEHatchMufflerAdvanced( + Hatch_Muffler_Adv_LV.ID, + "hatch.muffler.adv.tier.01", + "Advanced Muffler Hatch (LV)", + 1)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_MV.set( (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_MV.ID, @@ -169,71 +198,115 @@ public class GregtechCustomHatches { } private static void run3() { - /* - * Super Input Busses - */ - - int aStartID = 30022; - GregtechItemList.Hatch_SuperBus_Input_LV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.01", "Super Bus (I) (LV)", 1)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_LV.ID, + "hatch.superbus.input.tier.01", + "Super Bus (I) (LV)", + 1)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_MV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.02", "Super Bus (I) (MV)", 2)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_MV.ID, + "hatch.superbus.input.tier.02", + "Super Bus (I) (MV)", + 2)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_HV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.03", "Super Bus (I) (HV)", 3)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_HV.ID, + "hatch.superbus.input.tier.03", + "Super Bus (I) (HV)", + 3)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_EV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.04", "Super Bus (I) (EV)", 4)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_EV.ID, + "hatch.superbus.input.tier.04", + "Super Bus (I) (EV)", + 4)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_IV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.05", "Super Bus (I) (IV)", 5)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_IV.ID, + "hatch.superbus.input.tier.05", + "Super Bus (I) (IV)", + 5)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_LuV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.06", "Super Bus (I) (LuV)", 6)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_LuV.ID, + "hatch.superbus.input.tier.06", + "Super Bus (I) (LuV)", + 6)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_ZPM.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.07", "Super Bus (I) (ZPM)", 7)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_ZPM.ID, + "hatch.superbus.input.tier.07", + "Super Bus (I) (ZPM)", + 7)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_UV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.08", "Super Bus (I) (UV)", 8)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_UV.ID, + "hatch.superbus.input.tier.08", + "Super Bus (I) (UV)", + 8)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_MAX.set( - ((IMetaTileEntity) makeInputBus(aStartID, "hatch.superbus.input.tier.09", "Super Bus (I) (UHV)", 9)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_UHV.ID, + "hatch.superbus.input.tier.09", + "Super Bus (I) (UHV)", + 9)).getStackForm(1L)); - /* - * Super Output Busses - */ - aStartID = 30032; GregtechItemList.Hatch_SuperBus_Output_LV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.01", "Super Bus (O) (LV)", 1)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_LV.ID, + "hatch.superbus.output.tier.01", + "Super Bus (O) (LV)", + 1)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_MV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.02", "Super Bus (O) (MV)", 2)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_MV.ID, + "hatch.superbus.output.tier.02", + "Super Bus (O) (MV)", + 2)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_HV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.03", "Super Bus (O) (HV)", 3)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_HV.ID, + "hatch.superbus.output.tier.03", + "Super Bus (O) (HV)", + 3)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_EV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.04", "Super Bus (O) (EV)", 4)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_EV.ID, + "hatch.superbus.output.tier.04", + "Super Bus (O) (EV)", + 4)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_IV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.05", "Super Bus (O) (IV)", 5)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_IV.ID, + "hatch.superbus.output.tier.05", + "Super Bus (O) (IV)", + 5)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_LuV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.06", "Super Bus (O) (LuV)", 6)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_LuV.ID, + "hatch.superbus.output.tier.06", + "Super Bus (O) (LuV)", + 6)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_ZPM.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.07", "Super Bus (O) (ZPM)", 7)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_ZPM.ID, + "hatch.superbus.output.tier.07", + "Super Bus (O) (ZPM)", + 7)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_UV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.08", "Super Bus (O) (UV)", 8)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_UV.ID, + "hatch.superbus.output.tier.08", + "Super Bus (O) (UV)", + 8)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_MAX.set( - ((IMetaTileEntity) makeOutputBus(aStartID, "hatch.superbus.output.tier.09", "Super Bus (O) (UHV)", 9)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_UHV.ID, + "hatch.superbus.output.tier.09", + "Super Bus (O) (UHV)", + 9)).getStackForm(1L)); } private static MTEHatchSuperBusInput makeInputBus(int id, String unlocalizedName, String localizedName, int tier) { @@ -249,28 +322,43 @@ public class GregtechCustomHatches { } private static void run4() { - int aID = 31778; // 31778 - 31780 - - GregtechItemList.GT_MetaTileEntity_ChiselBus_LV - .set((makeChiselBus(aID++, "hatch.chisel.tier.01", "Chisel Bus I", 1)).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_ChiselBus_MV - .set((makeChiselBus(aID++, "hatch.chisel.tier.02", "Chisel Bus II", 2)).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_ChiselBus_HV - .set((makeChiselBus(aID++, "hatch.chisel.tier.03", "Chisel Bus III", 3)).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_ChiselBus_LV.set( + (makeChiselBus(GT_MetaTileEntity_ChiselBus_LV.ID, "hatch.chisel.tier.01", "Chisel Bus I", 1)) + .getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_ChiselBus_MV.set( + (makeChiselBus(GT_MetaTileEntity_ChiselBus_MV.ID, "hatch.chisel.tier.02", "Chisel Bus II", 2)) + .getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_ChiselBus_HV.set( + (makeChiselBus(GT_MetaTileEntity_ChiselBus_HV.ID, "hatch.chisel.tier.03", "Chisel Bus III", 3)) + .getStackForm(1L)); } private static void run6() { - int aID = 31781; // 31781-31784 - - GregtechItemList.GT_MetaTileEntity_Solidifier_I - .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.05", "Solidifier Hatch I", 5).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_II - .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.06", "Solidifier Hatch II", 6).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_III - .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.07", "Solidifier Hatch III", 7).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_IV - .set(new MTEHatchSolidifier(aID, "hatch.solidifier.tier.08", "Solidifier Hatch IV", 8).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_I.set( + new MTEHatchSolidifier( + GT_MetaTileEntity_Solidifier_I.ID, + "hatch.solidifier.tier.05", + "Solidifier Hatch I", + 5).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_II.set( + new MTEHatchSolidifier( + GT_MetaTileEntity_Solidifier_II.ID, + "hatch.solidifier.tier.06", + "Solidifier Hatch II", + 6).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_III.set( + new MTEHatchSolidifier( + GT_MetaTileEntity_Solidifier_III.ID, + "hatch.solidifier.tier.07", + "Solidifier Hatch III", + 7).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_IV.set( + new MTEHatchSolidifier( + GT_MetaTileEntity_Solidifier_IV.ID, + "hatch.solidifier.tier.08", + "Solidifier Hatch IV", + 8).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 85d87cb706..11ead9b3fd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -35,9 +35,7 @@ public class GregtechDehydrator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Chemical Dehydrators."); - if (GTPPCore.ConfigSwitches.enableMachine_Dehydrators) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index 528efc5712..6dd9c7170c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -179,14 +179,5 @@ public class GregtechEnergyBuffer { | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', GregtechOreDictNames.buffer_core }); - /* - * GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), - * GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | - * GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", - * Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), - * OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), GregtechOreDictNames.buffer_core - * }); - */ - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index 0be94d63c9..963551a2a3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -11,7 +11,6 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -21,9 +20,7 @@ public class GregtechGeothermalThermalGenerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Geothermal Engines."); - if (GTPPCore.ConfigSwitches.enableMachine_GeothermalEngines) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java index 956193bef2..6756c09898 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java @@ -4,7 +4,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_AlloyBlastSmelter; import static gregtech.api.enums.MetaTileEntityIDs.Mega_AlloyBlastSmelter; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEAlloyBlastSmelter; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.mega.MTEMegaAlloyBlastSmelter; @@ -13,9 +12,7 @@ public class GregtechIndustrialBlastSmelter { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java index 4a0da61dbd..dc800db078 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Centrifuge; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCentrifuge; @@ -11,9 +10,7 @@ public class GregtechIndustrialCentrifuge { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java index 219b5ee196..7f7cca61d0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CokeOven; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCokeOven; @@ -11,9 +10,7 @@ public class GregtechIndustrialCokeOven { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java index c05614827d..172881ebd8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CuttingFactoryController; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCuttingMachine; @@ -11,9 +10,8 @@ public class GregtechIndustrialCuttingFactory { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Cutting Factory Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { - run1(); - } + run1(); + } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java index 34f736e0f7..7229dc65b4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Electrolyzer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEndustrialElectrolyzer; @@ -11,9 +10,7 @@ public class GregtechIndustrialElectrolyzer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java index 1af1b8dec1..0a4ac87949 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Extruder; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialExtruder; @@ -11,9 +10,7 @@ public class GregtechIndustrialExtruder { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Extrusion Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java index 96883ac3c2..1dbc83bd2d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_FuelRefinery; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTERefinery; @@ -11,9 +10,7 @@ public class GregtechIndustrialFuelRefinery { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_NuclearFuelRefinery) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index 6d9d17c987..a53a63b377 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MacerationStack; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMacerator; @@ -11,9 +10,7 @@ public class GregtechIndustrialMacerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index 9d680127dd..2b42345f38 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -10,7 +10,6 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEMassFabricator; @@ -19,10 +18,8 @@ public class GregtechIndustrialMassFabricator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_MatterFabricator) { - generateRecipes(); - run1(); - } + generateRecipes(); + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java index 9508061d6f..1d363ff68d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Mixer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMixer; @@ -11,9 +10,7 @@ public class GregtechIndustrialMixer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Mixer Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java index 051569195a..6f13f31bc9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MultiMachine; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMultiMachine; @@ -11,9 +10,7 @@ public class GregtechIndustrialMultiMachine { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Multi-Machine Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java index de6bab91d0..aa8f8ab3cb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_PlatePress; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialPlatePress; @@ -11,9 +10,7 @@ public class GregtechIndustrialPlatePress { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Press Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java index e82a9f2027..8ed4182368 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Sifter; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialSifter; @@ -11,9 +10,7 @@ public class GregtechIndustrialSifter { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialSifter) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java index 7ee3452d34..32c05e6af1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_ThermalCentrifuge; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialThermalCentrifuge; @@ -11,9 +10,7 @@ public class GregtechIndustrialThermalCentrifuge { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java index 5c43c70fc3..80f1061cc4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java @@ -3,17 +3,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_TreeFarm; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm; public class GregtechIndustrialTreeFarm { public static void run() { - if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { - Logger.INFO("Gregtech5u Content | Registering Tree Farm Multiblock."); - run1(); - } + + Logger.INFO("Gregtech5u Content | Registering Tree Farm Multiblock."); + run1(); + } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java index 2ae9795b0d..c37bb1cf37 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WashPlant; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialWashPlant; @@ -11,9 +10,7 @@ public class GregtechIndustrialWashPlant { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Wash Plant Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index 39920a4553..ca6e0db141 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WireFactory; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialWireMill; @@ -11,9 +10,7 @@ public class GregtechIndustrialWiremill { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWireMill) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java index 71bc6937bc..d52a74fbba 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java @@ -21,9 +21,7 @@ public class GregtechLFTR { public static void run() { Logger.INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR]."); - if (GTPPCore.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java index 2121dde7a9..bf12c132e2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Nuclear_Salt_Processing_Plant; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTENuclearSaltProcessingPlant; @@ -11,13 +10,12 @@ public class GregtechNuclearSaltProcessingPlant { public static void run() { Logger.INFO("Gregtech5u Content | Registering Nuclear Salt Processing Plant Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_NuclearSaltProcessingPlant) { - // Nuclear Salt Processing Plant Multiblock - GregtechItemList.Nuclear_Salt_Processing_Plant.set( - new MTENuclearSaltProcessingPlant( - Nuclear_Salt_Processing_Plant.ID, - "nuclearsaltprocessingplant.controller.tier.single", - "Nuclear Salt Processing Plant").getStackForm(1L)); - } + // Nuclear Salt Processing Plant Multiblock + GregtechItemList.Nuclear_Salt_Processing_Plant.set( + new MTENuclearSaltProcessingPlant( + Nuclear_Salt_Processing_Plant.ID, + "nuclearsaltprocessingplant.controller.tier.single", + "Nuclear Salt Processing Plant").getStackForm(1L)); + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index d554a6dc8e..1873099afb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java @@ -13,8 +13,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Creator; import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Detector; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEAtmosphericReconditioner; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEPollutionCreator; @@ -23,86 +21,82 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEPollutionD public class GregtechPollutionDevices { public static void run() { - if (PollutionUtils.isPollutionEnabled()) { - Logger.INFO("Gregtech5u Content | Registering Anti-Pollution Devices."); - run1(); - } + Logger.INFO("Gregtech5u Content | Registering Anti-Pollution Devices."); + run1(); } private static void run1() { - if (GTPPCore.ConfigSwitches.enableMachine_Pollution) { - // 759 - GregtechItemList.Pollution_Detector.set( - new MTEPollutionDetector( - Pollution_Detector.ID, - "pollutiondetector.01.tier.single", - "Pollution Detection Device", - 0, - "Tells you if you're living in Gwalior yet.", - 0).getStackForm(1L)); - GregtechItemList.Pollution_Creator.set( - new MTEPollutionCreator( - Pollution_Creator.ID, - "pollutioncreator.01.tier.single", - "Smog Device", - 4, - "Polluting the skies.", - 0).getStackForm(1L)); + GregtechItemList.Pollution_Detector.set( + new MTEPollutionDetector( + Pollution_Detector.ID, + "pollutiondetector.01.tier.single", + "Pollution Detection Device", + 0, + "Tells you if you're living in Gwalior yet.", + 0).getStackForm(1L)); + GregtechItemList.Pollution_Creator.set( + new MTEPollutionCreator( + Pollution_Creator.ID, + "pollutioncreator.01.tier.single", + "Smog Device", + 4, + "Polluting the skies.", + 0).getStackForm(1L)); + + GregtechItemList.Pollution_Cleaner_LV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_LV.ID, + "pollutioncleaner.02.tier.single", + "Upgraded Pollution Scrubber", + 1).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_MV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_MV.ID, + "pollutioncleaner.03.tier.single", + "Advanced Pollution Scrubber", + 2).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_HV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_HV.ID, + "pollutioncleaner.04.tier.single", + "Precision Pollution Scrubber", + 3).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_EV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_EV.ID, + "pollutioncleaner.05.tier.single", + "Air Recycler", + 4).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_IV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_IV.ID, + "pollutioncleaner.06.tier.single", + "Upgraded Air Recycler", + 5).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_LuV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_LuV.ID, + "pollutioncleaner.07.tier.single", + "Advanced Air Recycler", + 6).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_ZPM.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_ZPM.ID, + "pollutioncleaner.08.tier.single", + "Precision Air Recycler", + 7).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_UV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_UV.ID, + "pollutioncleaner.09.tier.single", + "Atmospheric Cleaner", + 8).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_MAX.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_MAX.ID, + "pollutioncleaner.10.tier.single", + "Biosphere Cleanser", + 9).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_LV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_LV.ID, - "pollutioncleaner.02.tier.single", - "Upgraded Pollution Scrubber", - 1).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_MV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_MV.ID, - "pollutioncleaner.03.tier.single", - "Advanced Pollution Scrubber", - 2).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_HV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_HV.ID, - "pollutioncleaner.04.tier.single", - "Precision Pollution Scrubber", - 3).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_EV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_EV.ID, - "pollutioncleaner.05.tier.single", - "Air Recycler", - 4).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_IV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_IV.ID, - "pollutioncleaner.06.tier.single", - "Upgraded Air Recycler", - 5).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_LuV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_LuV.ID, - "pollutioncleaner.07.tier.single", - "Advanced Air Recycler", - 6).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_ZPM.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_ZPM.ID, - "pollutioncleaner.08.tier.single", - "Precision Air Recycler", - 7).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_UV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_UV.ID, - "pollutioncleaner.09.tier.single", - "Atmospheric Cleaner", - 8).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_MAX.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_MAX.ID, - "pollutioncleaner.10.tier.single", - "Biosphere Cleanser", - 9).getStackForm(1L)); - } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java index 76bde9c81d..be4978e165 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java @@ -9,7 +9,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.PowerSubStation; import gregtech.api.enums.ItemList; import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchInputBattery; @@ -20,9 +19,7 @@ public class GregtechPowerSubStation { public static void run() { Logger.INFO("Gregtech5u Content | Registering Power Substation Node."); - if (GTPPCore.ConfigSwitches.enableMultiblock_PowerSubstation) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java index 77385f6790..837960dded 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.QuantumForceTransformer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEQuantumForceTransformer; @@ -11,12 +10,11 @@ public class GregtechQuantumForceTransformer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Quantum Force Transformer Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_QuantumForceTransformer) { - GregtechItemList.QuantumForceTransformer.set( - new MTEQuantumForceTransformer( - QuantumForceTransformer.ID, - "quantumforcetransformer.controller.tier.single", - "Quantum Force Transformer").getStackForm(1L)); - } + GregtechItemList.QuantumForceTransformer.set( + new MTEQuantumForceTransformer( + QuantumForceTransformer.ID, + "quantumforcetransformer.controller.tier.single", + "Quantum Force Transformer").getStackForm(1L)); + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java index e7b313d851..b4b680bd12 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.RedstoneButtonPanel; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneButtonPanel; @@ -9,8 +10,7 @@ public class GregtechRedstoneButtonPanel { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Button Panel."); - if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneButtonPanel.set(new MTERedstoneButtonPanel(31800).getStackForm(1L)); - } + GregtechItemList.RedstoneButtonPanel.set(new MTERedstoneButtonPanel(RedstoneButtonPanel.ID).getStackForm(1L)); + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java index 1d92f61c4a..f49ee8639c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.RedstoneCircuitBlock; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneCircuitBlock; @@ -9,8 +10,7 @@ public class GregtechRedstoneCircuitBlock { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Circuit Block."); - if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneCircuitBlock.set(new MTERedstoneCircuitBlock(31801).getStackForm(1L)); - } + GregtechItemList.RedstoneCircuitBlock + .set(new MTERedstoneCircuitBlock(RedstoneCircuitBlock.ID).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java index e6fcbb4cb2..f1ec4feee5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.RedstoneLamp; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneLamp; @@ -9,8 +10,6 @@ public class GregtechRedstoneLamp { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Lamp."); - if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneLamp.set(new MTERedstoneLamp(31803).getStackForm(1L)); - } + GregtechItemList.RedstoneLamp.set(new MTERedstoneLamp(RedstoneLamp.ID).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java index 7c3cea0213..264bde4d29 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.RedstoneStrengthDisplay; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneStrengthDisplay; @@ -9,13 +10,11 @@ public class GregtechRedstoneStrengthDisplay { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Strength Display."); - if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneStrengthDisplay.set( - new MTERedstoneStrengthDisplay( - 31804, - "redstone.display", - "Redstone Strength Display", - "Displays Redstone Strength").getStackForm(1L)); - } + GregtechItemList.RedstoneStrengthDisplay.set( + new MTERedstoneStrengthDisplay( + RedstoneStrengthDisplay.ID, + "redstone.display", + "Redstone Strength Display", + "Displays Redstone Strength").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java index 149b9647ed..5225cd46d1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.RedstoneStrengthScale; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneStrengthScale; @@ -9,8 +10,7 @@ public class GregtechRedstoneStrengthScale { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Strength Scale."); - if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneStrengthScale.set(new MTERedstoneStrengthScale(31805).getStackForm(1L)); - } + GregtechItemList.RedstoneStrengthScale + .set(new MTERedstoneStrengthScale(RedstoneStrengthScale.ID).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 06328a7e30..2eec38cc27 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java @@ -12,7 +12,6 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -23,9 +22,8 @@ public class GregtechRocketFuelGenerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Rocket Engines."); - if (GTPPCore.ConfigSwitches.enableMachine_RocketEngines) { - run1(); - } + run1(); + } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index 4c6de56d94..91bd92f3ab 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java @@ -34,97 +34,96 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class GregtechSimpleWasher { public static void run() { - if (GTPPCore.ConfigSwitches.enableMachine_SimpleWasher) { - generateDirtyDustRecipes(); - generateDirtyCrushedRecipes(); - // Register the Simple Washer Entity. - - // The unlocalized names here have inconsistent numbering because there only used to be a simple washer - // every other tier, and they were numbered numerically. In order to maintain backwards compatibility, - // the tier numbers need to stay as they were. - List<Quad<GregtechItemList, Integer, String, String>> washers = ImmutableList.of( - new Quad<>( - GregtechItemList.SimpleDustWasher_LV, - SimpleDustWasher_LV.ID, - "simplewasher.01.tier.06", - "Simple Washer I"), - new Quad<>( - GregtechItemList.SimpleDustWasher_MV, - SimpleDustWasher_MV.ID, - "simplewasher.01.tier.02", - "Simple Washer II"), - new Quad<>( - GregtechItemList.SimpleDustWasher_HV, - SimpleDustWasher_HV.ID, - "simplewasher.01.tier.07", - "Simple Washer III"), - new Quad<>( - GregtechItemList.SimpleDustWasher_EV, - SimpleDustWasher_EV.ID, - "simplewasher.01.tier.03", - "Simple Washer IV"), - new Quad<>( - GregtechItemList.SimpleDustWasher_IV, - SimpleDustWasher_IV.ID, - "simplewasher.01.tier.08", - "Simple Washer V"), - new Quad<>( - GregtechItemList.SimpleDustWasher_LuV, - SimpleDustWasher_LuV.ID, - "simplewasher.01.tier.04", - "Simple Washer VI"), - new Quad<>( - GregtechItemList.SimpleDustWasher_ZPM, - SimpleDustWasher_ZPM.ID, - "simplewasher.01.tier.09", - "Simple Washer VII"), - new Quad<>( - GregtechItemList.SimpleDustWasher_UV, - SimpleDustWasher_UV.ID, - "simplewasher.01.tier.05", - "Simple Washer VIII")); - - GregtechItemList.SimpleDustWasher_ULV.set( - new MTEBasicMachineWithRecipe( - SimpleDustWasher_ULV.ID, - "simplewasher.01.tier.01", - "Deprecated ULV Simple Washer", - 0, - new String[] { "It's like an automatic Cauldron for washing dusts.", - "§cDEPRECATED: No recipe.§r Make a Simple Washer I.", GTPPCore.GT_Tooltip.get() }, - simpleWasherRecipes, - 1, - 1, - true, - SoundResource.NONE, - SpecialEffects.NONE, - "SIMPLE_WASHER", - null).setRecipeCatalystPriority(-11) - .getStackForm(1L)); - - for (int i = 0; i < washers.size(); i++) { - Quad<GregtechItemList, Integer, String, String> washer = washers.get(i); - int tier = i + 1; - washer.getKey() - .set( - new MTEBasicMachineWithRecipe( - washer.getValue_1(), - washer.getValue_2(), - washer.getValue_3(), - tier, - new String[] { "It's like an automatic Cauldron for washing dusts.", - GTPPCore.GT_Tooltip.get() }, - simpleWasherRecipes, - 1, - 1, - true, - SoundResource.NONE, - SpecialEffects.NONE, - "SIMPLE_WASHER", - null).setRecipeCatalystPriority(-tier) - .getStackForm(1L)); - } + generateDirtyDustRecipes(); + generateDirtyCrushedRecipes(); + // Register the Simple Washer Entity. + + // The unlocalized names here have inconsistent numbering because there only used to be a simple washer + // every other tier, and they were numbered numerically. In order to maintain backwards compatibility, + // the tier numbers need to stay as they were. + List<Quad<GregtechItemList, Integer, String, String>> washers = ImmutableList.of( + new Quad<>( + GregtechItemList.SimpleDustWasher_LV, + SimpleDustWasher_LV.ID, + "simplewasher.01.tier.06", + "Simple Washer I"), + new Quad<>( + GregtechItemList.SimpleDustWasher_MV, + SimpleDustWasher_MV.ID, + "simplewasher.01.tier.02", + "Simple Washer II"), + new Quad<>( + GregtechItemList.SimpleDustWasher_HV, + SimpleDustWasher_HV.ID, + "simplewasher.01.tier.07", + "Simple Washer III"), + new Quad<>( + GregtechItemList.SimpleDustWasher_EV, + SimpleDustWasher_EV.ID, + "simplewasher.01.tier.03", + "Simple Washer IV"), + new Quad<>( + GregtechItemList.SimpleDustWasher_IV, + SimpleDustWasher_IV.ID, + "simplewasher.01.tier.08", + "Simple Washer V"), + new Quad<>( + GregtechItemList.SimpleDustWasher_LuV, + SimpleDustWasher_LuV.ID, + "simplewasher.01.tier.04", + "Simple Washer VI"), + new Quad<>( + GregtechItemList.SimpleDustWasher_ZPM, + SimpleDustWasher_ZPM.ID, + "simplewasher.01.tier.09", + "Simple Washer VII"), + new Quad<>( + GregtechItemList.SimpleDustWasher_UV, + SimpleDustWasher_UV.ID, + "simplewasher.01.tier.05", + "Simple Washer VIII")); + + GregtechItemList.SimpleDustWasher_ULV.set( + new MTEBasicMachineWithRecipe( + SimpleDustWasher_ULV.ID, + "simplewasher.01.tier.01", + "Deprecated ULV Simple Washer", + 0, + new String[] { "It's like an automatic Cauldron for washing dusts.", + "§cDEPRECATED: No recipe.§r Make a Simple Washer I.", GTPPCore.GT_Tooltip.get() }, + simpleWasherRecipes, + 1, + 1, + true, + SoundResource.NONE, + SpecialEffects.NONE, + "SIMPLE_WASHER", + null).setRecipeCatalystPriority(-11) + .getStackForm(1L)); + + for (int i = 0; i < washers.size(); i++) { + Quad<GregtechItemList, Integer, String, String> washer = washers.get(i); + int tier = i + 1; + washer.getKey() + .set( + new MTEBasicMachineWithRecipe( + washer.getValue_1(), + washer.getValue_2(), + washer.getValue_3(), + tier, + new String[] { "It's like an automatic Cauldron for washing dusts.", + GTPPCore.GT_Tooltip.get() }, + simpleWasherRecipes, + 1, + 1, + true, + SoundResource.NONE, + SpecialEffects.NONE, + "SIMPLE_WASHER", + null).setRecipeCatalystPriority(-tier) + .getStackForm(1L)); } + } private static boolean generateDirtyDustRecipes() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java index 77f169ef1c..22d32167da 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java @@ -6,7 +6,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_MV; import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_ULV; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTETieredTank; @@ -14,9 +13,7 @@ public class GregtechTieredFluidTanks { public static void run() { Logger.INFO("Gregtech5u Content | Registering Portable Fluid Tanks."); - if (GTPPCore.ConfigSwitches.enableMachine_FluidTanks) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java index b848ef1e61..35a05f3409 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.TreeFarmer_Structural; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTETreeFarmerStructural; @@ -11,9 +10,8 @@ public class GregtechTreeFarmerTE { public static void run() { Logger.INFO("Gregtech5u Content | Registering Tree Farmer Structural Block."); - if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { - run1(); - } + run1(); + } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java index 9854921dd4..01ae9344e0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.WaterPump; + import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamWaterPump; @@ -7,7 +9,7 @@ public class GregtechWaterPump { public static void run() { // Water Pump Multiblock - GregtechItemList.WaterPump - .set(new MTESteamWaterPump(31085, "waterpump.controller.tier.single", "Water Pump").getStackForm(1L)); + GregtechItemList.WaterPump.set( + new MTESteamWaterPump(WaterPump.ID, "waterpump.controller.tier.single", "Water Pump").getStackForm(1L)); } } |