diff options
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
3 files changed, 16 insertions, 28 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java b/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java index 04761329..a0477cf4 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/PlayerSkinProviderMixin.java @@ -1,30 +1,18 @@ package de.hysky.skyblocker.mixin; +import org.slf4j.Logger; import org.spongepowered.asm.mixin.Mixin; 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 com.llamalad7.mixinextras.injector.WrapWithCondition; import de.hysky.skyblocker.utils.Utils; @Mixin(targets = "net.minecraft.client.texture.PlayerSkinProvider$1") public class PlayerSkinProviderMixin { - //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 MinecraftProfileTextures.fromMap(sessionService.getTextures(profile, false), false); - } catch (Throwable t) { - return MinecraftProfileTextures.EMPTY; - } - } - - return texture; - }*/ + @WrapWithCondition(method = "method_54647", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V")) + private static boolean skyblocker$dontLogInvalidSignatureWarnings(Logger logger, String message, Object profileId) { + return !Utils.isOnHypixel(); + } } diff --git a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java index 7d07f959..47c8780f 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilMinecraftSessionServiceMixin.java @@ -4,8 +4,7 @@ import org.slf4j.Logger; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import com.llamalad7.mixinextras.injector.WrapWithCondition; import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; import de.hysky.skyblocker.utils.Utils; @@ -13,9 +12,9 @@ import de.hysky.skyblocker.utils.Utils; @Mixin(value = YggdrasilMinecraftSessionService.class, remap = false) public class YggdrasilMinecraftSessionServiceMixin { - //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); - }*/ + //TODO perhaps investigate if we could fix this + @WrapWithCondition(method = "unpackTextures", remap = false, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Throwable;)V", ordinal = 0, remap = false)) + private boolean skyblocker$dontLogIncorrectEndingByteExceptions(Logger logger, String message, Throwable throwable) { + return !Utils.isOnHypixel() && throwable instanceof IllegalArgumentException; + } } diff --git a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java index 3c2bbc9a..78c4bac1 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java @@ -1,5 +1,6 @@ package de.hysky.skyblocker.mixin; +import com.llamalad7.mixinextras.injector.WrapWithCondition; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.mojang.authlib.yggdrasil.YggdrasilServicesKeyInfo; @@ -52,8 +53,8 @@ public class YggdrasilServicesKeyInfoMixin { } } - @WrapOperation(method = "validateProperty", remap = false, at = @At(value = "INVOKE", target = "org/slf4j/Logger.error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false)) - private void skyblocker$dontLogFailedSignatureValidation(Logger logger, String message, Object property, Object exception, Operation<Void> operation) { - if (!Utils.isOnHypixel()) operation.call(logger, message, property, exception); + @WrapWithCondition(method = "validateProperty", remap = false, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false)) + private boolean skyblocker$dontLogFailedSignatureValidations(Logger logger, String message, Object property, Object exception) { + return !Utils.isOnHypixel(); } }
\ No newline at end of file |