move disabling features

Author: moehreag

src/main/java/io/github/axolotlclient/mixin/ConnectScreenMixin.java

@@ -0,0 +1,17 @@
+package io.github.axolotlclient.mixin;
+
+import io.github.axolotlclient.util.FeatureDisabler;
+import net.minecraft.client.gui.screen.ConnectScreen;
+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;
+
+@Mixin(ConnectScreen.class)
+public abstract class ConnectScreenMixin {
+
+    @Inject(method = "connect", at = @At("HEAD"))
+    private void onServerJoin(String address, int port, CallbackInfo ci){
+        FeatureDisabler.onServerJoin(address);
+    }
+}

src/main/java/io/github/axolotlclient/mixin/MultiplayerScreenMixin.java

@@ -16,15 +16,11 @@
 public abstract class MultiplayerScreenMixin {
 
     @Inject(method = "init", at = @At("HEAD"))
-    public void freePlayerData(CallbackInfo ci){
-        if(HypixelMods.getInstance().cacheMode.get()!=null && Objects.equals(HypixelMods.getInstance().cacheMode.get(), HypixelMods.HypixelApiCacheMode.ON_CLIENT_DISCONNECT.toString())) {
+    public void freePlayerData(CallbackInfo ci) {
+        if (HypixelMods.getInstance().cacheMode.get() != null && Objects.equals(HypixelMods.getInstance().cacheMode.get(), HypixelMods.HypixelApiCacheMode.ON_CLIENT_DISCONNECT.toString())) {
             HypixelAbstractionLayer.clearPlayerData();
         }
         FeatureDisabler.clear();
     }
 
-    @Inject(method = "connect(Lnet/minecraft/client/network/ServerInfo;)V", at = @At("HEAD"))
-    public void onServerJoin(ServerInfo entry, CallbackInfo ci){
-        FeatureDisabler.onServerJoin(entry);
-    }
 }

src/main/java/io/github/axolotlclient/modules/hud/gui/hud/simple/CPSHud.java

@@ -2,7 +2,6 @@
 
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.Option;
-import io.github.axolotlclient.AxolotlclientConfig.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.entry.SimpleTextHudEntry;
 import io.github.axolotlclient.util.Hooks;
 import net.minecraft.client.MinecraftClient;

src/main/java/io/github/axolotlclient/util/FeatureDisabler.java

@@ -18,8 +18,8 @@ public static void init(){
         setServers(Freelook.getInstance().enabled, "hypixel", "mineplex", "gommehd", "nucleoid");
     }
 
-    public static void onServerJoin(ServerInfo info){
-        disabledServers.forEach((option, strings) -> disableOption(option, strings, info.address));
+    public static void onServerJoin(String address){
+        disabledServers.forEach((option, strings) -> disableOption(option, strings, address));
     }
 
     public static void clear(){

src/main/resources/axolotlclient.mixins.json

@@ -12,6 +12,7 @@
     "ClientPlayerEntityMixin",
     "ClientPlayNetworkHandlerMixin",
     "ClientWorldMixin",
+    "ConnectScreenMixin",
     "ControlsOptionsScreenMixin",
     "DebugHudMixin",
     "DownloadingTerrainScreenMixin",