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 33ff6a7d8..ab936bd08 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
@@ -53,13 +53,13 @@ public class ArmorItem extends Item {
         ArmorTrim trim = components.get(DataComponentType.TRIM);
         if (trim != null) {
             // discard custom trim patterns/materials to prevent visual glitches on bedrock
-            if (trim.getMaterial().isCustom() || trim.getPattern().isCustom()) {
+            if (trim.material().isCustom() || trim.pattern().isCustom()) {
                 return;
             }
 
             // TODO material IDs
-            String material = trim.getMaterial().getCustomValue().getAssetName();
-            String pattern = trim.getPattern().getCustomValue().getAssetId();
+            String material = trim.material().custom().assetName();
+            String pattern = trim.pattern().custom().assetId();
 
             NbtMapBuilder trimBuilder = NbtMap.builder();
             // bedrock has an uppercase first letter key, and the value is not namespaced
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4189f8857..b7e692ab7 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 = "8bc6990525" # Revert from jitpack after release
+mcprotocollib = "4ee05b62" # Revert from jitpack after release
 adventure = "4.14.0"
 adventure-platform = "4.3.0"
 junit = "5.9.2"