.github/workflows/build-docker.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - develop
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
   build-docker:
@@ -44,6 +42,5 @@ jobs:
           push: true
           # TODO: split tag names into multiple lines
           tags: |
-            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.sha}}
-            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.ref_name}}
-            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:latest            
+            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}/${{github.ref_name}}:${{github.sha}}
+            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}/${{github.ref_name}}:latest            

Dockerfile

@@ -9,25 +9,23 @@ ADD ./src ${CONFIG_PATH}
 RUN  mkdir ${DATA_PATH}
 
 
-# Add symlinks to Minecraft Vanilla files
-RUN mkdir ${DATA_PATH}/Vanilla && \
-    touch ${DATA_PATH}/Vanilla/banned-ips.json && \
-        ln -sf ${DATA_PATH}/Vanilla/banned-ips.json ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/Vanilla/banned-players.json && \
-        ln -sf ${DATA_PATH}/Vanilla/banned-players.json ${CONFIG_PATH} && \
-    mkdir ${DATA_PATH}/Vanilla/logs && \
-        ln -sf ${DATA_PATH}/Vanilla/logs ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/Vanilla/ops.json && \
-        ln -sf ${DATA_PATH}/Vanilla/ops.json ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/Vanilla/usercache.json && \
-        ln -sf ${DATA_PATH}/Vanilla/usercache.json ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/Vanilla/whitelist.json && \
-        ln -sf ${DATA_PATH}/Vanilla/whitelist.json ${CONFIG_PATH}
+# Add symlinks to Default Minecraft files
+RUN touch ${DATA_PATH}/banned-ips.json && \
+    ln -sf ${DATA_PATH}/banned-ips.json ${CONFIG_PATH}
+RUN touch ${DATA_PATH}/banned-players.json && \
+    ln -sf ${DATA_PATH}/banned-players.json ${CONFIG_PATH}
+RUN mkdir ${DATA_PATH}/logs && \
+    ln -sf ${DATA_PATH}/logs ${CONFIG_PATH}
+RUN touch ${DATA_PATH}/ops.json && \
+    ln -sf ${DATA_PATH}/ops.json ${CONFIG_PATH}
+RUN touch ${DATA_PATH}/usercache.json && \
+    ln -sf ${DATA_PATH}/usercache.json ${CONFIG_PATH}
+RUN touch ${DATA_PATH}/whitelist.json && \
+    ln -sf ${DATA_PATH}/whitelist.json ${CONFIG_PATH}
 
