From 8a0c045dc4bf313f29213356b21b4448e7629bea Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 28 Oct 2020 17:18:16 +0100 Subject: [PATCH 1/4] Show start progress not always on top, do not open gui while starting, fix window blocking --- src/main/java/de/bixilon/minosoft/Minosoft.java | 8 ++++++-- .../java/de/bixilon/minosoft/gui/main/Launcher.java | 12 ++++++++++-- .../minosoft/gui/main/StartProgressWindow.java | 8 ++++---- .../java/de/bixilon/minosoft/util/task/Task.java | 10 ++++++++++ 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.java b/src/main/java/de/bixilon/minosoft/Minosoft.java index 8b04697f7..32366e7a1 100644 --- a/src/main/java/de/bixilon/minosoft/Minosoft.java +++ b/src/main/java/de/bixilon/minosoft/Minosoft.java @@ -142,8 +142,6 @@ public final class Minosoft { }, "ModLoading", "", Priorities.NORMAL, TaskImportance.REQUIRED)); - taskWorker.addTask(new Task(progress -> Launcher.start(), "Launcher", "", Priorities.HIGH, TaskImportance.OPTIONAL, "Minosoft Language", "JavaFx Toolkit")); - taskWorker.addTask(new Task(progress -> { progress.countUp(); AssetsManager.downloadAllAssets(progress); @@ -159,6 +157,12 @@ public final class Minosoft { }, "Mojang language", "", Priorities.HIGH, TaskImportance.REQUIRED, "Assets")); taskWorker.work(startStatusLatch); + try { + startStatusLatch.waitUntilZero(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + Launcher.start(); } public static void checkClientToken() { diff --git a/src/main/java/de/bixilon/minosoft/gui/main/Launcher.java b/src/main/java/de/bixilon/minosoft/gui/main/Launcher.java index 9f521d797..13b23d3f2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/Launcher.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/Launcher.java @@ -36,7 +36,7 @@ public class Launcher { private static Stage stage; private static boolean exit = false; - public static void start() throws Exception { + public static void start() { Log.info("Starting launcher..."); CountDownLatch latch = new CountDownLatch(1); Platform.runLater(() -> { @@ -89,7 +89,11 @@ public class Launcher { } latch.countDown(); }); - latch.await(); + try { + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } Log.info("Launcher started!"); } @@ -101,4 +105,8 @@ public class Launcher { Platform.runLater(() -> stage.close()); } + + public static Stage getStage() { + return stage; + } } \ No newline at end of file diff --git a/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java index aae2f5f23..9ce722fd1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java @@ -23,6 +23,7 @@ import javafx.scene.control.Dialog; import javafx.scene.control.Label; import javafx.scene.control.ProgressBar; import javafx.scene.layout.GridPane; +import javafx.stage.Modality; import javafx.stage.Stage; import java.util.concurrent.CountDownLatch; @@ -30,7 +31,7 @@ import java.util.concurrent.atomic.AtomicReference; public class StartProgressWindow extends Application { public static CountDownLatch toolkitLatch = new CountDownLatch(2); // 2 if not started, 1 if started, 2 if loaded - private static Dialog progressDialog; + public static Dialog progressDialog; private static boolean exit = false; public static void show(CountUpAndDownLatch progress) { @@ -53,13 +54,12 @@ public class StartProgressWindow extends Application { grid.add(progressBar.get(), 0, 0); grid.add(progressLabel.get(), 1, 0); progressDialog.getDialogPane().setContent(grid); + Stage stage = (Stage) progressDialog.getDialogPane().getScene().getWindow(); + stage.initModality(Modality.APPLICATION_MODAL); if (exit) { return; } progressDialog.show(); - - Stage stage = (Stage) progressDialog.getDialogPane().getScene().getWindow(); - stage.setAlwaysOnTop(true); stage.toFront(); }); diff --git a/src/main/java/de/bixilon/minosoft/util/task/Task.java b/src/main/java/de/bixilon/minosoft/util/task/Task.java index 21281e280..da33dcabf 100644 --- a/src/main/java/de/bixilon/minosoft/util/task/Task.java +++ b/src/main/java/de/bixilon/minosoft/util/task/Task.java @@ -17,6 +17,7 @@ import de.bixilon.minosoft.modding.loading.Priorities; import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Set; public class Task { @@ -57,6 +58,15 @@ public class Task { this.dependsOns = dependsOn; } + public Task(TaskCallable task, String taskName, String taskDescription, Priorities priority, TaskImportance importance, List dependsOn) { + this.task = task; + this.taskName = taskName; + this.taskDescription = taskDescription; + this.priority = priority; + this.importance = importance; + dependsOn.forEach((dependency) -> this.dependsOns.add(dependency.getTaskName())); + } + public Task(TaskCallable task, String taskName, String taskDescription, Priorities priority, TaskImportance importance, String... dependsOn) { this.task = task; this.taskName = taskName; From b0e22ea52d8a2a9b4b232f74275608f1851bc24d Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 28 Oct 2020 22:50:10 +0100 Subject: [PATCH 2/4] Make StartProgressWindow closeable --- .../java/de/bixilon/minosoft/gui/main/StartProgressWindow.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java index 9ce722fd1..c3ef6cdc8 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java @@ -56,6 +56,7 @@ public class StartProgressWindow extends Application { progressDialog.getDialogPane().setContent(grid); Stage stage = (Stage) progressDialog.getDialogPane().getScene().getWindow(); stage.initModality(Modality.APPLICATION_MODAL); + stage.setOnCloseRequest((request) -> System.exit(0)); if (exit) { return; } From 93658700742d9f507e7ffa0fa5ce1828ad73f6ff Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 28 Oct 2020 23:18:57 +0100 Subject: [PATCH 3/4] improve config waiting, launcher: add minosoft logo in all dialogs and stages --- .../java/de/bixilon/minosoft/Minosoft.java | 1 + .../minosoft/config/Configuration.java | 19 +++++++++++-------- .../minosoft/gui/main/AccountWindow.java | 2 ++ .../bixilon/minosoft/gui/main/Launcher.java | 1 + .../bixilon/minosoft/gui/main/MainWindow.java | 3 +++ .../minosoft/gui/main/ServerListCell.java | 3 +++ .../gui/main/StartProgressWindow.java | 1 + 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.java b/src/main/java/de/bixilon/minosoft/Minosoft.java index 32366e7a1..1210f6525 100644 --- a/src/main/java/de/bixilon/minosoft/Minosoft.java +++ b/src/main/java/de/bixilon/minosoft/Minosoft.java @@ -98,6 +98,7 @@ public final class Minosoft { dialog.setContentText(exception.getLocalizedMessage()); Stage stage = (Stage) dialog.getDialogPane().getScene().getWindow(); + stage.getIcons().add(GUITools.logo); stage.setAlwaysOnTop(true); stage.toFront(); dialog.setOnCloseRequest(dialogEvent -> System.exit(1)); diff --git a/src/main/java/de/bixilon/minosoft/config/Configuration.java b/src/main/java/de/bixilon/minosoft/config/Configuration.java index aca3dab48..39f918201 100644 --- a/src/main/java/de/bixilon/minosoft/config/Configuration.java +++ b/src/main/java/de/bixilon/minosoft/config/Configuration.java @@ -30,7 +30,7 @@ import java.util.ArrayList; public class Configuration { final JsonObject config; - final Thread thread; + private final Object lock = new Object(); public Configuration(String filename) throws IOException { File file = new File(Config.homeDir + "config/" + filename); @@ -50,12 +50,14 @@ public class Configuration { config = Util.readJsonFromFile(file.getAbsolutePath()); final File finalFile = file; - thread = new Thread(() -> { + new Thread(() -> { while (true) { // wait for interrupt - try { - Thread.sleep(Integer.MAX_VALUE); - } catch (InterruptedException ignored) { + synchronized (lock) { + try { + lock.wait(); + } catch (InterruptedException ignored) { + } } // write config to temp file, delete original config, rename temp file to original file to avoid conflicts if minosoft gets closed while saving the config File tempFile = new File(Config.homeDir + "config/" + filename + ".tmp"); @@ -84,8 +86,7 @@ public class Configuration { Log.verbose(String.format("Configuration saved to file %s", filename)); } } - }, "IO"); - thread.start(); + }, "IO").start(); } public boolean getBoolean(ConfigurationPaths path) { @@ -155,7 +156,9 @@ public class Configuration { } public void saveToFile() { - thread.interrupt(); + synchronized (lock) { + lock.notifyAll(); + } } public HashBiMap getMojangAccounts() { diff --git a/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java index 56c8330ff..3e7ff9195 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java @@ -30,6 +30,7 @@ import javafx.scene.Node; import javafx.scene.control.*; import javafx.scene.layout.BorderPane; import javafx.scene.layout.GridPane; +import javafx.stage.Stage; import javafx.stage.Window; import java.net.URL; @@ -57,6 +58,7 @@ public class AccountWindow implements Initializable { Dialog dialog = new Dialog<>(); dialog.setTitle(LocaleManager.translate(Strings.LOGIN_DIALOG_TITLE)); dialog.setHeaderText(LocaleManager.translate(Strings.LOGIN_DIALOG_HEADER)); + ((Stage) dialog.getDialogPane().getScene().getWindow()).getIcons().add(GUITools.logo); ButtonType loginButtonType = new ButtonType(LocaleManager.translate(Strings.BUTTON_LOGIN), ButtonBar.ButtonData.OK_DONE); dialog.getDialogPane().getButtonTypes().addAll(loginButtonType, ButtonType.CANCEL); diff --git a/src/main/java/de/bixilon/minosoft/gui/main/Launcher.java b/src/main/java/de/bixilon/minosoft/gui/main/Launcher.java index 13b23d3f2..4739577dc 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/Launcher.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/Launcher.java @@ -44,6 +44,7 @@ public class Launcher { return; } Stage stage = new Stage(); + stage.getIcons().add(GUITools.logo); GUITools.versionList.setCellFactory(new Callback<>() { @Override diff --git a/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java index fb5834ac4..04fc5c1ad 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java @@ -59,6 +59,7 @@ public class MainWindow implements Initializable { Stage stage = new Stage(); stage.initModality(Modality.APPLICATION_MODAL); stage.setTitle(LocaleManager.translate(Strings.MANAGE_ACCOUNTS_NO_ACCOUNT_ERROR_TITLE)); + stage.getIcons().add(GUITools.logo); stage.setScene(new Scene(parent)); Platform.setImplicitExit(false); stage.setOnCloseRequest(event -> { @@ -114,6 +115,7 @@ public class MainWindow implements Initializable { Dialog dialog = new Dialog<>(); dialog.setTitle(LocaleManager.translate(Strings.ADD_SERVER_DIALOG_TITLE)); dialog.setHeaderText(LocaleManager.translate(Strings.ADD_SERVER_DIALOG_HEADER)); + ((Stage) dialog.getDialogPane().getScene().getWindow()).getIcons().add(GUITools.logo); ButtonType addButtonType = new ButtonType(LocaleManager.translate(Strings.BUTTON_ADD), ButtonBar.ButtonData.OK_DONE); dialog.getDialogPane().getButtonTypes().addAll(addButtonType, ButtonType.CANCEL); @@ -188,6 +190,7 @@ public class MainWindow implements Initializable { stage.initModality(Modality.APPLICATION_MODAL); stage.getIcons().add(GUITools.logo); stage.setTitle(LocaleManager.translate(Strings.SETTINGS_TITLE)); + stage.getIcons().add(GUITools.logo); stage.setScene(new Scene(parent)); stage.show(); } catch (IOException e) { diff --git a/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java b/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java index c14ac0a45..d11e465c2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java @@ -270,6 +270,7 @@ public class ServerListCell extends ListCell implements Initializable { Dialog dialog = new Dialog<>(); dialog.setTitle(LocaleManager.translate(Strings.EDIT_SERVER_DIALOG_TITLE, server.getName())); dialog.setHeaderText(LocaleManager.translate(Strings.EDIT_SERVER_DIALOG_HEADER)); + ((Stage) dialog.getDialogPane().getScene().getWindow()).getIcons().add(GUITools.logo); ButtonType saveButtonType = new ButtonType(LocaleManager.translate(Strings.BUTTON_SAVE), ButtonBar.ButtonData.OK_DONE); dialog.getDialogPane().getButtonTypes().addAll(saveButtonType, ButtonType.CANCEL); @@ -354,6 +355,7 @@ public class ServerListCell extends ListCell implements Initializable { Dialog dialog = new Dialog<>(); dialog.setTitle("View server info: " + server.getName()); + ((Stage) dialog.getDialogPane().getScene().getWindow()).getIcons().add(GUITools.logo); ButtonType loginButtonType = ButtonType.CLOSE; dialog.getDialogPane().getButtonTypes().add(loginButtonType); @@ -443,6 +445,7 @@ public class ServerListCell extends ListCell implements Initializable { Stage stage = new Stage(); stage.initModality(Modality.APPLICATION_MODAL); stage.setTitle(LocaleManager.translate(Strings.SESSIONS_DIALOG_TITLE, server.getName())); + stage.getIcons().add(GUITools.logo); stage.setScene(new Scene(parent)); stage.show(); } catch (IOException e) { diff --git a/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java index c3ef6cdc8..86a7ffbcb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/StartProgressWindow.java @@ -55,6 +55,7 @@ public class StartProgressWindow extends Application { grid.add(progressLabel.get(), 1, 0); progressDialog.getDialogPane().setContent(grid); Stage stage = (Stage) progressDialog.getDialogPane().getScene().getWindow(); + stage.getIcons().add(GUITools.logo); stage.initModality(Modality.APPLICATION_MODAL); stage.setOnCloseRequest((request) -> System.exit(0)); if (exit) { From 0208a1032f4a653ac0308d704428174f14a9c96b Mon Sep 17 00:00:00 2001 From: Bixilon Date: Thu, 29 Oct 2020 16:06:05 +0100 Subject: [PATCH 4/4] remove "Codename" in copyright, force add newline add end of file --- .editorconfig | 4 +- .idea/copyright/GPL.xml | 2 +- pom.xml | 8 ++-- src/main/java/de/bixilon/minosoft/Config.java | 2 +- .../java/de/bixilon/minosoft/Minosoft.java | 2 +- .../minosoft/config/Configuration.java | 3 +- .../minosoft/config/ConfigurationPaths.java | 4 +- .../minosoft/data/ChangeableIdentifier.java | 2 +- .../minosoft/data/ChatTextPositions.java | 2 +- .../bixilon/minosoft/data/Difficulties.java | 2 +- .../de/bixilon/minosoft/data/Directions.java | 2 +- .../bixilon/minosoft/data/EntityRotation.java | 2 +- .../de/bixilon/minosoft/data/GameModes.java | 2 +- .../bixilon/minosoft/data/IdentifierSet.java | 2 +- .../de/bixilon/minosoft/data/LevelTypes.java | 2 +- .../java/de/bixilon/minosoft/data/MapSet.java | 2 +- .../de/bixilon/minosoft/data/Mappings.java | 2 +- .../java/de/bixilon/minosoft/data/Player.java | 2 +- .../minosoft/data/PlayerPropertyData.java | 2 +- .../minosoft/data/SoundCategories.java | 4 +- .../java/de/bixilon/minosoft/data/Tag.java | 2 +- .../java/de/bixilon/minosoft/data/Trade.java | 2 +- .../java/de/bixilon/minosoft/data/Vector.java | 2 +- .../minosoft/data/VelocityHandler.java | 2 +- .../minosoft/data/VersionValueMap.java | 2 +- .../minosoft/data/assets/AssetsManager.java | 4 +- .../minosoft/data/entities/Entity.java | 2 +- .../data/entities/EntityInterface.java | 2 +- .../minosoft/data/entities/EntityObject.java | 2 +- .../data/entities/EntityProperty.java | 2 +- .../data/entities/EntityPropertyKeys.java | 2 +- .../data/entities/EntityPropertyModifier.java | 2 +- .../minosoft/data/entities/Location.java | 2 +- .../bixilon/minosoft/data/entities/Mob.java | 2 +- .../minosoft/data/entities/MobInterface.java | 2 +- .../data/entities/ObjectInterface.java | 2 +- .../minosoft/data/entities/Objects.java | 2 +- .../bixilon/minosoft/data/entities/Poses.java | 2 +- .../data/entities/RelativeLocation.java | 2 +- .../minosoft/data/entities/StatusEffect.java | 2 +- .../minosoft/data/entities/Velocity.java | 2 +- .../minosoft/data/entities/VillagerData.java | 2 +- .../entities/block/BedEntityMetaData.java | 2 +- .../entities/block/BlockEntityMetaData.java | 2 +- .../block/CampfireBlockEntityMetaData.java | 2 +- .../entities/meta/AbstractArrowMetaData.java | 2 +- .../meta/AbstractFireballMetaData.java | 2 +- .../entities/meta/AbstractFishMetaData.java | 2 +- .../entities/meta/AbstractHorseMetaData.java | 2 +- .../meta/AbstractIllagerMetaData.java | 2 +- .../meta/AbstractMerchantMetaData.java | 2 +- .../data/entities/meta/AgeableMetaData.java | 2 +- .../data/entities/meta/AmbientMetaData.java | 2 +- .../data/entities/meta/AnimalMetaData.java | 2 +- .../meta/AreaEffectCloudMetaData.java | 2 +- .../entities/meta/ArmorStandMetaData.java | 2 +- .../entities/meta/BasePiglinMetaData.java | 2 +- .../data/entities/meta/BatMetaData.java | 2 +- .../data/entities/meta/BeeMetaData.java | 2 +- .../data/entities/meta/BlazeMetaData.java | 2 +- .../data/entities/meta/BoatMetaData.java | 2 +- .../data/entities/meta/CatMetaData.java | 2 +- .../entities/meta/ChestedHorseMetaData.java | 2 +- .../data/entities/meta/ChickenMetaData.java | 2 +- .../data/entities/meta/CodMetaData.java | 2 +- .../meta/CommandBlockMinecartMetaData.java | 2 +- .../data/entities/meta/CowMetaData.java | 2 +- .../data/entities/meta/CreatureMetaData.java | 2 +- .../data/entities/meta/CreeperMetaData.java | 2 +- .../data/entities/meta/DolphinMetaData.java | 2 +- .../data/entities/meta/DonkeyMetaData.java | 2 +- .../entities/meta/DragonFireballMetaData.java | 2 +- .../data/entities/meta/DrownedMetaData.java | 2 +- .../data/entities/meta/EggMetaData.java | 2 +- .../entities/meta/ElderGuardianMetaData.java | 2 +- .../entities/meta/EnderCrystalMetaData.java | 2 +- .../entities/meta/EnderDragonMetaData.java | 2 +- .../entities/meta/EnderPearlMetaData.java | 2 +- .../data/entities/meta/EndermanMetaData.java | 2 +- .../data/entities/meta/EndermiteMetaData.java | 2 +- .../data/entities/meta/EntityMetaData.java | 2 +- .../data/entities/meta/EvokerMetaData.java | 2 +- .../meta/ExperienceBottleMetaData.java | 2 +- .../entities/meta/EyeOfEnderMetaData.java | 2 +- .../entities/meta/FallingBlockMetaData.java | 2 +- .../data/entities/meta/FireballMetaData.java | 2 +- .../data/entities/meta/FireworkMetaData.java | 2 +- .../entities/meta/FishingHookMetaData.java | 2 +- .../data/entities/meta/FlyingMetaData.java | 2 +- .../data/entities/meta/FoxMetaData.java | 2 +- .../meta/FurnaceMinecartMetaData.java | 2 +- .../data/entities/meta/GhastMetaData.java | 2 +- .../entities/meta/GiantZombieMetaData.java | 2 +- .../data/entities/meta/GolemMetaData.java | 2 +- .../data/entities/meta/GuardianMetaData.java | 2 +- .../data/entities/meta/HangingMetaData.java | 2 +- .../data/entities/meta/HoglinMetaData.java | 2 +- .../data/entities/meta/HorseMetaData.java | 2 +- .../data/entities/meta/HumanMetaData.java | 2 +- .../data/entities/meta/HuskMetaData.java | 2 +- .../entities/meta/IllusionerMetaData.java | 2 +- .../entities/meta/InsentientMetaData.java | 2 +- .../data/entities/meta/IronGolemMetaData.java | 2 +- .../data/entities/meta/ItemFrameMetaData.java | 2 +- .../data/entities/meta/ItemMetaData.java | 2 +- .../entities/meta/ItemedFireballMetaData.java | 2 +- .../meta/ItemedThrowableMetaData.java | 2 +- .../data/entities/meta/LivingMetaData.java | 2 +- .../data/entities/meta/LlamaMetaData.java | 2 +- .../data/entities/meta/LlamaSpitMetaData.java | 2 +- .../data/entities/meta/MinecartMetaData.java | 2 +- .../data/entities/meta/MonsterMetaData.java | 2 +- .../data/entities/meta/MooshroomMetaData.java | 2 +- .../data/entities/meta/MuleMetaData.java | 2 +- .../data/entities/meta/OcelotMetaData.java | 2 +- .../data/entities/meta/PandaMetaData.java | 2 +- .../data/entities/meta/ParrotMetaData.java | 2 +- .../data/entities/meta/PhantomMetaData.java | 2 +- .../data/entities/meta/PigMetaData.java | 2 +- .../entities/meta/PiglinBruteMetaData.java | 2 +- .../data/entities/meta/PiglinMetaData.java | 2 +- .../data/entities/meta/PillagerMetaData.java | 2 +- .../data/entities/meta/PolarBearMetaData.java | 2 +- .../data/entities/meta/PotionMetaData.java | 2 +- .../data/entities/meta/PrimedTNTMetaData.java | 4 +- .../entities/meta/PufferfishMetaData.java | 2 +- .../data/entities/meta/RabbitMetaData.java | 2 +- .../meta/RaidParticipantMetaData.java | 2 +- .../data/entities/meta/RavagerMetaData.java | 2 +- .../data/entities/meta/SalmonMetaData.java | 2 +- .../data/entities/meta/SheepMetaData.java | 2 +- .../data/entities/meta/ShulkerMetaData.java | 2 +- .../entities/meta/SilverfishMetaData.java | 2 +- .../entities/meta/SkeletonHorseMetaData.java | 2 +- .../data/entities/meta/SkeletonMetaData.java | 2 +- .../data/entities/meta/SlimeMetaData.java | 2 +- .../entities/meta/SmallFireballMetaData.java | 2 +- .../data/entities/meta/SnowGolemMetaData.java | 2 +- .../data/entities/meta/SnowballMetaData.java | 2 +- .../entities/meta/SpectralArrowMetaData.java | 2 +- .../entities/meta/SpellcasterMetaData.java | 2 +- .../data/entities/meta/SpiderMetaData.java | 2 +- .../data/entities/meta/SquidMetaData.java | 2 +- .../entities/meta/StraySkeletonMetaData.java | 2 +- .../data/entities/meta/StriderMetaData.java | 2 +- .../data/entities/meta/TameableMetaData.java | 2 +- .../data/entities/meta/ThrowableMetaData.java | 2 +- .../entities/meta/TippedArrowMetaData.java | 2 +- .../data/entities/meta/TridentMetaData.java | 2 +- .../entities/meta/TropicalFishMetaData.java | 2 +- .../data/entities/meta/TurtleMetaData.java | 2 +- .../data/entities/meta/VexMetaData.java | 2 +- .../data/entities/meta/VillagerMetaData.java | 2 +- .../entities/meta/VindicatorMetaData.java | 2 +- .../meta/WanderingTraderMetaData.java | 2 +- .../data/entities/meta/WaterMobMetaData.java | 2 +- .../data/entities/meta/WitchMetaData.java | 2 +- .../data/entities/meta/WitherMetaData.java | 2 +- .../entities/meta/WitherSkeletonMetaData.java | 2 +- .../entities/meta/WitherSkullMetaData.java | 2 +- .../data/entities/meta/WolfMetaData.java | 2 +- .../data/entities/meta/ZoglinMetaData.java | 2 +- .../entities/meta/ZombieHorseMetaData.java | 2 +- .../data/entities/meta/ZombieMetaData.java | 2 +- .../entities/meta/ZombieVillagerMetaData.java | 2 +- .../minosoft/data/entities/mob/Bat.java | 2 +- .../minosoft/data/entities/mob/Bee.java | 2 +- .../minosoft/data/entities/mob/Blaze.java | 2 +- .../minosoft/data/entities/mob/Cat.java | 2 +- .../data/entities/mob/CaveSpider.java | 2 +- .../minosoft/data/entities/mob/Chicken.java | 2 +- .../minosoft/data/entities/mob/Cod.java | 2 +- .../minosoft/data/entities/mob/Cow.java | 2 +- .../minosoft/data/entities/mob/Creeper.java | 2 +- .../minosoft/data/entities/mob/Dolphin.java | 2 +- .../minosoft/data/entities/mob/Donkey.java | 2 +- .../minosoft/data/entities/mob/Drowned.java | 2 +- .../data/entities/mob/ElderGuardian.java | 2 +- .../data/entities/mob/EnderDragon.java | 2 +- .../minosoft/data/entities/mob/Enderman.java | 2 +- .../minosoft/data/entities/mob/Endermite.java | 2 +- .../minosoft/data/entities/mob/Evoker.java | 2 +- .../data/entities/mob/FishingBobber.java | 2 +- .../minosoft/data/entities/mob/Fox.java | 2 +- .../minosoft/data/entities/mob/Ghast.java | 2 +- .../data/entities/mob/GiantZombie.java | 4 +- .../minosoft/data/entities/mob/Guardian.java | 2 +- .../minosoft/data/entities/mob/Hoglin.java | 2 +- .../minosoft/data/entities/mob/Horse.java | 2 +- .../minosoft/data/entities/mob/Husk.java | 2 +- .../data/entities/mob/Illusioner.java | 2 +- .../minosoft/data/entities/mob/IronGolem.java | 2 +- .../minosoft/data/entities/mob/Llama.java | 2 +- .../minosoft/data/entities/mob/MagmaCube.java | 2 +- .../minosoft/data/entities/mob/Mooshroom.java | 2 +- .../minosoft/data/entities/mob/Mule.java | 2 +- .../minosoft/data/entities/mob/Ocelot.java | 2 +- .../data/entities/mob/OtherPlayer.java | 2 +- .../minosoft/data/entities/mob/Panda.java | 2 +- .../minosoft/data/entities/mob/Parrot.java | 2 +- .../minosoft/data/entities/mob/Phantom.java | 2 +- .../minosoft/data/entities/mob/Pig.java | 2 +- .../minosoft/data/entities/mob/Piglin.java | 2 +- .../data/entities/mob/PiglinBrute.java | 2 +- .../minosoft/data/entities/mob/Pillager.java | 2 +- .../minosoft/data/entities/mob/PolarBear.java | 2 +- .../data/entities/mob/Pufferfish.java | 2 +- .../minosoft/data/entities/mob/Rabbit.java | 2 +- .../minosoft/data/entities/mob/Ravager.java | 2 +- .../minosoft/data/entities/mob/Salmon.java | 2 +- .../minosoft/data/entities/mob/Sheep.java | 2 +- .../minosoft/data/entities/mob/Shulker.java | 2 +- .../data/entities/mob/Silverfish.java | 2 +- .../minosoft/data/entities/mob/Skeleton.java | 2 +- .../data/entities/mob/SkeletonHorse.java | 2 +- .../minosoft/data/entities/mob/Slime.java | 2 +- .../minosoft/data/entities/mob/SnowGolem.java | 2 +- .../minosoft/data/entities/mob/Spider.java | 2 +- .../minosoft/data/entities/mob/Squid.java | 2 +- .../data/entities/mob/StraySkeleton.java | 2 +- .../minosoft/data/entities/mob/Strider.java | 2 +- .../data/entities/mob/TropicalFish.java | 2 +- .../minosoft/data/entities/mob/Turtle.java | 2 +- .../minosoft/data/entities/mob/Vex.java | 2 +- .../minosoft/data/entities/mob/Villager.java | 2 +- .../data/entities/mob/Vindicator.java | 2 +- .../data/entities/mob/WanderingTrader.java | 2 +- .../minosoft/data/entities/mob/Witch.java | 2 +- .../minosoft/data/entities/mob/Wither.java | 2 +- .../data/entities/mob/WitherSkeleton.java | 2 +- .../minosoft/data/entities/mob/Wolf.java | 2 +- .../minosoft/data/entities/mob/Zoglin.java | 2 +- .../minosoft/data/entities/mob/Zombie.java | 2 +- .../data/entities/mob/ZombieHorse.java | 2 +- .../data/entities/mob/ZombiePigman.java | 2 +- .../data/entities/mob/ZombieVillager.java | 2 +- .../data/entities/mob/ZombifiedPiglin.java | 2 +- .../entities/objects/AreaEffectCloud.java | 2 +- .../data/entities/objects/ArmorStand.java | 2 +- .../minosoft/data/entities/objects/Arrow.java | 2 +- .../minosoft/data/entities/objects/Boat.java | 2 +- .../data/entities/objects/DragonFireball.java | 2 +- .../data/entities/objects/EnderCrystal.java | 2 +- .../data/entities/objects/EvocationFangs.java | 2 +- .../data/entities/objects/ExperienceOrb.java | 2 +- .../data/entities/objects/EyeOfEnder.java | 2 +- .../data/entities/objects/FallingBlock.java | 2 +- .../entities/objects/FallingDragonEgg.java | 2 +- .../data/entities/objects/FireCharge.java | 2 +- .../data/entities/objects/Fireball.java | 2 +- .../data/entities/objects/Firework.java | 2 +- .../data/entities/objects/FishingFloat.java | 2 +- .../data/entities/objects/ItemFrame.java | 2 +- .../data/entities/objects/ItemStack.java | 2 +- .../data/entities/objects/LeashKnot.java | 2 +- .../data/entities/objects/LightningBolt.java | 2 +- .../data/entities/objects/LlamaSpit.java | 2 +- .../data/entities/objects/Minecart.java | 2 +- .../data/entities/objects/MinecartChest.java | 2 +- .../objects/MinecartCommandBlock.java | 2 +- .../entities/objects/MinecartFurnace.java | 2 +- .../data/entities/objects/MinecartHopper.java | 2 +- .../entities/objects/MinecartSpawner.java | 2 +- .../data/entities/objects/MinecartTNT.java | 2 +- .../data/entities/objects/Painting.java | 2 +- .../data/entities/objects/PrimedTNT.java | 2 +- .../data/entities/objects/ShulkerBullet.java | 2 +- .../data/entities/objects/SmallFireball.java | 2 +- .../data/entities/objects/Snowball.java | 2 +- .../data/entities/objects/SpectralArrow.java | 2 +- .../data/entities/objects/ThrownEgg.java | 2 +- .../entities/objects/ThrownEnderpearl.java | 2 +- .../objects/ThrownExperienceBottle.java | 2 +- .../data/entities/objects/ThrownPotion.java | 2 +- .../data/entities/objects/Trident.java | 2 +- .../data/entities/objects/WitherSkull.java | 2 +- .../minosoft/data/inventory/Inventory.java | 2 +- .../data/inventory/InventoryActions.java | 2 +- .../data/inventory/InventoryProperties.java | 2 +- .../data/inventory/InventorySlots.java | 4 +- .../data/inventory/InventoryTypes.java | 2 +- .../bixilon/minosoft/data/inventory/Slot.java | 2 +- .../minosoft/data/locale/Language.java | 2 +- .../minosoft/data/locale/LocaleManager.java | 4 +- .../bixilon/minosoft/data/locale/Strings.java | 2 +- .../locale/minecraft/MinecraftLanguage.java | 4 +- .../minecraft/MinecraftLocaleManager.java | 2 +- .../minosoft/data/mappings/BlockId.java | 2 +- .../minosoft/data/mappings/CustomMapping.java | 2 +- .../minosoft/data/mappings/Dimension.java | 2 +- .../minosoft/data/mappings/Enchantment.java | 2 +- .../minosoft/data/mappings/Entities.java | 2 +- .../bixilon/minosoft/data/mappings/Item.java | 2 +- .../minosoft/data/mappings/MobEffect.java | 2 +- .../minosoft/data/mappings/Motive.java | 2 +- .../minosoft/data/mappings/blocks/Block.java | 2 +- .../data/mappings/blocks/BlockProperties.java | 2 +- .../data/mappings/blocks/BlockRotations.java | 2 +- .../minosoft/data/mappings/blocks/Blocks.java | 2 +- .../mappings/blocks/actions/BeaconAction.java | 2 +- .../mappings/blocks/actions/BlockAction.java | 2 +- .../mappings/blocks/actions/ChestAction.java | 2 +- .../blocks/actions/EndGatewayAction.java | 2 +- .../blocks/actions/MobSpawnerAction.java | 2 +- .../blocks/actions/NoteBlockAction.java | 2 +- .../mappings/blocks/actions/PistonAction.java | 2 +- .../data/mappings/particle/Particle.java | 2 +- .../particle/data/BlockParticleData.java | 2 +- .../particle/data/DustParticleData.java | 4 +- .../particle/data/ItemParticleData.java | 2 +- .../mappings/particle/data/ParticleData.java | 2 +- .../data/mappings/recipes/Ingredient.java | 2 +- .../data/mappings/recipes/Recipe.java | 2 +- .../data/mappings/recipes/RecipeTypes.java | 2 +- .../data/mappings/recipes/Recipes.java | 2 +- .../data/mappings/statistics/Statistic.java | 2 +- .../statistics/StatisticCategories.java | 2 +- .../data/mappings/versions/Version.java | 2 +- .../mappings/versions/VersionMapping.java | 2 +- .../data/mappings/versions/Versions.java | 2 +- .../bixilon/minosoft/data/player/Hands.java | 4 +- .../minosoft/data/player/PingBars.java | 4 +- .../minosoft/data/player/PlayerListItem.java | 2 +- .../data/player/PlayerListItemBulk.java | 2 +- .../data/player/PlayerProperties.java | 2 +- .../minosoft/data/player/PlayerProperty.java | 2 +- .../data/player/advancements/Advancement.java | 2 +- .../advancements/AdvancementDisplay.java | 2 +- .../advancements/AdvancementProgress.java | 2 +- .../advancements/CriterionProgress.java | 2 +- .../data/scoreboard/ScoreboardManager.java | 2 +- .../data/scoreboard/ScoreboardObjective.java | 2 +- .../data/scoreboard/ScoreboardScore.java | 2 +- .../minosoft/data/scoreboard/Team.java | 2 +- .../minosoft/data/text/BaseComponent.java | 4 +- .../minosoft/data/text/ChatColors.java | 2 +- .../minosoft/data/text/ChatComponent.java | 4 +- .../data/text/ChatFormattingCodes.java | 2 +- .../bixilon/minosoft/data/text/RGBColor.java | 2 +- .../minosoft/data/text/TextComponent.java | 2 +- .../data/text/TranslatableComponent.java | 2 +- .../minosoft/data/world/BlockPosition.java | 2 +- .../de/bixilon/minosoft/data/world/Chunk.java | 2 +- .../minosoft/data/world/ChunkLocation.java | 2 +- .../minosoft/data/world/ChunkNibble.java | 2 +- .../data/world/ChunkNibbleLocation.java | 2 +- .../minosoft/data/world/InChunkLocation.java | 2 +- .../de/bixilon/minosoft/data/world/World.java | 2 +- .../data/world/palette/DirectPalette.java | 2 +- .../data/world/palette/IndirectPalette.java | 2 +- .../minosoft/data/world/palette/Palette.java | 2 +- .../minosoft/gui/main/AccountListCell.java | 4 +- .../minosoft/gui/main/AccountWindow.java | 2 +- .../gui/main/ConnectionChangeCallback.java | 2 +- .../bixilon/minosoft/gui/main/GUITools.java | 2 +- .../bixilon/minosoft/gui/main/Launcher.java | 4 +- .../bixilon/minosoft/gui/main/MainWindow.java | 2 +- .../de/bixilon/minosoft/gui/main/Server.java | 2 +- .../minosoft/gui/main/ServerListCell.java | 4 +- .../minosoft/gui/main/SessionListCell.java | 4 +- .../minosoft/gui/main/SessionsWindow.java | 2 +- .../minosoft/gui/main/SettingsWindow.java | 2 +- .../gui/main/StartProgressWindow.java | 3 +- .../java/de/bixilon/minosoft/logging/Log.java | 2 +- .../bixilon/minosoft/logging/LogLevels.java | 2 +- .../de/bixilon/minosoft/modding/Logger.java | 2 +- .../bixilon/minosoft/modding/MinosoftMod.java | 4 +- .../channels/DefaultPluginChannels.java | 2 +- .../minosoft/modding/event/EventListener.java | 2 +- .../minosoft/modding/event/EventManager.java | 2 +- .../minosoft/modding/event/EventMethod.java | 2 +- .../event/address/HostnameValidator.java | 2 +- .../modding/event/address/PortValidator.java | 2 +- .../modding/event/address/RegexValidator.java | 2 +- .../event/address/ServerAddressValidator.java | 2 +- .../event/address/SimpleAddressValidator.java | 2 +- .../event/events/BlockActionEvent.java | 2 +- .../events/BlockBreakAnimationEvent.java | 2 +- .../event/events/BlockChangeEvent.java | 2 +- .../BlockEntityMetaDataChangeEvent.java | 2 +- .../event/events/BossBarChangeEvent.java | 2 +- .../modding/event/events/CancelableEvent.java | 2 +- .../event/events/ChangeGameStateEvent.java | 2 +- .../events/ChatMessageReceivingEvent.java | 2 +- .../event/events/ChatMessageSendingEvent.java | 2 +- .../event/events/ChunkDataChangeEvent.java | 2 +- .../event/events/CloseWindowEvent.java | 2 +- .../events/CollectItemAnimationEvent.java | 2 +- .../modding/event/events/DisconnectEvent.java | 2 +- .../modding/event/events/EffectEvent.java | 2 +- .../event/events/EntityDespawnEvent.java | 2 +- .../events/EntityEquipmentChangeEvent.java | 2 +- .../event/events/EntitySpawnEvent.java | 2 +- .../event/events/EntitySpectateEvent.java | 2 +- .../minosoft/modding/event/events/Event.java | 2 +- .../event/events/ExperienceChangeEvent.java | 2 +- .../modding/event/events/JoinGameEvent.java | 2 +- .../event/events/LightningBoltSpawnEvent.java | 2 +- .../event/events/LoginDisconnectEvent.java | 2 +- .../LoginPluginMessageRequestEvent.java | 2 +- .../event/events/MultiBlockChangeEvent.java | 2 +- .../event/events/MultiSlotChangeEvent.java | 2 +- .../event/events/OpenSignEditorEvent.java | 2 +- .../event/events/PacketReceiveEvent.java | 2 +- .../modding/event/events/PacketSendEvent.java | 2 +- .../event/events/ParticleSpawnEvent.java | 2 +- .../events/PlayerListInfoChangeEvent.java | 2 +- .../events/PlayerListItemChangeEvent.java | 2 +- .../events/PluginMessageReceiveEvent.java | 2 +- .../event/events/ResourcePackChangeEvent.java | 2 +- .../modding/event/events/RespawnEvent.java | 2 +- .../event/events/SingleSlotChangeEvent.java | 2 +- .../events/SpawnLocationChangeEvent.java | 2 +- .../modding/event/events/StatusPongEvent.java | 2 +- .../event/events/StatusResponseEvent.java | 2 +- .../modding/event/events/TimeChangeEvent.java | 2 +- .../event/events/TitleChangeEvent.java | 2 +- .../event/events/UpdateHealthEvent.java | 2 +- .../events/annotations/EventHandler.java | 2 +- .../annotations/MaximumProtocolVersion.java | 2 +- .../annotations/MinimumProtocolVersion.java | 2 +- .../event/events/annotations/Unsafe.java | 2 +- .../minosoft/modding/loading/LoadingInfo.java | 2 +- .../minosoft/modding/loading/ModInfo.java | 2 +- .../minosoft/modding/loading/ModLoader.java | 2 +- .../minosoft/modding/loading/ModPhases.java | 2 +- .../minosoft/modding/loading/Priorities.java | 2 +- .../minosoft/protocol/network/Connection.java | 2 +- .../minosoft/protocol/network/Network.java | 2 +- .../protocol/network/netty/NettyNetwork.java | 2 +- .../protocol/network/netty/PacketDecoder.java | 2 +- .../protocol/network/netty/PacketEncoder.java | 2 +- .../network/netty/PacketReceiver.java | 2 +- .../netty/TCPClientChannelInitializer.java | 2 +- .../network/socket/SocketNetwork.java | 2 +- .../protocol/packets/ClientboundPacket.java | 2 +- .../minosoft/protocol/packets/Packet.java | 2 +- .../protocol/packets/ServerboundPacket.java | 2 +- .../PacketCompressionInterface.java | 2 +- .../login/PacketEncryptionRequest.java | 2 +- .../login/PacketLoginDisconnect.java | 2 +- .../login/PacketLoginPluginRequest.java | 2 +- .../login/PacketLoginSetCompression.java | 2 +- .../clientbound/login/PacketLoginSuccess.java | 2 +- .../play/PacketAcknowledgePlayerDigging.java | 2 +- .../clientbound/play/PacketAdvancements.java | 2 +- .../clientbound/play/PacketAttachEntity.java | 2 +- .../clientbound/play/PacketBlockAction.java | 2 +- .../play/PacketBlockBreakAnimation.java | 2 +- .../clientbound/play/PacketBlockChange.java | 2 +- .../play/PacketBlockEntityMetadata.java | 4 +- .../clientbound/play/PacketBossBar.java | 2 +- .../clientbound/play/PacketCamera.java | 2 +- .../play/PacketChangeGameState.java | 2 +- .../play/PacketChatMessageReceiving.java | 2 +- .../clientbound/play/PacketChunkBulk.java | 2 +- .../clientbound/play/PacketChunkData.java | 2 +- .../play/PacketCloseWindowReceiving.java | 2 +- .../clientbound/play/PacketCollectItem.java | 2 +- .../clientbound/play/PacketCombatEvent.java | 2 +- .../PacketConfirmTransactionReceiving.java | 2 +- .../play/PacketCraftRecipeResponse.java | 2 +- .../play/PacketDeclareRecipes.java | 2 +- .../clientbound/play/PacketDestroyEntity.java | 2 +- .../clientbound/play/PacketDisconnect.java | 2 +- .../clientbound/play/PacketEffect.java | 2 +- .../play/PacketEntityAnimation.java | 2 +- .../clientbound/play/PacketEntityEffect.java | 2 +- .../play/PacketEntityEquipment.java | 2 +- .../play/PacketEntityHeadRotation.java | 2 +- .../play/PacketEntityInitialisation.java | 2 +- .../play/PacketEntityMetadata.java | 2 +- .../play/PacketEntityMovement.java | 2 +- .../play/PacketEntityMovementAndRotation.java | 2 +- .../play/PacketEntityProperties.java | 2 +- .../play/PacketEntityRotation.java | 2 +- .../play/PacketEntitySoundEffect.java | 2 +- .../clientbound/play/PacketEntityStatus.java | 2 +- .../play/PacketEntityTeleport.java | 2 +- .../play/PacketEntityVelocity.java | 2 +- .../clientbound/play/PacketExplosion.java | 2 +- .../clientbound/play/PacketFacePlayer.java | 2 +- .../play/PacketHeldItemChangeReceiving.java | 2 +- .../clientbound/play/PacketJoinGame.java | 2 +- .../clientbound/play/PacketKeepAlive.java | 2 +- .../clientbound/play/PacketMapData.java | 2 +- .../play/PacketMultiBlockChange.java | 2 +- .../play/PacketNBTQueryResponse.java | 2 +- .../play/PacketNamedSoundEffect.java | 2 +- .../clientbound/play/PacketOpenBook.java | 2 +- .../play/PacketOpenHorseWindow.java | 2 +- .../play/PacketOpenSignEditor.java | 2 +- .../clientbound/play/PacketOpenWindow.java | 2 +- .../clientbound/play/PacketParticle.java | 2 +- .../play/PacketPlayerAbilitiesReceiving.java | 2 +- .../play/PacketPlayerListItem.java | 2 +- .../play/PacketPlayerPositionAndRotation.java | 2 +- .../play/PacketPluginMessageReceiving.java | 2 +- .../play/PacketRemoveEntityEffect.java | 2 +- .../play/PacketResourcePackSend.java | 2 +- .../clientbound/play/PacketRespawn.java | 2 +- .../PacketScoreboardDisplayScoreboard.java | 2 +- .../play/PacketScoreboardObjective.java | 2 +- .../play/PacketScoreboardUpdateScore.java | 2 +- .../play/PacketSelectAdvancementTab.java | 2 +- .../play/PacketServerDifficulty.java | 2 +- .../play/PacketSetCompression.java | 2 +- .../clientbound/play/PacketSetCooldown.java | 2 +- .../clientbound/play/PacketSetExperience.java | 2 +- .../clientbound/play/PacketSetPassenger.java | 2 +- .../clientbound/play/PacketSetSlot.java | 2 +- .../clientbound/play/PacketSoundEffect.java | 2 +- .../play/PacketSpawnExperienceOrb.java | 2 +- .../clientbound/play/PacketSpawnLocation.java | 2 +- .../clientbound/play/PacketSpawnMob.java | 2 +- .../clientbound/play/PacketSpawnObject.java | 2 +- .../clientbound/play/PacketSpawnPainting.java | 2 +- .../clientbound/play/PacketSpawnPlayer.java | 2 +- .../play/PacketSpawnWeatherEntity.java | 2 +- .../clientbound/play/PacketStatistics.java | 2 +- .../clientbound/play/PacketStopSound.java | 2 +- .../play/PacketTabCompleteReceiving.java | 2 +- .../play/PacketTabHeaderAndFooter.java | 2 +- .../packets/clientbound/play/PacketTags.java | 2 +- .../packets/clientbound/play/PacketTeams.java | 2 +- .../clientbound/play/PacketTimeUpdate.java | 2 +- .../packets/clientbound/play/PacketTitle.java | 2 +- .../clientbound/play/PacketTradeList.java | 2 +- .../clientbound/play/PacketUnloadChunk.java | 2 +- .../clientbound/play/PacketUnlockRecipes.java | 2 +- .../clientbound/play/PacketUpdateHealth.java | 2 +- .../clientbound/play/PacketUpdateLight.java | 2 +- .../play/PacketUpdateSignReceiving.java | 2 +- .../play/PacketUpdateViewDistance.java | 2 +- .../play/PacketUpdateViewPosition.java | 2 +- .../clientbound/play/PacketUseBed.java | 2 +- .../play/PacketVehicleMovement.java | 2 +- .../clientbound/play/PacketWindowItems.java | 2 +- .../play/PacketWindowProperty.java | 2 +- .../clientbound/play/PacketWorldBorder.java | 2 +- .../clientbound/status/PacketStatusPong.java | 2 +- .../status/PacketStatusResponse.java | 2 +- .../handshaking/PacketHandshake.java | 2 +- .../login/PacketEncryptionResponse.java | 2 +- .../login/PacketLoginPluginResponse.java | 2 +- .../serverbound/login/PacketLoginStart.java | 2 +- .../play/PacketAdvancementTab.java | 2 +- .../serverbound/play/PacketAnimation.java | 2 +- .../play/PacketChatMessageSending.java | 2 +- .../serverbound/play/PacketClickWindow.java | 2 +- .../play/PacketClientSettings.java | 2 +- .../serverbound/play/PacketClientStatus.java | 2 +- .../play/PacketCloseWindowSending.java | 2 +- .../play/PacketConfirmTeleport.java | 2 +- .../play/PacketConfirmTransactionSending.java | 2 +- .../play/PacketCraftingBookData.java | 2 +- .../play/PacketCraftingRecipeRequest.java | 2 +- .../play/PacketCreativeInventoryAction.java | 2 +- .../serverbound/play/PacketEntityAction.java | 2 +- .../play/PacketGenerateStructure.java | 2 +- .../play/PacketHeldItemChangeSending.java | 2 +- .../play/PacketInteractEntity.java | 2 +- .../play/PacketKeepAliveResponse.java | 2 +- .../serverbound/play/PacketNameItem.java | 2 +- .../play/PacketPlayerAbilitiesSending.java | 2 +- .../play/PacketPlayerBlockPlacement.java | 2 +- .../serverbound/play/PacketPlayerDigging.java | 2 +- ...acketPlayerPositionAndRotationSending.java | 2 +- .../play/PacketPlayerPositionSending.java | 2 +- .../play/PacketPlayerRotationSending.java | 2 +- .../play/PacketPluginMessageSending.java | 2 +- .../play/PacketQueryEntityNBT.java | 2 +- .../play/PacketRecipeBookState.java | 2 +- .../play/PacketResourcePackStatus.java | 2 +- .../serverbound/play/PacketSelectTrade.java | 2 +- .../play/PacketSetBeaconEffect.java | 2 +- .../play/PacketSetDisplayedRecipe.java | 2 +- .../serverbound/play/PacketSpectate.java | 2 +- .../serverbound/play/PacketSteerBoat.java | 2 +- .../serverbound/play/PacketSteerVehicle.java | 2 +- .../play/PacketTabCompleteSending.java | 2 +- .../play/PacketUpdateCommandBlock.java | 2 +- .../PacketUpdateCommandBlockMinecart.java | 2 +- .../play/PacketUpdateJigsawBlock.java | 2 +- .../play/PacketUpdateSignSending.java | 2 +- .../play/PacketUpdateStructureBlock.java | 2 +- .../serverbound/play/PacketUseItem.java | 2 +- .../play/PacketVehicleMovement.java | 2 +- .../play/PacketWindowClickButton.java | 2 +- .../serverbound/status/PacketStatusPing.java | 2 +- .../status/PacketStatusRequest.java | 2 +- .../minosoft/protocol/ping/ForgeModInfo.java | 2 +- .../minosoft/protocol/ping/PingCallback.java | 2 +- .../protocol/ping/ServerListPing.java | 2 +- .../minosoft/protocol/ping/ServerModInfo.java | 2 +- .../minosoft/protocol/ping/ServerModItem.java | 2 +- .../protocol/ping/ServerModTypes.java | 2 +- .../protocol/ping/VanillaModInfo.java | 2 +- .../protocol/protocol/ConnectionPing.java | 2 +- .../protocol/protocol/ConnectionReasons.java | 2 +- .../protocol/protocol/ConnectionStates.java | 2 +- .../protocol/protocol/CryptManager.java | 2 +- .../protocol/protocol/InByteBuffer.java | 2 +- .../protocol/protocol/InPacketBuffer.java | 2 +- .../protocol/protocol/OutByteBuffer.java | 2 +- .../protocol/protocol/OutPacketBuffer.java | 2 +- .../protocol/protocol/PacketHandler.java | 2 +- .../protocol/protocol/PacketSender.java | 2 +- .../minosoft/protocol/protocol/Packets.java | 2 +- .../minosoft/protocol/protocol/Protocol.java | 4 +- .../protocol/protocol/ProtocolDefinition.java | 2 +- .../de/bixilon/minosoft/util/BitByte.java | 2 +- .../de/bixilon/minosoft/util/ChunkUtil.java | 2 +- .../minosoft/util/CountUpAndDownLatch.java | 4 +- .../de/bixilon/minosoft/util/DNSUtil.java | 2 +- .../java/de/bixilon/minosoft/util/HTTP.java | 2 +- .../java/de/bixilon/minosoft/util/OSUtil.java | 2 +- .../bixilon/minosoft/util/ServerAddress.java | 2 +- .../java/de/bixilon/minosoft/util/Util.java | 4 +- .../util/mojang/api/MojangAccount.java | 2 +- .../MojangAccountAuthenticationAttempt.java | 2 +- .../util/mojang/api/MojangAuthentication.java | 2 +- .../util/mojang/api/MojangBlockedServers.java | 2 +- .../minosoft/util/mojang/api/MojangURLs.java | 2 +- .../minosoft/util/nbt/tag/ByteArrayTag.java | 4 +- .../minosoft/util/nbt/tag/ByteTag.java | 2 +- .../minosoft/util/nbt/tag/CompoundTag.java | 2 +- .../minosoft/util/nbt/tag/DoubleTag.java | 2 +- .../minosoft/util/nbt/tag/FloatTag.java | 2 +- .../minosoft/util/nbt/tag/IntArrayTag.java | 2 +- .../bixilon/minosoft/util/nbt/tag/IntTag.java | 2 +- .../minosoft/util/nbt/tag/ListTag.java | 2 +- .../minosoft/util/nbt/tag/LongArrayTag.java | 2 +- .../minosoft/util/nbt/tag/LongTag.java | 2 +- .../bixilon/minosoft/util/nbt/tag/NBTTag.java | 2 +- .../minosoft/util/nbt/tag/ShortTag.java | 2 +- .../minosoft/util/nbt/tag/StringTag.java | 2 +- .../minosoft/util/nbt/tag/TagTypes.java | 2 +- .../minosoft/util/task/AsyncTaskWorker.java | 2 +- .../de/bixilon/minosoft/util/task/Task.java | 2 +- .../minosoft/util/task/TaskCallable.java | 2 +- .../minosoft/util/task/TaskImportance.java | 2 +- src/main/resources/layout/accounts.fxml | 9 ++-- src/main/resources/layout/cells/account.fxml | 4 +- src/main/resources/layout/cells/server.fxml | 15 ++++++- src/main/resources/layout/cells/session.fxml | 15 ++++++- src/main/resources/layout/main.fxml | 15 ++++++- src/main/resources/layout/sessions.fxml | 15 ++++++- src/main/resources/layout/settings.fxml | 13 +++++- util/mappingsDownloader.py | 43 +++++++++++++------ util/serverWrapper.py | 13 +++++- 651 files changed, 781 insertions(+), 701 deletions(-) diff --git a/.editorconfig b/.editorconfig index cbffbb8d5..715cd7022 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,7 +3,7 @@ charset = utf-8 end_of_line = lf indent_size = 4 indent_style = space -insert_final_newline = false +insert_final_newline = true max_line_length = 0 tab_width = 4 ij_continuation_indent_size = 8 @@ -373,4 +373,4 @@ ij_xml_space_after_tag_name = false ij_xml_space_around_equals_in_attribute = false ij_xml_space_inside_empty_tag = true ij_xml_text_wrap = normal -ij_xml_use_custom_settings = false \ No newline at end of file +ij_xml_use_custom_settings = false diff --git a/.idea/copyright/GPL.xml b/.idea/copyright/GPL.xml index 51908d1b4..eef6ab612 100644 --- a/.idea/copyright/GPL.xml +++ b/.idea/copyright/GPL.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/pom.xml b/pom.xml index b7bf209fb..b8d37ffb3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - + @@ -23,4 +22,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/layout/cells/account.fxml b/src/main/resources/layout/cells/account.fxml index 076faf51d..7503f31f1 100644 --- a/src/main/resources/layout/cells/account.fxml +++ b/src/main/resources/layout/cells/account.fxml @@ -4,7 +4,7 @@ \ No newline at end of file + diff --git a/src/main/resources/layout/cells/session.fxml b/src/main/resources/layout/cells/session.fxml index 12974d145..5e3313150 100644 --- a/src/main/resources/layout/cells/session.fxml +++ b/src/main/resources/layout/cells/session.fxml @@ -4,7 +4,18 @@ - + \ No newline at end of file + diff --git a/src/main/resources/layout/main.fxml b/src/main/resources/layout/main.fxml index 1043b70e6..ab22e7f70 100644 --- a/src/main/resources/layout/main.fxml +++ b/src/main/resources/layout/main.fxml @@ -2,7 +2,18 @@ - + @@ -30,4 +41,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/layout/sessions.fxml b/src/main/resources/layout/sessions.fxml index 16311a67b..ccf9d745a 100644 --- a/src/main/resources/layout/sessions.fxml +++ b/src/main/resources/layout/sessions.fxml @@ -4,7 +4,18 @@ - + @@ -16,4 +27,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/layout/settings.fxml b/src/main/resources/layout/settings.fxml index 58f9d584c..cfa05698e 100644 --- a/src/main/resources/layout/settings.fxml +++ b/src/main/resources/layout/settings.fxml @@ -2,7 +2,18 @@ - + diff --git a/util/mappingsDownloader.py b/util/mappingsDownloader.py index 6ae5a1909..e6f6b6b61 100644 --- a/util/mappingsDownloader.py +++ b/util/mappingsDownloader.py @@ -1,4 +1,4 @@ -# Codename Minosoft +# Minosoft # Copyright (C) 2020 Moritz Zwerger # # This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. @@ -8,24 +8,43 @@ # You should have received a copy of the GNU General Public License along with this program. If not, see . # # This software is not affiliated with Mojang AB, the original developer of Minecraft. +# +# This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with this program. If not, see . +# +# This software is not affiliated with Mojang AB, the original developer of Minecraft. -import os -import requests -import shutil -import tarfile -import ujson +import \ + os +import \ + requests +import \ + shutil +import \ + tarfile +import \ + traceback +import \ + ujson -import traceback - -print("Minecraft mappings downloader (and generator)") +print( + "Minecraft mappings downloader (and generator)") PRE_FLATTENING_UPDATE_VERSION = "17w46a" DATA_FOLDER = "./mcdata/" -FILES_PER_VERSION = ["blocks.json", "registries.json"] +FILES_PER_VERSION = [ + "blocks.json", + "registries.json"] DOWNLOAD_BASE_URL = "https://apimon.de/mcdata/" -manifest = requests.get('https://launchermeta.mojang.com/mc/game/version_manifest.json').json() +manifest = requests.get( + 'https://launchermeta.mojang.com/mc/game/version_manifest.json').json() failed = [] -defaultMappings = ujson.load(open("mappingsDefaults.json")) +defaultMappings = ujson.load( + open( + "mappingsDefaults.json")) if not os.path.isdir(DATA_FOLDER): os.mkdir(DATA_FOLDER) diff --git a/util/serverWrapper.py b/util/serverWrapper.py index 16062652c..1f2642edc 100644 --- a/util/serverWrapper.py +++ b/util/serverWrapper.py @@ -1,5 +1,5 @@ """ -* Codename Minosoft +* Minosoft * Copyright (C) 2020 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. @@ -10,6 +10,17 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. """ +# Minosoft +# Copyright (C) 2020 Moritz Zwerger +# +# This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with this program. If not, see . +# +# This software is not affiliated with Mojang AB, the original developer of Minecraft. + import os import requests import shutil