From 1dd42d8bd2951373ae5db651436e92f2cdc9e9ca Mon Sep 17 00:00:00 2001 From: TekExplorer Date: Fri, 20 Nov 2020 14:17:29 -0500 Subject: [PATCH] Restructured Minecraft Proxy folder restructured the minecraft proxy folder and added a geysermc readme to indicate the geyser official eggs. updated readmes to match. --- .gitignore | 3 ++- README.md | 21 ++++++++++++------- minecraft/README.md | 18 +++++++++------- minecraft/bedrock/README.md | 4 ---- minecraft/proxy/README.md | 12 +++++++++++ minecraft/proxy/bedrock/README.md | 9 ++++++++ .../bedrock/dragon_proxy/README.md | 0 .../dragon_proxy/egg-dragon-proxy.json | 0 minecraft/proxy/bedrock/geyser/README.md | 6 ++++++ minecraft/proxy/cross_platform/README.md | 5 +++++ .../{ => cross_platform}/waterdog/README.md | 0 .../waterdog/egg-waterdog.json | 0 minecraft/proxy/java/README.md | 17 +++++++++++++++ .../proxy/{ => java}/travertine/README.md | 0 .../{ => java}/travertine/egg-travertine.json | 0 .../proxy/{ => java}/typhoonlimbo/README.md | 0 .../typhoonlimbo/egg-typhoon-limbo.json | 0 minecraft/proxy/{ => java}/velocity/README.md | 0 .../{ => java}/velocity/egg-velocity.json | 0 .../proxy/{ => java}/velocity/velocity.toml | 0 .../proxy/{ => java}/waterfall/README.md | 0 .../proxy/{ => java}/waterfall/config.yml | 0 .../{ => java}/waterfall/egg-waterfall.json | 0 23 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 minecraft/proxy/README.md create mode 100644 minecraft/proxy/bedrock/README.md rename minecraft/{ => proxy}/bedrock/dragon_proxy/README.md (100%) rename minecraft/{ => proxy}/bedrock/dragon_proxy/egg-dragon-proxy.json (100%) create mode 100644 minecraft/proxy/bedrock/geyser/README.md create mode 100644 minecraft/proxy/cross_platform/README.md rename minecraft/proxy/{ => cross_platform}/waterdog/README.md (100%) rename minecraft/proxy/{ => cross_platform}/waterdog/egg-waterdog.json (100%) create mode 100644 minecraft/proxy/java/README.md rename minecraft/proxy/{ => java}/travertine/README.md (100%) rename minecraft/proxy/{ => java}/travertine/egg-travertine.json (100%) rename minecraft/proxy/{ => java}/typhoonlimbo/README.md (100%) rename minecraft/proxy/{ => java}/typhoonlimbo/egg-typhoon-limbo.json (100%) rename minecraft/proxy/{ => java}/velocity/README.md (100%) rename minecraft/proxy/{ => java}/velocity/egg-velocity.json (100%) rename minecraft/proxy/{ => java}/velocity/velocity.toml (100%) rename minecraft/proxy/{ => java}/waterfall/README.md (100%) rename minecraft/proxy/{ => java}/waterfall/config.yml (100%) rename minecraft/proxy/{ => java}/waterfall/egg-waterfall.json (100%) diff --git a/.gitignore b/.gitignore index 615b2764..74893bfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.DS_Store node_modules/ -.vuepress/* \ No newline at end of file +.vuepress/* +.vscode \ No newline at end of file diff --git a/README.md b/README.md index 8fcfa050..c2233a72 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,6 @@ If you are reading this it looks like you are looking to add an egg to your serv [Minecraft](/minecraft/) * [Bedrock](/minecraft/bedrock/) * [Bedrock](/minecraft/bedrock/bedrock/) - * [DragonProxy](/minecraft/bedrock/dragonproxy/) * [Nukkit](/minecraft/bedrock/nukkit/) * [PocketMine MP](/minecraft/bedrock/pocketmine_mp/) @@ -106,12 +105,18 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Tuinity](/minecraft/java/tuinity/) * [VanillaCord](/minecraft/java/vanillacord/) -* [Proxies](/minecraft/proxy/) (these are for the java version of minecraft) - * [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/) - * [Travertine](/minecraft/proxy/travertine/) Java - * [Velocity](/minecraft/proxy/velocity/) - * [Waterdog](/minecraft/proxy/waterdog/) Java/Bedrock - * [Waterfall](/minecraft/proxy/waterfall/) +* [Proxies](/minecraft/proxy/) Minecraft Server Proxies + * [Java](/minecraft/proxy/java/) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) + * [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) + * [Waterdog](/minecraft/proxy/cross_platform/waterdog/) + [OpenRA](/openra/) * [OpenRA Dune2000](/openra/openra_dune2000) @@ -174,4 +179,4 @@ If you are reading this it looks like you are looking to add an egg to your serv [Xonotic](/xonotic/xonotic/) -[Cryofall](/cryofall/) \ No newline at end of file +[Cryofall](/cryofall/) diff --git a/minecraft/README.md b/minecraft/README.md index fa00deba..9d3b4ed7 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -6,7 +6,6 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, [Bedrock](/minecraft/bedrock/) Servers for Bedrock Minecraft (Windows 10, mobile, console) * [Bedrock](/minecraft/bedrock/bedrock/) -* [DragonProxy](/minecraft/bedrock/dragon_proxy/) * [Nukkit](/minecraft/bedrock/nukkit/) * [PocketMine MP](/minecraft/bedrock/pocketmine_mp/) @@ -24,9 +23,14 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains, * [Tuinity](/minecraft/java/tuinity/) * [VanillaCord](/minecraft/java/vanillacord/) -[Proxies](/minecraft/proxy/) Minecraft Server Proxies -* [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/) Java -* [Travertine](/minecraft/proxy/travertine/) Java -* [Velocity](/minecraft/proxy/velocity/) Java -* [Waterdog](/minecraft/proxy/waterdog/) Java/Bedrock -* [Waterfall](/minecraft/proxy/waterfall/) Java \ No newline at end of file +* [Proxies](/minecraft/proxy/) Minecraft Server Proxies + * [Java](/minecraft/proxy/java/) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) + * [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) + * [Waterdog](/minecraft/proxy/cross_platform/waterdog/) diff --git a/minecraft/bedrock/README.md b/minecraft/bedrock/README.md index 62935699..5dd20afa 100644 --- a/minecraft/bedrock/README.md +++ b/minecraft/bedrock/README.md @@ -4,10 +4,6 @@ [Minecraft Bedrock Server](https://minecraft.net/en-us/download/server/bedrock/) The official Minecraft Bedrock (Formerly Minecraft Pocket Edition) server. -#### DragonProxy -[DragonProxy Github](https://github.com/DragonetMC/DragonProxy) -A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers. - #### Nukkit [Nukkit GitHub](https://github.com/Nukkit/Nukkit) Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition diff --git a/minecraft/proxy/README.md b/minecraft/proxy/README.md new file mode 100644 index 00000000..f92c4a8d --- /dev/null +++ b/minecraft/proxy/README.md @@ -0,0 +1,12 @@ +# Minecraft Proxies + +* [Java](/minecraft/proxy/java/) + * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/) + * [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) + * [Waterdog](/minecraft/proxy/waterdog/) \ No newline at end of file diff --git a/minecraft/proxy/bedrock/README.md b/minecraft/proxy/bedrock/README.md new file mode 100644 index 00000000..a8785174 --- /dev/null +++ b/minecraft/proxy/bedrock/README.md @@ -0,0 +1,9 @@ +# 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/bedrock/dragon_proxy/README.md b/minecraft/proxy/bedrock/dragon_proxy/README.md similarity index 100% rename from minecraft/bedrock/dragon_proxy/README.md rename to minecraft/proxy/bedrock/dragon_proxy/README.md diff --git a/minecraft/bedrock/dragon_proxy/egg-dragon-proxy.json b/minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json similarity index 100% rename from minecraft/bedrock/dragon_proxy/egg-dragon-proxy.json rename to minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json diff --git a/minecraft/proxy/bedrock/geyser/README.md b/minecraft/proxy/bedrock/geyser/README.md new file mode 100644 index 00000000..10c01c34 --- /dev/null +++ b/minecraft/proxy/bedrock/geyser/README.md @@ -0,0 +1,6 @@ +# Geyser + +A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition. + +### Eggs +GeyserMC maintains their own eggs on their github: [GeyserMC pterodactyl eggs](https://github.com/GeyserMC/pterodactyl-stuff) diff --git a/minecraft/proxy/cross_platform/README.md b/minecraft/proxy/cross_platform/README.md new file mode 100644 index 00000000..8b4cedc8 --- /dev/null +++ b/minecraft/proxy/cross_platform/README.md @@ -0,0 +1,5 @@ +# Mineraft Cross Platform Proxies + +#### Waterdog +[Waterdog](https://github.com/yesdog/Waterdog) +Waterdog provides native support for the Minecraft Bedrock protocols along with the existing java protocols. It is capable of using the ProtocolSupport PE encapsulation protocol over TCP, or it can use the native RakNet Bedrock protocol for traditional downstream Bedrock servers such as Nukkit, Pocketmine, Bedrock Alpha Server, MiNET, and others. \ No newline at end of file diff --git a/minecraft/proxy/waterdog/README.md b/minecraft/proxy/cross_platform/waterdog/README.md similarity index 100% rename from minecraft/proxy/waterdog/README.md rename to minecraft/proxy/cross_platform/waterdog/README.md diff --git a/minecraft/proxy/waterdog/egg-waterdog.json b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json similarity index 100% rename from minecraft/proxy/waterdog/egg-waterdog.json rename to minecraft/proxy/cross_platform/waterdog/egg-waterdog.json diff --git a/minecraft/proxy/java/README.md b/minecraft/proxy/java/README.md new file mode 100644 index 00000000..920b9918 --- /dev/null +++ b/minecraft/proxy/java/README.md @@ -0,0 +1,17 @@ +# Minecraft Java Proxies + +#### Waterfall +[Waterfall](https://papermc.io/downloads#Waterfall) +Paper fork of the BungeeCord software, with improved Forge support and more features. + +#### Travertine +[Travertine](https://papermc.io/downloads#Travertine) +Waterfall, with additional support for Minecraft 1.7.10. + +#### Velocity +[Velocity](https://velocitypowered.com/) +Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility. + +#### Typhoonlimbo +[TyphoonLimbo](https://github.com/TyphoonMC/TyphoonLimbo) +Lightweight Minecraft limbo server diff --git a/minecraft/proxy/travertine/README.md b/minecraft/proxy/java/travertine/README.md similarity index 100% rename from minecraft/proxy/travertine/README.md rename to minecraft/proxy/java/travertine/README.md diff --git a/minecraft/proxy/travertine/egg-travertine.json b/minecraft/proxy/java/travertine/egg-travertine.json similarity index 100% rename from minecraft/proxy/travertine/egg-travertine.json rename to minecraft/proxy/java/travertine/egg-travertine.json diff --git a/minecraft/proxy/typhoonlimbo/README.md b/minecraft/proxy/java/typhoonlimbo/README.md similarity index 100% rename from minecraft/proxy/typhoonlimbo/README.md rename to minecraft/proxy/java/typhoonlimbo/README.md diff --git a/minecraft/proxy/typhoonlimbo/egg-typhoon-limbo.json b/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json similarity index 100% rename from minecraft/proxy/typhoonlimbo/egg-typhoon-limbo.json rename to minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json diff --git a/minecraft/proxy/velocity/README.md b/minecraft/proxy/java/velocity/README.md similarity index 100% rename from minecraft/proxy/velocity/README.md rename to minecraft/proxy/java/velocity/README.md diff --git a/minecraft/proxy/velocity/egg-velocity.json b/minecraft/proxy/java/velocity/egg-velocity.json similarity index 100% rename from minecraft/proxy/velocity/egg-velocity.json rename to minecraft/proxy/java/velocity/egg-velocity.json diff --git a/minecraft/proxy/velocity/velocity.toml b/minecraft/proxy/java/velocity/velocity.toml similarity index 100% rename from minecraft/proxy/velocity/velocity.toml rename to minecraft/proxy/java/velocity/velocity.toml diff --git a/minecraft/proxy/waterfall/README.md b/minecraft/proxy/java/waterfall/README.md similarity index 100% rename from minecraft/proxy/waterfall/README.md rename to minecraft/proxy/java/waterfall/README.md diff --git a/minecraft/proxy/waterfall/config.yml b/minecraft/proxy/java/waterfall/config.yml similarity index 100% rename from minecraft/proxy/waterfall/config.yml rename to minecraft/proxy/java/waterfall/config.yml diff --git a/minecraft/proxy/waterfall/egg-waterfall.json b/minecraft/proxy/java/waterfall/egg-waterfall.json similarity index 100% rename from minecraft/proxy/waterfall/egg-waterfall.json rename to minecraft/proxy/java/waterfall/egg-waterfall.json