v2.1

SIGMA-L · Sep 12, 2021 · c95002a · c95002a
1 parent 9390368
commit c95002a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 14 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.0</version>
+    <version>2.1</version>
     <packaging>jar</packaging>
 
     <name>PlayerRoleChecker</name>

diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/API/CodeUtil.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/API/CodeUtil.java
@@ -1,8 +1,10 @@
 package net.klnetwork.playerrolechecker.API;
 
 
+import net.klnetwork.playerrolechecker.PlayerRoleChecker;
 import net.klnetwork.playerrolechecker.Util.SQLiteUtil;
 
+import static net.klnetwork.playerrolechecker.PlayerRoleChecker.plugin;
 import static net.klnetwork.playerrolechecker.Util.SQLiteUtil.CheckCode;
 
 import java.util.UUID;
@@ -14,9 +16,9 @@ public static int getRandom(int min, int max) {
     }
 
     public static int CodeIssue(UUID uuid) {
-        int result = getRandom(1000,9999);
+        int result = getRandom(plugin.getConfig().getInt("CodeLimit.min"),plugin.getConfig().getInt("CodeLimit.max"));
         while (CheckCode(result)) {
-            result = getRandom(1000,9999);
+            result = getRandom(plugin.getConfig().getInt("CodeLimit.min"),plugin.getConfig().getInt("CodeLimit.max"));
         }
         SQLiteUtil.putSQLite(uuid.toString(), Integer.toString(result));
         return result;

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
@@ -1,6 +1,5 @@
 package net.klnetwork.playerrolechecker.JDA.Events;
 
-import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -38,8 +37,7 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
 
                 String discordID = event.getAuthor().getId();
 
-                EmbedBuilder embedBuilder = DiscordUtil.embedBuilder("JoinCommand.success-register", event.getMessage().getTimeCreated(), result[0], discordID);
-                event.getMessage().replyEmbeds(embedBuilder.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());

diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/Util/DiscordUtil.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/Util/DiscordUtil.java
@@ -33,7 +33,7 @@ public static void AddRole(Guild guild, Member member) {
         if (roleID == null) return;
         Role role = guild.getRoleById(roleID);
         if (role == null || member == null) return;
-        guild.removeRoleFromMember(member, role).queue();
+        guild.addRoleToMember(member, role).queue();
     }
 
     public static void RemoveRole(Guild guild, Member member) {

diff --git a/PlayerRoleChecker/src/main/resources/config.yml b/PlayerRoleChecker/src/main/resources/config.yml
@@ -16,6 +16,9 @@ Discord:
   AdminChannel:
   ChannelID:
   addToRole:
+CodeLimit:
+  min: 1000
+  max: 9999
 ## Message: 色々なメッセージをカスタマイズできます
 ## JoinEvent: マインクラフトユーザーがコードを発行したときのメッセージ
 ## - already-code: すでに発行されている場合のkickメッセージ

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

diff --git a/...kerConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Events/JoinEvent.java b/...kerConnector/src/main/java/net/klnetwork/playerrolecheckerconnector/Events/JoinEvent.java
@@ -31,19 +31,19 @@ public void onAsyncPreLoginEvent(AsyncPlayerPreLoginEvent e) {
         }
 
         if (!OtherUtil.CheckPlayer(e.getUniqueId())) {
-            e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_BANNED, ChatColor.translateAlternateColorCodes('&',plugin.getConfig().getString("Minecraft.kickMessage.line1") + "\n" + plugin.getConfig().getString("Minecraft.kickMessage.line2")));
+            e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_BANNED, ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("Minecraft.kickMessage.line1") + "\n" + plugin.getConfig().getString("Minecraft.kickMessage.line2")));
         }
     }
 
     @EventHandler
     public void onPlayerJoinEvent(PlayerJoinEvent e) {
         Player player = e.getPlayer();
-        PlayerRoleCheckerConnector.commandlist.forEach(i -> Bukkit.dispatchCommand(Bukkit.getServer().getConsoleSender(),OtherUtil.ReplaceString(i,player)));
+        PlayerRoleCheckerConnector.commandlist.forEach(i -> Bukkit.dispatchCommand(Bukkit.getServer().getConsoleSender(), OtherUtil.ReplaceString(i, player)));
 
-        e.setJoinMessage(ChatColor.translateAlternateColorCodes('&',OtherUtil.ReplaceString(plugin.getConfig().getString("Minecraft.joinMessage"),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());
-            if(result == null) return;
+            if (result == null) return;
 
             List<Role> roleList = null;
             String GuildID = PlayerRoleCheckerConnector.plugin.getConfig().getString("GuildID");
@@ -57,8 +57,7 @@ public void onPlayerJoinEvent(PlayerJoinEvent e) {
                 stringBuilder.append(role.getName()).append(" ");
             }
 
-            plugin.getConfig().getStringList("Minecraft.message").forEach(i -> player.sendMessage(ChatColor.translateAlternateColorCodes('&', i.replaceAll("%name%", player.getName()).replaceAll("%uuid%", String.valueOf(player.getUniqueId())).replaceAll("%discordid%",result[1]).replaceAll("%role%", String.valueOf(stringBuilder)))));
+            plugin.getConfig().getStringList("Minecraft.message").forEach(i -> player.sendMessage(ChatColor.translateAlternateColorCodes('&', i.replaceAll("%name%", player.getName()).replaceAll("%uuid%", String.valueOf(player.getUniqueId())).replaceAll("%discordid%", result[1]).replaceAll("%role%", String.valueOf(stringBuilder)))));
         });
-
     }
 }
diff --git a/PlayerRoleCheckerConnector/src/main/resources/config.yml b/PlayerRoleCheckerConnector/src/main/resources/config.yml
@@ -33,6 +33,7 @@ Minecraft:
     line1: '&6あなたには参加権限がありません。'
     line2: '&bDiscordを確認してみてください。'
   joinMessage: '&a%name%&fが入室しました'
+  joinMessageBoolean: true
   message:
     - '&a-----------------情報------------------'
     - 'MinecraftName: %name%'