Compare commits

..

No commits in common. "develop" and "feature-34" have entirely different histories.

21 changed files with 231 additions and 1260 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.

View File

@ -0,0 +1,110 @@
MyAnimation1:
change-interval: 100
texts:
- '&d-&3--------------'
- '&3-&d-&3-------------'
- '&3--&d-&3------------'
- '&3---&d-&3-----------'
- '&3----&d-&3----------'
- '&3-----&d-&3---------'
- '&3------&d-&3--------'
- '&3-------&d-&3-------'
- '&3--------&d-&3------'
- '&3---------&d-&3-----'
- '&3----------&d-&3----'
- '&3-----------&d-&3---'
- '&3------------&d-&3--'
- '&3-------------&d-&3-'
- '&3--------------&d-'
- '&3-------------&d-&3-'
- '&3------------&d-&3--'
- '&3-----------&d-&3---'
- '&3----------&d-&3----'
- '&3---------&d-&3-----'
- '&3--------&d-&3------'
- '&3-------&d-&3-------'
- '&3------&d-&3--------'
- '&3-----&d-&3---------'
- '&3----&d-&3----------'
- '&3---&d-&3-----------'
- '&3--&d-&3------------'
- '&3-&d-&3-------------'
- '&d-&3--------------'
ServerName:
change-interval: 300
texts:
- '&c&lServerName'
- '&c&n&lServerName'
- '&b&lServerName'
- '&b&l&nServerName'
- '&e&lServerName'
- '&e&n&lServerName'
web:
change-interval: 200
texts:
- '&ewww.domain.com'
- '&ewww.domain.com'
- '&ewww.domain.com'
- '&ewww.domain.com'
- '&ewww.domain.com'
- '&ewww.domain.com'
- '&6w&eww.domain.com'
- '&ew&6w&ew.domain.com'
- '&eww&6w&e.domain.com'
- '&ewww&6.&edomain.com'
- '&ewww.&6d&eomain.com'
- '&ewww.d&6o&emain.com'
- '&ewww.do&6m&eain.com'
- '&ewww.dom&6a&ein.com'
- '&ewww.doma&6i&en.com'
- '&ewww.domai&6n&e.com'
- '&ewww.domain&6.&ecom'
- '&ewww.domain.&6c&eom'
- '&ewww.domain.c&6o&em'
- '&ewww.domain.co&6m'
- '&ewww.domain.com'
- '&ewww.domain.com'
- '&ewww.domain.com'
- '&ewww.domain.com'
- '&ewww.domain.com'
- '&ewww.domain.com'
vote:
change-interval: 1000
texts:
- '&avote.domain.com'
- '&a&nvote.domain.com'
- '&5vote.domain.com'
- '&5&nvote.domain.com'
Welcome:
change-interval: 400
texts:
- '&7&lW_'
- '&7&lW_'
- '&7&lWe_'
- '&7&lWel_'
- '&7&lWelc_'
- '&7&lWelco_'
- '&7&lWelcom_'
- '&7&lWelcome_'
- '&7&lWelcome_'
- '&7&lWelcome_'
- '&7&lWelcome_'
- '&7&lWelcom_'
- '&7&lWelco_'
- '&7&lWelc_'
- '&7&lWel_'
- '&7&lWe_'
- '&7&lW_'
- '&7&lW_'
time:
change-interval: 3000
texts:
- '&7Time &b%time%'
- '&7Date &b%date%'
barcolors:
change-interval: 1000
texts:
- RED
- BLUE
- GREEN
- YELLOW

View File

