Compare commits

..

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

7 changed files with 12 additions and 141 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

@ -18,20 +18,13 @@ RUN touch ${DATA_PATH}/pv-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/*
dpkg-reconfigure --frontend=noninteractive locales
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 +60,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 +115,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

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

@ -181,35 +181,6 @@
},
"role_moder": {
"nodes": [
{
"type": "permission",
"key": "velocityplayerlimit.bypass",
"value": true
},
{
"type": "permission",
"key": "imageframe.list.others",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.adminsetcreator",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.admindelete",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "minecraft.command.gamemode.spectator",
@ -606,14 +577,6 @@
},
"role_elder": {
"nodes": [
{
"type": "permission",
"key": "imageframe.createlimit.role_elder",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "commandwhitelist.group.role_elder",
@ -640,7 +603,7 @@
"nodes": [
{
"type": "prefix",
"key": "prefix.10.<color:#c0c0c0>LA ⚔️</color>",
"key": "prefix.10.<aqua>Апатия 💰</aqua>",
"value": true
}
]
@ -649,7 +612,7 @@
"nodes": [
{
"type": "prefix",
"key": "prefix.10.<dark_red>КАМ</dark_red>",
"key": "prefix.10.<dark_red>KAM ⚒</dark_red>",
"value": true
}
]
@ -658,69 +621,13 @@
"nodes": [
{
"type": "prefix",
"key": "prefix.10.<color:#ed7702>ОКО 👁</color>",
"key": "prefix.10.<black>ОКО 👁</black>",
"value": true
}
]
},
"default": {
"nodes": [
{
"type": "permission",
"key": "imageframe.createlimit.default",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.create",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.create.animated",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.select",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.list",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.delete",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.setaccess",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "carbon.channel.global.see",
@ -1014,11 +921,6 @@
"key": "skinsrestorer.command.set.url",
"value": true
},
{
"type": "permission",
"key": "skinsrestorer.command.update",
"value": true
},
{
"type": "permission",
"key": "velocity.command.server",

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.