chore: merge pull request #347 from RebelMythik/master

Update doc that covers new versions

docs/running_a_server/binarysearch.md

@@ -13,27 +13,27 @@ keywords:
   - Error
 ---
 
-A common problem that server owners encounter is that they have a bug on their server that is not caused by the server JAR or any of its configurations, server settings, and other external factors. When you are certain that it is a plugin causing the issue but not sure which **among** your plugins are causing the issue, one of the best things to do is conduct a binary search.
+A common problem that server owners encounter is that they have a bug on their server that is not caused by the server JAR or any of its configurations, server settings, and other external factors. When you are certain that it is a plugin causing the issue but not sure which among your plugins are causing the issue, one of the best things to do is conduct a binary search.
 
 :::warning
 
 While it is technically possible to use plugins such as ServerUtils to unload and load the plugins, doing so is unreliable and is very likely to break something.
 
 :::
 
-## Step 0
+## Step 1
 
-First, you need to be 100% sure that this bug is not caused by the server JAR you are using. If you are using forks of Paper such as Purpur or Airplane, switch back to Paper first or check if you set something in the JAR configuration that you did not mean to. Also check if it is not an issue with your startup flags, database details, ports and proxies, etc.
+First, you need to be 100% sure that this bug is not caused by the server JAR you are using. If you are using forks of Paper switch back to Paper first or check if you set something in the JAR configuration that you did not mean to. Also check if it is not an issue with your startup flags, database details, ports and proxies, etc.
 
-## Step 1
+## Step 2
 
 Remove half of your plugins. To do this, select the plugins and move them outside of the /plugins folder. After this, reboot your server.
 
-## Step 2
+## Step 3
 
 If the bug is not fixed after that, now you know that the bug is among the plugins that are left. If the bug was fixed, you know that the bug is among the plugins that you removed. If you still cannot determine which plugin is the culprit after narrowing it down, remove half of the group of plugins again.
 
-## Step 3
+## Step 4
 
 Rinse and repeat. After you have finally found the culprit, you can fix the bug and then bring back all the plugins to your server. 
 

docs/running_a_server/converting-worlds.md

@@ -22,6 +22,7 @@ If you upload or generate a world on a Bukkit/Spigot/Paper server, you will noti
 ## Part 1: Download the world
 **Note:** This is not strictly necessary, you CAN use SFTP or the file manager if you want, but downloading the files makes them much easier to work with.
 
+
 This is most easily done by archiving the files using the Pterodactyl file manager and downloading them using SFTP. For instructions on using the file manager and SFTP, please see [File Manager Controls](/file-manager-controls/) and [How to use SFTP](/sftp/), respectively.
 
 ## Part 2: Converting the world
@@ -46,4 +47,3 @@ Return to the root folder once again and go into `world_the_end`. From here, cop
 
 By copying the DIM-1 and DIM1 folders into `world`, you have made a copy of all the data of the Nether and End dimensions available in the `world` folder, which means that it now contains all the required data to run all three dimensions successfully (it already has its own copies of `level.dat`, `session.lock` and `uid.dat`) and can be run without issue on vanilla, Fabric, Forge and other servers. 
 
-You did it!

docs/running_a_server/exploitfix.md

