From cb6643a345d7a84f2d49e6bf1fa9a2840ba7e9bb Mon Sep 17 00:00:00 2001 From: Sascha Askani Date: Mon, 5 Jun 2017 16:08:26 +0200 Subject: [PATCH 1/3] Fix FORGEVERSION -> FORGE_VERSION, remove unneeded statement in default case --- minecraft-server/start-minecraft.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/minecraft-server/start-minecraft.sh b/minecraft-server/start-minecraft.sh index e1fa5402..d90931d3 100755 --- a/minecraft-server/start-minecraft.sh +++ b/minecraft-server/start-minecraft.sh @@ -133,7 +133,7 @@ function installForge { esac echo "Checking Forge version information." - case $FORGEVERSION in + case $FORGE_VERSION in RECOMMENDED) curl -fsSL -o /tmp/forge.json http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-recommended\"]") @@ -147,9 +147,7 @@ function installForge { fi ;; - *) - FORGE_VERSION=$FORGEVERSION - ;; + *) ;; esac normForgeVersion=$VANILLA_VERSION-$FORGE_VERSION-$norm From da9618c08b8413e477cbdfa3f1c9550dcaff2f54 Mon Sep 17 00:00:00 2001 From: Sascha Askani Date: Mon, 5 Jun 2017 16:09:26 +0200 Subject: [PATCH 2/3] add support for BIOMESOP level type --- minecraft-server/start-minecraft.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minecraft-server/start-minecraft.sh b/minecraft-server/start-minecraft.sh index d90931d3..e3919879 100755 --- a/minecraft-server/start-minecraft.sh +++ b/minecraft-server/start-minecraft.sh @@ -454,7 +454,7 @@ if [ ! -e server.properties ]; then echo "Setting level type to $LEVEL_TYPE" # check for valid values and only then set case $LEVEL_TYPE in - DEFAULT|FLAT|LARGEBIOMES|AMPLIFIED|CUSTOMIZED) + DEFAULT|FLAT|LARGEBIOMES|AMPLIFIED|CUSTOMIZED|BIOMESOP) sed -i "/level-type\s*=/ c level-type=$LEVEL_TYPE" /data/server.properties ;; *) From 0e0828f47fb617202875c8838c3d351bc8666885 Mon Sep 17 00:00:00 2001 From: Sascha Askani Date: Mon, 5 Jun 2017 16:08:26 +0200 Subject: [PATCH 3/3] Revert "Fix FORGEVERSION -> FORGE_VERSION, remove unneeded statement in default" This reverts commit cb6643a345d7a84f2d49e6bf1fa9a2840ba7e9bb. --- minecraft-server/start-minecraft.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/minecraft-server/start-minecraft.sh b/minecraft-server/start-minecraft.sh index 6907579b..30ab985e 100755 --- a/minecraft-server/start-minecraft.sh +++ b/minecraft-server/start-minecraft.sh @@ -133,7 +133,7 @@ function installForge { esac echo "Checking Forge version information." - case $FORGE_VERSION in + case $FORGEVERSION in RECOMMENDED) curl -fsSL -o /tmp/forge.json http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-recommended\"]") @@ -147,7 +147,9 @@ function installForge { fi ;; - *) ;; + *) + FORGE_VERSION=$FORGEVERSION + ;; esac normForgeVersion=$VANILLA_VERSION-$FORGE_VERSION-$norm