From e997bd9a2940ca2649690ba0e47730bf9b335458 Mon Sep 17 00:00:00 2001 From: Mar Alegre Date: Thu, 4 Mar 2021 20:07:25 -0500 Subject: [PATCH] made mcbe server-agnostic --- mcbe/Containerfile | 6 +- mcbe/assets/minecraft/permissions.json | 10 --- mcbe/assets/minecraft/server.properties | 97 ------------------------- mcbe/assets/minecraft/whitelist.json | 28 ------- 4 files changed, 4 insertions(+), 137 deletions(-) delete mode 100644 mcbe/assets/minecraft/permissions.json delete mode 100644 mcbe/assets/minecraft/server.properties delete mode 100644 mcbe/assets/minecraft/whitelist.json diff --git a/mcbe/Containerfile b/mcbe/Containerfile index 4add417..6b96e2a 100644 --- a/mcbe/Containerfile +++ b/mcbe/Containerfile @@ -42,8 +42,10 @@ RUN url=$(wget -q https://www.minecraft.net/en-us/download/server/bedrock/ -O - rm $(basename $url) && \ chown -R mcadmin:mcadmin ./ -# copy minecraft config -COPY --chown=mcadmin:mcadmin assets/minecraft/ /home/mcadmin/ +# make links to minecraft config +RUN for f in permissions.json server.properties whitelist.json ; \ + do rm $f && ln -s /vol/data/config/$f ./ ; \ + done # copy units to systemd COPY assets/systemd/ /etc/systemd/system/ diff --git a/mcbe/assets/minecraft/permissions.json b/mcbe/assets/minecraft/permissions.json deleted file mode 100644 index 89c66fb..0000000 --- a/mcbe/assets/minecraft/permissions.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "permission": "operator", - "xuid": "2535473403284928" - }, - { - "permission": "operator", - "xuid": "2535422548094088" - } -] diff --git a/mcbe/assets/minecraft/server.properties b/mcbe/assets/minecraft/server.properties deleted file mode 100644 index 0536b6e..0000000 --- a/mcbe/assets/minecraft/server.properties +++ /dev/null @@ -1,97 +0,0 @@ -server-name=Living Lightning Server -# Used as the server name -# Allowed values: Any string - -gamemode=survival -# Sets the game mode for new players. -# Allowed values: "survival", "creative", or "adventure" - -difficulty=hard -# Sets the difficulty of the world. -# Allowed values: "peaceful", "easy", "normal", or "hard" - -allow-cheats=false -# If true then cheats like commands can be used. -# Allowed values: "true" or "false" - -max-players=10 -# The maximum number of players that can play on the server. -# Allowed values: Any positive integer - -online-mode=true -# If true then all connected players must be authenticated to Xbox Live. -# Clients connecting to remote (non-LAN) servers will always require Xbox Live authentication regardless of this setting. -# If the server accepts connections from the Internet, then it's highly recommended to enable online-mode. -# Allowed values: "true" or "false" - -white-list=true -# If true then all connected players must be listed in the separate whitelist.json file. -# Allowed values: "true" or "false" - -server-port=19132 -# Which IPv4 port the server should listen to. -# Allowed values: Integers in the range [1, 65535] - -server-portv6=19133 -# Which IPv6 port the server should listen to. -# Allowed values: Integers in the range [1, 65535] - -view-distance=64 -# The maximum allowed view distance in number of chunks. -# Allowed values: Any positive integer. - -tick-distance=8 -# The world will be ticked this many chunks away from any player. -# Allowed values: Integers in the range [4, 12] - -player-idle-timeout=0 -# After a player has idled for this many minutes they will be kicked. If set to 0 then players can idle indefinitely. -# Allowed values: Any non-negative integer. - -max-threads=0 -# Maximum number of threads the server will try to use. If set to 0 or removed then it will use as many as possible. -# Allowed values: Any positive integer. - -level-name=Glunge Drip -# Allowed values: Any string - -level-seed= -# Use to randomize the world -# Allowed values: Any string - -default-player-permission-level=member -# Permission level for new players joining for the first time. -# Allowed values: "visitor", "member", "operator" - -texturepack-required=false -# Force clients to use texture packs in the current world -# Allowed values: "true" or "false" - -content-log-file-enabled=false -# Enables logging content errors to a file -# Allowed values: "true" or "false" - -compression-threshold=1 -# Determines the smallest size of raw network payload to compress -# Allowed values: 0-65535 - -server-authoritative-movement=true -# Enables server authoritative movement. If true, the server will replay local user input on -# the server and send down corrections when the client's position doesn't match the server's. -# Corrections will only happen if correct-player-movement is set to true. - -player-movement-score-threshold=20 -# The number of incongruent time intervals needed before abnormal behavior is reported. -# Disabled by server-authoritative-movement. - -player-movement-distance-threshold=0.3 -# The difference between server and client positions that needs to be exceeded before abnormal behavior is detected. -# Disabled by server-authoritative-movement. - -player-movement-duration-threshold-in-ms=500 -# The duration of time the server and client positions can be out of sync (as defined by player-movement-distance-threshold) -# before the abnormal movement score is incremented. This value is defined in milliseconds. -# Disabled by server-authoritative-movement. - -correct-player-movement=false -# If true, the client position will get corrected to the server position if the movement score exceeds the threshold. diff --git a/mcbe/assets/minecraft/whitelist.json b/mcbe/assets/minecraft/whitelist.json deleted file mode 100644 index 73b4a34..0000000 --- a/mcbe/assets/minecraft/whitelist.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "ignoresPlayerLimit": false, - "name": "MarVel0z", - "xuid": "2535473403284928" - }, - { - "ignoresPlayerLimit": false, - "name": "BISONMEATS" - }, - { - "ignoresPlayerLimit": false, - "name": "TrinityAri", - "xuid": "2535422548094088" - }, - { - "ignoresPlayerLimit": false, - "name": "Marcade645" - }, - { - "ignoresPlayerLimit": false, - "name": "JogsIntoMordor" - }, - { - "ignoresPlayerLimit": false, - "name": "ElagabalusC" - } -]