@@ -166,4 +166,4 @@ You should be able to download one of the jars above (make sure you download a b
 
 As per PaperMC team: To test if the patch is working, run `say ${date:YYYY}` in console, it should output the same command and not `2021`. If it outputs `2021` you have not fixed the issue properly.
 
-If you need help updating your server please refer to our [Updating](1.19.md) guide and #support-chat channel.
+If you need help updating your server please refer to our [Updating](updating.md) guide and #support-chat channel.

docs/running_a_server/jars.md

@@ -9,18 +9,15 @@ keywords:
   - Spigot
   - Paper
   - Bukkit
-  - Tuinity
   - Forge
   - Fabric
   - Purpur
-  - Airplane
   - Pufferfish
   - Server Jars
   - Minecraft
   - Modded Server Jars
   - Plugin Server Jars
   - Bloom.host
-  - Minestom 
 ---
 
 ## Recommended Software:
@@ -46,22 +43,9 @@ Fabric, with a few performance mods added, is recommended if you want to run a m
 ## Other popular options: 
 
 :::warning
-Some popular Jars such as Sponge attempt to merge Bukkit and Forge to allow the use of Plugins and Mods in the same enviorment, while popular these implementations can end up combining the issues of both server types and be unstable as a result.
+Some popular Jars such as Mohist/Magma attempt to merge Bukkit and Forge to allow the use of Plugins and Mods in the same enviorment, while popular these implementations can end up combining the issues of both server types and be unstable as a result.
 :::
 
-### [Vanilla](https://www.minecraft.net/en-us/download/server)
-Vanilla is the jar provided by Mojang to run Minecraft servers. This is the bare minimum for servers with no plugin API for plugins to hook into or a modding API like forge. It is not optimized and only recommended for small groups of friends who want to play plain vanilla.
-
-
-
-### [Bukkit](https://bukkit.org/)
-Bukkit is an open source but defunct jar that was used in the early days of Minecraft plugin development. In 2014, Bukkit Project lead Warren Loo announced the end of the Bukkit project. The project was then DMCA'd by a former developer causing massive amounts of code to no longer be apart of Bukkit. If you want to learn the whole situation, read [Justin Flory blog post](https://blog.jwf.io/2020/04/open-source-minecraft-bukkit-gpl/) about it. CraftBukkit is a continuation that is still supported by Spigot, but is not recommended for servers as it's old and rarely recieves updates. 
-
-
-
-### [Spigot](https://www.spigotmc.org/)
-Spigot is a fork of Bukkit that began in 2012. After Bukkit defuncted, it became the new standard as Bukkit plugins could all run on Spigot. Spigot is not recommended anymore as Paper has far surpassed it in performance and options.
-
 ### [Pufferfish](https://github.com/pufferfish-gg/Pufferfish)
 "A highly optimized Paper fork designed for large servers requiring both maximum performance, stability, and "enterprise" features."  
 Pufferfish is a fork of paper (and as such also includes all of the improvements paper adds) that aims to add even more performance optimizations over paper. It includes every change that airplane used to have. And adds some of its own changes too.
@@ -76,32 +60,5 @@ Purpur aims to make your server more configurable, it adds **a lot** of fun or u
 
 
 ### [Sponge](https://www.spongepowered.org/)
- Sponge is an API designed to be an overhaul of the Bukkit API, it also allows you to run Forge mods together with Sponge plugins. It doesn't run Bukkit or any of its fork plugins. Currently, Sponge is on version 1.12.2 and is recommended for if you want modpacks and plugins together as smoothly as possible.
-
-
-
-### [Minestom](https://minestom.com/)
-"Minestom is a complete rewrite of Minecraft server software, open-source and without any code from Mojang."  
-Minestom is a *very* experimental developer API not meant to be used by end-users. Replacing Paper with this will not work since it does not implement the Bukkit API. It's very fast and can handle a lot of players. Only try if you like tinkering with code and are prepared to put in the work.
-
+ Sponge is an API designed to work with forge allowing the use of mods and plugins together in a stable environment. Currently, Sponge is recommended if you want modpacks and plugins together as smoothly as possible. However, Sponge does not support any sort of Spigot/Paper plugins as it's a completely different software.
 
----
-
-## Deprecated Server Software
-
-:::warning
-The server software mentioned in this section are no longer updated and are not recommended for use on your servers; however they are kept here for reference purposes.
-:::
-
-### [Airplane](https://airplane.gg/)
-~~"A stable, optimized, well supported 1.16.5 & 1.17 Paper fork."  
-Airplane is a fork of paper (and as such also includes all of the improvements paper adds) that aims to add even more performance optimizations over paper.~~  
-Airplane isn't being updated to modern versions of the game.
-
-It is recommended that an alternative JAR such as [Purpur](#purpur) or [Pufferfish](#pufferfish) should be used.
-
-### [Tuinity](https://github.com/Spottedleaf/Tuinity)
-~~Tuinity is a high performance fork of paper (and as such also includes all of the improvements paper adds) that brings more performance changes for servers to play around with. It can greatly increase TPS, allowing a smoother experience, especially on bigger servers.~~
-Tuinity has now been merged into [Paper](#paper) with all of its improvements and optimizations, and as such Tuinity as a jar is now obsolete. 
-
----