Remove account mixins (meteor added them), Fix account not working in…

… prod env. (#232)
AntiCope · Mar 18, 2023 · 5ea6ad2 · 5ea6ad2
1 parent 9c8b2a1
commit 5ea6ad2
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 124 deletions.
diff --git a/src/main/java/anticope/rejects/mixin/MinecraftClientAccessor.java b/src/main/java/anticope/rejects/mixin/MinecraftClientAccessor.java
diff --git a/src/main/java/anticope/rejects/mixin/PlayerSkinProviderAccessor.java b/src/main/java/anticope/rejects/mixin/PlayerSkinProviderAccessor.java
diff --git a/src/main/java/anticope/rejects/mixin/meteor/AccountMixin.java b/src/main/java/anticope/rejects/mixin/meteor/AccountMixin.java
@@ -6,7 +6,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 
-@Mixin(value = Account.class, remap = false)
+@Mixin(value = Account.class)
 public class AccountMixin {
     @ModifyArg(method = "toTag", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/NbtCompound;putString(Ljava/lang/String;Ljava/lang/String;)V", ordinal = 0), index = 1)
     private String putString(String key) {

diff --git a/src/main/java/anticope/rejects/mixin/meteor/AccountsMixin.java b/src/main/java/anticope/rejects/mixin/meteor/AccountsMixin.java
@@ -11,7 +11,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
-@Mixin(value = Accounts.class, remap = false)
+@Mixin(value = Accounts.class)
 public class AccountsMixin {
     @Inject(method = "lambda$fromTag$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/NbtCompound;getString(Ljava/lang/String;)Ljava/lang/String;"), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true)
     private static void onFromTag(NbtElement tag1, CallbackInfoReturnable<Account<?>> cir, NbtCompound t) {

diff --git a/src/main/java/anticope/rejects/utils/accounts/AccountUtils.java b/src/main/java/anticope/rejects/utils/accounts/AccountUtils.java
diff --git a/src/main/java/anticope/rejects/utils/accounts/CustomYggdrasilAccount.java b/src/main/java/anticope/rejects/utils/accounts/CustomYggdrasilAccount.java
@@ -1,6 +1,7 @@
 package anticope.rejects.utils.accounts;
 
 import com.mojang.authlib.exceptions.AuthenticationException;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
 import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.mixin.MinecraftClientAccessor;
 import meteordevelopment.meteorclient.systems.accounts.Account;
@@ -37,9 +38,12 @@ public boolean fetchInfo() {
     @Override
     public boolean login() {
         try {
-            Session session = CustomYggdrasilLogin.login(name, password, server);
             CustomYggdrasilLogin.LocalYggdrasilAuthenticationService service = new CustomYggdrasilLogin.LocalYggdrasilAuthenticationService(((MinecraftClientAccessor) mc).getProxy(), server);
-            CustomYggdrasilLogin.applyYggdrasilAccount(service, session);
+            MinecraftSessionService sessService = new CustomYggdrasilLogin.LocalYggdrasilMinecraftSessionService(service, service.server);
+            applyLoginEnvironment(service, sessService);
+
+            Session session = CustomYggdrasilLogin.login(name, password, server);
+            setSession(session);
             cache.username = session.getUsername();
             cache.loadHead();
             return true;

diff --git a/src/main/java/anticope/rejects/utils/accounts/CustomYggdrasilLogin.java b/src/main/java/anticope/rejects/utils/accounts/CustomYggdrasilLogin.java
@@ -9,7 +9,6 @@
 import com.mojang.authlib.exceptions.AuthenticationException;
 import com.mojang.authlib.minecraft.InsecureTextureException;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
-import com.mojang.authlib.minecraft.MinecraftSessionService;
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
 import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService;
@@ -56,11 +55,6 @@ public static Session login(String name, String password, String server) throws
         }
     }
 
-    public static void applyYggdrasilAccount(LocalYggdrasilAuthenticationService authService, Session session) {
-        MinecraftSessionService service = new LocalYggdrasilMinecraftSessionService(authService, authService.server);
-        AccountUtils.applyLoginEnvironment(authService, service, session);
-    }
-
     public static class LocalYggdrasilApi implements Environment {
         private final String url;
 

diff --git a/src/main/resources/meteor-rejects.mixins.json b/src/main/resources/meteor-rejects.mixins.json
@@ -12,11 +12,9 @@
     "GameRendererMixin",
     "LivingEntityMixin",
     "LivingEntityRendererMixin",
-    "MinecraftClientAccessor",
     "MultiplayerScreenAccessor",
     "MultiplayerScreenMixin",
     "PlayerMoveC2SPacketAccessor",
-    "PlayerSkinProviderAccessor",
     "ServerListAccessor",
     "StructureVoidBlockMixin",
     "TexturedRenderLayersMixin",