From c74367258e8a2a60392234d2a1a13e0a19433795 Mon Sep 17 00:00:00 2001 From: boubou19 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 --- .../registration/gregtech/Gregtech4Content.java | 12 +- .../registration/gregtech/GregtechConduits.java | 11 +- .../gregtech/GregtechCustomHatches.java | 224 ++++++++++++++------- .../registration/gregtech/GregtechDehydrator.java | 4 +- .../gregtech/GregtechEnergyBuffer.java | 9 - .../GregtechGeothermalThermalGenerator.java | 5 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 5 +- .../gregtech/GregtechIndustrialCentrifuge.java | 5 +- .../gregtech/GregtechIndustrialCokeOven.java | 5 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 6 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 5 +- .../gregtech/GregtechIndustrialExtruder.java | 5 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 5 +- .../gregtech/GregtechIndustrialMacerator.java | 5 +- .../gregtech/GregtechIndustrialMassFabricator.java | 7 +- .../gregtech/GregtechIndustrialMixer.java | 5 +- .../gregtech/GregtechIndustrialMultiMachine.java | 5 +- .../gregtech/GregtechIndustrialPlatePress.java | 5 +- .../gregtech/GregtechIndustrialSifter.java | 5 +- .../GregtechIndustrialThermalCentrifuge.java | 5 +- .../gregtech/GregtechIndustrialTreeFarm.java | 9 +- .../gregtech/GregtechIndustrialWashPlant.java | 5 +- .../gregtech/GregtechIndustrialWiremill.java | 5 +- .../registration/gregtech/GregtechLFTR.java | 4 +- .../GregtechNuclearSaltProcessingPlant.java | 16 +- .../gregtech/GregtechPollutionDevices.java | 152 +++++++------- .../gregtech/GregtechPowerSubStation.java | 5 +- .../gregtech/GregtechQuantumForceTransformer.java | 14 +- .../gregtech/GregtechRedstoneButtonPanel.java | 8 +- .../gregtech/GregtechRedstoneCircuitBlock.java | 8 +- .../gregtech/GregtechRedstoneLamp.java | 7 +- .../gregtech/GregtechRedstoneStrengthDisplay.java | 17 +- .../gregtech/GregtechRedstoneStrengthScale.java | 8 +- .../gregtech/GregtechRocketFuelGenerator.java | 6 +- .../gregtech/GregtechSimpleWasher.java | 179 ++++++++-------- .../gregtech/GregtechTieredFluidTanks.java | 5 +- .../gregtech/GregtechTreeFarmerTE.java | 6 +- .../registration/gregtech/GregtechWaterPump.java | 6 +- 38 files changed, 397 insertions(+), 401 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/registration') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index 02141388bb..48874d1d3e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -23,7 +23,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.GT4_Thermal_Boiler; import gregtech.api.GregTechAPI; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTEElectricAutoWorkbench; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator; @@ -115,12 +114,11 @@ public class Gregtech4Content { private static void thermalBoiler() { // Gregtech 4 Thermal Boiler - if (GTPPCore.ConfigSwitches.enableMultiblock_ThermalBoiler) { - Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler."); - GregtechItemList.GT4_Thermal_Boiler.set( - new MTEThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler") - .getStackForm(1L)); - } + Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler."); + GregtechItemList.GT4_Thermal_Boiler.set( + new MTEThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler") + .getStackForm(1L)); + } private static void multiCrafter() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index ec9eff9ebe..b331479028 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -19,7 +19,6 @@ import gregtech.api.metatileentity.implementations.MTEFluid; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.material.MaterialsElements; @@ -41,13 +40,9 @@ public class GregtechConduits { private static int BasePipeHexadecupleID = 30100; public static void run() { - if (GTPPCore.ConfigSwitches.enableCustom_Cables) { - run1(); - } - if (GTPPCore.ConfigSwitches.enableCustom_Pipes) { - run2(); - run3(); - } + run1(); + run2(); + run3(); } private static void run3() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index 2781730229..58d1abc73b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -1,5 +1,12 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_ChiselBus_HV; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_ChiselBus_LV; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_ChiselBus_MV; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_I; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_II; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_III; +import static gregtech.api.enums.MetaTileEntityIDs.GT_MetaTileEntity_Solidifier_IV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Air_Intake; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Air_Intake_Extreme; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_Cryotheum; @@ -10,17 +17,36 @@ import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_TurbineHousing; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_EV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_HV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_LV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_LuV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_MAX; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_MV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_UV; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Muffler_Adv_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Reservoir; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Input_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_EV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_HV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_IV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_LV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_MV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_UHV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_UV; +import static gregtech.api.enums.MetaTileEntityIDs.Hatch_SuperBus_Output_ZPM; +import gregtech.GTMod; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchAirIntakeExtreme; @@ -39,7 +65,7 @@ public class GregtechCustomHatches { public static void run() { Logger.INFO("Gregtech5u Content | Registering Custom Fluid Hatches."); run1(); - if (PollutionUtils.isPollutionEnabled()) { + if (GTMod.gregtechproxy.mPollution) { run2(); } run3(); @@ -116,8 +142,11 @@ public class GregtechCustomHatches { private static void run2() { GregtechItemList.Hatch_Muffler_Adv_LV.set( - (new MTEHatchMufflerAdvanced(30001, "hatch.muffler.adv.tier.01", "Advanced Muffler Hatch (LV)", 1)) - .getStackForm(1L)); + (new MTEHatchMufflerAdvanced( + Hatch_Muffler_Adv_LV.ID, + "hatch.muffler.adv.tier.01", + "Advanced Muffler Hatch (LV)", + 1)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_MV.set( (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_MV.ID, @@ -169,71 +198,115 @@ public class GregtechCustomHatches { } private static void run3() { - /* - * Super Input Busses - */ - - int aStartID = 30022; - GregtechItemList.Hatch_SuperBus_Input_LV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.01", "Super Bus (I) (LV)", 1)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_LV.ID, + "hatch.superbus.input.tier.01", + "Super Bus (I) (LV)", + 1)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_MV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.02", "Super Bus (I) (MV)", 2)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_MV.ID, + "hatch.superbus.input.tier.02", + "Super Bus (I) (MV)", + 2)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_HV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.03", "Super Bus (I) (HV)", 3)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_HV.ID, + "hatch.superbus.input.tier.03", + "Super Bus (I) (HV)", + 3)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_EV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.04", "Super Bus (I) (EV)", 4)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_EV.ID, + "hatch.superbus.input.tier.04", + "Super Bus (I) (EV)", + 4)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_IV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.05", "Super Bus (I) (IV)", 5)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_IV.ID, + "hatch.superbus.input.tier.05", + "Super Bus (I) (IV)", + 5)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_LuV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.06", "Super Bus (I) (LuV)", 6)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_LuV.ID, + "hatch.superbus.input.tier.06", + "Super Bus (I) (LuV)", + 6)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_ZPM.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.07", "Super Bus (I) (ZPM)", 7)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_ZPM.ID, + "hatch.superbus.input.tier.07", + "Super Bus (I) (ZPM)", + 7)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_UV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.08", "Super Bus (I) (UV)", 8)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_UV.ID, + "hatch.superbus.input.tier.08", + "Super Bus (I) (UV)", + 8)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_MAX.set( - ((IMetaTileEntity) makeInputBus(aStartID, "hatch.superbus.input.tier.09", "Super Bus (I) (UHV)", 9)) - .getStackForm(1L)); + ((IMetaTileEntity) makeInputBus( + Hatch_SuperBus_Input_UHV.ID, + "hatch.superbus.input.tier.09", + "Super Bus (I) (UHV)", + 9)).getStackForm(1L)); - /* - * Super Output Busses - */ - aStartID = 30032; GregtechItemList.Hatch_SuperBus_Output_LV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.01", "Super Bus (O) (LV)", 1)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_LV.ID, + "hatch.superbus.output.tier.01", + "Super Bus (O) (LV)", + 1)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_MV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.02", "Super Bus (O) (MV)", 2)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_MV.ID, + "hatch.superbus.output.tier.02", + "Super Bus (O) (MV)", + 2)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_HV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.03", "Super Bus (O) (HV)", 3)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_HV.ID, + "hatch.superbus.output.tier.03", + "Super Bus (O) (HV)", + 3)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_EV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.04", "Super Bus (O) (EV)", 4)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_EV.ID, + "hatch.superbus.output.tier.04", + "Super Bus (O) (EV)", + 4)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_IV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.05", "Super Bus (O) (IV)", 5)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_IV.ID, + "hatch.superbus.output.tier.05", + "Super Bus (O) (IV)", + 5)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_LuV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.06", "Super Bus (O) (LuV)", 6)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_LuV.ID, + "hatch.superbus.output.tier.06", + "Super Bus (O) (LuV)", + 6)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_ZPM.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.07", "Super Bus (O) (ZPM)", 7)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_ZPM.ID, + "hatch.superbus.output.tier.07", + "Super Bus (O) (ZPM)", + 7)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_UV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.08", "Super Bus (O) (UV)", 8)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_UV.ID, + "hatch.superbus.output.tier.08", + "Super Bus (O) (UV)", + 8)).getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_MAX.set( - ((IMetaTileEntity) makeOutputBus(aStartID, "hatch.superbus.output.tier.09", "Super Bus (O) (UHV)", 9)) - .getStackForm(1L)); + ((IMetaTileEntity) makeOutputBus( + Hatch_SuperBus_Output_UHV.ID, + "hatch.superbus.output.tier.09", + "Super Bus (O) (UHV)", + 9)).getStackForm(1L)); } private static MTEHatchSuperBusInput makeInputBus(int id, String unlocalizedName, String localizedName, int tier) { @@ -249,28 +322,43 @@ public class GregtechCustomHatches { } private static void run4() { - int aID = 31778; // 31778 - 31780 - - GregtechItemList.GT_MetaTileEntity_ChiselBus_LV - .set((makeChiselBus(aID++, "hatch.chisel.tier.01", "Chisel Bus I", 1)).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_ChiselBus_MV - .set((makeChiselBus(aID++, "hatch.chisel.tier.02", "Chisel Bus II", 2)).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_ChiselBus_HV - .set((makeChiselBus(aID++, "hatch.chisel.tier.03", "Chisel Bus III", 3)).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_ChiselBus_LV.set( + (makeChiselBus(GT_MetaTileEntity_ChiselBus_LV.ID, "hatch.chisel.tier.01", "Chisel Bus I", 1)) + .getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_ChiselBus_MV.set( + (makeChiselBus(GT_MetaTileEntity_ChiselBus_MV.ID, "hatch.chisel.tier.02", "Chisel Bus II", 2)) + .getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_ChiselBus_HV.set( + (makeChiselBus(GT_MetaTileEntity_ChiselBus_HV.ID, "hatch.chisel.tier.03", "Chisel Bus III", 3)) + .getStackForm(1L)); } private static void run6() { - int aID = 31781; // 31781-31784 - - GregtechItemList.GT_MetaTileEntity_Solidifier_I - .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.05", "Solidifier Hatch I", 5).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_II - .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.06", "Solidifier Hatch II", 6).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_III - .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.07", "Solidifier Hatch III", 7).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_IV - .set(new MTEHatchSolidifier(aID, "hatch.solidifier.tier.08", "Solidifier Hatch IV", 8).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_I.set( + new MTEHatchSolidifier( + GT_MetaTileEntity_Solidifier_I.ID, + "hatch.solidifier.tier.05", + "Solidifier Hatch I", + 5).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_II.set( + new MTEHatchSolidifier( + GT_MetaTileEntity_Solidifier_II.ID, + "hatch.solidifier.tier.06", + "Solidifier Hatch II", + 6).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_III.set( + new MTEHatchSolidifier( + GT_MetaTileEntity_Solidifier_III.ID, + "hatch.solidifier.tier.07", + "Solidifier Hatch III", + 7).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_IV.set( + new MTEHatchSolidifier( + GT_MetaTileEntity_Solidifier_IV.ID, + "hatch.solidifier.tier.08", + "Solidifier Hatch IV", + 8).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 85d87cb706..11ead9b3fd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -35,9 +35,7 @@ public class GregtechDehydrator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Chemical Dehydrators."); - if (GTPPCore.ConfigSwitches.enableMachine_Dehydrators) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index 528efc5712..6dd9c7170c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -179,14 +179,5 @@ public class GregtechEnergyBuffer { | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', GregtechOreDictNames.buffer_core }); - /* - * GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), - * GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | - * GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", - * Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), - * OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), GregtechOreDictNames.buffer_core - * }); - */ - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index 0be94d63c9..963551a2a3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -11,7 +11,6 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -21,9 +20,7 @@ public class GregtechGeothermalThermalGenerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Geothermal Engines."); - if (GTPPCore.ConfigSwitches.enableMachine_GeothermalEngines) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java index 956193bef2..6756c09898 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java @@ -4,7 +4,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_AlloyBlastSmelter; import static gregtech.api.enums.MetaTileEntityIDs.Mega_AlloyBlastSmelter; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEAlloyBlastSmelter; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.mega.MTEMegaAlloyBlastSmelter; @@ -13,9 +12,7 @@ public class GregtechIndustrialBlastSmelter { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java index 4a0da61dbd..dc800db078 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Centrifuge; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCentrifuge; @@ -11,9 +10,7 @@ public class GregtechIndustrialCentrifuge { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java index 219b5ee196..7f7cca61d0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CokeOven; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCokeOven; @@ -11,9 +10,7 @@ public class GregtechIndustrialCokeOven { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java index c05614827d..172881ebd8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CuttingFactoryController; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCuttingMachine; @@ -11,9 +10,8 @@ public class GregtechIndustrialCuttingFactory { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Cutting Factory Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { - run1(); - } + run1(); + } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java index 34f736e0f7..7229dc65b4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Electrolyzer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEndustrialElectrolyzer; @@ -11,9 +10,7 @@ public class GregtechIndustrialElectrolyzer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java index 1af1b8dec1..0a4ac87949 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Extruder; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialExtruder; @@ -11,9 +10,7 @@ public class GregtechIndustrialExtruder { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Extrusion Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java index 96883ac3c2..1dbc83bd2d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_FuelRefinery; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTERefinery; @@ -11,9 +10,7 @@ public class GregtechIndustrialFuelRefinery { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_NuclearFuelRefinery) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index 6d9d17c987..a53a63b377 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MacerationStack; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMacerator; @@ -11,9 +10,7 @@ public class GregtechIndustrialMacerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index 9d680127dd..2b42345f38 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -10,7 +10,6 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEMassFabricator; @@ -19,10 +18,8 @@ public class GregtechIndustrialMassFabricator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_MatterFabricator) { - generateRecipes(); - run1(); - } + generateRecipes(); + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java index 9508061d6f..1d363ff68d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Mixer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMixer; @@ -11,9 +10,7 @@ public class GregtechIndustrialMixer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Mixer Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java index 051569195a..6f13f31bc9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MultiMachine; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMultiMachine; @@ -11,9 +10,7 @@ public class GregtechIndustrialMultiMachine { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Multi-Machine Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java index de6bab91d0..aa8f8ab3cb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_PlatePress; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialPlatePress; @@ -11,9 +10,7 @@ public class GregtechIndustrialPlatePress { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Press Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java index e82a9f2027..8ed4182368 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Sifter; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialSifter; @@ -11,9 +10,7 @@ public class GregtechIndustrialSifter { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialSifter) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java index 7ee3452d34..32c05e6af1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_ThermalCentrifuge; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialThermalCentrifuge; @@ -11,9 +10,7 @@ public class GregtechIndustrialThermalCentrifuge { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java index 5c43c70fc3..80f1061cc4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java @@ -3,17 +3,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_TreeFarm; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm; public class GregtechIndustrialTreeFarm { public static void run() { - if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { - Logger.INFO("Gregtech5u Content | Registering Tree Farm Multiblock."); - run1(); - } + + Logger.INFO("Gregtech5u Content | Registering Tree Farm Multiblock."); + run1(); + } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java index 2ae9795b0d..c37bb1cf37 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WashPlant; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialWashPlant; @@ -11,9 +10,7 @@ public class GregtechIndustrialWashPlant { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Wash Plant Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index 39920a4553..ca6e0db141 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WireFactory; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialWireMill; @@ -11,9 +10,7 @@ public class GregtechIndustrialWiremill { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWireMill) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java index 71bc6937bc..d52a74fbba 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java @@ -21,9 +21,7 @@ public class GregtechLFTR { public static void run() { Logger.INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR]."); - if (GTPPCore.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java index 2121dde7a9..bf12c132e2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Nuclear_Salt_Processing_Plant; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTENuclearSaltProcessingPlant; @@ -11,13 +10,12 @@ public class GregtechNuclearSaltProcessingPlant { public static void run() { Logger.INFO("Gregtech5u Content | Registering Nuclear Salt Processing Plant Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_NuclearSaltProcessingPlant) { - // Nuclear Salt Processing Plant Multiblock - GregtechItemList.Nuclear_Salt_Processing_Plant.set( - new MTENuclearSaltProcessingPlant( - Nuclear_Salt_Processing_Plant.ID, - "nuclearsaltprocessingplant.controller.tier.single", - "Nuclear Salt Processing Plant").getStackForm(1L)); - } + // Nuclear Salt Processing Plant Multiblock + GregtechItemList.Nuclear_Salt_Processing_Plant.set( + new MTENuclearSaltProcessingPlant( + Nuclear_Salt_Processing_Plant.ID, + "nuclearsaltprocessingplant.controller.tier.single", + "Nuclear Salt Processing Plant").getStackForm(1L)); + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index d554a6dc8e..1873099afb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java @@ -13,8 +13,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Creator; import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Detector; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEAtmosphericReconditioner; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEPollutionCreator; @@ -23,86 +21,82 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEPollutionD public class GregtechPollutionDevices { public static void run() { - if (PollutionUtils.isPollutionEnabled()) { - Logger.INFO("Gregtech5u Content | Registering Anti-Pollution Devices."); - run1(); - } + Logger.INFO("Gregtech5u Content | Registering Anti-Pollution Devices."); + run1(); } private static void run1() { - if (GTPPCore.ConfigSwitches.enableMachine_Pollution) { - // 759 - GregtechItemList.Pollution_Detector.set( - new MTEPollutionDetector( - Pollution_Detector.ID, - "pollutiondetector.01.tier.single", - "Pollution Detection Device", - 0, - "Tells you if you're living in Gwalior yet.", - 0).getStackForm(1L)); - GregtechItemList.Pollution_Creator.set( - new MTEPollutionCreator( - Pollution_Creator.ID, - "pollutioncreator.01.tier.single", - "Smog Device", - 4, - "Polluting the skies.", - 0).getStackForm(1L)); + GregtechItemList.Pollution_Detector.set( + new MTEPollutionDetector( + Pollution_Detector.ID, + "pollutiondetector.01.tier.single", + "Pollution Detection Device", + 0, + "Tells you if you're living in Gwalior yet.", + 0).getStackForm(1L)); + GregtechItemList.Pollution_Creator.set( + new MTEPollutionCreator( + Pollution_Creator.ID, + "pollutioncreator.01.tier.single", + "Smog Device", + 4, + "Polluting the skies.", + 0).getStackForm(1L)); + + GregtechItemList.Pollution_Cleaner_LV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_LV.ID, + "pollutioncleaner.02.tier.single", + "Upgraded Pollution Scrubber", + 1).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_MV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_MV.ID, + "pollutioncleaner.03.tier.single", + "Advanced Pollution Scrubber", + 2).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_HV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_HV.ID, + "pollutioncleaner.04.tier.single", + "Precision Pollution Scrubber", + 3).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_EV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_EV.ID, + "pollutioncleaner.05.tier.single", + "Air Recycler", + 4).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_IV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_IV.ID, + "pollutioncleaner.06.tier.single", + "Upgraded Air Recycler", + 5).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_LuV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_LuV.ID, + "pollutioncleaner.07.tier.single", + "Advanced Air Recycler", + 6).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_ZPM.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_ZPM.ID, + "pollutioncleaner.08.tier.single", + "Precision Air Recycler", + 7).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_UV.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_UV.ID, + "pollutioncleaner.09.tier.single", + "Atmospheric Cleaner", + 8).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_MAX.set( + new MTEAtmosphericReconditioner( + Pollution_Cleaner_MAX.ID, + "pollutioncleaner.10.tier.single", + "Biosphere Cleanser", + 9).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_LV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_LV.ID, - "pollutioncleaner.02.tier.single", - "Upgraded Pollution Scrubber", - 1).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_MV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_MV.ID, - "pollutioncleaner.03.tier.single", - "Advanced Pollution Scrubber", - 2).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_HV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_HV.ID, - "pollutioncleaner.04.tier.single", - "Precision Pollution Scrubber", - 3).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_EV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_EV.ID, - "pollutioncleaner.05.tier.single", - "Air Recycler", - 4).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_IV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_IV.ID, - "pollutioncleaner.06.tier.single", - "Upgraded Air Recycler", - 5).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_LuV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_LuV.ID, - "pollutioncleaner.07.tier.single", - "Advanced Air Recycler", - 6).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_ZPM.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_ZPM.ID, - "pollutioncleaner.08.tier.single", - "Precision Air Recycler", - 7).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_UV.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_UV.ID, - "pollutioncleaner.09.tier.single", - "Atmospheric Cleaner", - 8).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_MAX.set( - new MTEAtmosphericReconditioner( - Pollution_Cleaner_MAX.ID, - "pollutioncleaner.10.tier.single", - "Biosphere Cleanser", - 9).getStackForm(1L)); - } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java index 76bde9c81d..be4978e165 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java @@ -9,7 +9,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.PowerSubStation; import gregtech.api.enums.ItemList; import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchInputBattery; @@ -20,9 +19,7 @@ public class GregtechPowerSubStation { public static void run() { Logger.INFO("Gregtech5u Content | Registering Power Substation Node."); - if (GTPPCore.ConfigSwitches.enableMultiblock_PowerSubstation) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java index 77385f6790..837960dded 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.QuantumForceTransformer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEQuantumForceTransformer; @@ -11,12 +10,11 @@ public class GregtechQuantumForceTransformer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Quantum Force Transformer Multiblock."); - if (GTPPCore.ConfigSwitches.enableMultiblock_QuantumForceTransformer) { - GregtechItemList.QuantumForceTransformer.set( - new MTEQuantumForceTransformer( - QuantumForceTransformer.ID, - "quantumforcetransformer.controller.tier.single", - "Quantum Force Transformer").getStackForm(1L)); - } + GregtechItemList.QuantumForceTransformer.set( + new MTEQuantumForceTransformer( + QuantumForceTransformer.ID, + "quantumforcetransformer.controller.tier.single", + "Quantum Force Transformer").getStackForm(1L)); + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java index e7b313d851..b4b680bd12 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.RedstoneButtonPanel; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneButtonPanel; @@ -9,8 +10,7 @@ public class GregtechRedstoneButtonPanel { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Button Panel."); - if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneButtonPanel.set(new MTERedstoneButtonPanel(31800).getStackForm(1L)); - } + GregtechItemList.RedstoneButtonPanel.set(new MTERedstoneButtonPanel(RedstoneButtonPanel.ID).getStackForm(1L)); + } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java index 1d92f61c4a..f49ee8639c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.RedstoneCircuitBlock; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneCircuitBlock; @@ -9,8 +10,7 @@ public class GregtechRedstoneCircuitBlock { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Circuit Block."); - if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneCircuitBlock.set(new MTERedstoneCircuitBlock(31801).getStackForm(1L)); - } + GregtechItemList.RedstoneCircuitBlock + .set(new MTERedstoneCircuitBlock(RedstoneCircuitBlock.ID).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java index e6fcbb4cb2..f1ec4feee5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.RedstoneLamp; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneLamp; @@ -9,8 +10,6 @@ public class GregtechRedstoneLamp { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Lamp."); - if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneLamp.set(new MTERedstoneLamp(31803).getStackForm(1L)); - } + GregtechItemList.RedstoneLamp.set(new MTERedstoneLamp(RedstoneLamp.ID).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java index 7c3cea0213..264bde4d29 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.RedstoneStrengthDisplay; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneStrengthDisplay; @@ -9,13 +10,11 @@ public class GregtechRedstoneStrengthDisplay { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Strength Display."); - if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneStrengthDisplay.set( - new MTERedstoneStrengthDisplay( - 31804, - "redstone.display", - "Redstone Strength Display", - "Displays Redstone Strength").getStackForm(1L)); - } + GregtechItemList.RedstoneStrengthDisplay.set( + new MTERedstoneStrengthDisplay( + RedstoneStrengthDisplay.ID, + "redstone.display", + "Redstone Strength Display", + "Displays Redstone Strength").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/reg