refactor: add some encapsulations

Author: Aurelian2842

common/src/main/java/dev/neovoxel/neobot/bot/BotListener.java

@@ -13,7 +13,6 @@
 import dev.neovoxel.nbapi.listener.NBotEventHandler;
 import dev.neovoxel.nbapi.listener.NBotListener;
 import dev.neovoxel.neobot.NeoBot;
-import dev.neovoxel.neobot.bot.types.NGroupMessageEvent;
 import org.graalvm.polyglot.HostAccess;
 import org.graalvm.polyglot.Value;
 import org.json.JSONArray;
@@ -246,7 +245,7 @@ private void fireEvent(String eventName, NEvent event) {
 
     @NBotEventHandler
     private void onGroupMessage(GroupMessageEvent event) {
-        fireEvent("GroupMessageEvent", new NGroupMessageEvent(event));
+        fireEvent("GroupMessageEvent", event);
     }
 
     @NBotEventHandler

common/src/main/java/dev/neovoxel/neobot/bot/types/NGroupMessageEvent.java

@@ -2,8 +2,10 @@
 
 import dev.neovoxel.neobot.NeoBot;
 import dev.neovoxel.neobot.game.event.ChatEvent;
+import dev.neovoxel.neobot.game.event.DeathEvent;
 import dev.neovoxel.neobot.game.event.LoginEvent;
 import dev.neovoxel.neobot.adapter.Player;
+import dev.neovoxel.neobot.game.event.PlayerEvent;
 import org.graalvm.polyglot.HostAccess;
 import org.graalvm.polyglot.Value;
 
@@ -55,17 +57,16 @@ public void onLogin(LoginEvent event) {
         fireEvent("LoginEvent", event);
     }
 
-    public void onJoin(Player player) {
-        fireEvent("JoinEvent", player);
+    public void onJoin(PlayerEvent event) {
+        fireEvent("JoinEvent", event);
     }
 
-
-    public void onQuit(Player player) {
-        fireEvent("QuitEvent", player);
+    public void onQuit(PlayerEvent event) {
+        fireEvent("QuitEvent", event);
     }
 
-    public void onDeath(Player player, String message) {
-        fireEvent("DeathEvent", player, message);
+    public void onDeath(DeathEvent event) {
+        fireEvent("DeathEvent", event);
     }
 
     public void onChat(ChatEvent event) {

common/src/main/java/dev/neovoxel/neobot/game/GameEventListener.java

@@ -5,12 +5,11 @@
 import org.graalvm.polyglot.HostAccess;
 
 @Getter(onMethod_ = {@HostAccess.Export})
-public abstract class ChatEvent {
-    private final Player player;
+public abstract class ChatEvent extends PlayerEvent {
     private final String message;
 
     protected ChatEvent(Player player, String message) {
-        this.player = player;
+        super(player);
         this.message = message;
     }
 

common/src/main/java/dev/neovoxel/neobot/game/event/ChatEvent.java

@@ -0,0 +1,15 @@
+package dev.neovoxel.neobot.game.event;
+
+import dev.neovoxel.neobot.adapter.Player;
+import lombok.Getter;
+import org.graalvm.polyglot.HostAccess;
+
+@Getter(onMethod_ = {@HostAccess.Export})
+public class DeathEvent extends PlayerEvent {
+    private final String message;
+
+    public DeathEvent(Player player, String deathMessage) {
+        super(player);
+        this.message = deathMessage;
+    }
+}

common/src/main/java/dev/neovoxel/neobot/game/event/DeathEvent.java

@@ -5,7 +5,7 @@
 
 import java.util.UUID;
 
-@Getter
+@Getter(onMethod_ = {@HostAccess.Export{})
 public abstract class LoginEvent {
     private final String name;
     private final UUID uuid;
@@ -15,15 +15,5 @@ protected LoginEvent(String name, UUID uuid) {
         this.uuid = uuid;
     }
 
-    @HostAccess.Export
-    public String getName() {
-        return name;
-    }
-
-    @HostAccess.Export
-    public UUID getUuid() {
-        return uuid;
-    }
-
     public abstract void disallow(String reason);
 }

common/src/main/java/dev/neovoxel/neobot/game/event/LoginEvent.java

@@ -0,0 +1,14 @@
+package dev.neovoxel.neobot.game.event;
+
+import dev.neovoxel.neobot.adapter.Player;
+import lombok.Getter;
+import org.graalvm.polyglot.HostAccess;
+
+@Getter(onMethod_ = {@HostAccess.Export})
+public class PlayerEvent {
+    protected final Player player;
+
+    public PlayerEvent(Player player) {
+        this.player = player;
+    }
+}

common/src/main/java/dev/neovoxel/neobot/game/event/PlayerEvent.java

@@ -11,6 +11,7 @@
 import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.HostAccess;
 import org.graalvm.polyglot.Value;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 import java.io.*;
@@ -40,7 +41,7 @@ public ScriptProvider(NeoBot plugin) {
 
     private static final Engine engine;
 
-    private static final List<Class> exposed = new ArrayList<>();
+    private static final List<Class<?>> exposed = new ArrayList<>();
 
     private static final HostAccess hostAccess;
 
@@ -74,6 +75,8 @@ public ScriptProvider(NeoBot plugin) {
         builder1.allowArrayAccess(true);
         exposed.add(Object.class);
         exposed.add(Enum.class);
+        exposed.add(JSONObject.class);
+        exposed.add(JSONArray.class);
         for (Class<?> clazz : exposed) {
             for (Method method : clazz.getMethods()) {
                 if (method.getName().equals("wait") || method.getName().equals("notify") || method.getName().equals("notifyAll")) {