From 2a047a3544bca085a523c0a542e4d7f105cfa818 Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Thu, 23 Mar 2023 20:32:27 +0100
Subject: [PATCH] Fixed Issue that some beta servers didn't work

---
 .../mixin/fixes/minecraft/screen/MixinConnectScreen_1.java  | 2 +-
 src/main/resources/viafabricplus.mixins.json                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
index 10361f6b..af7fb6d6 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinConnectScreen_1.java
@@ -67,7 +67,7 @@ public class MixinConnectScreen_1 {
     @Shadow
     ServerInfo field_40415;
 
-    @Redirect(method = "run", at = @At(value = "INVOKE", target = "Ljava/net/InetSocketAddress;getHostName()Ljava/lang/String;", ordinal = 1))
+    @Redirect(method = "run", at = @At(value = "INVOKE", target = "Ljava/net/InetSocketAddress;getHostName()Ljava/lang/String;", ordinal = 0))
     public String replaceAddress(InetSocketAddress instance) {
         if (ProtocolHack.isOlderThanOrEqualToOrForced(instance, ProtocolVersion.v1_17) || ProtocolHack.isEqualToOrForced(instance, BedrockProtocolVersion.bedrockLatest))
             return field_33737.getAddress();
diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
index 68957a39..ed1cff35 100644
--- a/src/main/resources/viafabricplus.mixins.json
+++ b/src/main/resources/viafabricplus.mixins.json
@@ -78,8 +78,10 @@
     "fixes.minecraft.input.MixinKeyboard",
     "fixes.minecraft.input.MixinKeyboardInput",
     "fixes.minecraft.input.MixinMouse",
+    "fixes.minecraft.item.MixinArmorItem",
     "fixes.minecraft.item.MixinAxeItem",
     "fixes.minecraft.item.MixinBlockItem",
+    "fixes.minecraft.item.MixinElytraItem",
     "fixes.minecraft.item.MixinEnderPearlItem",
     "fixes.minecraft.item.MixinFireworkRocketItem",
     "fixes.minecraft.item.MixinHeldItemRenderer",
@@ -147,9 +149,7 @@
     "fixes.viaversion.protocol1_9to1_8.MixinEntityTracker1_9",
     "fixes.viaversion.protocol1_9to1_8.MixinMetadataRewriter1_9To1_8",
     "fixes.viaversion.protocol1_9to1_8.MixinMovementTracker",
-    "fixes.viaversion.protocol1_9to1_8.MixinViaIdleThread",
-    "fixes.minecraft.item.MixinArmorItem",
-    "fixes.minecraft.item.MixinElytraItem"
+    "fixes.viaversion.protocol1_9to1_8.MixinViaIdleThread"
   ],
   "injectors": {
     "defaultRequire": 1