.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}}:${{github.sha}}
-            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.ref_name}}
+            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}/${{github.ref_name}}:latest            
-            ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:latest            

Dockerfile

@@ -9,25 +9,23 @@ ADD ./src ${CONFIG_PATH}
 RUN  mkdir ${DATA_PATH}
 
 
-# Add symlinks to Minecraft Vanilla files
+# Add symlinks to Default Minecraft files
-RUN mkdir ${DATA_PATH}/Vanilla && \
+RUN touch ${DATA_PATH}/banned-ips.json && \
-    touch ${DATA_PATH}/Vanilla/banned-ips.json && \
+    ln -sf ${DATA_PATH}/banned-ips.json ${CONFIG_PATH}
-        ln -sf ${DATA_PATH}/Vanilla/banned-ips.json ${CONFIG_PATH} && \
+RUN touch ${DATA_PATH}/banned-players.json && \
-    touch ${DATA_PATH}/Vanilla/banned-players.json && \
+    ln -sf ${DATA_PATH}/banned-players.json ${CONFIG_PATH}
-        ln -sf ${DATA_PATH}/Vanilla/banned-players.json ${CONFIG_PATH} && \
+RUN mkdir ${DATA_PATH}/logs && \
-    mkdir ${DATA_PATH}/Vanilla/logs && \
+    ln -sf ${DATA_PATH}/logs ${CONFIG_PATH}
-        ln -sf ${DATA_PATH}/Vanilla/logs ${CONFIG_PATH} && \
+RUN touch ${DATA_PATH}/ops.json && \
-    touch ${DATA_PATH}/Vanilla/ops.json && \
+    ln -sf ${DATA_PATH}/ops.json ${CONFIG_PATH}
-        ln -sf ${DATA_PATH}/Vanilla/ops.json ${CONFIG_PATH} && \
+RUN touch ${DATA_PATH}/usercache.json && \
-    touch ${DATA_PATH}/Vanilla/usercache.json && \
+    ln -sf ${DATA_PATH}/usercache.json ${CONFIG_PATH}
-        ln -sf ${DATA_PATH}/Vanilla/usercache.json ${CONFIG_PATH} && \
+RUN touch ${DATA_PATH}/whitelist.json && \
-    touch ${DATA_PATH}/Vanilla/whitelist.json && \
+    ln -sf ${DATA_PATH}/whitelist.json ${CONFIG_PATH}
-        ln -sf ${DATA_PATH}/Vanilla/whitelist.json ${CONFIG_PATH}
 
 # Add symlinks to Plasmo Voice files
-RUN mkdir ${DATA_PATH}/PlasmoVoice && \
+RUN touch ${DATA_PATH}/pv-voice_mutes.json && \
-    touch ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json && \
+    ln -sf ${DATA_PATH}/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
@@ -59,20 +57,13 @@ RUN mkdir -p ${DATA_PATH}/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 && \
+    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 +84,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 +107,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/plugins/FancyHolograms/holograms.yml

@@ -53,7 +53,7 @@ holograms:
     shadow_strength: 1.0
     billboard: fixed
     text:
-    - <color:#6558F4>discord.gg/5ZnJD4yDBq</color>
+    - <color:#6558F4>discord.gg/xsyy7d8RfG</color>
     - <gray>Клик</gray>
     text_shadow: false
     see_through: false

src/plugins/FancyNpcs/npcs.yml

@@ -69,8 +69,8 @@ npcs:
           value: minecraft:entity.experience_orb.pickup
         '2':
           action: message
-          value: <click:OPEN_URL:https://discord.gg/5ZnJD4yDBq><color:#6558F4><bold>Discord:</bold></color>
+          value: <click:OPEN_URL:https://discord.gg/xsyy7d8RfG><color:#6558F4><bold>Discord:</bold></color>
-            <grey>https://discord.gg/5ZnJD4yDBq</grey></click>
+            <grey>https://discord.gg/xsyy7d8RfG</grey></click>
   26dee80c-9004-47c6-bbc0-343fe2f2fba7:
     name: link_bebrashield_site
     creator: 3ce31233-217d-3258-8b5e-1f458c4f8e9d

src/plugins/zMenu/inventories/links.yml

@@ -25,13 +25,13 @@ items:
       name: "<color:#6558F4><bold>Discord</bold></color>"
       lore:
         - "<grey>Кликните, чтобы получить ссылку в чате.</grey>"
-        - "<grey>https://discord.gg/5ZnJD4yDBq</grey>"
+        - "<grey>https://discord.gg/xsyy7d8RfG</grey>"
     actions:
       - type: sound
         sound: ENTITY_EXPERIENCE_ORB_PICKUP
       - type: message
         messages:
-          - "<click:OPEN_URL:https://discord.gg/5ZnJD4yDBq><color:#6558F4><bold>Discord:</bold></color> <grey>https://discord.gg/5ZnJD4yDBq</grey></click>"
+          - "<click:OPEN_URL:https://discord.gg/xsyy7d8RfG><color:#6558F4><bold>Discord:</bold></color> <grey>https://discord.gg/xsyy7d8RfG</grey></click>"
       - type: close
 
   telegram: