From 959a58268d0bc357b294d270e105b8e0eb5c981b Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Mon, 24 Jun 2024 16:37:44 +0100 Subject: Add oredict for LV and HV circuits (try no 2) (#2682) * blacklist ic2 ciruits from unificator * fix 2 circuit oredicts * move cleanroom assembler recipe * remove unittest that needs nhcoremod to work * fix electronic circuit recipe * move recipe to better place and avoid duplicates * move fluid filter recipe --- .../java/gregtech/test/GTRecipeTest.java | 24 ---------------------- 1 file changed, 24 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 c54fb0a7c8..e6882080e9 100644 --- a/src/functionalTest/java/gregtech/test/GTRecipeTest.java +++ b/src/functionalTest/java/gregtech/test/GTRecipeTest.java @@ -1,8 +1,6 @@ package gregtech.test; import static gregtech.api.enums.GT_Values.RA; -import static gregtech.api.enums.ItemList.Circuit_Advanced; -import static gregtech.api.enums.ItemList.Circuit_Nanoprocessor; import static gregtech.api.enums.ItemList.Circuit_Parts_Crystal_Chip_Master; import static gregtech.api.enums.ItemList.IC2_LapotronCrystal; import static gregtech.api.enums.Materials.Advanced; @@ -12,7 +10,6 @@ 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_OreDictUnificator.isItemStackInstanceOf; import static gregtech.api.util.GT_Utility.copyAmount; import static net.minecraft.init.Blocks.chest; import static net.minecraft.init.Blocks.iron_ore; @@ -27,7 +24,6 @@ import static net.minecraftforge.oredict.OreDictionary.WILDCARD_VALUE; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -225,26 +221,6 @@ class GTRecipeTest { assertNull(checkNBTRecipe); } - @Test - void findOredicted() { - // https://github.com/GTNewHorizons/GT5-Unofficial/pull/2373 - assertTrue( - isItemStackInstanceOf(Circuit_Nanoprocessor.get(1), "circuitAdvanced"), - "Nanoprocessor is not registered as HV circuit"); - GT_Recipe recipeByNanoProcessor = recipeMap.findRecipeQuery() - .items(new ItemStack(lapis_block, 1), Circuit_Nanoprocessor.get(1)) - .find(); - assertNotNull(recipeByNanoProcessor); - - assertTrue( - isItemStackInstanceOf(Circuit_Advanced.get(1), "circuitAdvanced"), - "Processor Assembly is not registered as HV circuit"); - GT_Recipe recipeByCircuitAssembly = recipeMap.findRecipeQuery() - .items(new ItemStack(lapis_block, 1), Circuit_Advanced.get(1)) - .find(); - assertNotNull(recipeByCircuitAssembly); - } - @Test void findWithSpecificOreDictionary() { // https://github.com/GTNewHorizons/GT5-Unofficial/pull/2379 -- cgit