diff options
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/mixin')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java | 15 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java | 5 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java b/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java index 978835d2..04761329 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java @@ -6,24 +6,25 @@ import org.spongepowered.asm.mixin.injection.At; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.authlib.GameProfile; +import com.mojang.authlib.minecraft.MinecraftProfileTextures; import com.mojang.authlib.minecraft.MinecraftSessionService; import de.hysky.skyblocker.utils.Utils; -import net.minecraft.client.texture.PlayerSkinProvider.Textures; @Mixin(targets = "net.minecraft.client.texture.PlayerSkinProvider$1") public class PlayerSkinProviderMixin { - @ModifyReturnValue(method = "method_52867", at = @At("RETURN")) - private static Textures skyblocker$fixTexturesThatHadAnInvalidSignature(Textures texture, @Local MinecraftSessionService sessionService, @Local GameProfile profile) { - if (Utils.isOnHypixel() && texture == Textures.MISSING) { + //TODO This may not be needed anymore, will need to check + /*@ModifyReturnValue(method = "method_52867", at = @At("RETURN")) + private static MinecraftProfileTextures skyblocker$fixTexturesThatHadAnInvalidSignature(MinecraftProfileTextures texture, @Local MinecraftSessionService sessionService, @Local GameProfile profile) { + if (Utils.isOnHypixel() && texture == MinecraftProfileTextures.EMPTY) { try { - return Textures.fromMap(sessionService.getTextures(profile, false), false); + return MinecraftProfileTextures.fromMap(sessionService.getTextures(profile, false), false); } catch (Throwable t) { - return Textures.MISSING; + return MinecraftProfileTextures.EMPTY; } } return texture; - } + }*/ } diff --git a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java index 8da87be0..7d07f959 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java @@ -13,8 +13,9 @@ import de.hysky.skyblocker.utils.Utils; @Mixin(value = YggdrasilMinecraftSessionService.class, remap = false) public class YggdrasilMinecraftSessionServiceMixin { - @WrapOperation(method = "getSecurePropertyValue", remap = false, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;)V", remap = false)) + //TODO see if a new version of this is needed or not + /*@WrapOperation(method = "getSecurePropertyValue", remap = false, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;)V", remap = false)) private void skyblocker$dontLogMissingSignaturesOrTamperedProperties(Logger logger, String message, Object property, Operation<Void> operation) { if (!Utils.isOnHypixel()) operation.call(logger, message, property); - } + }*/ } |