From 49fa8f11d64c2a6947ffc80b3c3b6f9f51af791b Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Mon, 15 Aug 2022 15:51:20 +0200 Subject: [PATCH] Fix multiplayer button unlocking mixin --- .../net/wurstclient/mixin/MinecraftClientMixin.java | 12 ++++++++++++ .../net/wurstclient/mixin/TitleScreenMixin.java | 13 ------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java b/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java index c7d6e4ff..78842c58 100644 --- a/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java +++ b/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java @@ -114,6 +114,18 @@ public abstract class MinecraftClientMixin cir.setReturnValue(wurstSession); } + /** + * Stops the multiplayer button being grayed out if the user's Microsoft + * account is parental-control'd. + */ + @Inject(at = @At("HEAD"), + method = "isMultiplayerEnabled()Z", + cancellable = true) + public void isMultiplayerEnabled(CallbackInfoReturnable cir) + { + cir.setReturnValue(true); + } + @Redirect(at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;session:Lnet/minecraft/client/util/Session;", opcode = Opcodes.GETFIELD, diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 69470a63..9c1ce365 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -11,7 +11,6 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.screen.Screen; @@ -79,16 +78,4 @@ public abstract class TitleScreenMixin extends Screen // happens when ModMenu is installed altsButton.y = realmsButton.y; } - - /** - * Stops the multiplayer button being grayed out if the user's Microsoft - * account is parental-control'd or banned from online play. - */ - @Inject(at = @At("HEAD"), - method = "getMultiplayerDisabledText()Lnet/minecraft/text/Text;", - cancellable = true) - private void onGetMultiplayerDisabledText(CallbackInfoReturnable cir) - { - cir.setReturnValue(null); - } }