[commit] #1071 add scp079

Author: magiclu550

JPLS/src/main/java/cn/jsmod2/RPCHandler.java

@@ -212,7 +212,7 @@ public boolean stop(){
      * @return ip地址/已经关闭
      */
     public String get_ip(){
-        if(Server.getSender()==null){
+        if(Server.getSender()==null||!Server.getSender().getServer().isConnected){
             return "the server has stopped";
         }
         return Server.getSender().getServer().getGameServer().getIpAddress();
@@ -223,7 +223,7 @@ public String get_ip(){
      * @return 最大玩家数量
      */
     public int get_player_max(){
-        if(Server.getSender()==null){
+        if(Server.getSender()==null||!Server.getSender().getServer().isConnected){
             return 0;
         }
         return Server.getSender().getServer().getGameServer().getMaxPlayers();
@@ -234,7 +234,7 @@ public int get_player_max(){
      * @return 在线玩家数量
      */
     public int get_player(){
-        if(Server.getSender()==null){
+        if(Server.getSender()==null||!Server.getSender().getServer().isConnected){
             return 0;
         }
         return Server.getSender().getServer().getGameServer().getPlayers().size();
@@ -246,7 +246,7 @@ public int get_player(){
      */
     public List<String> get_player_list(){
         List<String> list = new ArrayList<>();
-        if(Server.getSender()==null)return list;
+        if(Server.getSender()==null||!Server.getSender().getServer().isConnected)return list;
         List<? extends IPlayer> players = Server.getSender().getServer().getGameServer().getPlayers();
         for(IPlayer p:players){
             list.add(p.getName());

JPLS/src/main/java/cn/jsmod2/api/item/Item.java

@@ -17,6 +17,9 @@
 
 public class Item extends ApiId implements Cloneable, Serializable,IItem {
 
+    public Item(){
+
+    }
     //在字段注入使用
     //playerName换成ItemId
 

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

@@ -50,6 +50,9 @@ public Player(String name){
         super(name, Powers.ALL,Powers.PLAYER);
     }
 
+    public Player(){
+        this("");
+    }
     @Override
     public String getName() {
         SimpleGetStream stream = new SimpleGetStream(String.class);

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

@@ -9,14 +9,17 @@
 package cn.jsmod2.api.player;
 
 import cn.jsmod2.api.Component;
-import cn.jsmod2.api.map.IDoor;
-import cn.jsmod2.api.map.IRoom;
-import cn.jsmod2.api.map.ITeslaGate;
-import cn.jsmod2.api.map.Room;
+import cn.jsmod2.api.map.*;
 import cn.jsmod2.core.ApiId;
 import cn.jsmod2.core.math.Vector;
+import cn.jsmod2.network.DoGetStream;
+import cn.jsmod2.network.DoStream;
+import cn.jsmod2.network.SimpleGetStream;
+import cn.jsmod2.network.SimpleSetStream;
+import cn.jsmod2.network.protocol.event.newstream.GetTypes;
 
 import java.io.Serializable;
+import java.util.List;
 
 public class Scp079Data extends ApiId implements IScp079Data, Serializable,Cloneable, Component {
 
@@ -38,131 +41,195 @@ public class Scp079Data extends ApiId implements IScp079Data, Serializable,Clone
 
     private float pitch;
 
-    private Room speaker;
+    private IRoom speaker;
 
     private Vector camera;
 
     public float getExp() {
+        SimpleGetStream stream = new SimpleGetStream(Float.class);
+        exp = stream.read(playerName,"Exp",Float.class);
         return exp;
     }
 
     public void setExp(float exp) {
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"Exp",exp);
         this.exp = exp;
     }
 
     public int getExpToLevelUp() {
+        SimpleGetStream stream = new SimpleGetStream(Integer.class);
+        expToLevelUp = stream.read(playerName,"ExpToLevelUp",Integer.class);
         return expToLevelUp;
     }
 
     public void setExpToLevelUp(int expToLevelUp) {
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"ExpToLevelUp",expToLevelUp);
         this.expToLevelUp = expToLevelUp;
     }
 
     public int getLevel() {
+        SimpleGetStream stream = new SimpleGetStream(Integer.class);
+        level = stream.read(playerName,"Level",Integer.class);
         return level;
     }
 
     public void setLevel(int level) {
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"Level",level);
         this.level = level;
     }
 
     public float getAP() {
+        SimpleGetStream stream = new SimpleGetStream(Float.class);
+        AP = stream.read(playerName,"AP",Float.class);
         return AP;
     }
 
     public void setAP(float AP) {
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"AP",AP);
         this.AP = AP;
     }
 
     public float getAPPerSecond() {
+        SimpleGetStream stream = new SimpleGetStream(Float.class);
+        APPerSecond = stream.read(playerName,"APPerSecond",Float.class);
         return APPerSecond;
     }
 
     public void setAPPerSecond(float APPerSecond) {
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"APPerSecond",APPerSecond);
         this.APPerSecond = APPerSecond;
     }
 
     public float getMaxAP() {
+        SimpleGetStream stream = new SimpleGetStream(Float.class);
+        maxAP = stream.read(playerName,"MaxAP",Float.class);
         return maxAP;
     }
 
     public void setMaxAP(float maxAP) {
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"MaxAP",maxAP);
         this.maxAP = maxAP;
     }
 
     public float getSpeakerAPPerSecond() {
+        SimpleGetStream stream = new SimpleGetStream(Float.class);
+        speakerAPPerSecond = stream.read(playerName,"SpeakerAPPerSecond",Float.class);
         return speakerAPPerSecond;
     }
 
     public void setSpeakerAPPerSecond(float speakerAPPerSecond) {
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"SpeakerAPPerSecond",speakerAPPerSecond);
         this.speakerAPPerSecond = speakerAPPerSecond;
     }
 
     public float getYaw() {
+        SimpleGetStream stream = new SimpleGetStream(Float.class);
+        yaw = stream.read(playerName,"Yaw",Float.class);
         return yaw;
     }
 
 
     public float getPitch() {
+        SimpleGetStream stream = new SimpleGetStream(Float.class);
+        pitch = stream.read(playerName,"Pitch",Float.class);
         return pitch;
     }
 
 
-    public Room getSpeaker() {
+    public IRoom getSpeaker() {
         return speaker;
     }
 
-    public void setSpeaker(Room speaker) {
-        this.speaker = speaker;
-    }
-
     public Vector getCamera() {
+        SimpleGetStream stream = new SimpleGetStream(Vector.class);
+        camera = stream.read(playerName,"Camera",Vector.class);
         return camera;
     }
 
     @Override
     public void setSpeaker(IRoom iRoom) {
-
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"Speaker",speaker);
+        this.speaker = iRoom;
     }
 
     @Override
     public IDoor[] getLockedDoors() {
-        return new IDoor[0];
+        DoGetStream stream = new DoGetStream(Door.class);
+        stream.playerName = playerName;
+        stream.method = "GetLockedDoors";
+        stream.getType = GetTypes.GET_PROTOCOL_ARRAY_WITHOUT_LIST_IN;
+        return (IDoor[]) ((List)stream.send()).toArray();
     }
 
     @Override
     public void lock(IDoor iDoor) {
-
+        DoStream stream = new DoStream();
+        stream.playerName = playerName;
+        stream.method = "Lock";
+        stream.args = new String[]{((ApiId)iDoor).getApiId()};
+        stream.send();
     }
 
     @Override
     public void unlock(IDoor iDoor) {
-
+        DoStream stream = new DoStream();
+        stream.playerName = playerName;
+        stream.method = "Unlock";
+        stream.args = new String[]{((ApiId)iDoor).getApiId()};
+        stream.send();
     }
 
     @Override
     public void triggerTesla(ITeslaGate iTeslaGate) {
-
+        DoStream stream = new DoStream();
+        stream.method = "TriggerTesla";
+        stream.playerName = playerName;
+        stream.args = new String[]{((ApiId)iTeslaGate).getApiId()};
+        stream.send();
     }
 
     @Override
     public void lockdown(IRoom iRoom) {
-
+        DoStream stream = new DoStream();
+        stream.playerName = playerName;
+        stream.method = "Lockdown";
+        stream.args = new String[]{((ApiId)iRoom).getApiId()};
+        stream.send();
     }
 
     @Override
     public void setCamera(Vector vector, boolean b) {
-
+        DoStream stream = new DoStream();
+        stream.playerName = playerName;
+        stream.method = "Camera";
+        stream.args = new String[]{vector.toString(),b+""};
+        stream.send();
     }
 
     @Override
     public void showGainExp(ExperienceType experienceType) {
-
+        DoStream stream = new DoStream();
+        stream.playerName = playerName;
+        stream.method = "ShowGainExp";
+        stream.args = new String[]{"'"+experienceType+"'"};
+        stream.send();
     }
 
     @Override
     public void showLevelUp(int i) {
-
+        DoStream stream = new DoStream();
+        stream.playerName = playerName;
+        stream.method = "ShowLevelUp";
+        stream.args = new String[]{i+""};
+        stream.send();
     }
 
     @Override

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

@@ -914,6 +914,7 @@ public void run() {
                     if(!Server.getSender().getServer().isConnected){
                         ServerLogger.getLogger().multiInfo(getClass(),"the listener thread is closed","","");
                     }
+                    //getLogger().multiDebug(getClass(),"正在响应...","","");
                     Socket socket = ((ServerSocket)serverSocket).accept();
                     scheduler.executeRunnable(new SocketHandlerThread(socket));
                     if (isDebug) {