From fc525709513d04fe80ff6722c0cb15aac8fd22b8 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 5 Nov 2023 21:32:27 -0500 Subject: [PATCH 1/2] Update cache_profile_texture_url for 1.20.2 --- .../perf/cache_profile_texture_url/SkinManagerMixin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java index 2b4047d6..d90a4b79 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -@Mixin(SkinManager.class) +@Mixin(targets = {"net/minecraft/client/resources/SkinManager$TextureCache" }) public class SkinManagerMixin { @Unique private final Cache mfix$hashCache = CacheBuilder.newBuilder() @@ -20,7 +20,7 @@ public class SkinManagerMixin { .concurrencyLevel(1) .build(); - @Redirect(method = "registerTexture(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinTextureCallback;)Lnet/minecraft/resources/ResourceLocation;", + @Redirect(method = { "getOrLoad", "registerTexture" }, at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;getHash()Ljava/lang/String;", remap = false)) private String useCachedHash(MinecraftProfileTexture texture) { // avoid lambda allocation for common case From 894173cf1d261fd43486f258416e545cd39f9288 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 5 Nov 2023 21:35:15 -0500 Subject: [PATCH 2/2] Remove unused import --- .../mixin/perf/cache_profile_texture_url/SkinManagerMixin.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java index d90a4b79..9870940c 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java @@ -3,7 +3,6 @@ package org.embeddedt.modernfix.common.mixin.perf.cache_profile_texture_url; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import net.minecraft.client.resources.SkinManager; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At;