[JSMOD@2_476_COMMIT] finish map api(except map)

Author: magiclu550

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

@@ -90,12 +90,5 @@ public void setInWorld(boolean inWord) {
         packet.setInWorld = inWord;
         packet.send();
     }
-
-    @Override
-    public String toString() {
-        return "Item{" +
-                "inWorld=" + inWorld +
-                ", itemType=" + itemType +
-                '}';
-    }
+    
 }

JSMod2API/src/main/java/cn/jsmod2/api/map/Door.java

@@ -138,17 +138,5 @@ public String getPermission() {
         return permission;
     }
 
-    @Override
-    public String toString() {
-        return "Door{" +
-                "open=" + open +
-                ", destoryed=" + destoryed +
-                ", dontOpenOnWarhead=" + dontOpenOnWarhead +
-                ", blockAfterWarheadDetonation=" + blockAfterWarheadDetonation +
-                ", locked=" + locked +
-                ", position=" + position +
-                ", name='" + name + '\'' +
-                ", permission='" + permission + '\'' +
-                '}';
-    }
+
 }

JSMod2API/src/main/java/cn/jsmod2/api/map/Elevator.java

@@ -107,14 +107,4 @@ public void use(){
         packet.send();
     }
 
-    @Override
-    public String toString() {
-        return "Elevator{" +
-                "elevatorType=" + elevatorType +
-                ", elevatorStatus=" + elevatorStatus +
-                ", locked=" + locked +
-                ", lockable=" + lockable +
-                ", movingSpeed=" + movingSpeed +
-                '}';
-    }
 }

JSMod2API/src/main/java/cn/jsmod2/api/map/Generator.java

@@ -122,17 +122,4 @@ public Room getRoom() {
         return room;
     }
 
-    @Override
-    public String toString() {
-        return "Generator{" +
-                "open=" + open +
-                ", locked=" + locked +
-                ", hasTablet=" + hasTablet +
-                ", engaged=" + engaged +
-                ", startTime=" + startTime +
-                ", timeLeft=" + timeLeft +
-                ", position=" + position +
-                ", room=" + room +
-                '}';
-    }
 }

JSMod2API/src/main/java/cn/jsmod2/api/map/Map.java

@@ -189,13 +189,4 @@ public void setLCZDecontaminated(boolean LCZDecontaminated) {
         this.LCZDecontaminated = LCZDecontaminated;
     }
 
-    @Override
-    public String toString() {
-        return "Map{" +
-                "warheadLeverEnabled=" + warheadLeverEnabled +
-                ", warheadKeycardEntered=" + warheadKeycardEntered +
-                ", warheadDetonated=" + warheadDetonated +
-                ", LCZDecontaminated=" + LCZDecontaminated +
-                '}';
-    }
 }

JSMod2API/src/main/java/cn/jsmod2/api/map/PocketDimensionExit.java

@@ -11,6 +11,9 @@
 import cn.jsmod2.core.ApiId;
 import cn.jsmod2.core.annotations.UseForServerInit;
 import cn.jsmod2.core.math.Vector;
+import cn.jsmod2.network.SimpleGetStream;
+import cn.jsmod2.network.SimpleSetStream;
+import cn.jsmod2.network.protocol.event.newstream.GetTypes;
 
 import java.io.Serializable;
 
@@ -21,22 +24,22 @@ public class PocketDimensionExit extends ApiId implements IPocketDimensionExit,
     private Vector position;
 
     public PocketDimensionExitType getExitType() {
+        SimpleGetStream stream = new SimpleGetStream(PocketDimensionExitType.class);
+        exitType = stream.read(playerName,"ExitType",PocketDimensionExitType.class);
         return exitType;
     }
 
     public void setExitType(PocketDimensionExitType exitType) {
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"ExitType",exitType);
         this.exitType = exitType;
     }
 
     public Vector getPosition() {
+        SimpleGetStream stream = new SimpleGetStream(Vector.class);
+        position = stream.read(playerName,"Position",Vector.class);
         return position;
     }
 
-    @Override
-    public String toString() {
-        return "PocketDimensionExit{" +
-                "exitType=" + exitType +
-                ", position=" + position +
-                '}';
-    }
+
 }

JSMod2API/src/main/java/cn/jsmod2/api/map/Room.java

@@ -10,8 +10,13 @@
 
 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.protocol.event.newstream.GetTypes;
 
 import java.io.Serializable;
