Merge branch 'feature-multi' into nyan-work/dev

README.md

@@ -269,7 +269,7 @@ set xaero world name to sync word id to xaerominimap, "#none" is disable.
 
 ### Support
 
-Current main development for Minecraft version: 1.20
+Current main development for Minecraft version: 1.20.1
 
 And use `preprocess` to be compatible with all versions.
 
@@ -283,7 +283,7 @@ And use `preprocess` to be compatible with all versions.
 - Minecraft 1.19.2
 - Minecraft 1.19.3
 - Minecraft 1.19.4
-- Minecraft 1.20
+- Minecraft 1.20.1
 
 ### Mappings
 

README_ZH_CN.md

@@ -14,7 +14,7 @@
 
 这是一个 [Carpet mod](https://github.com/gnembon/fabric-carpet) (fabric-carpet) 的扩展 mod，包含了不少~~NotVanilla的~~有意思的功能以及特性。
 
-管理命令: `/carpet-tctc-addition`
+管理命令: `/pca`
 
 ## 依赖
 
@@ -269,7 +269,7 @@ EVERYONE：所有人的数据都可以被同步。
 
 ### 支持
 
-当前主开发版本：1.20
+当前主开发版本：1.20.1
 
 并且使用 `预处理` 来兼容各版本。
 
@@ -283,7 +283,7 @@ EVERYONE：所有人的数据都可以被同步。
 - Minecraft 1.19.2
 - Minecraft 1.19.3
 - Minecraft 1.19.4
-- Minecraft 1.20
+- Minecraft 1.20.1
 
 ### 混淆映射表
 

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id("maven-publish")
-    id("fabric-loom").version("1.2-SNAPSHOT").apply(false)
+    id("fabric-loom").version("1.3-SNAPSHOT").apply(false)
     // https://github.com/Juuxel/LoomQuiltflower
     id("io.github.juuxel.loom-quiltflower").version("1.10.0").apply(false)
     id("net.kyori.blossom").version("1.3.1").apply(false)
@@ -16,8 +16,8 @@ preprocess {
     def mc1182 = createNode("1.18.2", 1_18_02, "mojang")
     def mc1192 = createNode("1.19.2", 1_19_02, "mojang")
     def mc1193 = createNode("1.19.3", 1_19_03, "mojang")
-    def mc1194 = createNode("1.19.4", 1_19_04, "mojang") // root
-    def mc1200 = createNode("1.20"  , 1_20_00, "mojang")
+    def mc1194 = createNode("1.19.4", 1_19_04, "mojang")
+    def mc1201 = createNode("1.20.1", 1_20_01, "mojang")
 
     mc1144.link(mc1152, null)
     mc1152.link(mc1165, null)
@@ -26,7 +26,7 @@ preprocess {
     mc1182.link(mc1192, file("versions/mapping-1.18.2-1.19.2.txt"))
     mc1192.link(mc1193, null)
     mc1193.link(mc1194, null)
-    mc1194.link(mc1200, null)
+    mc1194.link(mc1201, null)
 }
 
 ext {

common.gradle

@@ -50,20 +50,21 @@ dependencies {
     annotationProcessor("org.projectlombok:lombok:${project.lombok_version}")
 
     // Dependency
-    modImplementation("top.hendrixshen:magiclib-${project.minecraft_version.replace(".", "_")}:${project.magiclib_version}") {
+    modImplementation("top.hendrixshen.magiclib:magiclib-${project.minecraft_version.replace(".", "_")}:${project.magiclib_version}") {
         exclude(group: "curse.maven", module: "malilib-303119")
     }
 
     // Misc
     runtimeOnly(project(path: ":fabricWrapper"))
 }
 
-archivesBaseName("${project.mod_archives_base_name}-${project.minecraft_version}")
 group(project.mod_maven_group)
-sourceCompatibility(JavaVersion.VERSION_1_8)
-targetCompatibility(JavaVersion.VERSION_1_8)
 version(project.parent.version)
 
+base {
+    archivesBaseName("${project.mod_archives_base_name}-${project.minecraft_version}")
+}
+
 loom {
     interfaceInjection {
         enableDependencyInterfaceInjection.set(true)
@@ -190,6 +191,8 @@ blossom {
 }
 
 java {
+    sourceCompatibility(JavaVersion.VERSION_1_8)
+    targetCompatibility(JavaVersion.VERSION_1_8)
     withSourcesJar()
 }
 

fabricWrapper/build.gradle

@@ -5,12 +5,13 @@ plugins {
     id("maven-publish")
 }
 
-archivesBaseName("${project.mod_archives_base_name}")
 group(project.mod_maven_group)
-sourceCompatibility(JavaVersion.VERSION_1_8)
-targetCompatibility(JavaVersion.VERSION_1_8)
 version(project.parent.version)
 
+base {
+    archivesBaseName("${project.mod_archives_base_name}-all")
+}
+
 def fabric_subprojects = project.parent.subprojects.findAll({
     it.name != "fabricWrapper"
 })
@@ -48,9 +49,11 @@ jar {
 processResources {
     // disable cache
     outputs.upToDateWhen { false }
-    var jars = []
+    ArrayList<?> mc_condition = []
+    ArrayList<?> jars = []
 
     fabric_subprojects.each({
+        mc_condition.add("${it.minecraft_dependency}")
         jars.add(["file": "META-INF/jars/${project.mod_archives_base_name}-${it.minecraft_version}-${project.version}.jar"])
     })
 
@@ -60,19 +63,25 @@ processResources {
 
     filesMatching("fabric.mod.json") {
         expand([
-                "magiclib_dependency": project.magiclib_dependency,
-                "mod_description"    : project.mod_description,
-                "mod_homepage"       : project.mod_homepage,
-                "mod_id"             : project.mod_id,
-                "mod_license"        : project.mod_license,
-                "mod_name"           : project.mod_name,
-                "mod_version"        : project.version,
-                "mod_sources"        : project.mod_sources,
-                "sub_jars"           : new JsonBuilder(jars).toPrettyString(),
+                "minecraft_dependency": new JsonBuilder(mc_condition),
+                "magiclib_dependency" : project.magiclib_dependency,
+                "mod_description"     : project.mod_description,
+                "mod_homepage"        : project.mod_homepage,
+                "mod_id"              : project.mod_id,
+                "mod_license"         : project.mod_license,
+                "mod_name"            : project.mod_name,
+                "mod_version"         : project.version,
+                "mod_sources"         : project.mod_sources,
+                "sub_jars"            : new JsonBuilder(jars).toPrettyString(),
         ])
     }
 }
 
+java {
+    sourceCompatibility(JavaVersion.VERSION_1_8)
+    targetCompatibility(JavaVersion.VERSION_1_8)
+}
+
 publishing {
     publications {
         create("mavenJava", MavenPublication) {

fabricWrapper/src/main/resources/fabric.mod.json

@@ -22,7 +22,8 @@
   "environment": "*",
   "depends": {
     "carpet": "*",
-    "magiclib": ">=${magiclib_dependency}"
+    "magiclib": ">=${magiclib_dependency}",
+    "minecraft": ${minecraft_dependency}
   },
   "jars": ${sub_jars}
 }

gradle.properties

@@ -15,9 +15,9 @@ mod_sources=https://github.com/plusls/plusls-carpet-addition
 mod_version=0.3
 
 # Required Libraries
-# MagicLib - 0.7.336
-magiclib_dependency=0.7.336
-magiclib_version=0.7.336
+# MagicLib - 0.7.345
+magiclib_dependency=0.7.345
+magiclib_version=0.7.345
 
 # Annotation processor
 lombok_version=1.18.28

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

settings.gradle

@@ -36,7 +36,7 @@ def versions = Arrays.asList(
         "1.19.2",
         "1.19.3",
         "1.19.4",
-        "1.20",
+        "1.20.1",
 )
 
 for (String version : versions) {

versions/1.20.1/gradle.properties

@@ -0,0 +1,3 @@
+# Development Environment
+minecraft_version=1.20.1
+minecraft_dependency=1.20.x

versions/mainProject

@@ -1 +1 @@
-1.20
+1.20.1