From 846a4d4819dd938955112632db4682642d675965 Mon Sep 17 00:00:00 2001 From: TASelwyn <37274951+TASelwyn@users.noreply.github.com> Date: Sat, 5 Dec 2020 13:42:37 -0500 Subject: [PATCH] Cleaning up proxies Geyser is actually cross platform, not just bedrock. Also, dragonproxy is entirely abandoned in favour of geyser so removed all instances of dragonproxy and just left a msg saying use geyser in the top level readme. --- README.md | 58 +++++++++-------- minecraft/proxy/bedrock/README.md | 9 --- .../proxy/bedrock/dragon_proxy/README.md | 15 ----- .../dragon_proxy/egg-dragon-proxy.json | 63 ------------------- .../geyser/README.md | 0 steamcmd_servers/unturned/unturned/README.md | 16 ----- .../unturned/unturned/egg-unturned.json | 63 ------------------- 7 files changed, 28 insertions(+), 196 deletions(-) delete mode 100644 minecraft/proxy/bedrock/README.md delete mode 100644 minecraft/proxy/bedrock/dragon_proxy/README.md delete mode 100644 minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json rename minecraft/proxy/{bedrock => cross_platform}/geyser/README.md (100%) delete mode 100644 steamcmd_servers/unturned/unturned/README.md delete mode 100644 steamcmd_servers/unturned/unturned/egg-unturned.json diff --git a/README.md b/README.md index 704a0c4e..ad14bff2 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ If you are reading this it looks like you are looking to add an egg to your serv * [sogeBot](/bots/twitch/sogebot/) [Other](/bots/other/) -* [Big Brother Bot](/bots/other/bigbrotherbot) +* [Big Brother Bot](/bots/other/bigbrotherbot/) * [TeamSpeak3](bots/teamspeak3) * [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) @@ -53,22 +53,22 @@ If you are reading this it looks like you are looking to add an egg to your serv ## [Database](/database/) ### In-Memory Databases [Redis](/database/redis/) -* [Redis 5](/database/redis/redis-5) -* [Redis 6](/database/redis/redis-6) +* [Redis 5](/database/redis/redis-5/) +* [Redis 6](/database/redis/redis-6/) ### noSQL -* [mongoDB](/database/nosql/mongodb) +* [mongoDB](/database/nosql/mongodb/) ### SQL Databases * [MariaDB](/database/sql/mariadb/) * [PostgreSQL](/database/sql/postgres/) ## Voice Servers -* [Lavalink](/voice_servers/lavalink) -* [teaspeak](/voice_servers/teaspeak) +* [Lavalink](/voice_servers/lavalink/) +* [teaspeak](/voice_servers/teaspeak/) ## Game Eggs -[Among Us Impostor Server](/among_us/impostor_server) +[Among Us Impostor Server](/among_us/impostor_server/) [ET Legacy](/enemy_territory/etlegacy/) @@ -95,13 +95,13 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Java](/minecraft/java/) Servers for Java Minecraft * [Cuberite](/minecraft/java/cuberite/) - * [feather](/minecraft/feather/) + * [feather](/minecraft/java/feather/) * [Feed The Beast](/minecraft/java/ftb/) * [Forge](/minecraft/java/forge/) * [Magma](/minecraft/java/magma/) * [Paper](/minecraft/java/paper) * [Spigot](/minecraft/java/spigot/) - * [spongeforge](/minecraft/java/spongeforge/) + * [SpongeForge](/minecraft/java/spongeforge/) * [SpongeVanilla](/minecraft/java/spongevanilla/) * [Technic](/minecraft/java/technic/) * [Tuinity](/minecraft/java/tuinity/) @@ -113,17 +113,16 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Waterfall](/minecraft/proxy/java/waterfall/) * [Travertine](/minecraft/proxy/java/travertine/) * [Velocity](/minecraft/proxy/java/velocity/) - * [Bedrock](/minecraft/proxy/bedrock/) - * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/) - * [GeyserMC](/minecraft/proxy/bedrock/geyser/) - * [Cross Platform](/minecraft/proxy/cross_platform) + * [Cross Platform](/minecraft/proxy/cross_platform/) + * [GeyserMC] (/minecraft/proxy/cross_platform/geyser/) * [Waterdog](/minecraft/proxy/cross_platform/waterdog/) - + * DragonProxy abandoned in favour of GeyserMC. + [OpenRA](/openra/) -* [OpenRA Dune2000](/openra/openra_dune2000) -* [OpenRA Red Alert](/openra/openra_red_alert) -* [OpenRA Tiberian Dawn](/openra/openra_tiberian_dawn) +* [OpenRA Dune2000](/openra/openra_dune2000/) +* [OpenRA Red Alert](/openra/openra_red_alert/) +* [OpenRA Tiberian Dawn](/openra/openra_tiberian_dawn/) [Red Dead Redemption](/rdr/) @@ -137,40 +136,39 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Arma 3 HC](/steamcmd_servers/arma/arma3_headless_client/) * [Arma 3 HC](/steamcmd_servers/arma/arma3_x64/) * [Avorion](/steamcmd_servers/avorion/) -* [Citadel: Forged with Fire](/steamcmd_servers/citadel) -* [Conan Exiles](/steamcmd_servers/conan_exiles) -* [Don't Starve](/steamcmd_servers/dont_starve) +* [Citadel: Forged with Fire](/steamcmd_servers/citadel/) +* [Conan Exiles](/steamcmd_servers/conan_exiles/) +* [Don't Starve](/steamcmd_servers/dont_starve/) * [ECO](/steamcmd_servers/eco/) * [HLDS server](/steamcmd_servers/hlds_server) * [Holdfast](/steamcmd_servers/holdfast) * [Hurtworld](/steamcmd_servers/hurtworld) -* [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm) -* [Killing Floor 2](/steamcmd_servers/killingfloor2) -* [Mordhau](/steamcmd_servers/mordhau) -* [Onset](/steamcmd_servers/onset) +* [Insurgency: Sandstorm](/steamcmd_servers/insurgency_sandstorm/) +* [Killing Floor 2](/steamcmd_servers/killingfloor2/) +* [Mordhau](/steamcmd_servers/mordhau/) +* [Onset](/steamcmd_servers/onset/) * [PixARK](/steamcmd_servers/pixark/) * [Project Zomboid](/steamcmd_servers/project_zomboid/) -* [Rising World](/steamcmd_servers/rising_world) +* [Rising World](/steamcmd_servers/rising_world/) * [Rust Staging Branch](/steamcmd_servers/rust_staging/) * [SCP: Secret Laboratory](/steamcmd_servers/scpsl/) * [dedicated](/steamcmd_servers/scpsl/dedicated/) * [multiadmin](/steamcmd_servers/scpsl/multiadmin/) * [Soldat](/steamcmd_servers/soldat/) -* [Starbound](/steamcmd_servers/starbound) +* [Starbound](/steamcmd_servers/starbound/) * [Stationeers](/steamcmd_servers/stationeers/) * [Stormworks](/steamcmd_servers/stormworks/) -* [Sven Co-op](/steamcmd_servers/svencoop) +* [Sven Co-op](/steamcmd_servers/svencoop/) * [Squad](/steamcmd_servers/squad/) * [Team Fortress 2 Classic](/steamcmd_servers/team_fortress_2_classic/) * [Unturned](/steamcmd_servers/unturned/) - * [Unturned](/steamcmd_servers/unturned/unturned/) [Teeworlds](/teeworlds/) * [teeworlds](/teeworlds/teeworlds/) [Terraria](/terraria/) -* [vanilla](/terraria/vanilla) -* [tmodloader](/terraria/tmodloader) +* [vanilla](/terraria/vanilla/) +* [tmodloader](/terraria/tmodloader/) * [tshock](/terraria/tshock/) [Tycoon Games](/tycoon_games/) diff --git a/minecraft/proxy/bedrock/README.md b/minecraft/proxy/bedrock/README.md deleted file mode 100644 index a8785174..00000000 --- a/minecraft/proxy/bedrock/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Bedrock Proxies/Bridges - -#### DragonProxy (Abandoned in favor of Geyser) -[DragonProxy](https://github.com/DragonetMC/DragonProxy) -A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers. - -#### GeyserMC -[GeyserMC](https://geysermc.org/) -A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition. diff --git a/minecraft/proxy/bedrock/dragon_proxy/README.md b/minecraft/proxy/bedrock/dragon_proxy/README.md deleted file mode 100644 index 05889c65..00000000 --- a/minecraft/proxy/bedrock/dragon_proxy/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# DragonProxy - -A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers. - -### Server Ports - -DragonProxy need 2 port (default 19132) - -| Port | default | -|---------|----------| -| Bind | 19132 | -| Remote | 25565 | - -### Known Issues -Also see the [DragonProxy Github](https://github.com/DragonetMC/DragonProxy) diff --git a/minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json b/minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json deleted file mode 100644 index 0dcfcd27..00000000 --- a/minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-04-20T12:13:53+02:00", - "name": "DragonProxy", - "author": "info@goover.de", - "description": "A proxy made to allow Minecraft: Bedrock Edition clients to connect to Minecraft: Java Edition servers.", - "image": "quay.io\/pterodactyl\/core:java", - "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar DragonProxy.jar", - "config": { - "files": "{\r\n \"config.yml\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"bind-port:\": \"bind-port: {{server.build.default.port}}\",\r\n \"max-players:\": \"max-players: {{server.build.env.MAX_PLAYERS}}\",\r\n \"remote-port:\": \"remote-port: {{server.build.env.RPORT}}\",\r\n \"remote-auth:\": \"remote-auth: {{server.build.env.REMOTE_AUTH}}\",\r\n \"xbox-auth:\": \"xbox-auth: {{server.build.env.XBOX_AUTH}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Done\",\r\n \"userInteraction\": []\r\n}", - "logs": "[]", - "stop": "stop" - }, - "scripts": { - "installation": { - "script": "apk update\r\napk --no-cache --update add curl jq wget\r\n\r\ncd \/mnt\/server\r\nrm -rf DragonProxy.jar\r\nwget https:\/\/ci.codemc.io\/job\/DragonetMC\/job\/DragonProxy\/lastBuild\/artifact\/bootstrap\/standalone\/target\/DragonProxy.jar\r\n\r\nrm -rf \/mnt\/server\/config.yml\r\ncat < \/mnt\/server\/config.yml\r\n# -----------------------------------------------\r\n# DragonProxy Configuration (25\/03\/20)\r\n# https:\/\/github.com\/DragonetMC\/DragonProxy\r\n# -----------------------------------------------\r\n# DO NOT CHANGE THIS VARIABLE!!!!!!\r\nconfig-version: 2\r\n# DO NOT CHANGE THIS VARIABLE!!!!!!\r\n\r\nlocale: 'EN'\r\n\r\n# The IP and port the proxy will listen for connections on\r\n# '0.0.0.0' will bind to all IP addresses available on your device\r\nbind-address: '0.0.0.0'\r\nbind-port: 19132\r\n\r\n# The MOTD that will be shown on the MCPE server list\r\nmotd: 'DragonProxy'\r\nmotd2: 'https:\/\/github.com\/DragonetMC\/DragonProxy'\r\n\r\n# The maximum amount of players that can join the proxy\r\nmax-players: 1\r\n\r\n# The IP and port of the remote server to connect to\r\nremote-address: '127.0.0.1'\r\nremote-port: 25565\r\n\r\n# The authentication method used for connecting to the remote server.\r\n# Accepted values:\r\n# credentials : This will display a form when you join the proxy asking you to enter your Mojang credentials\r\n# offline : No authentication, cant join premium servers such as Hypixel\r\nremote-auth: credentials\r\n\r\n# Whether or not Bedrock clients should be authenticated with xbox live\r\nxbox-auth: false\r\n\r\n# Whether or not to use the motd and player count of the primary remote server\r\nping-passthrough: true\r\n\r\n# Player gameplay related settings\r\nplayer-settings:\r\n # Whether or not to translate commands sent from the remote server and display\r\n # them on the Bedrock client. This is currently experimental.\r\n enable-commands: false\r\n\r\n # Whether or not to enable auto jump\r\n auto-jump: true\r\n\r\n # Whether or not to fetch skins from Mojang's servers\r\n fetch-skins: true\r\n\r\nmetrics:\r\n enabled: true\r\n # DO NOT CHANGE\r\n server-uuid: donotchange_serveruuid\r\n\r\n# The amount of threads that will be used.\r\n# Only change if you know what you are doing\r\nthread-pool-size: 8\r\nEOT", - "container": "openjdk:8-jre-alpine", - "entrypoint": "ash" - } - }, - "variables": [ - { - "name": "Remote Port", - "description": "", - "env_variable": "RPORT", - "default_value": "25565", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - }, - { - "name": "Remote Auth", - "description": "The authentication method used for connecting to the remote server.\r\nAccepted values:\r\ncredentials : This will display a form when you join the proxy asking you to enter your Mojang credentials\r\noffline : No authentication, cant join premium servers such as Hypixel", - "env_variable": "REMOTE_AUTH", - "default_value": "credentials", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - }, - { - "name": "XBox Auth", - "description": "Whether or not Bedrock clients should be authenticated with xbox live\r\n\r\nTRUE or FALSE", - "env_variable": "XBOX_AUTH", - "default_value": "false", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - }, - { - "name": "Max Players", - "description": "The maximum amount of players that can join the proxy", - "env_variable": "MAX_PLAYERS", - "default_value": "1", - "user_viewable": 1, - "user_editable": 1, - "rules": "required|string|max:20" - } - ] -} \ No newline at end of file diff --git a/minecraft/proxy/bedrock/geyser/README.md b/minecraft/proxy/cross_platform/geyser/README.md similarity index 100% rename from minecraft/proxy/bedrock/geyser/README.md rename to minecraft/proxy/cross_platform/geyser/README.md diff --git a/steamcmd_servers/unturned/unturned/README.md b/steamcmd_servers/unturned/unturned/README.md deleted file mode 100644 index 32b69f98..00000000 --- a/steamcmd_servers/unturned/unturned/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Unturned - -Steam Description -You're one of the few not yet turned zombie. Keeping it that way will be a challenge. -- Go in guns blazing and attract the attention of everything, living and dead. -- Take a subtle approach sneaking around and making use of distractions. -- Confront and learn to counter special abilities ranging from invisibility to fire breathing to lightning attacks. - -### Server Ports -Rocketmod requires 3 ports to run properly. - -| Port | default | -|---------|---------| -| Game | 27015 | -| Game +1 | 27016 | -| Game +2 | 27017 | diff --git a/steamcmd_servers/unturned/unturned/egg-unturned.json b/steamcmd_servers/unturned/unturned/egg-unturned.json deleted file mode 100644 index df6abd65..00000000 --- a/steamcmd_servers/unturned/unturned/egg-unturned.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2020-07-12T22:04:47-04:00", - "name": "Unturned", - "author": "parker@parkervcp.com", - "description": "Vanilla Unturned with the included RockerMod.", - "image": "quay.io\/parkervcp\/pterodactyl-images:debian_source", - "startup": ".\/Unturned_Headless.x86_64 -batchmode -nographics -bind 0.0.0.0 -port {{SERVER_PORT}}", - "config": { - "files": "{}", - "startup": "{\r\n \"done\": \"Loading level: 100%\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", - "stop": "shutdown" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\nDEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Specific to Unturned\r\ncd \/mnt\/server\/\r\nln -s ..\/..\/..\/steamcmd\/linux64\/steamclient.so Unturned_Headless_Data\/Plugins\/x86_64\/steamclient.so\r\nln -s ..\/Extras\/Rocket.Unturned\/ Modules\/", - "container": "debian:buster-slim", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Steam App ID", - "description": "Steam App ID require for install and startup update", - "env_variable": "SRCDS_APPID", - "default_value": "1110390", - "user_viewable": 0, - "user_editable": 0, - "rules": "required|string|max:20" - }, - { - "name": "ld lib path", - "description": "This is needed to load specific libraries", - "env_variable": "LD_LIBRARY_PATH", - "default_value": ".\/Unturned_Headless_Data\/Plugins\/x86_64\/", - "user_viewable": 0, - "user_editable": 0, - "rules": "required|string" - }, - { - "name": "Steam User", - "description": "Should be left blank for anon user", - "env_variable": "STEAM_USER", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "nullable|string" - }, - { - "name": "Steam Password", - "description": "", - "env_variable": "STEAM_PASS", - "default_value": "", - "user_viewable": 1, - "user_editable": 1, - "rules": "nullable|string" - } - ] -} \ No newline at end of file