From f83235cf9607a84906b6e28dd4bc8f7e5675c40e Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sat, 8 Apr 2023 12:57:07 -0400
Subject: [PATCH] Remove unused parameter in NBT translation

---
 .../org/geysermc/geyser/item/type/AxolotlBucketItem.java    | 5 ++---
 .../main/java/org/geysermc/geyser/item/type/BannerItem.java | 4 ++--
 .../java/org/geysermc/geyser/item/type/CompassItem.java     | 4 ++--
 .../java/org/geysermc/geyser/item/type/CrossbowItem.java    | 6 +++---
 .../org/geysermc/geyser/item/type/DyeableArmorItem.java     | 4 ++--
 .../geysermc/geyser/item/type/DyeableHorseArmorItem.java    | 4 ++--
 .../org/geysermc/geyser/item/type/EnchantedBookItem.java    | 5 ++---
 .../org/geysermc/geyser/item/type/FireworkRocketItem.java   | 4 ++--
 .../org/geysermc/geyser/item/type/FireworkStarItem.java     | 4 ++--
 .../java/org/geysermc/geyser/item/type/FishingRodItem.java  | 5 ++---
 core/src/main/java/org/geysermc/geyser/item/type/Item.java  | 2 +-
 .../main/java/org/geysermc/geyser/item/type/MapItem.java    | 4 ++--
 .../java/org/geysermc/geyser/item/type/PlayerHeadItem.java  | 5 ++---
 .../org/geysermc/geyser/item/type/ReadableBookItem.java     | 4 ++--
 .../java/org/geysermc/geyser/item/type/ShulkerBoxItem.java  | 4 ++--
 .../geysermc/geyser/item/type/TropicalFishBucketItem.java   | 5 ++---
 .../geyser/translator/inventory/item/ItemTranslator.java    | 2 +-
 17 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/item/type/AxolotlBucketItem.java b/core/src/main/java/org/geysermc/geyser/item/type/AxolotlBucketItem.java
index d475fb5d8..cd53cf904 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/AxolotlBucketItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/AxolotlBucketItem.java
@@ -28,7 +28,6 @@ package org.geysermc.geyser.item.type;
 import com.github.steveice10.opennbt.tag.builtin.ByteTag;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
-import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.text.MinecraftLocale;
 import org.jetbrains.annotations.NotNull;
