aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/preload
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2024-06-24 16:37:44 +0100
committerGitHub <noreply@github.com>2024-06-24 16:37:44 +0100
commit959a58268d0bc357b294d270e105b8e0eb5c981b (patch)
tree1e2114e23369e4366036e7e0b8147d885158f690 /src/main/java/gregtech/loaders/preload
parentb8ebc3d68d7c8fae96ff464360d75b9142abb9f6 (diff)
downloadGT5-Unofficial-959a58268d0bc357b294d270e105b8e0eb5c981b.tar.gz
GT5-Unofficial-959a58268d0bc357b294d270e105b8e0eb5c981b.tar.bz2
GT5-Unofficial-959a58268d0bc357b294d270e105b8e0eb5c981b.zip
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
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java10
1 files changed, 10 insertions, 0 deletions
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
@@ -346,10 +348,18 @@ public class GT_Loader_OreDictionary implements Runnable {
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,
GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitEV", 1L));
GT_OreDictUnificator.registerOre(