Compare commits

..

No commits in common. "develop" and "motd-config" have entirely different histories.

13 changed files with 29 additions and 1164 deletions

View File

@ -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

View File

@ -15,23 +15,9 @@ RUN touch ${DATA_PATH}/pv-groups.json && \
ln -sf ${DATA_PATH}/pv-groups.json \
${CONFIG_PATH}/plugins/pv-addon-groups/groups.json
# 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
@ -67,19 +53,13 @@ ENV SONAR_DB_NAME=sonar_db
ENV SONAR_DB_USERNAME=sonar
ENV SONAR_DB_PASSWORD=0000
WORKDIR ${WORKDIR_PATH}/config
EXPOSE 25565/tcp
# TODO: Make awk commands sapn multiple lines
# TODO: Use one call to awk to perform substitutions
CMD \
# 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" forwarding.secret && \
@ -128,7 +108,4 @@ CMD \
sed -i "s/_SONAR_DB_USERNAME_/${SONAR_DB_USERNAME}/g" plugins/sonar/config.yml && \
sed -i "s/_SONAR_DB_PASSWORD_/${SONAR_DB_PASSWORD}/g" plugins/sonar/config.yml && \
# Change UID and GID of used files to desired values.
chown -R worker:worker ${WORKDIR_PATH} && \
su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar *.jar"
java -Xms${MEMORY} -Xmx${MEMORY} -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar *.jar

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 539 KiB

After

Width:  |  Height:  |  Size: 517 KiB

View File

@ -180,7 +180,7 @@ playerCount:
#
# Read more: https://asl.andre601.ch/profiles/#extraplayers-enabled
#
enabled: false
enabled: true
#
# Set the number that should be added to the online player count to then use as the new max player count.
# Placeholders resolving to numbers can be used here.
@ -242,4 +242,4 @@ playerCount:
#
# Read more: https://asl.andre601.ch/profiles/#onlineplayers-amount
#
amount: 0
amount: 0

View File

@ -1,41 +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
# Valid message types are CHAT and ACTIONBAR. Does nothing on velocity.
message_type: CHAT
groups:
default:
commands:
- server
- register
- login
- changepassword
- premium
- confirmpremium
- cracked
- groups
- skin
subcommands: []
role_moder:
commands:
- vmute
- vunmute
- vmutelist
subcommands: []
role_admin:
commands:
- send
- vbroadcastproxy
subcommands: []

View File

@ -403,8 +403,8 @@ auto-install-translations: true
meta-formatting:
prefix:
format:
- highest_on_track_roles
- highest_on_track_clans
- highest_on_track_staff
duplicates: first-only
start-spacer: "<dark_grey>[</dark_grey>"
middle-spacer: "<dark_grey>]</dark_grey> <dark_grey>[</dark_grey>"

File diff suppressed because it is too large Load Diff

View File

