diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-11-06 02:56:18 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-11-06 02:56:18 +1000 |
| commit | 7c1ad6437f46b1f43921839f009722bcc2a2e96f (patch) | |
| tree | d7ecedac157fd69febd52296a42dc78bb5b85142 | |
| parent | 680262936c89769d1e6253d71d4ca728ca293731 (diff) | |
| download | GT5-Unofficial-7c1ad6437f46b1f43921839f009722bcc2a2e96f.tar.gz GT5-Unofficial-7c1ad6437f46b1f43921839f009722bcc2a2e96f.tar.bz2 GT5-Unofficial-7c1ad6437f46b1f43921839f009722bcc2a2e96f.zip | |
+ Added raisin juice.
$ Added an NPE check to the ASM conditional.
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java | 50 |
2 files changed, 29 insertions, 24 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index e134c789d6..3b0e34154e 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -563,6 +563,9 @@ public final class ModItems { } + //Juice + FluidUtils.generateFluidNonMolten("RaisinJuice", "Raisin Juice", 2, new short[]{51, 0, 51, 100}, ItemUtils.getItemStackOfAmountFromOreDict("foodRaisin", 1), ItemUtils.getItemStackOfAmountFromOreDict("fruitRaisin", 1)); + //Test items metaItem2 = new BaseEuItem(); diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java index e50e55b6d5..a8db2e3fe5 100644 --- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java +++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java @@ -7,34 +7,36 @@ public class Preloader_GT_OreDict { public static boolean shouldPreventRegistration(String string, ItemStack circuit) { if (CORE_Preloader.enableOldGTcircuits){ - int damageValue = circuit.getItemDamage() - 32000; - if (circuit.getItem() instanceof GT_MetaGenerated_Item_01) { // 700-720 - if (damageValue >= 700 && damageValue <= 720) { - return true; + if (circuit != null){ + int damageValue = circuit.getItemDamage() - 32000; + if (circuit.getItem() instanceof GT_MetaGenerated_Item_01) { // 700-720 + if (damageValue >= 700 && damageValue <= 720) { + return true; + } } - } - else { - try { - 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 == 7 || damageValue == 11 || damageValue == 12 || damageValue == 14 - || damageValue == 16 || damageValue == 20 || damageValue == 21 || damageValue == 22) { - return true; - } - else if (damageValue >= 30 && damageValue <= 57) { - return true; - } - else if (damageValue >= 69 && damageValue <= 73) { - return true; - } - else if (damageValue >= 78 && damageValue <= 96) { - return true; + else { + try { + 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 == 7 || damageValue == 11 || damageValue == 12 || damageValue == 14 + || damageValue == 16 || damageValue == 20 || damageValue == 21 || damageValue == 22) { + return true; + } + else if (damageValue >= 30 && damageValue <= 57) { + return true; + } + else if (damageValue >= 69 && damageValue <= 73) { + return true; + } + else if (damageValue >= 78 && damageValue <= 96) { + return true; + } } } } - } - catch (ClassNotFoundException e) { + catch (ClassNotFoundException e) { + } } } } |