Updated GitHub repository. Fixed chest and GUI system checks bug. Mad…

…e FoliaLib a single instance reference. Added two new methods to retrieve clan data by ClanPlayer. Added firing of ClanHomeTeleportEvent when not running on Folia. Small code cleanup. Changed plugin version to `1.4.2`.
Loving11ish · Nov 3, 2023 · 1d3e019 · 1d3e019
1 parent b526b14
commit 1d3e019
Show file tree

Hide file tree

Showing 14 changed files with 100 additions and 78 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.loving11ish</groupId>
     <artifactId>ClansLite</artifactId>
-    <version>1.4.2-BETA-02</version>
+    <version>1.4.2</version>
     <packaging>jar</packaging>
 
     <name>ClansLite</name>

diff --git a/src/main/java/me/loving11ish/clans/Clans.java b/src/main/java/me/loving11ish/clans/Clans.java
@@ -42,9 +42,9 @@ public final class Clans extends JavaPlugin {
 
     private final PluginDescriptionFile pluginInfo = getDescription();
     private final String pluginVersion = pluginInfo.getVersion();
-    private FoliaLib foliaLib = new FoliaLib(this);
 
     private static Clans plugin;
+    private static FoliaLib foliaLib;
     private static FloodgateApi floodgateApi;
     private static VersionCheckerUtils versionCheckerUtils;
     private static boolean chestsEnabled = false;
@@ -65,6 +65,7 @@ public final class Clans extends JavaPlugin {
     public void onEnable() {
         //Plugin startup logic
         plugin = this;
+        foliaLib = new FoliaLib(this);
         versionCheckerUtils = new VersionCheckerUtils();
         versionCheckerUtils.setVersion();
 
@@ -303,21 +304,15 @@ public void onEnable() {
         });
 
         //Start auto save task
-        foliaLib.getImpl().runLaterAsync(new Runnable() {
-            @Override
-            public void run() {
-                TaskTimerUtils.runClansAutoSave();
-                console.sendMessage(ColorUtils.translateColorCodes(messagesFileManager.getMessagesConfig().getString("auto-save-started")));
-            }
+        foliaLib.getImpl().runLaterAsync(() -> {
+            TaskTimerUtils.runClansAutoSave();
+            console.sendMessage(ColorUtils.translateColorCodes(messagesFileManager.getMessagesConfig().getString("auto-save-started")));
         }, 5L, TimeUnit.SECONDS);
 
         //Start auto invite clear task
-        foliaLib.getImpl().runLaterAsync(new Runnable() {
-            @Override
-            public void run() {
-                TaskTimerUtils.runClanInviteClear();
-                console.sendMessage(ColorUtils.translateColorCodes(messagesFileManager.getMessagesConfig().getString("auto-invite-wipe-started")));
-            }
+        foliaLib.getImpl().runLaterAsync(() -> {
+            TaskTimerUtils.runClanInviteClear();
+            console.sendMessage(ColorUtils.translateColorCodes(messagesFileManager.getMessagesConfig().getString("auto-invite-wipe-started")));
         }, 5L, TimeUnit.SECONDS);
     }
 
@@ -437,6 +432,10 @@ public static Clans getPlugin() {
         return plugin;
     }
 
+    public static FoliaLib getFoliaLib() {
+        return foliaLib;
+    }
+
     public static FloodgateApi getFloodgateApi() {
         return floodgateApi;
     }

diff --git a/src/main/java/me/loving11ish/clans/commands/ClanAdmin.java b/src/main/java/me/loving11ish/clans/commands/ClanAdmin.java
@@ -60,29 +60,22 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                             p.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-broadcast-start")));
                         }
                     }
-                    FoliaLib foliaLib = new FoliaLib(Clans.getPlugin());
+                    FoliaLib foliaLib = Clans.getFoliaLib();
                     Clans.getPlugin().onDisable();
-                    foliaLib.getImpl().runLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            Bukkit.getPluginManager().getPlugin("ClansLite").onEnable();
-                        }
-                    }, 5L, TimeUnit.SECONDS);
-                    foliaLib.getImpl().runLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            Clans.getPlugin().reloadConfig();
-                            ClanCommand.updateBannedTagsList();
-                            Clans.getPlugin().messagesFileManager.reloadMessagesConfig();
-                            Clans.getPlugin().clanGUIFileManager.reloadClanGUIConfig();
-                            player.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-successful")));
-                            for (Player p : onlinePlayers){
-                                if (p.getName().equalsIgnoreCase(player.getName())){
-                                    continue;
-                                }
-                                if (!onlinePlayers.isEmpty()){
-                                    p.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-successful")));
-                                }
+                    foliaLib.getImpl().runLater(() ->
+                            Bukkit.getPluginManager().getPlugin("ClansLite").onEnable(), 5L, TimeUnit.SECONDS);
+                    foliaLib.getImpl().runLater(() -> {
+                        Clans.getPlugin().reloadConfig();
+                        ClanCommand.updateBannedTagsList();
+                        Clans.getPlugin().messagesFileManager.reloadMessagesConfig();
+                        Clans.getPlugin().clanGUIFileManager.reloadClanGUIConfig();
+                        player.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-successful")));
+                        for (Player p : onlinePlayers){
+                            if (p.getName().equalsIgnoreCase(player.getName())){
+                                continue;
+                            }
+                            if (!onlinePlayers.isEmpty()){
+                                p.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-successful")));
                             }
                         }
                     }, 5L, TimeUnit.SECONDS);
@@ -176,26 +169,19 @@ public void run() {
                             p.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-broadcast-start")));
                         }
                     }
