Merge pull request 'bug-88-fix-too-may-packets-kick' (#46) from bug-88 into develop

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

.dockerignore

@@ -46,3 +46,5 @@ src/plugins/BlueMap/data/minecraft-client-1.21.jar
 src/plugins/BMMarker/data
 
 src/plugins/LibertyBans/internal
+
+src/plugins/Chunky/tasks

.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            

.gitignore

@@ -46,3 +46,5 @@ src/plugins/BlueMap/data/minecraft-client-1.21.jar
 src/plugins/BMMarker/data
 
 src/plugins/LibertyBans/internal
+
+src/plugins/Chunky/tasks

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
@@ -61,12 +63,6 @@ RUN mkdir -p ${DATA_PATH}/CustomizablePlayerModels && \
     ln -sf ${DATA_PATH}/CustomizablePlayerModels/ \
         ${CONFIG_PATH}/plugins/CustomizablePlayerModels
 
-# Add symlinks to DiscordSRV files
-RUN mkdir -p ${DATA_PATH}/DiscordSRV && \
-    touch ${DATA_PATH}/DiscordSRV/accounts.aof && \
-    ln -sf ${DATA_PATH}/DiscordSRV/accounts.aof \
-        ${CONFIG_PATH}/plugins/DiscordSRV/accounts.aof
-
 # Add symlinks to BlueMap files
 RUN mkdir -p ${DATA_PATH}/BlueMap/maps && \
     mkdir -p ${DATA_PATH}/BlueMap/logs && \
@@ -78,10 +74,31 @@ RUN mkdir -p ${DATA_PATH}/BMMarker/data && \
     ln -sf ${DATA_PATH}/BMMarker/data \
         ${CONFIG_PATH}/plugins/BMMarker/data
 
+# Add symlinks to Chunky files
+RUN mkdir -p ${DATA_PATH}/Chunky/tasks && \
+    ln -sf ${DATA_PATH}/Chunky/tasks \
+        ${CONFIG_PATH}/plugins/Chunky/tasks
+
+# 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}
 
 
+# Minecraft
+EXPOSE 25565/tcp
+# BlueMap
+EXPOSE 8100/tcp 
+
+
+ENV GID=988
+ENV UID=999
+
 ENV MEMORY=4G
 ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000
 
@@ -119,15 +136,37 @@ ENV GRIM_DB_PASSWORD=0000
 
 ENV DISCORDSRV_BOT_TOKEN=dummy-token
 
+ENV DISCORDSRV_DB_HOST=127.0.0.1
+ENV DISCORDSRV_DB_PORT=3306
+ENV DISCORDSRV_DB_NAME=discordsrv_db
+ENV DISCORDSRV_DB_USERNAME=discordsrv
+ENV DISCORDSRV_DB_PASSWORD=0000
+
 
 WORKDIR ${WORKDIR_PATH}/config
 
-# Minecraft
-EXPOSE 25565/tcp
-# BlueMap
-EXPOSE 8100/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 && \
+    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.
+    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 && \
 
@@ -172,5 +211,15 @@ CMD \
     # Add DiscordSRV bot token
     sed -i "s/_DISCORDSRV_BOT_TOKEN_/${DISCORDSRV_BOT_TOKEN}/g" plugins/DiscordSRV/config.yml && \
 
+    # Add database info to DiscordSRV config
+    sed -i "s/_DISCORDSRV_DB_HOST_/${DISCORDSRV_DB_HOST}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_PORT_/${DISCORDSRV_DB_PORT}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_NAME_/${DISCORDSRV_DB_NAME}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_USERNAME_/${DISCORDSRV_DB_USERNAME}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_PASSWORD_/${DISCORDSRV_DB_PASSWORD}/g" plugins/DiscordSRV/config.yml && \
+
+    # Change UID and GID of used files to desired values.
+    chown -R worker:worker ${WORKDIR_PATH} && \
+
     # Launch
-    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/config/paper-global.yml

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

src/plugins/BMMarker/settings.json

@@ -1,5 +1,5 @@
 {
     "language": "en",
-    "maxUserSets": 1,
+    "maxUserSets": 100,
-    "maxUserMarker": 5
+    "maxUserMarker": 1000
-}
+}