+import java.util.List;
 
 
 /**
@@ -28,59 +33,67 @@ public class Room extends ApiId implements IRoom, Serializable,Cloneable {
     private Vector speakerPosition;
 
     public void flickerLights(){
-
+        DoStream stream = new DoStream();
+        stream.method = "FlickerLights";
+        stream.playerName = playerName;
+        stream.send();
     }
 
     public ZoneType getZoneType() {
+        SimpleGetStream stream = new SimpleGetStream(ZoneType.class);
+        zoneType = stream.read(playerName,"ZoneType",ZoneType.class);
         return zoneType;
     }
 
 
 
     public RoomType getRoomType() {
+        SimpleGetStream stream = new SimpleGetStream(RoomType.class);
+        roomType = stream.read(playerName,"RoomType",RoomType.class);
         return roomType;
     }
 
 
 
     public int getGenericID() {
+        SimpleGetStream stream = new SimpleGetStream(Integer.class);
+        genericID = stream.read(playerName,"GenericID",Integer.class);
         return genericID;
     }
 
 
-
     public Vector getPosition() {
+        SimpleGetStream stream = new SimpleGetStream(Vector.class);
+        position = stream.read(playerName,"Position",Vector.class);
         return position;
     }
 
 
 
     public Vector getForward() {
+        SimpleGetStream stream = new SimpleGetStream(Vector.class);
+        forward = stream.read(playerName,"Forward",Vector.class);
         return forward;
     }
 
     public Vector getSpeakerPosition() {
+        SimpleGetStream stream = new SimpleGetStream(Vector.class);
+        speakerPosition = stream.read(playerName,"SpeakerPosition",Vector.class);
         return speakerPosition;
     }
 
     public String[] getObjectName(){
-        return null;
+        DoGetStream stream = new DoGetStream(String.class);
+        stream.playerName = playerName;
+        stream.getType = GetTypes.GET_ARRAY;
+        stream.method = "GetObjectName";
+        return (String[]) ((List)stream.send()).toArray();
     }
 
     //这里未来解决
     public Object getGameObject(){
         return null;
     }
 
-    @Override
-    public String toString() {
-        return "Room{" +
-                "zoneType=" + zoneType +
-                ", roomType=" + roomType +
-                ", genericID=" + genericID +
-                ", position=" + position +
-                ", forward=" + forward +
-                ", speakerPosition=" + speakerPosition +
-                '}';
-    }
+
 }

JSMod2API/src/main/java/cn/jsmod2/api/map/TeslaGate.java

@@ -11,6 +11,9 @@
 import cn.jsmod2.api.Component;
 import cn.jsmod2.core.ApiId;
 import cn.jsmod2.core.math.Vector;
+import cn.jsmod2.network.DoStream;
+import cn.jsmod2.network.SimpleGetStream;
+import cn.jsmod2.network.SimpleSetStream;
 
 import java.io.Serializable;
 
@@ -27,18 +30,32 @@ public void activate(){
     }
 
     public void activate(boolean instant){
+        DoStream stream = new DoStream();
+        stream.playerName = playerName;
+        stream.method = "Activate";
+        stream.args = new String[]{instant+""};
+    }
+
+    public Vector getTriggerDistance() {
+        SimpleGetStream stream = new SimpleGetStream(Vector.class);
+        triggerDistance = stream.read(playerName,"TriggerDistance",Vector.class);
+        return triggerDistance;
+    }
 
+    public void setTriggerDistance(Vector triggerDistance) {
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"TriggerDistance",triggerDistance);
+        this.triggerDistance = triggerDistance;
+    }
+
+    public Vector getPosition() {
+        SimpleGetStream stream = new SimpleGetStream(Vector.class);
+        position = stream.read(playerName,"Position",Vector.class);
+        return position;
     }
 
     public Object getComponent(){
         return null;
     }
 
-    @Override
-    public String toString() {
-        return "TeslaGate{" +
-                "triggerDistance=" + triggerDistance +
-                ", position=" + position +
-                '}';
-    }
 }

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

@@ -18,6 +18,8 @@
 import cn.jsmod2.core.CommandSender;
 import cn.jsmod2.core.Server;
 import cn.jsmod2.core.math.Vector;
+import cn.jsmod2.network.SimpleGetStream;
+import cn.jsmod2.network.SimpleSetStream;
 
 import java.io.Serializable;
 import java.util.List;
@@ -30,7 +32,7 @@ public class Player extends CommandSender implements IPlayer, Serializable,Clone
 
     private int playerId;
 
-    private String streamId;
+    private String steamId;
 
     private RadioStatus radioStatus;
 
@@ -50,22 +52,27 @@ public ITeamRole getTeamRole() {
     }
 
     public void setTeamRole(ITeamRole teamRole) {
+        SimpleSetStream stream = new SimpleSetStream();
+        stream.write(playerName,"TeamRole",teamRole);
         this.teamRole = teamRole;
     }
 
 
     public String getIpAddress() {
+        SimpleGetStream stream = new SimpleGetStream(String.class);
+        ipAddress = stream.read(playerName,"IpAddress",String.class);
         return ipAddress;
     }
 
 
     public int getPlayerId() {
+        SimpleGetStream stream = new SimpleGetStream(Integer.class);
         return playerId;
     }
 
 
-    public String getStreamId() {
-        return streamId;
+    public String getSteamId() {
+        return steamId;
     }
 
 
@@ -292,17 +299,4 @@ public void setGhostMode(boolean ghostMode, boolean visibleToSpec, boolean visib
 
     }
 
-    @Override
-    public String toString() {
-        return "Player{" +
-                "teamRole=" + teamRole +
-                ", ipAddress='" + ipAddress + '\'' +
-                ", playerId=" + playerId +
-                ", streamId='" + streamId + '\'' +
-                ", radioStatus=" + radioStatus +
-                ", overwatchMode=" + overwatchMode +
-                ", doNotTrack=" + doNotTrack +
-                ", scp079Data=" + scp079Data +
-                '}';
-    }
 }

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

@@ -32,11 +32,5 @@ public boolean isBanned() {
         return isBanned;
     }
 
-    @Override
-    public String toString() {
-        return "Connection{" +
-                "ipAddress='" + ipAddress + '\'' +
-                ", isBanned=" + isBanned +
-                '}';
-    }
+
 }