From 61d37081fcc3dfd7c38bed868e25130d163753be Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Thu, 24 Aug 2023 18:05:53 +0200
Subject: [PATCH] move screen base classes into the base/ package
---
.../florianmichael/viafabricplus/ViaFabricPlus.java | 2 +-
.../{ => base}/screen/MappedSlotEntry.java | 2 +-
.../viafabricplus/{ => base}/screen/VFPScreen.java | 2 +-
.../base/settings/base/AbstractSetting.java | 2 +-
.../base/settings/groups/BedrockSettings.java | 4 ----
.../base/settings/type_impl/BooleanSetting.java | 4 ++--
.../base/settings/type_impl/ButtonSetting.java | 4 ++--
.../base/settings/type_impl/ModeSetting.java | 4 ++--
.../type_impl/ProtocolSyncBooleanSetting.java | 4 ++--
.../protocol/CustomClassicProtocolExtensions.java | 2 +-
.../injection/mixin/base/MixinAddServerScreen.java | 2 +-
.../injection/mixin/base/MixinMultiplayerScreen.java | 2 +-
.../injection/mixin/base/MixinSharedConstants.java | 2 +-
.../mixin/fixes/minecraft/MixinInGameHud.java | 2 --
.../screen/MixinCreativeInventoryScreen.java | 2 +-
.../viafabricplus/integration/ModMenuImpl.java | 2 +-
.../{impl => }/ClassicItemSelectionScreen.java | 4 ++--
.../screen/{impl => }/base/ForceVersionScreen.java | 5 ++---
.../{impl => }/base/ProtocolSelectionScreen.java | 12 ++++++------
.../screen/{impl => }/settings/SettingsScreen.java | 10 ++++------
.../settingrenderer/BooleanSettingRenderer.java | 4 ++--
.../settingrenderer/ButtonSettingRenderer.java | 4 ++--
.../settingrenderer/ModeSettingRenderer.java | 4 ++--
.../ProtocolSyncBooleanSettingRenderer.java | 5 ++---
.../settings/settingrenderer/meta/TitleRenderer.java | 4 ++--
.../{impl => }/thirdparty/BetaCraftScreen.java | 8 ++++----
.../thirdparty/classicube/ClassiCubeLoginScreen.java | 6 +++---
.../thirdparty/classicube/ClassiCubeMFAScreen.java | 6 +++---
.../classicube/ClassiCubeServerListScreen.java | 8 ++++----
src/main/resources/fabric.mod.json | 1 -
30 files changed, 56 insertions(+), 67 deletions(-)
rename src/main/java/de/florianmichael/viafabricplus/{ => base}/screen/MappedSlotEntry.java (98%)
rename src/main/java/de/florianmichael/viafabricplus/{ => base}/screen/VFPScreen.java (98%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/ClassicItemSelectionScreen.java (98%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/base/ForceVersionScreen.java (96%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/base/ProtocolSelectionScreen.java (92%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/settings/SettingsScreen.java (87%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/settings/settingrenderer/BooleanSettingRenderer.java (94%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/settings/settingrenderer/ButtonSettingRenderer.java (93%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/settings/settingrenderer/ModeSettingRenderer.java (94%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java (94%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/settings/settingrenderer/meta/TitleRenderer.java (93%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/thirdparty/BetaCraftScreen.java (95%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/thirdparty/classicube/ClassiCubeLoginScreen.java (95%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/thirdparty/classicube/ClassiCubeMFAScreen.java (94%)
rename src/main/java/de/florianmichael/viafabricplus/screen/{impl => }/thirdparty/classicube/ClassiCubeServerListScreen.java (96%)
diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
index 05954f86..82908a72 100644
--- a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
+++ b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
@@ -34,7 +34,7 @@ import de.florianmichael.viafabricplus.mappings.CharacterMappings;
import de.florianmichael.viafabricplus.mappings.ItemReleaseVersionMappings;
import de.florianmichael.viafabricplus.mappings.PackFormatsMappings;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.viafabricplus.screen.impl.ClassicItemSelectionScreen;
+import de.florianmichael.viafabricplus.screen.ClassicItemSelectionScreen;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/MappedSlotEntry.java b/src/main/java/de/florianmichael/viafabricplus/base/screen/MappedSlotEntry.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/screen/MappedSlotEntry.java
rename to src/main/java/de/florianmichael/viafabricplus/base/screen/MappedSlotEntry.java
index 2c2f6ba6..c5b8bdf0 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/MappedSlotEntry.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/screen/MappedSlotEntry.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen;
+package de.florianmichael.viafabricplus.base.screen;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/VFPScreen.java b/src/main/java/de/florianmichael/viafabricplus/base/screen/VFPScreen.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/screen/VFPScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/base/screen/VFPScreen.java
index 60d7c580..c86e76ac 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/VFPScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/screen/VFPScreen.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen;
+package de.florianmichael.viafabricplus.base.screen;
import com.mojang.blaze3d.systems.RenderSystem;
import de.florianmichael.viafabricplus.ViaFabricPlus;
diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/base/AbstractSetting.java b/src/main/java/de/florianmichael/viafabricplus/base/settings/base/AbstractSetting.java
index d8e71371..eee8a75c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/base/settings/base/AbstractSetting.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/settings/base/AbstractSetting.java
@@ -18,7 +18,7 @@
package de.florianmichael.viafabricplus.base.settings.base;
import com.google.gson.JsonObject;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
import net.minecraft.text.MutableText;
import net.minecraft.text.TranslatableTextContent;
diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/BedrockSettings.java b/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/BedrockSettings.java
index 5ecbb7b0..7cb3ac65 100644
--- a/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/BedrockSettings.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/settings/groups/BedrockSettings.java
@@ -22,13 +22,9 @@ import de.florianmichael.viafabricplus.base.settings.base.SettingGroup;
import de.florianmichael.viafabricplus.base.settings.type_impl.BooleanSetting;
import de.florianmichael.viafabricplus.base.settings.type_impl.ButtonSetting;
import de.florianmichael.viafabricplus.definition.bedrock.BedrockAccountHandler;
-import de.florianmichael.viafabricplus.screen.impl.base.ProtocolSelectionScreen;
-import de.florianmichael.viafabricplus.screen.impl.settings.SettingsScreen;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.ConfirmScreen;
import net.minecraft.client.gui.screen.NoticeScreen;
-import net.minecraft.client.gui.screen.TitleScreen;
-import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Util;
diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/BooleanSetting.java b/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/BooleanSetting.java
index 9b2563a9..21095c27 100644
--- a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/BooleanSetting.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/BooleanSetting.java
@@ -18,8 +18,8 @@
package de.florianmichael.viafabricplus.base.settings.type_impl;
import com.google.gson.JsonObject;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
-import de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer.BooleanSettingRenderer;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.screen.settings.settingrenderer.BooleanSettingRenderer;
import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting;
import de.florianmichael.viafabricplus.base.settings.base.SettingGroup;
import net.minecraft.text.MutableText;
diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ButtonSetting.java b/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ButtonSetting.java
index d16dd757..49ba2593 100644
--- a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ButtonSetting.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ButtonSetting.java
@@ -18,8 +18,8 @@
package de.florianmichael.viafabricplus.base.settings.type_impl;
import com.google.gson.JsonObject;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
-import de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer.ButtonSettingRenderer;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.screen.settings.settingrenderer.ButtonSettingRenderer;
import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting;
import de.florianmichael.viafabricplus.base.settings.base.SettingGroup;
import net.minecraft.text.MutableText;
diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ModeSetting.java b/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ModeSetting.java
index d99cc7fb..c3a07d52 100644
--- a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ModeSetting.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ModeSetting.java
@@ -18,8 +18,8 @@
package de.florianmichael.viafabricplus.base.settings.type_impl;
import com.google.gson.JsonObject;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
-import de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer.ModeSettingRenderer;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.screen.settings.settingrenderer.ModeSettingRenderer;
import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting;
import de.florianmichael.viafabricplus.base.settings.base.SettingGroup;
import net.minecraft.text.MutableText;
diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ProtocolSyncBooleanSetting.java b/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ProtocolSyncBooleanSetting.java
index 766c22aa..2fc8ca1f 100644
--- a/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ProtocolSyncBooleanSetting.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/settings/type_impl/ProtocolSyncBooleanSetting.java
@@ -19,8 +19,8 @@ package de.florianmichael.viafabricplus.base.settings.type_impl;
import com.google.gson.JsonObject;
import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
-import de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer.ProtocolSyncBooleanSettingRenderer;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.screen.settings.settingrenderer.ProtocolSyncBooleanSettingRenderer;
import de.florianmichael.viafabricplus.base.settings.base.SettingGroup;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import net.minecraft.text.MutableText;
diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/classic/protocol/CustomClassicProtocolExtensions.java b/src/main/java/de/florianmichael/viafabricplus/definition/classic/protocol/CustomClassicProtocolExtensions.java
index de4d6eff..de52f829 100644
--- a/src/main/java/de/florianmichael/viafabricplus/definition/classic/protocol/CustomClassicProtocolExtensions.java
+++ b/src/main/java/de/florianmichael/viafabricplus/definition/classic/protocol/CustomClassicProtocolExtensions.java
@@ -18,7 +18,7 @@
package de.florianmichael.viafabricplus.definition.classic.protocol;
import com.viaversion.viaversion.api.connection.UserConnection;
-import de.florianmichael.viafabricplus.screen.impl.ClassicItemSelectionScreen;
+import de.florianmichael.viafabricplus.screen.ClassicItemSelectionScreen;
import de.florianmichael.viafabricplus.base.event.LoadClassicProtocolExtensionCallback;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import io.netty.buffer.ByteBuf;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinAddServerScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinAddServerScreen.java
index a1ebc569..471ee458 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinAddServerScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinAddServerScreen.java
@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.base;
import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings;
import de.florianmichael.viafabricplus.injection.access.IServerInfo;
-import de.florianmichael.viafabricplus.screen.impl.base.ForceVersionScreen;
+import de.florianmichael.viafabricplus.screen.base.ForceVersionScreen;
import net.minecraft.client.gui.screen.AddServerScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
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 d8457dde..ba2996f4 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
@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.base;
import de.florianmichael.viafabricplus.definition.LegacyServerAddress;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.viafabricplus.screen.impl.base.ProtocolSelectionScreen;
+import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen;
import de.florianmichael.viafabricplus.base.settings.groups.GeneralSettings;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinSharedConstants.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinSharedConstants.java
index f09fcab1..207f93a0 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinSharedConstants.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinSharedConstants.java
@@ -17,7 +17,7 @@
*/
package de.florianmichael.viafabricplus.injection.mixin.base;
-import de.florianmichael.viafabricplus.screen.impl.thirdparty.classicube.ClassiCubeLoginScreen;
+import de.florianmichael.viafabricplus.screen.thirdparty.classicube.ClassiCubeLoginScreen;
import net.minecraft.SharedConstants;
import net.minecraft.client.MinecraftClient;
import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java
index 4ecc9397..503e41e1 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java
@@ -36,8 +36,6 @@ public abstract class MixinInGameHud {
@Shadow
private int scaledWidth;
- @Shadow private int scaledHeight;
-
// Removing newer elements
@Inject(method = "renderExperienceBar", at = @At("HEAD"), cancellable = true)
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java
index b71fbdc6..4a0a9981 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java
@@ -17,7 +17,7 @@
*/
package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen;
-import de.florianmichael.viafabricplus.screen.impl.ClassicItemSelectionScreen;
+import de.florianmichael.viafabricplus.screen.ClassicItemSelectionScreen;
import de.florianmichael.viafabricplus.base.settings.groups.VisualSettings;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
diff --git a/src/main/java/de/florianmichael/viafabricplus/integration/ModMenuImpl.java b/src/main/java/de/florianmichael/viafabricplus/integration/ModMenuImpl.java
index 8bbb6f56..b1cba204 100644
--- a/src/main/java/de/florianmichael/viafabricplus/integration/ModMenuImpl.java
+++ b/src/main/java/de/florianmichael/viafabricplus/integration/ModMenuImpl.java
@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.integration;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi;
-import de.florianmichael.viafabricplus.screen.impl.settings.SettingsScreen;
+import de.florianmichael.viafabricplus.screen.settings.SettingsScreen;
public class ModMenuImpl implements ModMenuApi {
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/ClassicItemSelectionScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/ClassicItemSelectionScreen.java
similarity index 98%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/ClassicItemSelectionScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/ClassicItemSelectionScreen.java
index 7e70f2a2..9a959239 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/ClassicItemSelectionScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/ClassicItemSelectionScreen.java
@@ -15,10 +15,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl;
+package de.florianmichael.viafabricplus.screen;
import de.florianmichael.viafabricplus.base.event.ChangeProtocolVersionCallback;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
+import de.florianmichael.viafabricplus.base.screen.VFPScreen;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/base/ForceVersionScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/base/ForceVersionScreen.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/base/ForceVersionScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/base/ForceVersionScreen.java
index 6e1e49d0..9fd859f4 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/base/ForceVersionScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/base/ForceVersionScreen.java
@@ -15,16 +15,15 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.base;
+package de.florianmichael.viafabricplus.screen.base;
import net.raphimc.vialoader.util.VersionEnum;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
+import de.florianmichael.viafabricplus.base.screen.VFPScreen;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
-import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/base/ProtocolSelectionScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/base/ProtocolSelectionScreen.java
similarity index 92%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/base/ProtocolSelectionScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/base/ProtocolSelectionScreen.java
index 650f9dca..f71dff51 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/base/ProtocolSelectionScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/base/ProtocolSelectionScreen.java
@@ -15,15 +15,15 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.base;
+package de.florianmichael.viafabricplus.screen.base;
import de.florianmichael.classic4j.BetaCraftHandler;
import de.florianmichael.viafabricplus.definition.classic.ClassiCubeAccountHandler;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.screen.impl.thirdparty.classicube.ClassiCubeLoginScreen;
-import de.florianmichael.viafabricplus.screen.impl.thirdparty.classicube.ClassiCubeServerListScreen;
-import de.florianmichael.viafabricplus.screen.impl.thirdparty.BetaCraftScreen;
-import de.florianmichael.viafabricplus.screen.impl.settings.SettingsScreen;
+import de.florianmichael.viafabricplus.base.screen.VFPScreen;
+import de.florianmichael.viafabricplus.screen.thirdparty.classicube.ClassiCubeLoginScreen;
+import de.florianmichael.viafabricplus.screen.thirdparty.classicube.ClassiCubeServerListScreen;
+import de.florianmichael.viafabricplus.screen.thirdparty.BetaCraftScreen;
+import de.florianmichael.viafabricplus.screen.settings.SettingsScreen;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/SettingsScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java
similarity index 87%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/SettingsScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java
index 39f2e76f..d3d7d26c 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/SettingsScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/SettingsScreen.java
@@ -15,19 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.settings;
+package de.florianmichael.viafabricplus.screen.settings;
import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer.meta.TitleRenderer;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.base.screen.VFPScreen;
+import de.florianmichael.viafabricplus.screen.settings.settingrenderer.meta.TitleRenderer;
import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting;
import de.florianmichael.viafabricplus.base.settings.base.SettingGroup;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
-import net.minecraft.client.util.math.MatrixStack;
public class SettingsScreen extends VFPScreen {
public final static SettingsScreen INSTANCE = new SettingsScreen();
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/BooleanSettingRenderer.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/BooleanSettingRenderer.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/BooleanSettingRenderer.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/BooleanSettingRenderer.java
index 3d527fc8..84ba4e6e 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/BooleanSettingRenderer.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/BooleanSettingRenderer.java
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer;
+package de.florianmichael.viafabricplus.screen.settings.settingrenderer;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
import de.florianmichael.viafabricplus.base.settings.type_impl.BooleanSetting;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/ButtonSettingRenderer.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ButtonSettingRenderer.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/ButtonSettingRenderer.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ButtonSettingRenderer.java
index 2174fa02..3acb7a79 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/ButtonSettingRenderer.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ButtonSettingRenderer.java
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer;
+package de.florianmichael.viafabricplus.screen.settings.settingrenderer;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
import de.florianmichael.viafabricplus.base.settings.type_impl.ButtonSetting;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/ModeSettingRenderer.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ModeSettingRenderer.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/ModeSettingRenderer.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ModeSettingRenderer.java
index f685577b..b8006333 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/ModeSettingRenderer.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ModeSettingRenderer.java
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer;
+package de.florianmichael.viafabricplus.screen.settings.settingrenderer;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
import de.florianmichael.viafabricplus.base.settings.type_impl.ModeSetting;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java
index f0036fc7..d2565bf8 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer;
+package de.florianmichael.viafabricplus.screen.settings.settingrenderer;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
import de.florianmichael.viafabricplus.base.settings.type_impl.ProtocolSyncBooleanSetting;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
@@ -26,7 +26,6 @@ import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import java.awt.*;
-import java.util.Arrays;
public class ProtocolSyncBooleanSettingRenderer extends MappedSlotEntry {
private final ProtocolSyncBooleanSetting value;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/meta/TitleRenderer.java b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/meta/TitleRenderer.java
similarity index 93%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/meta/TitleRenderer.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/meta/TitleRenderer.java
index c673546e..e9da1854 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/settings/settingrenderer/meta/TitleRenderer.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/settings/settingrenderer/meta/TitleRenderer.java
@@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer.meta;
+package de.florianmichael.viafabricplus.screen.settings.settingrenderer.meta;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/BetaCraftScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/BetaCraftScreen.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/BetaCraftScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/BetaCraftScreen.java
index 18f03601..402d8aac 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/BetaCraftScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/BetaCraftScreen.java
@@ -15,16 +15,16 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.thirdparty;
+package de.florianmichael.viafabricplus.screen.thirdparty;
import de.florianmichael.classic4j.model.betacraft.BCServerInfo;
import de.florianmichael.classic4j.model.betacraft.BCServerList;
import de.florianmichael.classic4j.model.betacraft.BCVersion;
import de.florianmichael.viafabricplus.definition.LegacyServerAddress;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.screen.impl.settings.settingrenderer.meta.TitleRenderer;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.base.screen.VFPScreen;
+import de.florianmichael.viafabricplus.screen.settings.settingrenderer.meta.TitleRenderer;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/classicube/ClassiCubeLoginScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeLoginScreen.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/classicube/ClassiCubeLoginScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeLoginScreen.java
index b4cbb044..84668b24 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/classicube/ClassiCubeLoginScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeLoginScreen.java
@@ -15,15 +15,15 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.thirdparty.classicube;
+package de.florianmichael.viafabricplus.screen.thirdparty.classicube;
import com.mojang.blaze3d.systems.RenderSystem;
import de.florianmichael.classic4j.ClassiCubeHandler;
import de.florianmichael.classic4j.api.LoginProcessHandler;
import de.florianmichael.classic4j.model.classicube.highlevel.CCAccount;
-import de.florianmichael.viafabricplus.screen.impl.base.ProtocolSelectionScreen;
+import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen;
import de.florianmichael.viafabricplus.definition.classic.ClassiCubeAccountHandler;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
+import de.florianmichael.viafabricplus.base.screen.VFPScreen;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/classicube/ClassiCubeMFAScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeMFAScreen.java
similarity index 94%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/classicube/ClassiCubeMFAScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeMFAScreen.java
index aab0336e..bd829fec 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/classicube/ClassiCubeMFAScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeMFAScreen.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.thirdparty.classicube;
+package de.florianmichael.viafabricplus.screen.thirdparty.classicube;
import com.mojang.blaze3d.systems.RenderSystem;
import de.florianmichael.classic4j.ClassiCubeHandler;
@@ -24,8 +24,8 @@ import de.florianmichael.classic4j.model.classicube.highlevel.CCAccount;
import de.florianmichael.classic4j.model.classicube.highlevel.CCError;
import de.florianmichael.viafabricplus.definition.classic.ClassiCubeAccountHandler;
import de.florianmichael.viafabricplus.integration.Classic4JImpl;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.screen.impl.base.ProtocolSelectionScreen;
+import de.florianmichael.viafabricplus.base.screen.VFPScreen;
+import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
diff --git a/src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/classicube/ClassiCubeServerListScreen.java b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeServerListScreen.java
similarity index 96%
rename from src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/classicube/ClassiCubeServerListScreen.java
rename to src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeServerListScreen.java
index 9012841e..313daf7b 100644
--- a/src/main/java/de/florianmichael/viafabricplus/screen/impl/thirdparty/classicube/ClassiCubeServerListScreen.java
+++ b/src/main/java/de/florianmichael/viafabricplus/screen/thirdparty/classicube/ClassiCubeServerListScreen.java
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package de.florianmichael.viafabricplus.screen.impl.thirdparty.classicube;
+package de.florianmichael.viafabricplus.screen.thirdparty.classicube;
import com.mojang.blaze3d.systems.RenderSystem;
import de.florianmichael.classic4j.ClassiCubeHandler;
@@ -25,9 +25,9 @@ import de.florianmichael.classic4j.model.classicube.highlevel.CCAccount;
import de.florianmichael.viafabricplus.definition.classic.ClassiCubeAccountHandler;
import de.florianmichael.viafabricplus.injection.access.IServerInfo;
import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
-import de.florianmichael.viafabricplus.screen.VFPScreen;
-import de.florianmichael.viafabricplus.screen.impl.base.ProtocolSelectionScreen;
-import de.florianmichael.viafabricplus.screen.MappedSlotEntry;
+import de.florianmichael.viafabricplus.base.screen.VFPScreen;
+import de.florianmichael.viafabricplus.screen.base.ProtocolSelectionScreen;
+import de.florianmichael.viafabricplus.base.screen.MappedSlotEntry;
import de.florianmichael.viafabricplus.base.settings.groups.AuthenticationSettings;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 2af57d28..162f1ad6 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -40,7 +40,6 @@
},
"breaks": {
"viafabric": "*",
- "multiconnect": "*",
"memoryleakfix": "<=1.1.0",
"krypton": "<=0.2.2"
}