From 0f73304a1d9efe9aee3ea0064400b97331144496 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Fri, 31 May 2024 15:17:04 +0200
Subject: [PATCH] Fix trim pattern

---
 .../viaversion/viaversion/api/minecraft/HolderImpl.java   | 8 ++++++++
 .../v1_20_3to1_20_5/rewriter/StructuredDataConverter.java | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/HolderImpl.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/HolderImpl.java
index 58d66f6aa..7020d968a 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/HolderImpl.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/HolderImpl.java
@@ -60,4 +60,12 @@ final class HolderImpl<T> implements Holder<T> {
     public int id() {
         return id;
     }
+
+    @Override
+    public String toString() {
+        return "HolderImpl{" +
+            "value=" + value +
+            ", id=" + id +
+            '}';
+    }
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/StructuredDataConverter.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/StructuredDataConverter.java
index 07d0dcc9d..7ef76a81c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/StructuredDataConverter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/StructuredDataConverter.java
@@ -17,6 +17,7 @@
  */
 package com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter;
 
+import com.google.common.base.Preconditions;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.FloatTag;
 import com.viaversion.nbt.tag.IntArrayTag;
@@ -24,7 +25,6 @@ import com.viaversion.nbt.tag.IntTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
-import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.GameProfile;
 import com.viaversion.viaversion.api.minecraft.HolderSet;
@@ -61,6 +61,7 @@ import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.MapDecorations1_
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.PotionEffects1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.Potions1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.TrimMaterials1_20_3;
+import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.data.TrimPatterns1_20_3;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.storage.BannerPatternStorage;
 import com.viaversion.viaversion.util.ComponentUtil;
 import com.viaversion.viaversion.util.UUIDUtil;
@@ -549,7 +550,7 @@ public final class StructuredDataConverter {
                 patternTag.putBoolean("decal", pattern.decal());
                 trimTag.put("pattern", patternTag);
             } else {
-                final String oldKey = TrimMaterials1_20_3.idToKey(data.pattern().id());
+                final String oldKey = TrimPatterns1_20_3.idToKey(data.pattern().id());
                 if (oldKey != null) {
                     trimTag.putString("pattern", oldKey);
                 }