Add ChannelMember#getUniqueId

Author: acrylic-style

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.azisaba</groupId>
   <artifactId>LunaChatPlus</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0</version>
   <description>A powerfull chat channel plugin with IME (Kana-Kanji conversion) support</description>
   <url>https://github.com/ucchyocean/LunaChat</url>
 

src/main/java/com/github/ucchyocean/lc3/member/ChannelMember.java

@@ -9,6 +9,9 @@
 import com.github.ucchyocean.lc3.LunaChatMode;
 
 import net.md_5.bungee.api.chat.BaseComponent;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
 
 /**
  * チャンネルメンバーの抽象クラス
@@ -28,6 +31,13 @@ public abstract class ChannelMember implements Comparable<ChannelMember> {
      */
     public abstract String getName();
 
+    /**
+     * プレイヤーのUUIDを返す
+     * @return UUIDもしくはプレイヤーではない場合はnull
+     */
+    @Nullable
+    public abstract UUID getUniqueId();
+
     /**
      * プレイヤー表示名を返す
      * @return プレイヤー表示名

src/main/java/com/github/ucchyocean/lc3/member/ChannelMemberBlock.java

@@ -12,6 +12,9 @@
 import org.bukkit.entity.Player;
 
 import net.md_5.bungee.api.chat.BaseComponent;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
 
 /**
  * ChannelMemberのBukkit-BlockCommandSender実装
@@ -49,6 +52,11 @@ public String getName() {
         return sender.getName();
     }
 
+    @Override
+    public @Nullable UUID getUniqueId() {
+        return null;
+    }
+
     /**
      * プレイヤー表示名を返す
      * @return プレイヤー表示名

src/main/java/com/github/ucchyocean/lc3/member/ChannelMemberBukkitConsole.java

@@ -12,6 +12,9 @@
 import org.bukkit.entity.Player;
 
 import net.md_5.bungee.api.chat.BaseComponent;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
 
 /**
  * ChannelMemberのBukkit-ConsoleCommandSender実装
@@ -49,6 +52,11 @@ public String getName() {
         return sender.getName();
     }
 
+    @Override
+    public @Nullable UUID getUniqueId() {
+        return null;
+    }
+
     /**
      * プレイヤー表示名を返す
      * @return プレイヤー表示名

src/main/java/com/github/ucchyocean/lc3/member/ChannelMemberBungeeConsole.java

@@ -11,6 +11,9 @@
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.connection.Server;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
 
 /**
  * ChannelMemberのBungee-ConsoleCommandSender実装
@@ -68,6 +71,11 @@ public String getName() {
         return sender.getName();
     }
 
+    @Override
+    public @Nullable UUID getUniqueId() {
+        return null;
+    }
+
     /**
      * 発言者の表示名を取得する
      * @return 発言者の表示名

src/main/java/com/github/ucchyocean/lc3/member/ChannelMemberOther.java

@@ -7,6 +7,8 @@
 
 import net.md_5.bungee.api.chat.BaseComponent;
 
+import java.util.UUID;
+
 /**
  * 任意の内容を設定できるChannelMember
  * @author ucchy
@@ -21,6 +23,7 @@ public class ChannelMemberOther extends ChannelMember {
     private BlockLocation location;
     private String serverName;
     private String worldName;
+    private UUID uniqueId;
 
     public ChannelMemberOther(@NotNull String name) {
         this(name, name);
@@ -62,6 +65,16 @@ public String getName() {
         return name;
     }
 
+    @Nullable
+    @Override
+    public UUID getUniqueId() {
+        return uniqueId;
+    }
+
+    public void setUniqueId(@Nullable UUID uniqueId) {
+        this.uniqueId = uniqueId;
+    }
+
     @Override
     public String getDisplayName() {
         return displayName;

src/main/java/com/github/ucchyocean/lc3/member/ChannelMemberPlayer.java

@@ -20,6 +20,7 @@
 import com.github.ucchyocean.lc3.util.BlockLocation;
 
 import net.md_5.bungee.api.chat.BaseComponent;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * ChannelMemberのBukkitPlayer実装
@@ -108,6 +109,11 @@ public String getName() {
         return id.toString();
     }
 
+    @Override
+    public @Nullable UUID getUniqueId() {
+        return id;
+    }
+
     /**
      * プレイヤー表示名を返す
      * @return プレイヤー表示名

src/main/java/com/github/ucchyocean/lc3/member/ChannelMemberProxiedPlayer.java

@@ -86,6 +86,11 @@ public String getName() {
         return id.toString();
     }
 
+    @Override
+    public @Nullable UUID getUniqueId() {
+        return id;
+    }
+
     /**
      * プレイヤー表示名を返す
      * @return プレイヤー表示名

src/main/java/com/github/ucchyocean/lc3/member/ChannelMemberSystem.java

@@ -1,6 +1,9 @@
 package com.github.ucchyocean.lc3.member;
 
 import net.md_5.bungee.api.chat.BaseComponent;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
 
 public class ChannelMemberSystem extends ChannelMember {
 
@@ -17,6 +20,11 @@ public String getName() {
         return NAME;
     }
 
+    @Override
+    public @Nullable UUID getUniqueId() {
+        return null;
+    }
+
     @Override
     public String getDisplayName() {
         return NAME;

src/test/java/com/github/ucchyocean/lc3/member/ChannelMemberDummy.java

@@ -6,6 +6,9 @@
 package com.github.ucchyocean.lc3.member;
 
 import net.md_5.bungee.api.chat.BaseComponent;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
 
 /**
  * テスト用のダミーメンバー
@@ -31,6 +34,11 @@ public String getName() {
         return "ucchy";
     }
 
+    @Override
+    public @Nullable UUID getUniqueId() {
+        return UUID.fromString("9603ae84-5be8-40af-af14-a62ed0f14a29");
+    }
+
     /**
      * @return
      * @see com.github.ucchyocean.lc3.member.ChannelMember#getDisplayName()