rename command-api -> command

command-common/src/main/java/band/kessoku/lib/command/KessokuCommand.java

@@ -0,0 +1,5 @@
+package band.kessoku.lib.command;
+
+public class KessokuCommand {
+    public static final String MOD_ID = "kessoku_command";
+}

command-api-common/src/main/java/band/kessoku/lib/command/events/CommandRegistryEvent.java → command-common/src/main/java/band/kessoku/lib/command/api/events/CommandRegistryEvent.java

@@ -1,4 +1,4 @@
-package band.kessoku.lib.command.events;
+package band.kessoku.lib.command.api.events;
 
 import band.kessoku.lib.event.api.Event;
 import com.mojang.brigadier.CommandDispatcher;

command-api-fabric/build.gradle → command-fabric/build.gradle

@@ -31,8 +31,11 @@ configurations {
 dependencies {
     modImplementation libs.fabric.loader
     modImplementation libs.fabric.api
-    common(project(path: ':command-api-common', configuration: 'namedElements')) { transitive false }
-    shadowBundle project(path: ':command-api-common', configuration: 'transformProductionFabric')
+
+    implementation(project(":event-base-common"))
+
+    common(project(path: ':command-common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':command-common', configuration: 'transformProductionFabric')
 }
 
 processResources {

command-fabric/src/main/java/band/kessoku/lib/command/KessokuCommandEntrypoint.java

@@ -0,0 +1,11 @@
+package band.kessoku.lib.command;
+
+import band.kessoku.lib.command.impl.KessokuCommandImpl;
+import net.fabricmc.api.ModInitializer;
+
+public class KessokuCommandEntrypoint implements ModInitializer {
+    @Override
+    public void onInitialize() {
+        KessokuCommandImpl.registerCommonEvents();
+    }
+}

command-api-fabric/src/main/java/band/kessoku/lib/command/KessokuCommandApiEntrypoint.java → command-fabric/src/main/java/band/kessoku/lib/command/impl/KessokuCommandImpl.java

@@ -1,12 +1,10 @@
-package band.kessoku.lib.command;
+package band.kessoku.lib.command.impl;
 
-import band.kessoku.lib.command.events.CommandRegistryEvent;
-import net.fabricmc.api.ModInitializer;
+import band.kessoku.lib.command.api.events.CommandRegistryEvent;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 
-public class KessokuCommandApiEntrypoint implements ModInitializer {
-    @Override
-    public void onInitialize() {
+public class KessokuCommandImpl {
+    public static void registerCommonEvents() {
         CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
             CommandRegistryEvent.EVENT.invoker().register(dispatcher, registryAccess, environment);
         });

command-api-fabric/src/main/resources/fabric.mod.json → command-fabric/src/main/resources/fabric.mod.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "kessoku_command_api",
+  "id": "kessoku_command",
   "version": "${version}",
   "name": "Kessoku Command API",
   "description": "About command registries.",

command-api-neo/build.gradle → command-neo/build.gradle

@@ -34,8 +34,12 @@ configurations {
 
 dependencies {
     neoForge libs.neo
-    common(project(path: ':command-api-common', configuration: 'namedElements')) { transitive false }
-    shadowBundle project(path: ':command-api-common', configuration: 'transformProductionNeoForge')
+
+    implementation(project(":event-base-common"))
+    implementation(project(":event-base-neo"))
+
+    common(project(path: ':command-common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':command-common', configuration: 'transformProductionNeoForge')
 }
 
 processResources {

command-neo/src/main/java/band/kessoku/lib/command/KessokuCommandEntrypoint.java

@@ -0,0 +1,15 @@
+package band.kessoku.lib.command;
+
+import band.kessoku.lib.command.impl.KessokuCommandImpl;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.common.NeoForge;
+
+@Mod(KessokuCommand.MOD_ID)
+public class KessokuCommandEntrypoint {
+    public KessokuCommandEntrypoint(IEventBus modEventBus) {
+        var forgeEventBus = NeoForge.EVENT_BUS;
+
+        KessokuCommandImpl.registerCommonEvents(forgeEventBus);
+    }
+}

command-neo/src/main/java/band/kessoku/lib/command/impl/KessokuCommandImpl.java

@@ -0,0 +1,14 @@
+package band.kessoku.lib.command.impl;
+
+import band.kessoku.lib.command.api.events.CommandRegistryEvent;
+import band.kessoku.lib.event.util.NeoEventUtils;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.event.RegisterCommandsEvent;
+
+public class KessokuCommandImpl {
+    public static void registerCommonEvents(IEventBus forgeEventBus) {
+        NeoEventUtils.registerEvent(forgeEventBus, RegisterCommandsEvent.class, event -> {
+            CommandRegistryEvent.EVENT.invoker().register(event.getDispatcher(), event.getBuildContext(), event.getCommandSelection());
+        });
+    }
+}

command-neo/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,29 @@
+modLoader = "javafml"
+loaderVersion = "[4,)"
+license = "LGPL-3.0-only"
+issueTrackerURL = "https://github.com/KessokuTeaTime/KessokuLib/issues"
+
+[[mods]]
+modId = "kessoku_command"
+version = "${version}"
+displayName = "Kessoku Command API"
+description = '''
+About command registries.
+'''
+logoFile = "icon.png"
+authors = "Kessoku Tea Time"
+displayURL = "https://modrinth.com/mod/kessoku-lib"
+
+[[dependencies.kessoku-event-base]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21.0,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.kessoku-event-base]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21,)"
+ordering = "NONE"
+side = "BOTH"

fabric/build.gradle

@@ -11,6 +11,8 @@ architectury {
 }
 
 dependencies {
+    modImplementation libs.fabric.loader
+
     include(project(":base-fabric"))
     include(project(":event-base-fabric"))
     include(project(":platform-fabric"))

lifecycle-events-fabric/src/main/java/band/kessoku/lib/events/lifecycle/KessokuLifecycleEventsEntrypoints.java → lifecycle-events-fabric/src/main/java/band/kessoku/lib/events/lifecycle/KessokuLifecycleEventsEntrypoint.java

@@ -3,7 +3,7 @@
 import band.kessoku.lib.events.lifecycle.impl.KessokuLifecycleEventsImpl;
 import net.fabricmc.api.ModInitializer;
 
-public class KessokuLifecycleEventsEntrypoints implements ModInitializer {
+public class KessokuLifecycleEventsEntrypoint implements ModInitializer {
     @Override
     public void onInitialize() {
         KessokuLifecycleEventsImpl.registerCommonEvents();

lifecycle-events-fabric/src/main/resources/fabric.mod.json

@@ -0,0 +1,31 @@
+{
+  "schemaVersion": 1,
+  "id": "kessoku_lifecycle_events",
+  "version": "${version}",
+  "name": "Kessoku Command API",
+  "description": "About command registries.",
+  "authors": [
+    "Kessoku Tea Time"
+  ],
+  "contact": {
+    "homepage": "https://modrinth.com/mod/kessoku-lib",
+    "sources": "https://github.com/KessokuTeaTime/KessokuLib",
+    "issues": "https://github.com/KessokuTeaTime/KessokuLib/issues"
+  },
+  "license": "LGPL-3.0-only",
+  "icon": "icon.png",
+  "environment": "*",
+  "depends": {
+    "fabricloader": ">=0.16.0",
+    "minecraft": "1.21",
+    "java": ">=21",
+    "fabric-api": "*"
+  },
+  "custom": {
+    "modmenu": {
+      "badges": [
+        "library"
+      ]
+    }
+  }
+}

settings.gradle

@@ -14,4 +14,4 @@ include("base-common", "base-fabric", "base-neo") // Base
 include("event-base-common", "event-base-fabric", "event-base-neo") // Event Base
 include("platform-common", "platform-fabric", "platform-neo") // Platform
 include("lifecycle-events-common", "lifecycle-events-fabric", "lifecycle-events-neo") // Lifecycle Events
-include("command-api-common", "command-api-fabric", "command-api-neo") // Command API
+include("command-common", "command-fabric", "command-neo") // Command API