From 648d073301c771e385f4b36049cc77b4fadc662c Mon Sep 17 00:00:00 2001 From: boubou_19 Date: Mon, 29 Nov 2021 02:20:03 +0100 Subject: extracted pollution values to CORE.ConfigSwitches --- src/Java/gtPlusPlus/core/lib/CORE.java | 45 ++++++++++++++++++++++ .../base/GregtechMeta_MultiBlockBase.java | 4 -- .../machines/multi/misc/GMTE_AmazonPackager.java | 7 ++-- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 7 ++-- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 8 ++-- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 7 ++-- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 7 ++-- ...echMetaTileEntity_IndustrialCuttingMachine.java | 7 ++-- ...regtechMetaTileEntity_IndustrialDehydrator.java | 10 ++--- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 7 ++-- .../GregtechMetaTileEntity_IndustrialExtruder.java | 7 ++-- ...GregtechMetaTileEntity_IndustrialMacerator.java | 7 ++-- .../GregtechMetaTileEntity_IndustrialMixer.java | 7 ++-- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 16 ++++---- ...regtechMetaTileEntity_IndustrialPlatePress.java | 8 ++-- .../GregtechMetaTileEntity_IndustrialSifter.java | 7 ++-- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 7 ++-- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 7 ++-- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 8 ++-- .../GregtechMetaTileEntity_IndustrialWireMill.java | 7 ++-- .../processing/GregtechMetaTileEntity_IsaMill.java | 7 ++-- ...egtechMetaTileEntity_Adv_DistillationTower.java | 8 ++-- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 7 ++-- .../GregtechMetaTileEntity_Adv_Implosion.java | 7 ++-- .../multi/production/GT4Entity_AutoCrafter.java | 6 +-- .../multi/production/GT4Entity_ThermalBoiler.java | 7 ++-- .../production/GregtechMTE_FrothFlotationCell.java | 7 ++-- .../production/GregtechMTE_NuclearReactor.java | 8 ++-- .../production/GregtechMetaTileEntityTreeFarm.java | 11 ++---- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 7 ++-- .../GregtechMetaTileEntity_Cyclotron.java | 7 ++-- ...egtechMetaTileEntity_IndustrialFishingPond.java | 6 +-- ...techMetaTileEntity_LargeSemifluidGenerator.java | 7 ++-- .../GregtechMetaTileEntity_MassFabricator.java | 7 ++-- .../GregtechMetaTileEntity_Refinery.java | 7 ++-- .../algae/GregtechMTE_AlgaePondBase.java | 7 ++-- 36 files changed, 186 insertions(+), 120 deletions(-) (limited to 'src') diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index cb6c9ef632..aca91d8f8b 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -259,6 +259,51 @@ public class CORE { public static boolean enableTreeFarmerParticles = true; public static boolean useGregtechTextures = true; + //Pollution + public static int pollutionPerSecondMultiPackager = 40; + public static int pollutionPerSecondMultiIndustrialAlloySmelter = 300; + public static int PollutionPerSecondMultiIndustrialArcFurnace = 2400; + public static int pollutionPerSecondMultiIndustrialCentrifuge = 300; + public static int pollutionPerSecondMultiIndustrialCokeOven = 80; + public static int pollutionPerSecondMultiIndustrialCuttingMachine = 160; + public static int pollutionPerSecondMultiIndustrialDehydrator = 500; + public static int pollutionPerSecondMultiIndustrialElectrolyzer = 300; + public static int pollutionPerSecondMultiIndustrialExtruder = 1000; + public static int pollutionPerSecondMultiIndustrialMacerator = 400; + public static int pollutionPerSecondMultiIndustrialMixer = 800; + public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal = 400; + public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid = 400; + public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc = 600; + public static int pollutionPerSecondMultiIndustrialPlatePress_ModeForming = 240; + public static int pollutionPerSecondMultiIndustrialPlatePress_ModeBending = 480; + public static int pollutionPerSecondMultiIndustrialSifter = 40; + public static int pollutionPerSecondMultiIndustrialThermalCentrifuge = 1000; + public static int pollutionPerSecondMultiIndustrialVacuumFreezer = 500; + public static int pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath = 400; + public static int pollutionPerSecondMultiIndustrialWashPlant_ModeWasher = 100; + public static int pollutionPerSecondMultiIndustrialWireMill = 100; + public static int pollutionPerSecondMultiIsaMill = 1280; + public static int pollutionPerSecondMultiAdvDistillationTower_ModeDistillery = 240; + public static int pollutionPerSecondMultiAdvDistillationTower_ModeDT = 480; + public static int pollutionPerSecondMultiAdvEBF = 500; + public static int pollutionPerSecondMultiAdvImplosion = 5000; + public static int pollutionPerSecondMultiABS = 200; + public static int pollutionPerSecondMultiCyclotron = 200; + public static int pollutionPerSecondMultiIndustrialFishingPond = 20; + public static int pollutionPerSecondMultiLargeRocketEngine; + public static int pollutionPerSecondMultiLargeSemiFluidGenerator = 1280; + public static int pollutionPerSecondMultiMassFabricator = 40; + public static int pollutionPerSecondMultiRefinery = 4000; + public static int pollutionPerSecondMultiGeneratorArray; + public static int pollutionPerSecondMultiTreeFarm = 100; + public static int pollutionPerSecondMultiFrothFlotationCell = 0; + public static int pollutionPerSecondMultiNuclearReactor_ModeBoosted = 160; + public static int pollutionPerSecondMultiNuclearReactor_ModeNormal = 80; + public static int pollutionPerSecondMultiAutoCrafter = 500; + public static int pollutionPerSecondMultiThermalBoiler = 700; + public static int pollutionPerSecondMultiAlgaePond = 0; + + diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 3878583b60..0b8182c64a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -2159,10 +2159,6 @@ public abstract class GregtechMeta_MultiBlockBase