Renewed Forge setup

minecraft/papermc/Dockerfile

@@ -23,7 +23,9 @@ VOLUME /app/config/cache
 
 
 # Default value to keep users from eating up all ram accidentally
-ENV XMS=4
+ENV XMX=4
+ENV MC_VERSION="${MC_VERSION}"
+ENV PAPERMC_VERSION="${PAPERMC_VERSION}"
 
 # Document exposed ports
 EXPOSE 25565

minecraft/papermc/docker-compose.yml

@@ -1,19 +1,3 @@
-# Copyright (C) 2020 Jef Roosens
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
 version: '3.5'
 services:
     app:
@@ -22,7 +6,7 @@ services:
             args:
                 - 'MC_VERSION'
                 - 'PAPERMC_VERSION'
-        image: 'chewingbever/mc-papermc-server:${MC_VERSION}-${PAPERMC_VERSION}'
+        image: 'chewingbever/mc-papermc:${MC_VERSION}-${PAPERMC_VERSION}'
         restart: 'always'
 
         # Needed to interact with server console

minecraft/papermc/entrypoint.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# Accept the EULA
+echo "eula=true" > /app/config/eula.txt
+
+# Log the last-used version, so we know which version to use when running it again (e.g. loading the backup)
+echo "${MC_VERSION}, PaperMC v${PAPERMC_VERSION}" >> /app/config/versions.txt
+
+XMS="${XMS:-$XMX}"
+
+# Launch the actual server
+java \
+    -Xms"${XMS}G" \
+    -Xmx"${XMX:-$XMS}G" \
+    -XX:+UseG1GC \
+    -XX:+ParallelRefProcEnabled \
+    -XX:MaxGCPauseMillis=200 \
+    -XX:+UnlockExperimentalVMOptions \
+    -XX:+DisableExplicitGC \
+    -XX:+AlwaysPreTouch \
+    -XX:G1NewSizePercent="$([ $XMS -gt 12 ] && echo 40 || echo 30)" \
+    -XX:G1MaxNewSizePercent="$([ $XMS -gt 12 ] && echo 50 || echo 40)" \
+    -XX:G1HeapRegionSize="$([ $XMS -gt 12 ] && echo 16 || echo 8)"M \
+    -XX:G1ReservePercent="$([ $XMS -gt 12 ] && echo 15 || echo 20)" \
+    -XX:G1HeapWastePercent=5 \
+    -XX:G1MixedGCCountTarget=4 \
+    -XX:InitiatingHeapOccupancyPercent="$([ $XMS -gt 12 ] && echo 20 || echo 15)" \
+    -XX:G1MixedGCLiveThresholdPercent=90 \
+    -XX:G1RSetUpdatingPauseTimePercent=5 \
+    -XX:SurvivorRatio=32 \
+    -XX:+PerfDisableSharedMem \
+    -XX:MaxTenuringThreshold=1 \
+    -Dusing.aikars.flags=https://mcflags.emc.gs \
+    -Daikars.new.flags=true \
+    -jar /app/server.jar \
+    --universe /app/worlds \
+    --nogui