From ba1db37a90c31c9a5522cdd263dd1db95bf961c8 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Thu, 4 May 2023 16:38:21 +0200 Subject: [PATCH] dev fix --- pom.xml | 4 ++++ .../Spigot/config/config/SelectConfig.java | 9 ++++----- .../alias/Spigot/listener/PluginEvents.java | 9 +++++++++ .../t2code/alias/Spigot/system/JoinEvent.java | 18 ------------------ .../net/t2code/alias/Spigot/system/Load.java | 5 ++--- 5 files changed, 19 insertions(+), 26 deletions(-) delete mode 100644 src/main/java/net/t2code/alias/Spigot/system/JoinEvent.java diff --git a/pom.xml b/pom.xml index 67c3d81..9c34bf8 100644 --- a/pom.xml +++ b/pom.xml @@ -72,21 +72,25 @@ net.t2code T2CodeLib 14.4 + provided net.t2code bungee 1615 + provided net.t2code PlugmanGUI 3.0 + provided net.t2code.minecraft.1_13.r1 spigot 1.13r1 + provided diff --git a/src/main/java/net/t2code/alias/Spigot/config/config/SelectConfig.java b/src/main/java/net/t2code/alias/Spigot/config/config/SelectConfig.java index dd49745..b4666df 100644 --- a/src/main/java/net/t2code/alias/Spigot/config/config/SelectConfig.java +++ b/src/main/java/net/t2code/alias/Spigot/config/config/SelectConfig.java @@ -25,12 +25,11 @@ public class SelectConfig { isConfigVersion = yamlConfiguration.getInt("ConfigVersion"); - updateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.updateCheck.onJoin"); - updateCheckSeePreReleaseUpdates = yamlConfiguration.getBoolean("Plugin.updateCheck.seePreReleaseUpdates"); - updateCheckTimeInterval = yamlConfiguration.getInt("Plugin.updateCheck.timeInterval"); + updateCheckOnJoin = yamlConfiguration.getBoolean("plugin.updateCheck.onJoin"); + updateCheckSeePreReleaseUpdates = yamlConfiguration.getBoolean("plugin.updateCheck.seePreReleaseUpdates"); + updateCheckTimeInterval = yamlConfiguration.getInt("plugin.updateCheck.timeInterval"); - - language = yamlConfiguration.getString("Plugin.language"); + language = yamlConfiguration.getString("plugin.language"); buyMessage = yamlConfiguration.getBoolean("buy.message"); buyCurrency = yamlConfiguration.getString("buy.currency"); diff --git a/src/main/java/net/t2code/alias/Spigot/listener/PluginEvents.java b/src/main/java/net/t2code/alias/Spigot/listener/PluginEvents.java index 5db24f0..ffd51ba 100644 --- a/src/main/java/net/t2code/alias/Spigot/listener/PluginEvents.java +++ b/src/main/java/net/t2code/alias/Spigot/listener/PluginEvents.java @@ -1,9 +1,13 @@ package net.t2code.alias.Spigot.listener; +import net.t2code.alias.Spigot.Main; import net.t2code.alias.Spigot.cmdManagement.ExecuteAlias; +import net.t2code.alias.Util; +import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerQuitEvent; public class PluginEvents implements Listener { @@ -12,4 +16,9 @@ public class PluginEvents implements Listener { Player player = event.getPlayer(); ExecuteAlias.aliasStorage.remove(player.getUniqueId()); } + + @EventHandler + public void onJoinEvent(PlayerLoginEvent event) { + T2CupdateAPI.join(Main.getPlugin(), Util.getPrefix(), "t2code.alias.updatemsg", event.getPlayer(), Util.getSpigotID(), Util.getDiscord()); + } } diff --git a/src/main/java/net/t2code/alias/Spigot/system/JoinEvent.java b/src/main/java/net/t2code/alias/Spigot/system/JoinEvent.java deleted file mode 100644 index 6da3412..0000000 --- a/src/main/java/net/t2code/alias/Spigot/system/JoinEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -// This claas was created by JaTiTV - -package net.t2code.alias.Spigot.system; - -import net.t2code.alias.Spigot.Main; -import net.t2code.alias.Util; -import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerLoginEvent; - -public class JoinEvent implements Listener { - - @EventHandler - public void onJoinEvent(PlayerLoginEvent event) { - T2CupdateAPI.join(Main.getPlugin(),Util.getPrefix(), "t2code.alias.updatemsg", event.getPlayer(), Util.getSpigotID(), Util.getDiscord()); - } -} \ No newline at end of file diff --git a/src/main/java/net/t2code/alias/Spigot/system/Load.java b/src/main/java/net/t2code/alias/Spigot/system/Load.java index ee0c2c1..83cd799 100644 --- a/src/main/java/net/t2code/alias/Spigot/system/Load.java +++ b/src/main/java/net/t2code/alias/Spigot/system/Load.java @@ -28,9 +28,8 @@ public class Load { Long long_ = T2Ctemplate.onLoadHeader(prefix, autor, version, spigot, discord); plugin.getCommand("t2code-alias").setExecutor(new AliasCmdExecuter()); loadReload(); - T2CupdateAPI.onUpdateCheck(plugin,prefix,Util.getGit(),Util.getSpigotID(),Util.getDiscord(), - SelectConfig.getUpdateCheckOnJoin(),SelectConfig.getUpdateCheckSeePreReleaseUpdates(),SelectConfig.getUpdateCheckTimeInterval()); - Bukkit.getServer().getPluginManager().registerEvents(new JoinEvent(), plugin); + T2CupdateAPI.onUpdateCheck(plugin, prefix, Util.getGit(), Util.getSpigotID(), Util.getDiscord(), + SelectConfig.getUpdateCheckOnJoin(), SelectConfig.getUpdateCheckSeePreReleaseUpdates(), SelectConfig.getUpdateCheckTimeInterval()); T2Ctemplate.onLoadFooter(prefix, long_, version); T2Cregister.listener(new PluginEvents(), plugin);