Skip to content

Commit 067b8f5

Browse files
committed
feat!: Support MC 1.20.1 & Drop support for MC 1.20
- Also update README Signed-off-by: MSDNicrosoft <wang3311835119@hotmail.com>
1 parent 52c580c commit 067b8f5

8 files changed

Lines changed: 81 additions & 68 deletions

File tree

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ Create buttons for preset chat messages, commands like `/warp home`, or anything
2828

2929
For your convenience, download links are listed below:
3030

31-
| Minecraft Version | Fabric API | LibGui (**Please use the given version**) |
32-
|-------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------|
33-
| 1.16.5 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.16.5) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.16.5) | 3.4.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/3.4.0) |
34-
| 1.17.1 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.17.1) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.17.1) | 4.2.3 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/4.2.3) |
35-
| 1.18.2 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.18.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.18.2) | 5.4.2 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/5.4.2) |
36-
| 1.19.2 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.2) | 6.4.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.4.0) |
37-
| 1.19.3 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.3) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.3) | 6.5.3 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.5.3) |
38-
| 1.19.4 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.4) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.4) | 7.1.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/7.1.0) |
39-
| 1.20 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.20) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.20) | 8.0.0-beta.1 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/8.0.0-beta.1) |
31+
| Minecraft Version | Fabric API | LibGui (**Please use the given version**) |
32+
|-------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------|
33+
| 1.16.5 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.16.5) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.16.5) | 3.4.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/3.4.0) |
34+
| 1.17.1 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.17.1) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.17.1) | 4.2.3 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/4.2.3) |
35+
| 1.18.2 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.18.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.18.2) | 5.4.2 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/5.4.2) |
36+
| 1.19.2 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.2) | 6.4.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.4.0) |
37+
| 1.19.3 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.3) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.3) | 6.5.3 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.5.3) |
38+
| 1.19.4 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.4) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.4) | 7.1.1 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/7.1.1) |
39+
| 1.20.1 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.20.1) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.20.1) | 8.0.1 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/8.0.1) |
4040

4141
## Features
4242

@@ -64,7 +64,7 @@ commands into the JSON as new buttons are created, and loads the JSON at the nex
6464

6565
## Support
6666

67-
Current main development for Minecraft version: `1.20`
67+
Current main development for Minecraft version: `1.20.1`
6868

6969
And use `preprocess` to be compatible with the following versions.
7070

@@ -78,7 +78,7 @@ And use `preprocess` to be compatible with the following versions.
7878
- Minecraft `1.19.2`
7979
- Minecraft `1.19.3`
8080
- Minecraft `1.19.4`
81-
- Minecraft `1.20`
81+
- Minecraft `1.20.1`
8282

8383
### Mappings
8484

README_ZH_CN.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ Command GUI Buttons 是 Minecraft 的 Fabric 模组,允许用户在其客户
2828

2929
为了方便,下方已列出下载链接:
3030

