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; impo |