Merge pull request #2248 from dhkatz/curseforge-support-improved

[Minecraft] Add new and improved CurseForge generic egg

README.md

@@ -159,6 +159,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
   * [PocketMine MP](game_eggs/minecraft/bedrock/pocketmine_mp)
 
 * [Java](game_eggs/minecraft/java) Servers for Java Minecraft
+  * [CurseForge](game_eggs/minecraft/java/curseforge)
   * [Cuberite](game_eggs/minecraft/java/cuberite)
   * [Fabric](game_eggs/minecraft/java/fabric)
   * [Feather](game_eggs/minecraft/java/feather)

game_eggs/README.md

@@ -58,6 +58,7 @@
   * [PocketMine MP](minecraft/bedrock/pocketmine_mp)
 
 * [Java](minecraft/java) Servers for Java Minecraft
+  * [CurseForge](minecraft/java/curseforge)
   * [Cuberite](minecraft/java/cuberite)
   * [Fabric](minecraft/java/fabric)
   * [Feather](minecraft/java/feather)

game_eggs/minecraft/README.md

@@ -15,11 +15,11 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains,
 ## [Java](java) Servers for Java Minecraft
 
 * [Cuberite](java/cuberite)
+* [CurseForge](java/curseforge)
 * [Fabric](java/fabric)
 * [Feather](java/feather)
 * [Forge](java/forge)
   * [Forge](java/forge/forge)
-  * [CurseForge Generic](java/forge/curseforge-generic)
 * [Feed The Beast](java/ftb)
 * [Glowstone](java/glowstone)
 * [Limbo](java/limbo)

game_eggs/minecraft/java/README.md

@@ -32,7 +32,7 @@ This is a direct fork of the default forge service
 
 - Has a version detection fix for "latest"
 
-### [CurseForge Generic](forge/curseforge-generic)
+### [CurseForge Generic](curseforge)
 
 [CurseForge Generic Website](https://www.curseforge.com)
 A generic service to pull forge mod packs from the curseforge site.

game_eggs/minecraft/java/curseforge/README.md

@@ -0,0 +1,23 @@
+# CurseForge Generic
+
+## This is a generic egg for CurseForge modpacks
+
+You will need to give it a modpack project ID. The project ID for [All the Mods 8 - ATM8](https://www.curseforge.com/minecraft/modpacks/all-the-mods-8) is `520914` for example.
+This can be found on the modpack page in the `About Project` section in the right sidebar.
+
+You can also optionally specify a file ID. If you do not specify a file ID, the latest version will be used. 
+The file ID for the server pack for [All the Mods 8 - ATM8](https://www.curseforge.com/minecraft/modpacks/all-the-mods-8) version `1.0.17` is `4504876` for example. 
+This can be found on the modpack page by clicking the wanted file and copying the id at the end of the URL (the number after `/files/`).
+
+The script will automatically setup of Forge, Fabric, or Quilt depending on the modpack.
+
+You *must* specify a CurseForge API key. 
+You can find out how to get an API key [here](https://support.curseforge.com/en/support/solutions/articles/9000208346-about-the-curseforge-api-and-how-to-apply-for-a-key)
+
+## Server Ports
+
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+
+| Port  | default |
+|-------|---------|
+| Game  | 25565   |

game_eggs/minecraft/java/forge/curseforge-generic/README.md

@@ -1,24 +0,0 @@
-# Forge Generic
-
-## This is a generic egg for curseforge modpacks
-
-You will need to give it a modpack ID. The ID for BOFA mods is `375152` for example.
-This can be found on the modpack page in the `About Project` section in the upper right corner.
-
-This will grab the latest release when the version is set to latest.
-
-It "should" grab versions of the pack based on the modpack version numbers
-
-## API Keys
-
-You will need to get an API key to run the installer now. Make an account at https://console.curseforge.com/
-
-https://console.curseforge.com/#/api-keys
-
-## Server Ports
-
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
-
-| Port  | default |
-|-------|---------|
-| Game  | 25565   |