[JSMOD@2_491_COMMIT] add events

Author: magiclu550

JSMod2API/src/main/java/cn/jsmod2/api/event/environment/WarheadStopEvent.java

@@ -0,0 +1,4 @@
+package cn.jsmod2.api.event.environment;
+
+public class WarheadStopEvent extends WarheadEvent implements IWarheadEvent{
+}

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerDoorAccessEvent.java

@@ -0,0 +1,38 @@
+package cn.jsmod2.api.event.player;
+
+import cn.jsmod2.api.map.Door;
+import cn.jsmod2.network.PacketSender;
+
+public class PlayerDoorAccessEvent extends PlayerEvent implements IPlayerDoorAccessEvent {
+
+    private boolean allow;
+
+    private boolean destroy;
+
+    private Door door;
+
+    public boolean isAllow() {
+        allow = PacketSender.sendEventGetPacket(playerName,"Allow",Boolean.class);
+        return allow;
+    }
+
+    public void setAllow(boolean allow) {
+        PacketSender.sendEventSetPacket(playerName,"Allow",allow);
+        this.allow = allow;
+    }
+
+    public boolean isDestroy() {
+        destroy = PacketSender.sendEventGetPacket(playerName,"Destroy",Boolean.class);
+        return destroy;
+    }
+
+    public void setDestroy(boolean destroy) {
+        PacketSender.sendEventSetPacket(playerName,"Destroy",destroy);
+        this.destroy = destroy;
+    }
+
+    public Door getDoor() {
+        return door;
+    }
+
+}

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerNicknameSetEvent.java

@@ -0,0 +1,20 @@
+package cn.jsmod2.api.event.player;
+
+import cn.jsmod2.network.PacketSender;
+
+public class PlayerNicknameSetEvent extends PlayerEvent implements IPlayerNicknameSetEvent {
+
+    private String nickName;
+
+    @Override
+    public void setNickname(String s) {
+        PacketSender.sendEventSetPacket(playerName,"NickName",nickName);
+        this.nickName = s;
+    }
+
+    @Override
+    public String getNickname() {
+        nickName = PacketSender.sendEventGetPacket(playerName,"NickName",String.class);
+        return nickName;
+    }
+}

JSMod2API/src/main/java/cn/jsmod2/api/event/team/DecideRespawnQueueEvent.java

@@ -20,14 +20,17 @@ public class DecideRespawnQueueEvent extends Event implements IDecideRespawnQueu
 
     private Team[] teams;
 
-    public DecideRespawnQueueEvent(Team[] teams){
-        this.teams = teams;
-    }
+
 
     public Team[] getTeams() {
         teams = (Team[]) PacketSender.sendEventGetPacket(playerName,"Teams",Team.class, List.class, GetTypes.GET_ARRAY).toArray();
         return teams;
     }
 
+    public void setTeams(Team[] teams){
+        PacketSender.sendEventSetPacket(playerName,"Teams",teams);
+        this.teams = teams;
+    }
+
 
 }

JSMod2API/src/test/java/cn/jsmod2/Test.java

@@ -12,7 +12,9 @@
 public class Test {
 
     public static void main(String[] args) {
-        System.out.println(new Player(""));
+        Map<String,String> map = new HashMap<>();
+        map.put("Teams","'"+Role.SCP_049+"'");
+        System.out.println(JSON.toJSONString(map).replace("\\\"","'"));
     }
 
 }

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

@@ -96,7 +96,7 @@ public byte[] dataObjectEncodeWithEnd(Object o,String end){
             if(!end.equals("")){
                 end = "~"+end;
             }
-            String json = JSON.toJSONString(o)+end;
+            String json = JSON.toJSONString(o).replace("\\\"","'")+end;
             String packet = id+"-"+json;
             return dataJsonEncode(packet);
         }catch (Exception e){

JSMod2Core/src/main/java/cn/jsmod2/core/protocol/Requester.java

@@ -9,6 +9,7 @@
 import com.alibaba.fastjson.JSON;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -38,7 +39,7 @@ public Requester(Server sender, ControlPacket packet){
     }
 
     public Requester with(String key,Object value){
-        _map.put(key,value instanceof ApiId?((ApiId) value).getApiId():value instanceof Enum?"'"+value+"'":value.toString());
+        _map.put(key,value instanceof ApiId?((ApiId) value).getApiId():value instanceof Enum?"'"+value+"'":value.getClass().isArray()||value instanceof List?JSON.toJSONString(value):value.toString());
         return this;
     }
 

JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/environment/IWarheadStopEvent.java

@@ -0,0 +1,4 @@
+package cn.jsmod2.api.event.environment;
+
+public interface IWarheadStopEvent extends IWarheadEvent{
+}

JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/player/IPlayerDoorAccessEvent.java

@@ -0,0 +1,16 @@
+package cn.jsmod2.api.event.player;
+
+import cn.jsmod2.api.map.IDoor;
+
+public interface IPlayerDoorAccessEvent extends IPlayerEvent {
+
+    boolean isAllow();
+
+    void setAllow(boolean allow);
+
+    boolean isDestroy();
+
+    void setDestroy(boolean destroy);
+
+    IDoor getDoor();
+}

JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/player/IPlayerNicknameSetEvent.java

@@ -0,0 +1,9 @@
+package cn.jsmod2.api.event.player;
+
+public interface IPlayerNicknameSetEvent extends IPlayerEvent{
+
+    String getNickname();
+
+    void setNickname(String nickname);
+
+}