Moved documentation related resources into documentation folder

Renamed some classes I missed in the previous refactor
Fixed introduced bugs in third-party screens
Improved screen code and draw main title in classic login screens

README.md

@@ -23,7 +23,7 @@ At the time of writing, VFP is the only protocol translation platform for the cl
 - Bedrock (1.20.0)
 
 # For users
-### Detailed instructions for use are available [here](.github/USAGE.md)
+### Detailed instructions for use are available [here](documentation/USAGE.md)
 ### If you encounter any issues, please report them on the [issue tracker](https://github.com/ViaVersion/ViaFabricPlus/issues) or on the ViaVersion [Discord](https://discord.gg/viaversion)
 
 ## Known incompatibilities
@@ -135,7 +135,7 @@ dependencies {
 </dependencies>
 ```
 
-### To learn more about the API and about addons, you can simply click [here](.github/DEVELOPER_API.md)
+### To learn more about the API and about addons, you can simply click [here](documentation/DEVELOPER_API.md)
 
 ## Disclaimer
 

src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java

@@ -53,7 +53,6 @@
  *  - Boats are probably broken. Check entity height offset fix
  *  - Check TO DO in MixinEntity
  *  - Diff ItemRegistryDiff from projects and add missing items
- *  - Fix third party implementations properly
  */
 public class ViaFabricPlus {
     private static final ViaFabricPlus instance = new ViaFabricPlus();

src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinAddServerScreen.java

@@ -74,7 +74,7 @@ private void addVersionSetterButton(CallbackInfo ci) {
         }
 
         // Create the button
-        ButtonWidget.Builder buttonBuilder = ButtonWidget.builder(forcedVersion == null ? Text.translatable("base.viafabricplus.set_version_for_this_server") : Text.literal(forcedVersion.getName()), button -> {
+        ButtonWidget.Builder buttonBuilder = ButtonWidget.builder(forcedVersion == null ? Text.translatable("base.viafabricplus.set_version") : Text.literal(forcedVersion.getName()), button -> {
             // Store current input in case the user cancels the version selection
             viaFabricPlus$nameField = serverNameField.getText();
             viaFabricPlus$addressField = addressField.getText();

src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeLoginScreen.java

@@ -38,17 +38,15 @@
 public class ClassiCubeLoginScreen extends VFPScreen {
     public static final ClassiCubeLoginScreen INSTANCE = new ClassiCubeLoginScreen();
 
-    private static final String CLASSI_CUBE_URL = "https://www.classicube.net/";
-
     public ClassiCubeLoginScreen() {
-        super("ClassiCube Login", false);
+        super("ClassiCube Login", true);
     }
 
     @Override
     public void open(Screen prevScreen) {
         this.setupSubtitle(
                 Text.translatable("classicube.viafabricplus.account"),
-                ConfirmLinkScreen.opening(CLASSI_CUBE_URL, this, true)
+                ConfirmLinkScreen.opening(ClassiCubeHandler.CLASSICUBE_ROOT_URI.toString(), this, true)
         );
         super.open(prevScreen);
     }
@@ -106,14 +104,16 @@ public void handleException(Throwable throwable) {
 
     @Override
     public void close() {
+        // The user wasn't logged in when opening this screen, so he cancelled the login process, so we can safely unset the account
+        ViaFabricPlus.global().getSaveManager().getAccountsSave().setClassicubeAccount(null);
         MainScreen.INSTANCE.open(prevScreen);
     }
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         super.render(context, mouseX, mouseY, delta);
+        this.renderTitle(context);
 
         context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 70, 16777215);
-        this.renderSubtitle(context);
     }
 }

src/main/java/de/florianmichael/viafabricplus/screen/classic4j/ClassiCubeMFAScreen.java

@@ -80,15 +80,16 @@ public void handleException(Throwable throwable) {
 
     @Override
     public void close() {
+        // The user wasn't logged in when opening this screen, so he cancelled the login process, so we can safely unset the account
         ViaFabricPlus.global().getSaveManager().getAccountsSave().setClassicubeAccount(null);
         MainScreen.INSTANCE.open(prevScreen);
     }
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         super.render(context, mouseX, mouseY, delta);
+        this.renderTitle(context);
 
         context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 70, 16777215);
-        this.renderSubtitle(context);
     }
 }

src/main/java/de/florianmichael/viafabricplus/screen/settings/ProtocolSyncBooleanSettingRenderer.java → src/main/java/de/florianmichael/viafabricplus/screen/settings/VersionedBooleanSettingRenderer.java

@@ -29,10 +29,10 @@
 
 import java.awt.*;
 
-public class ProtocolSyncBooleanSettingRenderer extends VFPListEntry {
+public class VersionedBooleanSettingRenderer extends VFPListEntry {
     private final VersionedBooleanSetting value;
 
-    public ProtocolSyncBooleanSettingRenderer(VersionedBooleanSetting value) {
+    public VersionedBooleanSettingRenderer(VersionedBooleanSetting value) {
         this.value = value;
     }
 

src/main/java/de/florianmichael/viafabricplus/settings/base/VersionedBooleanSetting.java

@@ -21,7 +21,7 @@
 
 import com.google.gson.JsonObject;
 import de.florianmichael.viafabricplus.screen.base.VFPListEntry;
-import de.florianmichael.viafabricplus.screen.settings.ProtocolSyncBooleanSettingRenderer;
+import de.florianmichael.viafabricplus.screen.settings.VersionedBooleanSettingRenderer;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
 import net.minecraft.text.MutableText;
 import net.raphimc.vialoader.util.VersionRange;
@@ -41,7 +41,7 @@ public VersionedBooleanSetting(SettingGroup parent, MutableText name, VersionRan
 
     @Override
     public VFPListEntry makeSettingRenderer() {
-        return new ProtocolSyncBooleanSettingRenderer(this);
+        return new VersionedBooleanSettingRenderer(this);
     }
 
     @Override

src/main/resources/assets/viafabricplus/lang/en_us.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "Via translates to: %s",
   "base.viafabricplus.server_version": "Server version: %s",
   "base.viafabricplus.auto": "Auto",
-  "base.viafabricplus.set_version_for_this_server": "Set version for this server",
+  "base.viafabricplus.set_version": "Set version",
   "base.viafabricplus.vanilla_and_modded": "Vanilla and Modded",
   "base.viafabricplus.vanilla_only": "Vanilla only",
   "base.viafabricplus.kick": "Kick",

src/main/resources/assets/viafabricplus/lang/es_ar.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "Via se traduce a: %s",
   "base.viafabricplus.server_version": "Versión del servidor: %s",
   "base.viafabricplus.auto": "Auto",
-  "base.viafabricplus.set_version_for_this_server": "Asignar la versión para este servidor",
+  "base.viafabricplus.set_version": "Asignar la versión para este servidor",
   "base.viafabricplus.vanilla_and_modded": "Vanilla y Modificado",
   "base.viafabricplus.vanilla_only": "Solo Vanilla",
   "base.viafabricplus.kick": "Echar",

src/main/resources/assets/viafabricplus/lang/es_cl.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "Via se traduce a: %s",
   "base.viafabricplus.server_version": "Versión del servidor: %s",
   "base.viafabricplus.auto": "Auto",
-  "base.viafabricplus.set_version_for_this_server": "Asignar la versión para este servidor",
+  "base.viafabricplus.set_version": "Asignar la versión para este servidor",
   "base.viafabricplus.vanilla_and_modded": "Vanilla y Modificado",
   "base.viafabricplus.vanilla_only": "Solo Vanilla",
   "base.viafabricplus.kick": "Echar",

src/main/resources/assets/viafabricplus/lang/es_ec.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "Via se traduce a: %s",
   "base.viafabricplus.server_version": "Versión del servidor: %s",
   "base.viafabricplus.auto": "Auto",
-  "base.viafabricplus.set_version_for_this_server": "Asignar la versión para este servidor",
+  "base.viafabricplus.set_version": "Asignar la versión para este servidor",
   "base.viafabricplus.vanilla_and_modded": "Vanilla y Modificado",
   "base.viafabricplus.vanilla_only": "Solo Vanilla",
   "base.viafabricplus.kick": "Echar",

src/main/resources/assets/viafabricplus/lang/es_es.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "Via se traduce a: %s",
   "base.viafabricplus.server_version": "Versión del servidor: %s",
   "base.viafabricplus.auto": "Auto",
-  "base.viafabricplus.set_version_for_this_server": "Asignar la versión para este servidor",
+  "base.viafabricplus.set_version": "Asignar la versión para este servidor",
   "base.viafabricplus.vanilla_and_modded": "Vanilla y Modificado",
   "base.viafabricplus.vanilla_only": "Solo Vanilla",
   "base.viafabricplus.kick": "Echar",

src/main/resources/assets/viafabricplus/lang/es_mx.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "Via se traduce a: %s",
   "base.viafabricplus.server_version": "Versión del servidor: %s",
   "base.viafabricplus.auto": "Auto",
-  "base.viafabricplus.set_version_for_this_server": "Asignar la versión para este servidor",
+  "base.viafabricplus.set_version": "Asignar la versión para este servidor",
   "base.viafabricplus.vanilla_and_modded": "Vanilla y Modificado",
   "base.viafabricplus.vanilla_only": "Solo Vanilla",
   "base.viafabricplus.kick": "Echar",

src/main/resources/assets/viafabricplus/lang/es_uy.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "Via se traduce a: %s",
   "base.viafabricplus.server_version": "Versión del servidor: %s",
   "base.viafabricplus.auto": "Auto",
-  "base.viafabricplus.set_version_for_this_server": "Asignar la versión para este servidor",
+  "base.viafabricplus.set_version": "Asignar la versión para este servidor",
   "base.viafabricplus.vanilla_and_modded": "Vanilla y Modificado",
   "base.viafabricplus.vanilla_only": "Solo Vanilla",
   "base.viafabricplus.kick": "Echar",

src/main/resources/assets/viafabricplus/lang/es_ve.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "Via se traduce a: %s",
   "base.viafabricplus.server_version": "Versión del servidor: %s",
   "base.viafabricplus.auto": "Auto",
-  "base.viafabricplus.set_version_for_this_server": "Asignar la versión para este servidor",
+  "base.viafabricplus.set_version": "Asignar la versión para este servidor",
   "base.viafabricplus.vanilla_and_modded": "Vanilla y Modificado",
   "base.viafabricplus.vanilla_only": "Solo Vanilla",
   "base.viafabricplus.kick": "Echar",

src/main/resources/assets/viafabricplus/lang/hu_hu.json

@@ -1,7 +1,7 @@
 {
   "modmenu.descriptionTranslation.viafabricplus": "Fabric mod, mellyel MINDEN Minecraft szerververzióhoz (Release, Beta, Alpha, Classic, Snapshotok, Bedrock) csatlakozhatsz, életminőségi javításokkal a játékmenethez",
 
-  "base.viafabricplus.set_version_for_this_server": "Verzió beállítása erre a szerverre",
+  "base.viafabricplus.set_version": "Verzió beállítása erre a szerverre",
   "base.viafabricplus.auto": "Auto",
   "base.viafabricplus.cancel": "Mégse",
   "base.viafabricplus.cancel_and_reset": "Mégse és visszaállítás",

src/main/resources/assets/viafabricplus/lang/pl_pl.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "Via tłumaczy na: %s",
   "base.viafabricplus.server_version": "Wersja serwera: %s",
   "base.viafabricplus.auto": "Auto",
-  "base.viafabricplus.set_version_for_this_server": "Ustaw wersję dla tego serwera",
+  "base.viafabricplus.set_version": "Ustaw wersję dla tego serwera",
   "base.viafabricplus.vanilla_and_modded": "Vanilla i modyfikacje",
   "base.viafabricplus.vanilla_only": "Tylko vanilla",
   "base.viafabricplus.kick": "Wyrzuć",

src/main/resources/assets/viafabricplus/lang/uk_ua.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "Via переклади до: %s",
   "base.viafabricplus.server_version": "Версія серверу: %s",
   "base.viafabricplus.auto": "Автоматично",
-  "base.viafabricplus.set_version_for_this_server": "Встановити версію для цього серверу",
+  "base.viafabricplus.set_version": "Встановити версію для цього серверу",
   "base.viafabricplus.vanilla_and_modded": "Ванілла та з Модами",
   "base.viafabricplus.vanilla_only": "Тільки Ванілла",
   "base.viafabricplus.kick": "Викинути",

src/main/resources/assets/viafabricplus/lang/zh_cn.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "连接所用版本：%s",
   "base.viafabricplus.server_version": "服务器版本：%s",
   "base.viafabricplus.auto": "自动",
-  "base.viafabricplus.set_version_for_this_server": "更改当前服务器版本",
+  "base.viafabricplus.set_version": "更改当前服务器版本",
   "base.viafabricplus.vanilla_and_modded": "原版和模组",
   "base.viafabricplus.vanilla_only": "仅原版",
   "base.viafabricplus.kick": "踢出",

src/main/resources/assets/viafabricplus/lang/zh_hk.json

@@ -16,7 +16,7 @@
     "base.viafabricplus.via_translates_to": "轉換為：%s",
     "base.viafabricplus.server_version": "伺服器版本：%s",
     "base.viafabricplus.auto": "自動",
-    "base.viafabricplus.set_version_for_this_server": "設置此伺服器嘅版本",
+    "base.viafabricplus.set_version": "設置此伺服器嘅版本",
     "base.viafabricplus.vanilla_and_modded": "原版和模組嘅",
     "base.viafabricplus.vanilla_only": "僅原版",
     "base.viafabricplus.kick": "踢出",

src/main/resources/assets/viafabricplus/lang/zh_tw.json

@@ -18,7 +18,7 @@
   "base.viafabricplus.via_translates_to": "轉換為：%s",
   "base.viafabricplus.server_version": "伺服器版本：%s",
   "base.viafabricplus.auto": "自動",
-  "base.viafabricplus.set_version_for_this_server": "設定這個伺服器的版本",
+  "base.viafabricplus.set_version": "設定這個伺服器的版本",
   "base.viafabricplus.vanilla_and_modded": "原版和模組",
   "base.viafabricplus.vanilla_only": "僅原版",
   "base.viafabricplus.kick": "踢出",