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 --- src/functionalTest/java/gregtech/test/GTRecipeTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/functionalTest/java') diff --git a/src/functionalTest/java/gregtech/test/GTRecipeTest.java b/src/functionalTest/java/gregtech/test/GTRecipeTest.java index 8cf7c36b84..104228992e 100644 --- a/src/functionalTest/java/gregtech/test/GTRecipeTest.java +++ b/src/functionalTest/java/gregtech/test/GTRecipeTest.java @@ -1,12 +1,11 @@ package gregtech.test; +import static gregtech.api.GregTech_API.sBlockOres1; import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.enums.ItemList.Circuit_Parts_Crystal_Chip_Master; import static gregtech.api.enums.ItemList.IC2_LapotronCrystal; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.OrePrefixes.circuit; import static gregtech.api.enums.OrePrefixes.lens; -import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_OreDictUnificator.get; import static gregtech.api.util.GT_Utility.copyAmount; import static net.minecraft.init.Blocks.chest; @@ -69,7 +68,7 @@ class GTRecipeTest { .toArray(new GT_Recipe[0])[0]; RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.blockores", 1, 32)) + .itemInputs(new ItemStack(sBlockOres1, 1, 32)) .itemOutputs(new ItemStack(iron_ingot, 1)) .duration(0) .eut(0) @@ -227,7 +226,7 @@ class GTRecipeTest { // as mUnificationTarget is not set for circuits in GT5. // But it works in the same way; specific circuit -> GT ore block, unificated circuit -> vanilla ore block GT_Recipe recipeCorrectOre = recipeMap.findRecipeQuery() - .items(getModItem(GregTech.ID, "gt.blockores", 1, 32)) + .items(new ItemStack(sBlockOres1, 1, 32)) .find(); assertNotNull(recipeCorrectOre); -- cgit