Merge pull request 'suggestion-76-files-migration' (#45) from suggestion-76 into develop

Reviewed-on: #45
Reviewed-by: oznobys <oznobys@noreply.localhost>

.github/workflows/build-docker.yml

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

Dockerfile

@@ -9,29 +9,31 @@ ADD ./src ${CONFIG_PATH}
 RUN  mkdir ${DATA_PATH}
 
 
-# Add symlinks to Minecraft default files
+# Add symlinks to Minecraft Vanilla files
-RUN touch ${DATA_PATH}/banned-ips.json && \
+RUN mkdir ${DATA_PATH}/Vanilla && \ 
-        ln -sf ${DATA_PATH}/banned-ips.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/Vanilla/banned-ips.json && \
-    touch ${DATA_PATH}/banned-players.json && \
+        ln -sf ${DATA_PATH}/Vanilla/banned-ips.json ${CONFIG_PATH} && \
-        ln -sf ${DATA_PATH}/banned-players.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/Vanilla/banned-players.json && \
-    mkdir ${DATA_PATH}/logs && \
+        ln -sf ${DATA_PATH}/Vanilla/banned-players.json ${CONFIG_PATH} && \
-        ln -sf ${DATA_PATH}/logs ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/Vanilla/logs && \
-    touch ${DATA_PATH}/ops.json && \
+        ln -sf ${DATA_PATH}/Vanilla/logs ${CONFIG_PATH} && \
-        ln -sf ${DATA_PATH}/ops.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/Vanilla/ops.json && \
-    touch ${DATA_PATH}/usercache.json && \
+        ln -sf ${DATA_PATH}/Vanilla/ops.json ${CONFIG_PATH} && \
-        ln -sf ${DATA_PATH}/usercache.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/Vanilla/usercache.json && \
-    touch ${DATA_PATH}/whitelist.json && \
+        ln -sf ${DATA_PATH}/Vanilla/usercache.json ${CONFIG_PATH} && \
-        ln -sf ${DATA_PATH}/whitelist.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/Vanilla/whitelist.json && \
-    mkdir ${DATA_PATH}/world && \
+        ln -sf ${DATA_PATH}/Vanilla/whitelist.json ${CONFIG_PATH} && \
-        ln -sf ${DATA_PATH}/world ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/Vanilla/world && \
-    mkdir ${DATA_PATH}/world_nether && \
+        ln -sf ${DATA_PATH}/Vanilla/world ${CONFIG_PATH} && \
-        ln -sf ${DATA_PATH}/world_nether ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/Vanilla/world_nether && \
-    mkdir ${DATA_PATH}/world_the_end && \
+        ln -sf ${DATA_PATH}/Vanilla/world_nether ${CONFIG_PATH} && \
-        ln -sf ${DATA_PATH}/world_the_end ${CONFIG_PATH}
+    mkdir ${DATA_PATH}/Vanilla/world_the_end && \
+        ln -sf ${DATA_PATH}/Vanilla/world_the_end ${CONFIG_PATH}
 
 # Add symlinks to PlasmoVoice files
-RUN touch ${DATA_PATH}/pv-voice_mutes.json && \
+RUN mkdir ${DATA_PATH}/PlasmoVoice && \
-    ln -sf ${DATA_PATH}/pv-voice_mutes.json \
+    touch ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json && \
+    ln -sf ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json \
         ${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json
 
 # Add symlinks to SuperVanish files
@@ -144,6 +146,20 @@ ENV DISCORDSRV_DB_PASSWORD=0000
 WORKDIR ${WORKDIR_PATH}/config
 
 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 && \
+    if [ -e ${DATA_PATH}/world ]; then mv ${DATA_PATH}/world ${DATA_PATH}/Vanilla; fi && \
+    if [ -e ${DATA_PATH}/world_nether ]; then mv ${DATA_PATH}/world_nether ${DATA_PATH}/Vanilla; fi && \
+    if [ -e ${DATA_PATH}/world_the_end ]; then mv ${DATA_PATH}/world_the_end ${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.
@@ -206,4 +222,4 @@ CMD \
     chown -R worker:worker ${WORKDIR_PATH} && \
 
     # Launch
-    su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui"
+    su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -XX:+UseZGC -XX:+ZGenerational -XX:+AlwaysPreTouch -XX:+UseStringDeduplication -jar *.jar -nogui"

src/plugins/Clumps/config.yml

@@ -0,0 +1,55 @@
+# XP Clumps Plugin Configuration
+
+# The radius within which XP orbs will merge (in blocks)
+merge-radius: 2.0
+
+# Minimum XP amount required in an orb for it to be merged with others
+min-xp-to-merge: 5
+
+# How often (in seconds) the plugin checks and merges XP orbs in each world
+merge-interval-seconds: 10
+
+# The radius within which XP orbs will be instantly collected by players
+instant-collect-radius: 1
+
+# Enable or disable the instant collection of XP orbs by players within the defined radius
+enable-instant-collect: true
+
+# Enable or disable the merging of XP orbs across the server
+enable-merging: true
+
+# The XP boost multiplier for players collecting XP near merged XP orbs (percentage as a multiplier)
+xp-boost-multiplier: 1.1  # 10% XP boost
+
+# Enable or disable the XP boost feature for players near merging XP orbs
+enable-xp-boost: false
+
+# Enable or disable particle effects when XP orbs merge (visual animations)
+enable-merge-animations: true
+
+# Prevent duplication of XP orbs (to avoid excessive orb spawning)
+prevent-orb-duplication: true
+
+# World-specific settings (if you want different settings for different worlds)
+world-settings:
+  # Example of how to configure world-specific settings for merging XP orbs
+  # These settings will override the global settings for specific worlds
+  overworld:
+    merge-radius: 2.0
+    min-xp-to-merge: 5
+    merge-interval-seconds: 10
+    enable-instant-collect: true
+    enable-merging: true
+    xp-boost-multiplier: 1.1
+    enable-xp-boost: true
+    enable-merge-animations: true
+  nether:
+    merge-radius: 3.0  # Different radius for the Nether
+    min-xp-to-merge: 10
+    merge-interval-seconds: 15  # Longer interval for Nether
+    enable-instant-collect: false  # Disabled instant collect in the Nether
+    enable-merging: true
+    xp-boost-multiplier: 1.2  # Higher XP boost in the Nether
+    enable-xp-boost: true
+    enable-merge-animations: false  # Disable animations in the Nether
+

src/plugins/Orebfuscator/config.yml

@@ -220,11 +220,11 @@ proximity:
     - world
     distance: 24
     frustumCulling:
-      enabled: true
+      enabled: false
       minDistance: 3.0
       fov: 80.0
     rayCastCheck:
-      enabled: true
+      enabled: false
       onlyCheckCenter: true
     useBlockBelow: true
     hiddenBlocks:

src/plugins/SeeMore/config.yml

@@ -0,0 +1,20 @@
+# Configuration for SeeMore.
+
+# Please don't change this!
+version: 2
+
+# The delay (in ticks) before a player's view distance is lowered after their client settings change.
+#  * This stops players overloading the server by constantly changing their view distance.
+update-delay: 600
+
+# Whether the plugin should log to the console when it changes a player's view distance.
+log-changes: true
+
+# These settings can be specified per world.
+#  * Note: If a world is not listed here or if a setting is missing, it will use the settings listed under the default
+#    section.
+world-settings:
+  default:
+    # The maximum view distance a player in this world can have.
+    # Set to -1 to use the server's configured view distance for this world.
+    maximum-view-distance: -1

src/server.properties

@@ -53,7 +53,7 @@ resource-pack-sha1=
 server-ip=
 server-name=Unknown Server
 server-port=25565
-simulation-distance=10
+simulation-distance=8
 spawn-animals=true
 spawn-monsters=true
 spawn-npcs=true
@@ -61,5 +61,5 @@ spawn-protection=0
 sync-chunk-writes=true
 text-filtering-config=
 use-native-transport=true
-view-distance=10
+view-distance=8
 white-list=false