Fix #3, add hat layers on head blocks

Signed-off-by: roadhog360 <[email protected]>
#3 was fixed with an overall better way to detect skins; Turns out they actually added this to the metadata all along in a way that 1.7 was able to detect!

Author: Roadhog360

README.md

@@ -14,10 +14,10 @@ Current Features:
   - Extended hat layer support
 - Translucent hat layer support
 - Fix overlap in hat layer when wearing a head
+- Hat layers on head blocks
 - New default skins alongside just Steve
 
 Todo:
-- Hat layers on head blocks
 - Config
   - Toggle head block inventory icon render
   - Toggle new default skins (Either Steve/Alex or JUST Steve)

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

@@ -1,11 +1,15 @@
 package roadhog360.simpleskinbackport.core;
 
+import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
 import net.minecraft.util.ResourceLocation;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
+import java.util.Map;
 import java.util.UUID;
 
 public class Utils {
@@ -56,6 +60,23 @@ public static boolean getSlimFromBase64Data(String base64) {
         return props.getAsJsonObject("textures").getAsJsonObject("SKIN").getAsJsonObject("metadata").get("model").getAsString().equals("slim");
     }
 
+    /**
+     * null == could not get slim state from game profile
+     * Unused but might be needed in the future
+     * @param profile
+     * @return
+     */
+    public static Boolean getSlimFromGameProfile(GameProfile profile) {
+        if(profile.getProperties().containsKey("textures")) {
+            for(Property property : profile.getProperties().get("textures")) {
+                if(property.getName().equals("textures")) {
+                    return Utils.getSlimFromBase64Data(property.getValue());
+                }
+            }
+        }
+        return null;
+    }
+
     public static String getCallerClassName() {
         StackTraceElement[] stElements = Thread.currentThread().getStackTrace();
         String callerClassName = null;
@@ -72,9 +93,8 @@ public static String getCallerClassName() {
         return null;
     }
 
-    private static final ThreadLocal<Boolean> isDownloadingPlayerSkin = ThreadLocal.withInitial(() -> false);
-
-    public static boolean getIsDownloadingPlayerSkin() {
-        return isDownloadingPlayerSkin.get();
-    }
+    /**
+     * null == not cached
+     */
+    public static final Map<String, Boolean> HASH_CACHE = Maps.newHashMap();
 }

src/main/java/roadhog360/simpleskinbackport/mixinplugin/SimpleSkinBackportEarlyMixins.java

@@ -26,6 +26,7 @@ public List<String> getMixins(Set<String> loadedCoreMods) {
             mixins.add("MixinAbstractClientPlayer");
             mixins.add("MixinModelBiped");
             mixins.add("MixinSkinManager");
+            mixins.add("MixinModelSkull");
         }
         return mixins;
     }

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

@@ -0,0 +1,29 @@
+package roadhog360.simpleskinbackport.mixins.early;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.model.ModelSkeletonHead;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+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.CallbackInfo;
+import roadhog360.simpleskinbackport.client.models.ModelHatLayer;
+
+@Mixin(ModelSkeletonHead.class)
+public abstract class MixinModelSkull extends ModelBase {
+
+    @Shadow
+    public ModelRenderer skeletonHead;
+    @Unique
+    ModelHatLayer simpleSkinBackport$bipedHeadwear;
+
+    @Inject(method = "<init>(IIII)V", at = @At(value = "TAIL"))
+    private void addHeadwear(int p_i1155_1_, int p_i1155_2_, int p_i1155_3_, int p_i1155_4_, CallbackInfo ci) {
+        simpleSkinBackport$bipedHeadwear = new ModelHatLayer(this, 32, 0);
+        simpleSkinBackport$bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, p_i1155_1_ + 0.5F);
+        simpleSkinBackport$bipedHeadwear.setRotationPoint(0.0F, 0.0F + p_i1155_2_, 0.0F);
+        skeletonHead.addChild(simpleSkinBackport$bipedHeadwear);
+    }
+}

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

@@ -3,32 +3,58 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.client.entity.AbstractClientPlayer;
+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;
+import roadhog360.simpleskinbackport.SimpleSkinBackport;
 import roadhog360.simpleskinbackport.client.ImageBufferDownloadPlayerSkin;
+import roadhog360.simpleskinbackport.ducks.INewModelData;
+
+import java.util.Objects;
 
 @Mixin(value = SkinManager.class, priority = 1100)
 public class MixinSkinManager {
     @WrapOperation(method = "func_152789_a", at = @At(value = "NEW", target = "(Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation;"))
-    private ResourceLocation changeDownloadLocation(String p_i1293_1_, Operation<ResourceLocation> original, @Local SkinManager.SkinAvailableCallback p_152789_3_) {
-        if(p_152789_3_ instanceof AbstractClientPlayer) {
-            String[] string = p_i1293_1_.split("/");
-            if(string.length == 2) {
-                return original.call(string[0] + "/64/" + string[1]);
-            }
+    private ResourceLocation changeDownloadLocation(String p_i1293_1_, Operation<ResourceLocation> original,
+                                                    @Local(argsOnly = true) final MinecraftProfileTexture.Type p_152789_2_,
+                                                    @Local(argsOnly = true) final SkinManager.SkinAvailableCallback p_152789_3_
+                                                    ) {
+        if(simpleSkinBackport$isNewPlayerWithPlayerData(p_152789_2_, p_152789_3_)) {
+            return new ResourceLocation(SimpleSkinBackport.MODID, p_i1293_1_);
         }
         return original.call(p_i1293_1_);
     }
 
     @WrapOperation(method = "func_152789_a", at = @At(value = "NEW", target = "()Lnet/minecraft/client/renderer/ImageBufferDownload;"))
-    private ImageBufferDownload changeDownloadBufferManager(Operation<ImageBufferDownload> original, @Local SkinManager.SkinAvailableCallback p_152789_3_) {
-        if(p_152789_3_ instanceof AbstractClientPlayer) {
+    private ImageBufferDownload changeDownloadBufferManager(Operation<ImageBufferDownload> original,
+                                                            @Local(argsOnly = true) final MinecraftProfileTexture.Type p_152789_2_,
+                                                            @Local(argsOnly = true) SkinManager.SkinAvailableCallback p_152789_3_) {
+        if(simpleSkinBackport$isNewPlayerWithPlayerData(p_152789_2_, p_152789_3_)) {
             return new ImageBufferDownloadPlayerSkin();
         }
         return original.call();
     }
+
+    @Inject(method = "func_152789_a",
+        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(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;
+    }
 }