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/loaders/preload/GT_Loader_OreDictionary.java | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/main/java/gregtech/loaders/preload') diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java index 4d51c90cb5..ba1c228e46 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java @@ -268,6 +268,8 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.written_book, 1, 32767)); GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.enchanted_book, 1, 32767)); + GT_OreDictUnificator.addToBlacklist(GT_ModHandler.getIC2Item("electronicCircuit", 1L)); + GT_OreDictUnificator.addToBlacklist(GT_ModHandler.getIC2Item("advancedCircuit", 1L)); GT_OreDictUnificator .registerOre(OrePrefixes.circuit, Materials.Basic, GT_ModHandler.getIC2Item("electronicCircuit", 1L)); GT_OreDictUnificator @@ -344,10 +346,18 @@ public class GT_Loader_OreDictionary implements Runnable { OrePrefixes.circuit, Materials.Primitive, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitULV", 1L)); + GT_OreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.Basic, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Good, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMV", 1L)); + GT_OreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.Advanced, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitHV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Data, -- cgit