diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
3 files changed, 100 insertions, 291 deletions
diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index e876252137..2ed494d0c0 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -7,17 +7,7 @@ import gregtech.api.enums.OrePrefixes; public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHandler { - public static boolean aTGregSupport = TinkersGregworks.isModLoaded() || NewHorizonsCoreMod.isModLoaded(); - public static boolean aEnableUBCMats = UndergroundBiomes.isModLoaded() || aTGregSupport; - public static boolean aEnableThaumcraftMats = Thaumcraft.isModLoaded() || aTGregSupport; - public static boolean aEnableRotaryCraftMats = RotaryCraft.isModLoaded() || aTGregSupport; - public static boolean aEnableThermalFoundationMats = ThermalFondation.isModLoaded() || aTGregSupport; - public static boolean aEnableEnderIOMats = EnderIO.isModLoaded() || aTGregSupport; - public static boolean aEnableRailcraftMats = Railcraft.isModLoaded() || aTGregSupport; - public static boolean aEnableGCMarsMats = GalacticraftMars.isModLoaded() || aTGregSupport; - public static boolean aEnableTwilightMats = TwilightForest.isModLoaded() || aTGregSupport; - public static boolean aEnableMetallurgyMats = Metallurgy.isModLoaded() || aTGregSupport; - public static boolean aEnableProjectRedMats = ProjectRedCore.isModLoaded() || aTGregSupport; + public static boolean aEnableThaumcraftMats = true; public ProcessingModSupport() { Materials.add(this); @@ -26,35 +16,7 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa @Override public void onMaterialsInit() { // Disable Materials if Parent Mod is not loaded - if (!aTGregSupport) { - Materials.Dysprosium.mHasParentMod = false; - Materials.Erbium.mHasParentMod = false; - Materials.Gadolinium.mHasParentMod = false; - Materials.Holmium.mHasParentMod = false; - Materials.Indium.mHasParentMod = false; - Materials.Lanthanum.mHasParentMod = false; - Materials.Praseodymium.mHasParentMod = false; - Materials.Promethium.mHasParentMod = false; - Materials.Rubidium.mHasParentMod = false; - Materials.Samarium.mHasParentMod = false; - Materials.SamariumMagnetic.mHasParentMod = false; - Materials.Scandium.mHasParentMod = false; - Materials.Strontium.mHasParentMod = false; - Materials.Tellurium.mHasParentMod = false; - Materials.Terbium.mHasParentMod = false; - Materials.Thulium.mHasParentMod = false; - Materials.Ytterbium.mHasParentMod = false; - Materials.HeeEndium.mHasParentMod = false; - Materials.DarkIron.mHasParentMod = false; - Materials.ElectrumFlux.mHasParentMod = false; - Materials.Force.mHasParentMod = false; - // Materials.Nikolite.mHasParentMod = false; - Materials.Sunnarium.mHasParentMod = false; - Materials.BlueAlloy.mHasParentMod = false; - Materials.Vinteum.mHasParentMod = false; - Materials.ChromiumDioxide.mHasParentMod = false; - } - if (!aEnableMetallurgyMats) { + if (!Metallurgy.isModLoaded()) { Materials.Angmallen.mHasParentMod = false; Materials.Atlarus.mHasParentMod = false; Materials.Carmot.mHasParentMod = false; @@ -83,20 +45,8 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa Materials.AstralSilver.mHasParentMod = false; Materials.Trinium.mHasParentMod = false; } - if (!aEnableThaumcraftMats) { - Materials.Amber.mHasParentMod = false; - Materials.Thaumium.mHasParentMod = false; - Materials.InfusedGold.mHasParentMod = false; - Materials.InfusedAir.mHasParentMod = false; - Materials.InfusedFire.mHasParentMod = false; - Materials.InfusedEarth.mHasParentMod = false; - Materials.InfusedWater.mHasParentMod = false; - Materials.InfusedEntropy.mHasParentMod = false; - Materials.InfusedOrder.mHasParentMod = false; - Materials.InfusedVis.mHasParentMod = false; - Materials.InfusedDull.mHasParentMod = false; - } - if (!aEnableUBCMats) { + + if (!UndergroundBiomes.isModLoaded()) { Materials.Blueschist.mHasParentMod = false; Materials.Chert.mHasParentMod = false; Materials.Dacite.mHasParentMod = false; @@ -108,50 +58,23 @@ public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHa Materials.Komatiite.mHasParentMod = false; Materials.Rhyolite.mHasParentMod = false; } - if (!aEnableTwilightMats) { - Materials.FierySteel.mHasParentMod = false; - Materials.LiveRoot.mHasParentMod = false; - Materials.IronWood.mHasParentMod = false; - Materials.Steeleaf.mHasParentMod = false; - Materials.Knightmetal.mHasParentMod = false; - } - if (!aEnableGCMarsMats) { - Materials.Desh.mHasParentMod = false; - Materials.MeteoricIron.mHasParentMod = false; - Materials.MeteoricSteel.mHasParentMod = false; - } - if (!aEnableThermalFoundationMats) { - Materials.Blizz.mHasParentMod = false; - Materials.Enderium.mHasParentMod = false; - } - if (!aEnableRotaryCraftMats) { + if (!RotaryCraft.isModLoaded()) { Materials.HSLA.mHasParentMod = false; } - if (!aEnableEnderIOMats) { - Materials.DarkSteel.mHasParentMod = false; - } - if (!aEnableRailcraftMats) { - Materials.Firestone.mHasParentMod = false; - } - if (!aEnableProjectRedMats) { - Materials.Electrotine.mHasParentMod = false; - } - // Enable Materials if correct mod is Loaded - Materials.ChromiumDioxide.mHasParentMod = Computronics.isModLoaded(); } @Override public void onComponentInit() { - if (Computronics.isModLoaded()) { - OrePrefixes.ring.enableComponent(Materials.RedAlloy); - OrePrefixes.ring.enableComponent(Materials.NiobiumTitanium); - OrePrefixes.foil.enableComponent(Materials.StainlessSteel); - OrePrefixes.foil.enableComponent(Materials.ChromiumDioxide); - OrePrefixes.foil.enableComponent(Materials.Iron); - OrePrefixes.plate.enableComponent(Materials.ChromiumDioxide); - OrePrefixes.screw.enableComponent(Materials.Copper); - } + + OrePrefixes.ring.enableComponent(Materials.RedAlloy); + OrePrefixes.ring.enableComponent(Materials.NiobiumTitanium); + OrePrefixes.foil.enableComponent(Materials.StainlessSteel); + OrePrefixes.foil.enableComponent(Materials.ChromiumDioxide); + OrePrefixes.foil.enableComponent(Materials.Iron); + OrePrefixes.plate.enableComponent(Materials.ChromiumDioxide); + OrePrefixes.screw.enableComponent(Materials.Copper); + } @Override diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java index bb2b0a89e9..779bd00d32 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java @@ -2,9 +2,9 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.ModIDs.Railcraft; import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sArcFurnaceRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GT_RecipeConstants.UniversalArcFurnace; import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; @@ -23,7 +23,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(8 * SECONDS) .eut(96) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1L)) @@ -32,7 +32,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1L)) @@ -43,7 +43,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1L)) @@ -52,7 +52,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(10 * TICKS) .eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(1L)) @@ -63,7 +63,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(10 * TICKS) .eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Cupronickel.get(1L)) @@ -75,7 +75,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Kanthal.get(1L)) @@ -87,7 +87,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Nichrome.get(1L)) @@ -99,7 +99,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_TungstenSteel.get(1L)) @@ -111,7 +111,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_HSSG.get(1L)) @@ -123,7 +123,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_HSSS.get(1L)) @@ -135,7 +135,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Naquadah.get(1L)) @@ -147,7 +147,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_NaquadahAlloy.get(1L)) @@ -159,7 +159,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Trinium.get(1L)) @@ -171,7 +171,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_ElectrumFlux.get(1L)) @@ -183,7 +183,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_AwakenedDraconium.get(1L)) @@ -195,7 +195,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) @@ -204,7 +204,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(7 * SECONDS + 10 * TICKS) .eut(90) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) @@ -215,7 +215,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(7 * SECONDS + 10 * TICKS) .eut(90) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) @@ -226,7 +226,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(7 * SECONDS + 10 * TICKS) .eut(90) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) @@ -235,7 +235,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) @@ -246,7 +246,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) @@ -257,7 +257,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) @@ -266,7 +266,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(10 * SECONDS + 10 * TICKS) .eut(150) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) @@ -275,7 +275,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(10 * SECONDS + 10 * TICKS) .eut(150) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) @@ -286,7 +286,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(10 * SECONDS + 10 * TICKS) .eut(150) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) @@ -295,7 +295,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) @@ -306,7 +306,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) @@ -317,7 +317,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) @@ -326,7 +326,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(13 * SECONDS + 10 * TICKS) .eut(210) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) @@ -337,7 +337,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(13 * SECONDS + 10 * TICKS) .eut(210) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) @@ -348,7 +348,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(13 * SECONDS + 10 * TICKS) .eut(210) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) @@ -357,7 +357,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) @@ -368,7 +368,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) @@ -379,7 +379,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) @@ -388,7 +388,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(16 * SECONDS + 10 * TICKS) .eut(270) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) @@ -399,7 +399,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(16 * SECONDS + 10 * TICKS) .eut(270) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) @@ -410,7 +410,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(16 * SECONDS + 10 * TICKS) .eut(270) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) @@ -419,7 +419,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) @@ -430,7 +430,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) @@ -441,7 +441,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) @@ -450,7 +450,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(18 * SECONDS) .eut(330) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) @@ -461,7 +461,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(18 * SECONDS) .eut(330) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) @@ -472,7 +472,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(18 * SECONDS) .eut(330) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) @@ -481,7 +481,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) @@ -492,7 +492,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) @@ -503,7 +503,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(18 * SECONDS) .eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1L)) @@ -512,7 +512,7 @@ public class ArcFurnaceRecipes implements Runnable { .noFluidOutputs() .duration(60 * SECONDS) .eut((int) TierEU.RECIPE_LV) - .addTo(sArcFurnaceRecipes); + .addTo(UniversalArcFurnace); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index df7f1e6f93..a34015e5e1 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -5,20 +5,15 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBlastRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes; import static gregtech.api.util.GT_RecipeBuilder.*; +import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import mods.railcraft.common.blocks.aesthetics.cube.EnumCube; -import mods.railcraft.common.items.RailcraftToolItems; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.ArrayUtils; - import gregtech.GT_Mod; import gregtech.api.enums.*; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -675,155 +670,46 @@ public class BlastFurnaceRecipes implements Runnable { } } - public void addPrimitiveBlastFurnaceRecipes(ItemStack[] inputs, int coalAmount, ItemStack[] outputs, int duration) { - // compute if it can make fuel block version of the recipes - boolean blockVersion = true; - for (ItemStack inputStack : inputs) { - if (inputStack.stackSize <= 6) { - blockVersion = false; - break; - } - } - - // skipping if it has been already set to false - if (blockVersion) { - for (ItemStack outputStack : outputs) { - if (outputStack.stackSize <= 6) { - blockVersion = false; - break; - } - } - } - - ItemStack[] inputsBlocks = new ItemStack[inputs.length]; - ItemStack[] outputsBlocks = new ItemStack[outputs.length]; - - // allocating the two arrays only if block version is possible - if (blockVersion) { - for (int i = 0; i < inputs.length; i++) { - ItemStack itemStack = inputs[i].copy(); - itemStack.stackSize *= 10; - inputsBlocks[i] = itemStack; - } - - for (int i = 0; i < outputs.length; i++) { - ItemStack itemStack = outputs[i].copy(); - itemStack.stackSize *= 10; - outputsBlocks[i] = itemStack; - } - } - - for (Materials coal : new Materials[] { Materials.Coal, Materials.Charcoal }) { - // coal as gems - GT_Values.RA.stdBuilder() - .itemInputs(ArrayUtils.add(inputs, coal.getGems(coalAmount))) - .itemOutputs(ArrayUtils.add(outputs, Materials.DarkAsh.getDustTiny(coalAmount))) - .noFluidInputs() - .noFluidOutputs() - .duration(duration) - .eut(0) - .addTo(sPrimitiveBlastRecipes); - - // coal as dust - GT_Values.RA.stdBuilder() - .itemInputs(ArrayUtils.add(inputs, coal.getDust(coalAmount))) - .itemOutputs(ArrayUtils.add(outputs, Materials.DarkAsh.getDustTiny(coalAmount))) - .noFluidInputs() - .noFluidOutputs() - .duration(duration) - .eut(0) - .addTo(sPrimitiveBlastRecipes); - - if (!blockVersion) { - continue; - } - - // coal as block - GT_Values.RA.stdBuilder() - .itemInputs(ArrayUtils.add(inputs, coal.getBlocks(coalAmount))) - .itemOutputs(ArrayUtils.add(outputs, Materials.DarkAsh.getDust(coalAmount))) - .noFluidInputs() - .noFluidOutputs() - .duration(duration * 10) - .eut(0) - .addTo(sPrimitiveBlastRecipes); - } - - if (Railcraft.isModLoaded()) { - // coal coke - GT_Values.RA.stdBuilder() - .itemInputs(ArrayUtils.add(inputs, RailcraftToolItems.getCoalCoke(coalAmount / 2))) - .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDustTiny(coalAmount / 2))) - .noFluidInputs() - .noFluidOutputs() - .duration(duration * 2 / 3) - .eut(0) - .addTo(sPrimitiveBlastRecipes); - - // coal coke block - GT_Values.RA.stdBuilder() - .itemInputs(ArrayUtils.add(inputs, EnumCube.COKE_BLOCK.getItem(coalAmount / 2))) - .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDust(coalAmount / 2))) - .noFluidInputs() - .noFluidOutputs() - .duration(duration * 10 * 2 / 3) - .eut(0) - .addTo(sPrimitiveBlastRecipes); - } + public void registerPrimitiveBlastFurnaceRecipes() { + GT_Values.RA.stdBuilder() - if (GTPlusPlus.isModLoaded()) { - // cactus coke - GT_Values.RA.stdBuilder() - .itemInputs( - ArrayUtils.add( - inputs, - GT_ModHandler.getModItem(GTPlusPlus.modID, "itemCactusCoke", coalAmount * 2))) - .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDustTiny(coalAmount * 2))) - .noFluidInputs() - .noFluidOutputs() - .duration(duration * 2 / 3) - .eut(0) - .addTo(sPrimitiveBlastRecipes); + .itemInputs(Materials.Iron.getIngots(1)) + .itemOutputs(Materials.Steel.getIngots(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * MINUTES) + .eut(0) + .metadata(ADDITIVE_AMOUNT, 4) + .addTo(sPrimitiveBlastRecipes); - // sugar coke - GT_Values.RA.stdBuilder() - .itemInputs( - ArrayUtils.add( - inputs, - GT_ModHandler.getModItem(GTPlusPlus.modID, "itemSugarCoke", (coalAmount * 2)))) - .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDustTiny(coalAmount * 2))) - .noFluidInputs() - .noFluidOutputs() - .duration(duration * 2 / 3) - .eut(0) - .addTo(sPrimitiveBlastRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Iron.getDust(1)) + .itemOutputs(Materials.Steel.getIngots(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * MINUTES) + .eut(0) + .metadata(ADDITIVE_AMOUNT, 4) + .addTo(sPrimitiveBlastRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Iron.getBlocks(1)) + .itemOutputs(Materials.Steel.getIngots(9)) + .noFluidInputs() + .noFluidOutputs() + .duration(54 * MINUTES) + .eut(0) + .metadata(ADDITIVE_AMOUNT, 36) + .addTo(sPrimitiveBlastRecipes); - public void registerPrimitiveBlastFurnaceRecipes() { - addPrimitiveBlastFurnaceRecipes( - new ItemStack[] { Materials.Iron.getIngots(1) }, - 4, - new ItemStack[] { Materials.Steel.getIngots(1) }, - 6 * MINUTES); - - addPrimitiveBlastFurnaceRecipes( - new ItemStack[] { Materials.Iron.getDust(1) }, - 4, - new ItemStack[] { Materials.Steel.getIngots(1) }, - 6 * MINUTES); - - addPrimitiveBlastFurnaceRecipes( - new ItemStack[] { Materials.Iron.getBlocks(1) }, - 36, - new ItemStack[] { Materials.Steel.getIngots(9) }, - 54 * MINUTES); - - addPrimitiveBlastFurnaceRecipes( - new ItemStack[] { Materials.Steel.getDust(1) }, - 2, - new ItemStack[] { Materials.Steel.getIngots(1) }, - 6 * MINUTES); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Steel.getDust(1)) + .itemOutputs(Materials.Steel.getIngots(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * MINUTES) + .eut(0) + .metadata(ADDITIVE_AMOUNT, 2) + .addTo(sPrimitiveBlastRecipes); } } |