[JSMOD@2_473_COMMIT] some events

Author: magiclu550

JSMod2API/JSMod2API.iml

@@ -14,5 +14,6 @@
     <orderEntry type="library" name="Maven: cn.jsmod2:jsmod2-core:1.0.3" level="project" />
     <orderEntry type="library" name="Maven: cn.jsmod2:jsmod2-protocol:1.0.3" level="project" />
     <orderEntry type="library" name="Maven: cn.jsmod2:jsmod2-iapi:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
   </component>
 </module>

JSMod2API/pom.xml

@@ -67,6 +67,11 @@
             <artifactId>jsmod2-iapi</artifactId>
             <version>1.0.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.47</version>
+        </dependency>
     </dependencies>
 
     <repositories>

JSMod2API/src/main/java/cn/jsmod2/api/event/admin/AdminQueryEvent.java

@@ -10,9 +10,13 @@
 import cn.jsmod2.api.player.IPlayer;
 import cn.jsmod2.api.player.Player;
 import cn.jsmod2.core.event.Event;
+import cn.jsmod2.network.PacketSender;
 import cn.jsmod2.network.protocol.event.admin.AdminQueryAdminSetPacket;
 import cn.jsmod2.network.protocol.event.admin.AdminQueryQueryGetPacket;
 import cn.jsmod2.network.protocol.event.admin.AdminQueryQuerySetPacket;
