Implement new plugins system

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'net.zenoc'
-version = '1.17.1-1.1.0-beta.1'
+version = '1.17.1-1.1.0-beta.2'
 var mainClass = "net.zenoc.gallium.Main"
 
 repositories {
@@ -34,7 +34,7 @@ dependencies {
 //    implementation 'com.mojang:authlib:1.5.25'
     implementation 'io.netty:netty-all:4.1.10.Final'
     implementation 'org.joml:joml:1.10.5'
-    implementation 'net.zenoc.gallium:gallium:1.1.0-beta.1'
+    implementation 'net.zenoc.gallium:gallium:1.1.0-beta.2'
     implementation 'net.minecraft:server:1.17.1'
     implementation 'com.github.oshi:oshi-core:6.2.2'
     implementation 'commons-io:commons-io:2.11.0'
@@ -43,6 +43,7 @@ dependencies {
     implementation 'net.kyori:event-method-asm:3.0.0'
     implementation 'net.kyori:adventure-text-serializer-gson:4.2.0'
     implementation 'org.xerial:sqlite-jdbc:3.42.0.0'
+    implementation 'org.json:json:20230618'
 }
 
 test {

src/main/java/net/minecraft/server/Main.java

@@ -60,7 +60,6 @@
 import net.minecraft.world.level.storage.PrimaryLevelData;
 import net.minecraft.world.level.storage.WorldData;
 import net.zenoc.gallium.Gallium;
-import net.zenoc.gallium.plugin.Plugin;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/net/minecraft/server/MinecraftServer.java

@@ -156,7 +156,9 @@
 import net.minecraft.world.level.storage.loot.PredicateManager;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
+import net.zenoc.gallium.Gallium;
 import net.zenoc.gallium.Mod;
+import net.zenoc.gallium.api.event.system.ServerShutdownEvent;
 import org.apache.commons.lang3.Validate;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -619,6 +621,11 @@ public void close() {
     }
 
     public void stopServer() {
+        // Gallium start
+        new ServerShutdownEvent("I haven't added the reason part of this yet").call();
+        Gallium.getPluginManager().unloadPlugins();
+        // Gallium end
+
         LOGGER.info("Stopping server");
         if (this.getConnection() != null) {
             this.getConnection().stop();

src/main/java/net/minecraft/server/dedicated/DedicatedServer.java

@@ -68,8 +68,6 @@
 import net.minecraft.world.level.storage.WorldData;
 import net.zenoc.gallium.Gallium;
 import net.zenoc.gallium.api.event.system.ServerStartEvent;
-import net.zenoc.gallium.plugin.Plugin;
-import net.zenoc.gallium.plugin.PluginBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -90,16 +88,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
     @Nullable
     private final Component resourcePackPrompt;
 
-    // Gallium start: internal Minecraft plugin
-    // TODO: Use this for Minecraft's default commands
-    public Plugin plugin = new PluginBuilder()
-            .setName("Minecraft")
-            .setId("minecraft")
-            .setVersion(getServerVersion())
-            .addAuthor("Mojang")
-            .build();
-    // Gallium end
-
     public DedicatedServer(Thread thread, RegistryAccess.RegistryHolder registryHolder, LevelStorageSource.LevelStorageAccess levelStorageAccess, PackRepository packRepository, ServerResources serverResources, WorldData worldData, DedicatedServerSettings dedicatedServerSettings, DataFixer dataFixer, MinecraftSessionService minecraftSessionService, GameProfileRepository gameProfileRepository, GameProfileCache gameProfileCache, ChunkProgressListenerFactory chunkProgressListenerFactory) {
         super(thread, registryHolder, levelStorageAccess, worldData, packRepository, Proxy.NO_PROXY, dataFixer, serverResources, minecraftSessionService, gameProfileRepository, gameProfileCache, chunkProgressListenerFactory);
         this.settings = dedicatedServerSettings;
@@ -192,7 +180,6 @@ public void run() {
             SkullBlockEntity.setMainThreadExecutor(this);
             GameProfileCache.setUsesAuthentication(this.usesAuthentication());
             Gallium.loadPlugins(); // Gallium
-            Gallium.getPluginManager().loadPlugin(plugin);
             LOGGER.info("Preparing level \"{}\"", this.getLevelIdName());
             this.loadLevel();
             long m = Util.getNanos() - l;

src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java

@@ -162,6 +162,7 @@
 import net.minecraft.world.phys.shapes.BooleanOp;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import net.zenoc.gallium.api.event.player.PlayerChatEvent;
 import net.zenoc.gallium.api.event.player.PlayerDisconnectEvent;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -1141,9 +1142,17 @@ private void handleChat(TextFilter.FilteredText filteredText) {
                 String string2 = filteredText.getFiltered();
                 Component component = string2.isEmpty() ? null : new TranslatableComponent("chat.type.text", new Object[]{this.player.getDisplayName(), string2});
                 Component component2 = new TranslatableComponent("chat.type.text", new Object[]{this.player.getDisplayName(), string});
+
+                // Gallium start: chat event
+                PlayerChatEvent chatEvent = (PlayerChatEvent) new PlayerChatEvent(new net.zenoc.gallium.api.world.entity.Player(this.player), string2).call();
+                LOGGER.debug("Chat");
+                if (chatEvent.isCancelled()) return;
+
+                // TODO: Custom chat format in config
                 this.server.getPlayerList().broadcastMessage(component2, (serverPlayer) -> {
                     return this.player.shouldFilterMessageTo(serverPlayer) ? component : component2;
                 }, ChatType.CHAT, this.player.getUUID());
+                // Gallium end
             }
 
             this.chatSpamTickCount += 20;

src/main/java/net/zenoc/gallium/Mod.java

@@ -51,6 +51,7 @@ public Mod() {
         this.bannedPlayersFile = new File("data/banned-players.json");
         this.opListFile = new File("data/ops.json");
         this.whitelistFile = new File("data/whitelist.json");
+        this.pluginConfigDirectory = new File("config/");
 
         try {
             database.addGroupsToGroupManager(groupManager);

src/main/java/net/zenoc/gallium/internal/minecraftplugin/MinecraftPlugin.java

@@ -0,0 +1,12 @@
+//package net.zenoc.gallium.internal.minecraftplugin;
+//
+//@Plugin(
+//        name = "Minecraft",
+//        id = "minecraft",
+//        description = "Minecraft",
+//        authors = {"Mojang"},
+//        version = "1.17.1"
+//)
+//public class MinecraftPlugin extends JavaPlugin {
+//    // TODO: Assign Minecraft default commands to this
+//}

src/main/resources/log4j2.xml

@@ -22,7 +22,7 @@
         </RollingRandomAccessFile>
     </Appenders>
     <Loggers>
-        <Root level="debug">
+        <Root level="info">
             <filters>
                 <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL"/>
             </filters>