v2.3

- v2.2のjarファイルはアップロードされる予定はありません！ - v2.3は非推奨のメソッドがあります
SIGMA-L · Sep 18, 2021 · a7916e6 · a7916e6
1 parent 48f9425
commit a7916e6
Show file tree

Hide file tree

Showing 12 changed files with 131 additions and 62 deletions.
diff --git a/PlayerRoleChecker/pom.xml b/PlayerRoleChecker/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.klnetwork.playerrolechecker</groupId>
     <artifactId>PlayerRoleChecker</artifactId>
-    <version>2.2</version>
+    <version>2.3</version>
     <packaging>jar</packaging>
 
     <name>PlayerRoleChecker</name>

diff --git a/...oleChecker/src/main/java/net/klnetwork/playerrolechecker/JDA/Events/ForceJoinCommand.java b/...oleChecker/src/main/java/net/klnetwork/playerrolechecker/JDA/Events/ForceJoinCommand.java
@@ -22,15 +22,17 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
                     } catch (Exception exception) {
                         event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("ForceJoinCommand.invalid-name", event.getMessage().getTimeCreated(), null, null).build()).queue();
                     }
-                    String[] result = SQLUtil.getDiscordFromSQL(uuid);
-                    if (result != null) {
-                        event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("ForceJoinCommand.already-registered", event.getMessage().getTimeCreated(), result[0], result[1]).build()).queue();
-                        return;
-                    }
-                    SQLUtil.putSQL(uuid,args[2]);
-                    event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("ForceJoinCommand.success-register", event.getMessage().getTimeCreated(), uuid, args[2]).build()).queue();
+                    String finalUUID = uuid;
+                    SQLUtil.getDiscordFromSQL(uuid, result -> {
+                        if (result != null) {
+                            event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("ForceJoinCommand.already-registered", event.getMessage().getTimeCreated(), result[0], result[1]).build()).queue();
+                            return;
+                        }
+                        SQLUtil.putSQL(finalUUID, args[2]);
+                        event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("ForceJoinCommand.success-register", event.getMessage().getTimeCreated(), finalUUID, args[2]).build()).queue();
 
-                    DiscordUtil.AddRole(event.getGuild(), event.getMember());
+                        DiscordUtil.AddRole(event.getGuild(), event.getMember());
+                    });
                 }
             }
         }

diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/JDA/Events/JoinCommand.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/JDA/Events/JoinCommand.java
@@ -27,20 +27,22 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
                     event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("JoinCommand.invalid-number", event.getMessage().getTimeCreated(), null, null).build()).queue();
                     return;
                 }
-                String[] alreadyUUID = SQLUtil.getDiscordFromSQL(result[0]);
-                if (alreadyUUID != null) {
-                    event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("JoinCommand.already-registered", event.getMessage().getTimeCreated(), alreadyUUID[0], alreadyUUID[1]).build()).queue();
-                    return;
-                }
-                SQLiteUtil.removeSQLite(result[0], result[1]);
-                SQLUtil.putSQL(result[0], event.getAuthor().getId());
+                SQLUtil.getUUIDFromSQL(result[0], alreadyUUID -> {
+                    if (alreadyUUID != null) {
+                        event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("JoinCommand.already-registered", event.getMessage().getTimeCreated(), alreadyUUID[0], alreadyUUID[1]).build()).queue();
+                        return;
+                    }
+
+                    SQLiteUtil.removeSQLite(result[0], result[1]);
+                    SQLUtil.putSQL(result[0], event.getAuthor().getId());
 
-                String discordID = event.getAuthor().getId();
+                    String discordID = event.getAuthor().getId();
 
-                event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("JoinCommand.success-register", event.getMessage().getTimeCreated(), result[0], discordID).build()).queue();
+                    event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("JoinCommand.success-register", event.getMessage().getTimeCreated(), result[0], discordID).build()).queue();
 
-                DiscordUtil.sendMessageToChannel(DiscordUtil.embedBuilder("JoinCommand.sendmessage", event.getMessage().getTimeCreated(), result[0], discordID));
-                DiscordUtil.AddRole(event.getGuild(), event.getMember());
+                    DiscordUtil.sendMessageToChannel(DiscordUtil.embedBuilder("JoinCommand.sendmessage", event.getMessage().getTimeCreated(), result[0], discordID));
+                    DiscordUtil.AddRole(event.getGuild(), event.getMember());
+                });
             } else {
                 event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("JoinCommand.length-big", event.getMessage().getTimeCreated(), null, null).build()).queue();
             }