+import cn.jsmod2.network.protocol.event.newstream.EventValueGetStream;
+import cn.jsmod2.network.protocol.event.newstream.EventValueSetStream;
+import cn.jsmod2.network.protocol.event.newstream.GetTypes;
 
 /**
  * @author magiclu550 #(code) jsmod2
@@ -58,26 +62,54 @@ public void setQuery(String query) {
     }
 
     public String getOutput() {
+        EventValueGetStream stream = new EventValueGetStream(String.class);
+        stream.playerName = playerName;
+        stream.getType = GetTypes.GET;
+        stream.name = "Output";
+        output = PacketSender.sendGetPacket(stream,String.class);
         return output;
     }
 
     public void setOutput(String output) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Output";
+        stream.value = output;
+        PacketSender.sendSetPacket(stream);
         this.output = output;
     }
 
     public boolean isHandled() {
+        EventValueGetStream stream = new EventValueGetStream(Boolean.class);
+        stream.playerName = playerName;
+        stream.name = "Handled";
+        handled = PacketSender.sendGetPacket(stream,Boolean.class);
         return handled;
     }
 
     public void setHandled(boolean handled) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Handled";
+        stream.value = handled;
+        PacketSender.sendSetPacket(stream);
         this.handled = handled;
     }
 
     public boolean isSuccessful() {
+        EventValueGetStream stream = new EventValueGetStream(Boolean.class);
+        stream.playerName = playerName;
+        stream.name = "Successful";
+        successful = PacketSender.sendGetPacket(stream,Boolean.class);
         return successful;
     }
 
     public void setSuccessful(boolean successful) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Successful";
+        stream.value = successful;
+        PacketSender.sendSetPacket(stream);
         this.successful = successful;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/event/admin/AuthCheckEvent.java

@@ -11,7 +11,14 @@
 import cn.jsmod2.api.player.IPlayer;
 import cn.jsmod2.api.player.Player;
 import cn.jsmod2.api.server.AuthType;
+import cn.jsmod2.core.ApiId;
 import cn.jsmod2.core.event.Event;
+import cn.jsmod2.network.PacketSender;
+import cn.jsmod2.network.protocol.event.newstream.EventValueGetStream;
+import cn.jsmod2.network.protocol.event.newstream.EventValueSetStream;
+
+import static cn.jsmod2.network.PacketSender.sendGetPacket;
+import static cn.jsmod2.network.PacketSender.sendSetPacket;
 
 
 /**
@@ -33,30 +40,62 @@ public IPlayer getRequester() {
     }
 
     public void setRequester(IPlayer requester) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.name = "Requester";
+        stream.value = requester;
+        stream.playerName = playerName;
+        sendSetPacket(stream);
         this.requester = requester;
     }
 
     public AuthType getType() {
+        EventValueGetStream stream = new EventValueGetStream(AuthType.class);
+        stream.name = "AuthType";
+        stream.playerName = playerName;
+        type = sendGetPacket(stream,AuthType.class);
         return type;
     }
 
     public void setType(AuthType type) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Type";
+        stream.value = type;
+        sendSetPacket(stream);
         this.type = type;
     }
 
     public boolean isAllow() {
+        EventValueGetStream stream = new EventValueGetStream(Boolean.class);
+        stream.playerName = playerName;
+        stream.name = "Allow";
+        allow = sendGetPacket(stream,Boolean.class);
         return allow;
     }
 
     public void setAllow(boolean allow) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Allow";
+        stream.value = allow;
+        sendSetPacket(stream);
         this.allow = allow;
     }
 
     public boolean isSuccessful() {
+        EventValueGetStream stream = new EventValueGetStream(Boolean.class);
+        stream.playerName = playerName;
+        stream.name = "Successful";
+        successful = sendGetPacket(stream,Boolean.class);
         return successful;
     }
 
     public void setSuccessful(boolean successful) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Successful";
+        stream.value = successful;
+        sendSetPacket(stream);
         this.successful = successful;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/event/admin/BanEvent.java

@@ -11,6 +11,11 @@
 import cn.jsmod2.api.player.IPlayer;
 import cn.jsmod2.api.player.Player;
 import cn.jsmod2.core.event.Event;
+import cn.jsmod2.network.protocol.event.newstream.EventValueGetStream;
+import cn.jsmod2.network.protocol.event.newstream.EventValueSetStream;
+
+import static cn.jsmod2.network.PacketSender.sendGetPacket;
+import static cn.jsmod2.network.PacketSender.sendSetPacket;
 
 
 /**
@@ -36,6 +41,11 @@ public IPlayer getPlayer() {
     }
 
     public void setPlayer(IPlayer player) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Player";
+        stream.value = player;
+        sendSetPacket(stream);
         this.player = player;
     }
 
@@ -44,38 +54,79 @@ public IPlayer getAdmin() {
     }
 
     public void setAdmin(IPlayer admin) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Admin";
+        stream.value = admin;
+        sendSetPacket(stream);
         this.admin = admin;
     }
 
     public int getDuration() {
+        EventValueGetStream stream = new EventValueGetStream(Integer.class);
+        stream.playerName = playerName;
+        stream.name = "Duration";
+        duration = sendGetPacket(stream,Integer.class);
         return duration;
     }
 
     public void setDuration(int duration) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.name = "Duration";
+        stream.value = duration;
+        stream.playerName = playerName;
+        sendSetPacket(stream);
         this.duration = duration;
     }
 
     public String getReason() {
+        EventValueGetStream stream = new EventValueGetStream(String.class);
+        stream.playerName = playerName;
+        stream.name = "Reason";
+        reason = sendGetPacket(stream,String.class);
         return reason;
     }
 
     public void setReason(String reason) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Reason";
+        stream.value = reason;
+        sendSetPacket(stream);
         this.reason = reason;
     }
 
     public String getResult() {
+        EventValueGetStream stream = new EventValueGetStream(String.class);
+        stream.playerName = playerName;
+        stream.name = "Result";
+        result = sendGetPacket(stream,String.class);
         return result;
     }
 
     public void setResult(String result) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Result";
+        stream.value = result;
+        sendSetPacket(stream);
         this.result = result;
     }
 
     public boolean isAllowBan() {
+        EventValueGetStream stream = new EventValueGetStream(Boolean.class);
+        stream.playerName = playerName;
+        stream.name = "AlloBan";
+        allowBan = sendGetPacket(stream,Boolean.class);
         return allowBan;
     }
 
     public void setAllowBan(boolean allowBan) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "AllowBan";
+        stream.value = allowBan;
+        sendSetPacket(stream);
         this.allowBan = allowBan;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/event/config/SetConfigEvent.java

@@ -9,8 +9,12 @@
 package cn.jsmod2.api.event.config;
 
 
-import cn.jsmod2.core.annotations.UseForServerInit;
 import cn.jsmod2.core.event.Event;
+import cn.jsmod2.network.protocol.event.newstream.EventValueGetStream;
+import cn.jsmod2.network.protocol.event.newstream.EventValueSetStream;
+
+import static cn.jsmod2.network.PacketSender.sendGetPacket;
+import static cn.jsmod2.network.PacketSender.sendSetPacket;
 
 /**
  * @author magiclu550 #(code) jsmod2
@@ -31,23 +35,45 @@ public SetConfigEvent(){
     }
 
     public String getKey() {
+        EventValueGetStream stream = new EventValueGetStream(String.class);
+        stream.playerName = playerName;
+        stream.name = "Key";
+        key = sendGetPacket(stream,String.class);
         return key;
     }
 
     public void setKey(String key) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Key";
+        stream.value = key;
+        sendSetPacket(stream);
         this.key = key;
     }
 
-    public Object getValue() {
-        return value;
+    public <T> T getValue(Class<T> type) {
+        EventValueGetStream stream = new EventValueGetStream(type);
+        stream.playerName = playerName;
+        stream.name = "Value";
+        value = sendGetPacket(stream,type);
+        return type.cast(value);
     }
 
     public void setValue(Object value) {
+        EventValueSetStream stream = new EventValueSetStream();
+        stream.playerName = playerName;
+        stream.name = "Value";
+        stream.value = value;
+        sendSetPacket(stream);
         this.value = value;
     }
 
-    public Object getDefaultValue() {
-        return defaultValue;
+    public <T> T getDefaultValue(Class<T> type) {
+        EventValueGetStream stream = new EventValueGetStream(type);
+        stream.playerName = playerName;
+        stream.name = "DefaultValue";
+        defaultValue = sendGetPacket(stream,type);
+        return type.cast(defaultValue);
     }