-                    FoliaLib foliaLib = new FoliaLib(Clans.getPlugin());
+                    FoliaLib foliaLib = Clans.getFoliaLib();
                     Clans.getPlugin().onDisable();
-                    foliaLib.getImpl().runLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            Bukkit.getPluginManager().getPlugin("ClansLite").onEnable();
-                        }
-                    }, 5L, TimeUnit.SECONDS);
-                    foliaLib.getImpl().runLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            Clans.getPlugin().reloadConfig();
-                            ClanCommand.updateBannedTagsList();
-                            Clans.getPlugin().messagesFileManager.reloadMessagesConfig();
-                            Clans.getPlugin().clanGUIFileManager.reloadClanGUIConfig();
-                            console.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-successful")));
-                            for (Player p : onlinePlayers){
-                                if (!onlinePlayers.isEmpty()){
-                                    p.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-successful")));
-                                }
+                    foliaLib.getImpl().runLater(() ->
+                            Bukkit.getPluginManager().getPlugin("ClansLite").onEnable(), 5L, TimeUnit.SECONDS);
+                    foliaLib.getImpl().runLater(() -> {
+                        Clans.getPlugin().reloadConfig();
+                        ClanCommand.updateBannedTagsList();
+                        Clans.getPlugin().messagesFileManager.reloadMessagesConfig();
+                        Clans.getPlugin().clanGUIFileManager.reloadClanGUIConfig();
+                        console.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-successful")));
+                        for (Player p : onlinePlayers){
+                            if (!onlinePlayers.isEmpty()){
+                                p.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("plugin-reload-successful")));
                             }
                         }
                     }, 5L, TimeUnit.SECONDS);

