From a165aa4068a87bddf2fbdc6726c11f073b0788f0 Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Thu, 25 Jul 2024 04:26:42 +0200 Subject: [PATCH] Some small changes --- .../xyz/alexcrea/cuanvil/update/UpdateManager.java | 10 +++++----- src/main/java/xyz/alexcrea/cuanvil/update/Version.java | 3 +-- src/main/kotlin/io/delilaheve/CustomAnvil.kt | 2 ++ .../xyz/alexcrea/cuanvil/command/ReloadExecutor.kt | 4 +--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/update/UpdateManager.java b/src/main/java/xyz/alexcrea/cuanvil/update/UpdateManager.java index c30c932..6395e02 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/update/UpdateManager.java +++ b/src/main/java/xyz/alexcrea/cuanvil/update/UpdateManager.java @@ -12,12 +12,12 @@ import java.io.InputStream; import java.util.*; public class UpdateManager { - private final static Version MAX_KNOW_MINECRAFT_VERSION = new Version(1, 21, 0); + private static final Version MAX_KNOW_MINECRAFT_VERSION = new Version(1, 21, 0); - public final static String MINECRAFT_VERSION_PATH = "lowMinecraftVersion"; - public final static String PLUGIN_VERSION_PATH = "configVersion"; - private final static String UPDATE_FOLDER = "version"; - private final static String VERSION_LIST_RESSOUCE = UPDATE_FOLDER+"/minecraftVersions.txt"; + public static final String MINECRAFT_VERSION_PATH = "lowMinecraftVersion"; + public static final String PLUGIN_VERSION_PATH = "configVersion"; + private static final String UPDATE_FOLDER = "version"; + private static final String VERSION_LIST_RESSOUCE = UPDATE_FOLDER+"/minecraftVersions.txt"; private List minecraftVersionList; private Version minecraftVersion; diff --git a/src/main/java/xyz/alexcrea/cuanvil/update/Version.java b/src/main/java/xyz/alexcrea/cuanvil/update/Version.java index 7c8245f..024db10 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/update/Version.java +++ b/src/main/java/xyz/alexcrea/cuanvil/update/Version.java @@ -61,8 +61,7 @@ public class Version implements Comparable{ @Override public boolean equals(Object obj) { - if(obj instanceof Version){ - Version other = (Version) obj; + if(obj instanceof Version other){ return (other.major == this.major) && (other.minor == this.minor) && (other.build == this.build); } return false; diff --git a/src/main/kotlin/io/delilaheve/CustomAnvil.kt b/src/main/kotlin/io/delilaheve/CustomAnvil.kt index 4ef5967..b7b18e9 100644 --- a/src/main/kotlin/io/delilaheve/CustomAnvil.kt +++ b/src/main/kotlin/io/delilaheve/CustomAnvil.kt @@ -131,6 +131,8 @@ class CustomAnvil : JavaPlugin() { return } + // TODO use the update system config I guess + // Register enchantment of compatible plugin and load configuration change. DependencyManager.handleCompatibilityConfig() diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt index 38a98c0..527d286 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/command/ReloadExecutor.kt @@ -9,7 +9,6 @@ import xyz.alexcrea.cuanvil.api.event.CAConfigReadyEvent import xyz.alexcrea.cuanvil.config.ConfigHolder import xyz.alexcrea.cuanvil.dependency.DependencyManager import xyz.alexcrea.cuanvil.gui.config.global.* -import xyz.alexcrea.cuanvil.update.Update_1_21 class ReloadExecutor : CommandExecutor { override fun onCommand(sender: CommandSender, cmd: Command, cmdstr: String, args: Array): Boolean { @@ -48,8 +47,7 @@ class ReloadExecutor : CommandExecutor { UnitRepairConfigGui.getCurrentInstance()?.reloadValues() CustomRecipeConfigGui.getCurrentInstance()?.reloadValues() - // temporary: handle 1.21 update - Update_1_21.handleUpdate() + // TODO use the update system config I guess // Handle dependency reload DependencyManager.handleConfigReload()