diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-01-30 10:56:42 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-30 10:56:42 -0800 |
| commit | 0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a (patch) | |
| tree | 1e2c649f3a6ce3f6b2babd0098a5f4819e9cd0b6 /src/main/java/gregtech/loaders/postload/recipes | |
| parent | f8cc82edeb9810c45cba762d733a2c909a302faa (diff) | |
| download | GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.gz GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.bz2 GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.zip | |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gregtech/loaders/postload/recipes')
50 files changed, 4080 insertions, 5276 deletions
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java index f69eb6d752..d64825965d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java @@ -1,5 +1,7 @@ package gregtech.loaders.postload.recipes; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -7,111 +9,50 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; public class AlloySmelterRecipes 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) - } - }; + { 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) } }; @Override public void run() { @@ -122,14 +63,14 @@ public class AlloySmelterRecipes implements Runnable { ItemStack tIngot2 = GT_OreDictUnificator.get(OrePrefixes.ingot, tMats[1].mMaterial, tMats[1].mAmount); ItemStack tOutputIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, tMats[2].mMaterial, tMats[2].mAmount); if (tOutputIngot != GT_Values.NI) { - GT_ModHandler.addAlloySmelterRecipe( - tIngot1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); - GT_ModHandler.addAlloySmelterRecipe( - tIngot1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); - GT_ModHandler.addAlloySmelterRecipe( - tDust1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); - GT_ModHandler.addAlloySmelterRecipe( - tDust1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); + GT_ModHandler + .addAlloySmelterRecipe(tIngot1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); + GT_ModHandler + .addAlloySmelterRecipe(tIngot1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); + GT_ModHandler + .addAlloySmelterRecipe(tDust1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); + GT_ModHandler + .addAlloySmelterRecipe(tDust1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java index a6a61c9470..632fe5d385 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java @@ -3,411 +3,347 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.GT_Values.MOD_ID_RC; import static gregtech.api.util.GT_ModHandler.getModItem; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; public class ArcFurnaceRecipes implements Runnable { + @Override public void run() { 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) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1) }, null, 160, 96); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Fluid.get(1L), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L) }, null, 180, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Item.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 12L), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 12L), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L) }, null, 180, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1L), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L) }, null, 10, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Item_Pipe.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L) }, null, 10, (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Cupronickel.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Kanthal.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Nichrome.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_TungstenSteel.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_HSSG.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_HSSS.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Naquadah.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_NaquadahAlloy.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Trinium.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_ElectrumFlux.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_AwakenedDraconium.get(1L), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12) }, null, 300, 360); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 0), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L) }, null, 150, 90); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 1), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), - |
