From 19a2d1715b561b5a1212f2c58782f2218727b519 Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Mon, 20 Mar 2023 17:07:44 +0100
Subject: [PATCH] fixed classic loading added spacer to buttons

---
 .../de/florianmichael/viafabricplus/ViaFabricPlus.java    | 3 ++-
 .../injection/mixin/base/MixinMultiplayerScreen.java      | 8 ++++----
 .../injection/mixin/bridge/MixinOptionsScreen.java        | 2 --
 .../viafabricplus/screen/ProtocolSelectionScreen.java     | 4 ++--
 .../viafabricplus/screen/settings/SettingsScreen.java     | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
index a201fe3f..3b36734c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
+++ b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
@@ -48,6 +48,8 @@ public class ViaFabricPlus {
         PreLoadCallback.EVENT.invoker().onLoad();
 
         CustomClassicProtocolExtensions.create();
+        ClassicItemSelectionScreen.create();
+
         new ProtocolHack();
 
         FinishMinecraftLoadCallback.EVENT.register(() -> {
@@ -62,7 +64,6 @@ public class ViaFabricPlus {
 
             // Classic Stuff
             ChatLengthDefinition.create();
-            ClassicItemSelectionScreen.create();
             ClassicProtocolCommands.create();
 
             // Bedrock Stuff
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerScreen.java
index d6e6463f..421c1804 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinMultiplayerScreen.java
@@ -41,10 +41,10 @@ public class MixinMultiplayerScreen extends Screen {
 
         final int orientation = GeneralSettings.INSTANCE.mainButtonOrientation.getIndex();
         switch (orientation) {
-            case 0 -> builder = builder.position(0, 0);
-            case 1 -> builder = builder.position(width - 98, 0);
-            case 2 -> builder = builder.position(0, height - 20);
-            case 3 -> builder = builder.position(width - 98, height - 20);
+            case 0 -> builder = builder.position(5, 5);
+            case 1 -> builder = builder.position(width - 98 - 5, 5);
+            case 2 -> builder = builder.position(5, height - 20 - 5);
+            case 5 -> builder = builder.position(width - 98 - 5, height - 20 - 5);
         }
 
         this.addDrawableChild(builder.size(98, 20).build());
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/bridge/MixinOptionsScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/bridge/MixinOptionsScreen.java
index 1e765139..be246512 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/bridge/MixinOptionsScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/bridge/MixinOptionsScreen.java
@@ -17,9 +17,7 @@
  */
 package de.florianmichael.viafabricplus.injection.mixin.bridge;
 
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import de.florianmichael.viafabricplus.settings.groups.BridgeSettings;
-import de.florianmichael.vialoadingbase.ViaLoadingBase;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/ProtocolSelectionScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/ProtocolSelectionScreen.java
index 4d1a0c47..f4407cab 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/ProtocolSelectionScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/ProtocolSelectionScreen.java
@@ -65,9 +65,9 @@ public class ProtocolSelectionScreen extends Screen {
         super.init();
 
         this.addDrawableChild(new SlotList(this.client, width, height, 3 + 3 /* start offset */ + (textRenderer.fontHeight + 2) * 3 /* title is 2 */, height + 5, textRenderer.fontHeight + 4));
-        this.addDrawableChild(ButtonWidget.builder(Text.literal("<-"), button -> this.close()).position(0, 0).size(20, 20).build());
+        this.addDrawableChild(ButtonWidget.builder(Text.literal("<-"), button -> this.close()).position(5, 5).size(20, 20).build());
 
-        this.addDrawableChild(ButtonWidget.builder(Text.translatable("words.viafabricplus.settings"), button -> client.setScreen(SettingsScreen.get(this))).position(width - 98, 0).size(98, 20).build());
+        this.addDrawableChild(ButtonWidget.builder(Text.translatable("words.viafabricplus.settings"), button -> client.setScreen(SettingsScreen.get(this))).position(width - 98 - 5, 5).size(98, 20).build());
     }
 
     @Override
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java
index e2d73558..12bdef2b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java
@@ -60,7 +60,7 @@ public class SettingsScreen extends Screen {
         super.init();
 
         this.addDrawableChild(new SlotList(this.client, width, height, 3 + 3 /* start offset */ + (textRenderer.fontHeight + 2) * 3 /* title is 2 */, height + 5, (textRenderer.fontHeight + 2) * 2));
-        this.addDrawableChild(ButtonWidget.builder(Text.literal("<-"), button -> this.close()).position(0, 0).size(20, 20).build());
+        this.addDrawableChild(ButtonWidget.builder(Text.literal("<-"), button -> this.close()).position(5, 5).size(20, 20).build());
     }
 
     @Override