diff --git a/personal/q3k/minecraft/Dockerfile-paper b/personal/q3k/minecraft/Dockerfile-paper index d1c39e44..048524d7 100644 --- a/personal/q3k/minecraft/Dockerfile-paper +++ b/personal/q3k/minecraft/Dockerfile-paper @@ -30,7 +30,7 @@ ARG VERSION=1.16.1 RUN set -e -x ;\ wget --quiet https://papermc.io/api/v1/paper/${VERSION}/latest/download ;\ - mv download paper.jar + mv download server.jar ADD worldedit-bukkit-7.2.0-beta-01.jar . ADD worldguard-bukkit-7.0.4-beta1.jar . diff --git a/personal/q3k/minecraft/Dockerfile-spigot b/personal/q3k/minecraft/Dockerfile-spigot index cf47ea88..2d650175 100644 --- a/personal/q3k/minecraft/Dockerfile-spigot +++ b/personal/q3k/minecraft/Dockerfile-spigot @@ -36,7 +36,7 @@ RUN set -e -x ;\ cp spigot*jar .. ;\ cd .. ;\ rm -rf build ;\ - mv spigot*.jar spigot.jar + mv spigot*.jar server.jar ADD worldedit-bukkit-7.2.0-beta-01.jar . ADD worldguard-bukkit-7.0.4-beta1.jar . diff --git a/personal/q3k/minecraft/prod.jsonnet b/personal/q3k/minecraft/prod.jsonnet index eef3b353..7c7b0ae5 100644 --- a/personal/q3k/minecraft/prod.jsonnet +++ b/personal/q3k/minecraft/prod.jsonnet @@ -4,7 +4,8 @@ local defaultWorldguardConfig = import "worldguard.libsonnet"; { local minecraft = self, versions:: { - "spigot-1.15.2": "registry.k0.hswaw.net/q3k/minecraft:spigot-1.15.2-r3", + "spigot-1.16.1": "registry.k0.hswaw.net/q3k/minecraft:spigot-1.16.1-r2", + "paper-1.16.1": "registry.k0.hswaw.net/q3k/minecraft:paper-1.16.1-r2", }, server(name, version):: { local server = self, @@ -72,7 +73,7 @@ local defaultWorldguardConfig = import "worldguard.libsonnet"; #!/usr/bin/env bash cd /home/minecraft/world cp /home/minecraft/config/server.properties . - cp /home/minecraft/spigot.jar . + cp /home/minecraft/server.jar . mkdir -p plugins/WorldGuard cp /home/minecraft/worldedit-*.jar plugins cp /home/minecraft/worldguard-*.jar plugins @@ -80,7 +81,7 @@ local defaultWorldguardConfig = import "worldguard.libsonnet"; echo "eula=true" > eula.txt bash /home/minecraft/config/overviewer.sh & - exec java -Xmx4G -Xms4G -jar spigot.jar + exec java -Xmx4G -Xms4G -jar server.jar |||, overviewersh:: ||| @@ -201,7 +202,7 @@ local defaultWorldguardConfig = import "worldguard.libsonnet"; ns: kube.Namespace("minecraft"), q3k: { - survival: minecraft.server("q3k-survival", "spigot-1.15.2") { + survival: minecraft.server("q3k-survival", "paper-1.16.1") { properties+: { motd: "wypierdol z polski kropka pe el", "enforce-whitelist": true,