@@ -39,8 +38,8 @@ public class AxolotlBucketItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(@NotNull GeyserSession session, @NotNull CompoundTag tag, @NotNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NotNull GeyserSession session, @NotNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         // Bedrock Edition displays the properties of the axolotl. Java does not.
         // To work around this, set the custom name to the Axolotl translation and it's displayed correctly
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/BannerItem.java b/core/src/main/java/org/geysermc/geyser/item/type/BannerItem.java
index 306bf2114..920f9e168 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/BannerItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/BannerItem.java
@@ -121,8 +121,8 @@ public class BannerItem extends BlockItem {
     }
 
     @Override
-    public void translateNbtToBedrock(@NotNull GeyserSession session, @NotNull CompoundTag tag, @NotNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NotNull GeyserSession session, @NotNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         CompoundTag blockEntityTag = tag.remove("BlockEntityTag");
         if (blockEntityTag != null && blockEntityTag.get("Patterns") instanceof ListTag patterns) {
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/CompassItem.java b/core/src/main/java/org/geysermc/geyser/item/type/CompassItem.java
index a543c7df8..d1ed6f6b8 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/CompassItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/CompassItem.java
@@ -57,8 +57,8 @@ public class CompassItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(GeyserSession session, CompoundTag tag, ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(GeyserSession session, CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         Tag lodestoneTag = tag.get("LodestoneTracked");
         if (lodestoneTag instanceof ByteTag) {
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/CrossbowItem.java b/core/src/main/java/org/geysermc/geyser/item/type/CrossbowItem.java
index b2ca3a449..c0f37086b 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/CrossbowItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/CrossbowItem.java
@@ -39,8 +39,8 @@ public class CrossbowItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag, @NonNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         ListTag chargedProjectiles = tag.get("ChargedProjectiles");
         if (chargedProjectiles != null) {
@@ -50,7 +50,7 @@ public class CrossbowItem extends Item {
                 ItemMapping projectileMapping = session.getItemMappings().getMapping((String) projectile.get("id").getValue());
                 if (projectileMapping == null) return;
                 CompoundTag projectileTag = projectile.get("tag");
-                ItemStack itemStack = new ItemStack(mapping.getJavaItem().javaId(), (byte) projectile.get("Count").getValue(), projectileTag);
+                ItemStack itemStack = new ItemStack(projectileMapping.getJavaItem().javaId(), (byte) projectile.get("Count").getValue(), projectileTag);
                 ItemData itemData = ItemTranslator.translateToBedrock(session, itemStack);
 
                 CompoundTag newProjectile = new CompoundTag("chargedItem");
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/DyeableArmorItem.java b/core/src/main/java/org/geysermc/geyser/item/type/DyeableArmorItem.java
index 71b8b35da..dbcff7d0b 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/DyeableArmorItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/DyeableArmorItem.java
@@ -38,8 +38,8 @@ public class DyeableArmorItem extends ArmorItem implements DyeableLeatherItem {
     }
 
     @Override
-    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag, @NonNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         DyeableLeatherItem.translateNbtToBedrock(tag);
     }
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/DyeableHorseArmorItem.java b/core/src/main/java/org/geysermc/geyser/item/type/DyeableHorseArmorItem.java
index 4312d7328..0d37f5eab 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/DyeableHorseArmorItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/DyeableHorseArmorItem.java
@@ -37,8 +37,8 @@ public class DyeableHorseArmorItem extends Item implements DyeableLeatherItem {
     }
 
     @Override
-    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag, @NonNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         DyeableLeatherItem.translateNbtToBedrock(tag);
     }
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/EnchantedBookItem.java b/core/src/main/java/org/geysermc/geyser/item/type/EnchantedBookItem.java
index 134c2c474..f7743e430 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/EnchantedBookItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/EnchantedBookItem.java
@@ -28,7 +28,6 @@ package org.geysermc.geyser.item.type;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.ListTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
-import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
 
 import java.util.ArrayList;
@@ -40,8 +39,8 @@ public class EnchantedBookItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(GeyserSession session, CompoundTag tag, ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(GeyserSession session, CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         List<Tag> newTags = new ArrayList<>();
         Tag enchantmentTag = tag.remove("StoredEnchantments");
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/FireworkRocketItem.java b/core/src/main/java/org/geysermc/geyser/item/type/FireworkRocketItem.java
index 9fb34e90b..3559cdf4d 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/FireworkRocketItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/FireworkRocketItem.java
@@ -38,8 +38,8 @@ public class FireworkRocketItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag, @NonNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         CompoundTag fireworks = tag.get("Fireworks");
         if (fireworks == null) {
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/FireworkStarItem.java b/core/src/main/java/org/geysermc/geyser/item/type/FireworkStarItem.java
index 0a2d556e5..9c13d7793 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/FireworkStarItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/FireworkStarItem.java
@@ -39,8 +39,8 @@ public class FireworkStarItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag, @NonNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         Tag explosion = tag.remove("Explosion");
         if (explosion instanceof CompoundTag) {
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/FishingRodItem.java b/core/src/main/java/org/geysermc/geyser/item/type/FishingRodItem.java
index c466df1af..96241deb3 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/FishingRodItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/FishingRodItem.java
@@ -28,7 +28,6 @@ package org.geysermc.geyser.item.type;
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.IntTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
-import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
 
 public class FishingRodItem extends Item {
@@ -37,8 +36,8 @@ public class FishingRodItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(GeyserSession session, CompoundTag tag, ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(GeyserSession session, CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         // Fix damage inconsistency
         Tag damage = tag.get("Damage");
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/Item.java b/core/src/main/java/org/geysermc/geyser/item/type/Item.java
index 2498f2987..ad4ef5533 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/Item.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/Item.java
@@ -114,7 +114,7 @@ public class Item {
     /**
      * Takes NBT from Java Edition and converts any value that Bedrock parses differently.
      */
-    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag, @NonNull ItemMapping mapping) {
+    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag) {
         if (tag.get("display") instanceof CompoundTag displayTag) {
             if (displayTag.get("Lore") instanceof ListTag listTag) {
                 List<Tag> lore = new ArrayList<>();
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/MapItem.java b/core/src/main/java/org/geysermc/geyser/item/type/MapItem.java
index 1eca75513..cd63a3799 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/MapItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/MapItem.java
@@ -35,8 +35,8 @@ public class MapItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(GeyserSession session, CompoundTag tag, ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(GeyserSession session, CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         Tag mapId = tag.remove("map");
         if (mapId == null || !(mapId.getValue() instanceof Number number)) return;
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/PlayerHeadItem.java b/core/src/main/java/org/geysermc/geyser/item/type/PlayerHeadItem.java
index 4e98894ec..5c985c732 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/PlayerHeadItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/PlayerHeadItem.java
@@ -29,7 +29,6 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.text.ChatColor;
 import org.geysermc.geyser.text.MinecraftLocale;
@@ -40,8 +39,8 @@ public class PlayerHeadItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag, @NonNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         Tag display = tag.get("display");
         if (!(display instanceof CompoundTag) || !((CompoundTag) display).contains("Name")) {
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/ReadableBookItem.java b/core/src/main/java/org/geysermc/geyser/item/type/ReadableBookItem.java
index a19b0f79b..814a6264e 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/ReadableBookItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/ReadableBookItem.java
@@ -46,8 +46,8 @@ public class ReadableBookItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag, @NonNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         ListTag pagesTag = tag.remove("pages");
         if (pagesTag == null) {
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/ShulkerBoxItem.java b/core/src/main/java/org/geysermc/geyser/item/type/ShulkerBoxItem.java
index 1df33574a..49828e475 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/ShulkerBoxItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/ShulkerBoxItem.java
@@ -39,8 +39,8 @@ public class ShulkerBoxItem extends BlockItem {
     }
 
     @Override
-    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag, @NonNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         CompoundTag blockEntityTag = tag.get("BlockEntityTag");
         if (blockEntityTag == null) {
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/TropicalFishBucketItem.java b/core/src/main/java/org/geysermc/geyser/item/type/TropicalFishBucketItem.java
index 4004a56e3..8b4e35d1e 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/TropicalFishBucketItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/TropicalFishBucketItem.java
@@ -32,7 +32,6 @@ import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.geyser.entity.type.living.animal.TropicalFishEntity;
-import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.text.MinecraftLocale;
 import org.geysermc.geyser.translator.text.MessageTranslator;
@@ -48,8 +47,8 @@ public class TropicalFishBucketItem extends Item {
     }
 
     @Override
-    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag, @NonNull ItemMapping mapping) {
-        super.translateNbtToBedrock(session, tag, mapping);
+    public void translateNbtToBedrock(@NonNull GeyserSession session, @NonNull CompoundTag tag) {
+        super.translateNbtToBedrock(session, tag);
 
         // Prevent name from appearing as "Bucket of"
         tag.put(new ByteTag("AppendCustomName", (byte) 1));
diff --git a/core/src/main/java/org/geysermc/geyser/translator/inventory/item/ItemTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/ItemTranslator.java
index 07f5c2aeb..d2c87eae8 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/inventory/item/ItemTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/item/ItemTranslator.java
@@ -112,7 +112,7 @@ public final class ItemTranslator {
         CompoundTag nbt = tag != null ? tag.clone() : null;
 
         if (nbt != null) {
-            javaItem.translateNbtToBedrock(session, nbt, bedrockItem);
+            javaItem.translateNbtToBedrock(session, nbt);
         }
 
         nbt = translateDisplayProperties(session, nbt, bedrockItem);