[JSMOD@2_490_COMMIT] font format

magiclu550 · magiclu550 · commit 9d08ffbe6457 · 2019-08-22T13:53:04.000+08:00
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/admin/AuthCheckEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/admin/AuthCheckEvent.java
@@ -33,7 +33,7 @@ public class AuthCheckEvent extends Event implements IAuthCheckEvent{
 
     private boolean allow;
 
-    private boolean successful;
+    private String deniedMessage;
 
     public IPlayer getRequester() {
         return requester;
@@ -82,21 +82,21 @@ public void setAllow(boolean allow) {
         this.allow = allow;
     }
 
-    public boolean isSuccessful() {
-        EventValueGetStream stream = new EventValueGetStream(Boolean.class);
+    public String getDeniedMessage() {
+        EventValueGetStream stream = new EventValueGetStream(String.class);
         stream.playerName = playerName;
-        stream.name = "Successful";
-        successful = sendGetPacket(stream,Boolean.class);
-        return successful;
+        stream.name = "DeniedMessage";
+        deniedMessage = sendGetPacket(stream,String.class);
+        return deniedMessage;
     }
 
-    public void setSuccessful(boolean successful) {
+    public void setDeniedMessage(String dm) {
         EventValueSetStream stream = new EventValueSetStream();
         stream.playerName = playerName;
-        stream.name = "Successful";
-        stream.value = successful;
+        stream.name = "DeniedMessage";
+        stream.value = dm;
         sendSetPacket(stream);
-        this.successful = successful;
+        this.deniedMessage = dm;
     }
 
 
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079CameraTeleportEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079CameraTeleportEvent.java
@@ -46,12 +46,12 @@ public void setAllow(boolean allow) {
     }
 
     public float getApDrain() {
-        apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);
+        apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);
         return apDrain;
     }
 
     public void setApDrain(float apDrain) {
-        sendEventSetPacket(playerName,"ApDrain",apDrain);
+        sendEventSetPacket(playerName,"APDrain",apDrain);
         this.apDrain = apDrain;
     }
 
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079DoorEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079DoorEvent.java
@@ -47,12 +47,12 @@ public void setAllow(boolean allow) {
     }
 
     public float getApDrain() {
-        apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);
+        apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);
         return apDrain;
     }
 
     public void setApDrain(float apDrain) {
-        sendEventSetPacket(playerName,"ApDrain",apDrain);
+        sendEventSetPacket(playerName,"APDrain",apDrain);
         this.apDrain = apDrain;
     }
 
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079ElevatorEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079ElevatorEvent.java
@@ -40,12 +40,12 @@ public void setAllow(boolean allow) {
     }
 
     public float getApDrain() {
-        apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);
+        apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);
         return apDrain;
     }
 
     public void setApDrain(float apDrain) {
-        sendEventSetPacket(playerName,"ApDrain",apDrain);
+        sendEventSetPacket(playerName,"APDrain",apDrain);
         this.apDrain = apDrain;
     }
 
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079ElevatorTeleportEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079ElevatorTeleportEvent.java
@@ -47,12 +47,12 @@ public void setAllow(boolean allow) {
     }
 
     public float getApDrain() {
-        apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);
+        apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);
         return apDrain;
     }
 
     public void setApDrain(float apDrain) {
-        sendEventSetPacket(playerName,"ApDrain",apDrain);
+        sendEventSetPacket(playerName,"APDrain",apDrain);
         this.apDrain = apDrain;
     }
 
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079LockEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079LockEvent.java
@@ -36,12 +36,12 @@ public void setAllow(boolean allow) {
     }
 
     public float getApDrain() {
-        apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);
+        apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);
         return apDrain;
     }
 
     public void setApDrain(float apDrain) {
-        sendEventSetPacket(playerName,"ApDrain",apDrain);
+        sendEventSetPacket(playerName,"APDrain",apDrain);
         this.apDrain = apDrain;
     }
     public Door getDoor() {
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079LockdownEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079LockdownEvent.java
@@ -46,12 +46,12 @@ public void setAllow(boolean allow) {
     }
 
     public float getApDrain() {
-        apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);
+        apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);
         return apDrain;
     }
 
     public void setApDrain(float apDrain) {
-        sendEventSetPacket(playerName,"ApDrain",apDrain);
+        sendEventSetPacket(playerName,"APDrain",apDrain);
         this.apDrain = apDrain;
     }
 
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079StartSpeakerEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079StartSpeakerEvent.java
@@ -40,12 +40,12 @@ public void setAllow(boolean allow) {
     }
 
     public float getApDrain() {
-        apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);
+        apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);
         return apDrain;
     }
 
     public void setApDrain(float apDrain) {
-        sendEventSetPacket(playerName,"ApDrain",apDrain);
+        sendEventSetPacket(playerName,"APDrain",apDrain);
         this.apDrain = apDrain;
     }
 
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079TeslaGateEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/player/Player079TeslaGateEvent.java
@@ -46,12 +46,12 @@ public void setAllow(boolean allow) {
     }
 
     public float getApDrain() {
-        apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);
+        apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);
         return apDrain;
     }
 
     public void setApDrain(float apDrain) {
-        sendEventSetPacket(playerName,"ApDrain",apDrain);
+        sendEventSetPacket(playerName,"APDrain",apDrain);
         this.apDrain = apDrain;
     }
 
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerInfectedEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerInfectedEvent.java
@@ -0,0 +1,43 @@
+package cn.jsmod2.api.event.player;
+
+import cn.jsmod2.api.player.IPlayer;
+import cn.jsmod2.api.player.Player;
+import cn.jsmod2.network.PacketSender;
+
+public class PlayerInfectedEvent extends PlayerEvent implements IPlayerInfectedEvent{
+
+    private float damage;
+
+    private Player attacker;
+
+    private float infectTime;
+
+    @Override
+    public float getDamage() {
+        damage = PacketSender.sendEventGetPacket(playerName,"Damage",Float.class);
+        return damage;
+    }
+
+    @Override
+    public void setDamage(float v) {
+        PacketSender.sendEventSetPacket(playerName,"Damage",v);
+        this.infectTime = v;
+    }
+
+    @Override
+    public IPlayer getAttacker() {
+        return attacker;
+    }
+
+    @Override
+    public float getInfectTime() {
+        infectTime = PacketSender.sendEventGetPacket(playerName,"InfectTime",Float.class);
+        return infectTime;
+    }
+
+    @Override
+    public void setInfectTime(float v) {
+        PacketSender.sendEventSetPacket(playerName,"InfectTime",v);
+        this.damage = v;
+    }
+}
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerTriggerTeslaEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerTriggerTeslaEvent.java
@@ -31,6 +31,7 @@ public PlayerTriggerTeslaEvent(){
 
     }
 
