diff options
author | Jason Mitchell <mitchej@gmail.com> | 2023-01-29 11:07:19 -0800 |
---|---|---|
committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-29 11:07:19 -0800 |
commit | 3e18e9fff0dc5d787f68411b296feec251382069 (patch) | |
tree | 64e28a02ca615331b60c3e3c6df55a890532f1df /src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java | |
parent | eb5e2b8185d10b3ffdd8f05a203f75a6ac1f4de9 (diff) | |
download | GT5-Unofficial-3e18e9fff0dc5d787f68411b296feec251382069.tar.gz GT5-Unofficial-3e18e9fff0dc5d787f68411b296feec251382069.tar.bz2 GT5-Unofficial-3e18e9fff0dc5d787f68411b296feec251382069.zip |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java')
-rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java | 494 |
1 files changed, 205 insertions, 289 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index d6b1c7d666..d6f7253156 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -2,25 +2,13 @@ package com.elisis.gtnhlanth.loader; import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; -import com.elisis.gtnhlanth.Tags; -import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool; -import com.elisis.gtnhlanth.common.register.LanthItemList; -import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool; -import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import cpw.mods.fml.common.Loader; -import goodgenerator.items.MyMaterial; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.*; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.HashSet; + import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -30,8 +18,24 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; + import org.apache.commons.lang3.reflect.FieldUtils; +import com.elisis.gtnhlanth.Tags; +import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool; +import com.elisis.gtnhlanth.common.register.LanthItemList; +import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool; +import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + +import cpw.mods.fml.common.Loader; +import goodgenerator.items.MyMaterial; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.*; + public class RecipeLoader { private static final Materials[] BLACKLIST = null; @@ -159,7 +163,7 @@ public class RecipeLoader { null, null, null, - new int[] {10000, 10000}, + new int[] { 10000, 10000 }, 600, 1920); @@ -176,9 +180,9 @@ public class RecipeLoader { 400); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(12)}, - new FluidStack[] {Materials.NitricAcid.getFluid(1000), Materials.Ammonia.getGas(1000)}, - new FluidStack[] {WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(12) }, + new FluidStack[] { Materials.NitricAcid.getFluid(1000), Materials.Ammonia.getGas(1000) }, + new FluidStack[] { WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000) }, new ItemStack[] {}, 30, 400); @@ -225,7 +229,7 @@ public class RecipeLoader { null, null, null, - new int[] {10000, 10000}, + new int[] { 10000, 10000 }, 760, 480); @@ -269,17 +273,10 @@ public class RecipeLoader { 30); /* - //Fluorosilicic Acid - GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(1), - Materials.SiliconDioxide.getDust(1), - Materials.HydrofluoricAcid.getFluid(6000), - WerkstoffMaterialPool.FluorosilicicAcid.getFluidOrGas(1000), - null, - 300, - 600 - ); - */ + * //Fluorosilicic Acid GT_Values.RA.addChemicalRecipe( GT_Utility.getIntegratedCircuit(1), + * Materials.SiliconDioxide.getDust(1), Materials.HydrofluoricAcid.getFluid(6000), + * WerkstoffMaterialPool.FluorosilicicAcid.getFluidOrGas(1000), null, 300, 600 ); + */ // Sodium Fluorosilicate // 2NaCl + H2SiF6 = 2HCl + Na2SiF6 GT_Values.RA.addChemicalRecipe( @@ -296,27 +293,20 @@ public class RecipeLoader { // Methanol // CH4O + CO + 3O =V2O5= H2C2O4 + H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1)}, - new FluidStack[] { - Materials.Methanol.getFluid(1000), - Materials.CarbonMonoxide.getGas(1000), - Materials.Oxygen.getGas(3000) - }, - new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(1000)}, + new ItemStack[] { MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1) }, + new FluidStack[] { Materials.Methanol.getFluid(1000), Materials.CarbonMonoxide.getGas(1000), + Materials.Oxygen.getGas(3000) }, + new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(1000) }, null, 450, 240); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1) - }, - new FluidStack[] { - Materials.Methanol.getFluid(9000), - Materials.CarbonMonoxide.getGas(9000), - Materials.Oxygen.getGas(27000) - }, - new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1) }, + new FluidStack[] { Materials.Methanol.getFluid(9000), Materials.CarbonMonoxide.getGas(9000), + Materials.Oxygen.getGas(27000) }, + new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(9000) }, null, 4050, 240); @@ -324,25 +314,24 @@ public class RecipeLoader { // Ethanol // C2H6O + 5O =V2O5= H2C2O4 + 2H2O GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1)}, - new FluidStack[] {Materials.Ethanol.getFluid(1000), Materials.Oxygen.getGas(5000)}, - new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(2000)}, + new ItemStack[] { MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1) }, + new FluidStack[] { Materials.Ethanol.getFluid(1000), Materials.Oxygen.getGas(5000) }, + new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(2000) }, null, 450, 240); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1) - }, - new FluidStack[] {Materials.Ethanol.getFluid(9000), Materials.Oxygen.getGas(45000)}, - new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(18000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1) }, + new FluidStack[] { Materials.Ethanol.getFluid(9000), Materials.Oxygen.getGas(45000) }, + new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(18000) }, null, 4050, 240); // GT_Values.RA.addChemicalRecipe( - // GT_Utility.getIntegratedCircuit(2), + // GT_Utility.getIntegratedCircuit(2), // WerkstoffMaterialPool.CeriumDioxide // // ) @@ -372,49 +361,39 @@ public class RecipeLoader { null, null, null, - new int[] {10000}, + new int[] { 10000 }, 150, 120); // CHAIN BEGIN // MONAZITE RecipeAdder.instance.DigesterRecipes.addDigesterRecipe( - new FluidStack[] {Materials.NitricAcid.getFluid(700)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Monazite, 2)}, + new FluidStack[] { Materials.NitricAcid.getFluid(700) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Monazite, 2) }, WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(400), - new ItemStack[] {Materials.SiliconDioxide.getDust(1)}, + new ItemStack[] { Materials.SiliconDioxide.getDust(1) }, 1920, 400, 800); RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe( - new FluidStack[] { - Materials.Water.getFluid(10000), - WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(1000) - }, - new ItemStack[] {GT_Utility.getIntegratedCircuit(1), Materials.Saltpeter.getDust(1)}, + new FluidStack[] { Materials.Water.getFluid(10000), + WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(1000) }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(1), Materials.Saltpeter.getDust(1) }, WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(11000), - new ItemStack[] { - WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4), - WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 1), - Materials.Monazite.getDustTiny(2) - }, + new ItemStack[] { WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4), + WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 1), Materials.Monazite.getDustTiny(2) }, 480, 900, 10); RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe( - new FluidStack[] { - Materials.Water.getFluid(90000), - WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(9000) - }, - new ItemStack[] {GT_Utility.getIntegratedCircuit(9), Materials.Saltpeter.getDust(9)}, + new FluidStack[] { Materials.Water.getFluid(90000), + WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(9000) }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), Materials.Saltpeter.getDust(9) }, WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(99000), - new ItemStack[] { - WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 4), - WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 9), - Materials.Monazite.getDust(2) - }, + new ItemStack[] { WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 4), + WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 9), Materials.Monazite.getDust(2) }, 480, 8100, 10); @@ -422,16 +401,12 @@ public class RecipeLoader { GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe( false, null, - new ItemStack[] { - WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1), - Materials.SiliconDioxide.getDust(1), - Materials.Rutile.getDust(1), - WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), - Materials.Ilmenite.getDust(1) - }, + new ItemStack[] { WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1), + Materials.SiliconDioxide.getDust(1), Materials.Rutile.getDust(1), + WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), Materials.Ilmenite.getDust(1) }, null, - new int[] {9000, 7500, 2000, 500, 2000}, - new FluidStack[] {WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(1000)}, + new int[] { 9000, 7500, 2000, 500, 2000 }, + new FluidStack[] { WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(1000) }, null, 400, 240, @@ -451,38 +426,28 @@ public class RecipeLoader { 400); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(13)}, - new FluidStack[] { - WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(1000), - WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(200) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(13) }, + new FluidStack[] { WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(1000), + WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(200) }, null, - new ItemStack[] { - WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dustTiny, 3), - }, + new ItemStack[] { WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dustTiny, 3), }, 480, 480); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] {GT_Utility.getIntegratedCircuit(14)}, - new FluidStack[] { - WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(9000), - WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1800) - }, + new ItemStack[] { GT_Utility.getIntegratedCircuit(14) }, + new FluidStack[] { WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(9000), + WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1800) }, null, - new ItemStack[] { - WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 3), - }, + new ItemStack[] { WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 3), }, 4320, 480); GT_Values.RA.addSifterRecipe( WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 1), - new ItemStack[] { - WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1) - }, - new int[] {9000, 7000}, + new ItemStack[] { WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1) }, + new int[] { 9000, 7000 }, 600, 256); @@ -502,7 +467,7 @@ public class RecipeLoader { Materials.Thorium.getDust(1), Materials.Phosphate.getDust(1), null, - new int[] {10000, 10000}, + new int[] { 10000, 10000 }, 200, 480); @@ -512,18 +477,16 @@ public class RecipeLoader { WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), null, null, - new int[] {10000}, + new int[] { 10000 }, 120, 240); GT_Values.RA.addSifterRecipe( WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), - new ItemStack[] { - WerkstoffMaterialPool.MonaziteRareEarthHydroxideConcentrate.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1) - }, - new int[] {9000, 5000, 4000}, + new ItemStack[] { WerkstoffMaterialPool.MonaziteRareEarthHydroxideConcentrate.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1) }, + new int[] { 9000, 5000, 4000 }, 800, 480); @@ -533,20 +496,16 @@ public class RecipeLoader { WerkstoffMaterialPool.NeutralizedUraniumFiltrate.get(OrePrefixes.dust, 1), null, null, - new int[] {10000}, + new int[] { 10000 }, 360, 120); GT_Values.RA.addSifterRecipe( WerkstoffMaterialPool.NeutralizedUraniumFiltrate.get(OrePrefixes.dust, 1), - new ItemStack[] { - Materials.Uranium.getDust(1), - Materials.Uranium.getDust(1), - Materials.Uranium.getDust(1), - Materials.Uranium235.getDust(1), - Materials.Uranium235.getDust(1), - }, - new int[] {4500, 4000, 3000, 3000, 2000}, + new ItemStack[] { Materials.Uranium.getDust(1), Materials.Uranium.getDust(1), + Materials.Uranium.getDust(1), Materials.Uranium235.getDust(1), + Materials.Uranium235.getDust(1), }, + new int[] { 4500, 4000, 3000, 3000, 2000 }, 1000, 30); @@ -595,11 +554,11 @@ public class RecipeLoader { GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe( false, null, - new ItemStack[] {WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1)}, + new ItemStack[] { WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1) }, null, - new int[] {1111}, - new FluidStack[] {WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(1000)}, - new FluidStack[] {WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000)}, + new int[] { 1111 }, + new FluidStack[] { WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(1000) }, + new FluidStack[] { WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000) }, 400, 240, 0); @@ -643,12 +602,16 @@ public class RecipeLoader { GT_Recipe.GT_Recipe_Map.sVacuumRecipes.addRecipe( // Uses fluid, outputs item. Yet another hacky recipe false, null, - new ItemStack[] { - WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get( - OrePrefixes.dust, 1), // TODO: Perhaps add more shit on output + new ItemStack[] { WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), // TODO: + // Perhaps + // add + // more + // shit + // on + // output }, null, - new FluidStack[] {WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000)}, + new FluidStack[] { WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000) }, null, 100, 240, @@ -659,7 +622,7 @@ public class RecipeLoader { WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1), WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2), // Maybe also holmium null, - new int[] {9000, 500}, + new int[] { 9000, 500 }, 600, 1920); @@ -685,7 +648,7 @@ public class RecipeLoader { null, null, null, - new int[] {10000, 10000}, + new int[] { 10000, 10000 }, 600, 33000); @@ -722,24 +685,11 @@ public class RecipeLoader { 400, 240); /* - GT_Values.RA.addCentrifugeRecipe( - WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 2), - null, - null, - Materials.Chloromethane.getGas(200), - WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dustSmall, 6), - null, //TODO - null, - null, - null, - null, - new int[] { - 10000, //10000 - }, - 700, - 1920 - ); - */ + * GT_Values.RA.addCentrifugeRecipe( + * WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 2), null, null, + * Materials.Chloromethane.getGas(200), WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dustSmall, 6), + * null, //TODO null, null, null, null, new int[] { 10000, //10000 }, 700, 1920 ); + */ GT_Values.RA.addCentrifugeRecipe( GT_Utility.getIntegratedCircuit(4), WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 8), @@ -751,25 +701,24 @@ public class RecipeLoader { null, null, null, - new int[] { - 10000, // 10000 + new int[] { 10000, // 10000 }, 6300, 1920); GT_Values.RA.addSifterRecipe( WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dust, 9), - new ItemStack[] {Materials.Samarium.getDust(6), Materials.Gadolinium.getDust(3)}, - new int[] {10000, 10000}, + new ItemStack[] { Materials.Samarium.getDust(6), Materials.Gadolinium.getDust(3) }, + new int[] { 10000, 10000 }, 400, 1920); // BASTNASITE (god help me) RecipeAdder.instance.DigesterRecipes.addDigesterRecipe( - new FluidStack[] {Materials.NitricAcid.getFluid(700)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bastnasite, 2)}, + new FluidStack[] { Materials.NitricAcid.getFluid(700) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bastnasite, 2) }, WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(400), - new ItemStack[] {Materials.SiliconDioxide.getDust(1)}, + new ItemStack[] { Materials.SiliconDioxide.getDust(1) }, 1920, 400, 800); @@ -794,12 +743,11 @@ public class RecipeLoader { 120); RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe( - new FluidStack[] { - Materials.Water.getFluid(10000), WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1000) - }, - new ItemStack[] {Materials.Saltpeter.getDust(1)}, + new FluidStack[] { Materials.Water.getFluid(10000), + WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1000) }, + new ItemStack[] { Materials.Saltpeter.getDust(1) }, WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(11000), - new ItemStack[] {WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 1)}, + new ItemStack[] { WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 1) }, 1920, 1000, 10); @@ -807,16 +755,14 @@ public class RecipeLoader { GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe( false, null, - new ItemStack[] { - Materials.SiliconDioxide.getDust(1), - Materials.Rutile.getDust(1), - WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), // TODO:Change outputs to complement Monazite - Materials.Ilmenite.getDust(1) - }, + new ItemStack[] { Materials.SiliconDioxide.getDust(1), Materials.Rutile.getDust(1), + WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), // TODO:Change outputs to complement + // Monazite + Materials.Ilmenite.getDust(1) }, null, - new int[] {9000, 7500, 1000, 500, 2000}, - new FluidStack[] {WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(1000)}, - new FluidStack[] {WerkstoffMaterialPool.FilteredBastnasiteMud.getFluidOrGas(400)}, + new int[] { 9000, 7500, 1000, 500, 2000 }, + new FluidStack[] { WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(1000) }, + new FluidStack[] { WerkstoffMaterialPool.FilteredBastnasiteMud.getFluidOrGas(400) }, 400, 240, 0); @@ -838,7 +784,7 @@ public class RecipeLoader { WerkstoffMaterialPool.LeachedBastnasiteRareEarthOxides.get(OrePrefixes.dust, 1), null, null, - new int[] {10000}, + new int[] { 10000 }, 200, 30); @@ -884,7 +830,7 @@ public class RecipeLoader { null, null, null, - new int[] {10000, 9000}, + new int[] { 10000, 9000 }, 600, 480); @@ -919,7 +865,7 @@ public class RecipeLoader { null, null, null, - new int[] {8000, 5000}, + new int[] { 8000, 5000 }, 900, 480); @@ -1007,7 +953,7 @@ public class RecipeLoader { null, null, null, - new int[] {9000, 8000, 10000}, + new int[] { 9000, 8000, 10000 }, 200, 1920); } @@ -1077,11 +1023,10 @@ public class RecipeLoader { 1920); GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { - GT_Utility.getIntegratedCircuit(9), WerkstoffMaterialPool.MoTeOCatalyst.get(OrePrefixes.dust, 1) - }, - new FluidStack[] {Materials.Butane.getGas(9000)}, - new FluidStack[] {WerkstoffMaterialPool.Butanediol.getFluidOrGas(9000)}, + new ItemStack[] { GT_Utility.getIntegratedCircuit(9), + WerkstoffMaterialPool.MoTeOCatalyst.get(OrePrefixes.dust, 1) }, + new FluidStack[] { Materials.Butane.getGas(9000) }, + new FluidStack[] { WerkstoffMaterialPool.Butanediol.getFluidOrGas(9000) }, null, 8100, 1920); @@ -1140,15 +1085,11 @@ public class RecipeLoader { 480); // Digester Control Block GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_IV.get(1L), - ItemList.Super_Tank_EV.get(2L), - ItemList.Electric_Motor_IV.get(4L), - ItemList.Electric_Pump_IV.get(4L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, 4L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L), - GT_Utility.getIntegratedCircuit(1) - }, + new ItemStack[] { ItemList.Hull_IV.get(1L), ItemList.Super_Tank_EV.get(2L), + ItemList.Electric_Motor_IV.get(4L), ItemList.Electric_Pump_IV.get(4L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, 4L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L), + GT_Utility.getIntegratedCircuit(1) }, Materials.Polytetrafluoroethylene.getMolten(1440), LanthItemList.DIGESTER, 600, @@ -1156,15 +1097,11 @@ public class RecipeLoader { // Dissolution Tank GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - ItemList.Hull_EV.get(1L), - ItemList.Super_Tank_HV.get(2L), - ItemList.Electric_Motor_EV.get(4L), - ItemList.Electric_Pump_EV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { ItemList.Hull_EV.get(1L), ItemList.Super_Tank_HV.get(2L), + ItemList.Electric_Motor_EV.get(4L), ItemList.Electric_Pump_EV.get(2L), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), + GT_Utility.getIntegratedCircuit(2) }, Materials.Polytetrafluoroethylene.getMolten(720), LanthItemList.DISSOLUTION_TANK, 400, @@ -1229,10 +1166,8 @@ public class RecipeLoader { if (GT_Utility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { - if ((OreDictionary.getOreName(oreDictID).startsWith("ore") - || OreDictionary.getOreName(oreDictID) - .startsWith( - "crushed")) /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) { + if ((OreDictionary.getOreName(oreDictID).startsWith("ore") || OreDictionary.getOreName(oreDictID) + .startsWith("crushed")) /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) { GT_Log.out.print(OreDictionary.getOreName(oreDictID)); GT_Recipe tRecipe = recipe.copy(); boolean modified = false; @@ -1277,7 +1212,7 @@ public class RecipeLoader { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID) - .startsWith("crushed") /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) { + .startsWith("crushed") /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -1324,9 +1259,8 @@ public class RecipeLoader { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if ((OreDictionary.getOreName(oreDictID).startsWith("crushed") - || OreDictionary.getOreName(oreDictID) - .startsWith( - "purified")) /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) { + || OreDictionary.getOreName(oreDictID).startsWith( + "purified")) /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -1376,9 +1310,14 @@ public class RecipeLoader { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID).startsWith("dust") - && (!OreDictionary.getOreName(oreDictID) - .contains( - "Dephosphated")) /*OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustImpureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustSpace") || OreDictionary.getOreName(oreDictID).startsWith("dustCerium")*/) { + && (!OreDictionary.getOreName(oreDictID).contains( + "Dephosphated")) /* + * OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium") + * || OreDictionary.getOreName(oreDictID).startsWith( + * "dustImpureCerium") || + * OreDictionary.getOreName(oreDictID).startsWith("dustSpace") || + * OreDictionary.getOreName(oreDictID).startsWith("dustCerium") + */) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -1424,15 +1363,12 @@ public class RecipeLoader { } } /* - GT_Recipe tRecipe = recipe.copy(); - if (GT_Utility.isStackValid(fluidInput)) { - if (fluidInput.getLocalizedName() == MyMaterial.plutoniumBasedLiquidFuel.getDefaultName()) { - tRecipe.mOutputs[1] = GT_Utility.copyAmount(tRecipe.mOutputs[1].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); - reAdd.add(tRecipe); - remove.add(tRecipe); - } - - }*/ + * GT_Recipe tRecipe = recipe.copy(); if (GT_Utility.isStackValid(fluidInput)) { if + * (fluidInput.getLocalizedName() == MyMaterial.plutoniumBasedLiquidFuel.getDefaultName()) { + * tRecipe.mOutputs[1] = GT_Utility.copyAmount(tRecipe.mOutputs[1].stackSize * 2, + * WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); reAdd.add(tRecipe); + * remove.add(tRecipe); } } + */ } GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.removeAll(remove); GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.addAll(reAdd); @@ -1452,7 +1388,7 @@ public class RecipeLoader { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID) - .startsWith("crushed") /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) { + .startsWith("crushed") /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) { GT_Recipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { @@ -1497,8 +1433,7 @@ public class RecipeLoader { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { String oreName = OreDictionary.getOreName(oreDictID); - if (oreName.equals("dustHibonite") - || oreName.equals("dustLanthaniteCe") + if (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe") || oreName.equals("dustZirconolite") || oreName.equals("dustYttrocerite") || oreName.equals("dustXenotime") @@ -1513,16 +1448,26 @@ public class RecipeLoader { tRecipe.mOutputs[i].stackSize, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(WerkstoffMaterialPool.Zirconium.get( - OrePrefixes.dust, 1))) { // TODO: Does not work and I have zero clue why - tRecipe.mOutputs[i] = null; - modified = true; - } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( - tRecipe.mOutputs[i].stackSize, - WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1)); - modified = true; - } + } else if (tRecipe.mOutputs[i] + .isItemEqual(WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1))) { // TODO: + // Does + // not + // work + // and + // I + // have + // zero + // clue + // why + tRecipe.mOutputs[i] = null; + modified = true; + } else + if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) { + tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i].stackSize, + WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1)); + modified = true; + } } if (modified) { reAdd.add(tRecipe); @@ -1599,8 +1544,7 @@ public class RecipeLoader { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { String oreName = OreDictionary.getOreName(oreDictID); - if (oreName.equals("dustCerite") - || oreName.equals("dustFluorcaphite") + if (oreName.equals("dustCerite") || oreName.equals("dustFluorcaphite") || oreName.equals("dustZirkelite") || oreName.equals("dustGadoliniteCe") || oreName.equals("dustGadoliniteY") @@ -1637,35 +1581,17 @@ public class RecipeLoader { GT_Log.out.print("Dehydrator done!\n"); } - /* DOES NOT WORK, something to do with load times for sifter recipes or some shit - //Sifter - for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList) { - if (recipe.mInputs.length == 0) - break; - ItemStack input = recipe.mInputs[0]; - GT_Log.out.print("Sift ore found " + input.getDisplayName() + "\n"); - if (GT_Utility.isStackValid(input)) { - if (true) { - GT_Log.out.print("Sift ore found and iffed " + input.getDisplayName() + "\n"); - //GT_Recipe tRecipe = recipe.copy(); - remove.add(recipe); - break; - } - } - - } - - GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.removeAll(remove); - GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.addAll(reAdd); - GT_Recipe.GT_Recipe_Map.sSifterRecipes.reInit(); - - GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! "); - - remove.clear(); - reAdd.clear(); - - GT_Log.out.print("Sifter done!\n"); - */ + /* + * DOES NOT WORK, something to do with load times for sifter recipes or some shit //Sifter for (GT_Recipe recipe + * : GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList) { if (recipe.mInputs.length == 0) break; ItemStack + * input = recipe.mInputs[0]; GT_Log.out.print("Sift ore found " + input.getDisplayName() + "\n"); if + * (GT_Utility.isStackValid(input)) { if (true) { GT_Log.out.print("Sift ore found and iffed " + + * input.getDisplayName() + "\n"); //GT_Recipe tRecipe = recipe.copy(); remove.add(recipe); break; } } } + * GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.removeAll(remove); + * GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.addAll(reAdd); + * GT_Recipe.GT_Recipe_Map.sSifterRecipes.reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + + * "! "); remove.clear(); reAdd.clear(); GT_Log.out.print("Sifter done!\n"); + */ // Chemical Bath for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes.mRecipeList) { // ItemStack input = recipe.mInputs[0]; @@ -1732,7 +1658,8 @@ public class RecipeLoader { // For Cauldron Wash registerCauldronCleaningFor(Materials.Cerium, WerkstoffMaterialPool.CeriumRichMixture.getBridgeMaterial()); registerCauldronCleaningFor( - Materials.Samarium, WerkstoffMaterialPool.SamariumOreConcentrate.getBridgeMaterial()); + Materials.Samarium, + WerkstoffMaterialPool.SamariumOreConcentrate.getBridgeMaterial()); GT_Log.out.print(Tags.MODID + ": Replace 3! "); GT_Log.out.print("Cauldron Wash done!\n"); @@ -1749,25 +1676,16 @@ public class RecipeLoader { // I use and copy some private methods in Bartworks because his system runs well. // Bartworks is under MIT License /* - * Copyright (c) 2018-2020 bartimaeusnek - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ public static void replaceInCraftTable(Object obj) { @@ -1856,8 +1774,7 @@ public class RecipeLoader { try { isOk = (boolean) recipeCheck.invoke(BartObj, input, Materials.Cerium); - } catch (InvocationTargetException | IllegalAccessException ignored) { - } + } catch (InvocationTargetException | IllegalAccessException ignored) {} if (isOk) return; try { @@ -1872,8 +1789,7 @@ public class RecipeLoader { try { isOk = (boolean) recipeCheck.invoke(BartObj, input, Materials.Samarium); - } catch (InvocationTargetException | IllegalAccessException ignored) { - } + } catch (InvocationTargetException | IllegalAccessException ignored) {} if (isOk) return; try { |