freya/images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minecraft: mc forge fixes

Browse source
This commit is contained in:
Murphy 2025-05-12 17:02:06 -04:00
parent c25ea2d5c7
commit 769473c800
Signed by: freya
GPG key ID: 9FBC6FFD6D2DBF17
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
minecraft/mclauncher
View file

@ -207,7 +207,12 @@ download_step() {
install_step_forge() {
log "installing forge server"
jar_name="$(get_key "JAR_NAME")"
java -jar "$SERVER_DIR/$jar_name" --installServer
# check if library dir exists (if not... install)
library="$SERVER_DIR/libraries/net/minecraftforge/forge/$(get_key MC_VERSION)-$(get_key FORGE_VERSION)"
if [ ! -d "$library" ]; then
java -jar "$SERVER_DIR/$jar_name" --installServer
fi
binary_step_forge
if [ "$MCLAUNCHER_BINARY" = "" ]; then
@ -248,12 +253,24 @@ execute_step_default() {
}
execute_step_forge() {
# save jvm args
echo "$JVMARGS" | tr ' ' '\n' > "$SERVER_DIR/user_jvm_args.txt"
# check if a run script exists
if [ -f "$SERVER_DIR/run.sh" ]; then
echo "$JVMARGS" | tr ' ' '\n' > "$SERVER_DIR/user_jvm_args.txt"
{ chmod +x "$SERVER_DIR/run.sh" || true; }
exec "$SERVER_DIR/run.sh" nogui
# check if the forge library dir exists
library="$SERVER_DIR/libraries/net/minecraftforge/forge/$(get_key MC_VERSION)-$(get_key FORGE_VERSION)"
elif [ -d "$library" ]; then
exec java @user_jvm_args.txt "@$library/unix_args.txt"
# fallback to raw jar file
else
exec java $JVMARGS -jar "$SERVER_DIR/$MCLAUNCHER_BINARY" nogui
exec java @user_jvm_args.txt -jar "$SERVER_DIR/$MCLAUNCHER_BINARY" nogui
fi
}