Fix potentially getting the wrong value for ItemStack.itemDamage

D-Cysteine · Feb 22, 2023 · 367fd9b · 367fd9b
1 parent e026e2f
commit 367fd9b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-nesqlExporterVersion=0.4.5
+nesqlExporterVersion=0.4.6
 
 minecraftVersion=1.7.10
 forgeVersion=10.13.4.1614

diff --git a/src/main/java/com/github/dcysteine/nesql/exporter/plugin/base/factory/ItemFactory.java b/src/main/java/com/github/dcysteine/nesql/exporter/plugin/base/factory/ItemFactory.java
@@ -13,6 +13,7 @@
 import com.github.dcysteine.nesql.sql.base.item.Item;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.client.Minecraft;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 import java.io.PrintWriter;
@@ -42,6 +43,10 @@ public Item get(ItemStack itemStack) {
         String modId = uniqueId.modId;
         String internalName = uniqueId.name;
 
+        // We can't just call itemStack.getItemDamage(), because that may have been overridden
+        // to return something other than the raw ItemStack.itemDamage field.
+        int itemDamage = Items.feather.getDamage(itemStack);
+
         String nbt = "";
         if (itemStack.hasTagCompound()) {
             nbt = itemStack.getTagCompound().toString();
@@ -63,7 +68,7 @@ public Item get(ItemStack itemStack) {
                     itemStack.getUnlocalizedName(),
                     StringUtil.stripFormatting(itemStack.getDisplayName()),
                     ItemUtil.getItemId(itemStack),
-                    itemStack.getItemDamage(),
+                    itemDamage,
                     nbt,
                     tooltip,
                     itemStack.getMaxStackSize(),
@@ -84,7 +89,7 @@ public Item get(ItemStack itemStack) {
                     "ERROR",
                     "ERROR",
                     ItemUtil.getItemId(itemStack),
-                    itemStack.getItemDamage(),
+                    itemDamage,
                     nbt,
                     stackTrace,
                     itemStack.getMaxStackSize(),