diff options
| author | Alkalus <Draknyte1@hotmail.com> | 2020-03-31 16:41:41 +0100 |
|---|---|---|
| committer | Alkalus <Draknyte1@hotmail.com> | 2020-03-31 16:41:41 +0100 |
| commit | f73e5c3499ea07bb11b7aaa19856b6a2791686eb (patch) | |
| tree | a9762fdd8a796f38c08d866f4631bfe94af92397 | |
| parent | 2c4a94b808c61d66163d9969017c2819ddb2c5ae (diff) | |
| download | GT5-Unofficial-f73e5c3499ea07bb11b7aaa19856b6a2791686eb.tar.gz GT5-Unofficial-f73e5c3499ea07bb11b7aaa19856b6a2791686eb.tar.bz2 GT5-Unofficial-f73e5c3499ea07bb11b7aaa19856b6a2791686eb.zip | |
$ Made the check for Hazmat in HazmatUtils smarter.
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java index be57853dda..50510f43bd 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java @@ -86,8 +86,9 @@ public class HazmatUtils { if (LoadedMods.IndustrialCraft2 || LoadedMods.IndustrialCraft2Classic) { - for (String aItemName : mDefaultHazmat) { - addProtection(ItemUtils.getItemStackFromFQRN(aItemName, 1)); + for (String aItemName : mDefaultHazmat) { + String[] aSplit = aItemName.split(":"); + addProtection(GT_ModHandler.getIC2Item(aSplit[1], 1L, 32767)); } Logger.INFO("[Hazmat] Registered IC2 Items as hazmat gear."); } @@ -339,11 +340,18 @@ public class HazmatUtils { return providesProtetion_Generic(sElectroHazmatList, aStack); } - private static boolean providesProtetion_Generic(GT_HashSet aSet, ItemStack aStack) { + private static boolean providesProtetion_Generic(GT_HashSet<GT_ItemStack> aSet, ItemStack aStack) { if (isVanillaHazmatPiece(aStack)) { return true; } - return aSet.getMap().containsKey(aStack); + for (GT_ItemStack o : aSet) { + if (o != null) { + if (o.isStackEqual(aStack)){ + return true; + } + } + } + return false; } private static String[] getTooltips(GT_ItemStack aStack) { |