diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech')
39 files changed, 60 insertions, 44 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index e77be6dab6..594c32d80d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -5,7 +5,9 @@ import java.util.List; import gregtech.api.util.GT_Config; import gtPlusPlus.core.handler.COMPAT_HANDLER; +import gtPlusPlus.core.handler.OldCircuitHandler; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; import gtPlusPlus.xmod.gregtech.api.world.GTPP_Worldgen; @@ -29,6 +31,11 @@ public class HANDLER_GT { if (mMaterialProperties != null){ GT_Materials.init(mMaterialProperties); } + + if (ConfigSwitches.enableOldGTcircuits){ + OldCircuitHandler.preInit(); + } + GregtechFluidHandler.run(); } @@ -45,11 +52,15 @@ public class HANDLER_GT { GregtechConduits.run(); //Only loads if the config option is true (default: true) - if (CORE.configSwitches.enableSkookumChoochers){ + if (CORE.ConfigSwitches.enableSkookumChoochers){ new MetaGeneratedGregtechTools(); new ProcessingToolHeadChoocher().run(); } + if (ConfigSwitches.enableOldGTcircuits){ + OldCircuitHandler.init(); + } + //Generates recipes for all gregtech smelting and alloy smelting combinations. //RecipeGen_BlastSmelterGT.generateRecipes(); new RecipeGen_BlastSmelterGT_Ex(); @@ -57,9 +68,14 @@ public class HANDLER_GT { } public static void postInit(){ - if (CORE.configSwitches.enableNitroFix){ + if (CORE.ConfigSwitches.enableNitroFix){ GregtechNitroDieselFix.run(); } + + if (ConfigSwitches.enableOldGTcircuits){ + OldCircuitHandler.postInit(); + } + //Register some custom recipe maps for any enabled multiblocks. //MultiblockRecipeMapHandler.run(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java index 9e1cd007c9..ed11baa5ed 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.helpers; -import static gtPlusPlus.core.lib.CORE.configSwitches.enableTreeFarmerParticles; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableTreeFarmerParticles; import cpw.mods.fml.common.eventhandler.Event.Result; import gregtech.api.enums.OrePrefixes; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 1d827d2ac6..7a3862c34d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -150,7 +150,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { GregtechItemList.Circuit_Parts_Wiring_LuV.set(this.addItem(tLastID = 720, "Etched LuV Voltage Wiring", "Part of Circuit Boards", new Object[0])); GregtechItemList.Circuit_Parts_Wiring_ZPM.set(this.addItem(tLastID = 721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards", new Object[0])); - if (CORE.configSwitches.enableCustomCircuits){ + if (CORE.ConfigSwitches.enableCustomCircuits){ ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_IV.get(1), "circuitSuperconductor"); ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_LuV.get(1), "circuitInfinite"); } @@ -229,7 +229,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { GregtechItemList.Food_Baked_Raisin_Bread.set(this.addItem(tLastID = 60, "Raisin Bread", "Extra Raisins, Just for ImQ009", new Object[]{new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L), getTcAspectStack(TC_Aspects.IGNIS, 1L)})); //Old Circuits - if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ + if (CORE.ConfigSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ registerOldCircuits(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java index 7a35f63605..2d621e7388 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java @@ -236,7 +236,7 @@ extends GregtechMeta_MultiBlockBase { @Override public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { - /*if (configSwitches.disableCentrifugeFormation){ + /*if (ConfigSwitches.disableCentrifugeFormation){ EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(this.getBaseMetaTileEntity().getOwnerName()); if (!player.getEntityWorld().isRemote && isDisabled == false) PlayerUtils.messagePlayer(player, "This Multiblock is disabled via the config. [Only re-enable if you're bugtesting.]"); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index 72f8ba73bb..61b579b189 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -68,7 +68,7 @@ public class Gregtech4Content { private static void thermalBoiler() { // Gregtech 4 Thermal Boiler - if (CORE.configSwitches.enableMultiblock_ThermalBoiler){ + if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler){ Utils.LOG_INFO("Gregtech 4 Content | Registering Thermal Boiler."); GregtechItemList.GT4_Thermal_Boiler .set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 438d64bfe2..480e2e775f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -40,10 +40,10 @@ public class GregtechConduits { { if (Gregtech){ Utils.LOG_INFO("Gregtech5u Content | Registering Custom Cables/Wires/Pipes."); - if (CORE.configSwitches.enableCustom_Cables) { + if (CORE.ConfigSwitches.enableCustom_Cables) { run1(); } - if (CORE.configSwitches.enableCustom_Pipes) { + if (CORE.ConfigSwitches.enableCustom_Pipes) { run2(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index aed701d6cd..af856df84e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -18,7 +18,7 @@ public class GregtechDehydrator { public static void run() { if (LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Chemical Dehydrators."); - if (CORE.configSwitches.enableMachine_Dehydrators) { + if (CORE.ConfigSwitches.enableMachine_Dehydrators) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index e6c183c5ad..db389e5919 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -19,7 +19,7 @@ public class GregtechEnergyBuffer { if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ Utils.LOG_INFO("Gregtech5u Content | Registering Energy Buffer Blocks."); - if (CORE.configSwitches.enableMachine_RocketEngines) { + if (CORE.ConfigSwitches.enableMachine_RocketEngines) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index a81e29bb77..0fbf59a675 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -16,7 +16,7 @@ public class GregtechGeothermalThermalGenerator { public static void run() { if (LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Geothermal Engines."); - if (CORE.configSwitches.enableMachine_GeothermalEngines) { + if (CORE.ConfigSwitches.enableMachine_GeothermalEngines) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java index 600ac3346a..a241fa7e42 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java @@ -10,7 +10,7 @@ public class GregtechIndustrialBlastSmelter { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock."); - if (CORE.configSwitches.enableMultiblock_AlloyBlastSmelter) { + if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java index a6b452a4b7..bb317487d7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -10,7 +10,7 @@ public class GregtechIndustrialCentrifuge { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialCentrifuge) { + if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java index d5bd5c58d3..4a0b6cff96 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java @@ -10,7 +10,7 @@ public class GregtechIndustrialCokeOven { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialCokeOven) { + if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java index 11d8b400d0..8d0760d7dc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java @@ -10,7 +10,7 @@ public class GregtechIndustrialCuttingFactory { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Cutting Factory Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialCuttingMachine) { + if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java index 453a6644e8..bdcee6be3d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -10,7 +10,7 @@ public class GregtechIndustrialElectrolyzer { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialElectrolyzer) { + if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java index f172f6b325..be40f59c06 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java @@ -10,7 +10,7 @@ public class GregtechIndustrialFuelRefinery { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock."); - if (CORE.configSwitches.enableMultiblock_NuclearFuelRefinery) { + if (CORE.ConfigSwitches.enableMultiblock_NuclearFuelRefinery) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java index b0b91af528..05988a1fdb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java @@ -9,7 +9,7 @@ public class GregtechIndustrialGeneratorArray { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Generator Array Multiblock."); - //if (CORE.configSwitches.enableMultiblock_IndustrialSifter) { // TODO + //if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { // TODO run1(); //} } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index 5ce1fc4a70..ef244020a5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java @@ -10,7 +10,7 @@ public class GregtechIndustrialMacerator { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialMacerationStack) { + if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index a04c516bce..10caa89f75 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -10,7 +10,7 @@ public class GregtechIndustrialMassFabricator { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock."); - if (CORE.configSwitches.enableMultiblock_MatterFabricator) { + if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java index b07ba7f275..81252f77a9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java @@ -10,7 +10,7 @@ public class GregtechIndustrialMultiTank { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks."); - if (CORE.configSwitches.enableMultiblock_MultiTank) { + if (CORE.ConfigSwitches.enableMultiblock_MultiTank) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java index e94f3ac364..3629ebdecc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java @@ -10,7 +10,7 @@ public class GregtechIndustrialPlatePress { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Press Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialPlatePress) { + if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java index 664f1c0d78..62f4209456 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java @@ -11,7 +11,7 @@ public class GregtechIndustrialSifter { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialSifter) { // TODO + if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { // TODO run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java index ef716abcef..910dd33576 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java @@ -11,7 +11,7 @@ public class GregtechIndustrialThermalCentrifuge { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialThermalCentrifuge) { + if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java index dc3949997e..124661a917 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java @@ -10,7 +10,7 @@ public class GregtechIndustrialTreeFarm { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Tree Farm Multiblock."); - if (CORE.configSwitches.enableMultiblock_TreeFarmer) { + if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java index 9f7b313e1b..f6fb887b01 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java @@ -12,7 +12,7 @@ public class GregtechIndustrialWashPlant { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Wash Plant Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialWashPlant) { + if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index b3ad360c23..a883ded0dc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java @@ -10,7 +10,7 @@ public class GregtechIndustrialWiremill { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialWireMill) { + if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java index 6df2b6df38..30f3d49734 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java @@ -10,7 +10,7 @@ public class GregtechIronBlastFurnace { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Iron Blast Furnace."); - if (CORE.configSwitches.enableMultiblock_IronBlastFurnace) { + if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java index 0681a061f2..cb731012b6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java @@ -10,7 +10,7 @@ public class GregtechLFTR { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR]."); - if (CORE.configSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { + if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java index d48815e563..7f88c49782 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java @@ -21,7 +21,7 @@ import net.minecraftforge.fluids.FluidStack; public class GregtechMiniRaFusion { public static void run() { - //if (CORE.configSwitches.enableMachine_SimpleWasher){ + //if (CORE.ConfigSwitches.enableMachine_SimpleWasher){ generateSlowFusionRecipes(); // Register the Simple Fusion Entity. GregtechItemList.Miniature_Fusion diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java index d70149ff99..c502ffabd0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java @@ -27,7 +27,7 @@ public class GregtechNitroDieselFix { @SuppressWarnings("unchecked") public static void run(){ - if (CORE.configSwitches.enableNitroFix){ + if (CORE.ConfigSwitches.enableNitroFix){ Utils.LOG_INFO("Gregtech5u Content | Attempting to Fix Nitro-Diesel production."); try { int mSub = Utils.getGregtechSubVersion(); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index 05fdfdd95f..cec8dc1810 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java @@ -17,7 +17,7 @@ public class GregtechPollutionDevices { } private static void run1() { - if (CORE.configSwitches.enableMachine_Pollution){ + if (CORE.ConfigSwitches.enableMachine_Pollution){ // 759 GregtechItemList.Pollution_Detector.set( new GregtechMetaPollutionDetector(756, "pollutiondetector.01.tier.single", "Pollution Detection Device", diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java index ac23c316a2..6a2e55f3c9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java @@ -17,7 +17,7 @@ public class GregtechPowerSubStation { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Power Substation Node."); - if (CORE.configSwitches.enableMultiblock_PowerSubstation) { + if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 520fa5af4d..35334f3e34 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java @@ -16,7 +16,7 @@ public class GregtechRocketFuelGenerator { public static void run() { if (LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Rocket Engines."); - if (CORE.configSwitches.enableMachine_RocketEngines) { + if (CORE.ConfigSwitches.enableMachine_RocketEngines) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java index 924a75680e..282e08de30 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java @@ -11,7 +11,7 @@ public class GregtechSafeBlock { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Lockable Safe Blocks."); - if (CORE.configSwitches.enableMachine_Safes) { + if (CORE.ConfigSwitches.enableMachine_Safes) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index d8d73f9052..8d88331be8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java @@ -14,7 +14,7 @@ import net.minecraftforge.fluids.FluidStack; public class GregtechSimpleWasher { public static void run() { - if (CORE.configSwitches.enableMachine_SimpleWasher){ + if (CORE.ConfigSwitches.enableMachine_SimpleWasher){ generateDirtyDustRecipes(); generateDirtyCrushedRecipes(); // Register the Simple Washer Entity. diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java index 4ca6cf35d1..77a8f8e517 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.configSwitches; +import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -9,9 +9,9 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileE public class GregtechSolarGenerators { public static void run() { - if (LoadedMods.Gregtech && configSwitches.enableMachine_SolarGenerators) { + if (LoadedMods.Gregtech && ConfigSwitches.enableMachine_SolarGenerators) { Utils.LOG_INFO("Gregtech5u Content | Registering Solar Generator Blocks."); - if (CORE.configSwitches.enableMachine_SolarGenerators) { + if (CORE.ConfigSwitches.enableMachine_SolarGenerators) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java index 3ed609edf0..ec7f55a210 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java @@ -10,7 +10,7 @@ public class GregtechSteamCondenser { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Steam Condensor."); - if (CORE.configSwitches.enableMachine_SteamConverter) { + if (CORE.ConfigSwitches.enableMachine_SteamConverter) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java index 9d9f9b3cd1..d30007eb22 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java @@ -10,7 +10,7 @@ public class GregtechTieredFluidTanks { public static void run() { if (LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Portable Fluid Tanks."); - if (CORE.configSwitches.enableMachine_FluidTanks) { + if (CORE.ConfigSwitches.enableMachine_FluidTanks) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java index ce7e6e8ae8..8dede46019 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java @@ -9,7 +9,7 @@ public class GregtechTreeFarmerTE { public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Tree Farmer Structural Block."); - if (CORE.configSwitches.enableMultiblock_TreeFarmer) { + if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { run1(); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java index 6ffadfea91..d6925035b0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java @@ -17,7 +17,7 @@ public class NewHorizonsAccelerator { public static void run() { if (LoadedMods.Gregtech && !CORE.GTNH) { Utils.LOG_INFO("New Horizons Content | Registering World Accelerators."); - if (CORE.configSwitches.enableMachine_WorldAccelerators) { + if (CORE.ConfigSwitches.enableMachine_WorldAccelerators) { run1(); } } |