diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2016-11-30 18:13:36 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-11-30 18:13:36 +1000 |
commit | 020c182014db57fb2abfa92493524f1c26ec0dd6 (patch) | |
tree | 03822d61a9585caa9b65c7199a6bc9042eea4769 /src/Java/gtPlusPlus/core/util | |
parent | ec9e420ff46e2c2ec164390785d02158c9af8ebe (diff) | |
download | GT5-Unofficial-020c182014db57fb2abfa92493524f1c26ec0dd6.tar.gz GT5-Unofficial-020c182014db57fb2abfa92493524f1c26ec0dd6.tar.bz2 GT5-Unofficial-020c182014db57fb2abfa92493524f1c26ec0dd6.zip |
+ Added a Blast Smelter Recipe check, so that things with invalid sub-components won't ever get a multi-dust recipe at all. (Should fix #43)
- Removed an old function for obtaining items excluding certain mods. Not really needed any more at all.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
-rw-r--r-- | src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java index 24875748bc..ec8c52cb6d 100644 --- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java @@ -244,7 +244,6 @@ public class ItemUtils { public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, int amount){ ItemStack returnValue = getItemStackOfAmountFromOreDict(oredictName, amount); - if (returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass() || returnValue.getItem() != ModItems.AAA_Broken){ return returnValue; } @@ -252,32 +251,6 @@ public class ItemUtils { return null; } - public static ItemStack getItemStackOfAmountFromOreDictNoBrokenExcluding(String excludeModName, String oredictName, int amount){ - ItemStack returnValue = getItemStackOfAmountFromOreDict(oredictName, amount); - - if (returnValue.getItem().getClass() != ModItems.AAA_Broken.getClass() || returnValue.getItem() != ModItems.AAA_Broken){ - if (returnValue.getClass().toString().toLowerCase().contains(excludeModName.toLowerCase())){ - ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName); - if (!oreDictList.isEmpty()){ - returnValue = oreDictList.get(1).copy(); - returnValue.stackSize = amount; - return returnValue; - } - } - else { - ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName); - if (!oreDictList.isEmpty()){ - returnValue = oreDictList.get(1).copy(); - returnValue.stackSize = amount; - return returnValue; - } - } - return returnValue; - } - Utils.LOG_INFO(oredictName+" was not valid."); - return null; - } - public static Item[] generateDusts(String unlocalizedName, String materialName, int materialTier, Material matInfo, int Colour){ int radioactive = getRadioactivityLevel(materialName); Item[] output = { |