- [FEAT] New APIs for Maintenance Mode and rewrite commands system

- [FEAT] Improved config system to fix old loading bugs and support JSON
- [FEAT] LuckPerms support for commands

NeoForge/build.gradle

@@ -106,8 +106,8 @@ publisher {
     setVersionType("release")
     setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
     setProjectVersion("${minecraft_version}-${project.version}")
-    setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
-    setGameVersions("1.21")
+    setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}")
+    setGameVersions("1.21", "1.21.1")
     setLoaders("neoforge")
     setArtifact(remapJar)
     setCurseEnvironment("both")

NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java

@@ -2,8 +2,8 @@ package com.hypherionmc.craterlib.client;
 
 import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
 import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
+import com.hypherionmc.craterlib.core.config.AbstractConfig;
 import com.hypherionmc.craterlib.core.config.ConfigController;
-import com.hypherionmc.craterlib.core.config.ModuleConfig;
 import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
 import com.hypherionmc.craterlib.core.platform.ClientPlatform;
@@ -51,9 +51,9 @@ public class NeoForgeClientHelper implements ClientPlatform {
         LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
         CraterEventBus.INSTANCE.postEvent(event);
 
-        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
+        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
             if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
-                ModuleConfig config = (ModuleConfig) conf;
+                AbstractConfig config = watcher.getLeft();
                 ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
             }
         });

NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeServerEvents.java

@@ -3,7 +3,6 @@ package com.hypherionmc.craterlib.common;
 import com.hypherionmc.craterlib.api.events.server.CraterRegisterCommandEvent;
 import com.hypherionmc.craterlib.api.events.server.CraterServerLifecycleEvent;
 import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import com.hypherionmc.craterlib.nojang.commands.CommandsRegistry;
 import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
@@ -36,8 +35,7 @@ public class NeoForgeServerEvents {
 
     @SubscribeEvent
     public void onCommandRegister(RegisterCommandsEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent());
-        CommandsRegistry.INSTANCE.registerCommands(event.getDispatcher());
+        CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent(event.getDispatcher()));
     }
 
 }

NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java

@@ -27,8 +27,8 @@ public class ServerGamePacketListenerImplMixin {
             cancellable = true
     )
     private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
-        Component finalArg = component == null ? arg.decoratedContent() : component;
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
+        Component finalcomp = component == null ? arg.decoratedContent() : component;
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalcomp.getString(), ChatUtils.mojangToAdventure(finalcomp));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();

NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerStatusPacketListenerMixin.java

@@ -0,0 +1,53 @@
+package com.hypherionmc.craterlib.mixin;
+
+import com.hypherionmc.craterlib.api.events.server.ServerStatusEvent;
+import com.hypherionmc.craterlib.core.event.CraterEventBus;
+import com.hypherionmc.craterlib.utils.ChatUtils;
+import net.minecraft.network.Connection;
+import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket;
+import net.minecraft.network.protocol.status.ServerStatus;
+import net.minecraft.network.protocol.status.ServerboundStatusRequestPacket;
+import net.minecraft.server.network.ServerStatusPacketListenerImpl;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ServerStatusPacketListenerImpl.class)
+public class ServerStatusPacketListenerMixin {
+
+    @Shadow
+    @Final
+    private ServerStatus status;
+
+    @Shadow @Final private Connection connection;
+
+    @Inject(method = "handleStatusRequest",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/network/Connection;send(Lnet/minecraft/network/protocol/Packet;)V",
+                    shift = At.Shift.BEFORE),
+            cancellable = true
+    )
+    private void injectHandleStatusRequest(ServerboundStatusRequestPacket arg, CallbackInfo ci) {
+        ServerStatusEvent.StatusRequestEvent event = new ServerStatusEvent.StatusRequestEvent(ChatUtils.mojangToAdventure(status.description()));
+        CraterEventBus.INSTANCE.postEvent(event);
+
+        if (event.getNewStatus() != null) {
+            ci.cancel();
+            this.connection.send(new ClientboundStatusResponsePacket(
+                    new ServerStatus(ChatUtils.adventureToMojang(
+                            event.getNewStatus()),
+                            status.players(),
+                            status.version(),
+                            status.favicon(),
+                            status.enforcesSecureChat(),
+                            status.isModded()
+                    )
+            ));
+        }
+    }
+
+}

NeoForge/src/main/resources/craterlib.neoforge.mixins.json

@@ -7,7 +7,8 @@
   ],
   "client": [],
   "server": [
-    "ServerGamePacketListenerImplMixin"
+    "ServerGamePacketListenerImplMixin",
+    "ServerStatusPacketListenerMixin"
   ],
   "injectors": {
     "defaultRequire": 1