From 2cecb2d3477ec8cb2747e249d4b395b5379bcbbf Mon Sep 17 00:00:00 2001 From: Phoenix-Starlight Date: Thu, 26 Oct 2023 19:45:10 -0700 Subject: [PATCH] Update cache mixin to 1.20.2 --- .../cache_profile_texture_url/SkinManagerMixin.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java index 426e9c14..3f88e1b7 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java @@ -4,7 +4,6 @@ import com.google.common.cache.CacheBuilder; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import net.minecraft.client.resources.SkinManager; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Mixin; @@ -13,12 +12,12 @@ import org.spongepowered.asm.mixin.injection.At; import java.util.concurrent.TimeUnit; import java.util.Map; -@Mixin(value=SkinManager.class) +@Mixin(targets="net.minecraft.client.resources.SkinManager$TextureCache") @ClientOnlyMixin public abstract class SkinManagerMixin { /** * @author Fury_Phoenix - * @reason No lib mixins on (neo)forge, yet + * @reason No lib mixins on (neo)forge, yet. * **/ @Unique private final Map hashCache = CacheBuilder.newBuilder() @@ -31,12 +30,12 @@ public abstract class SkinManagerMixin { @WrapOperation ( // Mixes (un)obfuscated types - method = "m_118828_", + method = {"getOrLoad", "registerTexture"}, at = @At( value = "INVOKE", - target = "Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;getHash()Ljava/lang/String;" - ), - remap = false + target = "Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;getHash()Ljava/lang/String;", + remap = false + ) ) private String stashCachedHash(MinecraftProfileTexture texture, Operation original) { return hashCache.computeIfAbsent(texture, k -> original.call(k));