diff options
Diffstat (limited to 'src/main/java')
123 files changed, 2154 insertions, 2930 deletions
diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java index 721cb36457..f815f60cad 100644 --- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java +++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java @@ -1822,6 +1822,24 @@ public enum MetaTileEntityIDs { Hatch_Muffler_Adv_UV(30008), Hatch_Muffler_Adv_MAX(30009), Hatch_Turbine_Rotor(30010), + Hatch_SuperBus_Input_LV(30022), + Hatch_SuperBus_Input_MV(30023), + Hatch_SuperBus_Input_HV(30024), + Hatch_SuperBus_Input_EV(30025), + Hatch_SuperBus_Input_IV(30026), + Hatch_SuperBus_Input_LuV(30027), + Hatch_SuperBus_Input_ZPM(30028), + Hatch_SuperBus_Input_UV(30029), + Hatch_SuperBus_Input_UHV(30030), + Hatch_SuperBus_Output_LV(30032), + Hatch_SuperBus_Output_MV(30033), + Hatch_SuperBus_Output_HV(30034), + Hatch_SuperBus_Output_EV(30035), + Hatch_SuperBus_Output_IV(30036), + Hatch_SuperBus_Output_LuV(30037), + Hatch_SuperBus_Output_ZPM(30038), + Hatch_SuperBus_Output_UV(30039), + Hatch_SuperBus_Output_UHV(30040), PipeIncoloy903(30995), Infinite_Item_Chest(31010), SimpleDustWasher_MV(31017), @@ -1884,10 +1902,23 @@ public enum MetaTileEntityIDs { GT4_Crop_Harvester_UV(31118), Mega_AlloyBlastSmelter(31150), QuantumForceTransformer(31151), + GT_MetaTileEntity_ChiselBus_LV(31778), + GT_MetaTileEntity_ChiselBus_MV(31779), + GT_MetaTileEntity_ChiselBus_HV(31780), + GT_MetaTileEntity_Solidifier_I(31781), + GT_MetaTileEntity_Solidifier_II(31782), + GT_MetaTileEntity_Solidifier_III(31783), + GT_MetaTileEntity_Solidifier_IV(31784), SimpleDustWasher_LV(31790), SimpleDustWasher_HV(31791), SimpleDustWasher_IV(31792), SimpleDustWasher_ZPM(31793), + RedstoneButtonPanel(31800), + RedstoneCircuitBlock(31801), + RedstoneLamp(31803), + RedstoneStrengthDisplay(31804), + RedstoneStrengthScale(31805), + WaterPump(31085), UniversalChemicalFuelEngine(32001), LargeEssentiaGenerator(32002), NeutronAcceleratorULV(32003), diff --git a/src/main/java/gregtech/asm/GTCorePlugin.java b/src/main/java/gregtech/asm/GTCorePlugin.java index 38d7548836..30bc193701 100644 --- a/src/main/java/gregtech/asm/GTCorePlugin.java +++ b/src/main/java/gregtech/asm/GTCorePlugin.java @@ -13,8 +13,8 @@ import bartworks.common.configs.Configuration; import cpw.mods.fml.relauncher.FMLInjectionData; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import gregtech.mixin.Mixin; +import gtPlusPlus.core.config.ASMConfiguration; import gtPlusPlus.preloader.PreloaderCore; -import gtPlusPlus.preloader.asm.AsmConfig; import gtPlusPlus.preloader.asm.PreloaderDummyContainer; import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler; @@ -27,6 +27,7 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader { static { try { ConfigurationManager.registerConfig(Configuration.class); + ConfigurationManager.registerConfig(ASMConfiguration.class); } catch (ConfigException e) { throw new RuntimeException(e); } @@ -64,7 +65,7 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader { if (mcDir != null && mcDir.exists()) { PreloaderCore.setMinecraftDirectory(mcDir); } - PreloaderCore.DEBUG_MODE = AsmConfig.debugMode; + PreloaderCore.DEBUG_MODE = ASMConfiguration.debug.debugMode; } @Override diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index 8f36836521..16d0b013b4 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -12,6 +12,9 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.launchwrapper.Launch; +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; + import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; @@ -33,9 +36,8 @@ import gregtech.api.util.FishPondFakeRecipe; import gregtech.api.util.SemiFluidFuelHandler; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.commands.CommandEnableDebugWhileRunning; import gtPlusPlus.core.common.CommonProxy; -import gtPlusPlus.core.config.ConfigHandler; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.handler.BookHandler; import gtPlusPlus.core.handler.PacketHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; @@ -54,6 +56,7 @@ import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; modid = Names.G_T_PLUS_PLUS, name = GTPPCore.name, version = GTPPCore.VERSION, + guiFactory = "gtPlusPlus.core.gui.config.GTPPGuiFactory", dependencies = "required-after:Forge;" + " after:TConstruct;" + " after:dreamcraft;" + " after:IC2;" @@ -106,6 +109,13 @@ public class GTplusplus implements ActionListener { } } + static { + try { + ConfigurationManager.registerConfig(Configuration.class); + } catch (ConfigException e) { + throw new RuntimeException(e); + } + } public static INIT_PHASE CURRENT_LOAD_PHASE = INIT_PHASE.SUPER; @Mod.Instance(Names.G_T_PLUS_PLUS) @@ -146,9 +156,6 @@ public class GTplusplus implements ActionListener { // Give this a go mate. setupMaterialBlacklist(); - // Handle GT++ Config - ConfigHandler.handleConfigFile(event); - // Check for Dev GTPPCore.DEVENV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); @@ -166,7 +173,7 @@ public class GTplusplus implements ActionListener { MetaGTProxy.init(); CoreManager.init(); // Used by foreign players to generate .lang files for translation. - if (GTPPCore.ConfigSwitches.dumpItemAndBlockData) { + if (Configuration.debug.dumpItemAndBlockData) { LocaleUtils.generateFakeLocaleFile(); } } @@ -208,7 +215,6 @@ public class GTplusplus implements ActionListener { @EventHandler public synchronized void serverStarting(final FMLServerStartingEvent event) { INIT_PHASE.SERVER_START.setPhaseActive(true); - event.registerServerCommand(new CommandEnableDebugWhileRunning()); if (Thaumcraft.isModLoaded()) { event.registerServerCommand(new CommandDumpAspects()); } diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java index 8b5efa1536..c97c787cd3 100644 --- a/src/main/java/gtPlusPlus/api/objects/Logger.java +++ b/src/main/java/gtPlusPlus/api/objects/Logger.java @@ -4,9 +4,9 @@ import org.apache.logging.log4j.LogManager; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.config.ASMConfiguration; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.preloader.PreloaderCore; -import gtPlusPlus.preloader.asm.AsmConfig; public class Logger { @@ -21,7 +21,7 @@ public class Logger { return gtPlusPlusLogger; } - private static final boolean enabled = !AsmConfig.disableAllLogging; + private static final boolean enabled = !ASMConfiguration.debug.disableAllLogging; public static final org.apache.logging.log4j.Logger getLogger() { return modLogger; @@ -38,7 +38,7 @@ public class Logger { public static void MACHINE_INFO(String s, Object... args) { if (enabled) { boolean localPlayer = PreloaderCore.DEV_ENVIRONMENT; - if (GTPPCore.ConfigSwitches.MACHINE_INFO || localPlayer) { + if (Configuration.debug.MachineInfo || localPlayer) { final String name1 = gtPlusPlus.core.util.reflect.ReflectionUtils.getMethodName(2); modLogger.info("Machine Info: " + s + " | " + name1, args); } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java index abd83d7171..b70e96108c 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -19,8 +19,8 @@ import gregtech.api.enums.TextureSet; import gregtech.api.util.GTLanguageManager; import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; @@ -198,7 +198,7 @@ public class BlockBaseModular extends BasicBlock { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { - if (!GTPPCore.ConfigSwitches.useGregtechTextures || this.blockMaterial == null + if (!Configuration.visual.useGregtechTextures || this.blockMaterial == null || this.thisBlock == BlockTypes.ORE) { this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); } diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java deleted file mode 100644 index 0001f825d8..0000000000 --- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java +++ /dev/null @@ -1,261 +0,0 @@ -package gtPlusPlus.core.commands; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - -import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.NBTUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.PreloaderCore; -import gtPlusPlus.preloader.asm.AsmConfig; - -public class CommandEnableDebugWhileRunning implements ICommand { - - private final List<String> aliases; - - public CommandEnableDebugWhileRunning() { - this.aliases = new ArrayList<>(); - this.aliases.add("gtplusplus"); - } - - @Override - public int compareTo(final Object o) { - if (o instanceof ICommand c) { - return this.getCommandName() - .compareTo(c.getCommandName()); - } - return -1; - } - - @Override - public String getCommandName() { - return "gtpp"; - } - - // Use '/gtpp' along with 'logging' or 'debug' to toggle Debug mode and Logging. - // Using nothing after the command toggles both to their opposite states respectively. - @Override - public String getCommandUsage(final ICommandSender var1) { - return "/gtpp ?"; - } - - @Override - public List<String> getCommandAliases() { - return this.aliases; - } - - @Override - public void processCommand(final ICommandSender S, final String[] argString) { - int aMaxArgumentsAllowed = 2; - - if ((argString == null || argString.length == 0 || argString.length > aMaxArgumentsAllowed) - || argString[0].equalsIgnoreCase("?")) { - Logger.INFO("Listing commands and their uses."); - final EntityPlayer P = CommandUtils.getPlayer(S); - AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; - PlayerUtils.messagePlayer(P, "The following are valid args for the '/gtpp' command:"); - PlayerUtils.messagePlayer(P, "? - This help command."); - PlayerUtils.messagePlayer(P, "logging - Toggles ALL GT++ logging for current session."); - PlayerUtils.messagePlayer(P, "hand - Lists information about held item."); - PlayerUtils.messagePlayer(P, "fuid xxx - Tries to find the fluid in the FluidRegistry."); - PlayerUtils.messagePlayer( - P, - "debug - Toggles GT++ Debug Mode. Only use when advised, may break everything. (OP)"); - } else if (argString[0].equalsIgnoreCase("debug")) { - Logger.INFO("Toggling Debug Mode."); - final EntityPlayer P = CommandUtils.getPlayer(S); - if (PlayerUtils.isPlayerOP(P)) { - PreloaderCore.DEBUG_MODE = !PreloaderCore.DEBUG_MODE; - PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + PreloaderCore.DEBUG_MODE); - } - } else if (argString[0].equalsIgnoreCase("logging")) { - Logger.INFO("Toggling Logging."); - final EntityPlayer P = CommandUtils.getPlayer(S); - AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; - PlayerUtils.messagePlayer(P, "Toggled GT++ Logging - Enabled: " + (!AsmConfig.disableAllLogging)); - } - /* - * else if (argString[0].toLowerCase().equals("test")) { ItemStack mSemiFluidgen = - * ItemUtils.simpleMetaStack("IC2:blockGenerator", 7, 1); final EntityPlayer P = CommandUtils.getPlayer(S); - * if(mSemiFluidgen != null) { PlayerUtils.messagePlayer(P, ItemUtils.getItemName(mSemiFluidgen)); } } - */ - - else if (argString[0].equalsIgnoreCase("inv")) { - final EntityPlayer P = CommandUtils.getPlayer(S); - if (P != null && !P.worldObj.isRemote) { - ItemStack[] aInv = P.inventory.mainInventory; - for (ItemStack aItem : aInv) { - if (aItem != null) { - String aModID = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).modId; - String aRegistryName = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).name; - Logger.INFO( - aModID + ":" - + aRegistryName - + ":" - + aItem.getItemDamage() - + " | " - + aItem.getDisplayName()); - } - } - PlayerUtils.messagePlayer(P, "Dumped Inventory."); - } - } else if (argString[0].equalsIgnoreCase("hand")) { - final EntityPlayer P = CommandUtils.getPlayer(S); - if (P != null) { - ItemStack aHeldItem = PlayerUtils.getItemStackInPlayersHand(P); - if (aHeldItem != null) { - String aItemDisplayName = ItemUtils.getItemName(aHeldItem); - String aItemUnlocalName = ItemUtils.getUnlocalizedItemName(aHeldItem); - String aNbtString = tryIterateNBTData(aHeldItem); - ArrayList<String> aOreDictNames = new ArrayList<>(); - - int[] aOreIDs = OreDictionary.getOreIDs(aHeldItem); - for (int id : aOreIDs) { - String aOreNameFromID = OreDictionary.getOreName(id); - if (aOreNameFromID != null && aOreNameFromID.length() > 0 - && !aOreNameFromID.equals("Unknown")) { - aOreDictNames.add(aOreNameFromID); - } - } - - String aOreDictData = ""; - if (!aOreDictNames.isEmpty()) { - for (String tag : aOreDictNames) { - aOreDictData += (tag + ", "); - } - if (aOreDictData.endsWith(", ")) { - aOreDictData = aOreDictData.substring(0, aOreDictData.length() - 2); - } - } - - ArrayList<String> aFluidContainerData = new ArrayList<>(); - FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem); - if (aHeldItemFluid != null) { - aFluidContainerData.add("FluidStack Unlocal Name: " + aHeldItemFluid.getUnlocalizedName()); - aFluidContainerData.add("FluidStack Local Name: " + aHeldItemFluid.getLocalizedName()); - aFluidContainerData.add( - "Fluid Unlocal Name: " + aHeldItemFluid.getFluid() - .getUnlocalizedName()); - aFluidContainerData.add("Fluid Local Name: " + aHeldItemFluid.getLocalizedName()); - aFluidContainerData.add( - "Fluid Name: " + aHeldItemFluid.getFluid() - .getName()); - } - - PlayerUtils.messagePlayer(P, "[" + aItemUnlocalName + "]" + "[" + aItemDisplayName + "] "); - if (!aFluidContainerData.isEmpty()) { - for (String s : aFluidContainerData) { - PlayerUtils.messagePlayer(P, s); - } - } - if (!aOreDictNames.isEmpty()) { - PlayerUtils.messagePlayer(P, aOreDictData); - } - if (!aNbtString.isEmpty()) { - PlayerUtils.messagePlayer(P, aNbtString); - } - } else { - PlayerUtils.messagePlayer(P, "No item held."); - } - } - } else if (argString[0].equalsIgnoreCase("fluid")) { - if (argString.length > 1 && argString[1] != null && !argString[1].isEmpty()) { - final EntityPlayer P = CommandUtils.getPlayer(S); - FluidStack aFluid = FluidUtils.getWildcardFluidStack(argString[1], 1); - if (P != null && aFluid != null) { - PlayerUtils.messagePlayer(P, "Found fluid stack: " + FluidRegistry.getFluidName(aFluid)); - } else if (P != null) { - PlayerUtils.messagePlayer(P, "Could not find any fluids."); - } - } - } else if (argString[0].equalsIgnoreCase("item")) { - if (argString.length > 1 && argString[1] != null && !argString[1].isEmpty()) { - final EntityPlayer P = CommandUtils.getPlayer(S); - ItemStack aTest = ItemUtils.getItemStackFromFQRN(argString[1], 1); - if (P != null && aTest != null) { - PlayerUtils.messagePlayer(P, "Found fluid stack: " + ItemUtils.getItemName(aTest)); - } else if (P != null) { - PlayerUtils.messagePlayer(P, "Could not find valid item."); - } - } - } else { - final EntityPlayer P = CommandUtils.getPlayer(S); - PlayerUtils.messagePlayer(P, "Invalid command, use '?' as an argument for help.'"); - } - } - - @Override - public boolean canCommandSenderUseCommand(final ICommandSender var1) { - return var1 != null && CommandUtils.getPlayer(var1) != null; - } - - @Override - public List<String> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { - ArrayList<String> aTabCompletes = new ArrayList<>(); - aTabCompletes.add("?"); - aTabCompletes.add("logging"); - aTabCompletes.add("debug"); - aTabCompletes.add("hand"); - aTabCompletes.add("fluid"); - return aTabCompletes; - } - - @Override - public boolean isUsernameIndex(final String[] var1, final int var2) { - // TODO Auto-generated method stub - return false; - } - - public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost) { - return true; - } - - public static String tryIterateNBTData(ItemStack aStack) { - try { - ArrayList<String> aItemDataTags = new ArrayList<>(); - NBTTagCompound aNBT = NBTUtils.getNBT(aStack); - if (!aNBT.hasNoTags()) { - Map<?, ?> mInternalMap = ReflectionUtils.getField(aNBT, "tagMap"); - if (mInternalMap != null) { - for (Map.Entry<?, ?> e : mInternalMap.entrySet()) { - aItemDataTags.add( - e.getKey() - .toString() + ":" - + e.getValue()); - } - int a = 0; - StringBuilder data = new StringBuilder(); - for (String tag : aItemDataTags) { - data.append(tag) - .append(", "); - } - if (data.toString() - .endsWith(", ")) { - data = new StringBuilder(data.substring(0, data.length() - 2)); - } - return data.toString(); - } else { - Logger.INFO("Data map reflected from NBTTagCompound was not valid."); - return "Bad NBT"; - } - } - } catch (Throwable ignored) {} - return ""; - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java index c6662800b2..7e60f95d37 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java @@ -4,7 +4,7 @@ import static gtPlusPlus.core.handler.CompatHandler.RemoveRecipeQueue; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.recipe.ShapedRecipeObject; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -42,7 +42,7 @@ public class CompatIC2 { private static void run() { - if (ConfigSwitches.disableIC2Recipes) { + if (Configuration.machines.disableIC2Recipes) { // Remove these. RemoveRecipeQueue.add("IC2:itemCable"); diff --git a/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java index 8e06c95c67..b23d02e789 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatThaumcraft.java @@ -3,14 +3,14 @@ package gtPlusPlus.core.common.compat; import static gregtech.api.enums.Mods.ForbiddenMagic; import gregtech.api.util.GTOreDictUnificator; -import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.util.minecraft.ItemUtils; public class CompatThaumcraft { public static void OreDict() { - if (ConfigSwitches.enableThaumcraftShardUnification) { + if (Configuration.machines.enableThaumcraftShardUnification) { run(); } } diff --git a/src/main/java/gtPlusPlus/core/config/ASMConfiguration.java b/src/main/java/gtPlusPlus/core/config/ASMConfiguration.java new file mode 100644 index 0000000000..d79a746642 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/config/ASMConfiguration.java @@ -0,0 +1,49 @@ +package gtPlusPlus.core.config; + +import com.gtnewhorizon.gtnhlib.config.Config; + +import gregtech.api.enums.Mods; + +@Config(modid = Mods.Names.G_T_PLUS_PLUS, configSubDirectory = "GTPlusPlus", category = "asm", filename = "ASM") +@Config.LangKeyPattern(pattern = "gtpp.gui.config.%cat.%field", fullyQualified = true) +@Config.Comment("ASM section") +@Config.RequiresMcRestart +public class ASMConfiguration { + + public static Debug debug = new Debug(); + public static General general = new General(); + + // Debug + @Config.Comment("Debug section") + public static class Debug { + + @Config.Comment("Disables ALL logging from GT++.") + @Config.DefaultBoolean(true) + public boolean disableAllLogging; + + @Config.Comment("Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)") + @Config.DefaultBoolean(false) + public boolean debugMode; + + @Config.Comment("Enable/Disable COFH OreDictionaryArbiter Patch (Useful for Development)") + @Config.DefaultBoolean(true) + public boolean enableCofhPatch; + + @Config.Comment("Enable/Disable Forge OreDictionary Patch (Useful for Development)") + @Config.DefaultBoolean(false) + public boolean enableOreDictPatch; + } + + @Config.Comment("General section") + public static class General { + // General Features + + @Config.Comment("Prevents the game crashing from having invalid keybinds. https://github.com/alkcorp/GTplusplus/issues/544") + @Config.DefaultBoolean(true) + public boolean enabledLwjglKeybindingFix; + + @Config.Comment("Fixes small oversights in Thaumcraft 4.") + @Config.DefaultBoolean(true) + public boolean enableTcAspectSafety; + } +} diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java deleted file mode 100644 index e6041ab78a..0000000000 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ /dev/null @@ -1,575 +0,0 @@ -package gtPlusPlus.core.config; - -import static gregtech.api.enums.Mods.GregTech; -import static gtPlusPlus.core.lib.GTPPCore.ConfigSwitches.*; -import static gtPlusPlus.core.lib.GTPPCore.EVERGLADESBIOME_ID; -import static gtPlusPlus.core.lib.GTPPCore.EVERGLADES_ID; -import static gtPlusPlus.core.lib.GTPPCore.turbineCutoffBase; - -import java.io.File; - -import net.minecraftforge.common.config.Configuration; - -import cpw.mods.fml.common.event.FMLPreInitializationEvent; - -public class ConfigHandler { - - public static void handleConfigFile(final FMLPreInitializationEvent event) { - final Configuration config = new Configuration( - new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg")); - config.load(); - - // Debug - /* - * DEBUG = config.getBoolean("debugMode", "debug", false, - * "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)"); - */ - MACHINE_INFO = config.getBoolean( - "enableMachineInfoLogging", - "debug", - false, - "Makes many machines display lots of debug logging."); - showHiddenNEIItems = config - .getBoolean("showHiddenNEIItems", "debug", false, "Makes all items hidden from NEI display."); - dumpItemAndBlockData = config.getBoolean( - "dumpItemAndBlockData", - "debug", - false, - "Dumps all GT++ and Toxic Everglade Data to en_US.lang in the config folder. This config option can be used by foreign players to generate blank .lang files, which they can populate with their language of choice."); - - // Machines - enableThaumcraftShardUnification = config.getBoolean( - "enableThaumcraftShardUnification", - "machines", - false, - "Allows the use of TC shards across many recipes by oreDicting them into a common group."); - disableIC2Recipes = config.getBoolean( - "disableIC2Recipes", - "machines", - false, - "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks."); - boilerSteamPerSecond = config.getInt( - "boilerSteamPerSecond", - "machines", - 750, - 0, - 10000, - "Sets the steam per second value in LV,MV,HV boilers (respectively 1x,2x,3x this number for the tiers)"); - - // GT-Fixes - turbineCutoffBase = config.getInt( - "turbineCutoffBase", - GregTech.ID, - 75000, - 0, - Integer.MAX_VALUE, - "Rotors below this durability will be removed, prevents NEI clutter. Minimum Durability is N * x, where N is the new value set and x is the turbine size, where 1 is Tiny and 4 is Huge. Set to 0 to disable."); - - // Pipes & Cables - enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", GregTech.ID, true, "Adds Custom GT Fluid Pipes."); - enableCustom_Cables = config.getBoolean("enableCustom_Cables", GregTech.ID, true, "Adds Custom GT Cables."); - - enableMachine_Dehydrators = config - .getBoolean("enableMachineDehydrators", GregTech.ID, true, "These dehydrate stuff."); - enableMachine_SteamConverter = config - .getBoolean("enableMachineSteamConverter", GregTech.ID, true, "Converts IC2 steam -> Railcraft steam."); - enableMachine_FluidTanks = config - .getBoolean("enableMachineFluidTanks", GregTech.ID, true, "Portable fluid tanks."); - enableMachine_RocketEngines = config.getBoolean( - "enableMachineRocketEngines", - GregTech.ID, - true, - "Diesel egines with different internals, they consume less fuel overall."); - enableMachine_GeothermalEngines = config.getBoolean( - "enableMachineGeothermalEngines", - GregTech.ID, - true, - "These may be overpowered, Consult a local geologist."); - enableMachine_Tesseracts = config - .getBoolean("enableMachineTesseracts", GregTech.ID, true, "Tesseracts for wireless item/fluid movement."); - enableMachine_SimpleWasher = config.getBoolean( - "enableMachineSimpleWasher", - GregTech.ID, - true, - "Very basic automated cauldron for dust washing."); - enableMachine_Pollution = config - .getBoolean("enableMachinePollution", GregTech.ID, true, "Pollution Detector & Scrubbers."); - - // Multi machines - enableMultiblock_AlloyBlastSmelter = config.getBoolean( - "enableMultiblockAlloyBlastSmelter", - GregTech.ID, - true, - "Required to smelt most high tier materials from GT++. Also smelts everything else to molten metal."); - enableMultiblock_IndustrialCentrifuge = config - .getBoolean("enableMultiblockIndustrialCentrifuge", GregTech.ID, true, "Spin, Spin, Spiiiin."); - enableMultiblock_IndustrialCokeOven = config.getBoolean( - "enableMultiblockIndustrialCokeOven", - GregTech.ID, - true, - "Pyro Oven Alternative, older, more realistic, better."); - enableMultiblock_IndustrialElectrolyzer = config.getBoolean( - "enableMultiblockIndustrialElectrolyzer", - GregTech.ID, - true, - "Electrolyzes things with extra bling factor."); - enableMultiblock_IndustrialMacerationStack = config.getBoolean( - "enableMultiblockIndustrialMacerationStack", - GregTech.ID, - true, - "A hyper efficient maceration tower, nets more bonus outputs."); - enableMultiblock_IndustrialPlatePress = config.getBoolean( - "enableMultiblockIndustrialPlatePress", - GregTech.ID, - true, - "Industrial bendering machine thingo."); - enableMultiblock_IndustrialWireMill = config.getBoolean( - "enableMultiblockIndustrialWireMill", - GregTech.ID, - true, - "Produces fine wire and exotic cables."); - enableMultiblock_MatterFabricator = config - .getBoolean("enableMultiblockMatterFabricator", GregTech.ID, true, "?FAB?RIC?ATE MA?TT?ER."); - enableMultiblock_MultiTank = config.getBoolean( - "enableMultiblockMultiTank", - GregTech.ID, - true, - "Tall tanks, each layer adds extra fluid storage."); - enableMultiblock_PowerSubstation = config - .getBoolean("enableMultiblockPowerSubstation", GregTech.ID, true, "For managing large power grids."); - enableMultiblock_LiquidFluorideThoriumReactor = config.getBoolean( - "enableMultiblockLiquidFluorideThoriumReactor", - GregTech.ID, - true, - "For supplying large power grids."); - enableMultiblock_NuclearFuelRefinery = config.getBoolean( - "enableMultiblock_NuclearFuelRefinery", - GregTech.ID, - true, - "Refines molten chemicals into nuclear fuels."); - enableMultiblock_NuclearSaltProcessingPlant = config.getBoolean( - "enableMultiblockNuclearSaltProcessingPlant", - GregTech.ID, - true, - "Reprocesses depleted nuclear salts into useful chemicals."); - enableMultiblock_IndustrialSifter = config - .getBoolean("enableMultiblock_IndustrialSifter", GregTech.ID, true, "Large scale sifting."); - enableMultiblock_LargeAutoCrafter = config.getBoolean( - "enableMultiblock_LargeAutoCrafter", - GregTech.ID, - true, - "Can Assemble, Disassemble and Craft Project data from Data Sticks."); - enableMultiblock_IndustrialThermalCentrifuge = config.getBoolean( - "enableMultiblock_IndustrialThermalCentrifuge", - GregTech.ID, - true, - "Your warm spin for the ore thing."); - enableMultiblock_IndustrialWashPlant = config.getBoolean( - "enableMultiblock_IndustrialWashPlant", - GregTech.ID, - true, - "Used to wash the dirt, riiiiight offff.."); - enableMultiblock_ThermalBoiler = config.getBoolean( - "enableMachineThermalBoiler", - GregTech.ID, - true, - "Thermal Boiler from GT4. Can Filter Lava for resources."); - enableMultiblock_IndustrialCuttingMachine = config.getBoolean( - "enableMultiblock_IndustrialCuttingMachine", - GregTech.ID, - true, - "Very fast and efficient Cutting Machine."); - enableMultiblock_IndustrialFishingPort = config - .getBoolean("enableMultiblock_IndustrialFishingPort", GregTech.ID, true, "Fish the seas, except on land."); - enableMultiblock_IndustrialExtrudingMachine = config.getBoolean( - "enableMultiblock_IndustrialExtrudingMachine", - GregTech.ID, - true, - "Very fast and efficient Extruding Machine."); - enableMultiblock_IndustrialMultiMachine = config.getBoolean( - "enableMultiblock_IndustrialMultiMachine", - GregTech.ID, - true, - "Can run recipes for 9 different types of machines."); - enableMultiblock_Cyclotron = config - .getBoolean("enableMultiblock_Cyclotron", GregTech.ID, true, "COMET - Scientific Cyclotron."); - - // Features - enableWatchdogBGM = config.getInt( - "enableWatchdogBGM", - "features", - 0, - 0, - Short.MAX_VALUE, - "Set to a value greater than 0 to reduce the ticks taken to delay between BGM tracks. Acceptable Values are 1-32767, where 0 is disabled. Vanilla Uses 12,000 & 24,000. 200 is 10s."); - hideUniversalCells = config - .getBoolean("hideUniversalCells", "features", true, "Hides every filled IC2 Universal Cell from NEI."); - - // Biomes - EVERGLADES_ID = config.getInt("darkworld_ID", "worldgen", 227, 1, 254, "The ID of the Dark Dimension."); - EVERGLADESBIOME_ID = config - .getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension."); - - // Pollution - pollutionPerSecondMultiPackager = config - .get( - "pollution", - "pollutionPerSecondMultiPackager", - pollutionPerSecondMultiPackager, - "pollution rate in gibbl/s for the Amazon warehousing depot") - .getInt(pollutionPerSecondMultiPackager); - pollutionPerSecondMultiIndustrialAlloySmelter = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialAlloySmelter", - pollutionPerSecondMultiIndustrialAlloySmelter, - "pollution rate in gibbl/s for the Alloy blast smelter") - .getInt(pollutionPerSecondMultiIndustrialAlloySmelter); - pollutionPerSecondMultiIndustrialArcFurnace = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialArcFurnace", - pollutionPerSecondMultiIndustrialArcFurnace, - "pollution rate in gibbl/s for the High current arc furnace") - .getInt(pollutionPerSecondMultiIndustrialArcFurnace); - pollutionPerSecondMultiIndustrialCentrifuge = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialCentrifuge", - pollutionPerSecondMultiIndustrialCentrifuge, - "pollution rate in gibbl/s for the Industrial centrifuge") - .getInt(pollutionPerSecondMultiIndustrialCentrifuge); - pollutionPerSecondMultiIndustrialCokeOven = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialCokeOven", - pollutionPerSecondMultiIndustrialCokeOven, - "pollution rate in gibbl/s for the Industrial coke oven") - .getInt(pollutionPerSecondMultiIndustrialCokeOven); - pollutionPerSecondMultiIndustrialCuttingMachine = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialCuttingMachine", - pollutionPerSecondMultiIndustrialCuttingMachine, - "pollution rate in gibbl/s for the Cutting factory") - .getInt(pollutionPerSecondMultiIndustrialCuttingMachine); - pollutionPerSecondMultiIndustrialDehydrator = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialDehydrator", - pollutionPerSecondMultiIndustrialDehydrator, - "pollution rate in gibbl/s for the Utupu-Tanuri") - .getInt(pollutionPerSecondMultiIndustrialDehydrator); - pollutionPerSecondMultiIndustrialElectrolyzer = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialElectrolyzer", - pollutionPerSecondMultiIndustrialElectrolyzer, - "pollution rate in gibbl/s for the Industrial electrolyzer") - .getInt(pollutionPerSecondMultiIndustrialElectrolyzer); - pollutionPerSecondMultiIndustrialExtruder = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialExtruder", - pollutionPerSecondMultiIndustrialExtruder, - "pollution rate in gibbl/s for the Industrial extrusion machine") - .getInt(pollutionPerSecondMultiIndustrialExtruder); - pollutionPerSecondMultiIndustrialMacerator = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialMacerator", - pollutionPerSecondMultiIndustrialMacerator, - "pollution rate in gibbl/s for the Maceration stack") - .getInt(pollutionPerSecondMultiIndustrialMacerator); - pollutionPerSecondMultiIndustrialMixer = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialMixer", - pollutionPerSecondMultiIndustrialMixer, - "pollution rate in gibbl/s for the Industrial mixing machine") - .getInt(pollutionPerSecondMultiIndustrialMixer); - pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal", - pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal, - "pollution rate in gibbl/s for the Large processing factory in metal mode") - .getInt(pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal); - pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid", - pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid, - "pollution rate in gibbl/s for the Large processing factory in fluid mode") - .getInt(pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid); - pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc", - pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc, - "pollution rate in gibbl/s for the Large processing factory in misc mode") - .getInt(pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc); - pollutionPerSecondMultiIndustrialPlatePress_ModeForming = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialPlatePress_ModeForming", - pollutionPerSecondMultiIndustrialPlatePress_ModeForming, - "pollution rate in gibbl/s for the Industrial material press in forming mode") - .getInt(pollutionPerSecondMultiIndustrialPlatePress_ModeForming); - pollutionPerSecondMultiIndustrialPlatePress_ModeBending = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialPlatePress_ModeBending", - pollutionPerSecondMultiIndustrialPlatePress_ModeBending, - "pollution rate in gibbl/s for the Industrial material press in bending mode") - .getInt(pollutionPerSecondMultiIndustrialPlatePress_ModeBending); - pollutionPerSecondMultiIndustrialForgeHammer = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialForgeHammer", - pollutionPerSecondMultiIndustrialForgeHammer, - "pollution rate in gibbl/s for the Industrial Forge Hammer") - .getInt(pollutionPerSecondMultiIndustrialForgeHammer); - pollutionPerSecondMultiIndustrialSifter = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialSifter", - pollutionPerSecondMultiIndustrialSifter, - "pollution rate in gibbl/s for the Large Sifter") - .getInt(pollutionPerSecondMultiIndustrialSifter); - pollutionPerSecondMultiIndustrialThermalCentrifuge = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialThermalCentrifuge", - pollutionPerSecondMultiIndustrialThermalCentrifuge, - "pollution rate in gibbl/s for the Large thermal refinery") - .getInt(pollutionPerSecondMultiIndustrialThermalCentrifuge); - pollutionPerSecondMultiIndustrialVacuumFreezer = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialVacuumFreezer", - pollutionPerSecondMultiIndustrialVacuumFreezer, - "pollution rate in gibbl/s for the Cryogenic freezer") - .getInt(pollutionPerSecondMultiIndustrialVacuumFreezer); - pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath", - pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath, - "pollution rate in gibbl/s for the Ore washing plant in chemical bath mode") - .getInt(pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath); - pollutionPerSecondMultiIndustrialWashPlant_ModeWasher = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialWashPlant_ModeWasher", - pollutionPerSecondMultiIndustrialWashPlant_ModeWasher, - "pollution rate in gibbl/s for the Ore washing plant in ore washer mode") - .getInt(pollutionPerSecondMultiIndustrialWashPlant_ModeWasher); - pollutionPerSecondMultiIndustrialWireMill = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialWireMill", - pollutionPerSecondMultiIndustrialWireMill, - "pollution rate in gibbl/s for the Wire factory") - .getInt(pollutionPerSecondMultiIndustrialWireMill); - pollutionPerSecondMultiIsaMill = config - .get( - "pollution", - "pollutionPerSecondMultiIsaMill", - pollutionPerSecondMultiIsaMill, - "pollution rate in gibbl/s for the IsaMill grinding machine") - .getInt(pollutionPerSecondMultiIsaMill); - pollutionPerSecondMultiAdvDistillationTower_ModeDistillery = config - .get( - "pollution", - "pollutionPerSecondMultiAdvDistillationTower_ModeDistillery", - pollutionPerSecondMultiAdvDistillationTower_ModeDistillery, - "pollution rate in gibbl/s for the Dangote distillus in distillery mode") - .getInt(pollutionPerSecondMultiAdvDistillationTower_ModeDistillery); - pollutionPerSecondMultiAdvDistillationTower_ModeDT = config - .get( - "pollution", - "pollutionPerSecondMultiAdvDistillationTower_ModeDT", - pollutionPerSecondMultiAdvDistillationTower_ModeDT, - "pollution rate in gibbl/s for the Dangote distillus in distillation tower mode") - .getInt(pollutionPerSecondMultiAdvDistillationTower_ModeDT); - pollutionPerSecondMultiAdvEBF = config - .get( - "pollution", - "pollutionPerSecondMultiAdvEBF", - pollutionPerSecondMultiAdvEBF, - "pollution rate in gibbl/s for the Volcanus") - .getInt(pollutionPerSecondMultiAdvEBF); - pollutionPerSecondMultiAdvImplosion = config - .get( - "pollution", - "pollutionPerSecondMultiAdvImplosion", - pollutionPerSecondMultiAdvImplosion, - "pollution rate in gibbl/s for the Density^2") - .getInt(pollutionPerSecondMultiAdvImplosion); - pollutionPerSecondMultiABS = config - .get( - "pollution", - "pollutionPerSecondMultiABS", - pollutionPerSecondMultiABS, - "pollution rate in gibbl/s for the Alloy blast furnace") - .getInt(pollutionPerSecondMultiABS); - pollutionPerSecondMultiCyclotron = config - .get( - "pollution", - "pollutionPerSecondMultiCyclotron", - pollutionPerSecondMultiCyclotron, - "pollution rate in gibbl/s for the Cyclotron") - .getInt(pollutionPerSecondMultiCyclotron); - pollutionPerSecondMultiIndustrialFishingPond = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialFishingPond", - pollutionPerSecondMultiIndustrialFishingPond, - "pollution rate in gibbl/s for the Zuhai - fishing port") - .getInt(pollutionPerSecondMultiIndustrialFishingPond); - // pollutionPerSecondMultiLargeRocketEngine; - pollutionPerSecondMultiLargeSemiFluidGenerator = config - .get( - "pollution", - "pollutionPerSecondMultiLargeSemiFluidGenerator", - pollutionPerSecondMultiLargeSemiFluidGenerator, - "pollution rate in gibbl/s for the Large semifluid burner") - .getInt(pollutionPerSecondMultiLargeSemiFluidGenerator); - pollutionPerSecondMultiMassFabricator = config - .get( - "pollution", - "pollutionPerSecondMultiMassFabricator", - pollutionPerSecondMultiMassFabricator, - "pollution rate in gibbl/s for the Matter fabrication CPU") - .getInt(pollutionPerSecondMultiMassFabricator); - pollutionPerSecondMultiRefinery = config - .get( - "pollution", - "pollutionPerSecondMultiRefinery", - pollutionPerSecondMultiRefinery, - "pollution rate in gibbl/s for the Reactor fuel processing plant") - .getInt(pollutionPerSecondMultiRefinery); - // pollutionPerSecondMultiGeneratorArray; - pollutionPerSecondMultiIndustrialRockBreaker = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialRockBreaker", - pollutionPerSecondMultiIndustrialRockBreaker, - "pollution rate in gibbl/s for the Industrial Rock Breaker") - .getInt(pollutionPerSecondMultiIndustrialRockBreaker); - pollutionPerSecondMultiIndustrialChisel = config - .get( - "pollution", - "pollutionPerSecondMultiIndustrialChisel", - pollutionPerSecondMultiIndustrialChisel, - "pollution rate in gibbl/s for the Industrial Chisel") - .getInt(pollutionPerSecondMultiIndustrialChisel); - pollutionPerSecondMultiTreeFarm = config - .get( - "pollution", - "pollutionPerSecondMultiTreeFarm", - pollutionPerSecondMultiTreeFarm, - "pollution rate in gibbl/s for the Tree growth simulator") - .getInt(pollutionPerSecondMultiTreeFarm); - pollutionPerSecondMultiFrothFlotationCell = config - .get( - "pollution", - "pollutionPerSecondMultiFrothFlotationCell", - pollutionPerSecondMultiFrothFlotationCell, - "pollution rate in gibbl/s for the Flotation cell regulator") - .getInt(pollutionPerSecondMultiFrothFlotationCell); - pollutionPerSecondMultiAutoCrafter = config - .get( - "pollution", - "pollutionPerSecondMultiAutoCrafter", - pollutionPerSecondMultiAutoCrafter, - "pollution rate in gibbl/s for the Large-Scale auto assembler v1.01") - .getInt(pollutionPerSecondMultiAutoCrafter); - pollutionPerSecondMultiMolecularTransformer = config - .get( - "pollution", - "pollutionPerSecondMultiMolecularTransformer", - pollutionPerSecondMultiMolecularTransformer, - "pollution rate in gibbl/s for the Multiblock Molecular Transformer") - .getInt(pollutionPerSecondMultiMolecularTransformer); - pollutionPerSecondMultiThermalBoiler = config - .get( - "pollution", - "pollutionPerSecondMultiThermalBoiler", - pollutionPerSecondMultiThermalBoiler, - "pollution rate in gibbl/s for the Thermal boiler") - .getInt(pollutionPerSecondMultiThermalBoiler); - pollutionPerSecondMultiAlgaePond = config - .get( - "pollution", - "pollutionPerSecondMultiAlgaePond", - pollutionPerSecondMultiAlgaePond, - "pollution rate in gibbl/s for the Algae farm") - .getInt(pollutionPerSecondMultiAlgaePond); - basePollutionPerSecondSemiFluidGenerator = config - .get( - "pollution", - "basePollutionPerSecondSemiFluidGenerator", - basePollutionPerSecondSemiFluidGenerator, - "base pollution rate in gibbl/s for the single block semi fluid generators") - .getInt(basePollutionPerSecondSemiFluidGenerator); - pollutionReleasedByTierSemiFluidGenerator = config.get( - "pollution", - "pollutionReleasedByTierSemiFluidGenerator", - pollutionReleasedByTierSemiFluidGenerator, - "coefficient applied to the base rate of the single block semi fluid generators based on its tier (first is tier 0 aka ULV)") - .getDoubleList(); - basePollutionPerSecondBoiler = config - .get( - "pollution", - "basePollutionPerSecondBoiler", - basePollutionPerSecondBoiler, - "base pollution rate in gibbl/s for the single block boilers") - .getInt(basePollutionPerSecondBoiler); - pollutionReleasedByTierBoiler = config.get( - "pollution", - "pollutionReleasedByTierBoiler", - pollutionReleasedByTierBoiler, - "coefficient applied to the base rate of the single block semi fluid generators based on its tier (first is tier 0 aka ULV)") - .getDoubleList(); - baseMinPollutionPerSecondRocketFuelGenerator = config - .get( - "pollution", - "baseMinPollutionPerSecondRocketFuelGenerator", - baseMinPollutionPerSecondRocketFuelGenerator, - "minimum base pollution rate in gibbl/s for the single block rocket engines") - .getInt(baseMinPollutionPerSecondRocketFuelGenerator); - baseMaxPollutionPerSecondRocketFuelGenerator = config - .get( - "pollution", - "baseMaxPollutionPerSecondRocketFuelGenerator", - baseMaxPollutionPerSecondRocketFuelGenerator, - "maximum base pollution rate in gibbl/s for the single block rocket engines") - .getInt(baseMaxPollutionPerSecondRocketFuelGenerator); - pollutionReleasedByTierRocketFuelGenerator = config.get( - "pollution", - "pollutionReleasedByTierRocketFuelGenerator", - pollutionReleasedByTierRocketFuelGenerator, - "coefficient applied to the base rate of the single block rocket engines based on its tier (first is tier 0 aka ULV)") - .getDoubleList(); - basePollutionPerSecondGeothermalGenerator = config - .get( - "pollution", - "basePollutionPerSecondGeothermalGenerator", - basePollutionPerSecondGeothermalGenerator, - "base pollution rate in gibbl/s for the geothermal engines") - .getInt(basePollutionPerSecondGeothermalGenerator); - pollutionReleasedByTierGeothermalGenerator = config.get( - "pollution", - "pollutionReleasedByTierGeothermalGenerator", - pollutionReleasedByTierGeothermalGenerator, - "coefficient applied to the base rate of the single block geothermal engines based on its tier (first is tier 0 aka ULV)") - .getDoubleList(); - - // Visual - enableAnimatedTextures = config - .getBoolean("enableAnimatedTextures", "visual", true, "Enables Animated GT++ Textures, Requires Restart"); - config.save(); - } -} diff --git a/src/main/java/gtPlusPlus/core/config/Configuration.java b/src/main/java/gtPlusPlus/core/config/Configuration.java new file mode 100644 index 0000000000..e2cd0463f1 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/config/Configuration.java @@ -0,0 +1,261 @@ +package gtPlusPlus.core.config; + +import com.gtnewhorizon.gtnhlib.config.Config; + +import gregtech.api.enums.Mods; + +@Config(modid = Mods.Names.G_T_PLUS_PLUS, configSubDirectory = "GTPlusPlus", filename = "GTPlusPlus") +@Config.LangKeyPattern(pattern = "gtpp.gui.config.%cat.%field", fullyQualified = true) +@Config.Comment("General section") +@Config.RequiresMcRestart +public class Configuration { + + public static final Debug debug = new Debug(); + public static final Machines machines = new Machines(); + public static final Gregtech gregtech = new Gregtech(); + public static final Pollution pollution = new Pollution(); + public static final Features features = new Features(); + public static final Visual visual = new Visual(); + public static final Worldgen worldgen = new Worldgen(); + + @Config.Comment("Debug section") + public static class Debug { + + @Config.Comment("Makes many machines display lots of debug logging.") + @Config.DefaultBoolean(false) + public boolean MachineInfo; + + @Config.Comment("Makes all items hidden from NEI display.") + @Config.DefaultBoolean(false) + public boolean showHiddenNEIItems; + + @Config.Comment("Dumps all GT++ and Toxic Everglade Data to en_US.lang in the config folder. This config option can be used by foreign players to generate blank .lang files, which they can populate with their language of choice.") + @Config.DefaultBoolean(false) + public boolean dumpItemAndBlockData; + + } + + @Config.Comment("Machines section") + public static class Machines { + + @Config.Comment("Allows the use of TC shards across many recipes by oreDicting them into a common group.") + @Config.DefaultBoolean(false) + public boolean enableThaumcraftShardUnification; + + @Config.Comment("Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks.") + @Config.DefaultBoolean(false) + public boolean disableIC2Recipes; + @Config.Comment("Sets the steam per second value in LV,MV,HV boilers (respectively 1x,2x,3x this number for the tiers)") + @Config.DefaultInt(750) + public int boilerSteamPerSecond; + } + + @Config.Comment("GregTech section") + public static class Gregtech { + + @Config.Comment("Rotors below this durability will be removed, prevents NEI clutter. Minimum Durability is N * x, where N is the new value set and x is the turbine size, where 1 is Tiny and 4 is Huge. Set to 0 to disable.") + @Config.DefaultInt(25_500) + public int turbineCutoffBase; + } + + @Config.Comment("Pollution section") + public static class Pollution { + + @Config.Comment("pollution rate in gibbl/s for the Amazon warehousing depot") + @Config.DefaultInt(40) + public int pollutionPerSecondMultiPackager; + @Config.Comment("pollution rate in gibbl/s for the Alloy blast smelter") + @Config.DefaultInt(300) + public int pollutionPerSecondMultiIndustrialAlloySmelter; + @Config.Comment("pollution rate in gibbl/s for the High current arc furnace") + @Config.DefaultInt(2_400) + public int pollutionPerSecondMultiIndustrialArcFurnace; + @Config.Comment("pollution rate in gibbl/s for the Industrial centrifuge") + @Config.DefaultInt(300) + public int pollutionPerSecondMultiIndustrialCentrifuge; + @Config.Comment("pollution rate in gibbl/s for the Industrial coke oven") + @Config.DefaultInt(80) + public int pollutionPerSecondMultiIndustrialCokeOven; + @Config.Comment("pollution rate in gibbl/s for the Cutting factory") + @Config.DefaultInt(160) + public int pollutionPerSecondMultiIndustrialCuttingMachine; + @Config.Comment("pollution rate in gibbl/s for the Utupu-Tanuri") + @Config.DefaultInt(500) + public int pollutionPerSecondMultiIndustrialDehydrator; + @Config.Comment("pollution rate in gibbl/s for the Industrial electrolyzer") + @Config.DefaultInt(300) + public int pollutionPerSecondMultiIndustrialElectrolyzer; + @Config.Comment("pollution rate in gibbl/s for the Industrial extrusion machine") + @Config.DefaultInt(1_000) + public int pollutionPerSecondMultiIndustrialExtruder; + @Config.Comment("pollution rate in gibbl/s for the Maceration stack") + @Config.DefaultInt(400) + public int pollutionPerSecondMultiIndustrialMacerator; + @Config.Comment("pollution rate in gibbl/s for the Industrial mixing machine") + @Config.DefaultInt(800) + public int pollutionPerSecondMultiIndustrialMixer; + @Config.Comment("pollution rate in gibbl/s for the Large processing factory in metal mode") + @Config.DefaultInt(400) + public int pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal; + @Config.Comment("pollution rate in gibbl/s for the Large processing factory in fluid mode") + @Config.DefaultInt(400) + public int pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid; + @Config.Comment("pollution rate in gibbl/s for the Large processing factory in misc mode") + @Config.DefaultInt(600) + public int pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc; + @Config.Comment("pollution rate in gibbl/s for the Industrial material press in forming mode") + @Config.DefaultInt(240) + public int pollutionPerSecondMultiIndustrialPlatePress_ModeForming; + @Config.Comment("pollution rate in gibbl/s for the Industrial material press in bending mode") + @Config.DefaultInt(480) + public int pollutionPerSecondMultiIndustrialPlatePress_ModeBending; + @Config.Comment("pollution rate in gibbl/s for the Industrial Forge Hammer") + @Config.DefaultInt(250) + public int pollutionPerSecondMultiIndustrialForgeHammer; + @Config.Comment("pollution rate in gibbl/s for the Large Sifter") + @Config.DefaultInt(40) + public int pollutionPerSecondMultiIndustrialSifter; + @Config.Comment("pollution rate in gibbl/s for the Large thermal refinery") + @Config.DefaultInt(1_000) + public int pollutionPerSecondMultiIndustrialThermalCentrifuge; + @Config.Comment("pollution rate in gibbl/s for the Industrial fluid heater") + @Config.DefaultInt(1_000) + public int pollutionPerSecondMultiIndustrialFluidHeater; + @Config.Comment("pollution rate in gibbl/s for the Cryogenic freezer") + @Config.DefaultInt(500) + public int pollutionPerSecondMultiIndustrialVacuumFreezer; + @Config.Comment("pollution rate in gibbl/s for the Ore washing plant in chemical bath mode") + @Config.DefaultInt(400) + public int pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath; + @Config.Comment("pollution rate in gibbl/s for the Ore washing plant in ore washer mode") + @Config.DefaultInt(100) + public int pollutionPerSecondMultiIndustrialWashPlant_ModeWasher; + @Config.Comment("pollution rate in gibbl/s for the Wire factory") + @Config.DefaultInt(100) + public int pollutionPerSecondMultiIndustrialWireMill; + @Config.Comment("pollution rate in gibbl/s for the IsaMill grinding machine") + @Config.DefaultInt(1_280) + public int pollutionPerSecondMultiIsaMill; + @Config.Comment("pollution rate in gibbl/s for the Dangote distillus in distillery mode") + @Config.DefaultInt(240) + public int pollutionPerSecondMultiAdvDistillationTower_ModeDistillery; + @Config.Comment("pollution rate in gibbl/s for the Dangote distillus in distillation tower mode") + @Config.DefaultInt(480) + public int pollutionPerSecondMultiAdvDistillationTower_ModeDT; + @Config.Comment("pollution rate in gibbl/s for the Volcanus") + @Config.DefaultInt(500) + public int pollutionPerSecondMultiAdvEBF; + @Config.Comment("pollution rate in gibbl/s for the Density^2") + @Config.DefaultInt(5_000) + public int pollutionPerSecondMultiAdvImplosion; + @Config.Comment("pollution rate in gibbl/s for the Alloy blast furnace") + @Config.DefaultInt(200) + public int pollutionPerSecondMultiABS; + @Config.Comment("pollution rate in gibbl/s for the Cyclotron") + @Config.DefaultInt(200) + public int pollutionPerSecondMultiCyclotron; + @Config.Comment("pollution rate in gibbl/s for the Zuhai - fishing port") + @Config.DefaultInt(20) + public int pollutionPerSecondMultiIndustrialFishingPond; + // pollutionPerSecondMultiLargeRocketEngine; + @Config.Comment("pollution rate in gibbl/s for the Large semifluid burner") + @Config.DefaultInt(1_280) + public int pollutionPerSecondMultiLargeSemiFluidGenerator; + @Config.Comment("pollution rate in gibbl/s for the Matter fabrication CPU") + @Config.DefaultInt(40) + public int pollutionPerSecondMultiMassFabricator; + @Config.Comment("pollution rate in gibbl/s for the Reactor fuel processing plant") + @Config.DefaultInt(4_000) + public int pollutionPerSecondMultiRefinery; + @Config.Comment("pollution rate in gibbl/s for the Industrial Rock Breaker") + @Config.DefaultInt(100) + public int pollutionPerSecondMultiIndustrialRockBreaker; + @Config.Comment("pollution rate in gibbl/s for the Industrial Chisel") + @Config.DefaultInt(50) + public int pollutionPerSecondMultiIndustrialChisel; + @Config.Comment("pollution rate in gibbl/s for the Tree growth simulator") + @Config.DefaultInt(100) + public int pollutionPerSecondMultiTreeFarm; + @Config.Comment("pollution rate in gibbl/s for the Flotation cell regulator") + @Config.DefaultInt(0) + public int pollutionPerSecondMultiFrothFlotationCell; + @Config.Comment("pollution rate in gibbl/s for the Large-Scale auto assembler v1.01") + @Config.DefaultInt(500) + public int pollutionPerSecondMultiAutoCrafter; + @Config.Comment("pollution rate in gibbl/s for the Nuclear salt processing plant") + @Config.DefaultInt(500) + public int pollutionPerSecondNuclearSaltProcessingPlant; + @Config.Comment("pollution rate in gibbl/s for the Multiblock Molecular Transformer") + @Config.DefaultInt(1_000) + public int pollutionPerSecondMultiMolecularTransformer; + + @Config.Comment("pollution rate in gibbl/s for the Elemental Duplicator") + @Config.DefaultInt(1_000) + public int pollutionPerSecondElementalDuplicator; + + @Config.Comment("pollution rate in gibbl/s for the Thermal boiler") + @Config.DefaultInt(700) + public int pollutionPerSecondMultiThermalBoiler; + @Config.Comment("pollution rate in gibbl/s for the Algae farm") + @Config.DefaultInt(0) + public int pollutionPerSecondMultiAlgaePond; + @Config.Comment("base pollution rate in gibbl/s for the single block semi fluid generators") + @Config.DefaultInt(40) + public int basePollutionPerSecondSemiFluidGenerator; + @Config.Comment("coefficient applied to the base rate of the single block semi fluid generators based on its tier (first is tier 0 aka ULV)") + @Config.DefaultDoubleList({ 0.0, 2.0, 4.0, 8.0, 12.0, 16.0 }) + public double[] pollutionReleasedByTierSemiFluidGenerator; + @Config.Comment("base pollution rate in gibbl/s for the single block boilers") + @Config.DefaultInt(35) + public int basePollutionPerSecondBoiler; + @Config.Comment("coefficient applied to the base rate of the single block boilers based on its tier (first is tier 0 aka ULV)") + @Config.DefaultDoubleList({ 0.0, 1.0, 1.43, 1.86 }) + public double[] pollutionReleasedByTierBoiler; + @Config.Comment("minimum base pollution rate in gibbl/s for the single block rocket engines") + @Config.DefaultInt(250) + public int baseMinPollutionPerSecondRocketFuelGenerator; + @Config.Comment("maximum base pollution rate in gibbl/s for the single block rocket engines") + @Config.DefaultInt(2_000) + public int baseMaxPollutionPerSecondRocketFuelGenerator; + @Config.Comment("coefficient applied to the base rate of the single block rocket engines based on its tier (first is tier 0 aka ULV)") + @Config.DefaultDoubleList({ 0.0, 0.0, 0.0, 0.0, 1.0, 2.0, 3.0 }) + public double[] pollutionReleasedByTierRocketFuelGenerator; + @Config.Comment("base pollution rate in gibbl/s for the geothermal engines") + @Config.DefaultInt(100) + public int basePollutionPerSecondGeothermalGenerator; + @Config.Comment("coefficient applied to the base rate of the single block geothermal engines based on its tier (first is tier 0 aka ULV)") + @Config.DefaultDoubleList({ 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 }) + public double[] pollutionReleasedByTierGeothermalGenerator; + } + + @Config.Comment("Features section") + public static class Features { + + @Config.Comment("Hides every filled IC2 Universal Cell from NEI.") + @Config.DefaultBoolean(true) + public boolean hideUniversalCells; + } + + @Config.Comment("Visual section") + public static class Visual { + + @Config.Comment("Enables Animated GT++ Textures") + @Config.DefaultBoolean(true) + public boolean enableAnimatedTextures; + + @Config.Comment("Use GT textures") + @Config.DefaultBoolean(true) + public boolean useGregtechTextures; + } + + @Config.Comment("Worldgen section") + public static class Worldgen { + + @Config.Comment("The ID of the Toxic Everglades.") + @Config.DefaultInt(227) + public int EVERGLADES_ID; + @Config.Comment("The biome within the Toxic Everglades.") + @Config.DefaultInt(199) + public int EVERGLADESBIOME_ID; + } +} diff --git a/src/main/java/gtPlusPlus/core/gui/config/ConfigGUI.java b/src/main/java/gtPlusPlus/core/gui/config/ConfigGUI.java new file mode 100644 index 0000000000..c18155c36d --- /dev/null +++ b/src/main/java/gtPlusPlus/core/gui/config/ConfigGUI.java @@ -0,0 +1,18 @@ +package gtPlusPlus.core.gui.config; + +import static gregtech.api.enums.Mods.GTPlusPlus; + +import net.minecraft.client.gui.GuiScreen; + +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig; + +import gtPlusPlus.core.config.ASMConfiguration; +import gtPlusPlus.core.config.Configuration; + +public class ConfigGUI extends SimpleGuiConfig { + + public ConfigGUI(GuiScreen parentScreen) throws ConfigException { + super(parentScreen, GTPlusPlus.ID, "GT++", true, Configuration.class, ASMConfiguration.class); + } +} diff --git a/src/main/java/gtPlusPlus/core/gui/config/GTPPGuiFactory.java b/src/main/java/gtPlusPlus/core/gui/config/GTPPGuiFactory.java new file mode 100644 index 0000000000..50bf54cb77 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/gui/config/GTPPGuiFactory.java @@ -0,0 +1,13 @@ +package gtPlusPlus.core.gui.config; + +import net.minecraft.client.gui.GuiScreen; + +import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory; + +public class GTPPGuiFactory implements SimpleGuiFactory { + + @Override + public Class<? extends GuiScreen> mainConfigGuiClass() { + return ConfigGUI.class; + } +} diff --git a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java index 0611be5d19..d511150ab2 100644 --- a/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java @@ -16,6 +16,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent; +import gregtech.GTMod; import gregtech.api.enums.Materials; import gregtech.api.util.GTLog; import gtPlusPlus.api.objects.Logger; @@ -25,7 +26,6 @@ import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; @@ -132,7 +132,7 @@ public class AchievementHandler { GregtechItemList.Boiler_Advanced_MV.get(1), aBaseAchievementName, false); - if (PollutionUtils.isPollutionEnabled()) { + if (GTMod.gregtechproxy.mPollution) { this.registerAchievement( "pollutionremoval", -11, diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index bdf93c22be..67ff8034dc 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -66,7 +66,6 @@ import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.materials.DustDecayable; import gtPlusPlus.core.item.tool.misc.ItemGregtechPump; import gtPlusPlus.core.item.wearable.WearableLoader; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.material.MaterialMisc; @@ -607,9 +606,7 @@ public final class ModItems { false, null); - if (GTPPCore.ConfigSwitches.enableMachine_Pollution) { - itemBasicTurbine = new ItemBasicScrubberTurbine(); - } + itemBasicTurbine = new ItemBasicScrubberTurbine(); // Zirconium // Cinter Pellet. @@ -643,55 +640,53 @@ public final class ModItems { // //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride // Load Tree Farmer - if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { // https://en.wikipedia.org/wiki/UAN - dustFertUN18 = ItemUtils - .generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0]; - dustFertUN32 = ItemUtils - .generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0]; - - if (Forestry.isModLoaded()) { - ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); - ItemStack temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1); - if (temp1 != null && temp2 != null) { - fluidFertBasic = FluidUtils.generateFluidNonMolten( - "Fertiliser", - "Fertiliser", - 32, - new short[] { 45, 170, 45, 100 }, - temp1, - null, - true); - GTValues.RA.stdBuilder() - .itemInputs(temp2) - .fluidOutputs(new FluidStack(fluidFertBasic, 36)) - .duration(5 * TICKS) - .eut(16) - .addTo(fluidExtractionRecipes); - } + // https://en.wikipedia.org/wiki/UAN + dustFertUN18 = ItemUtils + .generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0]; + dustFertUN32 = ItemUtils + .generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0]; + + if (Forestry.isModLoaded()) { + ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); + ItemStack temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1); + if (temp1 != null && temp2 != null) { + fluidFertBasic = FluidUtils.generateFluidNonMolten( + "Fertiliser", + "Fertiliser", + 32, + new short[] { 45, 170, 45, 100 }, + temp1, + null, + true); + GTValues.RA.stdBuilder() + .itemInputs(temp2) + .fluidOutputs(new FluidStack(fluidFertBasic, 36)) + .duration(5 * TICKS) + .eut(16) + .addTo(fluidExtractionRecipes); } - fluidFertUN32 = FluidUtils.generateFluidNonMolten( - "UN32Fertiliser", - "UN-32 Fertiliser", - 24, - new short[] { 55, 190, 55, 100 }, - null, - null, - true); - fluidFertUN18 = FluidUtils.generateFluidNonMolten( - "UN18Fertiliser", - "UN-18 Fertiliser", - 22, - new short[] { 60, 155, 60, 100 }, - null, - null, - true); - - /* - * GT_Values.RA.addMixerRecipe( arg0, //Item In arg1, arg2, arg3, arg4, //Fluid in arg5, //Fluid Out arg6, - * //Item out arg7, //Eu arg8); //Time - */ - } + fluidFertUN32 = FluidUtils.generateFluidNonMolten( + "UN32Fertiliser", + "UN-32 Fertiliser", + 24, + new short[] { 55, 190, 55, 100 }, + null, + null, + true); + fluidFertUN18 = FluidUtils.generateFluidNonMolten( + "UN18Fertiliser", + "UN-18 Fertiliser", + 22, + new short[] { 60, 155, 60, 100 }, + null, + null, + true); + + /* + * GT_Values.RA.addMixerRecipe( arg0, //Item In arg1, arg2, arg3, arg4, //Fluid in arg5, //Fluid Out arg6, + * //Item out arg7, //Eu arg8); //Time + */ // Juice FluidUtils.generateFluidNonMolten( @@ -984,12 +979,10 @@ public final class ModItems { } // A plate of Europium. - if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null) - && GTPPCore.ConfigSwitches.enableCustom_Pipes) { + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null) { itemPlateEuropium = new BaseItemPlate(MaterialsElements.getInstance().EUROPIUM); } - if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) - && GTPPCore.ConfigSwitches.enableCustom_Pipes) { + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) { itemDoublePlateEuropium = new BaseItemPlateDouble(MaterialsElements.getInstance().EUROPIUM); } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index 50b59ea42a..07744c5c2e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -27,6 +27,7 @@ import gregtech.api.objects.GTRenderedTexture; import gregtech.api.util.GTLanguageManager; import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; @@ -169,7 +170,7 @@ public class BaseItemComponent extends Item { } public String getCorrectTextures() { - if (!GTPPCore.ConfigSwitches.useGregtechTextures) { + if (!Configuration.visual.useGregtechTextures) { return GTPlusPlus.ID + ":" + "item" + this.componentType.COMPONENT_NAME; } String metType = "9j4852jyo3rjmh3owlhw9oe"; @@ -324,7 +325,7 @@ public class BaseItemComponent extends Item { @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { - return (GTPPCore.ConfigSwitches.useGregtechTextures ? true : false); + return (Configuration.visual.useGregtechTextures ? true : false); } @SuppressWarnings("unchecked") @@ -332,10 +333,10 @@ public class BaseItemComponent extends Item { public int getColorFromItemStack(final ItemStack stack, final int renderPass) { if (this.componentType == ComponentTypes.CELL || this.componentType == ComponentTypes.PLASMACELL) { - if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) { + if (renderPass == 0 && !Configuration.visual.useGregtechTextures) { return Utils.rgbtoHexValue(255, 255, 255); } - if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { + if (renderPass == 1 && Configuration.visual.useGregtechTextures) { return Utils.rgbtoHexValue(255, 255, 255); } } @@ -380,7 +381,7 @@ public class BaseItemComponent extends Item { @Override public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { - if (GTPPCore.ConfigSwitches.useGregtechTextures) { + if (Configuration.visual.useGregtechTextures) { if (pass == 0) { return this.base; } @@ -392,7 +393,7 @@ public class BaseItemComponent extends Item { @Override public void registerIcons(final IIconRegister i) { - if (GTPPCore.ConfigSwitches.useGregtechTextures) { + if (Configuration.visual.useGregtechTextures) { this.base = i.registerIcon(getCorrectTextures()); this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY"); } else { diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index 228c1803eb..451a5b1290 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -9,8 +9,8 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -47,7 +47,7 @@ public class BaseItemCell extends BaseItemComponent { @Override public void registerIcons(final IIconRegister i) { - if (GTPPCore.ConfigSwitches.useGregtechTextures) { + if (Configuration.visual.useGregtechTextures) { this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell"); this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell_OVERLAY"); } else { @@ -62,10 +62,10 @@ public class BaseItemCell extends BaseItemComponent { @Override public int getColorFromItemStack(final ItemStack stack, final int renderPass) { - if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) { + if (renderPass == 0 && !Configuration.visual.useGregtechTextures) { return Utils.rgbtoHexValue(230, 230, 230); } - if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { + if (renderPass == 1 && Configuration.visual.useGregtechTextures) { return Utils.rgbtoHexValue(230, 230, 230); } return this.componentColour; diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index a451bfc77b..bcb56795bc 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -17,6 +17,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTLanguageManager; import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.data.StringUtils; @@ -120,7 +121,7 @@ public class BaseItemDustUnique extends Item { } private String getCorrectTexture(final String pileSize) { - if (!GTPPCore.ConfigSwitches.useGregtechTextures) { + if (!Configuration.visual.useGregtechTextures) { if ((pileSize.equals("dust")) || (pileSize.equals("Dust"))) { this.setTextureName(GTPlusPlus.ID + ":" + "dust"); } else { diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index 82020229f0..cb227a9423 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -16,8 +16,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GTValues; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -78,7 +78,7 @@ public class BaseItemIngotHot extends BaseItemIngot { @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { - if (GTPPCore.ConfigSwitches.useGregtechTextures) { + if (Configuration.visual.useGregtechTextures) { return true; } else { return false; @@ -88,7 +88,7 @@ public class BaseItemIngotHot extends BaseItemIngot { @Override public void registerIcons(final IIconRegister i) { - if (GTPPCore.ConfigSwitches.useGregtechTextures) { + if (Configuration.visual.useGregtechTextures) { this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot"); this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY"); } else { @@ -100,9 +100,9 @@ public class BaseItemIngotHot extends BaseItemIngot { @Override public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { - if (pass == 0 && GTPPCore.ConfigSwitches.useGregtechTextures) { + if (pass == 0 && Configuration.visual.useGregtechTextures) { return this.base; - } else if (pass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { + } else if (pass == 1 && Configuration.visual.useGregtechTextures) { return this.overlay; } else { return this.overlay; diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index dd4ad12df8..45ba089f15 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -21,6 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; @@ -180,7 +181,7 @@ public class BaseOreComponent extends Item { this.overlay = par1IconRegister .registerIcon(GTPlusPlus.ID + ":" + "processing/MilledOre/milled_OVERLAY"); } - } else if (GTPPCore.ConfigSwitches.useGregtechTextures) { + } else if (Configuration.visual.useGregtechTextures) { // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" // is using `"+GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the // layer 0 texture path."); @@ -210,10 +211,10 @@ public class BaseOreComponent extends Item { } return this.componentColour; } else { - if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) { + if (renderPass == 0 && !Configuration.visual.useGregtechTextures) { return this.componentColour; } - if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) { + if (renderPass == 1 && Configuration.visual.useGregtechTextures) { return Utils.rgbtoHexValue(230, 230, 230); } return this.componentColour; diff --git a/src/main/java/gtPlusPlus/core/lib/GTPPCore.java b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java index 17b3573940..db30eecb33 100644 --- a/src/main/java/gtPlusPlus/core/lib/GTPPCore.java +++ b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java @@ -17,7 +17,6 @@ import gregtech.GT_Version; import gregtech.api.objects.XSTR; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractTerminal; @@ -34,12 +33,6 @@ public class GTPPCore { public static final String name = "GT++"; public static final String VERSION = GT_Version.VERSION; - // Tweakables - public static int EVERGLADES_ID = 227; - public static int EVERGLADESBIOME_ID = 238; - - public static int turbineCutoffBase = 75000; - // Tooltips; public static final Supplier<String> GT_Tooltip = () -> StatCollector.translateToLocal("GTPP.core.GT_Tooltip"); public static final Supplier<String> GT_Tooltip_Builder = () -> StatCollector @@ -65,123 +58,6 @@ public class GTPPCore { public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000]; - public static class ConfigSwitches { - - // Debug - public static boolean MACHINE_INFO = true; - public static boolean showHiddenNEIItems = false; - public static boolean dumpItemAndBlockData = false; - - // Machine Related - public static boolean enableThaumcraftShardUnification = false; - public static boolean disableIC2Recipes = false; - public static int boilerSteamPerSecond = 750; - - // Feature Related - public static int enableWatchdogBGM = PreloaderCore.enableWatchdogBGM; - public static boolean hideUniversalCells = true; - - // Single Block Machines - public static boolean enableMachine_Dehydrators = true; - public static boolean enableMachine_SteamConverter = true; - public static boolean enableMachine_FluidTanks = true; - public static boolean enableMachine_RocketEngines = true; - public static boolean enableMachine_GeothermalEngines = true; - public static boolean enableMachine_Tesseracts = true; - public static boolean enableMachine_SimpleWasher = true; - public static boolean enableMachine_Pollution = true; - public static boolean enableCustom_Pipes = true; - public static boolean enableCustom_Cables = true; - public static boolean enableMachine_RedstoneBlocks = true; - - // Multiblocks - public static boolean enableMultiblock_AlloyBlastSmelter = true; - public static boolean enableMultiblock_QuantumForceTransformer = true; - public static boolean enableMultiblock_IndustrialCentrifuge = true; - public static boolean enableMultiblock_IndustrialCokeOven = true; - public static boolean enableMultiblock_IndustrialElectrolyzer = true; - public static boolean enableMultiblock_WaterPump = true; - public static boolean enableMultiblock_IndustrialMacerationStack = true; - public static boolean enableMultiblock_IndustrialPlatePress = true; - public static boolean enableMultiblock_IndustrialWireMill = true; - public static boolean enableMultiblock_MatterFabricator = true; - public static boolean enableMultiblock_MultiTank = true; - public static boolean enableMultiblock_PowerSubstation = true; - public static boolean enableMultiblock_LiquidFluorideThoriumReactor = true; - public static boolean enableMultiblock_NuclearSaltProcessingPlant = true; - public static boolean enableMultiblock_NuclearFuelRefinery = true; - public static boolean enableMultiblock_TreeFarmer = true; - public static boolean enableMultiblock_IndustrialSifter = true; - public static boolean enableMultiblock_IndustrialThermalCentrifuge = true; - public static boolean enableMultiblock_IndustrialWashPlant = true; - public static boolean enableMultiblock_LargeAutoCrafter = true; - public static boolean enableMultiblock_ThermalBoiler = true; - public static boolean enableMultiblock_IndustrialCuttingMachine = true; - public static boolean enableMultiblock_IndustrialFishingPort = true; - public static boolean enableMultiblock_IndustrialExtrudingMachine = true; - public static boolean enableMultiblock_IndustrialMultiMachine = true; - public static boolean enableMultiblock_Cyclotron = true; - - // Visuals - public static boolean useGregtechTextures = true; - public static boolean enableAnimatedTextures = false; - - // Pollution - public static int pollutionPerSecondMultiPackager = 40; - public static int pollutionPerSecondMultiIndustrialAlloySmelter = 300; - public static int pollutionPerSecondMultiIndustrialArcFurnace = 2400; - public static int pollutionPerSecondMultiIndustrialCentrifuge = 300; - public static int pollutionPerSecondMultiIndustrialCokeOven = 80; - public static int pollutionPerSecondMultiIndustrialCuttingMachine = 160; - public static int pollutionPerSecondMultiIndustrialDehydrator = 500; - public static int pollutionPerSecondMultiIndustrialElectrolyzer = 300; - public static int pollutionPerSecondMultiIndustrialExtruder = 1000; - public static int pollutionPerSecondMultiIndustrialMacerator = 400; - public static int pollutionPerSecondMultiIndustrialMixer = 800; - public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal = 400; - public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid = 400; - public static int pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc = 600; - public static int pollutionPerSecondMultiIndustrialPlatePress_ModeForming = 240; - public static int pollutionPerSecondMultiIndustrialPlatePress_ModeBending = 480; - public static int pollutionPerSecondMultiIndustrialForgeHammer = 250; - public static int pollutionPerSecondMultiIndustrialSifter = 40; - public static int pollutionPerSecondMultiIndustrialThermalCentrifuge = 1000; - public static int pollutionPerSecondMultiIndustrialVacuumFreezer = 500; - public static int pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath = 400; - public static int pollutionPerSecondMultiIndustrialWashPlant_ModeWasher = 100; - public static int pollutionPerSecondMultiIndustrialWireMill = 100; - public static int pollutionPerSecondMultiIsaMill = 1280; - public static int pollutionPerSecondMultiAdvDistillationTower_ModeDistillery = 240; - public static int pollutionPerSecondMultiAdvDistillationTower_ModeDT = 480; - public static int pollutionPerSecondMultiAdvEBF = 500; - public static int pollutionPerSecondMultiAdvImplosion = 5000; - public static int pollutionPerSecondMultiABS = 200; - public static int pollutionPerSecondMultiCyclotron = 200; - public static int pollutionPerSecondMultiIndustrialFishingPond = 20; - public static int pollutionPerSecondMultiLargeSemiFluidGenerator = 1280; - public static int pollutionPerSecondMultiMassFabricator = 40; - public static int pollutionPerSecondMultiRefinery = 4000; - public static int pollutionPerSecondMultiTreeFarm = 100; - public static int pollutionPerSecondMultiFrothFlotationCell = 0; - public static int pollutionPerSecondMultiAutoCrafter = 500; - public static int pollutionPerSecondMultiThermalBoiler = 700; - public static int pollutionPerSecondMultiMolecularTransformer = 1000; - public static int pollutionPerSecondMultiAlgaePond = 0; - public static int pollutionPerSecondMultiIndustrialRockBreaker = 100; - public static int pollutionPerSecondMultiIndustrialChisel = 50; - // pollution single blocks - public static int basePollutionPerSecondSemiFluidGenerator = 40; - public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[] { 0, 2.0, 4.0, 8.0, 12.0, 16, - 0 }; - public static int basePollutionPerSecondBoiler = 35; - public static double[] pollutionReleasedByTierBoiler = new double[] { 0, 1.0, 1.43, 1.86 }; - public static int baseMinPollutionPerSecondRocketFuelGenerator = 250; - public static int baseMaxPollutionPerSecondRocketFuelGenerator = 2000; - public static double[] pollutionReleasedByTierRocketFuelGenerator = new double[] { 0, 0, 0, 0, 1, 2, 3 }; - public static int basePollutionPerSecondGeothermalGenerator = 100; - public static double[] pollutionReleasedByTierGeothermalGenerator = new double[] { 0, 0, 0, 0, 1, 1, 1 }; - } - public static class Everglades { public static final String NAME = "GT++ Toxic Everglades"; diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index 2ca0a4ae3d..bfbb891ea1 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -31,12 +31,12 @@ import gtPlusPlus.core.client.renderer.RenderSickBlaze; import gtPlusPlus.core.client.renderer.RenderStaballoyConstruct; import gtPlusPlus.core.client.renderer.RenderToxinball; import gtPlusPlus.core.common.CommonProxy; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.entity.projectile.EntityLightningAttack; import gtPlusPlus.core.entity.projectile.EntityToxinballSmall; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; import gtPlusPlus.nei.NEIGTPPConfig; import gtPlusPlus.xmod.gregtech.common.render.FlaskRenderer; @@ -92,7 +92,7 @@ public class ClientProxy extends CommonProxy { @Override public void onLoadComplete(FMLLoadCompleteEvent event) { - if (GTPPCore.ConfigSwitches.hideUniversalCells) { + if (Configuration.features.hideUniversalCells) { hideUniversalCells(); } super.onLoadComplete(event); diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java index 138fc66193..476e49248f 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java @@ -14,6 +14,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import gregtech.GTMod; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -23,7 +24,6 @@ import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.material.MaterialsElements; @@ -31,7 +31,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; @@ -130,41 +129,39 @@ public class RecipesGeneral { Logger.INFO("Added shapeless recipe for Tumbaga Dust."); } - if (GTPPCore.ConfigSwitches.enableMachine_Pollution) { - RecipeUtils.addShapedRecipe( - CI.craftingToolFile, - "plateIron", - "stickIron", - "plateIron", - "ringIron", - "plateIron", - "stickIron", - "plateIron", - CI.craftingToolHammer_Hard, - ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 0, 1)); - RecipeUtils.addShapedRecipe( - CI.craftingToolFile, - "plateBronze", - "stickBronze", - "plateBronze", - "ringBronze", - "plateBronze", - "stickBronze", - "plateBronze", - CI.craftingToolHammer_Hard, - ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 1, 1)); - RecipeUtils.addShapedRecipe( - CI.craftingToolFile, - "plateSteel", - "stickSteel", - "plateSteel", - "ringSteel", - "plateSteel", - "stickSteel", - "plateSteel", - CI.craftingToolHammer_Hard, - ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 2, 1)); - } + RecipeUtils.addShapedRecipe( + CI.craftingToolFile, + "plateIron", + "stickIron", + "plateIron", + "ringIron", + "plateIron", + "stickIron", + "plateIron", + CI.craftingToolHammer_Hard, + ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 0, 1)); + RecipeUtils.addShapedRecipe( + CI.craftingToolFile, + "plateBronze", + "stickBronze", + "plateBronze", + "ringBronze", + "plateBronze", + "stickBronze", + "plateBronze", + CI.craftingToolHammer_Hard, + ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 1, 1)); + RecipeUtils.addShapedRecipe( + CI.craftingToolFile, + "plateSteel", + "stickSteel", + "plateSteel", + "ringSteel", + "plateSteel", + "stickSteel", + "plateSteel", + CI.craftingToolHammer_Hard, + ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 2, 1)); GTValues.RA.stdBuilder() .itemInputs( @@ -426,7 +423,7 @@ public class RecipesGeneral { CI.component_Plate[8], GregtechItemList.Hatch_Input_Naquadah.get(1L, new Object[0])); - if (PollutionUtils.isPollutionEnabled()) { + if (GTMod.gregtechproxy.mPollution) { GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), bitsd, diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index 2b22652344..a0f647198f 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -30,6 +30,7 @@ import com.google.common.collect.ImmutableList; import bartworks.system.material.WerkstoffLoader; import goodgenerator.loader.Loaders; +import gregtech.GTMod; import gregtech.api.GregTechAPI; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -45,14 +46,12 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.crafting.ItemDummyResearch; import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.everglades.dimension.DimensionEverglades; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.covers.CoverManager; @@ -928,12 +927,10 @@ public class RecipesMachines { IV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1); IV_MACHINE_Mixer = ItemList.Machine_IV_Mixer.get(1); EV_MACHINE_ChemicalBath = ItemList.Machine_EV_ChemicalBath.get(1); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { - if (Railcraft.isModLoaded()) { - // Misc - INPUT_RCCokeOvenBlock = ItemUtils - .getItemStackWithMeta(Railcraft.isModLoaded(), "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); - } + if (Railcraft.isModLoaded()) { + // Misc + INPUT_RCCokeOvenBlock = ItemUtils + .getItemStackWithMeta(Railcraft.isModLoaded(), "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1); } runModRecipes(); } @@ -1174,406 +1171,387 @@ public class RecipesMachines { .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { - // Industrial Centrifuge - RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); - RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); + // Industrial Centrifuge + RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1); + RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1); - // Industrial Centrifuge - RecipeUtils.addShapedGregtechRecipe( - CI.circuitTier4, - pipeHugeStainlessSteel, - CI.circuitTier4, - CI.component_Plate[6], - EV_MACHINE_Centrifuge, - CI.component_Plate[6], - CI.component_Plate[8], - CI.machineCasing_EV, - CI.component_Plate[8], - RECIPE_IndustrialCentrifugeController); - // Centrifuge Casing - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[6], - "stickTumbaga", - CI.component_Plate[6], - CI.component_Plate[8], - "stickTumbaga", - CI.component_Plate[8], - CI.component_Plate[6], - "stickTumbaga", - CI.component_Plate[6], - RECIPE_IndustrialCentrifugeCasing); + // Industrial Centrifuge + RecipeUtils.addShapedGregtechRecipe( + CI.circuitTier4, + pipeHugeStainlessSteel, + CI.circuitTier4, + CI.component_Plate[6], + EV_MACHINE_Centrifuge, + CI.component_Plate[6], + CI.component_Plate[8], + CI.machineCasing_EV, + CI.component_Plate[8], + RECIPE_IndustrialCentrifugeController); + // Centrifuge Casing + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[6], + "stickTumbaga", + CI.component_Plate[6], + CI.component_Plate[8], + "stickTumbaga", + CI.component_Plate[8], + CI.component_Plate[6], + "stickTumbaga", + CI.component_Plate[6], + RECIPE_IndustrialCentrifugeCasing); - GTValues.RA.stdBuilder() - .itemInputs( - MaterialsAlloy.MARAGING250.getPlate(4), - MaterialsAlloy.INCONEL_792.getPlate(2), - MaterialsAlloy.TUMBAGA.getRod(3), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialCentrifugeCasing) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.MARAGING250.getPlate(4), + MaterialsAlloy.INCONEL_792.getPlate(2), + MaterialsAlloy.TUMBAGA.getRod(3), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialCentrifugeCasing) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - } + // Industrial Coke Oven + RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); + RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1); + RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1); + RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { + if (Railcraft.isModLoaded()) { // Industrial Coke Oven - RECIPE_IndustrialCokeOvenController = GregtechItemList.Industrial_CokeOven.get(1); - RECIPE_IndustrialCokeOvenFrame = GregtechItemList.Casing_CokeOven.get(1); - RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1); - RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1); - - if (Railcraft.isModLoaded()) { - // Industrial Coke Oven - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[7], - CI.circuitTier4, - CI.component_Plate[7], - CI.machineCasing_EV, - INPUT_RCCokeOvenBlock, - CI.machineCasing_EV, - CI.component_Plate[7], - CI.circuitTier4, - CI.component_Plate[7], - RECIPE_IndustrialCokeOvenController); - } - // Coke Oven Frame Casing RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[7], - CI.component_Rod[7], - CI.component_Plate[7], - CI.component_Rod[7], - "frameGtTantalloy61", - CI.component_Rod[7], - CI.component_Plate[7], - CI.component_Rod[7], - CI.component_Plate[7], - RECIPE_IndustrialCokeOvenFrame); - GTValues.RA.stdBuilder() - .itemInputs( - MaterialsAlloy.TANTALLOY_61.getPlate(4), - MaterialsAlloy.TANTALLOY_61.getRod(4), - MaterialsAlloy.TANTALLOY_61.getFrameBox(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialCokeOvenFrame) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - // Coke Oven Coil 1 - RecipeUtils.addShapedGregtechRecipe( - plateBronze, - plateBronze, - plateBronze, - "frameGtBronze", - CI.gearboxCasing_Tier_1, - "frameGtBronze", - plateBronze, - plateBronze, - plateBronze, - RECIPE_IndustrialCokeOvenCasingA); - // Coke Oven Coil 2 - RecipeUtils.addShapedGregtechRecipe( - plateSteel, - plateSteel, - plateSteel, - "frameGtSteel", - CI.gearboxCasing_Tier_2, - "frameGtSteel", - plateSteel, - plateSteel, - plateSteel, - RECIPE_IndustrialCokeOvenCasingB); - } - - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { - // Industrial Electrolyzer - RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1); - RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1); - - // Electrolyzer Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "platePotin", - "stickLongChrome", - "platePotin", - "stickLongPotin", - "frameGtPotin", - "stickLongPotin", - "platePotin", - "stickLongPotin", - "platePotin", - RECIPE_IndustrialElectrolyzerFrame); - GTValues.RA.stdBuilder() - .itemInputs( - MaterialsAlloy.POTIN.getPlate(4), - MaterialsAlloy.POTIN.getLongRod(3), - GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1), - MaterialsAlloy.POTIN.getFrameBox(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialElectrolyzerFrame) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - // Industrial Electrolyzer - RecipeUtils.addShapedGregtechRecipe( - "plateStellite", - CI.circuitTier5, - "plateStellite", - CI.machineCasing_IV, - IV_MACHINE_Electrolyzer, - CI.machineCasing_IV, - "plateStellite", - "rotorStellite", - "plateStellite", - RECIPE_IndustrialElectrolyzerController); - } - - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { - // Industrial Material Press - RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1); - RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1); - - // Material Press Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "plateTitanium", - "stickLongTumbaga", - "plateTitanium", - "stickTantalloy60", - "frameGtTumbaga", - "stickTantalloy60", - "plateTitanium", - "stickLongTumbaga", - "plateTitanium", - RECIPE_IndustrialMaterialPressFrame); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4), - MaterialsAlloy.TANTALLOY_60.getRod(2), - MaterialsAlloy.TUMBAGA.getLongRod(2), - MaterialsAlloy.TUMBAGA.getFrameBox(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialMaterialPressFrame) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - // Industrial Material Press - RecipeUtils.addShapedGregtechRecipe( - "plateTitanium", CI.circuitTier4, - "plateTitanium", + CI.component_Plate[7], CI.machineCasing_EV, - EV_MACHINE_BendingMachine, + INPUT_RCCokeOvenBlock, CI.machineCasing_EV, - "plateTitanium", + CI.component_Plate[7], CI.circuitTier4, - "plateTitanium", - RECIPE_IndustrialMaterialPressController); + CI.component_Plate[7], + RECIPE_IndustrialCokeOvenController); } + // Coke Oven Frame Casing + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[7], + CI.component_Rod[7], + CI.component_Plate[7], + CI.component_Rod[7], + "frameGtTantalloy61", + CI.component_Rod[7], + CI.component_Plate[7], + CI.component_Rod[7], + CI.component_Plate[7], + RECIPE_IndustrialCokeOvenFrame); + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.TANTALLOY_61.getPlate(4), + MaterialsAlloy.TANTALLOY_61.getRod(4), + MaterialsAlloy.TANTALLOY_61.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialCokeOvenFrame) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { - // Industrial Maceration Stack - RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1); - RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1); + // Coke Oven Coil 1 + RecipeUtils.addShapedGregtechRecipe( + plateBronze, + plateBronze, + plateBronze, + "frameGtBronze", + CI.gearboxCasing_Tier_1, + "frameGtBronze", + plateBronze, + plateBronze, + plateBronze, + RECIPE_IndustrialCokeOvenCasingA); + // Coke Oven Coil 2 + RecipeUtils.addShapedGregtechRecipe( + plateSteel, + plateSteel, + plateSteel, + "frameGtSteel", + CI.gearboxCasing_Tier_2, + "frameGtSteel", + plateSteel, + plateSteel, + plateSteel, + RECIPE_IndustrialCokeOvenCasingB); + + // Industrial Electrolyzer + RECIPE_IndustrialElectrolyzerController = GregtechItemList.Industrial_Electrolyzer.get(1); + RECIPE_IndustrialElectrolyzerFrame = GregtechItemList.Casing_Electrolyzer.get(1); + + // Electrolyzer Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "platePotin", + "stickLongChrome", + "platePotin", + "stickLongPotin", + "frameGtPotin", + "stickLongPotin", + "platePotin", + "stickLongPotin", + "platePotin", + RECIPE_IndustrialElectrolyzerFrame); + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.POTIN.getPlate(4), + MaterialsAlloy.POTIN.getLongRod(3), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Chrome, 1), + MaterialsAlloy.POTIN.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialElectrolyzerFrame) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - // Maceration Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "platePalladium", - "platePalladium", - "platePalladium", - "stickPlatinum", - "frameGtInconel625", - "stickPlatinum", - "platePalladium", - "stickLongPalladium", - "platePalladium", - RECIPE_IndustrialMacerationStackFrame); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5), - GTOreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2), - GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1), - MaterialsAlloy.INCONEL_625.getFrameBox(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialMacerationStackFrame) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + // Industrial Electrolyzer + RecipeUtils.addShapedGregtechRecipe( + "plateStellite", + CI.circuitTier5, + "plateStellite", + CI.machineCasing_IV, + IV_MACHINE_Electrolyzer, + CI.machineCasing_IV, + "plateStellite", + "rotorStellite", + "plateStellite", + RECIPE_IndustrialElectrolyzerController); + + // Industrial Material Press + RECIPE_IndustrialMaterialPressController = GregtechItemList.Industrial_PlatePress.get(1); + RECIPE_IndustrialMaterialPressFrame = GregtechItemList.Casing_MaterialPress.get(1); + + // Material Press Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", + "stickLongTumbaga", + "plateTitanium", + "stickTantalloy60", + "frameGtTumbaga", + "stickTantalloy60", + "plateTitanium", + "stickLongTumbaga", + "plateTitanium", + RECIPE_IndustrialMaterialPressFrame); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 4), + MaterialsAlloy.TANTALLOY_60.getRod(2), + MaterialsAlloy.TUMBAGA.getLongRod(2), + MaterialsAlloy.TUMBAGA.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialMaterialPressFrame) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - // Industrial Maceration stack - RecipeUtils.addShapedGregtechRecipe( - "plateTitanium", - EV_MACHINE_Macerator, - "plateTitanium", - EV_MACHINE_Macerator, - CI.circuitTier4, - EV_MACHINE_Macerator, - "plateTitanium", - EV_MACHINE_Macerator, - "plateTitanium", - RECIPE_IndustrialMacerationStackController); - // T2-Upgrade Card - RecipeUtils.addShapedGregtechRecipe( - "plateTungstenCarbide", - IV_MACHINE_Macerator, - "plateTungstenCarbide", - IV_MACHINE_Macerator, - CI.circuitTier7, - IV_MACHINE_Macerator, - "plateTungstenCarbide", - IV_MACHINE_Macerator, - "plateTungstenCarbide", - GregtechItemList.Maceration_Upgrade_Chip.get(1)); - } + // Industrial Material Press + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", + CI.circuitTier4, + "plateTitanium", + CI.machineCasing_EV, + EV_MACHINE_BendingMachine, + CI.machineCasing_EV, + "plateTitanium", + CI.circuitTier4, + "plateTitanium", + RECIPE_IndustrialMaterialPressController); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWireMill) { - // Industrial Wire Factory - RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1); - RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1); + // Industrial Maceration Stack + RECIPE_IndustrialMacerationStackController = GregtechItemList.Industrial_MacerationStack.get(1); + RECIPE_IndustrialMacerationStackFrame = GregtechItemList.Casing_MacerationStack.get(1); - // Wire Factory Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "plateBlueSteel", - "stickBlueSteel", - "plateBlueSteel", - "stickBlueSteel", - "frameGtBlueSteel", - "stickBlueSteel", - "plateBlueSteel", - "stickBlueSteel", - "plateBlueSteel", - RECIPE_IndustrialWireFactoryFrame); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4), - GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialWireFactoryFrame) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + // Maceration Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "platePalladium", + "platePalladium", + "platePalladium", + "stickPlatinum", + "frameGtInconel625", + "stickPlatinum", + "platePalladium", + "stickLongPalladium", + "platePalladium", + RECIPE_IndustrialMacerationStackFrame); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 5), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Platinum, 2), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Palladium, 1), + MaterialsAlloy.INCONEL_625.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialMacerationStackFrame) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - // Industrial Wire Factory - RecipeUtils.addShapedGregtechRecipe( - "plateZeron100", - CI.machineCasing_IV, - "plateZeron100", - CI.circuitTier5, - IV_MACHINE_Wiremill, - CI.circuitTier5, - "plateZeron100", - CI.machineCasing_IV, - "plateZeron100", - RECIPE_IndustrialWireFactoryController); - } + // Industrial Maceration stack + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", + EV_MACHINE_Macerator, + "plateTitanium", + EV_MACHINE_Macerator, + CI.circuitTier4, + EV_MACHINE_Macerator, + "plateTitanium", + EV_MACHINE_Macerator, + "plateTitanium", + RECIPE_IndustrialMacerationStackController); + // T2-Upgrade Card + RecipeUtils.addShapedGregtechRecipe( + "plateTungstenCarbide", + IV_MACHINE_Macerator, + "plateTungstenCarbide", + IV_MACHINE_Macerator, + CI.circuitTier7, + IV_MACHINE_Macerator, + "plateTungstenCarbide", + IV_MACHINE_Macerator, + "plateTungstenCarbide", + GregtechItemList.Maceration_Upgrade_Chip.get(1)); + + // Industrial Wire Factory + RECIPE_IndustrialWireFactoryController = GregtechItemList.Industrial_WireFactory.get(1); + RECIPE_IndustrialWireFactoryFrame = GregtechItemList.Casing_WireFactory.get(1); + + // Wire Factory Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateBlueSteel", + "stickBlueSteel", + "plateBlueSteel", + "stickBlueSteel", + "frameGtBlueSteel", + "stickBlueSteel", + "plateBlueSteel", + "stickBlueSteel", + "plateBlueSteel", + RECIPE_IndustrialWireFactoryFrame); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlueSteel, 4), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.BlueSteel, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialWireFactoryFrame) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - // Tiered Tanks - if (GTPPCore.ConfigSwitches.enableMachine_FluidTanks) { - CI.component_Plate[1] = "plateTin"; - pipeTier1 = "pipeLargeClay"; - CI.circuitTier1 = ItemList.Circuit_Primitive.get(1); - CI.component_Plate[2] = "plateCopper"; - pipeTier2 = "pipeHugeClay"; - CI.component_Plate[3] = "plateBronze"; - pipeTier3 = "pipeMediumBronze"; - CI.component_Plate[4] = "plateIron"; - pipeTier4 = "pipeMediumSteel"; - CI.component_Plate[5] = "plateSteel"; - CI.component_Plate[6] = "plateRedstone"; - CI.component_Plate[7] = "plateAluminium"; - CI.component_Plate[8] = "plateDarkSteel"; - ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket); - - // Allows clearing stored fluids. - GregtechItemList[] aTanks = new GregtechItemList[] { GregtechItemList.GTFluidTank_ULV, - GregtechItemList.GTFluidTank_LV, GregtechItemList.GTFluidTank_MV, GregtechItemList.GTFluidTank_HV }; - for (GregtechItemList aTank : aTanks) { - RecipeUtils.addShapelessGregtechRecipe(new Object[] { aTank.get(1) }, aTank.get(1)); - } + // Industrial Wire Factory + RecipeUtils.addShapedGregtechRecipe( + "plateZeron100", + CI.machineCasing_IV, + "plateZeron100", + CI.circuitTier5, + IV_MACHINE_Wiremill, + CI.circuitTier5, + "plateZeron100", + CI.machineCasing_IV, + "plateZeron100", + RECIPE_IndustrialWireFactoryController); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[1], - CI.component_Plate[5], - CI.component_Plate[1], - CI.component_Plate[4], - pipeTier1, - CI.component_Plate[4], - CI.component_Plate[4], - waterBucket, - CI.component_Plate[4], - GregtechItemList.GTFluidTank_ULV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[5], - CI.component_Plate[4], - CI.component_Plate[5], - CI.component_Plate[3], - pipeTier2, - CI.component_Plate[3], - CI.component_Plate[3], - CI.electricPump_LV, - CI.component_Plate[3], - GregtechItemList.GTFluidTank_LV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[8], - CI.component_Plate[3], - CI.component_Plate[8], - CI.component_Plate[5], - pipeTier3, - CI.component_Plate[5], - CI.component_Plate[5], - CI.electricPump_LV, - CI.component_Plate[5], - GregtechItemList.GTFluidTank_MV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.circuitTier1, - CI.component_Plate[7], - CI.circuitTier1, - CI.component_Plate[8], - pipeTier4, - CI.component_Plate[8], - CI.circuitTier1, - CI.electricPump_MV, - CI.circuitTier1, - GregtechItemList.GTFluidTank_HV.get(1)); + // Tiered Tanks + CI.component_Plate[1] = "plateTin"; + pipeTier1 = "pipeLargeClay"; + CI.circuitTier1 = ItemList.Circuit_Primitive.get(1); + CI.component_Plate[2] = "plateCopper"; + pipeTier2 = "pipeHugeClay"; + CI.component_Plate[3] = "plateBronze"; + pipeTier3 = "pipeMediumBronze"; + CI.component_Plate[4] = "plateIron"; + pipeTier4 = "pipeMediumSteel"; + CI.component_Plate[5] = "plateSteel"; + CI.component_Plate[6] = "plateRedstone"; + CI.component_Plate[7] = "plateAluminium"; + CI.component_Plate[8] = "plateDarkSteel"; + ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket); + + // Allows clearing stored fluids. + GregtechItemList[] aTanks = new GregtechItemList[] { GregtechItemList.GTFluidTank_ULV, + GregtechItemList.GTFluidTank_LV, GregtechItemList.GTFluidTank_MV, GregtechItemList.GTFluidTank_HV }; + for (GregtechItemList aTank : aTanks) { + RecipeUtils.addShapelessGregtechRecipe(new Object[] { aTank.get(1) }, aTank.get(1)); } - if (GTPPCore.ConfigSwitches.enableMultiblock_MultiTank) { - // Industrial Multi Tank - // RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1); - RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(1); - - // Industrial Multi Tank Casing - RecipeUtils.addShapedGregtechRecipe( - "stickGrisium", - "plateGrisium", - "stickGrisium", - "plateGrisium", - "frameGtGrisium", - "plateGrisium", - "plateGrisium", - "plateGrisium", - "plateGrisium", - RECIPE_IndustrialMultiTankFrame); - // Industrial Multi Tank - RecipeUtils.addShapedGregtechRecipe( - "pipeHugeTantalloy60", - "gearGrisium", - "pipeHugeTantalloy60", - CI.circuitTier4, - RECIPE_IndustrialMultiTankFrame, - CI.circuitTier4, - "plateDoubleGrisium", - "rotorGrisium", - "plateDoubleGrisium", - RECIPE_IndustrialMultiTankController); - } - // TODO + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[1], + CI.component_Plate[5], + CI.component_Plate[1], + CI.component_Plate[4], + pipeTier1, + CI.component_Plate[4], + CI.component_Plate[4], + waterBucket, + CI.component_Plate[4], + GregtechItemList.GTFluidTank_ULV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[5], + CI.component_Plate[4], + CI.component_Plate[5], + CI.component_Plate[3], + pipeTier2, + CI.component_Plate[3], + CI.component_Plate[3], + CI.electricPump_LV, + CI.component_Plate[3], + GregtechItemList.GTFluidTank_LV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.component_Plate[8], + CI.component_Plate[3], + CI.component_Plate[8], + CI.component_Plate[5], + pipeTier3, + CI.component_Plate[5], + CI.component_Plate[5], + CI.electricPump_LV, + CI.component_Plate[5], + GregtechItemList.GTFluidTank_MV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.circuitTier1, + CI.component_Plate[7], + CI.circuitTier1, + CI.component_Plate[8], + pipeTier4, + CI.component_Plate[8], + CI.circuitTier1, + CI.electricPump_MV, + CI.circuitTier1, + GregtechItemList.GTFluidTank_HV.get(1)); + + // Industrial Multi Tank + // RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1); + RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(1); + + // Industrial Multi Tank Casing + RecipeUtils.addShapedGregtechRecipe( + "stickGrisium", + "plateGrisium", + "stickGrisium", + "plateGrisium", + "frameGtGrisium", + "plateGrisium", + "plateGrisium", + "plateGrisium", + "plateGrisium", + RECIPE_IndustrialMultiTankFrame); + // Industrial Multi Tank + RecipeUtils.addShapedGregtechRecipe( + "pipeHugeTantalloy60", + "gearGrisium", + "pipeHugeTantalloy60", + CI.circuitTier4, + RECIPE_IndustrialMultiTankFrame, + CI.circuitTier4, + "plateDoubleGrisium", + "rotorGrisium", + "plateDoubleGrisium", + RECIPE_IndustrialMultiTankController); // Semi-Fluid Generators - GTValues.RA.stdBuilder() .itemInputs( CI.getNumberedBioCircuit(14), @@ -1651,100 +1629,97 @@ public class RecipesMachines { GTModHandler.addCraftingRecipe( GregtechItemList.Generator_SemiFluid_LV.get(1L), - CI.bitsd, + CI.bits, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E', ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Cobalt), 'G', MaterialsAlloy.TUMBAGA.getGear(2) }); GTModHandler.addCraftingRecipe( GregtechItemList.Generator_SemiFluid_MV.get(1L), - CI.bitsd, + CI.bits, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E', ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnnealedCopper), 'G', MaterialsAlloy.EGLIN_STEEL.getGear(2) }); GTModHandler.addCraftingRecipe( GregtechItemList.Generator_SemiFluid_HV.get(1L), - CI.bitsd, + CI.bits, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E', ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Chrome, 1) }); GTModHandler.addCraftingRecipe( GregtechItemList.Generator_SemiFluid_EV.get(1L), - CI.bitsd, + CI.bits, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Titanium), 'G', MaterialsAlloy.INCOLOY_DS.getGear(1) }); GTModHandler.addCraftingRecipe( GregtechItemList.Generator_SemiFluid_IV.get(1L), - CI.bitsd, + CI.bits, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', MaterialsAlloy.NITINOL_60.getGear(1) }); - if (GTPPCore.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { - // Industrial Blast Smelter - RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1); - RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1); - RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1); + // Industrial Blast Smelter + RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1); + RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1); + RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1); - // Blast Smelter - RecipeUtils.addShapedGregtechRecipe( - "plateZirconiumCarbide", - CI.circuitTier5, - "plateZirconiumCarbide", - cableTier6, - IV_MACHINE_AlloySmelter, - cableTier6, - "plateZirconiumCarbide", - CI.circuitTier5, - "plateZirconiumCarbide", - RECIPE_IndustrialBlastSmelterController); - // Blast Smelter Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "plateZirconiumCarbide", - CI.craftingToolHammer_Hard, - "plateZirconiumCarbide", - "plateZirconiumCarbide", - "frameGtZirconiumCarbide", - "plateZirconiumCarbide", - "plateZirconiumCarbide", - CI.craftingToolWrench, - "plateZirconiumCarbide", - RECIPE_IndustrialBlastSmelterFrame); - GTValues.RA.stdBuilder() - .itemInputs( - MaterialsAlloy.ZIRCONIUM_CARBIDE.getPlate(6), - MaterialsAlloy.ZIRCONIUM_CARBIDE.getFrameBox(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialBlastSmelterFrame) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + // Blast Smelter + RecipeUtils.addShapedGregtechRecipe( + "plateZirconiumCarbide", + CI.circuitTier5, + "plateZirconiumCarbide", + cableTier6, + IV_MACHINE_AlloySmelter, + cableTier6, + "plateZirconiumCarbide", + CI.circuitTier5, + "plateZirconiumCarbide", + RECIPE_IndustrialBlastSmelterController); + // Blast Smelter Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateZirconiumCarbide", + CI.craftingToolHammer_Hard, + "plateZirconiumCarbide", + "plateZirconiumCarbide", + "frameGtZirconiumCarbide", + "plateZirconiumCarbide", + "plateZirconiumCarbide", + CI.craftingToolWrench, + "plateZirconiumCarbide", + RECIPE_IndustrialBlastSmelterFrame); + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.ZIRCONIUM_CARBIDE.getPlate(6), + MaterialsAlloy.ZIRCONIUM_CARBIDE.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialBlastSmelterFrame) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - // Blast Smelter Coil - RecipeUtils.addShapedGregtechRecipe( - "plateStaballoy", - "plateStaballoy", - "plateStaballoy", - "frameGtStaballoy", + // Blast Smelter Coil + RecipeUtils.addShapedGregtechRecipe( + "plateStaballoy", + "plateStaballoy", + "plateStaballoy", + "frameGtStaballoy", + CI.gearboxCasing_Tier_3, + "frameGtStaballoy", + "plateStaballoy", + "plateStaballoy", + "plateStaballoy", + RECIPE_IndustrialBlastSmelterCoil); + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.STABALLOY.getPlate(6), + MaterialsAlloy.STABALLOY.getFrameBox(2), CI.gearboxCasing_Tier_3, - "frameGtStaballoy", - "plateStaballoy", - "plateStaballoy", - "plateStaballoy", - RECIPE_IndustrialBlastSmelterCoil); - GTValues.RA.stdBuilder() - .itemInputs( - MaterialsAlloy.STABALLOY.getPlate(6), - MaterialsAlloy.STABALLOY.getFrameBox(2), - CI.gearboxCasing_Tier_3, - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialBlastSmelterCoil) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - } + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialBlastSmelterCoil) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( @@ -1774,226 +1749,213 @@ public class RecipesMachines { 1200 * 20, (int) GTValues.VP[11]); - if (GTPPCore.ConfigSwitches.enableMultiblock_MatterFabricator) { - // Industrial Matter Fabricator - RECIPE_IndustrialMatterFabController = GregtechItemList.Industrial_MassFab.get(1); - RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(1); - RECIPE_IndustrialMatterFabCoil = GregtechItemList.Casing_MatterGen.get(1); + // Industrial Matter Fabricator + RECIPE_IndustrialMatterFabController = GregtechItemList.Industrial_MassFab.get(1); + RECIPE_IndustrialMatterFabFrame = GregtechItemList.Casing_MatterFab.get(1); + RECIPE_IndustrialMatterFabCoil = GregtechItemList.Casing_MatterGen.get(1); - // Matter Fabricator CPU - RecipeUtils.addShapedGregtechRecipe( - CI.getPlate(8, 1), - CI.circuitTier8, - CI.getPlate(8, 1), - GTOreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), - CI.machineCasing_UV, - GTOreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), - CI.getPlate(8, 1), - CI.circuitTier8, - CI.getPlate(8, 1), - RECIPE_IndustrialMatterFabController); - // Matter Fabricator Frame Casing - RecipeUtils.addShapedGregtechRecipe( - "plateNiobiumCarbide", - CI.component_Rod[8], - "plateNiobiumCarbide", - CI.component_Rod[8], - "frameGtInconel690", - CI.component_Rod[8], - "plateNiobiumCarbide", - CI.component_Rod[8], - "plateNiobiumCarbide", - RECIPE_IndustrialMatterFabFrame); - GTValues.RA.stdBuilder() - .itemOutputs(RECIPE_IndustrialMatterFabFrame) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + // Matter Fabricator CPU + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(8, 1), + CI.circuitTier8, + CI.getPlate(8, 1), + GTOreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), + CI.machineCasing_UV, + GTOreDictUnificator.get(OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 1L), + CI.getPlate(8, 1), + CI.circuitTier8, + CI.getPlate(8, 1), + RECIPE_IndustrialMatterFabController); + // Matter Fabricator Frame Casing + RecipeUtils.addShapedGregtechRecipe( + "plateNiobiumCarbide", + CI.component_Rod[8], + "plateNiobiumCarbide", + CI.component_Rod[8], + "frameGtInconel690", + CI.component_Rod[8], + "plateNiobiumCarbide", + CI.component_Rod[8], + "plateNiobiumCarbide", + RECIPE_IndustrialMatterFabFrame); + GTValues.RA.stdBuilder() + .itemOutputs(RECIPE_IndustrialMatterFabFrame) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - // Matter Fabricator Coil - RecipeUtils.addShapedGregtechRecipe( - CI.getPlate(6, 1), - CI.getPlate(7, 1), - CI.getPlate(6, 1), - "frameGtStellite", + // Matter Fabricator Coil + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(6, 1), + CI.getPlate(7, 1), + CI.getPlate(6, 1), + "frameGtStellite", + CI.machineCasing_UV, + "frameGtStellite", + CI.getPlate(6, 1), + CI.getPlate(7, 1), + CI.getPlate(6, 1), + RECIPE_IndustrialMatterFabCoil); + GTValues.RA.stdBuilder() + .itemInputs( CI.machineCasing_UV, - "frameGtStellite", - CI.getPlate(6, 1), - CI.getPlate(7, 1), - CI.getPlate(6, 1), - RECIPE_IndustrialMatterFabCoil); - GTValues.RA.stdBuilder() - .itemInputs( - CI.machineCasing_UV, - MaterialsAlloy.ZERON_100.getPlate(4), - MaterialsAlloy.PIKYONIUM.getPlate(2), - MaterialsAlloy.STELLITE.getFrameBox(2), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialMatterFabCoil) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - } + MaterialsAlloy.ZERON_100.getPlate(4), + MaterialsAlloy.PIKYONIUM.getPlate(2), + MaterialsAlloy.STELLITE.getFrameBox(2), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialMatterFabCoil) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialSifter) { - // Industrial Sieve - RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1); - RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1); - RECIPE_IndustrialSieveGrate = GregtechItemList.Casing_SifterGrate.get(1); + // Industrial Sieve + RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1); + RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1); + RECIPE_IndustrialSieveGrate = GregtechItemList.Casing_SifterGrate.get(1); - // Industrial Sieve - RecipeUtils.addShapedGregtechRecipe( - "plateEglinSteel", - CI.circuitTier3, - "plateEglinSteel", - cableTier4, - HV_MACHINE_Sifter, - cableTier4, - "plateEglinSteel", - CI.circuitTier3, - "plateEglinSteel", - RECIPE_IndustrialSieveController); - // Industrial Sieve Casing - RecipeUtils.addShapedGregtechRecipe( - "plateEglinSteel", - "plateEglinSteel", - "plateEglinSteel", - "plateEglinSteel", - "frameGtTumbaga", - "plateEglinSteel", - "plateEglinSteel", - "plateEglinSteel", - "plateEglinSteel", - RECIPE_IndustrialSieveFrame); - GTValues.RA.stdBuilder() - .itemInputs( - MaterialsAlloy.EGLIN_STEEL.getPlate(8), - MaterialsAlloy.TUMBAGA.getFrameBox(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialSieveFrame) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + // Industrial Sieve + RecipeUtils.addShapedGregtechRecipe( + "plateEglinSteel", + CI.circuitTier3, + "plateEglinSteel", + cableTier4, + HV_MACHINE_Sifter, + cableTier4, + "plateEglinSteel", + CI.circuitTier3, + "plateEglinSteel", + RECIPE_IndustrialSieveController); + // Industrial Sieve Casing + RecipeUtils.addShapedGregtechRecipe( + "plateEglinSteel", + "plateEglinSteel", + "plateEglinSteel", + "plateEglinSteel", + "frameGtTumbaga", + "plateEglinSteel", + "plateEglinSteel", + "plateEglinSteel", + "plateEglinSteel", + RECIPE_IndustrialSieveFrame); + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.EGLIN_STEEL.getPlate(8), + MaterialsAlloy.TUMBAGA.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialSieveFrame) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - // Industrial Sieve Grate - RecipeUtils.addShapedGregtechRecipe( - "frameGtEglinSteel", - "wireFineSteel", - "frameGtEglinSteel", - "wireFineSteel", - "wireFineSteel", - "wireFineSteel", - "frameGtEglinSteel", - "wireFineSteel", - "frameGtEglinSteel", - RECIPE_IndustrialSieveGrate); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5), - MaterialsAlloy.EGLIN_STEEL.getFrameBox(4), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(RECIPE_IndustrialSieveGrate) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + // Industrial Sieve Grate + RecipeUtils.addShapedGregtechRecipe( + "frameGtEglinSteel", + "wireFineSteel", + "frameGtEglinSteel", + "wireFineSteel", + "wireFineSteel", + "wireFineSteel", + "frameGtEglinSteel", + "wireFineSteel", + "frameGtEglinSteel", + RECIPE_IndustrialSieveGrate); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 5), + MaterialsAlloy.EGLIN_STEEL.getFrameBox(4), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(RECIPE_IndustrialSieveGrate) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - } + // Industrial Tree Farmer + RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); + RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(1); + // Industrial Tree Farm Controller + RecipeUtils.addShapedGregtechRecipe( + ItemList.Field_Generator_IV.get(1), + MaterialsAlloy.INCOLOY_MA956.getRotor(1), + ItemList.Field_Generator_IV.get(1), + MaterialsAlloy.NITINOL_60.getPlate(1), + GregtechItemList.GTPP_Casing_IV.get(1), + MaterialsAlloy.NITINOL_60.getPlate(1), + ItemList.Field_Generator_IV.get(1), + MaterialsAlloy.INCONEL_792.getComponentByPrefix(OrePrefixes.pipeMedium, 1), + ItemList.Field_Generator_IV.get(1), + RECIPE_TreeFarmController); + // Industrial Tree Farm Frame + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(2), + MaterialsAlloy.TUMBAGA.getFrameBox(1), + ItemUtils.getItemStackOfAmountFromOreDict("pipeTinySteel", 1), + ItemList.MV_Coil.get(1), + ItemList.IC2_Plantball.get(4), + GTOreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8)) + .itemOutputs(RECIPE_TreeFarmFrame) + .fluidInputs(GTModHandler.getDistilledWater(2000)) + .duration(10 * SECONDS) + .eut(64) + .addTo(assemblerRecipes); - if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { - // Industrial Tree Farmer - RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); - RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(1); - // Industrial Tree Farm Controller - RecipeUtils.addShapedGregtechRecipe( - ItemList.Field_Generator_IV.get(1), - MaterialsAlloy.INCOLOY_MA956.getRotor(1), - ItemList.Field_Generator_IV.get(1), - MaterialsAlloy.NITINOL_60.getPlate(1), - GregtechItemList.GTPP_Casing_IV.get(1), - MaterialsAlloy.NITINOL_60.getPlate(1), - ItemList.Field_Generator_IV.get(1), - MaterialsAlloy.INCONEL_792.getComponentByPrefix(OrePrefixes.pipeMedium, 1), - ItemList.Field_Generator_IV.get(1), - RECIPE_TreeFarmController); - // Industrial Tree Farm Frame + // Tesseracts + RECIPE_TesseractGenerator = GregtechItemList.GT4_Tesseract_Generator.get(1); + RECIPE_TesseractTerminal = GregtechItemList.GT4_Tesseract_Terminal.get(1); + // Tesseract Generator + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", + "circuitMaster", + "plateTitanium", + "circuitMaster", + ItemUtils.getSimpleStack(Blocks.ender_chest), + "circuitMaster", + "plateTitanium", + GregtechItemList.Gregtech_Computer_Cube.get(1), + "plateTitanium", + RECIPE_TesseractGenerator); + // Tesseract Terminal + RecipeUtils.addShapedGregtechRecipe( + "plateTitanium", + "circuitElite", + "plateTitanium", + "circuitElite", + ItemUtils.getSimpleStack(Blocks.ender_chest), + "circuitElite", + "plateTitanium", + CI.machineHull_EV, + "plateTitanium", + RECIPE_TesseractTerminal); + + // simple washer + final List<ItemStack> washers = ImmutableList.of( + GregtechItemList.SimpleDustWasher_LV.get(1), + GregtechItemList.SimpleDustWasher_MV.get(1), + GregtechItemList.SimpleDustWasher_HV.get(1), + GregtechItemList.SimpleDustWasher_EV.get(1), + GregtechItemList.SimpleDustWasher_IV.get(1), + GregtechItemList.SimpleDustWasher_LuV.get(1), + GregtechItemList.SimpleDustWasher_ZPM.get(1), + GregtechItemList.SimpleDustWasher_UV.get(1)); + + for (int i = 0; i < washers.size(); i++) { + final int tier = i + 1; GTValues.RA.stdBuilder() .itemInputs( - GTUtility.getIntegratedCircuit(2), - MaterialsAlloy.TUMBAGA.getFrameBox(1), - ItemUtils.getItemStackOfAmountFromOreDict("pipeTinySteel", 1), - ItemList.MV_Coil.get(1), - ItemList.IC2_Plantball.get(4), - GTOreDictUnificator.get(OrePrefixes.plank, Materials.Wood, 8)) - .itemOutputs(RECIPE_TreeFarmFrame) - .fluidInputs(GTModHandler.getDistilledWater(2000)) - .duration(10 * SECONDS) - .eut(64) + CI.getTieredMachineHull(tier), + CI.getTieredComponent(OrePrefixes.screw, tier, tier * 4), + CI.getTieredComponent(OrePrefixes.plate, tier - 1, tier * 2), + CI.getTieredComponent(OrePrefixes.rod, tier, tier), + CI.getTieredComponent(OrePrefixes.circuit, tier, 1)) + .itemOutputs(washers.get(i)) + .fluidInputs(CI.getTieredFluid(tier, 144 * tier)) + .duration(20 * 5 * tier) + .eut(GTValues.VP[tier]) .addTo(assemblerRecipes); } - if (GTPPCore.ConfigSwitches.enableMachine_Tesseracts) { - // Tesseracts - RECIPE_TesseractGenerator = GregtechItemList.GT4_Tesseract_Generator.get(1); - RECIPE_TesseractTerminal = GregtechItemList.GT4_Tesseract_Terminal.get(1); - // Tesseract Generator - RecipeUtils.addShapedGregtechRecipe( - "plateTitanium", - "circuitMaster", - "plateTitanium", - "circuitMaster", - ItemUtils.getSimpleStack(Blocks.ender_chest), - "circuitMaster", - "plateTitanium", - GregtechItemList.Gregtech_Computer_Cube.get(1), - "plateTitanium", - RECIPE_TesseractGenerator); - // Tesseract Terminal - RecipeUtils.addShapedGregtechRecipe( - "plateTitanium", - "circuitElite", - "plateTitanium", - "circuitElite", - ItemUtils.getSimpleStack(Blocks.ender_chest), - "circuitElite", - "plateTitanium", - CI.machineHull_EV, - "plateTitanium", - RECIPE_TesseractTerminal); - } - - if (GTPPCore.ConfigSwitches.enableMachine_SimpleWasher) { - final List<ItemStack> washers = ImmutableList.of( - GregtechItemList.SimpleDustWasher_LV.get(1), - GregtechItemList.SimpleDustWasher_MV.get(1), - GregtechItemList.SimpleDustWasher_HV.get(1), - GregtechItemList.SimpleDustWasher_EV.get(1), - GregtechItemList.SimpleDustWasher_IV.get(1), - GregtechItemList.SimpleDustWasher_LuV.get(1), - GregtechItemList.SimpleDustWasher_ZPM.get(1), - GregtechItemList.SimpleDustWasher_UV.get(1)); - - for (int i = 0; i < washers.size(); i++) { - final int tier = i + 1; - GTValues.RA.stdBuilder() - .itemInputs( - CI.getTieredMachineHull(tier), - CI.getTieredComponent(OrePrefixes.screw, tier, tier * 4), - CI.getTieredComponent(OrePrefixes.plate, tier - 1, tier * 2), - CI.getTieredComponent(OrePrefixes.rod, tier, tier), - CI.getTieredComponent(OrePrefixes.circuit, tier, 1)) - .itemOutputs(washers.get(i)) - .fluidInputs(CI.getTieredFluid(tier, 144 * tier)) - .duration(20 * 5 * tier) - .eut(GTValues.VP[tier]) - .addTo(assemblerRecipes); - - } - } - - if (GTPPCore.ConfigSwitches.enableMachine_Pollution && PollutionUtils.isPollutionEnabled()) { - + if (GTMod.gregtechproxy.mPollution) { RecipeUtils.addShapedGregtechRecipe( "plateCarbon", "plateCarbon", @@ -2141,63 +2103,60 @@ public class RecipesMachines { GregtechItemList.Pollution_Cleaner_MAX.get(1)); } - if (GTPPCore.ConfigSwitches.enableMultiblock_ThermalBoiler) { - RECIPE_ThermalBoilerController = GregtechItemList.GT4_Thermal_Boiler.get(1); - RECIPE_ThermalBoilerCasing = GregtechItemList.Casing_ThermalContainment.get(2); - ItemStack centrifugeEV = ItemList.Machine_EV_Centrifuge.get(1); - - RecipeUtils.addShapedGregtechRecipe( - "craftingGeothermalGenerator", - centrifugeEV, - "craftingGeothermalGenerator", - "gearGtTitanium", - CI.getTieredCircuitOreDictName(6), - "gearGtTitanium", - "craftingGeothermalGenerator", - centrifugeEV, - "craftingGeothermalGenerator", - RECIPE_ThermalBoilerController); + RECIPE_ThermalBoilerController = GregtechItemList.GT4_Thermal_Boiler.get(1); + RECIPE_ThermalBoilerCasing = GregtechItemList.Casing_ThermalContainment.get(2); + ItemStack centrifugeEV = ItemList.Machine_EV_Centrifuge.get(1); - RecipeUtils.addShapedGregtechRecipe( - "craftingGeothermalGenerator", - centrifugeEV, - "craftingGeothermalGenerator", - "gearGtTungstenSteel", - CI.getTieredCircuitOreDictName(5), - "gearGtTungstenSteel", - "craftingGeothermalGenerator", - centrifugeEV, - "craftingGeothermalGenerator", - RECIPE_ThermalBoilerController); + RecipeUtils.addShapedGregtechRecipe( + "craftingGeothermalGenerator", + centrifugeEV, + "craftingGeothermalGenerator", + "gearGtTitanium", + CI.getTieredCircuitOreDictName(6), + "gearGtTitanium", + "craftingGeothermalGenerator", + centrifugeEV, + "craftingGeothermalGenerator", + RECIPE_ThermalBoilerController); - RecipeUtils.addShapedGregtechRecipe( - MaterialsAlloy.MARAGING350.getPlate(1), - "plateStainlessSteel", - MaterialsAlloy.MARAGING350.getPlate(1), - "circuitAdvanced", - CI.machineCasing_HV, - "circuitAdvanced", - MaterialsAlloy.MARAGING350.getPlate(1), - MaterialsAlloy.MARAGING350.getPlate(1), - MaterialsAlloy.MARAGING350.getPlate(1), - RECIPE_ThermalBoilerCasing); - - // Lava Filter Recipe - GTValues.RA.stdBuilder() - .itemInputs( - GTUtility.getIntegratedCircuit(18), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 32), - ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", 32), - ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", 16), - ItemUtils.getItemStackOfAmountFromOreDict("foilCopper", 4), - ItemUtils.getItemStackWithMeta(true, "IC2:itemPartCarbonMesh", "RawCarbonMesh", 0, 64)) - .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemLavaFilter, 16)) - .fluidInputs(CI.getTieredFluid(3, 144)) - .duration(1 * MINUTES + 20 * SECONDS) - .eut(240) - .addTo(assemblerRecipes); + RecipeUtils.addShapedGregtechRecipe( + "craftingGeothermalGenerator", + centrifugeEV, + "craftingGeothermalGenerator", + "gearGtTungstenSteel", + CI.getTieredCircuitOreDictName(5), + "gearGtTungstenSteel", + "craftingGeothermalGenerator", + centrifugeEV, + "craftingGeothermalGenerator", + RECIPE_ThermalBoilerController); - } + RecipeUtils.addShapedGregtechRecipe( + MaterialsAlloy.MARAGING350.getPlate(1), + "plateStainlessSteel", + MaterialsAlloy.MARAGING350.getPlate(1), + "circuitAdvanced", + CI.machineCasing_HV, + "circuitAdvanced", + MaterialsAlloy.MARAGING350.getPlate(1), + MaterialsAlloy.MARAGING350.getPlate(1), + MaterialsAlloy.MARAGING350.getPlate(1), + RECIPE_ThermalBoilerCasing); + + // Lava Filter Recipe + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.getIntegratedCircuit(18), + ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 32), + ItemUtils.getItemStackOfAmountFromOreDict("wireFineSteel", 32), + ItemUtils.getItemStackOfAmountFromOreDict("ringTumbaga", 16), + ItemUtils.getItemStackOfAmountFromOreDict("foilCopper", 4), + ItemUtils.getItemStackWithMeta(true, "IC2:itemPartCarbonMesh", "RawCarbonMesh", 0, 64)) + .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemLavaFilter, 16)) + .fluidInputs(CI.getTieredFluid(3, 144)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(240) + .addTo(assemblerRecipes); // Air Intake Hatch RecipeUtils.addShapedGregtechRecipe( @@ -2224,229 +2183,223 @@ public class RecipesMachines { CI.getTieredCircuit(7), GregtechItemList.Hatch_Air_Intake_Extreme.get(1)); - if (GTPPCore.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { + // Thorium Reactor + RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1); + RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); // Zeron + RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); // Hastelloy - // Thorium Reactor - RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1); - RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); // Zeron - RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); // Hastelloy + ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); + RecipeUtils.addShapedGregtechRecipe( + controlCircuit, + "cableGt12Naquadah", + controlCircuit, + "plateDoubleHastelloyN", + GregtechItemList.Gregtech_Computer_Cube.get(1), + "plateDoubleHastelloyN", + "plateThorium232", + CI.machineHull_IV, + "plateThorium232", + RECIPE_LFTRController); + RecipeUtils.addShapedGregtechRecipe( + "plateDoubleHastelloyC276", + CI.craftingToolScrewdriver, + "plateDoubleHastelloyC276", + "gearGtTalonite", + CI.fieldGenerator_LV, + "gearGtTalonite", + "plateDoubleHastelloyC276", + CI.craftingToolHammer_Hard, + "plateDoubleHastelloyC276", + RECIPE_LFTRInnerCasing); - ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); - RecipeUtils.addShapedGregtechRecipe( - controlCircuit, - "cableGt12Naquadah", - controlCircuit, - "plateDoubleHastelloyN", - GregtechItemList.Gregtech_Computer_Cube.get(1), - "plateDoubleHastelloyN", - "plateThorium232", - CI.machineHull_IV, - "plateThorium232", - RECIPE_LFTRController); - RecipeUtils.addShapedGregtechRecipe( - "plateDoubleHastelloyC276", - CI.craftingToolScrewdriver, - "plateDoubleHastelloyC276", - "gearGtTalonite", - CI.fieldGenerator_LV, - "gearGtTalonite", - "plateDoubleHastelloyC276", - CI.craftingToolHammer_Hard, - "plateDoubleHastelloyC276", - RECIPE_LFTRInnerCasing); - - ItemStack IC2HeatPlate = ItemUtils.getItemStackFromFQRN("IC2:reactorPlatingHeat", 1); - RecipeUtils.addShapedGregtechRecipe( - "plateDoubleHastelloyN", - IC2HeatPlate, - "plateDoubleHastelloyN", - IC2HeatPlate, - "frameGtHastelloyC276", - IC2HeatPlate, - "plateDoubleHastelloyN", - IC2HeatPlate, - "plateDoubleHastelloyN", - RECIPE_LFTROuterCasing); - - // LFTR Control Circuit - GTValues.RA.stdBuilder() - .itemInputs( - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), - CI.fieldGenerator_HV) - .itemOutputs(controlCircuit) - .duration(4 * MINUTES) - .eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); + ItemStack IC2HeatPlate = ItemUtils.getItemStackFromFQRN("IC2:reactorPlatingHeat", 1); + RecipeUtils.addShapedGregtechRecipe( + "plateDoubleHastelloyN", + IC2HeatPlate, + "plateDoubleHastelloyN", + IC2HeatPlate, + "frameGtHastelloyC276", + IC2HeatPlate, + "plateDoubleHastelloyN", + IC2HeatPlate, + "plateDoubleHastelloyN", + RECIPE_LFTROuterCasing); + + // LFTR Control Circuit + GTValues.RA.stdBuilder() + .itemInputs( + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 1), + CI.fieldGenerator_HV) + .itemOutputs(controlCircuit) + .duration(4 * MINUTES) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); - // Fission Fuel Plant - RecipeUtils.addShapedGregtechRecipe( - CI.getTieredCircuitOreDictName(5), - CI.craftingToolSolderingIron, - CI.getTieredCircuitOreDictName(5), - "plateDenseTungstenSteel", - GregtechItemList.Gregtech_Computer_Cube.get(1), - "plateDenseTungstenSteel", - "gearGtStellite", - CI.machineHull_IV, - "gearGtStellite", - GregtechItemList.Industrial_FuelRefinery.get(1)); + // Fission Fuel Plant + RecipeUtils.addShapedGregtechRecipe( + CI.getTieredCircuitOreDictName(5), + CI.craftingToolSolderingIron, + CI.getTieredCircuitOreDictName(5), + "plateDenseTungstenSteel", + GregtechItemList.Gregtech_Computer_Cube.get(1), + "plateDenseTungstenSteel", + "gearGtStellite", + CI.machineHull_IV, + "gearGtStellite", + GregtechItemList.Industrial_FuelRefinery.get(1)); - ItemStack mInnerTank = ItemList.Super_Tank_IV.get(1); + ItemStack mInnerTank = ItemList.Super_Tank_IV.get(1); - // Incoloy Casing - RecipeUtils.addShapedGregtechRecipe( - "plateIncoloyDS", - "pipeHugeStaballoy", - "plateIncoloyDS", - "gearGtIncoloyDS", - mInnerTank, - "gearGtIncoloyDS", - "plateIncoloyDS", - "pipeHugeStaballoy", - "plateIncoloyDS", - GregtechItemList.Casing_Refinery_Internal.get(1)); - - // Hastelloy-N Sealant Casing - RecipeUtils.addShapedGregtechRecipe( - "plateIncoloyMA956", - "plateHastelloyN", - "plateIncoloyMA956", - "plateHastelloyN", - "frameGtHastelloyC276", - "plateHastelloyN", - "plateIncoloyMA956", - "plateHastelloyN", - "plateIncoloyMA956", - GregtechItemList.Casing_Refinery_External.get(1)); - - // Hastelloy-X Structural Casing - RecipeUtils.addShapedGregtechRecipe( - "ringInconel792", - "gearGtHastelloyX", - CI.component_Plate[5], - CI.craftingToolHammer_Hard, - "frameGtHastelloyC276", - CI.craftingToolWrench, - CI.component_Plate[5], - CI.getTieredMachineCasing(4), - "ringInconel792", - GregtechItemList.Casing_Refinery_Structural.get(1)); + // Incoloy Casing + RecipeUtils.addShapedGregtechRecipe( + "plateIncoloyDS", + "pipeHugeStaballoy", + "plateIncoloyDS", + "gearGtIncoloyDS", + mInnerTank, + "gearGtIncoloyDS", + "plateIncoloyDS", + "pipeHugeStaballoy", + "plateIncoloyDS", + GregtechItemList.Casing_Refinery_Internal.get(1)); + + // Hastelloy-N Sealant Casing + RecipeUtils.addShapedGregtechRecipe( + "plateIncoloyMA956", + "plateHastelloyN", + "plateIncoloyMA956", + "plateHastelloyN", + "frameGtHastelloyC276", + "plateHastelloyN", + "plateIncoloyMA956", + "plateHastelloyN", + "plateIncoloyMA956", + GregtechItemList.Casing_Refinery_External.get(1)); + + // Hastelloy-X Structural Casing + RecipeUtils.addShapedGregtechRecipe( + "ringInconel792", + "gearGtHastelloyX", + CI.component_Plate[5], + CI.craftingToolHammer_Hard, + "frameGtHastelloyC276", + CI.craftingToolWrench, + CI.component_Plate[5], + CI.getTieredMachineCasing(4), + "ringInconel792", + GregtechItemList.Casing_Refinery_Structural.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.getPlate(5, 1), - MaterialsAlloy.HASTELLOY_X.getPlateDouble(1), - CI.getPlate(5, 1), - CI.getPlate(5, 1), - CI.getTieredMachineCasing(5), - CI.getPlate(5, 1), - CI.getRobotArm(5, 1), - ItemList.Casing_FrostProof.get(1), - CI.getRobotArm(5, 1), - GregtechItemList.ColdTrap_IV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.getPlate(7, 1), - MaterialsAlloy.HS188A.getPlateDouble(1), - CI.getPlate(7, 1), - CI.getPlate(7, 1), - GregtechItemList.ColdTrap_IV.get(1), - CI.getPlate(7, 1), - CI.getRobotArm(7, 1), - ItemList.Casing_FrostProof.get(1), - CI.getRobotArm(7, 1), - GregtechItemList.ColdTrap_ZPM.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(5, 1), + MaterialsAlloy.HASTELLOY_X.getPlateDouble(1), + CI.getPlate(5, 1), + CI.getPlate(5, 1), + CI.getTieredMachineCasing(5), + CI.getPlate(5, 1), + CI.getRobotArm(5, 1), + ItemList.Casing_FrostProof.get(1), + CI.getRobotArm(5, 1), + GregtechItemList.ColdTrap_IV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(7, 1), + MaterialsAlloy.HS188A.getPlateDouble(1), + CI.getPlate(7, 1), + CI.getPlate(7, 1), + GregtechItemList.ColdTrap_IV.get(1), + CI.getPlate(7, 1), + CI.getRobotArm(7, 1), + ItemList.Casing_FrostProof.get(1), + CI.getRobotArm(7, 1), + GregtechItemList.ColdTrap_ZPM.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.getFieldGenerator(3, 1), - CI.getRobotArm(5, 1), - CI.getPlate(5, 1), - MaterialsAlloy.HASTELLOY_N.getPlateDouble(1), - ItemList.Machine_IV_ChemicalReactor.get(1), - MaterialsAlloy.HASTELLOY_N.getPlateDouble(1), - CI.getPlate(5, 1), - MaterialsAlloy.HASTELLOY_N.getPlateDouble(1), - CI.getFieldGenerator(3, 1), - GregtechItemList.ReactorProcessingUnit_IV.get(1)); - RecipeUtils.addShapedGregtechRecipe( - CI.getFieldGenerator(5, 1), - CI.getRobotArm(7, 1), - CI.getPlate(7, 1), - MaterialsAlloy.HS188A.getPlateDouble(1), - GregtechItemList.ReactorProcessingUnit_IV.get(1), - MaterialsAlloy.HS188A.getPlateDouble(1), - CI.getPlate(7, 1), - MaterialsAlloy.HS188A.getPlateDouble(1), - CI.getFieldGenerator(5, 1), - GregtechItemList.ReactorProcessingUnit_ZPM.get(1)); - - // Nuclear Salt Processing Plant Controller - RECIPE_SaltPlantController = GregtechItemList.Nuclear_Salt_Processing_Plant.get(1); + RecipeUtils.addShapedGregtechRecipe( + CI.getFieldGenerator(3, 1), + CI.getRobotArm(5, 1), + CI.getPlate(5, 1), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(1), + ItemList.Machine_IV_ChemicalReactor.get(1), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(1), + CI.getPlate(5, 1), + MaterialsAlloy.HASTELLOY_N.getPlateDouble(1), + CI.getFieldGenerator(3, 1), + GregtechItemList.ReactorProcessingUnit_IV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.getFieldGenerator(5, 1), + CI.getRobotArm(7, 1), + CI.getPlate(7, 1), + MaterialsAlloy.HS188A.getPlateDouble(1), + GregtechItemList.ReactorProcessingUnit_IV.get(1), + MaterialsAlloy.HS188A.getPlateDouble(1), + CI.getPlate(7, 1), + MaterialsAlloy.HS188A.getPlateDouble(1), + CI.getFieldGenerator(5, 1), + GregtechItemList.ReactorProcessingUnit_ZPM.get(1)); - RecipeUtils.addShapedGregtechRecipe( - "plateOsmiridium", - GregtechItemList.ReactorProcessingUnit_IV.get(1), - "plateOsmiridium", - "plateRuridit", - CI.getTieredCircuitOreDictName(7), - "plateRuridit", - "plateOsmiridium", - GregtechItemList.ColdTrap_IV.get(1), - "plateOsmiridium", - RECIPE_SaltPlantController); - } + // Nuclear Salt Processing Plant Controller + RECIPE_SaltPlantController = GregtechItemList.Nuclear_Salt_Processing_Plant.get(1); - // Cyclotron - if (GTPPCore.ConfigSwitches.enableMultiblock_Cyclotron) { - RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1); - RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(1); - RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1); + RecipeUtils.addShapedGregtechRecipe( + "plateOsmiridium", + GregtechItemList.ReactorProcessingUnit_IV.get(1), + "plateOsmiridium", + "plateRuridit", + CI.getTieredCircuitOreDictName(7), + "plateRuridit", + "plateOsmiridium", + GregtechItemList.ColdTrap_IV.get(1), + "plateOsmiridium", + RECIPE_SaltPlantController); - // Outer Casing - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Casing_FrostProof.get(1), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 4), - MaterialsAlloy.INCOLOY_DS.getPlate(8), - MaterialsAlloy.INCONEL_690.getScrew(16), - MaterialsAlloy.EGLIN_STEEL.getLongRod(4), - CI.getElectricPiston(3, 2)) - .itemOutputs(RECIPE_CyclotronOuterCasing) - .fluidInputs(MaterialsAlloy.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8) // Input Flui - ) - .duration(60 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(assemblerRecipes); - // Inner Coil - GTValues.RA.stdBuilder() - .itemInputs( - ItemList.Casing_Coil_Nichrome.get(1), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 8), - MaterialsAlloy.INCOLOY_MA956.getPlate(8), - MaterialsAlloy.TANTALLOY_61.getBolt(16), - MaterialsAlloy.INCOLOY_020.getScrew(32), - CI.getFieldGenerator(4, 1)) - .itemOutputs(RECIPE_CyclotronInnerCoil) - .fluidInputs(MaterialsAlloy.HG1223.getFluidStack(144 * 5) // Input Flui - ) - .duration(2 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - // Controller - GTValues.RA.stdBuilder() - .itemInputs( - CI.machineHull_IV, - ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, 2), - MaterialsAlloy.INCOLOY_020.getPlate(8), - MaterialsAlloy.TANTALLOY_61.getGear(2), - MaterialsAlloy.INCOLOY_MA956.getScrew(16), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 16)) - .itemOutputs(RECIPE_CyclotronController) - .fluidInputs(MaterialsAlloy.INCOLOY_020.getFluidStack(144 * 9) // Input Flui - ) - .duration(5 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); + // Cyclotron + RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1); + RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(1); + RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1); - } + // Outer Casing + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Casing_FrostProof.get(1), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 4), + MaterialsAlloy.INCOLOY_DS.getPlate(8), + MaterialsAlloy.INCONEL_690.getScrew(16), + MaterialsAlloy.EGLIN_STEEL.getLongRod(4), + CI.getElectricPiston(3, 2)) + .itemOutputs(RECIPE_CyclotronOuterCasing) + .fluidInputs(MaterialsAlloy.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8) // Input Flui + ) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(assemblerRecipes); + // Inner Coil + GTValues.RA.stdBuilder() + .itemInputs( + ItemList.Casing_Coil_Nichrome.get(1), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 8), + MaterialsAlloy.INCOLOY_MA956.getPlate(8), + MaterialsAlloy.TANTALLOY_61.getBolt(16), + MaterialsAlloy.INCOLOY_020.getScrew(32), + CI.getFieldGenerator(4, 1)) + .itemOutputs(RECIPE_CyclotronInnerCoil) + .fluidInputs(MaterialsAlloy.HG1223.getFluidStack(144 * 5) // Input Flui + ) + .duration(2 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(assemblerRecipes); + // Controller + GTValues.RA.stdBuilder() + .itemInputs( + CI.machineHull_IV, + ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, 2), + MaterialsAlloy.INCOLOY_020.getPlate(8), + MaterialsAlloy.TANTALLOY_61.getGear(2), + MaterialsAlloy.INCOLOY_MA956.getScrew(16), + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 16)) + .itemOutputs(RECIPE_CyclotronController) + .fluidInputs(MaterialsAlloy.INCOLOY_020.getFluidStack(144 * 9) // Input Flui + ) + .duration(5 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(assemblerRecipes); // Mazut GTModHandler.addCraftingRecipe( @@ -2456,261 +2409,246 @@ public class RecipesMachines { ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt08.get(Materials.Electrum), 'G', MaterialsAlloy.INCONEL_792.getGear(1) }); - if (GTPPCore.ConfigSwitches.enableMultiblock_PowerSubstation) { - RecipeUtils.addShapedRecipe( - "screwTitanium", - "plateIncoloy020", - "screwTitanium", - "plateIncoloy020", - "frameGtIncoloyMA956", - "plateIncoloy020", - "screwTitanium", - "plateIncoloy020", - "screwTitanium", - GregtechItemList.Casing_Power_SubStation.get(1)); - - ItemStack mBattery = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); - - RecipeUtils.addShapedRecipe( - "plateIncoloyMA956", - mBattery, - "plateIncoloyMA956", - GregtechItemList.Casing_Power_SubStation.get(1), - GregtechItemList.Casing_Vanadium_Redox.get(1), - GregtechItemList.Casing_Power_SubStation.get(1), - "plateIncoloy020", - "plateIncoloyMA956", - "plateIncoloy020", - GregtechItemList.PowerSubStation.get(1)); - } - - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { - RecipeUtils.addShapedRecipe( - "plateRedSteel", - CI.craftingToolHammer_Hard, - "plateRedSteel", - "plateRedSteel", - "frameGtBlackSteel", - "plateRedSteel", - "plateRedSteel", - CI.craftingToolWrench, - "plateRedSteel", - GregtechItemList.Casing_ThermalCentrifuge.get(1)); - GTValues.RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GregtechItemList.Casing_ThermalCentrifuge.get(1L)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + RecipeUtils.addShapedRecipe( + "screwTitanium", + "plateIncoloy020", + "screwTitanium", + "plateIncoloy020", + "frameGtIncoloyMA956", + "plateIncoloy020", + "screwTitanium", + "plateIncoloy020", + "screwTitanium", + GregtechItemList.Casing_Power_SubStation.get(1)); + + ItemStack mBattery = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR); - RecipeUtils.addShapedRecipe( - "plateRedSteel", - "circuitData", - "plateRedSteel", - "stickTalonite", - EV_MACHINE_ThermalCentrifuge, - "stickTalonite", - "plateRedSteel", - "gearGtTalonite", - "plateRedSteel", - GregtechItemList.Industrial_ThermalCentrifuge.get(1)); - } + RecipeUtils.addShapedRecipe( + "plateIncoloyMA956", + mBattery, + "plateIncoloyMA956", + GregtechItemList.Casing_Power_SubStation.get(1), + GregtechItemList.Casing_Vanadium_Redox.get(1), + GregtechItemList.Casing_Power_SubStation.get(1), + "plateIncoloy020", + "plateIncoloyMA956", + "plateIncoloy020", + GregtechItemList.PowerSubStation.get(1)); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { - RecipeUtils.addShapedRecipe( - "plateGrisium", - CI.craftingToolHammer_Hard, - "plateGrisium", - "plateTalonite", - "frameGtGrisium", - "plateTalonite", - "plateGrisium", - CI.craftingToolWrench, - "plateGrisium", - GregtechItemList.Casing_WashPlant.get(1)); - GTValues.RA.stdBuilder() - .itemInputs( - MaterialsAlloy.LEAGRISIUM.getPlate(4), - MaterialsAlloy.TALONITE.getPlate(2), - MaterialsAlloy.LEAGRISIUM.getFrameBox(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GregtechItemList.Casing_WashPlant.get(1L)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + RecipeUtils.addShapedRecipe( + "plateRedSteel", + CI.craftingToolHammer_Hard, + "plateRedSteel", + "plateRedSteel", + "frameGtBlackSteel", + "plateRedSteel", + "plateRedSteel", + CI.craftingToolWrench, + "plateRedSteel", + GregtechItemList.Casing_ThermalCentrifuge.get(1)); + GTValues.RA.stdBuilder() + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 6), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GregtechItemList.Casing_ThermalCentrifuge.get(1L)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - RecipeUtils.addShapedRecipe( - "plateGrisium", - EV_MACHINE_OreWasher, - "plateGrisium", - "plateTalonite", - "circuitData", - "plateTalonite", - "plateGrisium", - EV_MACHINE_ChemicalBath, - "plateGrisium", - GregtechItemList.Industrial_WashPlant.get(1)); - } + RecipeUtils.addShapedRecipe( + "plateRedSteel", + "circuitData", + "plateRedSteel", + "stickTalonite", + EV_MACHINE_ThermalCentrifuge, + "stickTalonite", + "plateRedSteel", + "gearGtTalonite", + "plateRedSteel", + GregtechItemList.Industrial_ThermalCentrifuge.get(1)); - if (GTPPCore.ConfigSwitches.enableMultiblock_LargeAutoCrafter) { - GTValues.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), - ItemList.Block_IridiumTungstensteel.get(1), - CI.getTieredComponent(OrePrefixes.circuit, 2, 16), - CI.getTieredComponent(OrePrefixes.screw, 5, 32), - CI.getTieredComponent(OrePrefixes.bolt, 5, 12), - CI.getTieredComponent(OrePrefixes.plate, 6, 8)) - .itemOutputs(GregtechItemList.Casing_Autocrafter.get(1)) - .fluidInputs(CI.getTertiaryTieredFluid(6, 144 * (4))) - .duration(2 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - GregtechItemList.Casing_Refinery_Structural.get(4), - ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 1), - CI.getTieredComponent(OrePrefixes.cableGt08, 6, 16), - CI.getTransmissionComponent(5, 2), - GregtechItemList.Gregtech_Computer_Cube.get(1)) - .itemOutputs(GregtechItemList.GT4_Multi_Crafter.get(1)) - .fluidInputs(CI.getTieredFluid(7, 144 * 8)) - .duration(5 * MINUTES) - .eut(TierEU.RECIPE_IV) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), - CI.getEmitter(4, 2), - CI.getRobotArm(4, 2), - CI.getTieredComponent(OrePrefixes.circuit, 2, 8), - CI.getTieredComponent(OrePrefixes.screw, 3, 8), - CI.getTieredComponent(OrePrefixes.plate, 5, 4)) - .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockProjectTable)) - .fluidInputs(CI.getAlternativeTieredFluid(5, 144 * 4)) - .duration(1 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_EV) - .addTo(assemblerRecipes); + RecipeUtils.addShapedRecipe( + "plateGrisium", + CI.craftingToolHammer_Hard, + "plateGrisium", + "plateTalonite", + "frameGtGrisium", + "plateTalonite", + "plateGrisium", + CI.craftingToolWrench, + "plateGrisium", + GregtechItemList.Casing_WashPlant.get(1)); + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.LEAGRISIUM.getPlate(4), + MaterialsAlloy.TALONITE.getPlate(2), + MaterialsAlloy.LEAGRISIUM.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GregtechItemList.Casing_WashPlant.get(1L)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - } + RecipeUtils.addShapedRecipe( + "plateGrisium", + EV_MACHINE_OreWasher, + "plateGrisium", + "plateTalonite", + "circuitData", + "plateTalonite", + "plateGrisium", + EV_MACHINE_ChemicalBath, + "plateGrisium", + GregtechItemList.Industrial_WashPlant.get(1)); + + GTValues.RA.stdBuilder() + .itemInputs( + ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), + ItemList.Block_IridiumTungstensteel.get(1), + CI.getTieredComponent(OrePrefixes.circuit, 2, 16), + CI.getTieredComponent(OrePrefixes.screw, 5, 32), + CI.getTieredComponent(OrePrefixes.bolt, 5, 12), + CI.getTieredComponent(OrePrefixes.plate, 6, 8)) + .itemOutputs(GregtechItemList.Casing_Autocrafter.get(1)) + .fluidInputs(CI.getTertiaryTieredFluid(6, 144 * (4))) + .duration(2 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + GregtechItemList.Casing_Refinery_Structural.get(4), + ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, 1), + CI.getTieredComponent(OrePrefixes.cableGt08, 6, 16), + CI.getTransmissionComponent(5, 2), + GregtechItemList.Gregtech_Computer_Cube.get(1)) + .itemOutputs(GregtechItemList.GT4_Multi_Crafter.get(1)) + .fluidInputs(CI.getTieredFluid(7, 144 * 8)) + .duration(5 * MINUTES) + .eut(TierEU.RECIPE_IV) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), 1), + CI.getEmitter(4, 2), + CI.getRobotArm(4, 2), + CI.getTieredComponent(OrePrefixes.circuit, 2, 8), + CI.getTieredComponent(OrePrefixes.screw, 3, 8), + CI.getTieredComponent(OrePrefixes.plate, 5, 4)) + .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockProjectTable)) + .fluidInputs(CI.getAlternativeTieredFluid(5, 144 * 4)) + .duration(1 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(assemblerRecipes); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { - ItemStack plate = MaterialsAlloy.MARAGING300.getPlate(1); - RecipeUtils.addShapedRecipe( - plate, - CI.craftingToolHammer_Hard, - plate, - "plateStellite", - "frameGtTalonite", - "plateStellite", - plate, - CI.craftingToolWrench, - plate, - GregtechItemList.Casing_CuttingFactoryFrame.get(1)); - GTValues.RA.stdBuilder() - .itemInputs( - MaterialsAlloy.MARAGING300.getPlate(4), - MaterialsAlloy.STELLITE.getPlate(2), - MaterialsAlloy.TALONITE.getFrameBox(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GregtechItemList.Casing_CuttingFactoryFrame.get(1L)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + ItemStack plate = MaterialsAlloy.MARAGING300.getPlate(1); + RecipeUtils.addShapedRecipe( + plate, + CI.craftingToolHammer_Hard, + plate, + "plateStellite", + "frameGtTalonite", + "plateStellite", + plate, + CI.craftingToolWrench, + plate, + GregtechItemList.Casing_CuttingFactoryFrame.get(1)); + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.MARAGING300.getPlate(4), + MaterialsAlloy.STELLITE.getPlate(2), + MaterialsAlloy.TALONITE.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GregtechItemList.Casing_CuttingFactoryFrame.get(1L)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - RecipeUtils.addShapedRecipe( - plate, - CI.getTieredCircuit(4), - plate, - "wireFinePlatinum", - IV_MACHINE_Cutter, - "wireFinePlatinum", - plate, - CI.getTieredCircuit(4), - plate, - GregtechItemList.Industrial_CuttingFactoryController.get(1)); - } + RecipeUtils.addShapedRecipe( + plate, + CI.getTieredCircuit(4), + plate, + "wireFinePlatinum", + IV_MACHINE_Cutter, + "wireFinePlatinum", + plate, + CI.getTieredCircuit(4), + plate, + GregtechItemList.Industrial_CuttingFactoryController.get(1)); // IV_MACHINE_Extruder - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { - ItemStack plate = MaterialsAlloy.INCONEL_690.getPlate(1); - RecipeUtils.addShapedRecipe( - plate, - CI.craftingToolHammer_Hard, - plate, - "plateTalonite", - "frameGtStaballoy", - "plateTalonite", - plate, - CI.craftingToolWrench, - plate, - GregtechItemList.Casing_Extruder.get(1)); - GTValues.RA.stdBuilder() - .itemInputs( - MaterialsAlloy.INCONEL_690.getPlate(4), - MaterialsAlloy.TALONITE.getPlate(2), - MaterialsAlloy.STABALLOY.getFrameBox(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GregtechItemList.Casing_Extruder.get(1L)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + plate = MaterialsAlloy.INCONEL_690.getPlate(1); + RecipeUtils.addShapedRecipe( + plate, + CI.craftingToolHammer_Hard, + plate, + "plateTalonite", + "frameGtStaballoy", + "plateTalonite", + plate, + CI.craftingToolWrench, + plate, + GregtechItemList.Casing_Extruder.get(1)); + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.INCONEL_690.getPlate(4), + MaterialsAlloy.TALONITE.getPlate(2), + MaterialsAlloy.STABALLOY.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GregtechItemList.Casing_Extruder.get(1L)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - RecipeUtils.addShapedRecipe( - plate, - CI.getTieredCircuit(5), - plate, - CI.electricPiston_IV, - IV_MACHINE_Extruder, - CI.electricPiston_IV, - plate, - CI.getTieredCircuit(5), - plate, - GregtechItemList.Industrial_Extruder.get(1)); - } + RecipeUtils.addShapedRecipe( + plate, + CI.getTieredCircuit(5), + plate, + CI.electricPiston_IV, + IV_MACHINE_Extruder, + CI.electricPiston_IV, + plate, + CI.getTieredCircuit(5), + plate, + GregtechItemList.Industrial_Extruder.get(1)); - if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialFishingPort) { - ItemStack plate = MaterialsAlloy.AQUATIC_STEEL.getPlate(1); - RecipeUtils.addShapedRecipe( - plate, - CI.craftingToolHammer_Hard, - plate, - "plateEglinSteel", - "frameGtEglinSteel", - "plateEglinSteel", - plate, - CI.craftingToolWrench, - plate, - GregtechItemList.Casing_FishPond.get(1)); - GTValues.RA.stdBuilder() - .itemInputs( - MaterialsAlloy.AQUATIC_STEEL.getPlate(4), - MaterialsAlloy.EGLIN_STEEL.getPlate(2), - MaterialsAlloy.EGLIN_STEEL.getFrameBox(1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GregtechItemList.Casing_FishPond.get(1L)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(16) - .addTo(assemblerRecipes); + plate = MaterialsAlloy.AQUATIC_STEEL.getPlate(1); + RecipeUtils.addShapedRecipe( + plate, + CI.craftingToolHammer_Hard, + plate, + "plateEglinSteel", + "frameGtEglinSteel", + "plateEglinSteel", + plate, + CI.craftingToolWrench, + plate, + GregtechItemList.Casing_FishPond.get(1)); + GTValues.RA.stdBuilder() + .itemInputs( + MaterialsAlloy.AQUATIC_STEEL.getPlate(4), + MaterialsAlloy.EGLIN_STEEL.getPlate(2), + MaterialsAlloy.EGLIN_STEEL.getFrameBox(1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GregtechItemList.Casing_FishPond.get(1L)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(assemblerRecipes); - RecipeUtils.addShapedRecipe( - plate, - CI.getTieredCircuit(5), - plate, - "wireFineElectrum", - ItemUtils.getSimpleStack(ModBlocks.blockFishTrap), - "wireFineElectrum", - plate, - CI.getTieredCircuit(5), - plate, - GregtechItemList.Industrial_FishingPond.get(1)); - } + RecipeUtils.addShapedRecipe( + plate, + CI.getTieredCircuit(5), + plate, + "wireFineElectrum", + ItemUtils.getSimpleStack(ModBlocks.blockFishTrap), + "wireFineElectrum", + plate, + CI.getTieredCircuit(5), + plate, + GregtechItemList.Industrial_FishingPond.get(1)); // Advanced Vacuum Freezer - ItemStack plate = MaterialsAlloy.LEAGRISIUM.getPlateDouble(1); + plate = MaterialsAlloy.LEAGRISIUM.getPlateDouble(1); ItemStack gear = MaterialsAlloy.INCOLOY_MA956.getGear(1); ItemStack frame = MaterialsAlloy.NITINOL_60.getFrameBox(1); ItemStack cell1 = ItemList.Reactor_Coolant_He_6.get(1); diff --git a/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java index 403198d6df..01e5a087c1 100644 --- a/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java +++ b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java @@ -4,11 +4,9 @@ import static gregtech.api.enums.Mods.GTPlusPlusEverglades; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.File; import net.minecraft.block.Block; import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.config.Configuration; import bwcrossmod.galacticgreg.MTEVoidMinerBase; import cpw.mods.fml.common.Mod; @@ -31,8 +29,6 @@ import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base; import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer; import gtPlusPlus.everglades.gen.gt.WorldGen_Ores; import gtPlusPlus.preloader.PreloaderCore; -import gtPlusPlus.xmod.gregtech.HandlerGT; -import gtPlusPlus.xmod.gregtech.api.util.GTPPConfig; @Mod( modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES, @@ -64,11 +60,6 @@ public class GTPPEverglades implements ActionListener { getEvergladesBiome().instance = instance; Everglades_Dimension.instance = instance; getEvergladesBiome().preInit(event); - - // Load/Set Custom Ore Gen - HandlerGT.sCustomWorldgenFile = new GTPPConfig( - new Configuration( - new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); } @EventHandler @@ -132,11 +123,6 @@ public class GTPPEverglades implements ActionListener { } protected synchronized void setVars(FMLPreInitializationEvent event) { - // Init WorldGen config. - HandlerGT.sCustomWorldgenFile = new GTPPConfig( - new Configuration( - new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); - if (DimensionManager.isDimensionRegistered(DimensionEverglades.DIMID)) { DimensionEverglades.DIMID = DimensionManager.getNextFreeDimId(); } @@ -164,7 +150,8 @@ public class GTPPEverglades implements ActionListener { } public void addVMDrop(Block block, int meta, float weight) { - MTEVoidMinerBase.addBlockToDimensionList(GTPPCore.EVERGLADES_ID, block, meta, weight); + MTEVoidMinerBase + .addBlockToDimensionList(gtPlusPlus.core.config.Configuration.worldgen.EVERGLADES_ID, block, meta, weight); } @EventHandler diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java index 8394bd8385..74fb6c8d54 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java @@ -12,9 +12,9 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.everglades.dimension.DimensionEverglades; public class BiomeEverglades { @@ -38,11 +38,9 @@ public class BiomeEverglades { @SuppressWarnings("unchecked") public BiomeGenEverglades() { - super(GTPPCore.EVERGLADESBIOME_ID); - // this.setBiomeID(); + super(Configuration.worldgen.EVERGLADESBIOME_ID); this.theBiomeDecorator = new CustomBiomeGenerator(); this.theBiomeDecorator.treesPerChunk = 10; - // Logger.INFO("Dark World Temperature Category: "+getTempCategory()); this.setBiomeName("Toxic Everglades"); this.topBlock = DimensionEverglades.blockTopLayer; this.fillerBlock = DimensionEverglades.blockSecondLayer; diff --git a/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java b/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java index 702a3210a2..bcdeabde03 100644 --- a/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java +++ b/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraftforge.common.DimensionManager; -import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.everglades.block.BlockEvergladesPortal; import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger; import gtPlusPlus.everglades.world.WorldProviderMod; @@ -12,7 +12,7 @@ import gtPlusPlus.everglades.world.WorldProviderMod; public class DimensionEverglades { public Object instance; - public static int DIMID = GTPPCore.EVERGLADES_ID; + public static int DIMID = Configuration.worldgen.EVERGLADES_ID; public static BlockEvergladesPortal portalBlock; public static ItemEvergladesPortalTrigger portalItem; public static Block blockTopLayer; diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java index 9ce91e3e4d..670b6b889a 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java @@ -8,8 +8,6 @@ import java.util.concurrent.ConcurrentHashMap; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import gtPlusPlus.xmod.gregtech.HandlerGT; - public abstract class WorldGen_GT { public final String mWorldGenName; @@ -18,7 +16,7 @@ public abstract class WorldGen_GT { public WorldGen_GT(String aName, List aList, boolean aDefault) { this.mWorldGenName = aName; - this.mEnabled = HandlerGT.sCustomWorldgenFile.get("worldgen", this.mWorldGenName, aDefault); + this.mEnabled = aDefault; if (this.mEnabled) { aList.add(this); } @@ -36,11 +34,10 @@ public abstract class WorldGen_GT { public boolean isGenerationAllowed(World aWorld, int aDimensionType, int aAllowedDimensionType) { String aDimName = aWorld.provider.getDimensionName(); - Boolean tAllowed = (Boolean) this.mDimensionMap.get(aDimName); + Boolean tAllowed = this.mDimensionMap.get(aDimName); if (tAllowed == null) { - boolean tValue = HandlerGT.sCustomWorldgenFile - .get("worldgen.dimensions." + this.mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType); - this.mDimensionMap.put(aDimName, Boolean.valueOf(tValue)); + boolean tValue = (aDimensionType == aAllowedDimensionType); + this.mDimensionMap.put(aDimName, tValue); return tValue; } else { return tAllowed; diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java index 74aad2d996..46fef6b58c 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java @@ -22,7 +22,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.everglades.dimension.DimensionEverglades; -import gtPlusPlus.xmod.gregtech.HandlerGT; public class WorldGen_GT_Ore_Layer extends WorldGen_GT { @@ -83,18 +82,14 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { boolean GC_UNUSED3, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) { super(aName, sList, aDefault); Logger.WORLD("Creating Ore Layer Object"); - this.mOverworld = HandlerGT.sCustomWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld); - this.mNether = HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether); - this.mEnd = HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd); + this.mOverworld = aOverworld; + this.mNether = aNether; + this.mEnd = aEnd; this.mMinY = 5; - this.mMaxY = (short) 14; - this.mWeight = ((short) HandlerGT.sCustomWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight)); - this.mDensity = ((short) HandlerGT.sCustomWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "Density", aDensity)); - this.mSize = ((short) Math - .max(1, HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); + this.mMaxY = 14; + this.mWeight = (short) aWeight; + this.mDensity = (short) aDensity; + this.mSize = (short) Math.max(1, aSize); this.mPrimary = aPrimary; this.mSecondary = aSecondary; this.mBetween = aBetween; diff --git a/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java b/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java index be5fc10090..9a84bcb4b4 100644 --- a/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java +++ b/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java @@ -9,7 +9,7 @@ import org.apache.logging.log4j.Level; import cpw.mods.fml.relauncher.FMLRelaunchLog; import gregtech.common.items.MetaGeneratedItem01; import gregtech.common.items.MetaGeneratedItem03; -import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.util.minecraft.ItemUtils; public class PreloaderGTOreDict { @@ -54,7 +54,7 @@ public class PreloaderGTOreDict { } } catch (final Throwable e) { - if (GTPPCore.ConfigSwitches.showHiddenNEIItems) { + if (Configuration.debug.showHiddenNEIItems) { FMLRelaunchLog.log( "[GT++ ASM] OreDictTransformer", Level.INFO, diff --git a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java deleted file mode 100644 index 5fa903906a..0000000000 --- a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java +++ /dev/null @@ -1,144 +0,0 @@ -package gtPlusPlus.preloader.asm; - -import java.io.File; -import java.util.ArrayList; - -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; - -import org.apache.logging.log4j.Level; - -import cpw.mods.fml.common.FMLLog; -import gtPlusPlus.preloader.PreloaderLogger; - -public class AsmConfig { - - public static Configuration config; - - public static boolean enableOreDictPatch; - public static boolean enableGtTooltipFix; - public static boolean enableGtNbtFix; - public static boolean enableGtCharcoalPitFix; - public static boolean enableCofhPatch; - public static boolean enableTcAspectSafety; - public static boolean enabledLwjglKeybindingFix; - public static boolean enabledFixEntitySetHealth; - public static boolean enableThaumicTinkererRepairFix; - - public static boolean disableAllLogging; - public static boolean debugMode; - - static { - config = new Configuration(new File("config/GTplusplus/asm.cfg")); - syncConfig(true); - } - - public static void syncConfig(boolean load) { - ArrayList<String> propOrder = new ArrayList<>(); - ArrayList<String> propOrderDebug = new ArrayList<>(); - - try { - if (!config.isChild && load) { - config.load(); - } - - Property prop; - - // Debug - prop = config.get("debug", "disableAllLogging", true); - prop.comment = "Disables ALL logging from GT++."; - prop.setLanguageKey("gtpp.disableAllLogging") - .setRequiresMcRestart(false); - disableAllLogging = prop.getBoolean(true); - propOrderDebug.add(prop.getName()); - - prop = config.get("debug", "debugMode", false); - prop.comment = "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)"; - prop.setLanguageKey("gtpp.debugMode") - .setRequiresMcRestart(false); - debugMode = prop.getBoolean(false); - propOrderDebug.add(prop.getName()); - - prop = config.get("debug", "enabledFixEntitySetHealth", false); - prop.comment = "Enable/Disable entity setHealth() fix."; - prop.setLanguageKey("gtpp.enabledFixEntitySetHealth") - .setRequiresMcRestart(true); - enabledFixEntitySetHealth = prop.getBoolean(false); - propOrderDebug.add(prop.getName()); - - prop = config.get("debug", "enableGtNbtFix", true); - prop.comment = "Enable/Disable GT NBT Persistency Fix"; - prop.setLanguageKey("gtpp.enableGtNbtFix") - .setRequiresMcRestart(true); - enableGtNbtFix = prop.getBoolean(true); - propOrderDebug.add(prop.getName()); - - prop = config.get("debug", "enableCofhPatch", false); - prop.comment = "Enable/Disable COFH OreDictionaryArbiter Patch (Useful for Development)"; - prop.setLanguageKey("gtpp.enableCofhPatch") - .setRequiresMcRestart(true); - enableCofhPatch = prop.getBoolean(false); - propOrderDebug.add(prop.getName()); - - prop = config.get("debug", "enableOreDictPatch", false); - prop.comment = "Enable/Disable Forge OreDictionary Patch (Useful for Development)"; - prop.setLanguageKey("gtpp.enableOreDictPatch") - .setRequiresMcRestart(true); - enableOreDictPatch = prop.getBoolean(false); - propOrderDebug.add(prop.getName()); - - prop = config.get("debug", "enableThaumicTinkererRepairFix", false); - prop.comment = "Enable/Disable Patch for Thaumic Repairer"; - prop.setLanguageKey("gtpp.enableThaumicTinkererRepairFix") - .setRequiresMcRestart(true); - enableThaumicTinkererRepairFix = prop.getBoolean(false); - propOrderDebug.add(prop.getName()); - - // General Features - prop = config.get("general", "enabledLwjglKeybindingFix", true); - prop.comment = "Prevents the game crashing from having invalid keybinds. https://github.com/alkcorp/GTplusplus/issues/544"; - prop.setLanguageKey("gtpp.enabledLwjglKeybindingFix") - .setRequiresMcRestart(true); - enabledLwjglKeybindingFix = prop.getBoolean(true); - propOrder.add(prop.getName()); - - prop = config.get("general", "enableGtTooltipFix", true); - prop.comment = "Enable/Disable Custom GT Tooltips"; - prop.setLanguageKey("gtpp.enableGtTooltipFix") - .setRequiresMcRestart(true); - enableGtTooltipFix = prop.getBoolean(true); - propOrder.add(prop.getName()); - - prop = config.get("general", "enableGtCharcoalPitFix", true); - prop.comment = "Makes the Charcoal Pile Igniter work better."; - prop.setLanguageKey("gtpp.enableGtCharcoalPitFix") - .setRequiresMcRestart(true); - enableGtCharcoalPitFix = prop.getBoolean(true); - propOrder.add(prop.getName()); - - // TC Aspect Safety - prop = config.get("general", "enableTcAspectSafety", true); - prop.comment = "Fixes small oversights in Thaumcraft 4."; - prop.setLanguageKey("gtpp.enableTcAspectSafety") - .setRequiresMcRestart(true); - enableTcAspectSafety = prop.getBoolean(true); - propOrder.add(prop.getName()); - - config.setCategoryPropertyOrder("general", propOrder); - config.setCategoryPropertyOrder("debug", propOrderDebug); - if (config.hasChanged()) { - config.save(); - } - - PreloaderLogger.INFO("Gt Nbt Fix - Enabled: " + enableGtNbtFix); - PreloaderLogger.INFO("Gt Tooltip Fix - Enabled: " + enableGtTooltipFix); - PreloaderLogger.INFO("COFH Patch - Enabled: " + enableCofhPatch); - PreloaderLogger.INFO("Thaumcraft Aspect Safety Patch - Enabled: " + enableTcAspectSafety); - PreloaderLogger - .INFO("Fix bad usage of EntityLivingBase.setHealth Patch - Enabled: " + enabledFixEntitySetHealth); - - } catch (Exception var3) { - FMLLog.log(Level.ERROR, var3, "GT++ ASM had a problem loading it's config", new Object[0]); - } - } -} diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index dc033514f1..4fb4225d26 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -9,9 +9,9 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import gregtech.asm.GTCorePlugin; +import gtPlusPlus.core.config.ASMConfiguration; import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.preloader.PreloaderLogger; -import gtPlusPlus.preloader.asm.AsmConfig; import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor; public class Preloader_Transformer_Handler implements IClassTransformer { @@ -47,7 +47,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer { public byte[] transform(String name, String transformedName, byte[] basicClass) { // Fix LWJGL index array out of bounds on keybinding IDs if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS)) - && AsmConfig.enabledLwjglKeybindingFix + && ASMConfiguration.general.enabledLwjglKeybindingFix && !GTCorePlugin.islwjgl3Present()) { boolean isClientSettingsClass = !transformedName.equals(LWJGL_KEYBOARD); PreloaderLogger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName); @@ -56,7 +56,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer { } // Fix the OreDictionary - Forge - if (transformedName.equals(FORGE_ORE_DICTIONARY) && AsmConfig.enableOreDictPatch) { + if (transformedName.equals(FORGE_ORE_DICTIONARY) && ASMConfiguration.debug.enableOreDictPatch) { PreloaderLogger.INFO("OreDictTransformer", "Transforming " + transformedName); ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES); new ClassReader(basicClass).accept(new OreDictionaryVisitor(classWriter), 0); @@ -65,7 +65,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer { // Fix the OreDictionary COFH if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER) - && (AsmConfig.enableCofhPatch || PreloaderCore.DEV_ENVIRONMENT)) { + && (ASMConfiguration.debug.enableCofhPatch || PreloaderCore.DEV_ENVIRONMENT)) { PreloaderLogger.INFO("COFH", "Transforming " + transformedName); return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter() .toByteArray(); @@ -80,7 +80,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer { // Fix Thaumcraft stuff // Patching ItemWispEssence to allow invalid item handling - if (transformedName.equals(THAUMCRAFT_ITEM_WISP_ESSENCE) && AsmConfig.enableTcAspectSafety) { + if (transformedName.equals(THAUMCRAFT_ITEM_WISP_ESSENCE) && ASMConfiguration.general.enableTcAspectSafety) { PreloaderLogger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName); return new ClassTransformer_TC_ItemWispEssence(basicClass, !PreloaderCore.DEV_ENVIRONMENT).getWriter() .toByteArray(); diff --git a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java index 4ccde441b3..e6b7740599 100644 --- a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java +++ b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java @@ -17,7 +17,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTRecipe; import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; @@ -36,7 +36,7 @@ public class RecipeRemovals { // Doesn't actually remove recipes, just hide them private static void removeCrudeTurbineRotors() { int aRemoved = 0; - int CUT = GTPPCore.turbineCutoffBase; + int CUT = Configuration.gregtech.turbineCutoffBase; Item aU; Collection<GTRecipe> aAssRecipes = RecipeMaps.assemblerRecipes.getAllRecipes(); // 170, 172, 174, 176 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; import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; @@ -32,19 +33,19 @@ public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements public MTERocketFuelGeneratorBase(final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription, final ITexture... aTextures) { super(aID, aName, aNameRegional, aTier, 3, aDescription, aTextures); - pollMin = (int) (GTPPCore.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); - pollMax = (int) (GTPPCore.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMin = (int) (Configuration.pollution.baseMinPollutionPerSecondRocketFuelGenerator + * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMax = (int) (Configuration.pollution.baseMaxPollutionPerSecondRocketFuelGenerator + * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); } public MTERocketFuelGeneratorBase(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); - pollMin = (int) (GTPPCore.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); - pollMax = (int) (GTPPCore.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMin = (int) (Configuration.pollution.baseMinPollutionPerSecondRocketFuelGenerator + * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); + pollMax = (int) (Configuration.pollution.baseMaxPollutionPerSecondRocketFuelGenerator + * Configuration.pollution.pollutionReleasedByTierRocketFuelGenerator[mTier]); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index f19263bb57..a0ee2891a2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -13,11 +13,11 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.config.Configuration; public class TexturesGtBlock { - private static final boolean mAnimated = GTPPCore.ConfigSwitches.enableAnimatedTextures; + private static final boolean mAnimated = Configuration.visual.enableAnimatedTextures; private static final ArrayList<Runnable> mCustomiconMap = new ArrayList<>(); /* diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java index b3a367bcaf..c16cec179e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEBoilerBase.java @@ -24,6 +24,7 @@ import gregtech.api.objects.GTItemStack; import gregtech.api.objects.GTRenderedTexture; import gregtech.api.util.GTOreDictUnificator; import gregtech.common.tileentities.boilers.MTEBoiler; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; @@ -37,14 +38,14 @@ public class MTEBoilerBase extends MTEBoiler { aID, "electricboiler." + tier + ".tier.single", aNameRegional, - "Produces " + (GTPPCore.ConfigSwitches.boilerSteamPerSecond * tier) + "L of Steam per second"); - this.steamPerSecond = (GTPPCore.ConfigSwitches.boilerSteamPerSecond * tier); + "Produces " + (Configuration.machines.boilerSteamPerSecond * tier) + "L of Steam per second"); + this.steamPerSecond = (Configuration.machines.boilerSteamPerSecond * tier); this.tier = tier; } public MTEBoilerBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); - this.steamPerSecond = (GTPPCore.ConfigSwitches.boilerSteamPerSecond * aTier); + this.steamPerSecond = (Configuration.machines.boilerSteamPerSecond * aTier); this.tier = aTier; } @@ -231,8 +232,8 @@ public class MTEBoilerBase extends MTEBoiler { @Override protected int getPollution() { - return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondBoiler - * GTPPCore.ConfigSwitches.pollutionReleasedByTierBoiler[this.tier]); + return (int) (Configuration.pollution.basePollutionPerSecondBoiler + * Configuration.pollution.pollutionReleasedByTierBoiler[this.tier]); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java index 4fac228f4f..e84f4763cf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java @@ -18,6 +18,7 @@ import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTModHandler; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -160,7 +161,7 @@ public class MTEGeothermalGenerator extends MTEBasicGenerator { @Override public int getPollution() { - return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondGeothermalGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierGeothermalGenerator[mTier]); + return (int) (Configuration.pollution.basePollutionPerSecondGeothermalGenerator + * Configuration.pollution.pollutionReleasedByTierGeothermalGenerator[mTier]); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java index a639ffbeab..4cbc1205f8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java @@ -19,6 +19,7 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; public class MTESemiFluidGenerator extends MTEBasicGenerator { @@ -37,8 +38,8 @@ public class MTESemiFluidGenerator extends MTEBasicGenerator { @Override public int getPollution() { - return (int) (GTPPCore.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator - * GTPPCore.ConfigSwitches.pollutionReleasedByTierSemiFluidGenerator[this.mTier]); + return (int) (Configuration.pollution.basePollutionPerSecondSemiFluidGenerator + * Configuration.pollution.pollutionReleasedByTierSemiFluidGenerator[this.mTier]); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java index 67a0c349e9..6988d2f43b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java @@ -21,6 +21,7 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; +import gregtech.GTMod; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; @@ -75,12 +76,12 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent), new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) }); - mPollutionEnabled = PollutionUtils.isPollutionEnabled(); + mPollutionEnabled = GTMod.gregtechproxy.mPollution; } public MTEAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 2, aDescription, aTextures, 2, 0); - mPollutionEnabled = PollutionUtils.isPollutionEnabled(); + mPollutionEnabled = GTMod.gregtechproxy.mPollution; } @Override @@ -240,9 +241,9 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { // Only check every 30s. if (!isIdle && aTick % (20L * 30) == 0L) { - mPollutionEnabled = PollutionUtils.isPollutionEnabled(); + mPollutionEnabled = GTMod.gregtechproxy.mPollution; // Clear out pollution if it's disabled, because I am a nice gal. - if (!PollutionUtils.isPollutionEnabled()) { + if (!GTMod.gregtechproxy.mPollution) { PollutionUtils.nullifyPollution(this.getBaseMetaTileEntity()); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java index b87403d17e..2521fb703f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java @@ -6,6 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import gregtech.GTMod; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -270,7 +271,7 @@ public class MTEPollutionCreator extends GTPPMetaTileEntity { public int pollutionMultiplier = 1; private void showPollution(final World worldIn, final EntityPlayer playerIn) { - if (!PollutionUtils.isPollutionEnabled()) { + if (!GTMod.gregtechproxy.mPollution) { PlayerUtils.messagePlayer(playerIn, "This block is useless, Pollution is disabled."); } else { addPollution(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java index 6d599b60b9..747663f4cb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java @@ -6,6 +6,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import gregtech.GTMod; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -270,7 +271,7 @@ public class MTEPollutionDetector extends GTPPMetaTileEntity { } private void showPollution(final World worldIn, final EntityPlayer playerIn) { - if (!PollutionUtils.isPollutionEnabled()) { + if (!GTMod.gregtechproxy.mPollution) { PlayerUtils.messagePlayer(playerIn, "This block is useless, Pollution is disabled."); } else { PlayerUtils.messagePlayer(playerIn, "This chunk contains " + getCurrentChunkPollution() + " pollution."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java index 9f0b6d6be9..387475d4f2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java @@ -42,7 +42,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -168,7 +168,7 @@ public class MTEAmazonPackager extends GTPPMultiBlockBase<MTEAmazonPackager> imp @Override public int getPollutionPerSecond(ItemStack arg0) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiPackager; + return Configuration.pollution.pollutionPerSecondMultiPackager; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java index db36800f42..031e8cfe11 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java @@ -34,6 +34,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -93,7 +94,7 @@ public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase<MTEIndustrialA @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialAlloySmelter; + return Configuration.pollution.pollutionPerSecondMultiIndustrialAlloySmelter; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java index 256e1219aa..20802032a0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java @@ -44,6 +44,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -265,7 +266,7 @@ public class MTEIndustrialArcFurnace extends GTPPMultiBlockBase<MTEIndustrialArc @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialArcFurnace; + return Configuration.pollution.pollutionPerSecondMultiIndustrialArcFurnace; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java index 86a971cb5c..b840cd9a08 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java @@ -34,6 +34,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -186,7 +187,7 @@ public class MTEIndustrialCentrifuge extends GTPPMultiBlockBase<MTEIndustrialCen @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCentrifuge; + return Configuration.pollution.pollutionPerSecondMultiIndustrialCentrifuge; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java index 1dc694e584..40a497fa06 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java @@ -38,6 +38,7 @@ import gregtech.api.util.GTStreamUtil; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchChiselBus; @@ -325,7 +326,7 @@ public class MTEIndustrialChisel extends GTPPMultiBlockBase<MTEIndustrialChisel> @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialChisel; + return Configuration.pollution.pollutionPerSecondMultiIndustrialChisel; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java index 552f90d855..afca39266c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java @@ -31,6 +31,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -198,7 +199,7 @@ public class MTEIndustrialCokeOven extends GTPPMultiBlockBase<MTEIndustrialCokeO @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCokeOven; + return Configuration.pollution.pollutionPerSecondMultiIndustrialCokeOven; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java index 5d80aac3f4..385ca224fc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java @@ -44,6 +44,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -189,7 +190,7 @@ public class MTEIndustrialCuttingMachine extends GTPPMultiBlockBase<MTEIndustria @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialCuttingMachine; + return Configuration.pollution.pollutionPerSecondMultiIndustrialCuttingMachine; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java index 0975c5fa88..eb7e6baa9c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java @@ -50,6 +50,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -187,7 +188,7 @@ public class MTEIndustrialDehydrator extends GTPPMultiBlockBase<MTEIndustrialDeh @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialDehydrator; + return Configuration.pollution.pollutionPerSecondMultiIndustrialDehydrator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java index 0f2b573a2e..69b7330901 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java @@ -29,6 +29,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -166,7 +167,7 @@ public class MTEIndustrialExtruder extends GTPPMultiBlockBase<MTEIndustrialExtru @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialExtruder; + return Configuration.pollution.pollutionPerSecondMultiIndustrialExtruder; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java index 9c22e81024..8dd62202b3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java @@ -30,6 +30,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -174,7 +175,7 @@ public class MTEIndustrialFluidHeater extends GTPPMultiBlockBase<MTEIndustrialFl @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge; + return Configuration.pollution.pollutionPerSecondMultiIndustrialFluidHeater; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java index b809feaa6e..a8bf12bfa0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java @@ -45,6 +45,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -226,7 +227,7 @@ public class MTEIndustrialForgeHammer extends GTPPMultiBlockBase<MTEIndustrialFo @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialForgeHammer; + return Configuration.pollution.pollutionPerSecondMultiIndustrialForgeHammer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java index 635e5889f5..4df9c8ce78 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java @@ -47,6 +47,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -359,7 +360,7 @@ public class MTEIndustrialMacerator extends GTPPMultiBlockBase<MTEIndustrialMace @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMacerator; + return Configuration.pollution.pollutionPerSecondMultiIndustrialMacerator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java index e733168fca..3526146ab6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java @@ -35,6 +35,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -187,7 +188,7 @@ public class MTEIndustrialMixer extends GTPPMultiBlockBase<MTEIndustrialMixer> i @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMixer; + return Configuration.pollution.pollutionPerSecondMultiIndustrialMixer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java index 4ffd484163..818ab3674a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java @@ -28,6 +28,7 @@ import gregtech.api.recipe.RecipeMap; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -224,7 +225,7 @@ public class MTEIndustrialMolecularTransformer extends GTPPMultiBlockBase<MTEInd @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer; + return Configuration.pollution.pollutionPerSecondMultiMolecularTransformer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java index fae1d920a8..f4df2c3c1c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java @@ -63,6 +63,7 @@ import gregtech.common.tileentities.machines.IDualInputInventory; import gregtech.common.tileentities.machines.MTEHatchCraftingInputME; import gregtech.common.tileentities.machines.MTEHatchInputME; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSolidifier; @@ -224,13 +225,13 @@ public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialM public int getPollutionPerSecond(final ItemStack aStack) { switch (machineMode) { case MACHINEMODE_METAL -> { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal; + return Configuration.pollution.pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal; } case MACHINEMODE_FLUID -> { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid; + return Configuration.pollution.pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid; } default -> { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc; + return Configuration.pollution.pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc; } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java index f41ebdd292..75d3e6df6f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java @@ -42,6 +42,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -192,8 +193,8 @@ public class MTEIndustrialPlatePress extends GTPPMultiBlockBase<MTEIndustrialPla @Override public int getPollutionPerSecond(final ItemStack aStack) { if (machineMode == MACHINEMODE_FORMER) - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeForming; - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeBending; + return Configuration.pollution.pollutionPerSecondMultiIndustrialPlatePress_ModeForming; + return Configuration.pollution.pollutionPerSecondMultiIndustrialPlatePress_ModeBending; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java index 6dbd019887..d8ba5e55c7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java @@ -32,6 +32,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -193,7 +194,7 @@ public class MTEIndustrialSifter extends GTPPMultiBlockBase<MTEIndustrialSifter> @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialSifter; + return Configuration.pollution.pollutionPerSecondMultiIndustrialSifter; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java index b494d0bfa7..c212fbadd2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java @@ -30,6 +30,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -161,7 +162,7 @@ public class MTEIndustrialThermalCentrifuge extends GTPPMultiBlockBase<MTEIndust @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge; + return Configuration.pollution.pollutionPerSecondMultiIndustrialThermalCentrifuge; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java index b47ccf583f..920859616b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java @@ -35,6 +35,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -215,7 +216,7 @@ public class MTEIndustrialVacuumFreezer extends GTPPMultiBlockBase<MTEIndustrial @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialVacuumFreezer; + return Configuration.pollution.pollutionPerSecondMultiIndustrialVacuumFreezer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java index 35d0867cee..9cca3ec17d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java @@ -59,6 +59,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -248,8 +249,8 @@ public class MTEIndustrialWashPlant extends GTPPMultiBlockBase<MTEIndustrialWash @Override public int getPollutionPerSecond(final ItemStack aStack) { if (machineMode == MACHINEMODE_CHEMBATH) - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath; - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeWasher; + return Configuration.pollution.pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath; + return Configuration.pollution.pollutionPerSecondMultiIndustrialWashPlant_ModeWasher; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java index 292fd1041b..8ceb3e8162 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java @@ -33,6 +33,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -185,7 +186,7 @@ public class MTEIndustrialWireMill extends GTPPMultiBlockBase<MTEIndustrialWireM @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialWireMill; + return Configuration.pollution.pollutionPerSecondMultiIndustrialWireMill; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java index 23e587ef2f..0df9417f32 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java @@ -51,6 +51,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; @@ -400,7 +401,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvi @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIsaMill; + return Configuration.pollution.pollutionPerSecondMultiIsaMill; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java index 139ea00d82..86e1c9e624 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java @@ -32,6 +32,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -67,7 +68,7 @@ public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase<MTENuclear @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAutoCrafter; + return Configuration.pollution.pollutionPerSecondNuclearSaltProcessingPlant; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java index 487e22f3f2..e59717127d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java @@ -29,6 +29,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -152,7 +153,7 @@ public class MTEndustrialElectrolyzer extends GTPPMultiBlockBase<MTEndustrialEle @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialElectrolyzer; + return Configuration.pollution.pollutionPerSecondMultiIndustrialElectrolyzer; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java index a5ff70f047..c74eb89a07 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java @@ -53,6 +53,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.MTEHatchOutputME; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -304,8 +305,8 @@ public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillati @Override public int getPollutionPerSecond(ItemStack aStack) { if (this.mMode == Mode.Distillery) - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDistillery; - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDT; + return Configuration.pollution.pollutionPerSecondMultiAdvDistillationTower_ModeDistillery; + return Configuration.pollution.pollutionPerSecondMultiAdvDistillationTower_ModeDT; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java index 4cedf91f0f..af2229f038 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java @@ -49,6 +49,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -254,7 +255,7 @@ public class MTEAdvEBF extends GTPPMultiBlockBase<MTEAdvEBF> implements ISurviva @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvEBF; + return Configuration.pollution.pollutionPerSecondMultiAdvEBF; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java index 109022932d..5590185fb7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java @@ -26,6 +26,7 @@ import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -155,7 +156,7 @@ public class MTEAdvImplosionCompressor extends GTPPMultiBlockBase<MTEAdvImplosio @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAdvImplosion; + return Configuration.pollution.pollutionPerSecondMultiAdvImplosion; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java index 20c14d1ed2..970f975a70 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java @@ -36,6 +36,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -212,7 +213,7 @@ public class MTEAlloyBlastSmelter extends GTPPMultiBlockBase<MTEAlloyBlastSmelte @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiABS; + return Configuration.pollution.pollutionPerSecondMultiABS; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java index 41b9abf12e..2fb4a7b5c7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java @@ -30,6 +30,7 @@ import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -79,7 +80,7 @@ public class MTEAutoCrafter extends GTPPMultiBlockBase<MTEAutoCrafter> implement @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAutoCrafter; + return Configuration.pollution.pollutionPerSecondMultiAutoCrafter; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java index 051daee9a3..7f1098b8ac 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java @@ -39,6 +39,7 @@ import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.chemistry.IonParticles; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; @@ -296,7 +297,7 @@ public class MTECyclotron extends GTPPMultiBlockBase<MTECyclotron> implements IS @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiCyclotron; + return Configuration.pollution.pollutionPerSecondMultiCyclotron; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java index e115fe5af1..a241238e42 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java @@ -36,6 +36,7 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchElementalDataOrbHolder; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -312,7 +313,7 @@ public class MTEElementalDuplicator extends GTPPMultiBlockBase<MTEElementalDupli @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer; + return Configuration.pollution.pollutionPerSecondElementalDuplicator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java index 8e052870fa..f4e9bac434 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java @@ -43,6 +43,7 @@ import gregtech.api.util.GTRecipe; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -181,7 +182,7 @@ public class MTEFrothFlotationCell extends GTPPMultiBlockBase<MTEFrothFlotationC @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiFrothFlotationCell; + return Configuration.pollution.pollutionPerSecondMultiFrothFlotationCell; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java index 9751218aae..4b9b5c0ae4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java @@ -48,6 +48,7 @@ import gregtech.api.util.OverclockCalculator; import gregtech.api.util.ParallelHelper; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -277,7 +278,7 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFi @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialFishingPond; + return Configuration.pollution.pollutionPerSecondMultiIndustrialFishingPond; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java index 0adfa82732..c3bf843fd3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java @@ -45,6 +45,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gregtech.api.util.ParallelHelper; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -342,7 +343,7 @@ public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase<MTEIndustrialRo @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiIndustrialRockBreaker; + return Configuration.pollution.pollutionPerSecondMultiIndustrialRockBreaker; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java index 141fbff41f..9b4dc8ee47 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java @@ -40,6 +40,7 @@ import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.util.GTRecipe; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -297,7 +298,7 @@ public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase<MTELargeSemif @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiLargeSemiFluidGenerator; + return Configuration.pollution.pollutionPerSecondMultiLargeSemiFluidGenerator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java index 22de5388f9..913a54eea5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java @@ -57,6 +57,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.config.MachineStats; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -220,7 +221,7 @@ public class MTEMassFabricator extends GTPPMultiBlockBase<MTEMassFabricator> imp @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiMassFabricator; + return Configuration.pollution.pollutionPerSecondMultiMassFabricator; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java index 2160f43546..f7f992e191 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java @@ -31,6 +31,7 @@ import gregtech.api.recipe.RecipeMap; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -198,7 +199,7 @@ public class MTERefinery extends GTPPMultiBlockBase<MTERefinery> implements ISur @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiRefinery; + return Configuration.pollution.pollutionPerSecondMultiRefinery; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java index 8889cbd501..b98d6ab662 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java @@ -45,6 +45,7 @@ import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.ParallelHelper; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -272,7 +273,7 @@ public class MTEThermalBoiler extends GTPPMultiBlockBase<MTEThermalBoiler> imple @Override public int getPollutionPerSecond(ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiThermalBoiler; + return Configuration.pollution.pollutionPerSecondMultiThermalBoiler; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java index 204cd5e6b9..bb5754bef7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java @@ -76,6 +76,7 @@ import gregtech.common.tileentities.machines.MTEHatchInputBusME; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -209,7 +210,7 @@ public class MTETreeFarm extends GTPPMultiBlockBase<MTETreeFarm> implements ISur @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiTreeFarm; + return Configuration.pollution.pollutionPerSecondMultiTreeFarm; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java index 1223158f31..f2f0bcb104 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java @@ -45,6 +45,7 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.Configuration; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -309,7 +310,7 @@ public class MTEAlgaePondBase extends GTPPMultiBlockBase<MTEAlgaePondBase> imple @Override public int getPollutionPerSecond(final ItemStack aStack) { - return GTPPCore.ConfigSwitches.pollutionPerSecondMultiAlgaePond; + return Configuration.pollution.pollutionPerSecondMultiAlgaePond; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index 2de926e31f..6e471c2829 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -31,6 +31,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import gregtech.GTMod; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -192,7 +193,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT } private boolean requiresMufflers() { - if (!PollutionUtils.isPollutionEnabled()) { + if (!GTMod.gregtechproxy.mPollution) { return false; } return getPollutionPerSecond(null) > 0; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 162c9b295e..f392bff171 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -69,12 +69,12 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.config.ASMConfiguration; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.MovingAverageLong; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.preloader.asm.AsmConfig; import gtPlusPlus.xmod.gregtech.api.gui.GTPPUITextures; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase; @@ -174,7 +174,7 @@ public class GregtechMetaTileEntity_PowerSubStationController } private void checkMachineProblem(String msg) { - if (!AsmConfig.disableAllLogging) { + if (!ASMConfiguration.debug.disableAllLogging) { Logger.INFO("Power Sub-Station problem: " + msg); } } 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/registration/gregtech/GregtechRedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java index 149b9647ed..5225cd46d1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.RedstoneStrengthScale; + import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneStrengthScale; @@ -9,8 +10,7 @@ public class GregtechRedstoneStrengthScale { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Strength Scale."); - if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneStrengthScale.set(new MTERedstoneStrengthScale(31805).getStackForm(1L)); - } + GregtechItemList.RedstoneStrengthScale + .set(new MTERedstoneStrengthScale(RedstoneStrengthScale.ID).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 06328a7e30..2eec38cc27 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java @@ -12,7 +12,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; @@ -23,9 +22,8 @@ public class GregtechRocketFuelGenerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Rocket Engines."); - if (GTPPCore.ConfigSwitches.enableMachine_RocketEngines) { - run1(); - } + run1(); + } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index 4c6de56d94..91bd92f3ab 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java @@ -34,97 +34,96 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class GregtechSimpleWasher { public static void run() { - if (GTPPCore.ConfigSwitches.enableMachine_SimpleWasher) { - generateDirtyDustRecipes(); - generateDirtyCrushedRecipes(); - // Register the Simple Washer Entity. - - // The unlocalized names here have inconsistent numbering because there only used to be a simple washer - // every other tier, and they were numbered numerically. In order to maintain backwards compatibility, - // the tier numbers need to stay as they were. - List<Quad<GregtechItemList, Integer, String, String>> washers = ImmutableList.of( - new Quad<>( - GregtechItemList.SimpleDustWasher_LV, - SimpleDustWasher_LV.ID, - "simplewasher.01.tier.06", - "Simple Washer I"), - new Quad<>( - GregtechItemList.SimpleDustWasher_MV, - SimpleDustWasher_MV.ID, - "simplewasher.01.tier.02", - "Simple Washer II"), - new Quad<>( - GregtechItemList.SimpleDustWasher_HV, - SimpleDustWasher_HV.ID, - "simplewasher.01.tier.07", - "Simple Washer III"), - new Quad<>( - GregtechItemList.SimpleDustWasher_EV, - SimpleDustWasher_EV.ID, - "simplewasher.01.tier.03", - "Simple Washer IV"), - new Quad<>( - GregtechItemList.SimpleDustWasher_IV, - SimpleDustWasher_IV.ID, - "simplewasher.01.tier.08", - "Simple Washer V"), - new Quad<>( - GregtechItemList.SimpleDustWasher_LuV, - SimpleDustWasher_LuV.ID, - "simplewasher.01.tier.04", - "Simple Washer VI"), - new Quad<>( - GregtechItemList.SimpleDustWasher_ZPM, - SimpleDustWasher_ZPM.ID, - "simplewasher.01.tier.09", - "Simple Washer VII"), - new Quad<>( - GregtechItemList.SimpleDustWasher_UV, - SimpleDustWasher_UV.ID, - "simplewasher.01.tier.05", - "Simple Washer VIII")); - - GregtechItemList.SimpleDustWasher_ULV.set( - new MTEBasicMachineWithRecipe( - SimpleDustWasher_ULV.ID, - "simplewasher.01.tier.01", - "Deprecated ULV Simple Washer", - 0, - new String[] { "It's like an automatic Cauldron for washing dusts.", - "§cDEPRECATED: No recipe.§r Make a Simple Washer I.", GTPPCore.GT_Tooltip.get() }, - simpleWasherRecipes, - 1, - 1, - true, - SoundResource.NONE, - SpecialEffects.NONE, - "SIMPLE_WASHER", - null).setRecipeCatalystPriority(-11) - .getStackForm(1L)); - - for (int i = 0; i < washers.size(); i++) { - Quad<GregtechItemList, Integer, String, String> washer = washers.get(i); - int tier = i + 1; - washer.getKey() - .set( - new MTEBasicMachineWithRecipe( - washer.getValue_1(), - washer.getValue_2(), - washer.getValue_3(), - tier, - new String[] { "It's like an automatic Cauldron for washing dusts.", - GTPPCore.GT_Tooltip.get() }, - simpleWasherRecipes, - 1, - 1, - true, - SoundResource.NONE, - SpecialEffects.NONE, - "SIMPLE_WASHER", - null).setRecipeCatalystPriority(-tier) - .getStackForm(1L)); - } + generateDirtyDustRecipes(); + generateDirtyCrushedRecipes(); + // Register the Simple Washer Entity. + + // The unlocalized names here have inconsistent numbering because there only used to be a simple washer + // every other tier, and they were numbered numerically. In order to maintain backwards compatibility, + // the tier numbers need to stay as they were. + List<Quad<GregtechItemList, Integer, String, String>> washers = ImmutableList.of( + new Quad<>( + GregtechItemList.SimpleDustWasher_LV, + SimpleDustWasher_LV.ID, + "simplewasher.01.tier.06", + "Simple Washer I"), + new Quad<>( + GregtechItemList.SimpleDustWasher_MV, + SimpleDustWasher_MV.ID, + "simplewasher.01.tier.02", + "Simple Washer II"), + new Quad<>( + GregtechItemList.SimpleDustWasher_HV, + SimpleDustWasher_HV.ID, + "simplewasher.01.tier.07", + "Simple Washer III"), + new Quad<>( + GregtechItemList.SimpleDustWasher_EV, + SimpleDustWasher_EV.ID, + "simplewasher.01.tier.03", + "Simple Washer IV"), + new Quad<>( + GregtechItemList.SimpleDustWasher_IV, + SimpleDustWasher_IV.ID, + "simplewasher.01.tier.08", + "Simple Washer V"), + new Quad<>( + GregtechItemList.SimpleDustWasher_LuV, + SimpleDustWasher_LuV.ID, + "simplewasher.01.tier.04", + "Simple Washer VI"), + new Quad<>( + GregtechItemList.SimpleDustWasher_ZPM, + SimpleDustWasher_ZPM.ID, + "simplewasher.01.tier.09", + "Simple Washer VII"), + new Quad<>( + GregtechItemList.SimpleDustWasher_UV, + SimpleDustWasher_UV.ID, + "simplewasher.01.tier.05", + "Simple Washer VIII")); + + GregtechItemList.SimpleDustWasher_ULV.set( + new MTEBasicMachineWithRecipe( + SimpleDustWasher_ULV.ID, + "simplewasher.01.tier.01", + "Deprecated ULV Simple Washer", + 0, + new String[] { "It's like an automatic Cauldron for washing dusts.", + "§cDEPRECATED: No recipe.§r Make a Simple Washer I.", GTPPCore.GT_Tooltip.get() }, + simpleWasherRecipes, + 1, + 1, + true, + SoundResource.NONE, + SpecialEffects.NONE, + "SIMPLE_WASHER", + null).setRecipeCatalystPriority(-11) + .getStackForm(1L)); + + for (int i = 0; i < washers.size(); i++) { + Quad<GregtechItemList, Integer, String, String> washer = washers.get(i); + int tier = i + 1; + washer.getKey() + .set( + new MTEBasicMachineWithRecipe( + washer.getValue_1(), + washer.getValue_2(), + washer.getValue_3(), + tier, + new String[] { "It's like an automatic Cauldron for washing dusts.", + GTPPCore.GT_Tooltip.get() }, + simpleWasherRecipes, + 1, + 1, + true, + SoundResource.NONE, + SpecialEffects.NONE, + "SIMPLE_WASHER", + null).setRecipeCatalystPriority(-tier) + .getStackForm(1L)); } + } private static boolean generateDirtyDustRecipes() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java index 77f169ef1c..22d32167da 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java @@ -6,7 +6,6 @@ import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_MV; import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_ULV; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTETieredTank; @@ -14,9 +13,7 @@ public class GregtechTieredFluidTanks { public static void run() { Logger.INFO("Gregtech5u Content | Registering Portable Fluid Tanks."); - if (GTPPCore.ConfigSwitches.enableMachine_FluidTanks) { - run1(); - } + run1(); } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java index b848ef1e61..35a05f3409 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.TreeFarmer_Structural; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTETreeFarmerStructural; @@ -11,9 +10,8 @@ public class GregtechTreeFarmerTE { public static void run() { Logger.INFO("Gregtech5u Content | Registering Tree Farmer Structural Block."); - if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { - run1(); - } + run1(); + } private static void run1() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java index 9854921dd4..01ae9344e0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gregtech.api.enums.MetaTileEntityIDs.WaterPump; + import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamWaterPump; @@ -7,7 +9,7 @@ public class GregtechWaterPump { public static void run() { // Water Pump Multiblock - GregtechItemList.WaterPump - .set(new MTESteamWaterPump(31085, "waterpump.controller.tier.single", "Water Pump").getStackForm(1L)); + GregtechItemList.WaterPump.set( + new MTESteamWaterPump(WaterPump.ID, "waterpump.controller.tier.single", "Water Pump").getStackForm(1L)); } } |