diff --git a/...erRoleChecker/src/main/java/net/klnetwork/playerrolechecker/JDA/Events/RemoveCommand.java b/...erRoleChecker/src/main/java/net/klnetwork/playerrolechecker/JDA/Events/RemoveCommand.java
@@ -22,15 +22,17 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
                     } catch (Exception exception) {
                         event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("RemoveCommand.invalid-name", event.getMessage().getTimeCreated(), null, null).build()).queue();
                     }
-                    String[] result = SQLUtil.getDiscordFromSQL(uuid);
-                    if (result == null) {
-                        event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("RemoveCommand.not-registered", event.getMessage().getTimeCreated(), null, null).build()).queue();
-                        return;
-                    }
-                    SQLUtil.removeSQL(result[0], result[1]);
-                    DiscordUtil.RemoveRole(event.getGuild(), event.getMember());
+                    String finalUUID = uuid;
+                    SQLUtil.getDiscordFromSQL(uuid, result -> {
+                        if (result == null) {
+                            event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("RemoveCommand.not-registered", event.getMessage().getTimeCreated(), null, null).build()).queue();
+                            return;
+                        }
+                        SQLUtil.removeSQL(result[0], result[1]);
+                        DiscordUtil.RemoveRole(event.getGuild(), event.getMember());
 
-                    event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("RemoveCommand.success-remove", event.getMessage().getTimeCreated(), uuid, result[1]).build()).queue();
+                        event.getMessage().replyEmbeds(DiscordUtil.embedBuilder("RemoveCommand.success-remove", event.getMessage().getTimeCreated(), finalUUID, result[1]).build()).queue();
+                    });
                 }
             }
         }

diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/SQL.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/SQL.java
@@ -6,9 +6,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import static net.klnetwork.playerrolechecker.PlayerRoleChecker.plugin;
-import static org.bukkit.Bukkit.getServer;
-
 public class SQL {
 
     public static void init() {

diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/Util/OtherUtil.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/Util/OtherUtil.java
@@ -18,7 +18,6 @@ public void waitTimer(UUID uuid) {
                 String[] result = SQLiteUtil.getCodeFromSQLite(uuid.toString());
                 if (result != null) {
                     SQLiteUtil.removeSQLite(result[0], result[1]);
-
                 }
             } catch (InterruptedException e) {
                 e.printStackTrace();

diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/Util/SQLUtil.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/Util/SQLUtil.java
@@ -1,17 +1,46 @@
 package net.klnetwork.playerrolechecker.Util;
 
 
-import net.klnetwork.playerrolechecker.PlayerRoleChecker;
+import org.bukkit.Bukkit;
 
 import java.sql.*;
+import java.util.function.Consumer;
 
 import static net.klnetwork.playerrolechecker.PlayerRoleChecker.plugin;
 
+@SuppressWarnings("DeprecatedIsStillUsed")
 public class SQLUtil {
 
     private static Connection connection;
     private static long connectionAlive = 0;
 
+    /**
+     * @param uuid - プレイヤーのUUID
+     * @return - DiscordIDとUUIDを非同期で返します
+     */
+    public static void getDiscordFromSQL(String uuid, Consumer<String[]> consumer) {
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+            String[] result = SQLUtil.getDiscordFromSQL(uuid);
+            consumer.accept(result);
+        });
+    }
+
+    /**
+     * @param discord - プレイヤーのUUID
+     * @return - UUIDとDiscordIDを非同期で返します
+     */
+    public static void getUUIDFromSQL(String discord, Consumer<String[]> consumer) {
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+            String[] result = SQLUtil.getUUIDFromSQL(discord);
+            consumer.accept(result);
+        });
+    }
+
+    /**
+     * @param uuid - - discordID
+     * @return - discordIDとUUIDを返します
+     * @deprecated - 2.2
+     */
     public static String[] getDiscordFromSQL(String uuid) {
         String[] result = null;
         try {
@@ -24,13 +53,17 @@ public static String[] getDiscordFromSQL(String uuid) {
             preparedStatement.close();
             //PreparedStatementが閉じたらResultSetは閉じるはず
 
-
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
         return result;
     }
 
+    /**
+     * @param discord - discordID
+     * @return - UUIDとdiscordIDを返します
+     * @deprecated - 2.2
+     */
     public static String[] getUUIDFromSQL(String discord) {
         String[] result = null;
         try {
@@ -43,16 +76,14 @@ public static String[] getUUIDFromSQL(String discord) {
             preparedStatement.close();
             //PreparedStatementが閉じたらResultSetは閉じるはず
 
-
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
         return result;
     }
 
-
     public static void putSQL(String uuid, String discord) {
-        new Thread(() -> {
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
             try {
                 PreparedStatement preparedStatement = getSQLConnection().prepareStatement("insert into verifyplayer values (?,?)");
                 preparedStatement.setString(1, uuid);
@@ -64,11 +95,11 @@ public static void putSQL(String uuid, String discord) {
             } catch (SQLException throwables) {
                 throwables.printStackTrace();
             }
-        }).start();
+        });
     }
 
     public static void removeSQL(String uuid, String discord) {
-        new Thread(() -> {
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
             try {
                 PreparedStatement preparedStatement = getSQLConnection().prepareStatement("delete from verifyplayer where uuid = ? and discord = ?");
                 preparedStatement.setString(1, uuid);
@@ -80,7 +111,7 @@ public static void removeSQL(String uuid, String discord) {
             } catch (SQLException throwables) {
                 throwables.printStackTrace();
             }
-        }).start();
+        });
     }
 
     public static Connection getSQLConnection() throws SQLException {

diff --git a/PlayerRoleCheckerConnector/pom.xml b/PlayerRoleCheckerConnector/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.klnetwork.playerrolecheckerconnector</groupId>
     <artifactId>PlayerRoleCheckerConnector</artifactId>
-    <version>2.2</version>
+    <version>2.3</version>
     <packaging>jar</packaging>
 
     <name>PlayerRoleCheckerConnector</name>

diff --git a/...erConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Command/AddBypass.java b/...erConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Command/AddBypass.java
@@ -14,7 +14,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         if (args.length == 1) {
             try {
                 String uuid = OtherUtil.getUUID(args[0]).toString();
-                if(SQLiteUtil.getUUIDFromSQLite(uuid) != null){
+                if (SQLiteUtil.getUUIDFromSQLite(uuid) != null) {
                     sender.sendMessage(ChatColor.RED + "処理に失敗しました！ data=すでに登録されています");
                     return true;
                 }
@@ -25,17 +25,17 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             }
 
         }
-        if (args.length == 2){
-            if(args[0].equalsIgnoreCase("force")){
-                String uuid = args[1];
-                if(SQLiteUtil.getUUIDFromSQLite(uuid) != null){
+        if (args.length == 2) {
+            if (args[0].equalsIgnoreCase("force")) {
+                String force = args[1];
+                if (SQLiteUtil.getUUIDFromSQLite(force) != null) {
                     sender.sendMessage(ChatColor.RED + "処理に失敗しました！ data=すでに登録されています");
                     return true;
                 }
-                SQLiteUtil.putSQLite(uuid.toLowerCase());
-                sender.sendMessage(ChatColor.GREEN + "成功しました！ data=" + uuid);
+                SQLiteUtil.putSQLite(force.toLowerCase());
+                sender.sendMessage(ChatColor.GREEN + "成功しました！ data=" + force);
             }
         }
         return true;
     }
-}
+}
diff --git a/...onnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Command/RemoveBypass.java b/...onnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Command/RemoveBypass.java
@@ -27,13 +27,13 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
         if (args.length == 2) {
             if (args[0].equalsIgnoreCase("force")) {
-                String uuid = args[1];
-                if (SQLiteUtil.getUUIDFromSQLite(uuid) == null) {
-                    sender.sendMessage(ChatColor.RED + "処理に失敗しました！ data=登録されていないようです (" + uuid + ")");
+                String force = args[1];
+                if (SQLiteUtil.getUUIDFromSQLite(force) == null) {
+                    sender.sendMessage(ChatColor.RED + "処理に失敗しました！ data=登録されていないようです (" + force + ")");
                     return true;
                 }
-                SQLiteUtil.removeSQLite(uuid);
-                sender.sendMessage(ChatColor.GREEN + "成功しました！ data=" + uuid);
+                SQLiteUtil.removeSQLite(force);
+                sender.sendMessage(ChatColor.GREEN + "成功しました！ data=" + force);
             }
         }
         return true;

diff --git a/...kerConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Events/JoinEvent.java b/...kerConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Events/JoinEvent.java
@@ -16,9 +16,10 @@
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-import static net.klnetwork.playerrolecheckerconnector.PlayerRoleCheckerConnector.plugin;
 import java.util.List;
 
+import static net.klnetwork.playerrolecheckerconnector.PlayerRoleCheckerConnector.plugin;
+
 public class JoinEvent implements Listener {
 
     @EventHandler
@@ -41,8 +42,7 @@ public void onPlayerJoinEvent(PlayerJoinEvent e) {
         PlayerRoleCheckerConnector.commandlist.forEach(i -> Bukkit.dispatchCommand(Bukkit.getServer().getConsoleSender(), OtherUtil.ReplaceString(i, player)));
 
         if (plugin.getConfig().getBoolean("Minecraft.joinMessageBoolean")) e.setJoinMessage(ChatColor.translateAlternateColorCodes('&', OtherUtil.ReplaceString(plugin.getConfig().getString("Minecraft.joinMessage"), player)));
-        Bukkit.getScheduler().runTaskAsynchronously(PlayerRoleCheckerConnector.plugin, () -> {
-            String[] result = SQLUtil.getDiscordFromSQL(player.getUniqueId().toString());
+        SQLUtil.getDiscordFromSQL(player.getUniqueId().toString(), result -> {
             if (result == null) return;
 
             List<Role> roleList = null;

diff --git a/...CheckerConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Util/SQLUtil.java b/...CheckerConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Util/SQLUtil.java
@@ -1,16 +1,47 @@
 package net.klnetwork.playerrolecheckerconnector.Util;
 
 
+import org.bukkit.Bukkit;
+
 import java.sql.*;
+import java.util.function.Consumer;
 
 import static net.klnetwork.playerrolecheckerconnector.PlayerRoleCheckerConnector.plugin;
 
-
+@SuppressWarnings("DeprecatedIsStillUsed")
 public class SQLUtil {
 
     private static Connection connection;
     private static long connectionAlive = 0;
 
+
+    /**
+     * @param uuid - プレイヤーのUUID
+     * @return - discordIDとUUIDを非同期で返します
+     */
+    public static void getDiscordFromSQL(String uuid, Consumer<String[]> consumer) {
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+            String[] result = SQLUtil.getDiscordFromSQL(uuid);
+            consumer.accept(result);
+        });
+    }
+
+    /**
+     * @param discord - プレイヤーのUUID
+     * @return - UUIDとdiscordIDを非同期で返します
+     */
+    public static void getUUIDFromSQL(String discord, Consumer<String[]> consumer) {
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+            String[] result = SQLUtil.getUUIDFromSQL(discord);
+            consumer.accept(result);
+        });
+    }
+
+    /**
+     * @param uuid - discordID
+     * @return - discordIDとUUIDを非同期で返します
+     * @deprecated - 2.2
+     */
     public static String[] getDiscordFromSQL(String uuid) {
         String[] result = null;
         try {
@@ -29,6 +60,11 @@ public static String[] getDiscordFromSQL(String uuid) {
         return result;
     }
 
+    /**
+     * @param discord - discordID
+     * @return - UUIDとdiscordIDを返します
+     * @deprecated - 2.2
+     */
     public static String[] getUUIDFromSQL(String discord) {
         String[] result = null;
         try {
@@ -48,7 +84,7 @@ public static String[] getUUIDFromSQL(String discord) {
     }
 
     public static void putSQL(String uuid, String discord) {
-        new Thread(() -> {
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
             try {
                 PreparedStatement preparedStatement = getSQLConnection().prepareStatement("insert into verifyplayer values (?,?)");
                 preparedStatement.setString(1, uuid);
@@ -60,11 +96,11 @@ public static void putSQL(String uuid, String discord) {
             } catch (SQLException throwables) {
                 throwables.printStackTrace();
             }
-        }).start();
+        });
     }
 
     public static void removeSQL(String uuid, String discord) {
-        new Thread(() -> {
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
             try {
                 PreparedStatement preparedStatement = getSQLConnection().prepareStatement("delete from verifyplayer where uuid = ? and discord = ?");
                 preparedStatement.setString(1, uuid);
@@ -76,7 +112,7 @@ public static void removeSQL(String uuid, String discord) {
             } catch (SQLException throwables) {
                 throwables.printStackTrace();
             }
-        }).start();
+        });
     }
 
     public static Connection getSQLConnection() throws SQLException {