diff --git a/images/lobby/Containerfile b/images/lobby/Containerfile deleted file mode 100644 index 93cce6b..0000000 --- a/images/lobby/Containerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM git.lab0x13.site/scrow/papermc:0.2 - -COPY ./world /data/world diff --git a/images/lobby/Makefile b/images/lobby/Makefile deleted file mode 100644 index 16787da..0000000 --- a/images/lobby/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -include ../container.mk -TAG := lobby -VERSION := 0.2 diff --git a/images/lobby/world/DIM-1/data/raids.dat b/images/lobby/world/DIM-1/data/raids.dat deleted file mode 100644 index 5e7bb0e..0000000 Binary files a/images/lobby/world/DIM-1/data/raids.dat and /dev/null differ diff --git a/images/lobby/world/DIM1/data/raids_end.dat b/images/lobby/world/DIM1/data/raids_end.dat deleted file mode 100644 index 5e7bb0e..0000000 Binary files a/images/lobby/world/DIM1/data/raids_end.dat and /dev/null differ diff --git a/images/lobby/world/data/raids.dat b/images/lobby/world/data/raids.dat deleted file mode 100644 index a1027a1..0000000 Binary files a/images/lobby/world/data/raids.dat and /dev/null differ diff --git a/images/lobby/world/icon.png b/images/lobby/world/icon.png deleted file mode 100644 index 4ea69f8..0000000 Binary files a/images/lobby/world/icon.png and /dev/null differ diff --git a/images/lobby/world/level.dat b/images/lobby/world/level.dat deleted file mode 100644 index 9f8b990..0000000 Binary files a/images/lobby/world/level.dat and /dev/null differ diff --git a/images/lobby/world/level.dat_old b/images/lobby/world/level.dat_old deleted file mode 100644 index e06b9b1..0000000 Binary files a/images/lobby/world/level.dat_old and /dev/null differ diff --git a/images/lobby/world/mcmmo_regions/mcmmo_-1_-1_.mcm b/images/lobby/world/mcmmo_regions/mcmmo_-1_-1_.mcm deleted file mode 100644 index f826040..0000000 Binary files a/images/lobby/world/mcmmo_regions/mcmmo_-1_-1_.mcm and /dev/null differ diff --git a/images/lobby/world/mcmmo_regions/mcmmo_-1_0_.mcm b/images/lobby/world/mcmmo_regions/mcmmo_-1_0_.mcm deleted file mode 100644 index fd81b7e..0000000 Binary files a/images/lobby/world/mcmmo_regions/mcmmo_-1_0_.mcm and /dev/null differ diff --git a/images/lobby/world/poi/r.-1.-1.mca b/images/lobby/world/poi/r.-1.-1.mca deleted file mode 100644 index 5531184..0000000 Binary files a/images/lobby/world/poi/r.-1.-1.mca and /dev/null differ diff --git a/images/lobby/world/poi/r.-1.-2.mca b/images/lobby/world/poi/r.-1.-2.mca deleted file mode 100644 index e69de29..0000000 diff --git a/images/lobby/world/poi/r.-1.0.mca b/images/lobby/world/poi/r.-1.0.mca deleted file mode 100644 index d4ec377..0000000 Binary files a/images/lobby/world/poi/r.-1.0.mca and /dev/null differ diff --git a/images/lobby/world/poi/r.-1.1.mca b/images/lobby/world/poi/r.-1.1.mca deleted file mode 100644 index e69de29..0000000 diff --git a/images/lobby/world/poi/r.-2.-1.mca b/images/lobby/world/poi/r.-2.-1.mca deleted file mode 100644 index e69de29..0000000 diff --git a/images/lobby/world/poi/r.-2.0.mca b/images/lobby/world/poi/r.-2.0.mca deleted file mode 100644 index c2f4978..0000000 Binary files a/images/lobby/world/poi/r.-2.0.mca and /dev/null differ diff --git a/images/lobby/world/poi/r.0.-1.mca b/images/lobby/world/poi/r.0.-1.mca deleted file mode 100644 index deaef9e..0000000 Binary files a/images/lobby/world/poi/r.0.-1.mca and /dev/null differ diff --git a/images/lobby/world/poi/r.0.-2.mca b/images/lobby/world/poi/r.0.-2.mca deleted file mode 100644 index e69de29..0000000 diff --git a/images/lobby/world/poi/r.0.0.mca b/images/lobby/world/poi/r.0.0.mca deleted file mode 100644 index 451f1c5..0000000 Binary files a/images/lobby/world/poi/r.0.0.mca and /dev/null differ diff --git a/images/lobby/world/poi/r.0.5.mca b/images/lobby/world/poi/r.0.5.mca deleted file mode 100644 index 3831b42..0000000 Binary files a/images/lobby/world/poi/r.0.5.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-1.-1.mca b/images/lobby/world/region/r.-1.-1.mca deleted file mode 100644 index 0ef8577..0000000 Binary files a/images/lobby/world/region/r.-1.-1.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-1.-2.mca b/images/lobby/world/region/r.-1.-2.mca deleted file mode 100644 index 06fbf18..0000000 Binary files a/images/lobby/world/region/r.-1.-2.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-1.0.mca b/images/lobby/world/region/r.-1.0.mca deleted file mode 100644 index 883485b..0000000 Binary files a/images/lobby/world/region/r.-1.0.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-1.1.mca b/images/lobby/world/region/r.-1.1.mca deleted file mode 100644 index 57932e5..0000000 Binary files a/images/lobby/world/region/r.-1.1.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-1.4.mca b/images/lobby/world/region/r.-1.4.mca deleted file mode 100644 index a95d67f..0000000 Binary files a/images/lobby/world/region/r.-1.4.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-1.5.mca b/images/lobby/world/region/r.-1.5.mca deleted file mode 100644 index d3e6463..0000000 Binary files a/images/lobby/world/region/r.-1.5.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-1.6.mca b/images/lobby/world/region/r.-1.6.mca deleted file mode 100644 index d8afd9b..0000000 Binary files a/images/lobby/world/region/r.-1.6.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-2.-1.mca b/images/lobby/world/region/r.-2.-1.mca deleted file mode 100644 index 7b2bd7f..0000000 Binary files a/images/lobby/world/region/r.-2.-1.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-2.-2.mca b/images/lobby/world/region/r.-2.-2.mca deleted file mode 100644 index f3ff924..0000000 Binary files a/images/lobby/world/region/r.-2.-2.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-2.0.mca b/images/lobby/world/region/r.-2.0.mca deleted file mode 100644 index 6e21b91..0000000 Binary files a/images/lobby/world/region/r.-2.0.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-2.1.mca b/images/lobby/world/region/r.-2.1.mca deleted file mode 100644 index c8e0909..0000000 Binary files a/images/lobby/world/region/r.-2.1.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-2.2.mca b/images/lobby/world/region/r.-2.2.mca deleted file mode 100644 index e19cc8b..0000000 Binary files a/images/lobby/world/region/r.-2.2.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-3.1.mca b/images/lobby/world/region/r.-3.1.mca deleted file mode 100644 index a28580b..0000000 Binary files a/images/lobby/world/region/r.-3.1.mca and /dev/null differ diff --git a/images/lobby/world/region/r.-3.2.mca b/images/lobby/world/region/r.-3.2.mca deleted file mode 100644 index 0a28cdd..0000000 Binary files a/images/lobby/world/region/r.-3.2.mca and /dev/null differ diff --git a/images/lobby/world/region/r.0.-1.mca b/images/lobby/world/region/r.0.-1.mca deleted file mode 100644 index 3b79fc3..0000000 Binary files a/images/lobby/world/region/r.0.-1.mca and /dev/null differ diff --git a/images/lobby/world/region/r.0.-2.mca b/images/lobby/world/region/r.0.-2.mca deleted file mode 100644 index 1a06934..0000000 Binary files a/images/lobby/world/region/r.0.-2.mca and /dev/null differ diff --git a/images/lobby/world/region/r.0.0.mca b/images/lobby/world/region/r.0.0.mca deleted file mode 100644 index f451bf3..0000000 Binary files a/images/lobby/world/region/r.0.0.mca and /dev/null differ diff --git a/images/lobby/world/region/r.0.1.mca b/images/lobby/world/region/r.0.1.mca deleted file mode 100644 index ddaf092..0000000 Binary files a/images/lobby/world/region/r.0.1.mca and /dev/null differ diff --git a/images/lobby/world/region/r.0.4.mca b/images/lobby/world/region/r.0.4.mca deleted file mode 100644 index a2dbee6..0000000 Binary files a/images/lobby/world/region/r.0.4.mca and /dev/null differ diff --git a/images/lobby/world/region/r.0.5.mca b/images/lobby/world/region/r.0.5.mca deleted file mode 100644 index cb8df54..0000000 Binary files a/images/lobby/world/region/r.0.5.mca and /dev/null differ diff --git a/images/lobby/world/region/r.0.6.mca b/images/lobby/world/region/r.0.6.mca deleted file mode 100644 index dd8e2fa..0000000 Binary files a/images/lobby/world/region/r.0.6.mca and /dev/null differ diff --git a/images/lobby/world/region/r.4.1.mca b/images/lobby/world/region/r.4.1.mca deleted file mode 100644 index 8d92be2..0000000 Binary files a/images/lobby/world/region/r.4.1.mca and /dev/null differ diff --git a/images/lobby/world/region/r.4.2.mca b/images/lobby/world/region/r.4.2.mca deleted file mode 100644 index 3236467..0000000 Binary files a/images/lobby/world/region/r.4.2.mca and /dev/null differ diff --git a/images/lobby/world/region/r.5.1.mca b/images/lobby/world/region/r.5.1.mca deleted file mode 100644 index 3775d5c..0000000 Binary files a/images/lobby/world/region/r.5.1.mca and /dev/null differ diff --git a/images/lobby/world/region/r.5.2.mca b/images/lobby/world/region/r.5.2.mca deleted file mode 100644 index db25f38..0000000 Binary files a/images/lobby/world/region/r.5.2.mca and /dev/null differ diff --git a/images/lobby/world/session.lock b/images/lobby/world/session.lock deleted file mode 100644 index 4729d0e..0000000 Binary files a/images/lobby/world/session.lock and /dev/null differ diff --git a/images/lobby/world/uid.dat b/images/lobby/world/uid.dat deleted file mode 100644 index 620bfae..0000000 --- a/images/lobby/world/uid.dat +++ /dev/null @@ -1 +0,0 @@ -þ)˜õbÝMΚo%óò{EÏ \ No newline at end of file diff --git a/images/papermc/Containerfile b/images/papermc/Containerfile index 5439663..771aec0 100644 --- a/images/papermc/Containerfile +++ b/images/papermc/Containerfile @@ -21,8 +21,29 @@ COPY --chmod=755 entrypoint.sh /entrypoint.sh COPY ./server.properties /data RUN mkdir -p /data/config COPY ./paper-global.yml /data/config +COPY ./ops.json /data RUN printf eula=true > eula.txt -RUN java -jar server.jar --initSettings +RUN java -Xms3072M -Xmx3072M --add-modules=jdk.incubator.vector -XX:+UseG1GC \ + -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 \ + -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch \ + -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 \ + -XX:InitiatingHeapOccupancyPercent=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 \ + -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M \ + -XX:G1ReservePercent=20 -jar server.jar --nogui --initSettings + ENTRYPOINT ["/entrypoint.sh"] -CMD ["java", "-jar", "server.jar", "--nogui"] +CMD ["java", "-Xms3072M", "-Xmx3072M", "--add-modules=jdk.incubator.vector", \ + "-XX:+UseG1GC", "-XX:+ParallelRefProcEnabled", "-XX:MaxGCPauseMillis=200", \ + "-XX:+UnlockExperimentalVMOptions", "-XX:+DisableExplicitGC", \ + "-XX:+AlwaysPreTouch", "-XX:G1HeapWastePercent=5", "-XX:G1MixedGCCountTarget=4", \ + "-XX:InitiatingHeapOccupancyPercent=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", \ + "-XX:G1NewSizePercent=30", "-XX:G1MaxNewSizePercent=40", \ + "-XX:G1HeapRegionSize=8M", "-XX:G1ReservePercent=20", \ + "-jar", "server.jar", "--nogui"] diff --git a/images/papermc/ops.json b/images/papermc/ops.json new file mode 100644 index 0000000..67d306a --- /dev/null +++ b/images/papermc/ops.json @@ -0,0 +1,8 @@ +[ + { + "uuid": "3218c49a-b80d-49ae-a42e-4496141eb2b1", + "name": "kento2", + "level": 4, + "bypassesPlayerLimit": false + } +] \ No newline at end of file diff --git a/jobs/minecraft.nomad.hcl b/jobs/minecraft.nomad.hcl index b969b10..508e3e6 100644 --- a/jobs/minecraft.nomad.hcl +++ b/jobs/minecraft.nomad.hcl @@ -77,7 +77,7 @@ job "minecraft" { resources { cpu = 1000 - memory = 2048 + # we already limit memory using java args } } } diff --git a/minigame/run-lobby b/minigame/run-lobby index e82611b..89a4c3b 100755 --- a/minigame/run-lobby +++ b/minigame/run-lobby @@ -1,6 +1,6 @@ #!/command/execlineb nomad job dispatch -meta mode="lobby" - -meta image="git.lab0x13.site/scrow/lobby:0.2" + -meta image="git.lab0x13.site/scrow/papermc:0.2" -meta plugins="https://git.lab0x13.site/api/packages/scrow/generic/core-bukkit/UNVERSIONED/CoreBukkit.jar" minecraft