Fix items not having a gameprofile in <= 1.20.4. Fix #150

tr7zw · Apr 23, 2024 · b10dee1 · b10dee1
1 parent ee820f2
commit b10dee1
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/src/main/java/dev/tr7zw/skinlayers/util/NMSWrapper.java b/src/main/java/dev/tr7zw/skinlayers/util/NMSWrapper.java
@@ -83,20 +83,7 @@ public static ResourceLocation getPlayerSkin(GameProfile gameprofile) {
 
     public static GameProfile getGameProfile(ItemStack itemStack) {
         // spotless:off 
-        //#if MC <= 12004
-        //$ if (itemStack.hasTag()) {
-        //$     CompoundTag compoundTag = itemStack.getTag();
-        //$     if (compoundTag.contains("CustomModelData")) {
-        //$         return null; // do not try to 3d-fy custom head models
-        //$     }
-        //$     if (compoundTag.contains("SkullOwner", 10)) {
-        //$         return NbtUtils.readGameProfile(compoundTag.getCompound("SkullOwner"));
-        //$     } else if (compoundTag.contains("SkullOwner", 8)
-        //$             && !StringUtils.isBlank(compoundTag.getString("SkullOwner"))) {
-        //$         return new GameProfile(Util.NIL_UUID, compoundTag.getString("SkullOwner"));
-        //$     }
-        //$ }
-        //#else
+        //#if MC >= 12005
         if(itemStack.getComponents().has(DataComponents.CUSTOM_MODEL_DATA)) {
             return null;
         }
@@ -113,9 +100,23 @@ public static GameProfile getGameProfile(ItemStack itemStack) {
                 return resolvableProfile.gameProfile();
             }
         }
+        return null;
+        //#else
+        //$$ if (itemStack.hasTag()) {
+        //$$     CompoundTag compoundTag = itemStack.getTag();
+        //$$     if (compoundTag.contains("CustomModelData")) {
+        //$$         return null; // do not try to 3d-fy custom head models
+        //$$     }
+        //$$     if (compoundTag.contains("SkullOwner", 10)) {
+        //$$         return NbtUtils.readGameProfile(compoundTag.getCompound("SkullOwner"));
+        //$$     } else if (compoundTag.contains("SkullOwner", 8)
+        //$$             && !StringUtils.isBlank(compoundTag.getString("SkullOwner"))) {
+        //$$         return new GameProfile(Util.NIL_UUID, compoundTag.getString("SkullOwner"));
+        //$$     }
+        //$$ }
+        //$$ return null;
         //#endif
         //spotless:on
-        return null;
     }
 
 }