From 4da017c9be99ae0c0bf0bf780b7dadf83c9c7c22 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Thu, 25 Sep 2025 20:30:03 +0200 Subject: [PATCH] more pretty log --- .../java/xyz/alexcrea/cuanvil/update/Update_1_21.java | 9 ++++----- .../java/xyz/alexcrea/cuanvil/update/Update_1_21_9.java | 9 ++++----- .../alexcrea/cuanvil/update/plugin/PluginUpdates.java | 9 +++++++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21.java b/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21.java index 1695b34..56de63c 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21.java +++ b/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21.java @@ -9,19 +9,20 @@ public class Update_1_21 { private static final Version V1_21 = new Version(1, 21); - public static void handleUpdate(Version current){ + public static boolean handleUpdate(Version current){ // Test if we are running in 1.21 or better if(V1_21.greaterThan(current)) - return; + return false; // if version path is not null then check if its it's before 1.21 String oldVersion = ConfigHolder.DEFAULT_CONFIG.getConfig().getString(UpdateUtils.MINECRAFT_VERSION_PATH); if(oldVersion != null){ var version = Version.fromString(oldVersion); - if(V1_21.lesserEqual(version)) return; + if(V1_21.lesserEqual(version)) return false; } doUpdate(); + return true; } private static void doUpdate() { @@ -86,8 +87,6 @@ public class Update_1_21 { // imply reload of CONFLICT_HOLDER // We also do not need to reload base config as there is no object related to it. ConfigHolder.ITEM_GROUP_HOLDER.reload(); - - CustomAnvil.instance.getLogger().info("Updating Done !"); } } diff --git a/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21_9.java b/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21_9.java index 0075285..e749d74 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21_9.java +++ b/src/main/java/xyz/alexcrea/cuanvil/update/Update_1_21_9.java @@ -9,19 +9,20 @@ public class Update_1_21_9 { private static final Version V1_21_9 = new Version(1, 21, 9); - public static void handleUpdate(Version current){ + public static boolean handleUpdate(Version current){ // Test if we are running in 1.21.9 or better if(V1_21_9.greaterThan(current)) - return; + return false; // if version path is not null then check if its it's before 1.21.9 String oldVersion = ConfigHolder.DEFAULT_CONFIG.getConfig().getString(UpdateUtils.MINECRAFT_VERSION_PATH); if(oldVersion != null){ var version = Version.fromString(oldVersion); - if(V1_21_9.lesserEqual(version)) return; + if(V1_21_9.lesserEqual(version)) return false; } doUpdate(); + return true; } private static void doUpdate() { @@ -52,8 +53,6 @@ public class Update_1_21_9 { // imply reload of CONFLICT_HOLDER // We also do not need to reload base config as there is no object related to it. ConfigHolder.ITEM_GROUP_HOLDER.reload(); - - CustomAnvil.instance.getLogger().info("Updating Done !"); } } diff --git a/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PluginUpdates.java b/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PluginUpdates.java index 0beaf63..430825c 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PluginUpdates.java +++ b/src/main/java/xyz/alexcrea/cuanvil/update/plugin/PluginUpdates.java @@ -57,8 +57,13 @@ public class PluginUpdates { public static void handleMCVersionUpdate(){ Version current = UpdateUtils.currentMinecraftVersion(); - Update_1_21.handleUpdate(current); - Update_1_21_9.handleUpdate(current); + boolean hadUpdate = false; + hadUpdate |= Update_1_21.handleUpdate(current); + hadUpdate |= Update_1_21_9.handleUpdate(current); + + if(hadUpdate){ + CustomAnvil.instance.getLogger().info("Updating Done !"); + } } private static void finishConfiguration(@Nonnull String newVersion, @Nonnull Set toSave) {