From 361adcefd72d3f58040b18cc7ae92b65ec017522 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 15 Aug 2024 16:48:03 +0200 Subject: add forbidden getModItem calls (#2869) * add forbidden getModItem calls * remove bartworks gmi * remove goodgenerators gmi * spotless * no more literals in getModItem calls * fix kekztech calls * fix kubatech calls * fix gregtech calls (1/?) * move WA from NHCore to GT5U * MTE enum expanded with bw values * MTE enum expanded with tectech values * fix inversion * fix gregtech calls (2/?) * copied enum from NHCore to GT5U and moved machine hulls * moved plasma gens and alloy smelters * moved machine matter amplifiers, assemblers, scanners, Pump, transformers * moved battery buffer 1,2,3,4, battery charger 4x4, dynamo hatches, energy hatches * moved wet transformers, hi amps transformers, turbo chargers, chest buffers, rock breakers, input hatches, output hatches * moved circuit assemblers * moved chemical bath, chemical reactor, fermenter, fluid canner, fluid extractor, fluid heater, mixer * moved autoclave, bending machine, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor, extruder, fluid solidifier, forming press, forge hammer, lathe, precision laser engraver, macerator, matter fabricator, microwave, washing plant, polarizer, recycler, replicator, sifter, slicer, thermal centrifuge, wiremill, arc furnace, centrifuge, plasma arc furnace, canning machine * moved batteries * comment * spotless apply * yeet * imports * bronze blast furnace is no more since a while * sanitize kubatech MTE registration * merge GG's MTE enum into GT5U one * fix gregtech calls (3/4) * fix gt++ calls (1/?) * small cleanup * fix gt++ calls (2/3) * fix gt++ calls (3/3) * temporary test * fix config * Revert "temporary test" This reverts commit ad99b8a4736794aab1d01ff453809c6f7e721724. * disabled the GT check until GTNH-Intergalactic is merged into GT5U or at least its GT5U parts * spotless apply * dumb dumb * fix dynamic access to CustomItemList * update tests * fix scala test * fix script? * fix script? * actual fix? * there we go! * yeet GT for now, until we move the EOH Controller recipe somewhere else * fix dep --- .../com/elisis/gtnhlanth/loader/RecipeLoader.java | 42 +++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'src/main/java/com/elisis') diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 19c258d429..140485c317 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -81,6 +81,8 @@ import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.Thulium import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumChlorideConcentrate; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumExtractingNanoResin; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.YtterbiumOreConcentrate; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.OrePrefixes.blockCasingAdvanced; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; @@ -281,7 +283,7 @@ public class RecipeLoader { .eut(7680) .addTo(assemblerRecipes); - ItemStack insulator = GT_ModHandler.getModItem("dreamcraft", "item.MicaInsulatorSheet", 1); + ItemStack insulator = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorSheet", 1); // Coolant Delivery Casing @@ -629,7 +631,7 @@ public class RecipeLoader { .itemInputs( new ItemStack(LanthItemList.MASKED_MASK), MyMaterial.lithiumChloride.get(OrePrefixes.dust, 2), - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 4)) + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 4)) .itemOutputs(new ItemStack(LanthItemList.maskMap.get(MaskList.BLANK2))) .duration(25 * GT_RecipeBuilder.SECONDS) .eut(1920) @@ -948,7 +950,7 @@ public class RecipeLoader { // IODINE-START // SeaweedAsh GT_ModHandler.addSmeltingRecipe( - GT_ModHandler.getModItem("harvestcraft", "seaweedItem", 1), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "seaweedItem", 1), WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dustSmall, 1)); // SeaweedConcentrate @@ -985,7 +987,7 @@ public class RecipeLoader { GT_Values.RA.stdBuilder() .itemInputs( Materials.Pyrolusite.getDust(6), - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 6), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 6), WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5)) .itemOutputs( WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 12), @@ -1008,7 +1010,7 @@ public class RecipeLoader { // 6KOH + 6Cl = KClO3 + 5KCl + 3H2O GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 18), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 18), GT_Utility.getIntegratedCircuit(3)) .itemOutputs( Materials.RockSalt.getDust(10), @@ -2224,7 +2226,7 @@ public class RecipeLoader { // Lanthanum GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Lanthanum.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2236,7 +2238,7 @@ public class RecipeLoader { // Praseodymium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Praseodymium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2248,7 +2250,7 @@ public class RecipeLoader { // Cerium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Cerium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2260,7 +2262,7 @@ public class RecipeLoader { // Neodymium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Neodymium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2272,7 +2274,7 @@ public class RecipeLoader { // Promethium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Promethium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2284,7 +2286,7 @@ public class RecipeLoader { // Sm GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Samarium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2296,7 +2298,7 @@ public class RecipeLoader { // Europium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Europium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2308,7 +2310,7 @@ public class RecipeLoader { // Gadolinium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Gadolinium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2320,7 +2322,7 @@ public class RecipeLoader { // Terbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Terbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2332,7 +2334,7 @@ public class RecipeLoader { // Dysprosium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Dysprosium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2344,7 +2346,7 @@ public class RecipeLoader { // Holmium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Holmium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2356,7 +2358,7 @@ public class RecipeLoader { // Erbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Erbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2368,7 +2370,7 @@ public class RecipeLoader { // Thulium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Thulium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2380,7 +2382,7 @@ public class RecipeLoader { // Ytterbium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Ytterbium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) @@ -2392,7 +2394,7 @@ public class RecipeLoader { // Lutetium GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0), Materials.Lutetium.getDust(1), Materials.Carbon.getNanite(1)) .fluidInputs(MyMaterial.P507.getFluidOrGas(4000)) -- cgit