@ -1,16 +1,16 @@
GachiWelcome:
change-interval: 4000
texts:
- "<gradient:#4cd964:#e6c67a><bold>Нажми на кнопочку.</bold></gradient>"
- "<gradient:#e6c67a:#4cd964><bold>Струячим дальше!</bold></gradient>"
- "<gradient:#4cd964:#e6c67a><bold>Оооооооо...</bold></gradient>"
- "<gradient:#e6c67a:#4cd964><bold>ПОИХАЛИ</bold></gradient>"
- "<gradient:#4cd964:#e6c67a><bold>Я посрал!</bold></gradient>"
- "<gradient:#e6c67a:#4cd964><bold>Ясно. Бан.</bold></gradient>"
- "<gradient:#4cd964:#e6c67a><bold>Ооо, щас мы тебя прокачаем</bold></gradient>"
- "<gradient:#e6c67a:#4cd964><bold>АСФУРИЛЛАХ.</bold></gradient>"
- "<gradient:#4cd964:#e6c67a><bold>Бисмастер Бивлакарта?</bold></gradient>"
- "<gradient:#e6c67a:#4cd964><bold>Тошик где мой редстоун?</bold></gradient>"
- "<gradient:#4cd964:#e6c67a><bold>Тьома я зробив ферму свекли!</bold></gradient>"
- "<gradient:#e6c67a:#4cd964><bold>АРА, во всём виновата курица.</bold></gradient>"
- "<gradient:#4cd964:#e6c67a><bold>Мама твоя...</bold></gradient>"
- "<gradient:#ffaa00:#00ff55><bold>Нажми на кнопочку.</bold></gradient>"
- "<gradient:#00ff55:#ffaa00><bold>Струячим дальше!</bold></gradient>"
- "<gradient:#ffaa00:#00ff55><bold>Оооооооо...</bold></gradient>"
- "<gradient:#00ff55:#ffaa00><bold>ПОИХАЛИ</bold></gradient>"
- "<gradient:#ffaa00:#00ff55><bold>Я посрал!</bold></gradient>"
- "<gradient:#00ff55:#ffaa00><bold>Ясно. Бан.</bold></gradient>"
- "<gradient:#ffaa00:#00ff55><bold>Ооо, щас мы тебя прокачаем</bold></gradient>"
- "<gradient:#00ff55:#ffaa00><bold>АСФУРИЛЛАХ.</bold></gradient>"
- "<gradient:#ffaa00:#00ff55><bold>Бисмастер Бивлакарта?</bold></gradient>"
- "<gradient:#00ff55:#ffaa00><bold>Тошик где мой редстоун?</bold></gradient>"
- "<gradient:#ffaa00:#00ff55><bold>Тьома я зробив ферму свекли!</bold></gradient>"
- "<gradient:#00ff55:#ffaa00><bold>АРА, во всём виновата курица.</bold></gradient>"
- "<gradient:#ffaa00:#00ff55><bold>Мама твоя...</bold></gradient>"

View File

@ -3,18 +3,18 @@ header-footer:
enabled: true
disable-condition: '%server%=limbo'
header:
- "<gradient:#4cd964:#e6c67a>&m </gradient>"
- "<gradient:#4cd964:#e6c67a><bold>BEBRASHIELD RELOAD</bold></gradient>"
- "<gradient:#00ff55:#ffaa00>&m </gradient>"
- "<gradient:#00ff55:#ffaa00><bold>BEBRASHIELD RELOAD</bold></gradient>"
- "%animation:GachiWelcome%"
- ""
footer:
- ""
- ""
- "<#e6c67a>TPS:<#4cd964> %server_tps_1%<dark_gray> | </dark_gray><#e6c67a>Ping:<#4cd964> %ping% ms"
- "<#e6c67a>Онлайн: <#4cd964>%server_online%"
- "<gold>TPS:</gold><green> %server_tps_1%</green><dark_gray> | </dark_gray><gold>Ping:</gold><green> %ping% ms</green>"
- "<gold>Онлайн:</gold> <white>%online%</white><dark_gray>/</dark_gray><white>%server_max_players%</white>"
- ""
- "<gradient:#4cd964:#e6c67a> bebrashield.net </gradient>"
- "<gradient:#e6c67a:#4cd964>&m </gradient>"
- "<gradient:#00ff55:#ffaa00> bebrashield.net </gradient>"
- "<gradient:#ffaa00:#00ff55>&m </gradient>"
@ -218,7 +218,7 @@ compensate-for-packetevents-bug: false
# https://github.com/NEZNAMY/TAB/wiki/Feature-guide:-Global-playerlist
global-playerlist:
enabled: false
enabled: true
display-others-as-spectators: false
display-vanished-players-as-spectators: true
isolate-unlisted-servers: false

Binary file not shown.

View File

@ -1,9 +0,0 @@
# Configuration for Velocity Player Limit v1.0.0 by hpfxd.com
# https://github.com/hpfxd/VelocityPlayerLimit
#
# Permission to bypass limit: "velocityplayerlimit.bypass"
# Permission to use /playerlimit: "velocityplayerlimit.command"
show-in-player-list: true
player-limit: 30
kick-message: '&cСервер полон.'

View File

@ -93,7 +93,7 @@ map-1_16-world-names:
#
# 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!
# If this setting is active, the main hand is used instead of the off-hand to trigger the blocking of the player.
# With the main hand, the blocking starts way faster.