aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2020-01-14 14:07:07 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2020-01-14 14:07:07 +0000
commit7145fd82c99f1a9c8cc85aa2ffc30b9e44600122 (patch)
treeb93ff0bd5f5428063fa907cc53d657e93cff1460 /src
parent694b7e5a189a45f6f6c8b85388380d6c1e81cc0f (diff)
downloadGT5-Unofficial-7145fd82c99f1a9c8cc85aa2ffc30b9e44600122.tar.gz
GT5-Unofficial-7145fd82c99f1a9c8cc85aa2ffc30b9e44600122.tar.bz2
GT5-Unofficial-7145fd82c99f1a9c8cc85aa2ffc30b9e44600122.zip
$ Adjusted comparison checks, because the ArrayList will never contain identical ItemStack objects.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java
index 0c1b61be55..d3412bbfb4 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java
@@ -13,6 +13,7 @@ import org.objectweb.asm.MethodVisitor;
import cpw.mods.fml.relauncher.FMLRelaunchLog;
import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_Utility;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import net.minecraft.block.Block;
@@ -30,13 +31,19 @@ public class ClassTransformer_GT_CharcoalPit {
}
public static boolean isWoodLog(Block log, int meta) {
- boolean isLog1 = OrePrefixes.log.contains(ItemUtils.getSimpleStack(log, meta, 1));
- if (isLog1) {
- return true;
+ ItemStack aLogStack = ItemUtils.getSimpleStack(log, meta, 1);
+ ArrayList<ItemStack> aData = OrePrefixes.log.mPrefixedItems;
+ for (ItemStack aStack : aData) {
+ if (GT_Utility.areStacksEqual(aStack, aLogStack)) {
+ return true;
+ }
}
- ArrayList<ItemStack> oredict = OreDictionary.getOres("logWood");
- if (oredict.contains(ItemUtils.getSimpleStack(log))) {
- return true;
+ aData.clear();
+ aData = OreDictionary.getOres("logWood");
+ for (ItemStack aStack : aData) {
+ if (GT_Utility.areStacksEqual(aStack, aLogStack)) {
+ return true;
+ }
}
return false;
}