Changes download URLs of Paper to papermc.io

Updates software version
Stores version of downloaded Paper .jar files
Completes #8

src/main/java/net/knarcraft/minecraftserverlauncher/server/ServerTypeHandler.java

@@ -134,7 +134,7 @@ public class ServerTypeHandler {
                 break;
             case "Paper":
                 newType = new Paper("Paper", false, serverVersions, serverTypeInfo[2],
-                        serverTypeInfo[3]);
+                        serverTypeInfo[3], serverTypeInfo[4], serverTypeInfo[5]);
                 break;
             case "Bungee":
                 newType = new BungeeCord("Bungee", true, serverVersions, serverTypeInfo[2],

src/main/java/net/knarcraft/minecraftserverlauncher/server/ServerVersionContainer.java

@@ -22,6 +22,7 @@ public class ServerVersionContainer {
     private String bungeeVersion;
     private Map<String, String> waterfallVersions;
     private Map<String, String> travertineVersions;
+    private Map<String, String> paperVersions;
     private Map<String, String> spongeVanillaVersions;
     private Map<String, String> spongeForgeVersions;
     private String downloadedBuildToolsVersion;
@@ -32,6 +33,7 @@ public class ServerVersionContainer {
     private ServerVersionContainer() {
         this.waterfallVersions = new HashMap<>();
         this.travertineVersions = new HashMap<>();
+        this.paperVersions = new HashMap<>();
         this.spongeVanillaVersions = new HashMap<>();
         this.spongeForgeVersions = new HashMap<>();
         loadState();
@@ -58,6 +60,7 @@ public class ServerVersionContainer {
         this.bungeeVersion = null;
         this.waterfallVersions = new HashMap<>();
         this.travertineVersions = new HashMap<>();
+        this.paperVersions = new HashMap<>();
         this.spongeVanillaVersions = new HashMap<>();
         this.spongeForgeVersions = new HashMap<>();
         this.downloadedBuildToolsVersion = null;
@@ -70,6 +73,7 @@ public class ServerVersionContainer {
                 "bungeeVersion;" + bungeeVersion + "\n" +
                 "waterfallVersions;" + mapToString(waterfallVersions) + "\n" +
                 "travertineVersions;" + mapToString(travertineVersions) + "\n" +
+                "paperVersions;" + mapToString(paperVersions) + "\n" +
                 "spongeVanillaVersions;" + mapToString(spongeVanillaVersions) + "\n" +
                 "spongeForgeVersions;" + mapToString(spongeForgeVersions) + "\n" +
                 "downloadedBuildToolsVersion;" + downloadedBuildToolsVersion;
@@ -163,6 +167,9 @@ public class ServerVersionContainer {
             case "travertineVersions":
                 parseVersionsToMap(travertineVersions, variableValue);
                 break;
+            case "paperVersions":
+                parseVersionsToMap(paperVersions, variableValue);
+                break;
             case "spongeVanillaVersions":
                 parseVersionsToMap(spongeVanillaVersions, variableValue);
                 break;
@@ -291,6 +298,27 @@ public class ServerVersionContainer {
         saveState();
     }
 
+    /**
+     * Gets a specific paper version
+     *
+     * @param versionKey <p>The version to check the current version of</p>
+     * @return <p>The current paper version</p>
+     */
+    public String getPaperVersion(String versionKey) {
+        return this.paperVersions.get(versionKey);
+    }
+
+    /**
+     * Sets the current version for a given paper version
+     *
+     * @param mapKey <p>The version key to set version for</p>
+     * @param newValue <p>The new current version</p>
+     */
+    public void setPaperVersion(String mapKey, String newValue) {
+        this.paperVersions.put(mapKey, newValue);
+        saveState();
+    }
+
     /**
      * Gets a specific sponge vanilla version
      *

src/main/java/net/knarcraft/minecraftserverlauncher/server/servertypes/Paper.java

@@ -3,19 +3,25 @@ package net.knarcraft.minecraftserverlauncher.server.servertypes;
 /**
  * This class represents the Paper Minecraft server type
  */
-public class Paper extends Spigot {
+public class Paper extends Waterfall {
 
     /**
      * Instantiates a new Paper server type
      *
-     * @param typeName        <p>The name of the server type</p>
-     * @param isProxy         <p>Whether this server type is a proxy server</p>
-     * @param versions        <p>A list of one or more server versions for the type</p>
-     * @param downloadURL     <p>The URL used for downloading .jar files</p>
-     * @param downloadURLPart <p>A string used after the download url as an additional part of the URL</p>
+     * @param typeName    <p>The name of the server type</p>
+     * @param isProxy     <p>Whether this server type is a proxy server</p>
+     * @param versions    <p>The available versions for the server type</p>
+     * @param versionURL  <p>The URL used to finding the newest version</p>
+     * @param srcStart    <p>The string after which the version id starts</p>
+     * @param srcEnd      <p>The string marking the end of the version id</p>
+     * @param downloadURL <p>The URL used for downloading the latest version</p>
      */
-    public Paper(String typeName, boolean isProxy, String[] versions, String downloadURL, String downloadURLPart) {
-        super(typeName, isProxy, versions, downloadURL, downloadURLPart);
+    public Paper(String typeName, boolean isProxy, String[] versions, String versionURL, String srcStart,
+                 String srcEnd, String downloadURL) {
+        super(typeName, isProxy, versions, versionURL, srcStart, srcEnd, downloadURL);
+
+        this.oldVersionFunction = serverVersionContainer::getPaperVersion;
+        this.versionUpdateFunction = serverVersionContainer::setPaperVersion;
     }
 
 }

src/main/resources/currentversion.csv

@@ -1,2 +1,2 @@
 beta
-1.3.4
+1.3.5

src/main/resources/servertypes.csv

@@ -1,6 +1,6 @@
 Vanilla;Latest,Snapshot,1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.8.9,1.7.10,1.6.4,1.5.2,1.4.7,1.3.2,1.2.5;https://launchermeta.mojang.com/mc/game/version_manifest.json;"release":";";https://s3.amazonaws.com/Minecraft.Download/versions/
 Spigot;Latest,1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.9.4,1.8.8,1.7.10,1.6.4-R2.1,1.5.2-R1.1,1.4.7-R1.1;https://static.knarcraft.net/archive/downloads/minecraftserverjars/Spigot/;spigot-
-Paper;1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.8.8;https://static.knarcraft.net/archive/downloads/minecraftserverjars/Paper/;Paper-
+Paper;1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.8.8;https://papermc.io/api/v1/paper/;"latest":;,;https://papermc.io/api/v1/paper/
 #SpongeVanilla;1.12.2,1.11.2,1.10.2,1.8.9;https://dl-api.spongepowered.org/v1/org.spongepowered/spongevanilla/downloads?type=stable&minecraft=;"version":";",;https://repo.spongepowered.org/maven/org/spongepowered/spongevanilla/;/spongevanilla-
 Craftbukkit;Latest,1.17.1,1.16.5,1.15.2,1.14.4,1.13.2,1.12.2,1.11.2,1.10.2,1.9.4,1.8.8,1.7.10-R0.1,1.6.4-R2.0,1.5.2-R1.0,1.4.6-R0.3,1.3.2-R3.0,1.2.5-R2.0,1.1-R6,1.0.1-R1,b1.8.1,b1.7.3;https://static.knarcraft.net/archive/downloads/minecraftserverjars/Bukkit/;craftbukkit-
 #SpongeForge;1.12.2,1.11.2,1.10.2;https://dl-api.spongepowered.org/v1/org.spongepowered/spongeforge/downloads?type=stable&minecraft=;"version":";",;https://repo.spongepowered.org/maven/org/spongepowered/spongeforge/;/spongeforge-

src/test/java/net/knarcraft/minecraftserverlauncher/server/ServerVersionContainerTest.java

@@ -38,7 +38,7 @@ public class ServerVersionContainerTest {
         serverVersionContainer.reset();
         System.out.println(serverVersionContainer.toString());
         assertEquals("vanillaVersion;null\nsnapshotVersion;null\nbungeeVersion;null\nwaterfallVersions;\n" +
-                        "travertineVersions;\nspongeVanillaVersions;\nspongeForgeVersions;\ndownloadedBuildToolsVersion;null",
+                        "travertineVersions;\npaperVersions;\nspongeVanillaVersions;\nspongeForgeVersions;\ndownloadedBuildToolsVersion;null",
                 serverVersionContainer.toString());
     }