From c5e6fa7d0cf406f8e2dde7302741d71f9f340e71 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 24 Apr 2024 10:11:22 +0200
Subject: [PATCH] Fix trim material ids at tail

---
 .../protocol1_20_5to1_20_3/data/TrimMaterials1_20_3.java        | 2 +-
 .../rewriter/BlockItemPacketRewriter1_20_5.java                 | 1 +
 .../rewriter/StructuredDataConverter.java                       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimMaterials1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimMaterials1_20_3.java
index 6f102a8ad..c2c92247a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimMaterials1_20_3.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimMaterials1_20_3.java
@@ -27,11 +27,11 @@ public final class TrimMaterials1_20_3 {
         "copper",
         "diamond",
         "emerald",
-        "quartz",
         "gold",
         "iron",
         "lapis",
         "netherite",
+        "quartz",
         "redstone"
     );
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
index 07b015bc8..c4cc7a9c4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -892,6 +892,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             if (id == -1) {
                 return;
             }
+
             materialHolder = Holder.of(id);
         } else if (materialTag instanceof CompoundTag) {
             final CompoundTag materialCompoundTag = (CompoundTag) materialTag;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
index 1092a686d..dbfdb1ce5 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
@@ -668,6 +668,7 @@ public final class StructuredDataConverter {
         if (unmappedId != -1) {
             return unmappedId;
         }
+
         final IntTag itemBackupTag = tag.getIntTag(ITEM_BACKUP_TAG_KEY);
         if (itemBackupTag != null) {
             tag.remove(ITEM_BACKUP_TAG_KEY);