Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
plugins {
id 'fabric-loom' version '1.10-SNAPSHOT'
id 'fabric-loom' version "${loom_version}"
id 'maven-publish'
}

version = project.mod_version
group = project.maven_group

base {
archivesName = project.archivesBaseName
}

loom {
runs {
// This adds a new gradle task that runs the datagen API: "gradlew runDatagenClient"
Expand Down
17 changes: 9 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.21.5
yarn_mappings=1.21.5+build.1
loader_version=0.16.14
minecraft_version=1.21.6
yarn_mappings=1.21.6+build.1
loader_version=0.17.2
loom_version=1.11-SNAPSHOT

#Fabric api
fabric_version=0.121.0+1.21.5
fabric_version=0.128.2+1.21.6

# Mod Properties
mod_version=2.0.5
mod_version=2.0.6
maven_group=com.mosadie
archives_base_name=servermainmenu-lib
archivesBaseName=servermainmenu-lib

# Dependency Versions (easy to check on https://linkie.shedaniel.dev/dependencies)
cloth_config_version=18.0.145
mod_menu_version=14.0.0-rc.2
cloth_config_version=19.0.147
mod_menu_version=15.0.0
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public String getId() {

@Override
public Identifier getPanorama() {
return Identifier.ofVanilla("textures/gui/title/background/panorama");
return Identifier.of("minecraft", "textures/gui/title/background/panorama");
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/mosadie/servermainmenu/api/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ private static void leaveIfNeeded() {
if (MinecraftClient.getInstance().world != null) {
ServerMainMenuLibClient.LOGGER.info("Disconnecting from world...");

MinecraftClient.getInstance().world.disconnect();
MinecraftClient.getInstance().disconnect();
MinecraftClient.getInstance().world.disconnect(Text.translatable("menu.disconnect"));
MinecraftClient.getInstance().disconnectWithProgressScreen();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@Mixin(Identifier.class)
public class IdentifierMixin {
// I'm sorry future self for this mixin. It's a complete hack, and will likely break at some point.
// Future self here in September 2025. This has so far caused 1 bug report. (#12)
/**
* @author MoSadie
* @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.
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"servermainmenu-lib.mixins.json"
],
"depends": {
"fabricloader": ">=0.16.10",
"fabric-api": ">=0.119.5",
"fabricloader": ">=0.17.2",
"fabric-api": ">=0.128.2",
"minecraft": "~1.21",
"modmenu": ">=13.0.0",
"cloth-config": ">=18.0.145"
"modmenu": ">=15.0.0",
"cloth-config": ">=19.0.147"
},
"custom": {
"modmenu": {
Expand Down