Always populate ops.txt to allow for additive config

For #283

Dockerfile

@@ -34,7 +34,6 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf
 ARG RESTIFY_VER=1.1.6
 ARG RCON_CLI_VER=1.4.6
 ARG MC_SERVER_RUNNER_VER=1.3.2
-ARG TOF_BUILDTOOLS_VER=1.2.0
 ARG ARCH=amd64
 
 ADD https://github.com/itzg/restify/releases/download/${RESTIFY_VER}/restify_${RESTIFY_VER}_linux_${ARCH}.tar.gz /tmp/restify.tgz
@@ -49,22 +48,6 @@ ADD https://github.com/itzg/mc-server-runner/releases/download/${MC_SERVER_RUNNE
 RUN tar -x -C /usr/local/bin -f /tmp/mc-server-runner.tgz mc-server-runner && \
   rm /tmp/mc-server-runner.tgz
 
-ADD https://git.faldoria.de/tof/server/build-tools/-/jobs/artifacts/buildtools-${TOF_BUILDTOOLS_VER}/raw/target/ToF-BuildTools.jar?job=release-artifact /tmp/tof-buildtools/BuildTools.jar
-
-ONBUILD ARG BUILDTOOLS_OUTPUT=/plugins
-ONBUILD COPY *Dockerfile* *plugins.yml /tmp/tof-buildtools/
-ONBUILD RUN \
-  [ -d /tmp/tof-buildtools ] && \
-  [ $(find /tmp/tof-buildtools -type f -name plugins.yml | wc -l) -gt 0 ] && \
-  java -jar /tmp/tof-buildtools/BuildTools.jar \
-    --config "/tmp/tof-buildtools/plugins.yml" \
-    --configs "plugins.yml" \
-    --dir "/tmp/tof-buildtools/" \
-    --output ${BUILDTOOLS_OUTPUT} && \
-  chown -R minecraft:minecraft ${BUILDTOOLS_OUTPUT} && \
-  rm -fR /tmp/tof-buildtools/ || \
-  true
-
 COPY mcadmin.jq /usr/share
 RUN chmod +x /usr/local/bin/*
 
@@ -78,6 +61,7 @@ ENV UID=1000 GID=1000 \
   JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
   TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= FABRICVERSION=LATEST LEVEL=world \
   PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
+  RESOURCE_PACK= RESOURCE_PACK_SHA1= \
   LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true SERVER_NAME="Dedicated Server" \
   REPLACE_ENV_VARIABLES="FALSE" ENV_VARIABLE_PREFIX="CFG_"
 

README.md

@@ -9,6 +9,8 @@ This docker image provides a Minecraft Server that will automatically download t
 version at startup. You can also run/upgrade to any specific version or the
 latest snapshot. See the *Versions* section below for more information.
 
+[![Click for more docs](https://i.imgur.com/jS02ebD.png)](https://github.com/itzg/docker-minecraft-server/blob/master/README.md)
+
 To simply use the latest stable version, run
 
     docker run -d -p 25565:25565 --name mc itzg/minecraft-server
@@ -821,6 +823,12 @@ Determines if monsters will be spawned.
 Determines if villagers will be spawned.
 
     docker run -d -e SPAWN_NPCS=true
+    
+### Set spawn protection
+
+Sets the area that non-ops can not edit (0 to disable)
+
+    docker run -d -e SPAWN_PROTECTION=0
 
 ### View Distance
 Sets the amount of world data the server sends the client, measured in chunks in each direction of the player (radius, not diameter).
@@ -894,6 +902,14 @@ For example (just the `-e` bits):
 
     -e LEVEL_TYPE=flat -e 'GENERATOR_SETTINGS=3;minecraft:bedrock,3*minecraft:stone,52*minecraft:sandstone;2;'
 
+### Custom Server Resource Pack
+
+You can set a link to a custom resource pack and set it's checksum using the `RESOURCE_PACK` and `RESOURCE_PACK_SHA1` options respectively, the default is blank:
+
+    docker run -d -e 'RESROUCE_PACK=http\://link.com/to/pack.zip?\=1' -e 'RESOURCE_PACK_SHA1=d5db29cd03a2ed055086cef9c31c252b4587d6d0'
+
+**NOTE:** `:` and `=` must be escaped using `\`. The checksum plain-text hexadecimal.
+
 ### World Save Name
 
 You can either switch between world saves or run multiple containers with different saves by using the `LEVEL` option,
@@ -1004,7 +1020,9 @@ ways to adjust the memory settings:
 * `MAX_MEMORY`, independently sets the max heap size
 
 The values of all three are passed directly to the JVM and support format/units as
-`<size>[g|G|m|M|k|K]`.
+`<size>[g|G|m|M|k|K]`. For example:
+
+    -e MEMORY=2G
 
 ### JVM Options
 
@@ -1022,3 +1040,13 @@ environment variable. In [the example compose file](docker-compose-proxied.yml)
 a companion squid proxy by setting the equivalent of
 
     -e PROXY=proxy:3128
+
+### Using "noconsole" option
+
+Some older versions of Spigot required `--noconsole` to be passed when detaching stdin. You can
+pass that at the end of `docker run` after the image name or set `-e CONSOLE=FALSE`.
+
+### Explicitly disable GUI
+
+Some older servers get confused and think that the GUI interface is enabled. You can explicitly
+disable that by passing `-e GUI=FALSE`.

start-finalSetup04ServerProperties

@@ -49,6 +49,7 @@ function customizeServerProps {
   setServerProp "spawn-animals" "$SPAWN_ANIMALS"
   setServerProp "spawn-monsters" "$SPAWN_MONSTERS"
   setServerProp "spawn-npcs" "$SPAWN_NPCS"
+  setServerProp "spawn-protection" "$SPAWN_PROTECTION"
   setServerProp "generate-structures" "$GENERATE_STRUCTURES"
   setServerProp "view-distance" "$VIEW_DISTANCE"
   setServerProp "hardcore" "$HARDCORE"
@@ -70,6 +71,8 @@ function customizeServerProps {
   setServerProp "online-mode" "$ONLINE_MODE"
   setServerProp "allow-flight" "$ALLOW_FLIGHT"
   setServerProp "level-type" "${LEVEL_TYPE^^}"
+  setServerProp "resource-pack" "$RESOURCE_PACK"
+  setServerProp "resource-pack-sha1" "$RESOURCE_PACK_SHA1"
 
   if [ -n "$DIFFICULTY" ]; then
     case $DIFFICULTY in

start-minecraftFinalSetup

@@ -2,9 +2,10 @@
 
 . /start-utils
 
-if [ -n "$OPS" -a ! -e ops.txt.converted ]; then
-  echo "Setting ops"
-  echo $OPS | awk -v RS=, '{print}' >> ops.txt
+if [ -n "$OPS" ]; then
+  echo "Setting/adding ops"
+  rm -rf ops.txt.converted
+  echo $OPS | awk -v RS=, '{print}' > ops.txt
 fi
 
 if [ -n "$WHITELIST" -a ! -e white-list.txt.converted ]; then