From dbc10704fdbff100d1ae592aa0ddf1dc8b1aeca0 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 12 Sep 2024 22:30:04 +0200 Subject: Merge config categories (#3152) Co-authored-by: miozune Co-authored-by: Martin Robertz --- .../api/metatileentity/implementations/MTEFluid.java | 4 ++-- .../metatileentity/implementations/MTEMultiBlockBase.java | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java index ddc0e28723..2613aa23c0 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java @@ -64,7 +64,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.ISerializableObject; import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder; import gregtech.common.GTClient; -import gregtech.common.config.other.ConfigGeneral; +import gregtech.common.config.Other; import gregtech.common.covers.CoverDrain; import gregtech.common.covers.CoverFluidRegulator; import gregtech.common.covers.CoverInfo; @@ -504,7 +504,7 @@ public class MTEFluid extends MetaPipeEntity { boolean wasActionPerformed = false; - int limit = ConfigGeneral.pipeWrenchingChainRange; + int limit = Other.pipeWrenchingChainRange; for (int connected = 0; connected < limit; connected++) { TileEntity nextPipeBaseTile = currentPipeBase.getTileEntityAtSide(tSide); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java index 8cdcd6e18f..a6526ac6fa 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java @@ -96,7 +96,7 @@ import gregtech.api.util.shutdown.ShutDownReason; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gregtech.client.GTSoundLoop; import gregtech.common.Pollution; -import gregtech.common.config.machinestats.ConfigMachines; +import gregtech.common.config.MachineStats; import gregtech.common.gui.modularui.widget.CheckRecipeResultSyncer; import gregtech.common.gui.modularui.widget.ShutDownReasonSyncer; import gregtech.common.items.MetaGeneratedTool01; @@ -172,9 +172,9 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity public MTEMultiBlockBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 2); this.processingLogic = null; - MTEMultiBlockBase.disableMaintenance = ConfigMachines.disableMaintenanceChecks; - this.damageFactorLow = ConfigMachines.damageFactorLow; - this.damageFactorHigh = ConfigMachines.damageFactorHigh; + MTEMultiBlockBase.disableMaintenance = MachineStats.machines.disableMaintenanceChecks; + this.damageFactorLow = MachineStats.machines.damageFactorLow; + this.damageFactorHigh = MachineStats.machines.damageFactorHigh; this.mNEI = ""; if (!shouldCheckMaintenance()) fixAllIssues(); } @@ -182,9 +182,9 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity public MTEMultiBlockBase(String aName) { super(aName, 2); this.processingLogic = createProcessingLogic(); - MTEMultiBlockBase.disableMaintenance = ConfigMachines.disableMaintenanceChecks; - this.damageFactorLow = ConfigMachines.damageFactorLow; - this.damageFactorHigh = ConfigMachines.damageFactorHigh; + MTEMultiBlockBase.disableMaintenance = MachineStats.machines.disableMaintenanceChecks; + this.damageFactorLow = MachineStats.machines.damageFactorLow; + this.damageFactorHigh = MachineStats.machines.damageFactorHigh; if (!shouldCheckMaintenance()) fixAllIssues(); } -- cgit