From f10122fedec9ce1379c90c446ed8bb16d28d3678 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Thu, 29 Jul 2021 20:44:36 +0800 Subject: add recipe --- build.gradle | 1 - .../CrossMod/Thaumcraft/ResearchItems.java | 8 + .../java/GoodGenerator/Loader/RecipeLoader.java | 211 +++++++++++++++++++++ 3 files changed, 219 insertions(+), 1 deletion(-) create mode 100644 src/main/java/GoodGenerator/CrossMod/Thaumcraft/ResearchItems.java diff --git a/build.gradle b/build.gradle index db3a18b0ec..19cf1e9e5e 100644 --- a/build.gradle +++ b/build.gradle @@ -93,7 +93,6 @@ dependencies { setChanging(true) }*/ compile files('libs/TecTech-1.7.10-4.10.4-d35bc08e.jar') - compile files('libs/ElectroMagicTools-1.2.8.2[1.7.10].jar') compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") runtime("eu.usrv:YAMCore:${minecraftVersion}-${yamcoreVersion}:deobf"); } diff --git a/src/main/java/GoodGenerator/CrossMod/Thaumcraft/ResearchItems.java b/src/main/java/GoodGenerator/CrossMod/Thaumcraft/ResearchItems.java new file mode 100644 index 0000000000..c6a88911c1 --- /dev/null +++ b/src/main/java/GoodGenerator/CrossMod/Thaumcraft/ResearchItems.java @@ -0,0 +1,8 @@ +package GoodGenerator.CrossMod.Thaumcraft; + +import thaumcraft.api.research.ResearchItem; + +/*public class ResearchItems extends ResearchItem { + + public ResearchItems(String name, ) +}*/ diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java index b3a1adc713..c695f400f8 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java @@ -4,6 +4,7 @@ import GoodGenerator.Items.MyMaterial; import GoodGenerator.util.CrackRecipeAdder; import GoodGenerator.util.MaterialFix; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; +import cpw.mods.fml.common.Loader; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -466,6 +467,110 @@ public class RecipeLoader { 480 ); + GT_Values.RA.addMixerRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4), + GT_Utility.getIntegratedCircuit(4),null, + Materials.Naquadah.getMolten(288), + null, + new ItemStack(Loaders.rawAtomicSeparationCatalyst,18), + 300, + 480 + ); + + GT_Values.RA.addMixerRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4), + GT_Utility.getIntegratedCircuit(4),null, + Materials.Naquadah.getMolten(288), + null, + new ItemStack(Loaders.rawAtomicSeparationCatalyst,18), + 300, + 480 + ); + + GT_Values.RA.addMixerRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4), + GT_Utility.getIntegratedCircuit(4),null, + Materials.Naquadah.getMolten(288), + null, + new ItemStack(Loaders.rawAtomicSeparationCatalyst,54), + 300, + 480 + ); + + GT_Values.RA.addMixerRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Shadow,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4), + GT_Utility.getIntegratedCircuit(4),null, + Materials.Naquadah.getMolten(288), + null, + new ItemStack(Loaders.rawAtomicSeparationCatalyst,54), + 300, + 480 + ); + + GT_Values.RA.addMixerRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4), + GT_Utility.getIntegratedCircuit(4),null, + Materials.Naquadah.getMolten(288), + null, + new ItemStack(Loaders.rawAtomicSeparationCatalyst,18), + 300, + 480 + ); + + GT_Values.RA.addMixerRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Sunnarium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4), + GT_Utility.getIntegratedCircuit(4),null, + Materials.Naquadah.getMolten(288), + null, + new ItemStack(Loaders.rawAtomicSeparationCatalyst,18), + 300, + 480 + ); + + GT_Values.RA.addMixerRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ardite,4), + GT_Utility.getIntegratedCircuit(4),null, + Materials.Naquadah.getMolten(288), + null, + new ItemStack(Loaders.rawAtomicSeparationCatalyst,54), + 300, + 480 + ); + + GT_Values.RA.addMixerRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Firestone,9), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Bedrockium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Ichorium,4), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Manyullyn,4), + GT_Utility.getIntegratedCircuit(4),null, + Materials.Naquadah.getMolten(288), + null, + new ItemStack(Loaders.rawAtomicSeparationCatalyst,54), + 300, + 480 + ); + GT_Values.RA.addFormingPressRecipe( WerkstoffLoader.Tiberium.get(OrePrefixes.plate,4), GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Silicon,8), @@ -1086,6 +1191,112 @@ public class RecipeLoader { 120 ); + if (Loader.isModLoaded("miscutils")) { + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), + Materials.NitrogenDioxide.getGas(1000) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("combustionpromotor", 2000) + }, + null, + 200, + 120 + ); + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumNitrade, 2) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), + Materials.NitrogenDioxide.getGas(1000) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("combustionpromotor", 2000) + }, + null, + 200, + 120 + ); + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + GT_Utility.getIntegratedCircuit(16), + WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), + Materials.NitrogenDioxide.getGas(1000) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("combustionpromotor", 2000) + }, + null, + 200, + 120 + ); + } + + if (Loader.isModLoaded("botdustries")) { + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("hydrogen peroxide", 1000), + Materials.NitrogenDioxide.getGas(1000) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("combustionpromotor", 2000) + }, + null, + 200, + 120 + ); + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PotassiumNitrade, 2) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("hydrogen peroxide", 1000), + Materials.NitrogenDioxide.getGas(1000) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("combustionpromotor", 2000) + }, + null, + 200, + 120 + ); + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + GT_Utility.getIntegratedCircuit(16), + WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("hydrogen peroxide", 1000), + Materials.NitrogenDioxide.getGas(1000) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("combustionpromotor", 2000) + }, + null, + 200, + 120 + ); + } + GT_ModHandler.addCraftingRecipe( Loaders.UCFE.copy(), new Object[]{ -- cgit