[JSMOD@2_484_COMMIT] add Server apis

Author: magiclu550

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

@@ -50,7 +50,6 @@ public Player(String name){
         super(name,"all","player");
     }
 
-
     public ITeamRole getTeamRole() {
         return teamRole;
     }

JSMod2API/src/main/java/cn/jsmod2/api/server/Smod2Server.java

@@ -12,9 +12,13 @@
 
 import cn.jsmod2.api.map.Map;
 import cn.jsmod2.api.player.Player;
+import cn.jsmod2.api.team.ITeamRole;
+import cn.jsmod2.api.team.TeamRole;
 import cn.jsmod2.core.CommandSender;
+import cn.jsmod2.core.Console;
 import cn.jsmod2.core.GameServer;
 import cn.jsmod2.core.Server;
+import cn.jsmod2.network.protocol.event.newstream.GetTypes;
 import cn.jsmod2.network.protocol.server.*;
 
 import java.util.List;
@@ -39,6 +43,8 @@ public class Smod2Server extends CommandSender implements GameServer {
     @Deprecated
     private int maxPlayers;
 
+    private String playerListTitle;
+
     public Smod2Server() {
         super("CONSOLE","all","console","admin","player","nobody");
     }
@@ -65,6 +71,22 @@ public Smod2Server updateServer(GameServer server){
         return null;
     }
 
+    public String getPlayerListTitle() {
+        SimpleServerFieldStream stream = new SimpleServerFieldStream(String.class);
+        stream.field = "PlayerListTitle";
+        stream.isWrite = false;
+        playerListTitle = (String) stream.send();
+        return playerListTitle;
+    }
+
+    public void setPlayerListTitle(String playerListTitle) {
+        SimpleServerFieldStream stream = new SimpleServerFieldStream(Void.class);
+        stream.field = "PlayerListTitle";
+        stream.isWrite = true;
+        stream.value = playerListTitle;
+        stream.send();
+        this.playerListTitle = playerListTitle;
+    }
 
     public int getPort() {
         GetPortPacket packet = new GetPortPacket();
@@ -119,4 +141,46 @@ public List<Player> getPlayers() {
     public void personalBroadcast(int i, String s, boolean b) {
 
     }
+
+    @Override
+    public List<IConnection> getConnections(String s) {
+        SimpleServerMethodPacket packet = new SimpleServerMethodPacket(Connection.class);
+        packet.method = "GetConnections";
+        packet.args = new String[]{s};
+        packet.getTypes = GetTypes.GET_PROTOCOL_ARRAY_WITHOUT_LIST_IN;
+        return (List<IConnection>) packet.send();
+    }
+
+    @Override
+    public List<ITeamRole> getRoles(String s) {
+        SimpleServerMethodPacket packet = new SimpleServerMethodPacket(TeamRole.class);
+        packet.method = "GetRoles";
+        packet.args = new String[]{s};
+        packet.getTypes = GetTypes.GET_PROTOCOL_ARRAY_WITHOUT_LIST_IN;
+        return (List<ITeamRole>)packet.send();
+    }
+
+    @Override
+    public String getAppFolder(boolean b, boolean b1, boolean b2, boolean b3) {
+        SimpleServerMethodPacket packet = new SimpleServerMethodPacket(String.class);
+        packet.method = "GetAppFolder";
+        packet.args = new String[]{b+"",b1+"",b2+"",b3+""};
+        return (String)packet.send();
+    }
+
+    @Override
+    public boolean banSteamId(String s, String s1, int i, String s2, String s3) {
+        SimpleServerMethodPacket packet = new SimpleServerMethodPacket(Boolean.class);
+        packet.method = "BanSteamId";
+        packet.args = new String[]{s,s1,i+"",s2,s3};
+        return (Boolean) packet.send();
+    }
+
+    @Override
+    public boolean banIpAddress(String s, String s1, int i, String s2, String s3) {
+        SimpleServerMethodPacket packet = new SimpleServerMethodPacket(Boolean.class);
+        packet.method = "BanIpAddress";
+        packet.args = new String[]{s,s1,i+"",s2,s3};
+        return (Boolean)packet.send();
+    }
 }

JSMod2DevelopKit/src/main/java/cn/jsmod2/core/GameServer.java

@@ -2,9 +2,16 @@
 
 
 import cn.jsmod2.api.map.IMap;
+import cn.jsmod2.api.player.IPlayer;
+import cn.jsmod2.api.server.IConnection;
 import cn.jsmod2.api.server.IRound;
+import cn.jsmod2.api.team.ITeamRole;
+import cn.jsmod2.api.team.Role;
+import cn.jsmod2.core.annotations.PlayerName;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用于封装其他语言服务器信息，如果要将该服务器做成与其他服务器交互的话
@@ -14,11 +21,17 @@
 
 public interface GameServer {
 
-    List<? extends ISimplePlayer> getPlayers();
+    List<? extends IPlayer> getPlayers();
 
     @Deprecated
     GameServer updateServer(GameServer server);
 
+    //3.5.0
+    String getPlayerListTitle();
+
+    //3.5.0
+    void setPlayerListTitle(String playerListTitle);
+
     default int getPort() {
         return 0;
     }
@@ -50,4 +63,56 @@ default int getMaxPlayers() {
     default void setMaxPlayers(int maxPlayers) {
     }
 
+
+    default List<? extends IPlayer> getPlayers(String filter){
+        return getPlayers().stream().filter(name -> ((IPlayer) name).getName().equals(filter)).collect(Collectors.toList());
+    }
+
+    default List<? extends IPlayer> getPlayers(Role role){
+        return getPlayers().stream().filter(name -> ((IPlayer) name).getTeamRole().getRole().equals(role)).collect(Collectors.toList());
+    }
+
+    default List<? extends IPlayer> getPlayers(Role[] role){
+        return getPlayers().stream().filter(name -> Arrays.asList(role).contains(((IPlayer) name).getTeamRole().getRole())).collect(Collectors.toList());
+    }
+
+    default IPlayer getPlayer(int id){
+        List<IPlayer> players = (List<IPlayer>) getPlayers();
+        for(IPlayer player:players){
+            if(player.getPlayerId() == id){
+                return player;
+            }
+        }
+        return null;
+    }
+
+    List<IConnection> getConnections(String filter);
+
+    default List<IConnection> getConnections(){
+        return getConnections("");
+    }
+
+    List<ITeamRole> getRoles(String filter);
+
+    default List<ITeamRole> getRoles(){
+        return getRoles("");
+    }
+
+    String getAppFolder(boolean shared,boolean addSeparator,boolean addPort,boolean addConfigs);
+
+    default String getAppFolder(){
+        return getAppFolder(false,false,false,false);
+    }
+
+    boolean banSteamId(String username,String steamId,int duration,String reason,String issuer);
+
+    default boolean banSteamId(String username,String steamId,int duration,String reason){
+        return banSteamId(username,steamId,duration,reason,"Server");
+    }
+
+    boolean banIpAddress(String username,String ipAddress,int duration,String reason,String issuer);
+
+    default boolean banIpAddress(String username,String ipAddress,int duration,String reason){
+        return banIpAddress(username, ipAddress, duration, reason,"Server");
+    }
 }

JSMod2DevelopKit/target/classes/cn/jsmod2/core/plugin/PluginBase.class

@@ -0,0 +1,35 @@
+package cn.jsmod2.network;
+
+import cn.jsmod2.core.ApiId;
+import cn.jsmod2.core.protocol.GetPacket;
+
+public class SimpleFieldStream extends GetPacket {
+    public Object value;
+
+    public String field;
+
+    public int getTypes;
+
+    public boolean isWrite;//0 read 1 write
+
+    public SimpleFieldStream(int id,Class<?> type) {
+        super(id, type);
+    }
+
+    @Override
+    public Object send() {
+        if(value instanceof ApiId){
+            value = ((ApiId)value).getApiId();
+            requester.with("apiId",true);
+        }
+        requester.with("value",value).with("field",field);
+        if(isWrite){
+            requester.with("write",true).to();
+            return null;//无返回值
+        }else{
+            requester.with("read",true);
+        }
+
+        return PacketSender.getResponseValue(requester.get(),getTypes);//有返回值
+    }
+}

JSMod2Protocol/src/main/java/cn/jsmod2/network/SimpleFieldStream.java

@@ -0,0 +1,31 @@
+package cn.jsmod2.network;
+
+import cn.jsmod2.core.protocol.GetPacket;
+import cn.jsmod2.core.utils.Utils;
+
+public class SimpleMethodStream extends GetPacket {
+
+    public String method;
+
+    public String[] args;
+
+    public boolean isWrite;
+
+    public int getTypes;
+
+    public SimpleMethodStream(int id,Class<?> type){
+        super(id,type);
+    }
+
+    @Override
+    public Object send() {
+        requester.with("method",method).with("args", Utils.arraysToString(args));
+        if(isWrite){
+            requester.with("write",true).to();
+            return null;
+        }else{
+            requester.with("read",true);
+        }
+        return PacketSender.getResponseValue(requester.get(),getTypes);
+    }
+}