diff options
Diffstat (limited to 'src/main/java/bartworks/common/tileentities')
10 files changed, 36 insertions, 33 deletions
diff --git a/src/main/java/bartworks/common/tileentities/classic/TileEntityHeatedWaterPump.java b/src/main/java/bartworks/common/tileentities/classic/TileEntityHeatedWaterPump.java index 3f973e8eea..046ecb40f2 100644 --- a/src/main/java/bartworks/common/tileentities/classic/TileEntityHeatedWaterPump.java +++ b/src/main/java/bartworks/common/tileentities/classic/TileEntityHeatedWaterPump.java @@ -47,7 +47,7 @@ import bartworks.API.ITileDropsContent; import bartworks.API.ITileHasDifferentTextureSides; import bartworks.API.modularUI.BWUITextures; import bartworks.MainMod; -import bartworks.common.configs.ConfigHandler; +import bartworks.common.configs.Configuration; import gregtech.api.util.GTUtility; import gregtech.common.Pollution; @@ -113,8 +113,8 @@ public class TileEntityHeatedWaterPump extends TileEntity implements ITileDropsC ++this.tick; --this.fuel; if (this.tick % 20 == 0) { - if (this.outputstack.amount <= 8000 - ConfigHandler.mbWaterperSec) - this.outputstack.amount += ConfigHandler.mbWaterperSec; + if (this.outputstack.amount <= 8000 - Configuration.singleBlocks.mbWaterperSec) + this.outputstack.amount += Configuration.singleBlocks.mbWaterperSec; this.tick = 0; } } @@ -167,7 +167,8 @@ public class TileEntityHeatedWaterPump extends TileEntity implements ITileDropsC .ifPresent(e -> { if (e.getTotalWorldTime() % 20 == 0) { Optional.ofNullable(e.getChunkFromBlockCoords(this.xCoord, this.zCoord)) - .ifPresent(c -> Pollution.addPollution(c, ConfigHandler.pollutionHeatedWaterPumpSecond)); + .ifPresent( + c -> Pollution.addPollution(c, Configuration.pollution.pollutionHeatedWaterPumpSecond)); } }); } @@ -330,10 +331,10 @@ public class TileEntityHeatedWaterPump extends TileEntity implements ITileDropsC public String[] getInfoData() { return new String[] { StatCollector.translateToLocal("tooltip.tile.waterpump.0.name") + " " - + GTUtility.formatNumbers(ConfigHandler.mbWaterperSec) + + GTUtility.formatNumbers(Configuration.singleBlocks.mbWaterperSec) + String.format( StatCollector.translateToLocal("tooltip.tile.waterpump.1.name"), - ConfigHandler.pollutionHeatedWaterPumpSecond), + Configuration.pollution.pollutionHeatedWaterPumpSecond), StatCollector.translateToLocal("tooltip.tile.waterpump.2.name") }; } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java index b982c0d886..7859cc587d 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java @@ -56,7 +56,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import bartworks.API.SideReference; import bartworks.API.recipe.BartWorksRecipeMaps; import bartworks.MainMod; -import bartworks.common.configs.ConfigHandler; +import bartworks.common.configs.Configuration; import bartworks.common.items.ItemLabParts; import bartworks.common.loaders.FluidLoader; import bartworks.common.net.RendererPacket; @@ -232,10 +232,10 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase<MTEBioVat> { } private int calcMod(double x) { - double y = this.getOutputCapacity() / 2D, z = ConfigHandler.bioVatMaxParallelBonus; + double y = this.getOutputCapacity() / 2D, z = Configuration.Multiblocks.bioVatMaxParallelBonus; int ret = MathUtils.ceilInt((-1D / y * Math.pow(x - y, 2D) + y) / y * z); - return MathUtils.clamp(1, ret, ConfigHandler.bioVatMaxParallelBonus); + return MathUtils.clamp(1, ret, Configuration.Multiblocks.bioVatMaxParallelBonus); } @Override diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java b/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java index fca10c20fd..d558e5466b 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEDeepEarthHeatingPump.java @@ -26,7 +26,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import bartworks.common.configs.ConfigHandler; +import bartworks.common.configs.Configuration; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -98,7 +98,7 @@ public class MTEDeepEarthHeatingPump extends MTEDrillerBase { tt.addMachineType("Geothermal Heat Pump") .addInfo("Consumes " + GTValues.V[this.mTier + 2] + "EU/t") .addInfo("Has 4 Modes, use the Screwdriver to change them:"); - if (ConfigHandler.DEHPDirectSteam) { + if (Configuration.multiblocks.DEHPDirectSteam) { tt.addInfo("0 Idle, 1 Steam, 2 Superheated Steam (requires Distilled Water), 3 Retract") .addInfo("Explodes when it runs out of Water/Distilled Water") .addInfo( @@ -233,7 +233,7 @@ public class MTEDeepEarthHeatingPump extends MTEDrillerBase { if (this.mMode == 0) { this.mMode = 1; } - if (ConfigHandler.DEHPDirectSteam) { + if (Configuration.multiblocks.DEHPDirectSteam) { if (this.mMode == 1) { long steamProduced = this.mTier * 600 * 2L * this.mEfficiency / 10000L; long waterConsume = (steamProduced + 160) / 160; diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java b/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java index 4b99f97ec5..1339c11095 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java @@ -67,7 +67,7 @@ import com.gtnewhorizon.structurelib.structure.StructureUtility; import bartworks.API.recipe.BartWorksRecipeMaps; import bartworks.MainMod; import bartworks.client.renderer.EICPistonVisualizer; -import bartworks.common.configs.ConfigHandler; +import bartworks.common.configs.Configuration; import bartworks.common.net.EICPacket; import bartworks.util.Coords; import cpw.mods.fml.relauncher.Side; @@ -95,7 +95,7 @@ import gregtech.api.util.OverclockCalculator; public class MTEElectricImplosionCompressor extends MTEExtendedPowerMultiBlockBase<MTEElectricImplosionCompressor> implements ISurvivalConstructable { - private static final boolean pistonEnabled = !ConfigHandler.disablePistonInEIC; + private static final boolean pistonEnabled = !Configuration.multiblocks.disablePistonInEIC; private Boolean piston = true; private static final SoundResource sound = SoundResource.RANDOM_EXPLODE; private final ArrayList<ChunkCoordinates> chunkCoordinates = new ArrayList<>(5); diff --git a/src/main/java/bartworks/common/tileentities/multis/MTELESU.java b/src/main/java/bartworks/common/tileentities/multis/MTELESU.java index a039aa593c..e2c393f889 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTELESU.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTELESU.java @@ -43,7 +43,7 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; import bartworks.API.modularUI.BWUITextures; import bartworks.MainMod; -import bartworks.common.configs.ConfigHandler; +import bartworks.common.configs.Configuration; import bartworks.common.loaders.ItemRegistry; import bartworks.util.BWTooltipReference; import bartworks.util.ConnectedBlocksChecker; @@ -85,7 +85,7 @@ public class MTELESU extends MTEMultiBlockBase { public MTELESU(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); - this.mStorage = ConfigHandler.energyPerCell; + this.mStorage = Configuration.multiblocks.energyPerCell; } public MTELESU(String aName) { @@ -136,7 +136,7 @@ public class MTELESU extends MTEMultiBlockBase { @Override public long maxEUOutput() { - return Math.min(Math.max(this.mStorage / ConfigHandler.energyPerCell, 1L), 32768L); + return Math.min(Math.max(this.mStorage / Configuration.multiblocks.energyPerCell, 1L), 32768L); } @Override @@ -177,7 +177,7 @@ public class MTELESU extends MTEMultiBlockBase { Collections.addAll(e, dsc); e.add( StatCollector.translateToLocal("tooltip.tile.lesu.1.name") + " " - + GTUtility.formatNumbers(ConfigHandler.energyPerCell) + + GTUtility.formatNumbers(Configuration.multiblocks.energyPerCell) + "EU"); dsc = StatCollector.translateToLocal("tooltip.tile.lesu.2.name") .split(";"); @@ -396,9 +396,10 @@ public class MTELESU extends MTEMultiBlockBase { } this.mEfficiency = this.getMaxEfficiency(null); - this.mStorage = ConfigHandler.energyPerCell * this.connectedcells.hashset.size() >= Long.MAX_VALUE - 1 - || ConfigHandler.energyPerCell * this.connectedcells.hashset.size() < 0 ? Long.MAX_VALUE - 1 - : ConfigHandler.energyPerCell * this.connectedcells.hashset.size(); + this.mStorage = Configuration.multiblocks.energyPerCell * this.connectedcells.hashset.size() + >= Long.MAX_VALUE - 1 || Configuration.multiblocks.energyPerCell * this.connectedcells.hashset.size() < 0 + ? Long.MAX_VALUE - 1 + : Configuration.multiblocks.energyPerCell * this.connectedcells.hashset.size(); this.mMaxProgresstime = 1; this.mProgresstime = 0; @@ -546,7 +547,7 @@ public class MTELESU extends MTEMultiBlockBase { () -> this.getBaseMetaTileEntity() .isActive() ? this.getBaseMetaTileEntity() - .getOutputVoltage() * ConfigHandler.energyPerCell + .getOutputVoltage() * Configuration.multiblocks.energyPerCell : 0, val -> clientMaxEU = val)) .widget( diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java index 8d5ea073db..58f00bf77c 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java @@ -46,7 +46,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import bartworks.API.BorosilicateGlass; -import bartworks.common.configs.ConfigHandler; +import bartworks.common.configs.Configuration; import bartworks.util.BWUtil; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; @@ -148,7 +148,8 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase<MTEMegaBlastFurnace> Materials.CarbonMonoxide.getGas(1000), Materials.SulfurDioxide.getGas(1000) }; private int mHeatingCapacity; private byte glassTier; - private final static int polPtick = ConfigHandler.basePollutionMBFSecond / 20 * ConfigHandler.megaMachinesMax; + private final static int polPtick = Configuration.pollution.basePollutionMBFSecond / 20 + * Configuration.Multiblocks.megaMachinesMax; public MTEMegaBlastFurnace(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -312,7 +313,7 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase<MTEMegaBlastFurnace> ? CheckRecipeResultRegistry.SUCCESSFUL : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue); } - }.setMaxParallel(ConfigHandler.megaMachinesMax); + }.setMaxParallel(Configuration.Multiblocks.megaMachinesMax); } @Override diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java index e1366cec7d..3c15af0fae 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java @@ -39,7 +39,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import bartworks.API.BorosilicateGlass; -import bartworks.common.configs.ConfigHandler; +import bartworks.common.configs.Configuration; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; import gregtech.api.interfaces.ITexture; @@ -178,7 +178,7 @@ public class MTEMegaChemicalReactor extends MegaMultiBlockBase<MTEMegaChemicalRe @Override protected ProcessingLogic createProcessingLogic() { return new ProcessingLogic().enablePerfectOverclock() - .setMaxParallel(ConfigHandler.megaMachinesMax); + .setMaxParallel(Configuration.Multiblocks.megaMachinesMax); } @Override diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java index 382b64fb47..ac6a0ae6b4 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java @@ -42,7 +42,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.IStructureElementCheckOnly; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import bartworks.common.configs.ConfigHandler; +import bartworks.common.configs.Configuration; import gregtech.api.GregTechAPI; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IHatchElement; @@ -391,7 +391,7 @@ public class MTEMegaDistillTower extends MegaMultiBlockBase<MTEMegaDistillTower> @Override protected ProcessingLogic createProcessingLogic() { - return new ProcessingLogic().setMaxParallel(ConfigHandler.megaMachinesMax); + return new ProcessingLogic().setMaxParallel(Configuration.Multiblocks.megaMachinesMax); } @Override diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java index 4720b0b37c..3e2a73c725 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java @@ -49,7 +49,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import bartworks.API.BorosilicateGlass; -import bartworks.common.configs.ConfigHandler; +import bartworks.common.configs.Configuration; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; import gregtech.api.enums.HeatingCoilLevel; @@ -220,7 +220,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase<MTEMegaOilCracker> imp this.setEuModifier(1.0F - Math.min(0.1F * (MTEMegaOilCracker.this.heatLevel.getTier() + 1), 0.5F)); return super.process(); } - }.setMaxParallel(ConfigHandler.megaMachinesMax); + }.setMaxParallel(Configuration.Multiblocks.megaMachinesMax); } public HeatingCoilLevel getCoilLevel() { diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java index e47782d980..a24f5d4b7e 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaVacuumFreezer.java @@ -46,7 +46,7 @@ import com.gtnewhorizon.structurelib.structure.IItemSource; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import bartworks.common.configs.ConfigHandler; +import bartworks.common.configs.Configuration; import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; @@ -424,7 +424,7 @@ public class MTEMegaVacuumFreezer extends MegaMultiBlockBase<MTEMegaVacuumFreeze .setHeatOC(true) .setHeatDiscount(false); } - }.setMaxParallel(ConfigHandler.megaMachinesMax); + }.setMaxParallel(Configuration.Multiblocks.megaMachinesMax); } @Override |