Skip to content

Commit 1c45ace

Browse files
committed
Work on #12 and QOL Updates for 1.21.6
Found an edge case that could crash the game, but it shouldn't be possible to trigger, fixed anyway.
1 parent 6180d8f commit 1c45ace

8 files changed

Lines changed: 20 additions & 23 deletions

File tree

build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
plugins {
2-
id 'fabric-loom' version '1.10-SNAPSHOT'
2+
id 'fabric-loom' version "${loom_version}"
33
id 'maven-publish'
44
}
55

66
version = project.mod_version
77
group = project.maven_group
88

9-
base {
10-
archivesName = project.archivesBaseName
11-
}
12-
139
loom {
1410
runs {
1511
// This adds a new gradle task that runs the datagen API: "gradlew runDatagenClient"

gradle.properties

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
org.gradle.jvmargs=-Xmx1G
33
# Fabric Properties
44
# check these on https://fabricmc.net/develop
5-
minecraft_version=1.21.5
6-
yarn_mappings=1.21.5+build.1
7-
loader_version=0.16.14
5+
minecraft_version=1.21.6
6+
yarn_mappings=1.21.6+build.1
7+
loader_version=0.17.2
8+
loom_version=1.11-SNAPSHOT
89

910
#Fabric api
10-
fabric_version=0.121.0+1.21.5
11+
fabric_version=0.128.2+1.21.6
1112

1213
# Mod Properties
13-
mod_version=2.0.5
14+
mod_version=2.0.6
1415
maven_group=com.mosadie
15-
archives_base_name=servermainmenu-lib
16+
archivesBaseName=servermainmenu-lib
1617

1718
# Dependency Versions (easy to check on https://linkie.shedaniel.dev/dependencies)
18-
cloth_config_version=18.0.145
19-
mod_menu_version=14.0.0-rc.2
19+
cloth_config_version=19.0.147
20+
mod_menu_version=15.0.0

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/com/mosadie/servermainmenu/api/NormalTheme.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public String getId() {
1616

1717
@Override
1818
public Identifier getPanorama() {
19-
return Identifier.ofVanilla("textures/gui/title/background/panorama");
19+
return Identifier.of("minecraft", "textures/gui/title/background/panorama");
2020
}
2121

2222
@Override

src/main/java/com/mosadie/servermainmenu/api/Util.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ private static void leaveIfNeeded() {
132132
if (MinecraftClient.getInstance().world != null) {
133133
ServerMainMenuLibClient.LOGGER.info("Disconnecting from world...");
134134

135-
MinecraftClient.getInstance().world.disconnect();
136-
MinecraftClient.getInstance().disconnect();
135+
MinecraftClient.getInstance().world.disconnect(Text.translatable("menu.disconnect"));
136+
MinecraftClient.getInstance().disconnectWithProgressScreen();
137137
}
138138
}
139139
}

src/main/java/com/mosadie/servermainmenu/mixin/IdentifierMixin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
@Mixin(Identifier.class)
99
public class IdentifierMixin {
1010
// I'm sorry future self for this mixin. It's a complete hack, and will likely break at some point.
11+
// Future self here in September 2025. This has so far caused 1 bug report. (#12)
1112
/**
1213
* @author MoSadie
1314
* @reason Trying to get the panorama ID to resolve to a custom one instead, am tied of running into so many rendering issues so time for hacky solutions. Added in v2.0.5 when updating to Minecraft 1.21.5 because I could not get the previous system of overwriting the panorama renderer completely to work.

src/main/resources/fabric.mod.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
"servermainmenu-lib.mixins.json"
3131
],
3232
"depends": {
33-
"fabricloader": ">=0.16.10",
34-
"fabric-api": ">=0.119.5",
33+
"fabricloader": ">=0.17.2",
34+
"fabric-api": ">=0.128.2",
3535
"minecraft": "~1.21",
36-
"modmenu": ">=13.0.0",
37-
"cloth-config": ">=18.0.145"
36+
"modmenu": ">=15.0.0",
37+
"cloth-config": ">=19.0.147"
3838
},
3939
"custom": {
4040
"modmenu": {

0 commit comments

Comments
 (0)