31-
| Minecraft 版本 | Fabric API | LibGui (**请使用给定的版本**) |
32-
|--------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------|
33-
| 1.16.5 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.16.5) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.16.5) | 3.4.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/3.4.0) |
34-
| 1.17.1 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.17.1) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.17.1) | 4.2.3 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/4.2.3) |
35-
| 1.18.2 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.18.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.18.2) | 5.4.2 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/5.4.2) |
36-
| 1.19.2 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.2) | 6.4.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.4.0) |
37-
| 1.19.3 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.3) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.3) | 6.5.3 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.5.3) |
38-
| 1.19.4 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.4) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.4) | 7.1.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/7.1.0) |
39-
| 1.20 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.20) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.20) | 8.0.0-beta.1 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/8.0.0-beta.1) |
31+
| Minecraft 版本 | Fabric API | LibGui (**请使用给定的版本**) |
32+
|--------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------|
33+
| 1.16.5 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.16.5) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.16.5) | 3.4.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/3.4.0) |
34+
| 1.17.1 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.17.1) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.17.1) | 4.2.3 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/4.2.3) |
35+
| 1.18.2 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.18.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.18.2) | 5.4.2 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/5.4.2) |
36+
| 1.19.2 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.2) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.2) | 6.4.0 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.4.0) |
37+
| 1.19.3 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.3) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.3) | 6.5.3 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/6.5.3) |
38+
| 1.19.4 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.19.4) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.19.4) | 7.1.1 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/7.1.1) |
39+
| 1.20.1 | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files?version=1.20.1) \| [Modrinth](https://modrinth.com/mod/fabric-api/versions?g=1.20.1) | 8.0.1 [GitHub](https://github.com/CottonMC/LibGui/releases/tag/8.0.1) |
4040

4141
## 功能
4242

@@ -64,7 +64,7 @@ Command GUI Buttons 是 Minecraft 的 Fabric 模组,允许用户在其客户
6464

6565
### 支持
6666

67-
当前主开发版本: `1.20`
67+
当前主开发版本: `1.20.1`
6868

6969
并且使用 `预处理` 来兼容下列版本。
7070

@@ -78,7 +78,7 @@ Command GUI Buttons 是 Minecraft 的 Fabric 模组,允许用户在其客户
7878
- Minecraft `1.19.2`
7979
- Minecraft `1.19.3`
8080
- Minecraft `1.19.4`
81-
- Minecraft `1.20`
81+
- Minecraft `1.20.1`
8282

8383
### 混淆映射表
8484

build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
id("maven-publish")
32
id("fabric-loom").version("1.2-SNAPSHOT").apply(false)
43
id("com.replaymod.preprocess").version("SNAPSHOT")
54
id("org.ajoberstar.grgit").version("5.2.0")
@@ -13,14 +12,14 @@ preprocess {
1312
def mc1192 = createNode("1.19.2", 1_19_02, "mojang")
1413
def mc1193 = createNode("1.19.3", 1_19_03, "mojang")
1514
def mc1194 = createNode("1.19.4", 1_19_04, "mojang")
16-
def mc1200 = createNode("1.20", 1_20_00, "mojang")
15+
def mc1201 = createNode("1.20.1", 1_20_01, "mojang")
1716

1817
mc1165.link(mc1171, null)
1918
mc1171.link(mc1182, null)
2019
mc1182.link(mc1192, null)
2120
mc1192.link(mc1193, null)
2221
mc1193.link(mc1194, null)
23-
mc1200.link(mc1194, null)
22+
mc1201.link(mc1194, null)
2423
}
2524

2625
def ENV = System.getenv()

common.gradle

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@ apply(plugin: "fabric-loom")
22
apply(plugin: "com.replaymod.preprocess")
33
apply(plugin: "net.kyori.blossom")
44

5-
int mcVersion = 1
6-
7-
preprocess {
8-
mcVersion = vars.get()["MC"]
9-
tabIndentation = false
10-
}
11-
125
repositories {
136
maven {
147
name("CottonMC")
@@ -29,6 +22,19 @@ repositories {
2922
mavenLocal()
3023
}
3124

25+
int mcVersion = 1
26+
27+
preprocess {
28+
mcVersion = vars.get().get("MC")
29+
tabIndentation = false
30+
}
31+
32+
def runtimeDependencies = [
33+
// Module, Property prefix, Resolve condition, Transitive dependencies.
34+
["maven.modrinth:lazydfu", "lazydfu", mcVersion < 12000, false],
35+
["maven.modrinth:smoothboot-fabric", "smoothboot", mcVersion < 12000, false],
36+
]
37+
3238
dependencies {
3339
// Development environment
3440
minecraft("com.mojang:minecraft:${project.minecraft_version}")
@@ -45,8 +51,18 @@ dependencies {
4551
modApi("maven.modrinth:modmenu:${project.modmenu_version}")
4652

4753
// Make development client more comfortable.
48-
modRuntimeOnly("maven.modrinth:lazydfu:${project.lazydfu_version}")
49-
modRuntimeOnly("maven.modrinth:smoothboot-fabric:${project.smoothboot_version}")
54+
runtimeDependencies.forEach { item ->
55+
String dependencyNotation = item[0]
56+
String propertyPrefix = item[1]
57+
boolean shouldResolve = item[2]
58+
boolean shouldTransitive = item[3]
59+
60+
if (shouldResolve) {
61+
modRuntimeOnly("${dependencyNotation}:${project.property("${propertyPrefix}_version")}:") {
62+
transitive(shouldTransitive)
63+
}
64+
}
65+
}
5066

5167
runtimeOnly(project(path: ":fabricWrapper"))
5268
}
@@ -121,14 +137,14 @@ processResources {
121137

122138
filesMatching("fabric.mod.json") {
123139
expand([
124-
"minecraft_dependency" : project.minecraft_dependency,
125-
"minecraft_version_id" : project.minecraft_version.replace(".", "_"),
126-
"minecraft_version_out" : project.minecraft_out,
127-
"mod_id" : project.mod_id,
128-
"mod_name" : project.mod_name,
129-
"mod_license" : project.mod_license,
130-
"mod_sources" : project.mod_sources,
131-
"mod_version" : project.version,
140+
"minecraft_dependency" : project.minecraft_dependency,
141+
"minecraft_version_id" : project.minecraft_version.replace(".", "_"),
142+
"minecraft_version_out": project.minecraft_out,
143+
"mod_id" : project.mod_id,
144+
"mod_name" : project.mod_name,
145+
"mod_license" : project.mod_license,
146+
"mod_sources" : project.mod_sources,
147+
"mod_version" : project.version,
132148
])
133149
}
134150
}

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def versions = Arrays.asList(
2424
"1.19.2",
2525
"1.19.3",
2626
"1.19.4",
27-
"1.20"
27+
"1.20.1",
2828
)
2929

3030
for (String version : versions) {

versions/1.20.1/gradle.properties

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Independent branch configuration for MC 1.20.1
2+
# Development Environment
3+
minecraft_dependency=1.20.1
4+
minecraft_version=1.20.1
5+
minecraft_out=1.20.1
6+
7+
# Required Libraries
8+
# FabricAPI 0.84.0+1.20.1
9+
fabric_version=0.84.0+1.20.1
10+
11+
# LibGui 8.0.1+1.20
12+
libgui_version=8.0.1+1.20
13+
14+
# Runtime Libraries - Only for development environment
15+
# LazyDFU 0.1.3
16+
lazydfu_version=0.1.3
17+
18+
# Mod Menu - 7.1.0
19+
modmenu_version=7.1.0
20+
21+
# Smooth Boot - No longer needed since MC 1.19.4
22+
smoothboot_version=0

versions/1.20/gradle.properties

Lines changed: 0 additions & 24 deletions
This file was deleted.

versions/mainProject

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.20
1+
1.20.1

0 commit comments

Comments
 (0)