From 87b142218fd91fd2a6f5c8368c07bd43f6d161cf Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sat, 20 Aug 2016 15:31:32 +0200 Subject: [PATCH 1/7] Removed .sh file extension Equality.. --- Minecraft/{mcserver.sh => mcserver} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Minecraft/{mcserver.sh => mcserver} (100%) diff --git a/Minecraft/mcserver.sh b/Minecraft/mcserver similarity index 100% rename from Minecraft/mcserver.sh rename to Minecraft/mcserver From e27aa43a720a2989485f56bbbfc566ac05cc8643 Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sat, 20 Aug 2016 16:46:44 +0200 Subject: [PATCH 2/7] Fixed EULA installation --- lgsm/functions/install_minecraft_eula.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/install_minecraft_eula.sh b/lgsm/functions/install_minecraft_eula.sh index a95fe8e1d..410e283b4 100644 --- a/lgsm/functions/install_minecraft_eula.sh +++ b/lgsm/functions/install_minecraft_eula.sh @@ -11,6 +11,8 @@ sleep 1 echo "You are required to accept the EULA:" echo "https://account.mojang.com/documents/minecraft_eula" +echo "eula=false" > "${filesdir}/eula.txt" + if [ -z "${autoinstall}" ]; then echo "By continuing you are indicating your agreement to the EULA." echo "" @@ -28,4 +30,4 @@ echo "" sleep 5 fi -sed -i "s/\"eula=false\"/\"eula=true\"/g" serverfiles/eula.txt \ No newline at end of file +sed -i "s/eula=false/eula=true/g" "${filesdir}/eula.txt" \ No newline at end of file From f813c03ede2ecdf8aa959643b201ba05ccd1539f Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sat, 20 Aug 2016 17:19:06 +0200 Subject: [PATCH 3/7] Added default config --- Minecraft/cfg/lgsm-default.ini | 39 ++++++++++++++++++++++++++++++++ lgsm/functions/install_config.sh | 5 ++++ 2 files changed, 44 insertions(+) create mode 100644 Minecraft/cfg/lgsm-default.ini diff --git a/Minecraft/cfg/lgsm-default.ini b/Minecraft/cfg/lgsm-default.ini new file mode 100644 index 000000000..ea0f74b16 --- /dev/null +++ b/Minecraft/cfg/lgsm-default.ini @@ -0,0 +1,39 @@ +#Minecraft server properties (LGSM 210516) +#Sat Aug 20 15:59:43 CEST 2016 +generator-settings= +use-native-transport=true +op-permission-level=4 +allow-nether=true +level-name=world +enable-query=false +allow-flight=false +announce-player-achievements=true +server-port=25565 +max-world-size=29999984 +level-type=DEFAULT +enable-rcon=false +rcon.password= +rcon.port=25575 +level-seed= +force-gamemode=false +server-ip= +network-compression-threshold=256 +max-build-height=256 +spawn-npcs=true +white-list=false +spawn-animals=true +snooper-enabled=true +resource-pack-sha1= +online-mode=true +resource-pack= +pvp=true +difficulty=1 +enable-command-block=false +gamemode=0 +player-idle-timeout=0 +max-players=20 +max-tick-time=60000 +spawn-monsters=true +view-distance=10 +generate-structures=true +motd=A Minecraft Server \ No newline at end of file diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 90ebb2ff1..1ac2ffd31 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -301,6 +301,11 @@ elif [ "${gamename}" == "Left 4 Dead 2" ]; then wget -N /dev/null ${githuburl}/Left4Dead2/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq sleep 1 fn_sourceconfig +elif [ "${gamename}" == "Minecraft" ]; then + echo -e "downloading lgsm-default.ini...\c" + wget -N /dev/null ${githuburl}/Minecraft/cfg/lgsm-default.ini 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 + fn_defaultconfig elif [ "${gamename}" == "No More Room in Hell" ]; then echo -e "downloading lgsm-default.cfg...\c" wget -N /dev/null ${githuburl}/NoMoreRoomInHell/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq From acb9546bfd9f78999a36dbf1f7dcb5d735be4794 Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sat, 20 Aug 2016 17:20:36 +0200 Subject: [PATCH 4/7] Improved config details --- lgsm/functions/info_config.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/lgsm/functions/info_config.sh b/lgsm/functions/info_config.sh index f5c944a64..a80540a9a 100644 --- a/lgsm/functions/info_config.sh +++ b/lgsm/functions/info_config.sh @@ -10,7 +10,7 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))" ## Examples of filtering to get info from config files # sed 's/foo//g' - remove foo # tr -cd '[:digit:]' leave only digits -# tr -d '=\"; ' remove selected charectors =\"; +# tr -d '=\"; ' remove selected characters =\"; # grep -v "foo" filter out lines that contain foo unavailable="${red}UNAVAILABLE${default}" @@ -71,22 +71,31 @@ fn_info_config_dontstarve(){ fn_info_config_minecraft(){ if [ ! -f "${servercfgfullpath}" ]; then rconpassword="${unavailable}" + rconport="${zero}" slots="${zero}" port="${zero}" + gamemode="${zero}" + gameworld="${unavailable}" else # check if the ip exists in the config file. Failing this will fall back to the default. ipconfigcheck=$(grep "server-ip=" "${servercfgfullpath}" | sed 's/server-ip=//g') if [ -n "${ipconfigcheck}" ]; then ip="${ipconfigcheck}" fi - rconpassword=$(grep "rcon.password=" "${servercfgfullpath}" | sed 's/rcon.password=//g' | tr -d '\') + rconpassword=$(grep "rcon.password=" "${servercfgfullpath}" | sed 's/rcon.password=//g' | tr -d '=\"; ') + rconport=$(grep "rcon.port=" "${servercfgfullpath}" | tr -cd '[:digit:]') slots=$(grep "max-players=" "${servercfgfullpath}" | tr -cd '[:digit:]') port=$(grep "server-port=" "${servercfgfullpath}" | tr -cd '[:digit:]') + gamemode=$(grep "gamemode=" "${servercfgfullpath}" | tr -cd '[:digit:]') + gameworld=$(grep "level-name=" "${servercfgfullpath}" | sed 's/level-name=//g' | tr -d '=\"; ') # Not Set rconpassword=${rconpassword:-"NOT SET"} + rconport=${rconport:-"NOT SET"} slots=${slots:-"NOT SET"} port=${port:-"NOT SET"} + gamemode=${gamemode:-"NOT SET"} + gameworld=${gameworld:-"NOT SET"} fi } @@ -99,9 +108,9 @@ fn_info_config_projectzomboid(){ port="${zero}" gameworld="${unavailable}" else - servername=$(grep "PublicName=" "${servercfgfullpath}" | sed 's/PublicName=//g' | tr -d '\') - serverpassword=$(grep "^Password=$" "${servercfgfullpath}" | sed 's/Password=//g' | tr -d '\') - rconpassword=$(grep "RCONPassword=" "${servercfgfullpath}" | sed 's/RCONPassword=//g' | tr -d '\') + servername=$(grep "PublicName=" "${servercfgfullpath}" | sed 's/PublicName=//g' | tr -d '=\";\n') + serverpassword=$(grep "^Password=$" "${servercfgfullpath}" | sed 's/Password=//g' | tr -d '=\"; ') + rconpassword=$(grep "RCONPassword=" "${servercfgfullpath}" | sed 's/RCONPassword=//g' | tr -d '=\"; ') slots=$(grep "MaxPlayers=" "${servercfgfullpath}" | grep -v "#" | tr -cd '[:digit:]') port=$(grep "DefaultPort=" "${servercfgfullpath}" | tr -cd '[:digit:]') gameworld=$(grep "Map=" "${servercfgfullpath}" | sed 's/Map=//g' | tr -d '\n') From f0d43742a1425ce3cbd439d352b94d6041c861db Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sat, 20 Aug 2016 17:35:28 +0200 Subject: [PATCH 5/7] Fixed servercfgdefault and slightly improved default config.. --- Minecraft/cfg/lgsm-default.ini | 59 +++++++++++++++++----------------- Minecraft/mcserver | 4 +-- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Minecraft/cfg/lgsm-default.ini b/Minecraft/cfg/lgsm-default.ini index ea0f74b16..8e350192c 100644 --- a/Minecraft/cfg/lgsm-default.ini +++ b/Minecraft/cfg/lgsm-default.ini @@ -1,39 +1,40 @@ #Minecraft server properties (LGSM 210516) -#Sat Aug 20 15:59:43 CEST 2016 -generator-settings= -use-native-transport=true -op-permission-level=4 -allow-nether=true -level-name=world -enable-query=false +#Sat Aug 20 17:30:15 CEST 2016 allow-flight=false +allow-nether=true announce-player-achievements=true -server-port=25565 -max-world-size=29999984 -level-type=DEFAULT -enable-rcon=false -rcon.password= -rcon.port=25575 -level-seed= -force-gamemode=false -server-ip= -network-compression-threshold=256 -max-build-height=256 -spawn-npcs=true -white-list=false -spawn-animals=true -snooper-enabled=true -resource-pack-sha1= -online-mode=true -resource-pack= -pvp=true difficulty=1 enable-command-block=false +enable-query=false +enable-rcon=false +force-gamemode=false gamemode=0 -player-idle-timeout=0 +generate-structures=true +generator-settings= +hardcore=false +level-name=world +level-seed= +level-type=DEFAULT +max-build-height=256 max-players=20 max-tick-time=60000 +max-world-size=29999984 +motd=A Minecraft Server +network-compression-threshold=256 +online-mode=true +op-permission-level=4 +player-idle-timeout=0 +pvp=true +rcon.password= +rcon.port=25575 +resource-pack-sha1= +resource-pack= +server-ip= +server-port=25565 +snooper-enabled=true +spawn-animals=true spawn-monsters=true +spawn-npcs=true +use-native-transport=true view-distance=10 -generate-structures=true -motd=A Minecraft Server \ No newline at end of file +white-list=false diff --git a/Minecraft/mcserver b/Minecraft/mcserver index 3888ae606..0d599d3f8 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then set -x fi -version="210516" +version="200816" #### Variables #### @@ -61,7 +61,7 @@ executable="java -Xmx512M -Xms512M -jar minecraft_server.jar nogui" servercfg="server.properties" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" -servercfgdefault="${servercfgdir}/lgsm-default.cfg" +servercfgdefault="${servercfgdir}/lgsm-default.ini" backupdir="${rootdir}/backups" # Logging From 3697ae95959e847378a4cfa16b2a24453484ec4c Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sat, 20 Aug 2016 17:57:40 +0200 Subject: [PATCH 6/7] Added fn_parms Fixes: /home/mcserver/lgsm/functions/command_start.sh: line 58: fn_parms: command not found --- Minecraft/mcserver | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Minecraft/mcserver b/Minecraft/mcserver index 0d599d3f8..95b7a70e5 100644 --- a/Minecraft/mcserver +++ b/Minecraft/mcserver @@ -34,6 +34,10 @@ maxplayers="16" ip="0.0.0.0" updateonstart="off" +fn_parms(){ +parms="nogui" +} + #### Advanced Variables #### # Github Branch Select @@ -57,7 +61,7 @@ functionsdir="${lgsmdir}/functions" filesdir="${rootdir}/serverfiles" systemdir="${filesdir}" executabledir="${filesdir}" -executable="java -Xmx512M -Xms512M -jar minecraft_server.jar nogui" +executable="java -Xmx512M -Xms512M -jar minecraft_server.jar" servercfg="server.properties" servercfgdir="${filesdir}" servercfgfullpath="${servercfgdir}/${servercfg}" From 3e529d3f802d06369da25686d664cd764a9dbe89 Mon Sep 17 00:00:00 2001 From: Marvin Lehmann Date: Sat, 20 Aug 2016 18:09:11 +0200 Subject: [PATCH 7/7] Removed ugly space --- lgsm/functions/install_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index 1ac2ffd31..cf2953958 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -303,7 +303,7 @@ elif [ "${gamename}" == "Left 4 Dead 2" ]; then fn_sourceconfig elif [ "${gamename}" == "Minecraft" ]; then echo -e "downloading lgsm-default.ini...\c" - wget -N /dev/null ${githuburl}/Minecraft/cfg/lgsm-default.ini 2>&1 | grep -F HTTP | cut -c45- | uniq + wget -N /dev/null ${githuburl}/Minecraft/cfg/lgsm-default.ini 2>&1 | grep -F HTTP | cut -c45- | uniq sleep 1 fn_defaultconfig elif [ "${gamename}" == "No More Room in Hell" ]; then