From bb9da48b9975cb27e3b7c538bff2853a34b36fcd Mon Sep 17 00:00:00 2001 From: miozune Date: Sun, 5 Feb 2023 01:40:43 +0900 Subject: Remove redundant flags (#529) * Remove CORE.GTNH * Remove LoadedMods.Gregtech * Remove LoadedMods.IndustrialCraft2 * Remove LoadedMods.MiscUtils * Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK * clean * Remove mention to GT versions * Fix assembler mode --- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 49 +- .../java/gtPlusPlus/core/common/CommonProxy.java | 5 - .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 29 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 179 +- .../gtPlusPlus/core/handler/EnumHelperHandler.java | 11 +- .../gtPlusPlus/core/handler/OldCircuitHandler.java | 97 - .../core/handler/Recipes/RegistrationHandler.java | 1 - src/main/java/gtPlusPlus/core/item/ModItems.java | 60 +- .../core/item/chemistry/AgriculturalChem.java | 22 +- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 4 +- .../core/item/chemistry/RocketFuels.java | 19 - .../gtPlusPlus/core/item/general/ItemGiantEgg.java | 12 +- .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 10 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 24 - src/main/java/gtPlusPlus/core/lib/LoadedMods.java | 41 +- .../java/gtPlusPlus/core/material/ELEMENT.java | 63 +- .../java/gtPlusPlus/core/material/Material.java | 7 +- .../core/recipe/LOADER_Machine_Components.java | 48 +- .../gtPlusPlus/core/recipe/RECIPES_Extruder.java | 51 - .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 387 +- .../gtPlusPlus/core/recipe/RECIPES_General.java | 73 +- .../core/recipe/RECIPES_LaserEngraver.java | 293 +- .../core/recipe/RECIPES_MachineComponents.java | 560 --- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 3836 ++++++++++---------- .../core/recipe/RECIPES_Old_Circuits.java | 562 --- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 32 - .../gtPlusPlus/core/recipe/RECIPE_Batteries.java | 8 +- .../java/gtPlusPlus/core/recipe/common/CI.java | 74 +- src/main/java/gtPlusPlus/core/util/Utils.java | 62 - .../core/util/minecraft/HazmatUtils.java | 26 +- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 18 +- .../core/util/minecraft/MaterialUtils.java | 13 +- .../util/minecraft/gregtech/PollutionUtils.java | 25 +- .../core/util/reflect/AddGregtechRecipe.java | 118 +- 34 files changed, 2392 insertions(+), 4427 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java delete mode 100644 src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java delete mode 100644 src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java (limited to 'src/main/java/gtPlusPlus/core') diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index c8c0f4ca08..140773f4ea 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -18,7 +18,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.interfaces.ITexturedBlock; import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer; import gtPlusPlus.core.item.base.itemblock.ItemBlockOre; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -106,26 +105,20 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture( blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA()); - if (aIconSet != null) { - return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; - } + return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; } if (hiddenTextureArray == null) { - if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - hiddenTextureArray = Textures.BlockIcons.GRANITES; - } else { - try { - Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES"); - if (o != null) { - hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class); - } - if (hiddenTextureArray == null) { - hiddenTextureArray = new IIconContainer[6]; - } - } catch (IllegalArgumentException | IllegalAccessException e) { + try { + Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES"); + if (o != null) { + hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class); + } + if (hiddenTextureArray == null) { hiddenTextureArray = new IIconContainer[6]; } + } catch (IllegalArgumentException | IllegalAccessException e) { + hiddenTextureArray = new IIconContainer[6]; } } return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) }; @@ -200,26 +193,20 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture( blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex], this.blockMaterial.getRGBA()); - if (aIconSet != null) { - return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; - } + return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet }; } if (hiddenTextureArray == null) { - if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - hiddenTextureArray = Textures.BlockIcons.GRANITES; - } else { - try { - Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES"); - if (o != null) { - hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class); - } - if (hiddenTextureArray == null) { - hiddenTextureArray = new IIconContainer[6]; - } - } catch (IllegalArgumentException | IllegalAccessException e) { + try { + Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES"); + if (o != null) { + hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class); + } + if (hiddenTextureArray == null) { hiddenTextureArray = new IIconContainer[6]; } + } catch (IllegalArgumentException | IllegalAccessException e) { + hiddenTextureArray = new IIconContainer[6]; } } return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) }; diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index 26bf349b93..19cf2d8356 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -50,11 +50,6 @@ public class CommonProxy { public CommonProxy() { // Should Register Gregtech Materials I've Made Utils.registerEvent(this); - if (!CORE.GTNH) { - Logger.INFO("We're using Gregtech " + Utils.getGregtechVersionAsString()); - } else { - Logger.INFO("We're using GTNH's Gregtech " + Utils.getGregtechVersionAsString()); - } } public void preInit(final FMLPreInitializationEvent e) { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java index 666c0177ee..357647c83e 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java @@ -5,7 +5,6 @@ import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; import net.minecraft.item.ItemStack; import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.ShapedRecipeObject; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -50,22 +49,20 @@ public class COMPAT_IC2 { if (ConfigSwitches.disableIC2Recipes) { - if (LoadedMods.Gregtech) { - // Fuck these right off. - RemoveRecipeQueue.add("IC2:itemCable"); - RemoveRecipeQueue.add("IC2:itemCable:1"); - RemoveRecipeQueue.add("IC2:itemCable:2"); - RemoveRecipeQueue.add("IC2:itemCable:3"); - RemoveRecipeQueue.add("IC2:itemCable:5"); - RemoveRecipeQueue.add("IC2:itemCable:6"); - RemoveRecipeQueue.add("IC2:itemCable:10"); - RemoveRecipeQueue.add("IC2:itemCable:13"); - // RemoveRecipeQueue.add(itemCropnalyzer); - // RemoveRecipeQueue.add(itemSolarHelmet); + // Fuck these right off. + RemoveRecipeQueue.add("IC2:itemCable"); + RemoveRecipeQueue.add("IC2:itemCable:1"); + RemoveRecipeQueue.add("IC2:itemCable:2"); + RemoveRecipeQueue.add("IC2:itemCable:3"); + RemoveRecipeQueue.add("IC2:itemCable:5"); + RemoveRecipeQueue.add("IC2:itemCable:6"); + RemoveRecipeQueue.add("IC2:itemCable:10"); + RemoveRecipeQueue.add("IC2:itemCable:13"); + // RemoveRecipeQueue.add(itemCropnalyzer); + // RemoveRecipeQueue.add(itemSolarHelmet); - // AddRecipeQueue.add(Cropnalyzer); - // AddRecipeQueue.add(SolarHelmet); - } + // AddRecipeQueue.add(Cropnalyzer); + // AddRecipeQueue.add(SolarHelmet); } } } diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 27816d2a42..5e78c2ed2d 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -1,7 +1,5 @@ package gtPlusPlus.core.handler; -import static gtPlusPlus.core.lib.LoadedMods.Gregtech; - import java.util.LinkedList; import java.util.Queue; import java.util.Set; @@ -35,7 +33,6 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; -import gtPlusPlus.core.recipe.RECIPES_Extruder; import gtPlusPlus.core.recipe.RECIPES_GREGTECH; import gtPlusPlus.core.recipe.RECIPES_LaserEngraver; import gtPlusPlus.core.recipe.ShapedRecipeObject; @@ -73,98 +70,90 @@ public class COMPAT_HANDLER { } public static void registerGregtechMachines() { - if (Gregtech) { - - // Debug - GregtechItemList.Garbage_Collector_Debug_Machine.set( - new GregtechMetaGarbageCollector( - "garbagecollector.01.tier.single", - "JVM Garbage Collector", - "Useful for debugging or smoother performance on local servers").getStackForm(1L)); - - // Free IDs - /* - * --- 859 to 868 --- 911 to 940 - */ + // Debug + GregtechItemList.Garbage_Collector_Debug_Machine.set( + new GregtechMetaGarbageCollector( + "garbagecollector.01.tier.single", + "JVM Garbage Collector", + "Useful for debugging or smoother performance on local servers").getStackForm(1L)); - new RECIPES_LaserEngraver(); - new RECIPES_Extruder(); - GregtechGeneratorsULV.run(); - GregtechEnergyBuffer.run(); - GregtechLFTR.run(); - GregtechSteamCondenser.run(); - GregtechSafeBlock.run(); - // GregtechSuperConductionPoint.run(); - GregtechIronBlastFurnace.run(); - GregtechIndustrialCentrifuge.run(); - GregtechIndustrialCokeOven.run(); - GregtechIndustrialPlatePress.run(); - GregtechRocketFuelGenerator.run(); - GregtechIndustrialElectrolyzer.run(); - GregtechIndustrialMacerator.run(); - GregtechIndustrialWiremill.run(); - GregtechIndustrialMassFabricator.run(); - GregtechIndustrialBlastSmelter.run(); - GregtechQuantumForceTransformer.run(); - GregtechSolarGenerators.run(); - GregtechPowerSubStation.run(); - GregtechDehydrator.run(); - GregtechAdvancedBoilers.run(); - GregtechPollutionDevices.run(); - GregtechTieredFluidTanks.run(); - // GregtechIndustrialMultiTank.run(); - GregtechGeothermalThermalGenerator.run(); - Gregtech4Content.run(); - GregtechIndustrialFuelRefinery.run(); - GregtechTreeFarmerTE.run(); - GregtechIndustrialTreeFarm.run(); - GregtechIndustrialSifter.run(); - GregtechSimpleWasher.run(); - GregtechRTG.run(); - GregtechCyclotron.run(); - GregtechHiAmpTransformer.run(); - GregtechIndustrialThermalCentrifuge.run(); - GregtechIndustrialWashPlant.run(); - GregtechSemiFluidgenerators.run(); - GregtechWirelessChargers.run(); - GregtechIndustrialGeneratorArray.run(); - GregtechIndustrialCuttingFactory.run(); - // GregtechMiniRaFusion.run(); - GregtechComponentAssembler.run(); - GregtechTeslaTower.run(); - GregtechSuperChests.run(); - GregtechIndustrialFishPond.run(); - GregtechTieredChunkloaders.run(); - GregtechIndustrialExtruder.run(); - GregtechIndustrialMultiMachine.run(); - // GregtechBedrockPlatforms.run(); - GregtechBufferDynamos.run(); - GregtechAmazonWarehouse.run(); - GregtechFactoryGradeReplacementMultis.run(); - GregtechThaumcraftDevices.run(); - GregtechThreadedBuffers.run(); - GregtechIndustrialMixer.run(); - GregtechCustomHatches.run(); - // GregtechNaqReactor.run(); - GregtechIndustrialArcFurnace.run(); - GregtechSolarTower.run(); - GregtechLargeTurbinesAndHeatExchanger.run(); - GregtechPowerBreakers.run(); - GregtechFluidReactor.run(); - GregtechAlgaeContent.run(); - GregtechIndustrialAlloySmelter.run(); - GregtechIsaMill.run(); - GregtechSteamMultis.run(); - GregtechIndustrialForgeHammer.run(); - GregtechMolecularTransformer.run(); - GregtechIndustrialElementDuplicator.run(); - GregtechIndustrialRockBreaker.run(); - GregtechIndustrialChisel.run(); - GregtechIndustrialFluidHeater.run(); + // Free IDs + /* + * --- 859 to 868 --- 911 to 940 + */ - // New Horizons Content - NewHorizonsAccelerator.run(); - } + new RECIPES_LaserEngraver(); + GregtechGeneratorsULV.run(); + GregtechEnergyBuffer.run(); + GregtechLFTR.run(); + GregtechSteamCondenser.run(); + GregtechSafeBlock.run(); + GregtechIronBlastFurnace.run(); + GregtechIndustrialCentrifuge.run(); + GregtechIndustrialCokeOven.run(); + GregtechIndustrialPlatePress.run(); + GregtechRocketFuelGenerator.run(); + GregtechIndustrialElectrolyzer.run(); + GregtechIndustrialMacerator.run(); + GregtechIndustrialWiremill.run(); + GregtechIndustrialMassFabricator.run(); + GregtechIndustrialBlastSmelter.run(); + GregtechQuantumForceTransformer.run(); + GregtechSolarGenerators.run(); + GregtechPowerSubStation.run(); + GregtechDehydrator.run(); + GregtechAdvancedBoilers.run(); + GregtechPollutionDevices.run(); + GregtechTieredFluidTanks.run(); + // GregtechIndustrialMultiTank.run(); + GregtechGeothermalThermalGenerator.run(); + Gregtech4Content.run(); + GregtechIndustrialFuelRefinery.run(); + GregtechTreeFarmerTE.run(); + GregtechIndustrialTreeFarm.run(); + GregtechIndustrialSifter.run(); + GregtechSimpleWasher.run(); + GregtechRTG.run(); + GregtechCyclotron.run(); + GregtechHiAmpTransformer.run(); + GregtechIndustrialThermalCentrifuge.run(); + GregtechIndustrialWashPlant.run(); + GregtechSemiFluidgenerators.run(); + GregtechWirelessChargers.run(); + GregtechIndustrialGeneratorArray.run(); + GregtechIndustrialCuttingFactory.run(); + // GregtechMiniRaFusion.run(); + GregtechComponentAssembler.run(); + GregtechTeslaTower.run(); + GregtechSuperChests.run(); + GregtechIndustrialFishPond.run(); + GregtechTieredChunkloaders.run(); + GregtechIndustrialExtruder.run(); + GregtechIndustrialMultiMachine.run(); + // GregtechBedrockPlatforms.run(); + GregtechBufferDynamos.run(); + GregtechAmazonWarehouse.run(); + GregtechFactoryGradeReplacementMultis.run(); + GregtechThaumcraftDevices.run(); + GregtechThreadedBuffers.run(); + GregtechIndustrialMixer.run(); + GregtechCustomHatches.run(); + // GregtechNaqReactor.run(); + GregtechIndustrialArcFurnace.run(); + GregtechSolarTower.run(); + GregtechLargeTurbinesAndHeatExchanger.run(); + GregtechPowerBreakers.run(); + GregtechFluidReactor.run(); + GregtechAlgaeContent.run(); + GregtechIndustrialAlloySmelter.run(); + GregtechIsaMill.run(); + GregtechSteamMultis.run(); + GregtechIndustrialForgeHammer.run(); + GregtechMolecularTransformer.run(); + GregtechIndustrialElementDuplicator.run(); + GregtechIndustrialRockBreaker.run(); + GregtechIndustrialChisel.run(); + GregtechIndustrialFluidHeater.run(); } // InterMod @@ -203,9 +192,7 @@ public class COMPAT_HANDLER { if (LoadedMods.CompactWindmills) { COMPAT_CompactWindmills.OreDict(); } - if (LoadedMods.IndustrialCraft2) { - COMPAT_IC2.OreDict(); - } + COMPAT_IC2.OreDict(); if (LoadedMods.PamsHarvestcraft) { COMPAT_HarvestCraft.OreDict(); } diff --git a/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java b/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java index c22cb3bc56..746b2bb814 100644 --- a/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java @@ -1,19 +1,12 @@ package gtPlusPlus.core.handler; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.gregtech.HANDLER_GT; import gtPlusPlus.xmod.ic2.CustomInternalName; public class EnumHelperHandler { public static void init() { - - if (LoadedMods.IndustrialCraft2) { - CustomInternalName.init(); - } - - if (LoadedMods.Gregtech) { - HANDLER_GT.addNewOrePrefixes(); - } + CustomInternalName.init(); + HANDLER_GT.addNewOrePrefixes(); } } diff --git a/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java b/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java deleted file mode 100644 index 4881479be3..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java +++ /dev/null @@ -1,97 +0,0 @@ -package gtPlusPlus.core.handler; - -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableOldGTcircuits; - -import java.lang.reflect.Field; -import java.util.HashSet; - -import org.apache.commons.lang3.reflect.FieldUtils; - -import gregtech.api.enums.GT_Values; -import gregtech.api.util.EmptyRecipeMap; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.recipe.RECIPES_Old_Circuits; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; - -public class OldCircuitHandler { - - public static void preInit() { - if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) { - removeCircuitRecipeMap(); // Bye shitty recipes. - } - } - - public static void init() {} - - public static void postInit() { - if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) { - RECIPES_Old_Circuits.handleCircuits(); - new RECIPES_Old_Circuits(); - } - } - - public static boolean addCircuitItems() { - if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) { - return MetaGeneratedGregtechItems.INSTANCE.registerOldCircuits(); - } - return false; - } - - private static boolean removeCircuitRecipeMap() { - if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) { - try { - Logger.INFO( - "[Old Feature - Circuits] Trying to override the Circuit Assembler Recipe map, so that no recipes for new circuits get added."); - ReflectionUtils.setFinalStatic( - GT_Recipe_Map.class.getDeclaredField("sCircuitAssemblerRecipes"), - new EmptyRecipeMap( - new HashSet(0), - "gt.recipe.removed", - "Removed", - null, - GT_Values.RES_PATH_GUI + "basicmachines/Default", - 0, - 0, - 0, - 0, - 0, - GT_Values.E, - 0, - GT_Values.E, - true, - false)); - Field jaffar = GT_Recipe_Map.class.getDeclaredField("sCircuitAssemblerRecipes"); - FieldUtils.removeFinalModifier(jaffar, true); - jaffar.set( - null, - new EmptyRecipeMap( - new HashSet(0), - "gt.recipe.removed", - "Removed", - null, - GT_Values.RES_PATH_GUI + "basicmachines/Default", - 0, - 0, - 0, - 0, - 0, - GT_Values.E, - 0, - GT_Values.E, - true, - false)); - Logger.INFO( - "[Old Feature - Circuits] Successfully replaced circuit assembler recipe map with one that cannot hold recipes."); - } catch (Exception e) { - Logger.INFO("[Old Feature - Circuits] Failed removing circuit assembler recipe map."); - return false; - } - return true; - } - return false; - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java index f240656dd7..cd4ff542dc 100644 --- a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java @@ -17,7 +17,6 @@ public class RegistrationHandler { RECIPES_Tools.loadRecipes(); RECIPES_General.loadRecipes(); RECIPES_Machines.loadRecipes(); - RECIPES_Shapeless.loadRecipes(); RECIPES_MachineComponents.loadRecipes(); RECIPE_Batteries.loadRecipes(); Logger.INFO("Loaded: " + recipesSuccess + " Failed: " + recipesFailed); diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index e9bb6e1bf6..04f22931c6 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -94,8 +94,6 @@ public final class ModItems { public static Item itemPlateBlutonium; public static Item itemPlateCyanite; public static Item itemPlateLudicrite; - // Thaumcraft - public static Item itemPlateVoidMetal; // Pneumaticraft public static Item itemPlateCompressedIron; // SimplyJetpacks @@ -534,8 +532,7 @@ public final class ModItems { // in radioisotope thermoelectric generators (RTGs) // and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power. MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM238, false); - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null - || Utils.getGregtechVersionAsInt() < 50931) { + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null) { MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM239, false); } @@ -544,10 +541,6 @@ public final class ModItems { MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false); - if (!CORE.GTNH) { - MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.getInstance().TRINIUM); - } - // Custom Materials that will have standalone refinery processes MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false); MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM); @@ -565,10 +558,6 @@ public final class ModItems { MISC_MATERIALS.run(); - // Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though - if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - MaterialGenerator.generate(ALLOY.TUNGSTEN_CARBIDE); - } MaterialGenerator.generate(ALLOY.SILICON_CARBIDE); MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE); MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE); @@ -656,10 +645,6 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.HG1223, false, false); // Generate Fictional Materials - if (!CORE.GTNH) { - MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false); - MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false); - } MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM); MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false); MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON); @@ -900,12 +885,9 @@ public final class ModItems { dustFertUN32 = ItemUtils .generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0]; - ItemStack temp1 = null; + ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); ItemStack temp2 = null; - if (LoadedMods.IndustrialCraft2) { - temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); - } if (LoadedMods.Forestry) { temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1); } @@ -1264,20 +1246,6 @@ public final class ModItems { Logger.WARNING("BigReactors not Found - Skipping Resources."); } - // Thaumcraft - if ((LoadedMods.Thaumcraft || LOAD_ALL_CONTENT) && !CORE.GTNH) { - Logger.INFO("Thaumcraft Found - Loading Resources."); - // Item Init - try { - ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16); - itemPlateVoidMetal = ItemUtils.generateSpecialUsePlate("Void", "Void", new short[] { 82, 17, 82 }, 0); - GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); - } catch (final NullPointerException e) {} - - } else { - Logger.WARNING("Thaumcraft not Found - Skipping Resources."); - } - // Pneumaticraft if (LoadedMods.PneumaticCraft || LOAD_ALL_CONTENT) { Logger.INFO("PneumaticCraft Found - Loading Resources."); @@ -1311,22 +1279,18 @@ public final class ModItems { } // IC2 Exp - if (LoadedMods.IndustrialCraft2 || LOAD_ALL_CONTENT) { - Logger.INFO("IndustrialCraft2 Found - Loading Resources."); - - // Baubles Mod Test - try { - final Class baublesTest = ReflectionUtils.getClass("baubles.api.IBauble"); - if (baublesTest != null) { - COMPAT_Baubles.run(); - } else { - Logger.INFO("Baubles Not Found - Skipping Resources."); - } - } catch (final Throwable T) { + Logger.INFO("IndustrialCraft2 Found - Loading Resources."); + + // Baubles Mod Test + try { + final Class baublesTest = ReflectionUtils.getClass("baubles.api.IBauble"); + if (baublesTest != null) { + COMPAT_Baubles.run(); + } else { Logger.INFO("Baubles Not Found - Skipping Resources."); } - } else { - Logger.WARNING("IndustrialCraft2 not Found - Skipping Resources."); + } catch (final Throwable T) { + Logger.INFO("Baubles Not Found - Skipping Resources."); } // Special Item Handling Case diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index f60b1af543..ca0adc9676 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -558,18 +558,16 @@ public class AgriculturalChem extends ItemPackage { /** * IC2 Support */ - if (LoadedMods.IndustrialCraft2) { - aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1); - CORE.RA.addDehydratorRecipe( - new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, - null, - null, - new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod, - aManureByprod }, - new int[] { 10000, 2000, 2000 }, - 20 * 20, - 240); - } + aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1); + CORE.RA.addDehydratorRecipe( + new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, + null, + null, + new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod, + aManureByprod }, + new int[] { 10000, 2000, 2000 }, + 20 * 20, + 240); // Dirt Production CORE.RA.addCompressorRecipe( diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index dd27ca4e00..d335281fd9 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -38,7 +38,7 @@ public class CoalTar extends ItemPackage { FluidUtils.getFluidStack("nitrofuel", 7500), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 11), 100, - CORE.GTNH ? 1000 : 500); + 1000); CORE.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellBioDiesel", 9), ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2), @@ -46,7 +46,7 @@ public class CoalTar extends ItemPackage { FluidUtils.getFluidStack("nitrofuel", 3000), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 11), 300, - CORE.GTNH ? 1000 : 500); + 1000); } public static void recipeCreateEthylene() { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 5af0676af7..1bffc2f092 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -220,22 +220,6 @@ public class RocketFuels extends ItemPackage { } } - private static void createLOX() { - GT_Values.RA.addVacuumFreezerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidOxygen", 1), - 20 * 16); - CORE.RA.addAdvancedFreezerRecipe( - new ItemStack[] {}, - new FluidStack[] { FluidUtils.getFluidStack("oxygen", 3000) }, - new FluidStack[] { FluidUtils.getFluidStack(Liquid_Oxygen, 3000) }, - new ItemStack[] {}, - new int[] {}, - 20 * 16, - 240, - 0); - } - private static void createLOH() { GT_Values.RA.addVacuumFreezerRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), @@ -475,9 +459,6 @@ public class RocketFuels extends ItemPackage { createHydrazine(); createMonomethylhydrazine(); - if (!CORE.GTNH) { - createLOX(); - } createLOH(); createHydratedAmmoniumNitrateSlurry(); diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java index 6afb84765f..2cebe798c3 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java @@ -81,14 +81,10 @@ public class ItemGiantEgg extends BaseItemTickable { private static ItemStack getStemCellStack() { if (mCorrectStemCells == null) { - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechSubVersion() > 28) { - ItemStack xl = ItemUtils - .getValueOfItemList("Circuit_Chip_Stemcell", 1, ItemUtils.getSimpleStack(Items.egg, 2)); - if (xl != null) { - mCorrectStemCells = xl.copy(); - } - } else { - mCorrectStemCells = ItemUtils.getSimpleStack(Items.egg, 2); + ItemStack xl = ItemUtils + .getValueOfItemList("Circuit_Chip_Stemcell", 1, ItemUtils.getSimpleStack(Items.egg, 2)); + if (xl != null) { + mCorrectStemCells = xl.copy(); } } return mCorrectStemCells; diff --git a/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java b/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java index 2a5fa9107d..e8e4807747 100644 --- a/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java +++ b/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java @@ -4,7 +4,6 @@ import gregtech.api.enums.Materials; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -18,13 +17,12 @@ public class ItemsMultiTools { private static void run() { // Load Multitools - final boolean gtStyleTools = LoadedMods.Gregtech; if (CORE.ConfigSwitches.enableMultiSizeTools) { // GT Materials final Materials[] rm = Materials.values(); for (final Materials m : rm) { - toolFactoryGT(m, gtStyleTools); + toolFactoryGT(m); } // GT++ Materials @@ -53,9 +51,9 @@ public class ItemsMultiTools { } } - private static boolean toolFactoryGT(final Materials m, final boolean b) { - ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(b, m); - ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(b, m); + private static boolean toolFactoryGT(final Materials m) { + ModItems.MP_GTMATERIAL = ItemUtils.generateMultiPick(true, m); + ModItems.MS_GTMATERIAL = ItemUtils.generateMultiShovel(true, m); return true; } diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 870ccf733f..dc6e8cc7a3 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -10,13 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.util.FakePlayerFactory; import com.mojang.authlib.GameProfile; import cpw.mods.fml.common.FMLCommonHandler; -import gregtech.api.GregTech_API; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.random.XSTR; @@ -24,26 +22,17 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder; -import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; public class CORE { - // import cpw.mods.fml.common.Optional; - - // Analytics handler - // public static SegmentAnalytics mHelper; - public static Map PlayerCache; // Math Related public static final float PI = (float) Math.PI; public static volatile Random RANDOM = new XSTR(); - // Env. Variables - public static Configuration Config; - public static boolean DEVENV = false; // Only can be set in Dev, no config or setting elsewhere. public static final boolean LOAD_ALL_CONTENT = false;; @@ -58,10 +47,6 @@ public class CORE { public static int EVERGLADES_ID = 227; public static int EVERGLADESBIOME_ID = 238; - // GT Vars; - public static final int GREG_FIRST_ID = 760; - public static final boolean MAIN_GREGTECH_5U_EXPERIMENTAL_FORK = Meta_GT_Proxy.areWeUsingGregtech5uExperimental(); - public static final int GREGTECH_API_VERSION = GregTech_API.VERSION; public static int turbineCutoffBase = 75000; // GT++ Fake Player Profile @@ -77,8 +62,6 @@ public class CORE { .translateToLocal("GTPP.core.GT_Tooltip_Radioactive"); public static final String noItem = ""; - // Because I want to be lazy Gregtech New Horizons Var. - public static boolean GTNH = false; // Because I want to be lazy. Beyond Reality Classic Var. public static boolean BRC = false; @@ -101,9 +84,6 @@ public class CORE { /** * Some Gregtech Material and Recipe Variables */ - @Deprecated - public static IGregtech_RecipeAdder sRecipeAdder; - public static IGregtech_RecipeAdder RA; public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000]; @@ -324,8 +304,4 @@ public class CORE { } FMLCommonHandler.instance().exitJava(0, true); } - - public static final void gc() { - System.gc(); - } } diff --git a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java index da24c8bbc1..498b69860e 100644 --- a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java @@ -7,19 +7,16 @@ import java.util.HashMap; import cpw.mods.fml.common.Loader; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures; import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder; public class LoadedMods { // Initialize Variables - public static boolean Gregtech = false; public static boolean PlayerAPI = false; public static boolean BuildCraft = false; public static boolean EnderIO = false; public static boolean Big_Reactors = false; - public static boolean IndustrialCraft2 = false; public static boolean IndustrialCraft2Classic = false; public static boolean Simply_Jetpacks = false; public static boolean RFTools = false; @@ -39,7 +36,6 @@ public class LoadedMods { public static boolean MagicBees = false; public static boolean ExtraBees = false; public static boolean Psychedelicraft = false; - public static boolean MiscUtils = true; // Dummy For MetaData Lookups in MT Wrapper public static boolean ThermalFoundation = false; public static boolean IHL = false; public static boolean AdvancedSolarPanel = false; @@ -72,29 +68,21 @@ public class LoadedMods { @SuppressWarnings("deprecation") public static void checkLoaded() { Logger.INFO("Looking for optional mod prereqs."); - if (isModLoaded("gregtech")) { - Gregtech = true; - Logger.INFO("Components enabled for: Gregtech"); - if (Gregtech) { - try { - CORE.sRecipeAdder = CORE.RA = new GregtechRecipeAdder(); - Logger.INFO("Created Gregtech recipe handler."); - GregtechTextures.BlockIcons.VOID.name(); - GregtechTextures.ItemIcons.VOID.name(); - Logger.INFO("Created Gregtech texture handler."); - } catch (final NullPointerException e) { - Logger.INFO("Could NOT create a Gregtech recipe handler."); - } - } - - totalMods++; + Logger.INFO("Components enabled for: Gregtech"); + try { + CORE.RA = new GregtechRecipeAdder(); + Logger.INFO("Created Gregtech recipe handler."); + GregtechTextures.BlockIcons.VOID.name(); + GregtechTextures.ItemIcons.VOID.name(); + Logger.INFO("Created Gregtech texture handler."); + } catch (final NullPointerException e) { + Logger.INFO("Could NOT create a Gregtech recipe handler."); } - if (isModLoaded("dreamcraft") - || ReflectionUtils.doesClassExist("gregtech.api.util.GT_Multiblock_Tooltip_Builder")) { + + totalMods++; + if (isModLoaded("dreamcraft")) { DreamCraft = true; - GTNH = true; Logger.INFO("Components enabled for: DreamCraft"); - Logger.INFO("Components enabled for: GT: New Horizons"); totalMods++; } if (isModLoaded("beyondrealitycore")) { @@ -153,11 +141,6 @@ public class LoadedMods { Logger.INFO("Components enabled for: Big Reactors"); totalMods++; } - if (isModLoaded("IC2")) { - IndustrialCraft2 = true; - Logger.INFO("Components enabled for: IndustrialCraft2"); - totalMods++; - } if (isModLoaded("IC2-Classic-Spmod")) { IndustrialCraft2Classic = true; Logger.INFO("Components enabled for: IndustrialCraft2-Classic"); diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java index f73c1af0ab..666de12f53 100644 --- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java @@ -4,7 +4,6 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.TextureSet; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.client.CustomTextureSet.TextureSets; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; @@ -597,66 +596,8 @@ public final class ELEMENT { public ELEMENT() { // GTNH Trinium Handling - if (CORE.GTNH) { - // yay - Materials a1 = MaterialUtils.getMaterial("Trinium"); - Materials a2 = Materials.valueOf("Trinium"); - Materials a3 = Materials.get("Trinium"); - Materials a4; - if (a1 == null) { - Logger.INFO("[Material] First attempt to find Trinium failed, using backup method."); - if (a2 == null) { - Logger.INFO("[Material] Fallback attempt to find Trinium failed, using second fallback."); - if (a3 == null) { - Logger.INFO("[Material] Fallback attempt to find Trinium failed, dumping materials."); - for (Materials m : Materials.values()) { - Logger.INFO("[Material] Found " + MaterialUtils.getMaterialName(m)); - } - a4 = null; - } else { - Logger.INFO("[Material] a3 Found " + MaterialUtils.getMaterialName(a3)); - a4 = a3; - } - } else { - Logger.INFO("[Material] a2 Found " + MaterialUtils.getMaterialName(a2)); - a4 = a2; - } - TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a4); - } else { - Logger.INFO("[Material] a1 Found " + MaterialUtils.getMaterialName(a1)); - TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a1); - } - - TRINIUM_REFINED = TRINIUM; - - } else { - TRINIUM = new Material( - "Trinium", - MaterialState.SOLID, - TextureSet.SET_FINE, - new short[] { 70, 110, 30 }, - 604, - 4057, - 181, - 133, - false, - "Ke", - 0, - false); // Not a GT Inherited Material - TRINIUM_REFINED = new Material( - "Refined Trinium", - MaterialState.SOLID, - TextureSets.REFINED.get(), - new short[] { 210, 255, 170 }, - 4304, - 14057, - 181, - 133, - false, - "Ke", - 0, - new MaterialStack[] { new MaterialStack(TRINIUM, 1) }); // Not a GT Inherited Material - } + TRINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Trinium); + TRINIUM_REFINED = TRINIUM; } public static ELEMENT getInstance() { diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index 98ab4739d4..00f5139b60 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -33,7 +33,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits; import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper; import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial; @@ -1138,11 +1137,7 @@ public class Material { } public final ItemStack getCable16(final int stacksize) { - if (GregtechConduits.cableGt16 != null) { - return getComponentByPrefix(GregtechConduits.cableGt16, stacksize); - } else { - return ItemUtils.getErrorStack(stacksize); - } + return getComponentByPrefix(OrePrefixes.cableGt16, stacksize); } /** diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java index ff104057b1..aace371163 100644 --- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java +++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.recipe; import gregtech.api.enums.ItemList; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -9,18 +8,9 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class LOADER_Machine_Components { public static void initialise() { - registerDefaultComponents(); - if (!CORE.GTNH) { - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - registerGTExperimentalComponents(); - } else { - registerGTStandardComponents(); - } - } else { - registerGTNHComponents(); - } + registerGTNHComponents(); } private static void registerDefaultComponents() { @@ -65,13 +55,11 @@ public class LOADER_Machine_Components { CI.sensor_HV = ItemList.Sensor_HV.get(1); CI.sensor_EV = ItemList.Sensor_EV.get(1); CI.sensor_IV = ItemList.Sensor_IV.get(1); - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1); - CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1); - CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1); - CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1); - CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1); - } + CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1); + CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1); + CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1); + CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1); + CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1); } private static void registerGTExperimentalComponents() { @@ -101,11 +89,9 @@ public class LOADER_Machine_Components { CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1); - CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1); - CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1); - } + CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1); + CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1); + CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1); registerComponentsULV(); registerComponentsMAX(); @@ -145,11 +131,9 @@ public class LOADER_Machine_Components { CI.sensor_UV = GregtechItemList.Sensor_UV.get(1); CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1); - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1); - CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1); - CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1); - } + CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1); + CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1); + CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1); registerComponentsULV(); } @@ -188,11 +172,9 @@ public class LOADER_Machine_Components { CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - CI.fluidRegulator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32665, 1); - CI.fluidRegulator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32666, 1); - CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1); - } + CI.fluidRegulator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32665, 1); + CI.fluidRegulator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32666, 1); + CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1); // Thanks 0lafe CI.electricMotor_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32596, 1); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java deleted file mode 100644 index 524aa08f60..0000000000 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java +++ /dev/null @@ -1,51 +0,0 @@ -package gtPlusPlus.core.recipe; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.*; -import gregtech.api.interfaces.IOreRecipeRegistrator; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; - -public class RECIPES_Extruder implements IOreRecipeRegistrator { - - public RECIPES_Extruder() { - OrePrefixes.ingot.add((IOreRecipeRegistrator) this); - OrePrefixes.dust.add((IOreRecipeRegistrator) this); - } - - public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { - if (!CORE.GTNH && ((aMaterial == Materials.Glass || aMaterial == Materials.WroughtIron - || GT_OreDictUnificator.get(OrePrefixes.ingot, (Object) aMaterial, 1L) != null) - && !aMaterial.contains(SubTag.NO_SMELTING))) { - final long aMaterialMass = aMaterial.getMass(); - final int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L); - if (tAmount > 0 && tAmount <= 64 && aPrefix.mMaterialAmount % 3628800L == 0L) { - int tVoltageMultiplier = (aMaterial.mBlastFurnaceTemp >= 2800) ? 64 : 16; - if (aMaterial.contains(SubTag.NO_SMASHING)) { - tVoltageMultiplier /= 4; - } else if (aPrefix.name().startsWith(OrePrefixes.dust.name())) { - return; - } - - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, new Object[] { aStack }), - GregtechItemList.Shape_Extruder_SmallGear.get(0L, new Object[0]), - GT_OreDictUnificator - .get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount), - ((int) Math.max(aMaterialMass * 5L * tAmount, tAmount) / 4), - 8 * tVoltageMultiplier); - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, new Object[] { aStack }), - ItemList.Shape_Mold_Gear_Small.get(0L, new Object[0]), - GT_OreDictUnificator - .get(OrePrefixes.gearGtSmall, (Object) aMaterial.mSmeltInto, (long) tAmount), - ((int) Math.max(aMaterialMass * 10L * tAmount, tAmount) / 4), - 2 * tVoltageMultiplier); - } - } - } -} diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 0dcdb008bb..3bf145f0b3 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -1,7 +1,5 @@ package gtPlusPlus.core.recipe; -import static gtPlusPlus.core.lib.CORE.GTNH; - import java.util.ArrayList; import net.minecraft.init.Blocks; @@ -30,7 +28,6 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.*; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EnchantingUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -59,10 +56,8 @@ public class RECIPES_GREGTECH { dehydratorRecipes(); blastFurnaceRecipes(); - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - largeChemReactorRecipes(); - fusionRecipes(); - } + largeChemReactorRecipes(); + fusionRecipes(); fissionFuelRecipes(); autoclaveRecipes(); @@ -359,80 +354,45 @@ public class RECIPES_GREGTECH { private static void assemblyLineRecipes() { - ItemStack[] aCoilWire = new ItemStack[] { - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 64 : 32), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 64 : 32), - ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 64 : 32), }; + ItemStack[] aCoilWire = new ItemStack[] { ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, 64), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, 64), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, 64), + ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, 64), }; // Containment Casings CORE.RA.addAssemblylineRecipe( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1), 20 * 60 * 30, - new Object[] { ItemList.Field_Generator_IV.get(GTNH ? 32 : 16), - ItemList.Electric_Motor_EV.get(GTNH ? 64 : 32), - ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.cableGt12, 7, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.wireGt16, 6, GTNH ? 64 : 32), - ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, GTNH ? 64 : 16), - ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8), - ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.ARCANITE.getGear(GTNH ? 8 : 2), - new Object[] { CI.getTieredCircuitOreDictName(5), 64 }, + new Object[] { ItemList.Field_Generator_IV.get(32), ItemList.Electric_Motor_EV.get(64), + ItemList.Energy_LapotronicOrb.get(32), CI.getTieredComponent(OrePrefixes.cableGt12, 7, 32), + CI.getTieredComponent(OrePrefixes.wireGt16, 6, 64), + ItemUtils.getOrePrefixStack(OrePrefixes.plate, Materials.Naquadria, 64), + ELEMENT.getInstance().GADOLINIUM.getDust(32), ELEMENT.getInstance().SAMARIUM.getDust(16), + ALLOY.ARCANITE.getGear(8), new Object[] { CI.getTieredCircuitOreDictName(5), 64 }, new Object[] { CI.getTieredCircuitOreDictName(6), 32 }, new Object[] { CI.getTieredCircuitOreDictName(7), 16 }, GregtechItemList.Laser_Lens_Special.get(1), aCoilWire[3] }, - new FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)), - ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * (GTNH ? 8 : 4)), - ALLOY.TUMBAGA.getFluidStack(144 * 9 * (GTNH ? 32 : 8)), - ALLOY.NICHROME.getFluidStack(144 * 1 * (GTNH ? 16 : 4)), }, + new FluidStack[] { ALLOY.NITINOL_60.getFluidStack(144 * 9 * 4), + ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * 8), ALLOY.TUMBAGA.getFluidStack(144 * 9 * 32), + ALLOY.NICHROME.getFluidStack(144 * 1 * 16), }, ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32), - 20 * 60 * 10 * (GTNH ? 2 : 1), + 20 * 60 * 10 * 2, (int) MaterialUtils.getVoltageForTier(6)); - // Slow Fusion Controller - /* - * CORE.RA.addAssemblylineRecipe( GregtechItemList.COMET_Cyclotron.get(1), 20 * 60 * 30, new ItemStack[] { - * CI.getFieldGenerator(6, GTNH ? 32 : 8), ItemList.Electric_Motor_EV.get(GTNH ? 32 : 8), - * ItemList.Tool_Scanner.get(GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.cableGt12, 6, GTNH ? 32 : 16), - * CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 64 : 32), CI.getTieredComponent(OrePrefixes.plate, 6, - * GTNH ? 64 : 32), ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8), - * ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.INCOLOY_MA956.getGear(GTNH ? 8 : 2), - * CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32), CI.getTieredComponent(OrePrefixes.circuit, 6, - * GTNH ? 32 : 16), CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8) }, new FluidStack[] { - * CI.getTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), CI.getTertiaryTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), - * CI.getAlternativeTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)), CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)), - * }, GregtechItemList.Miniature_Fusion.get(1), 20 * 60 * 5 * (GTNH ? 2 : 1), (int) - * MaterialUtils.getVoltage