Skip to content

Commit a08ffdc

Browse files
committed
feat: Support MC 1.21.8
1 parent 42d3040 commit a08ffdc

11 files changed

Lines changed: 82 additions & 50 deletions

File tree

build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
plugins {
2-
id("fabric-loom").version("1.11-SNAPSHOT").apply(false)
3-
id("com.replaymod.preprocess").version("0a04a56")
4-
id("org.ajoberstar.grgit").version("5.3.2")
5-
id("top.hendrixshen.replace-token").version("1.1.3").apply(false)
2+
alias(libs.plugins.preprocessor)
3+
alias(libs.plugins.grgit)
64
}
75

86
preprocess {
@@ -16,7 +14,7 @@ preprocess {
1614
def mc1194 = createNode("1.19.4", 1_19_04, "mojang")
1715
def mc1206 = createNode("1.20.6", 1_20_06, "mojang")
1816
def mc1215 = createNode("1.21.5", 1_21_05, "mojang")
19-
def mc1217 = createNode("1.21.7", 1_21_07, "mojang")
17+
def mc1218 = createNode("1.21.8", 1_21_08, "mojang")
2018

2119
mc1165.link(mc1171, null)
2220
mc1171.link(mc1182, null)
@@ -25,7 +23,7 @@ preprocess {
2523
mc1193.link(mc1194, null)
2624
mc1194.link(mc1206, null)
2725
mc1206.link(mc1215, null)
28-
mc1215.link(mc1217, null)
26+
mc1215.link(mc1218, null)
2927
}
3028

3129
def ENV = System.getenv()

gradle.properties

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,3 @@ mod_sources=https://github.com/MSDNicrosoft/Command-GUI-Buttons
99
mod_version=2.3.1
1010
maven_group=work.msdnicrosoft.commandbuttons
1111
archives_base_name=CommandGUIButtons
12-
13-
# Annotation processor
14-
lombok_version=1.18.38
15-
16-
# Dependencies
17-
loader_version=0.16.14

gradle/libs.versions.toml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
[versions]
2+
# Gradle Plugins
3+
fabric-loom = "1.11-SNAPSHOT"
4+
preprocessor = "0a04a56"
5+
grgit = "5.3.2"
6+
yamlang = "1.5.0"
7+
replace-token = "1.1.3"
8+
9+
# modApi
10+
fabric-loader = "0.17.2"
11+
lombok = "1.18.38"
12+
13+
[plugins]
14+
fabric-loom = { id = "fabric-loom", version.ref = "fabric-loom" }
15+
preprocessor = { id = "com.replaymod.preprocess", version.ref = "preprocessor" }
16+
grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
17+
yamlang = { id = "me.fallenbreath.yamlang", version.ref = "yamlang" }
18+
replace-token = { id = "top.hendrixshen.replace-token", version.ref = "replace-token" }
19+
20+
[libraries]
21+
# modApi
22+
fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
23+
lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
24+
25+
# modRuntimeOnly Dependencies
26+
magiclib-core-fabric = { module = "top.hendrixshen.magiclib:magiclib-core-fabric", version = "0.8.158" }

settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"1.19.4",
99
"1.20.6",
1010
"1.21.5",
11-
"1.21.7"
11+
"1.21.8"
1212
]
1313
}

src/main/resources/assets/mgbuttons/lang/en_us.json

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
mgbuttons:
2+
gui:
3+
command: Command
4+
edit:
5+
name: Name
6+
type: Type command...
7+
type_with_index: Type command %d
8+
main:
9+
delete: Delete mode
10+
edit: Edit mode
11+
search: Search...
12+
key:
13+
category: Command GUI Buttons
14+
opengui: Open GUI

src/main/resources/assets/mgbuttons/lang/zh_cn.json

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
mgbuttons:
2+
gui:
3+
command: 命令
4+
edit:
5+
name: 名称
6+
type: 输入命令...
7+
type_with_index: 输入命令 %d
8+
main:
9+
delete: 删除模式
10+
edit: 编辑模式
11+
search: 搜索...
12+
key:
13+
category: Command GUI Buttons
14+
opengui: 打开 GUI

versions/1.16.5/build.gradle

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
apply(plugin: "fabric-loom")
2-
apply(plugin: "com.replaymod.preprocess")
3-
apply(plugin: "top.hendrixshen.replace-token")
1+
plugins {
2+
alias(libs.plugins.fabric.loom)
3+
alias(libs.plugins.preprocessor)
4+
alias(libs.plugins.yamlang)
5+
alias(libs.plugins.replace.token)
6+
}
47

58
repositories {
69
maven {
@@ -37,23 +40,23 @@ dependencies {
3740
// Development environment
3841
minecraft("com.mojang:minecraft:${project.minecraft_version}")
3942
mappings(loom.officialMojangMappings())
40-
modApi("net.fabricmc:fabric-loader:${project.loader_version}")
43+
modApi(libs.fabric.loader)
4144

4245
// Annotation processor
43-
modApi("org.projectlombok:lombok:${project.lombok_version}")
44-
annotationProcessor("org.projectlombok:lombok:${project.lombok_version}")
46+
modApi(libs.lombok)
47+
annotationProcessor(libs.lombok)
4548

46-
// Dependency
49+
// Dependencies
4750
modApi("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
4851
modApi("io.github.cottonmc:LibGui:${project.libgui_version}")
4952
modApi("maven.modrinth:modmenu:${project.modmenu_version}")
5053

5154
// Make development client more comfortable.
52-
modRuntimeOnly("top.hendrixshen.magiclib:magiclib-better-dev-${project.minecraft_version}${project.minecraft_version.size() == 4 ? ".0" : ""}-fabric:0.3.60-beta") {
55+
modRuntimeOnly("top.hendrixshen.magiclib:magiclib-better-dev-${project.minecraft_version}${project.minecraft_version.size() == 4 ? ".0" : ""}-fabric:0.3.63") {
5356
transitive = false
5457
}
5558

56-
modRuntimeOnly("top.hendrixshen.magiclib:magiclib-core-fabric:0.8.153") {
59+
modRuntimeOnly(libs.magiclib.core.fabric) {
5760
transitive = false
5861
}
5962

@@ -137,6 +140,11 @@ replaceToken {
137140
replaceIn("work/msdnicrosoft/commandbuttons/CommandButtonsReference")
138141
}
139142

143+
yamlang {
144+
targetSourceSets = [sourceSets.main]
145+
inputDir = 'assets/mgbuttons/lang'
146+
}
147+
140148
processResources {
141149
outputs.upToDateWhen { false }
142150

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Dependency Versions
2-
minecraft_dependency=>=1.21.6 <=1.21.7
3-
minecraft_version=1.21.7
4-
minecraft_out=1.21.6-7
2+
minecraft_dependency=>=1.21.6 <=1.21.8
3+
minecraft_version=1.21.8
4+
minecraft_out=1.21.6-8
55

66
# Required Libraries
7-
# FabricAPI 0.129.0+1.21.7
8-
fabric_version=0.129.0+1.21.7
7+
# FabricAPI 0.132.0+1.21.8
8+
fabric_version=0.132.0+1.21.8
99

1010
# LibGui 14.0.0+1.21.6
1111
libgui_version=14.0.0+1.21.6

0 commit comments

Comments
 (0)