diff --git a/core/src/main/java/org/geysermc/geyser/item/type/ArmorItem.java b/core/src/main/java/org/geysermc/geyser/item/type/ArmorItem.java
index ba7f05205..33ff6a7d8 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/ArmorItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/ArmorItem.java
@@ -52,16 +52,15 @@ public class ArmorItem extends Item {
 
         ArmorTrim trim = components.get(DataComponentType.TRIM);
         if (trim != null) {
-            // TODO material IDs
-            String material = trim.getMaterial().getAssetName();
-            String pattern = trim.getPattern().getAssetId();
-
             // discard custom trim patterns/materials to prevent visual glitches on bedrock
-            if (!material.startsWith("minecraft:")
-                    || !pattern.startsWith("minecraft:")) {
+            if (trim.getMaterial().isCustom() || trim.getPattern().isCustom()) {
                 return;
             }
 
+            // TODO material IDs
+            String material = trim.getMaterial().getCustomValue().getAssetName();
+            String pattern = trim.getPattern().getCustomValue().getAssetId();
+
             NbtMapBuilder trimBuilder = NbtMap.builder();
             // bedrock has an uppercase first letter key, and the value is not namespaced
             trimBuilder.put("Material", stripNamespace(material));
diff --git a/core/src/main/java/org/geysermc/geyser/item/type/GoatHornItem.java b/core/src/main/java/org/geysermc/geyser/item/type/GoatHornItem.java
index 48e75dc79..35b7a76fc 100644
--- a/core/src/main/java/org/geysermc/geyser/item/type/GoatHornItem.java
+++ b/core/src/main/java/org/geysermc/geyser/item/type/GoatHornItem.java
@@ -25,6 +25,7 @@
 
 package org.geysermc.geyser.item.type;
 
+import com.github.steveice10.mc.protocol.data.game.Holder;
 import com.github.steveice10.mc.protocol.data.game.item.ItemStack;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponentType;
 import com.github.steveice10.mc.protocol.data.game.item.component.DataComponents;
@@ -60,7 +61,7 @@ public class GoatHornItem extends Item {
         if (components == null) {
             return builder;
         }
-        Instrument instrument = components.get(DataComponentType.INSTRUMENT);
+        Holder<Instrument> instrument = components.get(DataComponentType.INSTRUMENT);
         // TODO registry
         if (instrument != null) {
             // Drop the Minecraft namespace if applicable
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5e2720942..4189f8857 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ protocol-connection = "3.0.0.Beta1-20240411.165033-128"
 raknet = "1.0.0.CR3-20240416.144209-1"
 blockstateupdater="1.20.80-20240411.142413-1"
 mcauthlib = "d9d773e"
-mcprotocollib = "2a7176f7ee" # Revert from jitpack after release
+mcprotocollib = "8bc6990525" # Revert from jitpack after release
 adventure = "4.14.0"
 adventure-platform = "4.3.0"
 junit = "5.9.2"