@ -1,22 +1,33 @@
# https://github.com/NEZNAMY/TAB/wiki/Feature-guide:-Header-&-Footer
header-footer:
enabled: true
disable-condition: '%server%=limbo'
header:
- "<gradient:#4cd964:#e6c67a>&m </gradient>"
- "<gradient:#4cd964:#e6c67a><bold>BEBRASHIELD RELOAD</bold></gradient>"
- "%animation:GachiWelcome%"
- "<#FFFFFF>&m </#FFFF00>"
- "<gradient:#B7E4C7:#FFD8A8>Bebrashield:re</gradient>"
- "<gradient:#B7E4C7:#FFD8A8>%server_name%</gradient>"
- ""
footer:
- ""
- ""
- "<#e6c67a>TPS:<#4cd964> %server_tps_1%<dark_gray> | </dark_gray><#e6c67a>Ping:<#4cd964> %ping% ms"
- "<#e6c67a>Онлайн: <#4cd964>%server_online%"
- ""
- "<gradient:#4cd964:#e6c67a> bebrashield.net </gradient>"
- "<gradient:#e6c67a:#4cd964>&m </gradient>"
- "<gradient:#B7E4C7:#FFD8A8>TPS: %server_tps_1% | Ping: %ping% ms</gradient>"
- "<gradient:#FFD8A8:#B7E4C7> bebrashield.net </gradient>"
- "<#FFFF00>&m </#FFFFFF>"
disable-condition: '%world%=disabledworld'
per-world:
world1:
header:
- "an example of world with custom"
footer:
- "header/footer and prefix/suffix"
world2;world3:
header:
- "This is a shared header for"
- "world2 and world3"
per-server:
server1:
header:
- "an example of server with custom header"
# https://github.com/NEZNAMY/TAB/wiki/Feature-guide:-Tablist-name-formatting
tablist-name-formatting:
@ -25,12 +36,12 @@ tablist-name-formatting:
# https://github.com/NEZNAMY/TAB/wiki/Feature-guide:-Nametags
scoreboard-teams:
enabled: false
enable-collision: false
enabled: true
enable-collision: true
invisible-nametags: false
# https://github.com/NEZNAMY/TAB/wiki/Feature-guide:-Sorting-players-in-tablist
sorting-types:
- "GROUPS:owner,clans,admin,mod,helper,builder,vip,default"
- "GROUPS:owner,admin,mod,helper,builder,vip,default"
- "PLACEHOLDER_A_TO_Z:%player%"
case-sensitive-sorting: true
can-see-friendly-invisibles: false
@ -84,10 +95,34 @@ scoreboard:
scoreboard-1.20.3+:
title: "<#E0B11E>MyServer</#FF0000>"
display-condition: "%player-version-id%>=765;%bedrock%=false" # Only display it to players using 1.20.3+ AND NOT bedrock edition
lines: []
lines:
- "&7%date%"
- "%animation:MyAnimation1%"
- "&6Online:"
- "* &eOnline&7:||%online%"
- "* &eCurrent World&7:||%worldonline%"
- "* &eStaff&7:||%staffonline%"
- ""
- "&6Personal Info:"
- "* &bRank&7:||%group%"
- "* &bPing&7:||%ping%&8ms"
- "* &bWorld&7:||%world%"
- "%animation:MyAnimation1%"
scoreboard:
title: "<#E0B11E>MyServer</#FF0000>"
lines: []
lines:
- "&7%date%"
- "%animation:MyAnimation1%"
- "&6Online:"
- "* &eOnline&7: &f%online%"
- "* &eCurrent World&7: &f%worldonline%"
- "* &eStaff&7: &f%staffonline%"
- ""
- "&6Personal Info:"
- "* &bRank&7: &f%group%"
- "* &bPing&7: &f%ping%&8ms"
- "* &bWorld&7: &f%world%"
- "%animation:MyAnimation1%"
# https://github.com/NEZNAMY/TAB/wiki/Feature-guide:-Layout
layout:
@ -99,7 +134,24 @@ layout:
empty-slot-ping-value: 1000
layouts:
default:
fixed-slots: []
fixed-slots:
- '1|&3Website&f:'
- '2|&bmyserver.net'
- '3|&8&m '
- '4|&3Name&f:'
- '5|&b%player%'
- '7|&3Rank&f:'
- '8|Rank: %group%'
- '10|&3World&f:'
- '11|&b%world%'
- '13|&3Time&f:'
- '14|&b%time%'
- '21|&3Teamspeak&f:'
- '22|&bts.myserver.net'
- '23|&8&m '
- '41|&3Store&f:'
- '42|&bshop.myserver.net'
- '43|&8&m '
groups:
staff:
condition: permission:tab.staff
@ -223,11 +275,16 @@ global-playerlist:
display-vanished-players-as-spectators: true
isolate-unlisted-servers: false
update-latency: false
spy-servers: []
spy-servers:
- spyserver1
- spyserver2
server-groups:
servers:
- lobby
- survival
lobbies:
- lobby1
- lobby2
group2:
- server1
- server2
# Take permissions and groups from backend server instead of proxy
use-bukkit-permissions-manager: false
@ -235,4 +292,4 @@ use-bukkit-permissions-manager: false
# Sometimes server might be using offline uuids in tablist instead of online, such as disabling waterfall's tablist rewrite option
# If you experience tablist formatting not working, toggle this option (set it to opposite value)
# Only affects proxies with online mode enabled
use-online-uuid-in-tablist: false
use-online-uuid-in-tablist: true

