[commit] player : add getName

Author: magiclu550

.idea/libraries/Maven__cn_jsmod2_jsmod2_core_1_0_3.xml

@@ -16,6 +16,7 @@
 import cn.jsmod2.api.team.TeamRole;
 import cn.jsmod2.api.user.UserGroup;
 import cn.jsmod2.core.CommandSender;
+import cn.jsmod2.core.Powers;
 import cn.jsmod2.core.Server;
 import cn.jsmod2.core.math.Vector;
 import cn.jsmod2.network.*;
@@ -46,7 +47,13 @@ public class Player extends CommandSender implements IPlayer, Serializable,Clone
     private Scp079Data scp079Data = new Scp079Data();
 
     public Player(String name){
-        super(name,"all","cn.jsmod2.player");
+        super(name, Powers.ALL,Powers.PLAYER);
+    }
+
+    @Override
+    public String getName() {
+        SimpleGetStream stream = new SimpleGetStream(String.class);
+        return stream.read(playerName,"Name",String.class);
     }
 
     public ITeamRole getTeamRole() {

JPLS/src/main/java/cn/jsmod2/api/player/Player.java

@@ -32,7 +32,7 @@
 public class Console extends CommandSender{
 
     private Console(){
-        super("CONSOLE","all","console","cn.jsmod2.admin","cn.jsmod2.player","nobody");
+        super("CONSOLE","all","console","admin","player","nobody");
     }
 
     private static Console console;

JPLS/src/main/java/cn/jsmod2/core/Console.java

@@ -34,7 +34,7 @@ object PowerPool {
   for(i <- 0 until ops.size()){
     val powers = poolMapping.get(ops.get(i))
     if(powers != null){
-      powers.get.add("cn.jsmod2.admin")
+      powers.get.add("admin")
     }
   }
 
@@ -49,18 +49,18 @@ object PowerPool {
   def addAdminMemory(name:String): Unit ={
     val find = poolMapping.get(name)
     if(find==null){
-      throw new NoSuchPlayerException("no such cn.jsmod2.player name")
+      throw new NoSuchPlayerException("no such player name")
     }
-    if(!find.get.contains("cn.jsmod2.admin"))
-      find.get.add("cn.jsmod2.admin")
+    if(!find.get.contains("admin"))
+      find.get.add("admin")
   }
 
   def removeAdminMemory(name:String): Boolean ={
     val find = poolMapping.get(name)
     if(find==null){
-      throw new NoSuchPlayerException("no such cn.jsmod2.player name")
+      throw new NoSuchPlayerException("no such player name")
     }
-    find.get.remove("cn.jsmod2.admin")
+    find.get.remove("admin")
   }
 
 }

JPLS/src/main/java/cn/jsmod2/core/command/PowerPool.scala

@@ -10,6 +10,7 @@
 
 package cn.jsmod2.core.protocol;
 
+import cn.jsmod2.core.CommandSender;
 import cn.jsmod2.core.RegisterTemplate;
 import cn.jsmod2.core.Server;
 import cn.jsmod2.core.ex.ProtocolException;
@@ -152,6 +153,9 @@ public <T> T dataObjectDecode(byte[] data,Class<T> clz){
                 System.arraycopy(props, 1, fields, 0, fields.length);
                 insertField(fields, o);
             }
+            if(o instanceof CommandSender){
+                ((CommandSender) o).setName(((CommandSender) o).getName());
+            }
             return clz.cast(o);
         }catch (Exception e){
             throw new ProtocolException("The jsmod2 protocol is error",e);

JPLS/src/main/java/cn/jsmod2/core/protocol/BinaryStream.java

@@ -9,10 +9,10 @@ public interface Powers {
     String CONSOLE = "console";
 
     //管理员
-    String ADMIN = "cn.jsmod2.admin";
+    String ADMIN = "admin";
 
     //普通玩家
-    String PLAYER = "cn.jsmod2.player";
+    String PLAYER = "player";
 
     //任何人不能，控制台可以
     String NOBODY = "nobody";

jsmod2/src/main/java/cn/jsmod2/core/Powers.java

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Aug 16 16:35:36 CST 2019
+#Fri Aug 23 21:16:43 CST 2019
 version=1.0-SNAPSHOT
 groupId=cn.jsmod2
-artifactId=JSMod2-DevelopKit
+artifactId=jsmod2