不再区分Active和Compat版本（由于目前来看一直是同步更新，因此似乎没有必要这么做）

build.gradle

@@ -4,18 +4,18 @@ plugins {
 }
 
 preprocess {
-	def mc1152 = createNode("compat_1.15.2", 1_15_02, "mojang")
-	def mc1165 = createNode("compat_1.16.5", 1_16_05, "mojang")
-	def mc1171 = createNode("compat_1.17.1", 1_17_01, "mojang")
-	def mc1182 = createNode("compat_1.18.2", 1_18_02, "mojang")
-	def mc1190 = createNode("compat_1.19"  , 1_19_00, "mojang")
-	def mc1192 = createNode("compat_1.19.2", 1_19_02, "mojang")
-	def mc1193 = createNode("compat_1.19.3", 1_19_03, "mojang")
+	def mc1152 = createNode("1.15.2", 1_15_02, "mojang")
+	def mc1165 = createNode("1.16.5", 1_16_05, "mojang")
+	def mc1171 = createNode("1.17.1", 1_17_01, "mojang")
+	def mc1182 = createNode("1.18.2", 1_18_02, "mojang")
+	def mc1190 = createNode("1.19"  , 1_19_00, "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")
 	def mc1201 = createNode("1.20.1", 1_20_01, "mojang")
 	def mc1202 = createNode("1.20.2", 1_20_02, "mojang")
 	def mc1204 = createNode("1.20.4", 1_20_04, "mojang")
-	def mc1211 = createNode("1.21.1"  , 1_21_01, "mojang")
+	def mc1211 = createNode("1.21.1", 1_21_01, "mojang")
 
 	mc1152.link(mc1165, file("versions/mapping-1.15.2-1.16.5.txt"))
 	mc1165.link(mc1171, null)

settings.gradle

@@ -24,13 +24,13 @@ pluginManagement {
 }
 
 def versions = Arrays.asList(
-		"compat_1.15.2",
-		"compat_1.16.5",
-		"compat_1.17.1",
-		"compat_1.18.2",
-		"compat_1.19"  ,
-		"compat_1.19.2",
-		"compat_1.19.3",
+		"1.15.2",
+		"1.16.5",
+		"1.17.1",
+		"1.18.2",
+		"1.19"  ,
+		"1.19.2",
+		"1.19.3",
 		"1.19.4",
 		"1.20.1",
 		"1.20.2",
@@ -45,12 +45,4 @@ for (String version : versions) {
 	proj.buildFileName = "../../common.gradle"
 }
 
-include(":active")
-def active = project(":active")
-active.name = "active"
-active.projectDir = file("wrapper/active")
-
-include(":compat")
-def compat = project(":compat")
-compat.name = "compat"
-compat.projectDir = file("wrapper/compat")
+include(":wrapper")

update/versions.json

@@ -15,6 +15,7 @@
 			]
 		},
 		{
+			"notes": "To be removed",
 			"version": "2.3.4-compat",
 			"changelog": "<https://github.com/Xujiayao/Discord-MC-Chat/releases/tag/2.3.4-compat>\n\n> DMCC Discord Server is now public! Join now through: https://discord.gg/kbXkV6k2XU\n> \n> DMCC will support the [Placeholder API](<https://placeholders.pb4.eu/>) in the next release.\n> \n> `botPlayingStatus` and `botListeningStatus` have been renamed to `botPlayingActivity` and `botListeningActivity`. Please modify them before restarting the server to avoid losing any existing changes.\n> \n> In addition, the check for updates feature has been fixed. You will be able to receive update notifications for future new versions when using version 2.3.4.",
 			"minecraft_dependency": [

wrapper/active/build.gradle → wrapper/build.gradle

@@ -15,10 +15,6 @@ base {
 	archivesName = archives_base_name
 }
 
-sourceSets {
-	main.resources.srcDir "../src/main/resources"
-}
-
 dependencies {
 	minecraft("com.mojang:minecraft:${minecraft_version}")
 	mappings(loom.officialMojangMappings())
@@ -46,7 +42,7 @@ dependencies {
 }
 
 def fabric_subprojects = parent.subprojects.findAll({
-	it.name != "active" && !it.name.contains("compat")
+	it.name != "wrapper"
 })
 
 remapJar {
@@ -70,15 +66,15 @@ remapJar {
 		}
 	}
 
-	from("../../LICENSE") {
+	from("../LICENSE") {
 		rename { "${it}_${archives_base_name}" }
 	}
 	from("build/tmp/versions")
 
 	doLast {
 		copy {
 			from "build/libs"
-			into "../../build"
+			into "../build"
 		}
 	}
 }