diff options
| author | boubou19 <miisterunknown@gmail.com> | 2023-01-28 17:44:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-28 16:44:28 +0000 |
| commit | dd19e321ddd7f336685e6e901ee284a31db0f910 (patch) | |
| tree | f1634532f094daae1a5314734bcf5e096e649989 /src/main/java/gregtech | |
| parent | 225be0dc54c36d7dd8104936d63371f0574f4a06 (diff) | |
| download | GT5-Unofficial-dd19e321ddd7f336685e6e901ee284a31db0f910.tar.gz GT5-Unofficial-dd19e321ddd7f336685e6e901ee284a31db0f910.tar.bz2 GT5-Unofficial-dd19e321ddd7f336685e6e901ee284a31db0f910.zip | |
Sanitize recipes (#1688)
* move some alloy smelter recipes
* move printer recipes
* moved arc furnace recipes
* moved mixer recipes
* moved extruder recipes
* moved fluid canner recipes
* moved fluid solidifier recipes
* moved chem bath recipes
* moved some chemical reactor recipes
* moved some assembler recipes
* moved some fluid extractor recipes
* moved some autoclave recipes
* moved some electrolyzer recipes
* moved some centrifuge recipes
* moved some pulverizer recipes
* moved slicer recipes
* moved some forming press recipes
* moved some fluid heater recipes
* moved some bending machine recipes
* moved some vacuum freezer recipes
* moved blast furnace recipes
* moved pyrolyse oven recipes
* moved laser engraver recipes
* moved circuit assembler recipes
* move compressor recipe
* moved cutting machine recipes
* moved distillery & distillation tower recipes
* moved fermenter recipes
* moved some smelter recipes
* moved some canner recipes
* moved fusion reactor recipes
* moved implosion compressor recipes
* moved plasma forge recipes
* moved some more chemical reactor recipes
* moved some lathe recipes
* moved some wiremill recipes
* moved some more wiremill recipes
* moved brewery recipes
* spotless 1
* move thaumcraft recipes
* moved assline recipes
* moved some more recipes
* moved sifter recipes
* moved forge hammer recipes
* moved fuel recipes
* moved some more thaumcraft recipes
* moved some recipe removals
* moved some more fluid extracter recipes
* moved extractor recipes
* moved crop processing recipes
* moved thermal centrifuge recipe
* moved packager recipes
* moved some more ic2 recipe removal
* moved NEI Hidding recipes
* moved fluid extractor recipe
* moved oredict unification recipes
* moved some more arcfurnace recipe
* moved matter amplifier recipes
* moved electromagnetic separator recipes
* use the run method of each file
* spotlessApply 2
* forgot mixer potion recipes
* aligned recipes
* centralise Loader.isModLoaded calls
* recipe magic number killstreak 1
* recipe magic number killstreak 2
* recipe magic number killstreak 3
* fix mistake
* spotless apply 3
* recipe magic number killstreak 4
* fix Railcraft mixer recipes
* fix pyrolyse recipes
* fix vacuum recipes
Diffstat (limited to 'src/main/java/gregtech')
51 files changed, 24087 insertions, 23012 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index bd84529cf5..7ac9d15161 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1,23031 +1,97 @@ package gregtech.loaders.postload; -import static gregtech.api.GregTech_API.mGTPlusPlus; import static gregtech.api.enums.GT_Values.*; -import static gregtech.api.util.GT_ModHandler.getModItem; -import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; -import codechicken.nei.api.API; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.enums.*; -import gregtech.api.objects.MaterialStack; -import gregtech.api.util.*; -import gregtech.common.GT_DummyWorld; -import gregtech.common.items.GT_MetaGenerated_Item_03; import gregtech.loaders.postload.chains.GT_BauxiteRefineChain; import gregtech.loaders.postload.chains.GT_NaniteChain; import gregtech.loaders.postload.chains.GT_PCBFactoryRecipes; -import ic2.api.recipe.ILiquidHeatExchangerManager; -import ic2.api.recipe.Recipes; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.Map; -import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; -import mods.railcraft.common.items.RailcraftToolItems; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; +import gregtech.loaders.postload.recipes.*; public class GT_MachineRecipeLoader implements Runnable { - private final MaterialStack[][] mAlloySmelterList = { - { - new MaterialStack(Materials.Tetrahedrite, 3L), - new MaterialStack(Materials.Tin, 1L), - new MaterialStack(Materials.Bronze, 3L) - }, - { - new MaterialStack(Materials.Tetrahedrite, 3L), - new MaterialStack(Materials.Zinc, 1L), - new MaterialStack(Materials.Brass, 3L) - }, - { - new MaterialStack(Materials.Copper, 3L), - new MaterialStack(Materials.Tin, 1L), - new MaterialStack(Materials.Bronze, 4L) - }, - { - new MaterialStack(Materials.Copper, 3L), - new MaterialStack(Materials.Zinc, 1L), - new MaterialStack(Materials.Brass, 4L) - }, - { - new MaterialStack(Materials.Copper, 1L), - new MaterialStack(Materials.Nickel, 1L), - new MaterialStack(Materials.Cupronickel, 2L) - }, - { - new MaterialStack(Materials.Copper, 1L), - new MaterialStack(Materials.Redstone, 4L), - new MaterialStack(Materials.RedAlloy, 1L) - }, - { - new MaterialStack(Materials.AnnealedCopper, 3L), - new MaterialStack(Materials.Tin, 1L), - new MaterialStack(Materials.Bronze, 4L) - }, - { - new MaterialStack(Materials.AnnealedCopper, 3L), - new MaterialStack(Materials.Zinc, 1L), - new MaterialStack(Materials.Brass, 4L) - }, - { - new MaterialStack(Materials.AnnealedCopper, 1L), - new MaterialStack(Materials.Nickel, 1L), - new MaterialStack(Materials.Cupronickel, 2L) - }, - { - new MaterialStack(Materials.AnnealedCopper, 1L), - new MaterialStack(Materials.Redstone, 4L), - new MaterialStack(Materials.RedAlloy, 1L) - }, - { - new MaterialStack(Materials.Iron, 1L), - new MaterialStack(Materials.Tin, 1L), - new MaterialStack(Materials.TinAlloy, 2L) - }, - { - new MaterialStack(Materials.WroughtIron, 1L), - new MaterialStack(Materials.Tin, 1L), - new MaterialStack(Materials.TinAlloy, 2L) - }, - { - new MaterialStack(Materials.Iron, 2L), - new MaterialStack(Materials.Nickel, 1L), - new MaterialStack(Materials.Invar, 3L) - }, - { - new MaterialStack(Materials.WroughtIron, 2L), - new MaterialStack(Materials.Nickel, 1L), - new MaterialStack(Materials.Invar, 3L) - }, - { - new MaterialStack(Materials.Tin, 9L), - new MaterialStack(Materials.Antimony, 1L), - new MaterialStack(Materials.SolderingAlloy, 10L) - }, - { - new MaterialStack(Materials.Lead, 4L), - new MaterialStack(Materials.Antimony, 1L), - new MaterialStack(Materials.BatteryAlloy, 5L) - }, - { - new MaterialStack(Materials.Gold, 1L), - new MaterialStack(Materials.Silver, 1L), - new MaterialStack(Materials.Electrum, 2L) - }, - { - new MaterialStack(Materials.Magnesium, 1L), - new MaterialStack(Materials.Aluminium, 2L), - new MaterialStack(Materials.Magnalium, 3L) - }, - { - new MaterialStack(Materials.Silver, 1L), - new MaterialStack(Materials.Electrotine, 4L), - new MaterialStack(Materials.BlueAlloy, 1L) - }, - { - new MaterialStack(Materials.Boron, 1L), - new MaterialStack(Materials.Glass, 7L), - new MaterialStack(Materials.BorosilicateGlass, 8L) - } - }; - private static final String aTextAE = "appliedenergistics2"; - private static final String aTextAEMM = "item.ItemMultiMaterial"; - private static final String aTextForestry = "Forestry"; - private static final String aTextEBXL = "ExtrabiomesXL"; - private static final String aTextTCGTPage = "gt.research.page.1."; - private static final Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems"); + + public static final String aTextAE = "appliedenergistics2"; + public static final String aTextAEMM = "item.ItemMultiMaterial"; + public static final String aTextForestry = "Forestry"; + public static final String aTextEBXL = "ExtrabiomesXL"; + public static final String aTextTCGTPage = "gt.research.page.1."; + public static final Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems"); + public static final Boolean isThaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); + public static final Boolean isBartWorksLoaded = Loader.isModLoaded("bartworks"); + public static final Boolean isGTNHLanthanidLoaded = Loader.isModLoaded("gtnhlanth"); + public static final Boolean isGTPPLoaded = Loader.isModLoaded(MOD_ID_GTPP); + public static final Boolean isGalaxySpaceLoaded = Loader.isModLoaded("GalaxySpace"); + public static final Boolean isGalacticraftMarsLoaded = Loader.isModLoaded("GalacticraftMars"); + public static final Boolean isIronChestLoaded = Loader.isModLoaded("IronChest"); + public static final Boolean isCoremodLoaded = Loader.isModLoaded(MOD_ID_DC); + public static final Boolean isBuildCraftFactoryLoaded = Loader.isModLoaded("BuildCraft|Factory"); + public static final Boolean isIronTankLoaded = Loader.isModLoaded("irontank"); + public static final Boolean isExtraUtilitiesLoaded = Loader.isModLoaded("ExtraUtilities"); + public static final Boolean isEBXLLoaded = Loader.isModLoaded(GT_MachineRecipeLoader.aTextEBXL); + public static final Boolean isRailcraftLoaded = Loader.isModLoaded(MOD_ID_RC); + public static final Boolean isForestryloaded = Loader.isModLoaded(GT_MachineRecipeLoader.aTextForestry); + public static final Boolean isIC2NuclearControlLoaded = Loader.isModLoaded("IC2NuclearControl"); + public static final Boolean isAvaritiaAddonsLoaded = Loader.isModLoaded("avaritiaddons"); + public static final Boolean isTinkersConstructLoaded = Loader.isModLoaded("TConstruct"); + public static final Boolean isHardcoreEnderExpansionLoaded = Loader.isModLoaded("HardcoreEnderExpansion"); + public static final Boolean isForestryLoaded = Loader.isModLoaded(MOD_ID_FR); + public static final Boolean isAE2Loaded = Loader.isModLoaded("appliedenergistics2"); @Override public void run() { - GT_Log.out.println("GT_Mod: Adding non-OreDict Machine Recipes."); - try { - GT_Utility.removeSimpleIC2MachineRecipe( - GT_Values.NI, - ic2.api.recipe.Recipes.metalformerExtruding.getRecipes(), - ItemList.Cell_Empty.get(3L)); - GT_Utility.removeSimpleIC2MachineRecipe( - ItemList.IC2_Energium_Dust.get(1L), ic2.api.recipe.Recipes.compressor.getRecipes(), GT_Values.NI); - GT_Utility.removeSimpleIC2MachineRecipe( - new ItemStack(Items.gunpowder), ic2.api.recipe.Recipes.extractor.getRecipes(), GT_Values.NI); - GT_Utility.removeSimpleIC2MachineRecipe( - new ItemStack(Blocks.wool, 1, 32767), ic2.api.recipe.Recipes.extractor.getRecipes(), GT_Values.NI); - GT_Utility.removeSimpleIC2MachineRecipe( - new ItemStack(Blocks.gravel), ic2.api.recipe.Recipes.oreWashing.getRecipes(), GT_Values.NI); - } catch (Throwable ignored) { - } - GT_Utility.removeIC2BottleRecipe( - GT_ModHandler.getIC2Item("fuelRod", 1), - GT_ModHandler.getIC2Item("UranFuel", 1), - ic2.api.recipe.Recipes.cannerBottle.getRecipes(), - GT_ModHandler.getIC2Item("reactorUraniumSimple", 1, 1)); - GT_Utility.removeIC2BottleRecipe( - GT_ModHandler.getIC2Item("fuelRod", 1), - GT_ModHandler.getIC2Item("MOXFuel", 1), - ic2.api.recipe.Recipes.cannerBottle.getRecipes(), - GT_ModHandler.getIC2Item("reactorMOXSimple", 1, 1)); - GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(Items.wheat_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(10), 10000, 32, 2); - GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(Items.melon_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(10), 10000, 32, 2); - GT_Values.RA.addFluidExtractionRecipe( - new ItemStack(Items.pumpkin_seeds, 1, 32767), - GT_Values.NI, - Materials.SeedOil.getFluid(10), - 10000, - 32, - 2); - GT_Values.RA.addFluidExtractionRecipe( - ItemList.Crop_Drop_Rape.get(1), null, Materials.SeedOil.getFluid(125), 10000, 32, 2); - - try { - GT_DummyWorld tWorld = (GT_DummyWorld) GT_Values.DW; - while (tWorld.mRandom.mIterationStep > 0) { - GT_Values.RA.addFluidExtractionRecipe( - GT_Utility.copyAmount(1L, ForgeHooks.getGrassSeed(tWorld)), - GT_Values.NI, - Materials.SeedOil.getFluid(5L), - 10000, - 64, - 2); - } - } catch (Throwable e) { - GT_Log.out.println( - "GT_Mod: failed to iterate somehow, maybe it's your Forge Version causing it. But it's not that important\n"); - e.printStackTrace(GT_Log.err); - } - - GT_Values.RA.addArcFurnaceRecipe( - ItemList.Block_TungstenSteelReinforced.get(1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1) - }, - null, - 160, - 96); - - GT_Values.RA.addPrinterRecipe( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L), - getFluidStack("squidink", 36), - GT_Values.NI, - ItemList.Paper_Punch_Card_Empty.get(1L), - 100, - 2); - GT_Values.RA.addPrinterRecipe( - ItemList.Paper_Punch_Card_Empty.get(1L), - getFluidStack("squidink", 36), - ItemList.Tool_DataStick.getWithName(0L, "With Punch Card Data"), - ItemList.Paper_Punch_Card_Encoded.get(1L), - 100, - 2); - GT_Values.RA.addPrinterRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3L), - getFluidStack("squidink", 144), - ItemList.Tool_DataStick.getWithName(0L, "With Scanned Book Data"), - ItemList.Paper_Printed_Pages.get(1L), - 400, - 2); - GT_Values.RA.addPrinterRecipe( - new ItemStack(Items.map, 1, 32767), - getFluidStack("squidink", 144), - ItemList.Tool_DataStick.getWithName(0L, "With Scanned Map Data"), - new ItemStack(Items.filled_map, 1, 0), - 400, - 2); - GT_Values.RA.addPrinterRecipe( - new ItemStack(Items.book, 1, 32767), - getFluidStack("squidink", 144), - GT_Values.NI, - GT_Utility.getWrittenBook("Manual_Printer", ItemList.Book_Written_01.get(1L)), - 400, - 2); - - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderPearl, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Utility.getIntegratedCircuit(1), - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.getDust(Materials.EnderEye, OrePrefixes.dust.mMaterialAmount), - (int) (100L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 48); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Utility.getIntegratedCircuit(1), - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.getDust(Materials.Electrum, 2L * OrePrefixes.dust.mMaterialAmount), - (int) (200L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 8); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Utility.getIntegratedCircuit(1), - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.getDust(Materials.Invar, 3L * OrePrefixes.dust.mMaterialAmount), - (int) (300L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 8); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Invar, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manganese, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), - GT_Values.NI, - GT_Utility.getIntegratedCircuit(1), - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.getDust(Materials.StainlessSteel, 9L * OrePrefixes.dust.mMaterialAmount), - (int) (900L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 120); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Utility.getIntegratedCircuit(1), - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.getDust(Materials.Kanthal, 3L * OrePrefixes.dust.mMaterialAmount), - (int) (300L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 120); - // GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3L), - // GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barium, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, - // Materials.Yttrium, 1L), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), GT_Values.NF, - // GT_Values.NF, GT_OreDictUnificator.getDust(Materials.YttriumBariumCuprate, 6L * - // OrePrefixes.dust.mMaterialAmount), (int) (600L * OrePrefixes.dust.mMaterialAmount / 3628800L), 8); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Utility.getIntegratedCircuit(1), - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.getDust(Materials.Brass, 4L * OrePrefixes.dust.mMaterialAmount), - (int) (400L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 8); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Utility.getIntegratedCircuit(1), - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.getDust(Materials.Bronze, 4L * OrePrefixes.dust.mMaterialAmount), - (int) (400L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 8); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Utility.getIntegratedCircuit(3), - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.getDust(Materials.Cupronickel, 2L * OrePrefixes.dust.mMaterialAmount), - (int) (200L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 24); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Utility.getIntegratedCircuit(4), - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.getDust(Materials.SterlingSilver, 5L * OrePrefixes.dust.mMaterialAmount), - (int) (500L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 120); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Electrum, 2L), - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Utility.getIntegratedCircuit(1), - GT_Values.NF, - GT_Values.NF, - GT_OreDictUnificator.getDust(Materials.Bla |
