Fix accidentally undid head fix, add null check

Signed-off-by: roadhog360 <[email protected]>

Author: Roadhog360

src/main/java/roadhog360/simpleskinbackport/core/Utils.java

@@ -57,7 +57,8 @@ public static boolean isDefaultSkinSlim(UUID uuid) {
 
     public static boolean getSlimFromBase64Data(String base64) {
         JsonObject props = new Gson().fromJson(new String(Base64.getDecoder().decode(base64), StandardCharsets.UTF_8), JsonObject.class);
-        return props.getAsJsonObject("textures").getAsJsonObject("SKIN").getAsJsonObject("metadata").get("model").getAsString().equals("slim");
+        JsonObject medatata = props.getAsJsonObject("textures").getAsJsonObject("SKIN").getAsJsonObject("metadata");
+        return medatata != null && medatata.get("model").getAsString().equals("slim");
     }
 
     /**

src/main/java/roadhog360/simpleskinbackport/mixins/early/MixinSkinManager.java

@@ -6,8 +6,10 @@
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import net.minecraft.client.renderer.ImageBufferDownload;
 import net.minecraft.client.resources.SkinManager;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -24,7 +26,7 @@ private ResourceLocation changeDownloadLocation(String p_i1293_1_, Operation<Res
                                                     @Local(argsOnly = true) final MinecraftProfileTexture.Type p_152789_2_,
                                                     @Local(argsOnly = true) final SkinManager.SkinAvailableCallback p_152789_3_
                                                     ) {
-        if(p_152789_2_ == MinecraftProfileTexture.Type.SKIN) {
+        if(simpleSkinBackport$isNewPlayerWithPlayerData(p_152789_2_, p_152789_3_)) {
             return new ResourceLocation(SimpleSkinBackport.MODID, p_i1293_1_);
         }
         return original.call(p_i1293_1_);
@@ -34,7 +36,7 @@ private ResourceLocation changeDownloadLocation(String p_i1293_1_, Operation<Res
     private ImageBufferDownload changeDownloadBufferManager(Operation<ImageBufferDownload> original,
                                                             @Local(argsOnly = true) final MinecraftProfileTexture.Type p_152789_2_,
                                                             @Local(argsOnly = true) SkinManager.SkinAvailableCallback p_152789_3_) {
-        if(p_152789_2_ == MinecraftProfileTexture.Type.SKIN) {
+        if(simpleSkinBackport$isNewPlayerWithPlayerData(p_152789_2_, p_152789_3_)) {
             return new ImageBufferDownloadPlayerSkin();
         }
         return original.call();
@@ -44,10 +46,15 @@ private ImageBufferDownload changeDownloadBufferManager(Operation<ImageBufferDow
         at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;func_152121_a(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;)V",
         shift = At.Shift.AFTER))
     private void injectCallbackSkinCheck(MinecraftProfileTexture p_152789_1_, MinecraftProfileTexture.Type p_152789_2_, SkinManager.SkinAvailableCallback p_152789_3_, CallbackInfoReturnable<ResourceLocation> cir) {
-        if(p_152789_2_ == MinecraftProfileTexture.Type.SKIN && p_152789_3_ instanceof INewModelData playerData) {
+        if(simpleSkinBackport$isNewPlayerWithPlayerData(p_152789_2_, p_152789_3_) && p_152789_3_ instanceof INewModelData playerData) {
             if(Objects.equals(p_152789_1_.getMetadata("model"), "slim")) {
                 playerData.simpleSkinBackport$setSlim(true);
             }
         }
     }
+
+    @Unique
+    private boolean simpleSkinBackport$isNewPlayerWithPlayerData(final MinecraftProfileTexture.Type type, SkinManager.SkinAvailableCallback callback) {
+        return type == MinecraftProfileTexture.Type.SKIN && callback instanceof EntityPlayer;
+    }
 }