src/plugins/CarbonChat/channels/global.conf

@@ -20,7 +20,7 @@ format {
     #     }
     # 
     basic {
-        "default_format"="<gray>[<color:#4cd964>G</color>]</gray> %luckperms_prefix% <white><username> <grey>></grey> <message></white>"
+        "default_format"="<dark_grey>[<color:#4cd964>Global</color>]</dark_grey> %luckperms_prefix%<white><username> <grey>></grey> <message></white>"
         discord="<message>"
         console="[G] <username>: <message>"
     }

src/plugins/CarbonChat/channels/local.conf

@@ -20,7 +20,7 @@ format {
     #     }
     # 
     basic {
-        "default_format"="<gray>[L]</gray> %luckperms_prefix% <grey><username></grey> <dark_grey>></dark_grey> <grey><message></grey>"
+        "default_format"="<dark_grey>[<#e6c67a>Local</#e6c67a>]</dark_grey> %luckperms_prefix%<grey><username></grey> <dark_grey>></dark_grey> <grey><message></grey>"
         discord="<message>"
         console="[<channel>] <username>: <message>"
     }

src/plugins/CarbonChat/command-settings.conf

@@ -43,7 +43,7 @@ settings {
         ]
     }
     "carbon:unmute" {
-        enabled=true
+        enabled=false
         name=unmute
         aliases=[]
     }
@@ -100,7 +100,7 @@ settings {
         ]
     }
     "carbon:muteinfo" {
-        enabled=true
+        enabled=false
         name=muteinfo
         aliases=[
             muted
@@ -114,7 +114,7 @@ settings {
         ]
     }
     "carbon:mute" {
-        enabled=true
+        enabled=false
         name=mute
         aliases=[]
     }

src/plugins/CarbonChat/locale/messages-en_US.properties

@@ -153,10 +153,10 @@ reply.target.self=<red>You cannot whisper to yourself
 whisper.console=<gold>[<green><sender_display_name></green>] -> [<green><recipient_display_name></green>] <message>
 whisper.continue.target_missing=<red>You have no one to whisper
 whisper.error=<red>Failed to send private message
-whisper.from=<click\:suggest_command\:'/whisper <sender_username> '><hover\:show_text\:'Click to start a reply'><gold>[<green><sender_display_name></green>] -> [<green>You</green>] <message>
+whisper.from=<click\:suggest_command\:'/whisper <sender_username> '><hover\:show_text\:'Click to start a reply'><dark_grey>[<grey><sender_display_name></grey>] -> [<grey>You</grey>] <grey>></grey> <message>
 whisper.ignored_by_target=<red><target> <red>is ignoring you
 whisper.ignoring_all=<red>You cannot send messages while they are ignored\!
 whisper.ignoring_target=<red>You are ignoring <target>
-whisper.to=<click\:suggest_command\:'/whisper <recipient_username> '><hover\:show_text\:'Click to start another message to <recipient_display_name>'><gold>[<green>You</green>] -> [<green><recipient_display_name></green>] <message>
+whisper.to=<click\:suggest_command\:'/whisper <recipient_username> '><hover\:show_text\:'Click to start another message to <recipient_display_name>'><dark_grey>[<grey>You</grey>] -> [<grey><recipient_display_name></grey>] <grey>></grey> <message>
 whisper.toggled.off=No longer receiving private messages.
 whisper.toggled.on=Now receiving private messages.

src/plugins/Chunky/config.yml

@@ -0,0 +1,9 @@
+# Chunky Configuration
+# https://github.com/pop4959/Chunky/wiki/Configuration
+
+version: 2
+language: en
+continue-on-restart: false
+force-load-existing-chunks: false
+silent: false
+update-interval: 5

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/CommandWhitelist/config.yml

@@ -0,0 +1,81 @@
+
+# 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
+    - ignore
+    - unignore
+    - discord
+    - imageframe
+    subcommands:
+    - discord ?
+    - discord help
+    - discord link
+    - discord linked
+    - discord clearlinked
+  role_moder:
+    commands:
+    - ban
+    - unban
+    - ipban
+    - unbanip
+    - banlist
+    - mute
+    - unmute
+    - ipmute
+    - unmuteip
+    - mutelist
+    - warn
+    - unwarn
+    - ipwarn
+    - unwarnip
+    - warns
+    - history
+    - alts
+    - kick
+    - ipkick
+    - blame
+    - vanish
+    - openender
+    - openinv
+    - grim
+    - coreprotect
+    - vmute
+    - vunmute
+    - vmutelist
+    - gamemode
+    - tp
+    subcommands:
+    - gamemode adventure
+    - gamemode creative
+  role_admin:
+    commands:
+    - luckperms
+    - searchender
+    - searchenchant
+    - searchcontainer
+    - bmarker
+    - bmarker-setup
+    - bmarker-setup-set
+    subcommands: []

src/plugins/DiscordSRV/config.yml

@@ -27,22 +27,22 @@ BotToken: "_DISCORDSRV_BOT_TOKEN_"
 #
 # Первая часть пар каналов не является названием канала Discord!
 # Выполните "/discord reload" после изменения этого опции для применения
-Channels: {"global": "1394245250096173076"}
+Channels: {"carbon:global": "1401248428087836803"}
 
 # Канал для вывода сообщений Консоли (НЕ ИМЯ); оставьте пустым, чтобы отключить консольный канал
 DiscordConsoleChannelId: ""
 
 # Ссылка на приглашение, отображаемая игрокам при использовании /discord, и в сообщении, отображаемом несвязанным игрокам при обязательной привязке.
-DiscordInviteLink: "https://discord.gg/xsyy7d8RfG"
+DiscordInviteLink: "https://discord.gg/5ZnJD4yDBq"
 
 # Эксперименты
 # Эти функции не полностью оптимизированы; Используйте на свой риск
 
 # JDBC (MySQL/MariaDB)
-Experiment_JdbcAccountLinkBackend: "jdbc:mysql://HOST:PORT/NAME?autoReconnect=true&useSSL=false"
+Experiment_JdbcAccountLinkBackend: "jdbc:mysql://_DISCORDSRV_DB_HOST_:_DISCORDSRV_DB_PORT_/_DISCORDSRV_DB_NAME_?autoReconnect=true&useSSL=false"
-Experiment_JdbcTablePrefix: ""
+Experiment_JdbcTablePrefix: "discordsrv"
-Experiment_JdbcUsername: ""
+Experiment_JdbcUsername: "_DISCORDSRV_DB_USERNAME_"
-Experiment_JdbcPassword: ""
+Experiment_JdbcPassword: "_DISCORDSRV_DB_PASSWORD_"
 
 # Webhook Delivery
 Experiment_WebhookChatMessageDelivery: false
@@ -72,7 +72,7 @@ MaximumAttemptsForSystemDNSBeforeUsingFallbackDNS: 3
 TimestampFormat: EEE, d. MMM yyyy HH:mm:ss z
 DateFormat: yyyy-MM-dd
 # https://docs.discordsrv.com/config/#Timezone
-Timezone: default
+Timezone: Europe/Kiev
 # MinecraftMentionSound: Должен ли звук посылаться игроку в Minecraft при упоминании из Discord
 MinecraftMentionSound: true
 
@@ -101,7 +101,7 @@ UseModernPaperChatEvent: false
 # StatusUpdateRateInMinutes: Как часто (в минутах) менять статус (если их несколько)
 DiscordGameStatus: ["Синхронизирует Бебру"]
 DiscordOnlineStatus: ONLINE
-StatusUpdateRateInMinutes: 2
+StatusUpdateRateInMinutes: 1
 
 # Настройка канала чата
 # Канал чата предназначен для вывода всех внутриигровых сообщений, а также всех публичных сообщений, которыми обмениваются игроки
@@ -128,14 +128,14 @@ StatusUpdateRateInMinutes: 2
 # DiscordChatChannelRolesSelection: список ролей, которые должны быть отфильтрованы по всем ролям пользователя.
 # DiscordChatChannelRoleAliases: список псевдонимов ролей (альтернативные имена для ролей для использования в сообщениях Minecraft)
 #
-DiscordChatChannelDiscordToMinecraft: true
+DiscordChatChannelDiscordToMinecraft: false
-DiscordChatChannelMinecraftToDiscord: true
+DiscordChatChannelMinecraftToDiscord: false
 DiscordChatChannelTruncateLength: 256
 DiscordChatChannelTranslateMentions: true
 DiscordChatChannelAllowedMentions: [user, channel, emote]
 DiscordChatChannelEmojiBehavior: "name"
 DiscordChatChannelEmoteBehavior: "name"
-DiscordChatChannelPrefixRequiredToProcessMessage: "!д"
+DiscordChatChannelPrefixRequiredToProcessMessage: "#"
 DiscordChatChannelPrefixActsAsBlacklist: false
 DiscordChatChannelRolesAllowedToUseColorCodesInChat: ["Developer", "Owner", "Admin", "Moderator"]
 DiscordChatChannelBroadcastDiscordMessagesToConsole: true
@@ -299,7 +299,7 @@ DiscordCannedResponses: {"!ip": "bebrashield.net", "!site": "https://bebrashield
 #
 MinecraftDiscordAccountLinkedConsoleCommands: ["", "", ""]
 MinecraftDiscordAccountUnlinkedConsoleCommands: ["", "", ""]
-MinecraftDiscordAccountLinkedRoleNameToAddUserTo: "Бебра"
+MinecraftDiscordAccountLinkedRoleNameToAddUserTo: "1399136491090739210"
 MinecraftDiscordAccountLinkedAllowRelinkBySendingANewCode: true
 MinecraftDiscordAccountLinkedUsePM: true
 MinecraftDiscordAccountLinkedMessageDeleteSeconds: 0

src/plugins/DiscordSRV/linking.yml

@@ -14,7 +14,7 @@ Require linked account to play:
   # Если вы не знаете, что это такое - не трогайте.
 
   # Ники в Minecraft, которые могут заходить на сервер без подписки/привязки?
-  Bypass names: [Scarsz, Vankka]
+  Bypass names: []
   # Имеют ли люди из ванильного вайтлиста право входить на сервер без подписки/привязки?
   Whitelisted players bypass check: true
   # Разрешить или запретить игрокам из бан-листа VANILLA связывать свои аккаунты
@@ -26,7 +26,7 @@ Require linked account to play:
   # Используйте {BOT} в качестве заполнителя для имени бота
   # Используйте {CODE} в качестве заполнителя для кода, который надо отправить боту
   # Используйте {INVITE} в качестве заполнителя для ссылки-приглашения, которая необходима людям для присоединения к серверу Discord (использует DiscordInviteLink, настроенный в config.yml)
-  Not linked message: "&7Вы должны связать свою учетную запись &9Discord&7, чтобы играть.\n\n&7Отправьте сообщение боту &b{BOT}&7 на сервере Discord с кодом &b{CODE}&7, чтобы привязать аккаунт.\n\n&7Ссылка-приглашение » &b{INVITE}"
+  Not linked message: "&7Вы должны связать свою учетную запись &9Discord&7, чтобы играть.\n\n&7Отправьте сообщение боту &#e6c67a{BOT}&7 на сервере Discord с кодом &#e6c67a{CODE}&7, чтобы привязать аккаунт."
 
   # Если включено, игрокам нужно будет не только связать свои аккаунты, но и потребуется
   # быть участником сервера Discord, на котором находится бот.
@@ -44,10 +44,10 @@ Require linked account to play:
 
   # Можно требовать не только привязку аккаунта, но и наличие специальной роли, например Twitch
   Subscriber role:
-    Require subscriber role to join: false
+    Require subscriber role to join: true
-    Subscriber roles: ["00000000000000000", "00000000000000000", "00000000000000000"]
+    Subscriber roles: ["1399048944482259135", "1399048955291111495", "1399048958147301407", "1371492083281563728", ""]
     Require all of the listed roles: false # при значении false требуется только одна из указанных выше ролей, при true - все роли.
-    Kick message: "&cВы должны быть подписаны на Twitch, чтобы иметь возможность играть."
+    Kick message: "&cВы должны пройти верификацию модерации на сервере Discord, чтобы иметь возможность играть."
 
   Messages:
     DiscordSRV still starting: "&cВ настоящее время невозможно проверить состояние ссылки, поскольку сервер все еще подключается к Discord.\n\nПопробуйте еще раз через минуту."

src/plugins/DiscordSRV/messages.yml

@@ -367,7 +367,7 @@ MinecraftPlayerAchievementMessage:
 # %tps%:           средний TPS сервера
 # Также поддерживаются PlaceholderAPI шаблоны
 #
-ChannelTopicUpdaterChatChannelTopicFormat: "%playercount%/%playermax% игроков онлайн | %totalplayers% уникальных игроков | Сервер запущен уже %uptimemins% минут | Обновлено: %date%"
+ChannelTopicUpdaterChatChannelTopicFormat: "%playercount% игроков онлайн | %totalplayers% игроков было всего | Сервер запущен уже %uptimemins% минут | Обновлено: %date%"
 ChannelTopicUpdaterConsoleChannelTopicFormat: "TPS: %tps% | Mem: %usedmemorygb%GB исп/%freememorygb%GB своб/%maxmemorygb%GB макс | %serverversion%"
 # AtServerShutdownFormats поддерживает только %totalplayers%, %serverversion%, & %date% / %time%
 ChannelTopicUpdaterChatChannelTopicAtServerShutdownFormat: "Сервер отключён | %totalplayers% уникальных игроков"

src/plugins/DiscordSRV/synchronization.yml

@@ -33,7 +33,7 @@ NicknameSynchronizationFormat: "%displayname%"
 # GroupRoleSynchronizationCycleTime: Время (в минутах) - как часто DiscordSRV будет синхронизировать роли и группы игроков.
 # GroupRoleSynchronizationCycleCompletely: должна ли синхронизация, запущенная по таймеру, синхронизировать каждого участника на серверах Discord ботов
 #
-GroupRoleSynchronizationGroupsAndRolesToSync: {"player": "1371491528786182216"}
+GroupRoleSynchronizationGroupsAndRolesToSync: {"role_player": "1399136491090739210"}
 GroupRoleSynchronizationMinecraftIsAuthoritative: true
 GroupRoleSynchronizationOneWay: false
 GroupRoleSynchronizationEnableDenyPermission: false

src/plugins/ImageFrame/config.yml

@@ -121,7 +121,8 @@ Settings:
   # For example "imageframe.createlimit.vip"
   # Players with no groups will be treated as "default" unless they have "imageframe.createlimit.unlimited"
   PlayerCreationLimit:
-    default: 10
+    default: 3
+    role_elder: 10
     vip: 15
     moderator: 20
   # Max amount of markers on an individual map

src/plugins/LibertyBans/config.yml

@@ -9,11 +9,13 @@ durationPermissions:
    # Specify all the durations which you want to explicitly grant permission for.
   permissions-to-check:
     - 'perm'
-    - '4h'
+    - '7d'
-    - '30d'
+    - '14d'
-    - '10d'
+    - '28d'
+    - '90d'
+    - '180d'
    # If disabled, players are not checked for duration permissions.
-  enable: false
+  enable: true
 
  # Formatting of absolute dates
 date-formatting:
@@ -25,7 +27,7 @@ date-formatting:
 
  # What language file should be used for messages?
  # For example, 'en' means LibertyBans will look for a file called 'messages_en.yml'
-lang-file: 'en'
+lang-file: 'ru'
  # Options related to punishment enforcement and alt account checking
  # 
  # -- Alt Account Enforcement and Checking --

src/plugins/LibertyBans/lang/messages_en.yml

@@ -149,7 +149,6 @@ additions:
       - ''
       - '&3&lAppeal Your Punishment&f'
       - '&cWebsite: &7https://bebrashield.net&f'
-      - '&cDiscord: &7https://discord.gg/xsyy7d8RfG'
     permission:
       duration: '&cYou may not do this for &e%DURATION%&c.'
       both: '&cYou may not do this to players and their IP addresses.'
@@ -480,7 +479,7 @@ all:
      # The prefix to use
     value: '&6&lLibertyBans &8»&7 '
      # If enabled, all messages will be prefixed
-    enable: true
+    enable: false
 
    # This section is only relevant if using the server scopes feature
   scopes:

src/plugins/LibertyBans/lang/messages_ru.yml

@@ -134,7 +134,7 @@ all:
   base-permission-message: '&cТы уверен, что оно тебе нужно? К слову, права на эту команду у тебя нет.'
   prefix:
     # If enabled, all messages will be prefixed
-    enable: true
+    enable: false
     # The prefix to use
     value: '&6&lLibertyBans &8»&7 '
 
@@ -197,8 +197,8 @@ additions:
       - '&cПричина&f'
       - '&7%REASON%&f'
       - ''
-      - '&3По поводу разбана пишите в тех.поддержку:&f'
+      - '&3По поводу разбана пишите администрации:&f'
-      - '&cwww.support.com'
+      - '&cWebsite: &7https://bebrashield.net&f'
     permission:
       duration: '&cТебе нельзя банить на &e%DURATION%&c.'
       both: '&cВы не можете блокировать игроков.'

src/plugins/LibertyBans/sql.yml

@@ -77,11 +77,11 @@ timeouts:
 
  # Authentication details for remote databases: used for MariaDB, MySQL, PostgreSQL, and CockroachDB.
 auth-details:
-  database: 'minecraft_db'
+  host: '_LIBERTYBANS_DB_HOST_'
-  password: '0000'
+  port: _LIBERTYBANS_DB_PORT_
-  user: 'minecraft'
+  database: '_LIBERTYBANS_DB_NAME_'
-  host: '127.0.0.1'
+  user: '_LIBERTYBANS_DB_USERNAME_'
-  port: 3306
+  password: '_LIBERTYBANS_DB_PASSWORD_'
 
  # The values in this section only apply when using a MariaDB or MySQL database
 mariadb:
@@ -111,7 +111,7 @@ use-traditional-jdbc-url: false
  # 'MYSQL' - Requires an external MySQL database. At least MySQL 8.0 is required.
  # 'POSTGRES' - Requires an external PostgreSQL database. At least PostgreSQL 12 is required.
  # 'COCKROACH' - Requires an external CockroachDB database. The latest CockroachDB is required. Warning: this option is strictly experimental.
-rdms-vendor: 'HSQLDB'
+rdms-vendor: 'MARIADB'
  # 
  # How large should the connection pool be?
  # A thread pool of similar size is derived from the connection pool size.

src/plugins/LuckPerms/config.yml

@@ -31,7 +31,7 @@
 # - When set to "global" this setting is effectively ignored.
 # - In all other cases, the value here is added to all players in a "server" context.
 # - See: https://luckperms.net/wiki/Context
-server: lobby
+server: survival
 
 # If the servers own UUID cache/lookup facility should be used when there is no record for a player
 # already in LuckPerms.
@@ -404,11 +404,13 @@ auto-install-translations: true
 meta-formatting:
   prefix:
     format:
-      - "highest"
+      - highest_on_track_roles
+      - highest_on_track_clans
+      
     duplicates: first-only
-    start-spacer: "["
+    start-spacer: "<dark_grey>[</dark_grey>"
-    middle-spacer: " "
+    middle-spacer: "<dark_grey>]</dark_grey> <dark_grey>[</dark_grey>"
-    end-spacer: "]"
+    end-spacer: "<dark_grey>] </dark_grey>"
   suffix:
     format:
       - "highest"

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/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: 800
+max-pps: -1
 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/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