up 26.1

Coloryr · Coloryr · commit df8d20b1263c · 2026-05-08T23:22:02.000+08:00
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -0,0 +1,4 @@
+object Versions {
+    const val fabricLoom = "1.16-SNAPSHOT"
+    const val architecturyLoom = "1.14-SNAPSHOT"
+}
diff --git a/client b/client
@@ -1 +1 @@
-Subproject commit 3b14dd91adc9ebf380e1c0cc2453905922edabab
+Subproject commit a6460e48dde4663c3c7b6dd6fb3a18948ab83b18
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+org.gradle.daemon=false
diff --git a/server/fabric_1_16_5/build.gradle.kts b/server/fabric_1_16_5/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.15-SNAPSHOT"
+    id("fabric-loom") version Versions.fabricLoom
 }
 
 dependencies {
diff --git a/server/fabric_1_20_1/build.gradle.kts b/server/fabric_1_20_1/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.15-SNAPSHOT"
+    id("fabric-loom") version Versions.fabricLoom
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_17
diff --git a/server/fabric_1_21/build.gradle.kts b/server/fabric_1_21/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.15-SNAPSHOT"
+    id("fabric-loom") version Versions.fabricLoom
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_21
diff --git a/server/fabric_1_21_11/build.gradle.kts b/server/fabric_1_21_11/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.15-SNAPSHOT"
+    id("fabric-loom") version Versions.fabricLoom
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_21
diff --git a/server/fabric_1_21_6/build.gradle.kts b/server/fabric_1_21_6/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.15-SNAPSHOT"
+    id("fabric-loom") version Versions.fabricLoom
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_21
diff --git a/server/fabric_26_1/build.gradle.kts b/server/fabric_26_1/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("net.fabricmc.fabric-loom") version "1.15-SNAPSHOT"
+    id("net.fabricmc.fabric-loom") version Versions.fabricLoom
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_25
diff --git a/server/forge_1_16_5/build.gradle.kts b/server/forge_1_16_5/build.gradle.kts
@@ -1,15 +1,15 @@
 plugins {
-    id("dev.architectury.loom") version "1.13-SNAPSHOT"
-    id("architectury-plugin") version "3.4-SNAPSHOT"
+    id("dev.architectury.loom") version Versions.architecturyLoom
+//    id("architectury-plugin") version "3.5-SNAPSHOT"
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_17
 java.targetCompatibility = JavaVersion.VERSION_17
 
-architectury {
-    platformSetupLoomIde()
-    forge()
-}
+//architectury {
+//    platformSetupLoomIde()
+//    forge()
+//}
 
 repositories {
     maven("https://maven.minecraftforge.net/")
diff --git a/server/forge_1_20_1/build.gradle.kts b/server/forge_1_20_1/build.gradle.kts
@@ -1,15 +1,15 @@
 plugins {
-    id("dev.architectury.loom") version "1.13-SNAPSHOT"
-    id("architectury-plugin") version "3.4-SNAPSHOT"
+    id("dev.architectury.loom") version Versions.architecturyLoom
+//    id("architectury-plugin") version "3.5-SNAPSHOT"
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_17
 java.targetCompatibility = JavaVersion.VERSION_17
 
-architectury {
-    platformSetupLoomIde()
-    forge()
-}
+//architectury {
+//    platformSetupLoomIde()
+//    forge()
+//}
 
 repositories {
     maven("https://maven.minecraftforge.net/")
diff --git a/server/neoforge_1_21/build.gradle.kts b/server/neoforge_1_21/build.gradle.kts
@@ -1,15 +1,15 @@
 plugins {
-    id("dev.architectury.loom") version "1.13-SNAPSHOT"
-    id("architectury-plugin") version "3.4-SNAPSHOT"
+    id("dev.architectury.loom") version Versions.architecturyLoom
+//    id("architectury-plugin") version "3.5-SNAPSHOT"
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_21
 java.targetCompatibility = JavaVersion.VERSION_21
 
-architectury {
-  platformSetupLoomIde()
-  neoForge()
-}
+//architectury {
+//  platformSetupLoomIde()
+//  neoForge()
+//}
 
 repositories {
     maven("https://maven.neoforged.net/releases/")
diff --git a/server/neoforge_1_21_11/build.gradle.kts b/server/neoforge_1_21_11/build.gradle.kts
@@ -1,15 +1,15 @@
 plugins {
-    id("dev.architectury.loom") version "1.13-SNAPSHOT"
-    id("architectury-plugin") version "3.4-SNAPSHOT"
+    id("dev.architectury.loom") version Versions.architecturyLoom
+//    id("architectury-plugin") version "3.5-SNAPSHOT"
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_21
 java.targetCompatibility = JavaVersion.VERSION_21
 
-architectury {
-  platformSetupLoomIde()
-  neoForge()
-}
+//architectury {
+//  platformSetupLoomIde()
+//  neoForge()
+//}
 
 repositories {
     maven("https://maven.neoforged.net/releases/")
diff --git a/server/neoforge_1_21_6/build.gradle.kts b/server/neoforge_1_21_6/build.gradle.kts
@@ -1,15 +1,15 @@
 plugins {
-    id("dev.architectury.loom") version "1.13-SNAPSHOT"
-    id("architectury-plugin") version "3.4-SNAPSHOT"
+    id("dev.architectury.loom") version Versions.architecturyLoom
+//    id("architectury-plugin") version "3.5-SNAPSHOT"
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_21
 java.targetCompatibility = JavaVersion.VERSION_21
 
-architectury {
-  platformSetupLoomIde()
-  neoForge()
-}
+//architectury {
+//  platformSetupLoomIde()
+//  neoForge()
+//}
 
 repositories {
     maven("https://maven.neoforged.net/releases/")
diff --git a/server/neoforge_26_1/build.gradle.kts b/server/neoforge_26_1/build.gradle.kts
@@ -1,15 +1,15 @@
 plugins {
-    id("dev.architectury.loom-no-remap") version "1.14-SNAPSHOT"
+    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
 
-architectury {
-  platformSetupLoomIde()
-  neoForge()
-}
+//architectury {
+//  platformSetupLoomIde()
+//  neoForge()
+//}
 
 repositories {
     maven("https://maven.neoforged.net/releases/")
@@ -19,14 +19,14 @@ dependencies {
     minecraft("com.mojang:minecraft:26.1")
     neoForge("net.neoforged:neoforge:26.1.0.19-beta")
 
-    modImplementation("net.kyori:adventure-platform-neoforge:6.9.0")
-
-    shadowImplementation("net.kyori:adventure-text-minimessage:4.26.1")
-    shadowImplementation("net.kyori:adventure-api:4.26.1")
-    shadowImplementation("net.kyori:adventure-text-serializer-gson:4.8.1")
-    shadowImplementation("net.kyori:adventure-text-serializer-legacy:4.8.1")
-    shadowImplementation("net.kyori:adventure-text-serializer-plain:4.8.1")
-    shadowImplementation("net.kyori:adventure-key:4.8.1")
+//    modImplementation("net.kyori:adventure-platform-neoforge:6.9.0")
+//
+//    shadowImplementation("net.kyori:adventure-text-minimessage:4.26.1")
+//    shadowImplementation("net.kyori:adventure-api:4.26.1")
+//    shadowImplementation("net.kyori:adventure-text-serializer-gson:4.8.1")
+//    shadowImplementation("net.kyori:adventure-text-serializer-legacy:4.8.1")
+//    shadowImplementation("net.kyori:adventure-text-serializer-plain:4.8.1")
+//    shadowImplementation("net.kyori:adventure-key:4.8.1")
 }
 
 tasks {
@@ -40,7 +40,7 @@ tasks {
         relocate("net.kyori", "com.coloryr.allmusic.libs.net.kyori")
         relocate("com.google.gson", "com.coloryr.allmusic.libs.com.google.gson")
 
-        inputFile.set(shadowJar.get().archiveFile)
+//        inputFile.set(shadowJar.get().archiveFile)
         archiveFileName.set("[neoforge-26.1]AllMusic_Server-${project.version}.jar")
         destinationDirectory.set(file("${parent!!.projectDir}/target"))
     }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`org.gradle.jvmargs=-Xmx3G`
`2`		`-org.gradle.daemon=false`
	`2`	`+org.gradle.daemon=false`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("fabric-loom") version "1.15-SNAPSHOT"`
	`2`	`+ id("fabric-loom") version Versions.fabricLoom`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("net.fabricmc.fabric-loom") version "1.15-SNAPSHOT"`
	`2`	`+ id("net.fabricmc.fabric-loom") version Versions.fabricLoom`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`java.sourceCompatibility = JavaVersion.VERSION_25`