onejar

client/neoforge_1_21/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues/"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Client"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Client Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_client"

client/neoforge_1_21_11/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Client"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Client Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_client"

client/neoforge_1_21_3/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues/"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Client"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Client Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_client"

client/neoforge_1_21_4/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues/"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Client"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Client Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_client"

client/neoforge_1_21_6/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Client"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Client Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_client"

client/neoforge_26_1/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Client"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Client Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_client"

client/neoforge_26_2/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Client"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Client Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_client"

onejar/neoforge_1_21/build.gradle.kts

@@ -0,0 +1,66 @@
+plugins {
+    id("dev.architectury.loom") version Versions.architecturyLoom
+//    id("architectury-plugin") version "3.5-SNAPSHOT"
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
+
+// 直接引用 client 和 server 模块的源码目录，无需手动复制
+val clientSourceDir = project(":client:neoforge_1_21").projectDir.resolve("src/main/java/com/coloryr/allmusic/client")
+val serverSourceDir = project(":server:neoforge_1_21").projectDir.resolve("src/main/java/com/coloryr/allmusic/server")
+val commSourceDir = project(":server:neoforge_1_21").projectDir.resolve("src/main/java/com/coloryr/allmusic/comm")
+val clientResDir = project(":client:neoforge_1_21").projectDir.resolve("src/main/resources")
+
+sourceSets {
+    main {
+        java {
+            setSrcDirs(listOf(clientSourceDir, serverSourceDir, commSourceDir))
+        }
+        resources {
+            setSrcDirs(listOf(
+                file("src/main/resources"),  // onejar 自己的合并资源（fabric.mod.json）
+                clientResDir,
+            ))
+        }
+    }
+}
+
+//architectury {
+//  platformSetupLoomIde()
+//  neoForge()
+//}
+
+repositories {
+    maven("https://maven.neoforged.net/releases/")
+}
+
+dependencies {
+    minecraft("com.mojang:minecraft:1.21")
+    mappings(loom.officialMojangMappings())
+    neoForge("net.neoforged:neoforge:21.0.167")
+
+    modImplementation("net.kyori:adventure-platform-neoforge:6.0.1")
+
+    implementation(include("net.kyori:adventure-platform-neoforge:6.0.1")!!)
+}
+
+tasks {
+    processResources {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+        filesMatching("META-INF/neoforge.mods.toml") {
+            expand("version" to project.version)
+        }
+    }
+
+    remapJar {
+        inputFile.set(shadowJar.get().archiveFile)
+        archiveFileName.set("[neoforge-1.21]AllMusic-${project.version}.jar")
+        destinationDirectory.set(file("${parent!!.projectDir}/../build"))
+    }
+
+    build {
+        dependsOn(remapJar)
+    }
+}

onejar/neoforge_1_21/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

onejar/neoforge_1_21/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,59 @@
+modLoader = "javafml"
+loaderVersion = "[2,)"
+license = "GPL-3.0"
+issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues/"
+
+[[mods]]
+modId = "allmusic"
+version = "${version}"
+displayName = "AllMusic"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Mod'''
+
+[[mods]]
+modId = "allmusic_client"
+version = "${version}"
+displayName = "AllMusic Client"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Client Mod'''
+
+[[mods]]
+modId = "allmusic_server"
+version = "${version}"
+displayName = "AllMusic Server"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Server Mod'''
+
+[[dependencies.allmusic_client]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21.0.167,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.allmusic_client]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.allmusic_server]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21.0.167,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.allmusic_server]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21,)"
+ordering = "NONE"
+side = "BOTH"

onejar/neoforge_1_21_11/build.gradle.kts

@@ -0,0 +1,64 @@
+plugins {
+    id("dev.architectury.loom") version Versions.architecturyLoom
+//    id("architectury-plugin") version "3.5-SNAPSHOT"
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
+
+// 直接引用 client 和 server 模块的源码目录，无需手动复制
+val clientSourceDir = project(":client:neoforge_1_21_11").projectDir.resolve("src/main/java/com/coloryr/allmusic/client")
+val serverSourceDir = project(":server:neoforge_1_21_11").projectDir.resolve("src/main/java/com/coloryr/allmusic/server")
+val commSourceDir = project(":server:neoforge_1_21_11").projectDir.resolve("src/main/java/com/coloryr/allmusic/comm")
+val clientResDir = project(":client:neoforge_1_21_11").projectDir.resolve("src/main/resources")
+
+sourceSets {
+    main {
+        java {
+            setSrcDirs(listOf(clientSourceDir, serverSourceDir, commSourceDir))
+        }
+        resources {
+            setSrcDirs(listOf(
+                file("src/main/resources"),  // onejar 自己的合并资源（fabric.mod.json）
+                clientResDir,
+            ))
+        }
+    }
+}
+
+//architectury {
+//  platformSetupLoomIde()
+//  neoForge()
+//}
+
+repositories {
+    maven("https://maven.neoforged.net/releases/")
+}
+
+dependencies {
+    minecraft("com.mojang:minecraft:1.21.11")
+    mappings(loom.officialMojangMappings())
+    neoForge("net.neoforged:neoforge:21.11.42")
+
+    implementation(include("net.kyori:adventure-platform-neoforge:6.8.0")!!)
+}
+
+tasks {
+    processResources {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+        filesMatching("META-INF/neoforge.mods.toml") {
+            expand("version" to project.version)
+        }
+    }
+
+    remapJar {
+        inputFile.set(shadowJar.get().archiveFile)
+        archiveFileName.set("[neoforge-1.21.11]AllMusic-${project.version}.jar")
+        destinationDirectory.set(file("${parent!!.projectDir}/../build"))
+    }
+
+    build {
+        dependsOn(remapJar)
+    }
+}

onejar/neoforge_1_21_11/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

onejar/neoforge_1_21_11/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,59 @@
+modLoader = "javafml"
+loaderVersion = "[2,)"
+license = "GPL-3.0"
+issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues/"
+
+[[mods]]
+modId = "allmusic"
+version = "${version}"
+displayName = "AllMusic"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Mod'''
+
+[[mods]]
+modId = "allmusic_client"
+version = "${version}"
+displayName = "AllMusic Client"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Client Mod'''
+
+[[mods]]
+modId = "allmusic_server"
+version = "${version}"
+displayName = "AllMusic Server"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Server Mod'''
+
+[[dependencies.allmusic_client]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21.11.17-beta,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.allmusic_client]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21.11,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.allmusic_server]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21.11.17-beta,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.allmusic_server]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21.11,)"
+ordering = "NONE"
+side = "BOTH"

onejar/neoforge_1_21_6/build.gradle.kts

@@ -0,0 +1,64 @@
+plugins {
+    id("dev.architectury.loom") version Versions.architecturyLoom
+//    id("architectury-plugin") version "3.5-SNAPSHOT"
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
+
+// 直接引用 client 和 server 模块的源码目录，无需手动复制
+val clientSourceDir = project(":client:neoforge_1_21_6").projectDir.resolve("src/main/java/com/coloryr/allmusic/client")
+val serverSourceDir = project(":server:neoforge_1_21_6").projectDir.resolve("src/main/java/com/coloryr/allmusic/server")
+val commSourceDir = project(":server:neoforge_1_21_6").projectDir.resolve("src/main/java/com/coloryr/allmusic/comm")
+val clientResDir = project(":client:neoforge_1_21_6").projectDir.resolve("src/main/resources")
+
+sourceSets {
+    main {
+        java {
+            setSrcDirs(listOf(clientSourceDir, serverSourceDir, commSourceDir))
+        }
+        resources {
+            setSrcDirs(listOf(
+                file("src/main/resources"),  // onejar 自己的合并资源（fabric.mod.json）
+                clientResDir,
+            ))
+        }
+    }
+}
+
+//architectury {
+//  platformSetupLoomIde()
+//  neoForge()
+//}
+
+repositories {
+    maven("https://maven.neoforged.net/releases/")
+}
+
+dependencies {
+    minecraft("com.mojang:minecraft:1.21.6")
+    mappings(loom.officialMojangMappings())
+    neoForge("net.neoforged:neoforge:21.6.20-beta")
+
+    implementation(include("net.kyori:adventure-platform-neoforge:6.6.0")!!)
+}
+
+tasks {
+    processResources {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+        filesMatching("META-INF/neoforge.mods.toml") {
+            expand("version" to project.version)
+        }
+    }
+
+    remapJar {
+        inputFile.set(shadowJar.get().archiveFile)
+        archiveFileName.set("[neoforge-1.21.6]AllMusic-${project.version}.jar")
+        destinationDirectory.set(file("${parent!!.projectDir}/../build"))
+    }
+
+    build {
+        dependsOn(remapJar)
+    }
+}

onejar/neoforge_1_21_6/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

onejar/neoforge_1_21_6/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,59 @@
+modLoader = "javafml"
+loaderVersion = "[2,)"
+license = "GPL-3.0"
+issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues/"
+
+[[mods]]
+modId = "allmusic"
+version = "${version}"
+displayName = "AllMusic"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Mod'''
+
+[[mods]]
+modId = "allmusic_client"
+version = "${version}"
+displayName = "AllMusic Client"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Client Mod'''
+
+[[mods]]
+modId = "allmusic_server"
+version = "${version}"
+displayName = "AllMusic Server"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Server Mod'''
+
+[[dependencies.allmusic_client]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21.6.20-beta,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.allmusic_client]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21.6,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.allmusic_server]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21.6.20-beta,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.allmusic_server]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21.6,)"
+ordering = "NONE"
+side = "BOTH"

onejar/neoforge_26_1/build.gradle.kts

@@ -0,0 +1,65 @@
+plugins {
+    id("dev.architectury.loom-no-remap") version Versions.architecturyLoom
+//    id("architectury-plugin") version "3.5-SNAPSHOT"
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_25
+java.targetCompatibility = JavaVersion.VERSION_25
+
+// 直接引用 client 和 server 模块的源码目录，无需手动复制
+val clientSourceDir = project(":client:neoforge_26_1").projectDir.resolve("src/main/java/com/coloryr/allmusic/client")
+val serverSourceDir = project(":server:neoforge_26_1").projectDir.resolve("src/main/java/com/coloryr/allmusic/server")
+val commSourceDir = project(":server:neoforge_26_1").projectDir.resolve("src/main/java/com/coloryr/allmusic/comm")
+val clientResDir = project(":client:neoforge_26_1").projectDir.resolve("src/main/resources")
+
+sourceSets {
+    main {
+        java {
+            setSrcDirs(listOf(clientSourceDir, serverSourceDir, commSourceDir))
+        }
+        resources {
+            setSrcDirs(listOf(
+                file("src/main/resources"),  // onejar 自己的合并资源（fabric.mod.json）
+                clientResDir,
+            ))
+        }
+    }
+}
+
+//architectury {
+//  platformSetupLoomIde()
+//  neoForge()
+//}
+
+repositories {
+    maven("https://maven.neoforged.net/releases/")
+}
+
+dependencies {
+    minecraft("com.mojang:minecraft:26.1")
+    neoForge("net.neoforged:neoforge:26.1.0.19-beta")
+
+    compileOnly("icyllis.modernui:ModernUI-NeoForge:26.1.2-3.13.0.4")
+    compileOnly("de.maxhenkel.voicechat:voicechat-api:2.6.0")
+
+    implementation(include("net.kyori:adventure-platform-neoforge:6.9.0")!!)
+}
+
+tasks {
+    processResources {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+        filesMatching("META-INF/neoforge.mods.toml") {
+            expand("version" to project.version)
+        }
+    }
+
+    shadowJar {
+        archiveFileName.set("[neoforge-26.1]AllMusic-${project.version}.jar")
+        destinationDirectory.set(file("${parent!!.projectDir}/../build"))
+    }
+
+    build {
+        dependsOn(shadowJar)
+    }
+}

onejar/neoforge_26_1/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

onejar/neoforge_26_1/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,71 @@
+modLoader = "javafml"
+loaderVersion = "[2,)"
+license = "GPL-3.0"
+issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues/"
+
+[[mods]]
+modId = "allmusic"
+version = "${version}"
+displayName = "AllMusic"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Mod'''
+
+[[mods]]
+modId = "allmusic_client"
+version = "${version}"
+displayName = "AllMusic Client"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Client Mod'''
+
+[[mods]]
+modId = "allmusic_server"
+version = "${version}"
+displayName = "AllMusic Server"
+displayURL = "https://github.com/Coloryr/AllMusic/"
+logoFile = "icon.png"
+authors = "Color_yr"
+description = '''AllMusic Server Mod'''
+
+[[dependencies.allmusic_client]]
+modId = "neoforge"
+type = "required"
+versionRange = "[26.1.0.19-beta,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.allmusic_client]]
+modId = "minecraft"
+type = "required"
+versionRange = "[26.1,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.allmusic_client]]
+modId="modernui"
+type="optional"
+ordering="AFTER"
+side="CLIENT"
+
+[[dependencies.allmusic_client]]
+modId="voicechat_api"
+type="optional"
+ordering="AFTER"
+side="CLIENT"
+
+[[dependencies.allmusic_server]]
+modId = "neoforge"
+type = "required"
+versionRange = "[26.1.0.19-beta,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.allmusic_server]]
+modId = "minecraft"
+type = "required"
+versionRange = "[26.1,)"
+ordering = "NONE"
+side = "BOTH"

server/neoforge_1_21/build.gradle.kts

@@ -20,9 +20,9 @@ dependencies {
     mappings(loom.officialMojangMappings())
     neoForge("net.neoforged:neoforge:21.0.167")
 
-    modImplementation("net.kyori:adventure-platform-neoforge:6.8.0")
+    modImplementation("net.kyori:adventure-platform-neoforge:6.0.1")
 
-    implementation(include("net.kyori:adventure-platform-neoforge:6.0.0")!!)
+    implementation(include("net.kyori:adventure-platform-neoforge:6.0.1")!!)
 }
 
 tasks {

server/neoforge_1_21/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java

@@ -6,7 +6,6 @@ import com.mojang.brigadier.CommandDispatcher;
 import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
-import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -19,7 +18,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
-@EventBusSubscriber(modid = "allmusic_server", value = Dist.DEDICATED_SERVER, bus = EventBusSubscriber.Bus.MOD)
+@EventBusSubscriber(modid = "allmusic_server", bus = EventBusSubscriber.Bus.MOD)
 public class AllMusicServer {
     public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server");
     public static MinecraftServer server;
@@ -32,7 +31,7 @@ public class AllMusicServer {
         AllMusic.side = new SideNeoForge();
     }
 
-    @EventBusSubscriber(modid = "allmusic_server", value = Dist.DEDICATED_SERVER)
+    @EventBusSubscriber(modid = "allmusic_server")
     public static class MusicEvent {
         @SubscribeEvent
         public static void onRegisterCommands(RegisterCommandsEvent event) {

server/neoforge_1_21/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues/"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Server"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Server Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_server"

server/neoforge_1_21_11/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java

@@ -34,28 +34,22 @@ public class AllMusicServer {
 
     @SubscribeEvent
     public static void onRegisterCommands(RegisterCommandsEvent event) {
-        if (event.getCommandSelection() != Commands.CommandSelection.INTEGRATED) {
-            CommandDispatcher<CommandSourceStack> dispatcher = event.getDispatcher();
-            CommandNeoForge.instance.register(dispatcher);
-        }
+        CommandDispatcher<CommandSourceStack> dispatcher = event.getDispatcher();
+        CommandNeoForge.instance.register(dispatcher);
     }
 
     @SubscribeEvent
     public static void onServerStarting(ServerStartedEvent event) {
-        if (event.getServer().isDedicatedServer()) {
-            audiences = MinecraftServerAudiences.of(event.getServer());
-            server = event.getServer();
-            AllMusic.init(new File(AllMusic.SERVER_DIR));
-            AllMusic.start();
-            Tasks.init();
-        }
+        audiences = MinecraftServerAudiences.of(event.getServer());
+        server = event.getServer();
+        AllMusic.init(new File(AllMusic.SERVER_DIR));
+        AllMusic.start();
+        Tasks.init();
     }
 
     @SubscribeEvent
     public static void onServerStopping(ServerStoppingEvent event) {
-        if (event.getServer().isDedicatedServer()) {
-            AllMusic.stop();
-        }
+        AllMusic.stop();
     }
 
     @SubscribeEvent

server/neoforge_1_21_11/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Server"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Server Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_server"

server/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/comm/AllMusicInit.java

@@ -16,8 +16,6 @@ public class AllMusicInit implements IPayloadHandler<MusicCodec> {
 
     public AllMusicInit(IEventBus modEventBus, ModContainer modContainer) {
         modEventBus.addListener(this::register);
-
-
     }
 
     public void register(final RegisterPayloadHandlersEvent event) {

server/neoforge_1_21_6/src/main/java/com/coloryr/allmusic/server/AllMusicServer.java

@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
-@EventBusSubscriber(modid = "allmusic_server", value = Dist.DEDICATED_SERVER)
+@EventBusSubscriber(modid = "allmusic_server")
 public class AllMusicServer {
 
     public static final Logger LOGGER = LoggerFactory.getLogger("AllMusic Server");
@@ -35,28 +35,22 @@ public class AllMusicServer {
 
     @SubscribeEvent
     public static void onRegisterCommands(RegisterCommandsEvent event) {
-        if (event.getCommandSelection() != Commands.CommandSelection.INTEGRATED) {
-            CommandDispatcher<CommandSourceStack> dispatcher = event.getDispatcher();
-            CommandNeoForge.instance.register(dispatcher);
-        }
+        CommandDispatcher<CommandSourceStack> dispatcher = event.getDispatcher();
+        CommandNeoForge.instance.register(dispatcher);
     }
 
     @SubscribeEvent
     public static void onServerStarting(ServerStartedEvent event) {
-        if (event.getServer().isDedicatedServer()) {
-            audiences = MinecraftServerAudiences.of(event.getServer());
-            server = event.getServer();
-            AllMusic.init(new File(AllMusic.SERVER_DIR));
-            AllMusic.start();
-            Tasks.init();
-        }
+        audiences = MinecraftServerAudiences.of(event.getServer());
+        server = event.getServer();
+        AllMusic.init(new File(AllMusic.SERVER_DIR));
+        AllMusic.start();
+        Tasks.init();
     }
 
     @SubscribeEvent
     public static void onServerStopping(ServerStoppingEvent event) {
-        if (event.getServer().isDedicatedServer()) {
-            AllMusic.stop();
-        }
+        AllMusic.stop();
     }
 
     @SubscribeEvent

server/neoforge_1_21_6/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Server"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Server Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_server"

server/neoforge_26_1/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Server"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Server Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_server"

server/neoforge_26_2/src/main/resources/META-INF/neoforge.mods.toml

@@ -6,11 +6,11 @@ issueTrackerURL = "https://github.com/Coloryr/AllMusic/issues"
 [[mods]]
 modId = "allmusic"
 version = "${version}"
-displayName = "AllMusic Server"
+displayName = "AllMusic"
 displayURL = "https://github.com/Coloryr/AllMusic/"
 logoFile = "icon.png"
 authors = "Color_yr"
-description = '''AllMusic Server Mod'''
+description = '''AllMusic Mod'''
 
 [[mods]]
 modId = "allmusic_server"

settings.gradle.kts

@@ -64,6 +64,10 @@ include(":onejar:fabric_1_21_6")
 include(":onejar:fabric_1_21_11")
 include(":onejar:fabric_26_1")
 include(":onejar:fabric_26_2")
+include(":onejar:neoforge_1_21")
+include(":onejar:neoforge_1_21_6")
+include(":onejar:neoforge_1_21_11")
+include(":onejar:neoforge_26_1")
 
 pluginManagement {
     repositories {