diff --git a/src/main/java/me/loving11ish/clans/commands/ClanCommand.java b/src/main/java/me/loving11ish/clans/commands/ClanCommand.java
@@ -28,7 +28,7 @@ public class ClanCommand implements CommandExecutor {
     private static List<String> bannedTags;
 
     public static void updateBannedTagsList(){
-        FoliaLib foliaLib = new FoliaLib(Clans.getPlugin());
+        FoliaLib foliaLib = Clans.getFoliaLib();
         bannedTaskUpdateTask = foliaLib.getImpl().runLaterAsync(() ->
                 bannedTags = Clans.getPlugin().getConfig().getStringList("clan-tags.disallowed-tags"), 1L, TimeUnit.SECONDS);
     }

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanListSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanListSubCommand.java
@@ -21,7 +21,7 @@ public boolean clanListSubCommand(CommandSender sender) {
             Player player = (Player) sender;
             Set<Map.Entry<UUID, Clan>> clans = ClansStorageUtil.getClans();
             StringBuilder clansString = new StringBuilder();
-            if (clans.size() == 0) {
+            if (clans.isEmpty()) {
                 player.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("no-clans-to-list")));
             } else {
                 clansString.append(ColorUtils.translateColorCodes(messagesConfig.getString("clans-list-header") + "\n"));

diff --git a/src/main/java/me/loving11ish/clans/listeners/ChestBreakEvent.java b/src/main/java/me/loving11ish/clans/listeners/ChestBreakEvent.java
@@ -36,7 +36,7 @@ public class ChestBreakEvent implements Listener {
 
     @EventHandler
     public void onChestBreak(BlockBreakEvent event){
-        if (!clansConfig.getBoolean("protections.chests.enabled")){
+        if (!Clans.isChestsEnabled()){
             return;
         }
         if (event.getBlock().getType().equals(Material.CHEST)){
@@ -94,7 +94,7 @@ public void onChestBreak(BlockBreakEvent event){
 
     @EventHandler
     public void onTNTDestruction(EntityExplodeEvent event){
-        if (!clansConfig.getBoolean("protections.chests.enabled")){
+        if (!Clans.isChestsEnabled()){
             return;
         }
         if (event.getEntity() instanceof TNTPrimed){
@@ -118,7 +118,7 @@ public void onTNTDestruction(EntityExplodeEvent event){
 
     @EventHandler
     public void onCreeperDestruction(EntityExplodeEvent event){
-        if (!clansConfig.getBoolean("protections.chests.enabled")){
+        if (!Clans.isChestsEnabled()){
             return;
         }
         if (event.getEntity() instanceof Creeper){

diff --git a/src/main/java/me/loving11ish/clans/listeners/ChestOpenEvent.java b/src/main/java/me/loving11ish/clans/listeners/ChestOpenEvent.java
@@ -18,14 +18,13 @@
 
 public class ChestOpenEvent implements Listener {
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
     FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String CLAN_PLACEHOLDER = "%CLAN%";
 
     @EventHandler
     public void onChestOpen(PlayerInteractEvent event){
-        if (!clansConfig.getBoolean("protections.chests.enabled")){
+        if (!Clans.isChestsEnabled()){
             return;
         }
         if (event.getAction().equals(Action.RIGHT_CLICK_BLOCK)){

diff --git a/src/main/java/me/loving11ish/clans/listeners/PlayerDamageEvent.java b/src/main/java/me/loving11ish/clans/listeners/PlayerDamageEvent.java
@@ -43,7 +43,6 @@ public void onPlayerHit(EntityDamageByEntityEvent event){
                                 if (clansConfig.getBoolean("protections.pvp.enable-bypass-permission")){
                                     if (attackingPlayer.hasPermission("clanslite.bypass.pvp")
                                             ||attackingPlayer.hasPermission("clanslite.bypass.*")
-                                            ||attackingPlayer.hasPermission("clanslite.bypass")
                                             ||attackingPlayer.hasPermission("clanslite.*")
                                             ||attackingPlayer.isOp()){
                                         return;

diff --git a/src/main/java/me/loving11ish/clans/listeners/PlayerPreConnectionEvent.java b/src/main/java/me/loving11ish/clans/listeners/PlayerPreConnectionEvent.java
@@ -42,6 +42,8 @@ public void onPlayerPreConnect(AsyncPlayerPreLoginEvent event) {
                             console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &c&lChest protection system disabled!"));
                         }
                     }else {
+                        Clans.setGUIEnabled(false);
+                        Clans.setChestsEnabled(false);
                         console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &cYour current server version does not support PersistentDataContainers!"));
                         console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &c&lChest protection system disabled!"));
                         console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &c&lGlobal GUI system disabled!"));
@@ -54,12 +56,15 @@ public void onPlayerPreConnect(AsyncPlayerPreLoginEvent event) {
                         console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &c&lGlobal GUI system disabled!"));
                         console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &c&lChest protection system disabled!"));
                     }else {
+                        Clans.setGUIEnabled(false);
+                        Clans.setChestsEnabled(false);
                         console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &cYour current server version does not support PersistentDataContainers!"));
                         console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &c&lChest protection system disabled!"));
                         console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &c&lGlobal GUI system disabled!"));
                     }
                     console.sendMessage(ColorUtils.translateColorCodes("&4-------------------------------------------"));
                     console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &4This plugin is only supported on online servers or servers running in an online network situation!"));
+                    console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &4Some features may behave incorrectly or may be broken completely!"));
                     console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &4Please set &e'online-mode=true' &4in &e'server.properties'"));
                     console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &4Or ensure your proxy setup is correct and your proxy is set to online mode!"));
                     console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite: &4&lNO SUPPORT WILL BE GIVEN UNLESS THE ABOVE IS CHANGED/SETUP CORRECTLY!"));

diff --git a/src/main/java/me/loving11ish/clans/menusystem/paginatedMenu/ClanListGUI.java b/src/main/java/me/loving11ish/clans/menusystem/paginatedMenu/ClanListGUI.java
@@ -112,7 +112,7 @@ else if(event.getCurrentItem().getType().equals(Material.STONE_BUTTON)){
     public void setMenuItems() {
         addMenuControls();
         if (guiConfig.getBoolean("clan-list.icons.auto-refresh-data.enabled")){
-            FoliaLib foliaLib = new FoliaLib(Clans.getPlugin());
+            FoliaLib foliaLib = Clans.getFoliaLib();
             autoGUIRefreshTask = foliaLib.getImpl().runTimerAsync(new Runnable() {
                 @Override
                 public void run() {
@@ -136,11 +136,14 @@ public void run() {
                                 Clan clan = ClansStorageUtil.findClanByOfflineOwner(clanOwnerPlayer);
 
                                 ItemStack playerHead = new ItemStack(Material.PLAYER_HEAD, 1);
-                                SkullMeta skull = (SkullMeta) playerHead.getItemMeta();
-                                skull.setOwningPlayer(UsermapStorageUtil.getBukkitOfflinePlayerByUUID(ownerUUID));
-                                playerHead.setItemMeta(skull);
-                                if (clansConfig.getBoolean("general.developer-debug-mode.enabled")){
-                                    console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite-Debug: &aRetrieved player head info for UUID: &d" + clanOwnerUUIDString));
+
+                                if (Clans.isOnlineMode()){
+                                    SkullMeta skull = (SkullMeta) playerHead.getItemMeta();
+                                    skull.setOwningPlayer(UsermapStorageUtil.getBukkitOfflinePlayerByUUID(ownerUUID));
+                                    playerHead.setItemMeta(skull);
+                                    if (clansConfig.getBoolean("general.developer-debug-mode.enabled")){
+                                        console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite-Debug: &aRetrieved player head info for UUID: &d" + clanOwnerUUIDString));
+                                    }
                                 }
 
                                 ItemMeta meta = playerHead.getItemMeta();
@@ -238,11 +241,14 @@ public void run() {
                         Clan clan = ClansStorageUtil.findClanByOfflineOwner(clanOwnerPlayer);
 
                         ItemStack playerHead = new ItemStack(Material.PLAYER_HEAD, 1);
-                        SkullMeta skull = (SkullMeta) playerHead.getItemMeta();
-                        skull.setOwningPlayer(UsermapStorageUtil.getBukkitOfflinePlayerByUUID(ownerUUID));
-                        playerHead.setItemMeta(skull);
-                        if (clansConfig.getBoolean("general.developer-debug-mode.enabled")){
-                            console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite-Debug: &aRetrieved player head info for UUID: &d" + clanOwnerUUIDString));
+
+                        if (Clans.isOnlineMode()){
+                            SkullMeta skull = (SkullMeta) playerHead.getItemMeta();
+                            skull.setOwningPlayer(UsermapStorageUtil.getBukkitOfflinePlayerByUUID(ownerUUID));
+                            playerHead.setItemMeta(skull);
+                            if (clansConfig.getBoolean("general.developer-debug-mode.enabled")){
+                                console.sendMessage(ColorUtils.translateColorCodes("&6ClansLite-Debug: &aRetrieved player head info for UUID: &d" + clanOwnerUUIDString));
+                            }
                         }
 
                         ItemMeta meta = playerHead.getItemMeta();

diff --git a/src/main/java/me/loving11ish/clans/updatesystem/UpdateChecker.java b/src/main/java/me/loving11ish/clans/updatesystem/UpdateChecker.java
@@ -25,7 +25,7 @@ public UpdateChecker(int resourceId) {
     }
 
     public void getVersion(final Consumer<String> consumer) {
-        FoliaLib foliaLib = new FoliaLib(Clans.getPlugin());
+        FoliaLib foliaLib = Clans.getFoliaLib();
         foliaLib.getImpl().runAsync((task) -> {
             try (InputStream inputStream = new URL("https://api.spigotmc.org/legacy/update.php?resource=" + this.resourceId).openStream(); Scanner scanner = new Scanner(inputStream)) {
                 if (scanner.hasNext()) {

diff --git a/src/main/java/me/loving11ish/clans/utils/ClansStorageUtil.java b/src/main/java/me/loving11ish/clans/utils/ClansStorageUtil.java
@@ -1,5 +1,6 @@
 package me.loving11ish.clans.utils;
 
+import me.loving11ish.clans.models.ClanPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
@@ -238,6 +239,11 @@ public static Clan findClanByOfflineOwner(OfflinePlayer offlinePlayer){
         return clansList.get(uuid);
     }
 
+    public static Clan findClanOwnerByClanPlayer(ClanPlayer clanPlayer){
+        UUID uuid = UUID.fromString(clanPlayer.getJavaUUID());
+        return clansList.get(uuid);
+    }
+
     public static Clan findClanByPlayer(Player player){
         for (Clan clan : clansList.values()){
             if (findClanByOwner(player) != null) {
@@ -270,6 +276,22 @@ public static Clan findClanByOfflinePlayer(OfflinePlayer player){
         return null;
     }
 
+    public static Clan findClanPlayerByClanPlayer(ClanPlayer clanPlayer){
+        for (Clan clan : clansList.values()){
+            if (findClanOwnerByClanPlayer(clanPlayer) != null){
+                return clan;
+            }
+            if (clan.getClanMembers() != null){
+                for (String member : clan.getClanMembers()){
+                    if (member.equals(clanPlayer.getJavaUUID())){
+                        return clan;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
     public static void updatePrefix(Player player, String prefix){
         UUID uuid = player.getUniqueId();
         if (!isClanOwner(player)){

diff --git a/src/main/java/me/loving11ish/clans/utils/TaskTimerUtils.java b/src/main/java/me/loving11ish/clans/utils/TaskTimerUtils.java
@@ -14,7 +14,7 @@ public class TaskTimerUtils {
 
     static ConsoleCommandSender console = Bukkit.getConsoleSender();
     static FileConfiguration config = Clans.getPlugin().getConfig();
-    static FoliaLib foliaLib = new FoliaLib(Clans.getPlugin());
+    static FoliaLib foliaLib = Clans.getFoliaLib();
 
     public static WrappedTask autoSaveTask;
     public static WrappedTask inviteClearTask;