View File

@ -0,0 +1,25 @@
#Owner:
# tabprefix: "&0&l[&a&lOwner&0&l] &a"
# tagprefix: "&2&lOwner &a"
Player:
tabprefix: "&0&l[&7&lPlayer&0&l] &3"
tagprefix: "&2&lPlayer &3"
example_group:
header:
- "This is an example of per-group header/footer"
footer:
- "applied to a group"
# default settings for all groups, all groups will take properties from this section unless player's primary group overrides a specific setting
_DEFAULT_:
tabprefix: "%luckperms-prefix%"
tagprefix: "%luckperms-prefix%"
customtabname: "%player%"
tabsuffix: "%luckperms-suffix%"
tagsuffix: "%luckperms-suffix%"
per-world:
world1:
Owner:
tabprefix: "&0&l[&a&lOwner&0&l] &a"
tagprefix: "&2&lOwner &a"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 539 KiB

View File

@ -33,40 +33,10 @@ condition: ''
# Read more: https://asl.andre601.ch/profiles/#profiles
#
profiles:
- motd: ['<aqua>Welcome to the club Bebrashield:re', '<gold>your mom is pretty']
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> А чё, когда барьер расширять будете? "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Колёса крутятся алмазы мутятся! "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> А там точно не лазуритный блок? "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> О, что это за берёза? "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Стойте! Проходите! Стойте! А ты уходи! "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Нюхай бебру! "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Ну это 100% соя. "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Лес летающих деревьев... "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> О погоде - в Византии сегодня потоп! "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Чё, когда бан пикси? "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Я князь тьмы! Нет, ты сясь тьома. "
- '<aqua>Bebrashield 2.0 also try Bebrashield:re'
- '<gold>you look like Billy'
#
# Set the "Message of the day" to display.
@ -112,7 +82,7 @@ motd:
# This should only happen for the first ping of a player and subsequent pings should display the favicon, if the
# pings are done within the configured cache time (See 'faviconCacheTime' in the config.yml).
#
favicon: 'logo.png'
favicon: ''
#
# Contains options for modifying the player count (Text displaying <online>/<max>).
@ -149,8 +119,8 @@ playerCount:
# Read more: https://asl.andre601.ch/profiles/#hover
#
hover:
- '<white>Чё вылупился?'
- '<white>Заходи!'
- '<aqua>Чё'
- '<yellow>Вылупился'
#
# Set the text that should be displayed instead of the default '<online>/<max>' text.
#
@ -180,7 +150,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 +212,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,12 +403,11 @@ auto-install-translations: true
meta-formatting:
prefix:
format:
- highest_on_track_roles
- highest_on_track_clans
- "highest"
duplicates: first-only
start-spacer: "<dark_grey>[</dark_grey>"
middle-spacer: "<dark_grey>]</dark_grey> <dark_grey>[</dark_grey>"
end-spacer: "<dark_grey>] </dark_grey>"
start-spacer: "["
middle-spacer: " "
end-spacer: "]"
suffix:
format:
- "highest"

File diff suppressed because it is too large Load Diff

View File

@ -1,16 +0,0 @@
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>"

View File

@ -1,6 +0,0 @@
_DEFAULT_:
tabprefix: "%luckperms-prefix%"
tagprefix: "%luckperms-prefix%"
customtabname: "%player%"
tabsuffix: "%luckperms-suffix%"
tagsuffix: "%luckperms-suffix%"

Binary file not shown.

View File

@ -1,14 +0,0 @@
server:
name: "proxy"
metrics:
enabled: true
driver: "prometheus"
collectors:
systemGc: true
systemMemory: true
systemProcess: true
systemThread: true
server: true
world: true
tick: true
events: true

View File

@ -1,16 +0,0 @@
mode: "HTTP"
http:
host: "0.0.0.0"
port: 9100
authentication:
scheme: "NONE"
username: "username"
password: "password"
pushGateway:
job: "unifiedmetrics"
url: "http://pushgateway:9091"
authentication:
scheme: "NONE"
username: "username"
password: "password"
interval: 10

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.