Skip to content

Commit 6f735d7

Browse files
committed
chore: update to 1.21.10
1 parent e1639b4 commit 6f735d7

File tree

3 files changed

+21
-28
lines changed

3 files changed

+21
-28
lines changed

.github/workflows/gradle.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
with:
3333
name: build-artifacts
3434
path: build/libs
35-
- uses: "marvinpinto/action-automatic-releases@latest"
35+
- uses: softprops/action-gh-release@v2
3636
with:
37-
repo_token: "${{ secrets.GITHUB_TOKEN }}"
38-
automatic_release_tag: "latest-1.21.8"
37+
token: "${{ secrets.GITHUB_TOKEN }}"
38+
tag_name: "latest-1.21.10"
3939
prerelease: false
40-
title: "1.21.8 Build"
40+
name: "1.21.10 Build"
4141
files: |
4242
./build/libs/*.jar

build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ repositories {
1313
}
1414

1515
// https://fabricmc.net/develop
16-
val game = "1.21.8" // Note: remember to update ServerFinderScreen with the new game version
16+
val game = "1.21.10" // Note: remember to update ServerFinderScreen with the new game version
1717

1818
dependencies {
1919
minecraft("com.mojang:minecraft:$game")
20-
mappings("net.fabricmc:yarn:$game+build.1:v2")
21-
modImplementation("net.fabricmc:fabric-loader:0.17.2")
20+
mappings("net.fabricmc:yarn:$game+build.2:v2")
21+
modImplementation("net.fabricmc:fabric-loader:0.17.3")
2222

23-
modImplementation("net.fabricmc.fabric-api:fabric-api:0.131.0+$game")
23+
modImplementation("net.fabricmc.fabric-api:fabric-api:0.136.0+$game")
2424

2525
modImplementation("meteordevelopment:meteor-client:$game-SNAPSHOT")
26-
modImplementation("com.terraformersmc:modmenu:15.0.0-beta.3")
26+
modImplementation("com.terraformersmc:modmenu:16.0.0-rc.1")
2727

28-
include(modImplementation("io.gitlab.jfronny:google-chat:0.10.1")!!)
29-
val libjfVersion = "3.19.2"
28+
include(modImplementation("io.gitlab.jfronny:google-chat:0.10.4")!!)
29+
val libjfVersion = "3.19.4"
3030
include(modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:$libjfVersion")!!)
3131
include(modImplementation("io.gitlab.jfronny.libjf:libjf-translate-v1:$libjfVersion")!!)
3232
include("io.gitlab.jfronny.libjf:libjf-base:$libjfVersion")

src/main/java/io/gitlab/jfronny/meteoradditions/util/ShimUi.java

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -121,44 +121,37 @@ private void generate(Screen self) throws IllegalAccessException {
121121
private void entry(EntryInfo<?> entry, Naming.Entry naming) throws IllegalAccessException {
122122
if (enabledText.equals(naming.name())) return;
123123
Type type = entry.getValueType();
124-
WWidget widget = null;
125-
if (type.isInt()) {
126-
widget = add((EntryInfo<Integer>) entry, naming,
124+
switch (type) {
125+
case Type.TInt _0 -> add((EntryInfo<Integer>) entry, naming,
127126
theme.intEdit((int) entry.getValue(), (int) entry.getMinValue(), (int) entry.getMaxValue(), false),
128127
(s, r) -> s.action = r,
129128
WIntEdit::get,
130129
WIntEdit::set);
131-
} else if (type.isLong()) {
132-
// Unsupported
133-
} else if (type.isFloat()) {
134-
widget = add((EntryInfo<Float>) entry, naming,
130+
case Type.TLong _0 -> table.add(theme.label(entry.getName() + " (unsupported: long)"));
131+
case Type.TFloat _0 -> add((EntryInfo<Float>) entry, naming,
135132
theme.doubleEdit((float) entry.getValue(), entry.getMinValue(), entry.getMaxValue()),
136133
(s, r) -> s.action = r,
137134
s -> (float) s.get(),
138135
(s, v) -> s.set(v));
139-
} else if (type.isDouble()) {
140-
widget = add((EntryInfo<Double>) entry, naming,
136+
case Type.TDouble _0 -> add((EntryInfo<Double>) entry, naming,
141137
theme.doubleEdit((double) entry.getValue(), entry.getMinValue(), entry.getMaxValue()),
142138
(s, r) -> s.action = r,
143139
WDoubleEdit::get,
144140
WDoubleEdit::set);
145-
} else if (type.isString()) {
146-
widget = add((EntryInfo<String>) entry, naming,
141+
case Type.TString _0 -> add((EntryInfo<String>) entry, naming,
147142
theme.textBox(Objects.requireNonNullElse((String) entry.getValue(), "")),
148143
(s, r) -> s.action = r,
149144
WTextBox::get,
150145
WTextBox::set);
151-
} else if (type.isBool()) {
152-
widget = add((EntryInfo<Boolean>) entry, naming,
146+
case Type.TBool _0 -> add((EntryInfo<Boolean>) entry, naming,
153147
theme.checkbox((boolean) entry.getValue()),
154148
(s, r) -> s.action = r,
155149
s -> s.checked,
156150
(s, v) -> s.checked = v);
157-
} else if (type.isEnum()) {
158-
widget = tEnum(entry, naming, type.asEnum());
151+
//noinspection rawtypes
152+
case Type.TEnum tEnum -> tEnum(entry, naming, tEnum);
153+
case Type.TUnknown _0 -> table.add(theme.label(entry.getName() + " (unsupported: unknown)"));
159154
}
160-
161-
if (widget == null) table.add(theme.label(entry.getName() + " (unsupported)"));
162155
table.row();
163156
}
164157

0 commit comments

Comments
 (0)