-# Add symlinks to PlasmoVoice files
-RUN mkdir ${DATA_PATH}/PlasmoVoice && \
-    touch ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json && \
-    ln -sf ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json \
+# Add symlinks to Plasmo Voice files
+RUN touch ${DATA_PATH}/pv-voice_mutes.json && \
+    ln -sf ${DATA_PATH}/pv-voice_mutes.json \
         ${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json
 
 # Add symlinks to SuperVanish files
@@ -56,23 +54,10 @@ RUN mkdir -p ${DATA_PATH}/FancyNpcs/logs && \
     ln -sf ${DATA_PATH}/FancyNpcs/logs/ \
         ${CONFIG_PATH}/plugins/FancyNpcs/logs
 
-# Generate unicode locale so that cyrillic characters display properly
-RUN apt-get update -y && apt-get install -y locales && \
-    echo en_US.UTF-8 UTF-8 > /etc/locale.gen && \
-    dpkg-reconfigure --frontend=noninteractive locales && \
-    rm -Rf var/lib/apt/lists/*
-ENV LANG en_US.UTF-8
-
 
 VOLUME ${DATA_PATH}
 
 
-EXPOSE 25565/tcp
-
-
-ENV GID=988
-ENV UID=999
-
 ENV MEMORY=4G
 ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000
 
@@ -93,25 +78,9 @@ ENV SKINSRESTORER_DB_PASSWORD=0000
 
 WORKDIR ${WORKDIR_PATH}/config
 
+EXPOSE 25565/tcp
+
 CMD \
-    # Remove after migrated
-    mkdir -p ${DATA_PATH}/Vanilla && \
-    if [ -e ${DATA_PATH}/banned-ips.json ]; then mv ${DATA_PATH}/banned-ips.json ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/banned-players.json ]; then mv ${DATA_PATH}/banned-players.json ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/logs ]; then mv ${DATA_PATH}/logs ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/ops.json ]; then mv ${DATA_PATH}/ops.json ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/usercache.json ]; then mv ${DATA_PATH}/usercache.json ${DATA_PATH}/Vanilla; fi && \
-    if [ -e ${DATA_PATH}/whitelist.json ]; then mv ${DATA_PATH}/whitelist.json ${DATA_PATH}/Vanilla; fi && \
-    mkdir -p ${DATA_PATH}/PlasmoVoice && \
-    if [ -e ${DATA_PATH}/pv-voice_mutes.json ]; then mv ${DATA_PATH}/pv-voice_mutes.json ${DATA_PATH}/PlasmoVoice; fi && \
-
-    # Create and switch to user with desired UID and GID.
-    # All processes that create/change files in ${DATA_PATH}
-    # must be run under this user.
-    groupadd -g ${GID} worker && \
-    useradd -M -g ${GID} -u ${UID} worker && \
-    chmod -R o-rwx ${WORKDIR_PATH} && \
-
     # Add proxy secret
     sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" config/paper-global.yml && \
 
@@ -132,8 +101,5 @@ CMD \
     sed -i "s/_SKINSRESTORER_DB_USERNAME_/${SKINSRESTORER_DB_USERNAME}/g" plugins/SkinsRestorer/config.yml && \
     sed -i "s/_SKINSRESTORER_DB_PASSWORD_/${SKINSRESTORER_DB_PASSWORD}/g" plugins/SkinsRestorer/config.yml && \
 
-    # Change UID and GID of used files to desired values.
-    chown -R worker:worker ${WORKDIR_PATH} && \
-
     # Launch
-    su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui"
+    java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui

src/config/paper-global.yml

@@ -79,8 +79,8 @@ misc:
 packet-limiter:
   all-packets:
     action: KICK
-    interval: 1.0
-    max-packet-rate: 200.0
+    interval: 7.0
+    max-packet-rate: 500.0
   kick-message: <red><lang:disconnect.exceeded_packet_rate>
   overrides:
     ServerboundPlaceRecipePacket:

src/plugins/CommandWhitelist/config.yml

@@ -1,37 +0,0 @@
-
-# Messages use MiniMessage formatting (https://docs.adventure.kyori.net/minimessage/format)
-messages:
-  prefix: ''
-  command_denied: ''
-  subcommand_denied: ''
-  no_permission: ''
-  no_such_subcommand: ''
-  config_reloaded: <yellow>Configuration reloaded.
-  added_to_whitelist: <yellow>Whitelisted command <gold>%s <yellow>for permission
-    <gold>%s
-  removed_from_whitelist: <yellow>Removed command <gold>%s <yellow>from permission
-    <gold>%s
-  group_doesnt_exist: <red>Group doesn't exist or error occured
-
-# Do not enable if you don't have issues with aliased commands.
-# This requires server restart to take effect.
-use_protocollib: false
-
-# Valid message types are CHAT and ACTIONBAR. Does nothing on velocity.
-message_type: CHAT
-groups:
-  default:
-    commands:
-    - tell
-    - reply
-    - spawn
-    - links
-    - menu
-    - servers
-    subcommands: []
-  role_moder:
-    commands:
-    - vmute
-    - vunmute
-    - vmutelist
-    subcommands: []

src/plugins/FancyHolograms/holograms.yml

@@ -4,9 +4,9 @@ holograms:
     type: TEXT
     location:
       world: world
-      x: 512255.5
+      x: 255.5
       y: 3.057499885559082
-      z: 512262.5
+      z: 262.5
       yaw: -180.0
       pitch: 0.0
     visibility_distance: -1
@@ -35,9 +35,9 @@ holograms:
     type: TEXT
     location:
       world: world
-      x: 512261.5
+      x: 261.5
       y: 2.25
-      z: 512261.5
+      z: 261.5
       yaw: 135.0
       pitch: 0.0
     visibility_distance: 32
@@ -63,9 +63,9 @@ holograms:
     type: TEXT
     location:
       world: world
-      x: 512249.5
+      x: 249.5
       y: 2.25
-      z: 512261.5
+      z: 261.5
       yaw: -135.0
       pitch: 0.0
     visibility_distance: 32

src/plugins/FancyNpcs/npcs.yml

@@ -6,9 +6,9 @@ npcs:
     type: PLAYER
     location:
       world: world
-      x: 512255.5
+      x: 255.5
       y: 0.9375
-      z: 512262.5
+      z: 262.5
       yaw: -180.0
       pitch: 0.0
     showInTab: false
@@ -43,9 +43,9 @@ npcs:
     type: INTERACTION
     location:
       world: world
-      x: 512261.5
+      x: 261.5
       y: 2.0
-      z: 512261.5
+      z: 261.5
       yaw: -35.550262
       pitch: 11.700032
     showInTab: false
@@ -78,9 +78,9 @@ npcs:
     type: INTERACTION
     location:
       world: world
-      x: 512249.5
+      x: 249.5
       y: 2.0
-      z: 512261.5
+      z: 261.5
       yaw: -121.19934
       pitch: 76.49999
     showInTab: false

src/plugins/LuckPerms/config.yml

@@ -404,7 +404,7 @@ auto-install-translations: true
 meta-formatting:
   prefix:
     format:
-      - highest_on_track_roles
+      - highest_on_track_staff
       - highest_on_track_clans
       
     duplicates: first-only

src/plugins/RegionTeleport/spawnlocations.yml

@@ -1,7 +1,7 @@
 spawn:
   world: world
-  x: 512255.5
+  x: 255.5
   y: 1.0
-  z: 512258.5
+  z: 258.5
   yaw: 0.0
   pitch: 0.0

src/plugins/ViaVersion/config.yml

@@ -41,7 +41,7 @@ suppress-text-component-conversion-warnings: true
 #
 # What is the maximum per second a client can send (Use %pps to display their pps)
 # Use -1 to disable.
-max-pps: -1
+max-pps: 800
 max-pps-kick-msg: You are sending too many packets!
 #
 # We can also kick them if over a period they send over a threshold a certain amount of times.

src/plugins/WorldGuard/worlds/world/regions.yml

@@ -11,8 +11,8 @@
 #
 regions:
     spawn:
-        min: {x: 512206, y: 0, z: 512206}
-        max: {x: 512304, y: 32, z: 512304}
+        min: {x: 206, y: 0, z: 206}
+        max: {x: 304, y: 32, z: 304}
         members: {}
         flags: {other-explosion: deny, lava-fire: deny, water-flow: deny, use: deny,
             invincible: allow, snow-fall: deny, leaf-decay: deny, firework-damage: deny,