+    //Triggerable
     public void setTriggerable(boolean triggerable) {
         PacketSender.sendEventSetPacket(playerName,"Triggerable",triggerable);
         Triggerable = triggerable;
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/server/CheckRoundEndEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/server/CheckRoundEndEvent.java
@@ -0,0 +1,35 @@
+package cn.jsmod2.api.event.server;
+
+import cn.jsmod2.api.server.ROUND_END_STATUS;
+import cn.jsmod2.api.server.Round;
+import cn.jsmod2.network.PacketSender;
+
+public class CheckRoundEndEvent extends ServerEvent implements ICheckRoundEndEvent{
+
+    private Round round;
+
+    private ROUND_END_STATUS status;
+
+    @Override
+    public Round getRound() {
+        round = PacketSender.sendEventGetPacket(playerName,"Round",Round.class);
+        return round;
+    }
+
+    public void setRound(Round round) {
+        PacketSender.sendEventSetPacket(playerName,"Round",round);
+        this.round = round;
+    }
+
+    @Override
+    public ROUND_END_STATUS getStatus() {
+        status = PacketSender.sendEventGetPacket(playerName,"Status",ROUND_END_STATUS.class);
+        return status;
+    }
+
+    @Override
+    public void setStatus(ROUND_END_STATUS status) {
+        PacketSender.sendEventSetPacket(playerName,"Status",status);
+        this.status = status;
+    }
+}
diff --git a/JSMod2API/src/main/java/cn/jsmod2/api/event/server/RoundEndEvent.java b/JSMod2API/src/main/java/cn/jsmod2/api/event/server/RoundEndEvent.java
@@ -8,17 +8,16 @@
  */
 package cn.jsmod2.api.event.server;
 
-import cn.jsmod2.api.server.ROUND_END_STATS;
+import cn.jsmod2.api.server.ROUND_END_STATUS;
 import cn.jsmod2.api.server.Round;
-import cn.jsmod2.api.server.Smod2Server;
 import cn.jsmod2.network.PacketSender;
 
 
 public class RoundEndEvent extends ServerEvent implements IRoundEndEvent{
 
     private Round round = new Round();
 
-    private ROUND_END_STATS stats;
+    private ROUND_END_STATUS status;
 
 
 
@@ -27,9 +26,9 @@ public Round getRound() {
     }
 
 
-    public ROUND_END_STATS getStats() {
-        stats = PacketSender.sendEventGetPacket(playerName,"Stats",ROUND_END_STATS.class);
-        return stats;
+    public ROUND_END_STATUS getStats() {
+        status = PacketSender.sendEventGetPacket(playerName,"Status",ROUND_END_STATUS.class);
+        return status;
     }
 
     public RoundEndEvent(){
diff --git a/JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/admin/IAuthCheckEvent.java b/JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/admin/IAuthCheckEvent.java
@@ -16,9 +16,9 @@ public interface IAuthCheckEvent extends IEvent {
 
     void setAllow(boolean allow);
 
-    boolean isSuccessful();
+    String getDeniedMessage();
 
-    void setSuccessful(boolean successful);
+    void setDeniedMessage(String message);
 
     void setRequester(IPlayer requester);
 
diff --git a/JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/player/IPlayerInfectedEvent.java b/JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/player/IPlayerInfectedEvent.java
@@ -0,0 +1,17 @@
+package cn.jsmod2.api.event.player;
+
+import cn.jsmod2.api.player.IPlayer;
+
+public interface IPlayerInfectedEvent extends IPlayerEvent {
+
+    float getDamage();
+
+    void setDamage(float damage);
+
+    IPlayer getAttacker();
+
+    float getInfectTime();
+
+    void setInfectTime(float infectTime);
+
+}
diff --git a/JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/server/ICheckRoundEndEvent.java b/JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/server/ICheckRoundEndEvent.java
@@ -0,0 +1,13 @@
+package cn.jsmod2.api.event.server;
+
+import cn.jsmod2.api.server.IRound;
+import cn.jsmod2.api.server.ROUND_END_STATUS;
+
+public interface ICheckRoundEndEvent extends IServerEvent {
+
+    IRound getRound();
+
+    void setStatus(ROUND_END_STATUS stats);
+
+    ROUND_END_STATUS getStatus();
+}
diff --git a/JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/server/IRoundEndEvent.java b/JSMod2DevelopKit/src/main/java/cn/jsmod2/api/event/server/IRoundEndEvent.java
@@ -9,7 +9,7 @@
 package cn.jsmod2.api.event.server;
 
 import cn.jsmod2.api.server.IRound;
-import cn.jsmod2.api.server.ROUND_END_STATS;
+import cn.jsmod2.api.server.ROUND_END_STATUS;
 
 
 public interface IRoundEndEvent extends IServerEvent {
@@ -18,6 +18,6 @@ public interface IRoundEndEvent extends IServerEvent {
     IRound getRound();
 
 
-    ROUND_END_STATS getStats();
+    ROUND_END_STATUS getStats();
 
 }
diff --git a/JSMod2DevelopKit/src/main/java/cn/jsmod2/api/server/ROUND_END_STATUS.java b/JSMod2DevelopKit/src/main/java/cn/jsmod2/api/server/ROUND_END_STATUS.java
@@ -8,7 +8,7 @@
  */
 package cn.jsmod2.api.server;
 
-public enum ROUND_END_STATS {
+public enum ROUND_END_STATUS {
     ON_GOING,
     MTF_VICTORY,
     SCP_VICTORY,

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ public void setAllow(boolean allow) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public float getApDrain() {`
`49`		`- apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);`
	`49`	`+ apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);`
`50`	`50`	`return apDrain;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public void setApDrain(float apDrain) {`
`54`		`- sendEventSetPacket(playerName,"ApDrain",apDrain);`
	`54`	`+ sendEventSetPacket(playerName,"APDrain",apDrain);`
`55`	`55`	`this.apDrain = apDrain;`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,12 @@ public void setAllow(boolean allow) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public float getApDrain() {`
`50`		`- apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);`
	`50`	`+ apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);`
`51`	`51`	`return apDrain;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public void setApDrain(float apDrain) {`
`55`		`- sendEventSetPacket(playerName,"ApDrain",apDrain);`
	`55`	`+ sendEventSetPacket(playerName,"APDrain",apDrain);`
`56`	`56`	`this.apDrain = apDrain;`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ public void setAllow(boolean allow) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public float getApDrain() {`
`43`		`- apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);`
	`43`	`+ apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);`
`44`	`44`	`return apDrain;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public void setApDrain(float apDrain) {`
`48`		`- sendEventSetPacket(playerName,"ApDrain",apDrain);`
	`48`	`+ sendEventSetPacket(playerName,"APDrain",apDrain);`
`49`	`49`	`this.apDrain = apDrain;`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ public void setAllow(boolean allow) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public float getApDrain() {`
`39`		`- apDrain = sendEventGetPacket(playerName,"ApDrain",Float.class);`
	`39`	`+ apDrain = sendEventGetPacket(playerName,"APDrain",Float.class);`
`40`	`40`	`return apDrain;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public void setApDrain(float apDrain) {`
`44`		`- sendEventSetPacket(playerName,"ApDrain",apDrain);`
	`44`	`+ sendEventSetPacket(playerName,"APDrain",apDrain);`
`45`	`45`	`this.apDrain = apDrain;`
`46`	`46`	`}`
`47`	`47`	`public Door getDoor() {`