diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-10-08 13:51:27 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-10-08 13:51:27 +1000 |
| commit | 38bad04e1892dfa56e65bdac43af9dcbe9fadc16 (patch) | |
| tree | 42f44a85c7f5cc87977f4b25e6de770f17422d1f /src/Java | |
| parent | 89d0c5a37a6b982d30a24350492fe8d7acb0d63c (diff) | |
| download | GT5-Unofficial-38bad04e1892dfa56e65bdac43af9dcbe9fadc16.tar.gz GT5-Unofficial-38bad04e1892dfa56e65bdac43af9dcbe9fadc16.tar.bz2 GT5-Unofficial-38bad04e1892dfa56e65bdac43af9dcbe9fadc16.zip | |
+ Added support for the new circuit components added since original implementation.
Diffstat (limited to 'src/Java')
3 files changed, 16 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java index 20286473d0..1a5d3eea25 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java @@ -107,7 +107,10 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { ItemList.Circuit_Elite.set(GregtechItemList.Old_Circuit_Elite.get(1)); ItemList.Circuit_Master.set(GregtechItemList.Old_Circuit_Master.get(1)); ItemList.Circuit_Ultimate.set(GregtechItemList.Old_Circuit_Ultimate.get(1)); - + + //set data orbs and sticks to their new replacements + ItemList.Tool_DataStick.set(GregtechItemList.Old_Tool_DataStick.get(1)); + ItemList.Tool_DataOrb.set(GregtechItemList.Old_Tool_DataOrb.get(1)); ItemList.Circuit_Board_Basic.set(GregtechItemList.Old_Circuit_Board_Basic.get(1)); ItemList.Circuit_Board_Advanced.set(GregtechItemList.Old_Circuit_Board_Advanced.get(1)); @@ -211,7 +214,13 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { "Circuit_Wetwarecomputer", "Circuit_Wetwaresupercomputer", "Circuit_Wetwaremainframe", - "Circuit_Parts_RawCrystalChip" + "Circuit_Parts_RawCrystalChip,", + //Circuits Additions in .30/.31 + "Circuit_Board_Plastic", + "Circuit_Parts_GlassFiber", + "Circuit_Parts_PetriDish", + "Circuit_Microprocessor" + }; for (String component : CircuitToHide){ diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java index f8bb372d66..62692f5814 100644 --- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java +++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java @@ -17,8 +17,8 @@ public class Preloader_GT_OreDict { if (Class.forName("gregtech.common.items.GT_MetaGenerated_Item_03") != null) { // 6/11/12/14/16/20/30-57/69-73/79-96 Class<?> MetaItem03 = Class.forName("gregtech.common.items.GT_MetaGenerated_Item_03"); if (isInstanceOf(MetaItem03, circuit.getItem())) { - if (damageValue == 6 || damageValue == 11 || damageValue == 12 || damageValue == 14 - || damageValue == 16 || damageValue == 20) { + if (damageValue == 6 || damageValue == 7 || damageValue == 11 || damageValue == 12 || damageValue == 14 + || damageValue == 16 || damageValue == 20 || damageValue == 21 || damageValue == 22) { return true; } else if (damageValue >= 30 && damageValue <= 57) { @@ -27,7 +27,7 @@ public class Preloader_GT_OreDict { else if (damageValue >= 69 && damageValue <= 73) { return true; } - else if (damageValue >= 79 && damageValue <= 96) { + else if (damageValue >= 78 && damageValue <= 96) { return true; } } diff --git a/src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java index 9070e880e6..a52c4f795a 100644 --- a/src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java +++ b/src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java @@ -8,6 +8,8 @@ import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; @MCVersion(value = "1.7.10") public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin { + //-Dfml.coreMods.load=gtPlusPlus.preloader.asm.Preloader_FMLLoadingPlugin + @Override public String getAccessTransformerClass() { return null; |