diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2017-08-12 14:59:27 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-08-12 14:59:27 +1000 |
| commit | 7861c2debf0b64468b5130db75b45bab07fc880d (patch) | |
| tree | cfeb71dd93a6c43323b86816d50d460ea1ad49ce | |
| parent | b5e53e9a638d358729b73fd2ee1e87b019fe13a0 (diff) | |
| download | GT5-Unofficial-7861c2debf0b64468b5130db75b45bab07fc880d.tar.gz GT5-Unofficial-7861c2debf0b64468b5130db75b45bab07fc880d.tar.bz2 GT5-Unofficial-7861c2debf0b64468b5130db75b45bab07fc880d.zip | |
$ Fixed recipes not using OreDict for circuits.
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/common/CI.java | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index 7cee90bc15..37f9dca0e6 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -271,25 +271,32 @@ public class CI { } else { if (tier == 0){ - return ItemList.Circuit_Primitive.get(1); + //return ItemList.Circuit_Primitive.get(1); + return "circuitPrimitive"; } else if (tier == 1){ - return ItemList.Circuit_Basic.get(1); + //return ItemList.Circuit_Basic.get(1); + return "circuitBasic"; } else if (tier == 2){ - return ItemList.Circuit_Good.get(1); + //return ItemList.Circuit_Good.get(1); + return "circuitGood"; } else if (tier == 3){ - return ItemList.Circuit_Advanced.get(1); + //return ItemList.Circuit_Advanced.get(1); + return "circuitAdvanced"; } else if (tier == 4){ - return ItemList.Circuit_Elite.get(1); + //return ItemList.Circuit_Elite.get(1); + return "circuitElite"; } else if (tier == 5){ - return ItemList.Circuit_Master.get(1); + //return ItemList.Circuit_Master.get(1); + return "circuitMaster"; } else if (tier == 6){ - return ItemList.Circuit_Ultimate.get(1); + //return ItemList.Circuit_Ultimate.get(1); + return "circuitUltimate"; } else if (tier == 7){ return "circuitSuperconductor"; @@ -368,14 +375,14 @@ public class CI { Utils.LOG_INFO("[Components] Failed getting a tiered component. "+type.name()+" | "+tier); return null; } - + public static ItemStack getDataOrb(){ - if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - return GregtechItemList.Old_Tool_DataOrb.get(1); - } - else { - return ItemList.Tool_DataOrb.get(1); - } + if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ + return GregtechItemList.Old_Tool_DataOrb.get(1); + } + else { + return ItemList.Tool_DataOrb.get(1); + } } } |