From c74367258e8a2a60392234d2a1a13e0a19433795 Mon Sep 17 00:00:00 2001
From: boubou19 <miisterunknown@gmail.com>
Date: Thu, 19 Sep 2024 23:05:17 +0200
Subject: migrate GT++ config to GTNHLib (#3193)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
.../implementations/base/GTPPMultiBlockBase.java | 4 ++--
.../base/generators/MTERocketFuelGeneratorBase.java | 17 +++++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations')
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
--
cgit