2.0b release

Author: LazyWizard

.idea/.gitignore

@@ -1,3 +1,7 @@
+ Version 2.0b (August 28, 2020)
+================================
+Moved version file hosting from Bitbucket to GitHub
+
  Version 2.0 (March 19, 2019)
 ==============================
 Added "nexusModId" field to .version file format:

mod/changelog.txt

@@ -3,9 +3,9 @@
     "name": "Version Checker",
     "author": "LazyWizard",
     "utility": "true",
-    "version": "2.0",
+    "version": "2.0b",
     "description": "Tells you whether Starsector or any of your mods have updates available. A mod must include a .version file and an entry in data/config/version/version_files.csv for this to work with them.",
-    "gameVersion": "0.9a",
+    "gameVersion": "0.9.1a",
     "jars":["jars/lw_VersionChecker.jar"],
     "modPlugin": "org.lazywizard.versionchecker.VCModPlugin"
 }

mod/mod_info.json

@@ -1,19 +1,18 @@
 {
-    # Points toward the online master .version file. This mod works by comparing
+    # Points toward the master .version file online. This mod works by comparing
     # the local and online version to see if there is a newer version available.
     #
     # The master file must be:
     # - Online (duh)
     # - Directly reachable (the URL goes to the raw file, not a redirect page)
     # - Permanently linked and editable without the URL itself changing
     #
-    # Bitbucket, GitHub, and other online repositories make excellent hosts.
+    # GitHub and other online repositories make excellent hosts (with the
+    # exception of Bitbucket, connections to which require cryptographic ciphers
+    # that the JRE that ships with Starsector does not include).
     #
-    # Example links for common hosts:
-    #"masterVersionFile":"https://github.com/LazyWizard/VersionChecker/blob/master/versionchecker.version",
-    #"masterVersionFile":"https://github.com/LazyWizard/VersionChecker/releases/download/0.1/versionchecker.version",
-    #"masterVersionFile":"https://bitbucket.org/LazyWizard/version-checker/raw/tip/versionchecker.version",
-    "masterVersionFile":"https://bitbucket.org/LazyWizard/version-checker/downloads/versionchecker.version",
+    # A link to the raw .version JSON data
+    "masterVersionFile":"https://raw.githubusercontent.com/LazyWizard/version-checker/master/mod/versionchecker.version",
     # The name that is displayed in-game for your mod
     "modName":"Version Checker",
     # The ID of the thread where updates to this mod can be found (optional).
@@ -34,6 +33,6 @@
     {
         "major":2,
         "minor":0,
-        "patch":0 # Can be a number, character or string (1, 2, a, b, "-RC2", etc)
+        "patch":b # Can be a number, character or string (1, 2, a, b, "-RC2", etc)
     }
 }

mod/versionchecker.version

@@ -112,7 +112,7 @@ public void advance(float amount)
     {
         // Don't do anything while in a menu/dialog
         CampaignUIAPI ui = Global.getSector().getCampaignUI();
-        if (Global.getSector().isInNewGameAdvance() || ui.isShowingDialog())
+        if (Global.getSector().isInNewGameAdvance() || ui.isShowingDialog() || ui.isShowingMenu())
         {
             return;
         }

src/org/lazywizard/versionchecker/UpdateNotificationScript.java

@@ -52,6 +52,8 @@ public void connect() throws IOException
 
         // Enable TLS v1.2 (required to use Bitbucket past December 1st, 2018)
         System.setProperty("https.protocols", "SSLv3,TLSv1,TLSv1.1,TLSv1.2");
+        // TODO: Enable TLS v1.3 (required to use Bitbucket past August 24, 2020)
+        //System.setProperty("https.cipherSuites", System.getProperty("https.cipherSuites") + ",");
 
         final JSONObject settings = Global.getSettings().loadJSON(SETTINGS_FILE);
         notificationKey = settings.getInt("summonUpdateNotificationKey");

src/org/lazywizard/versionchecker/VCModPlugin.java

@@ -16,11 +16,10 @@
 import java.util.Scanner;
 import java.util.concurrent.*;
 
-// TEMP: runcode String path = (System.getProperty("user.dir")+"/"+System.getProperty("com.fs.starfarer.settings.paths.mods")); path = path.replace("\\\\", "\\").replace("\\","/");System.out.println(path);
 final class VersionChecker
 {
     private static final String VANILLA_UPDATE_URL
-            = "https://bitbucket.org/LazyWizard/version-checker/downloads/vanilla.txt";
+            = "https://raw.githubusercontent.com/LazyWizard/version-checker/master/vanilla.txt";
     private static int MAX_THREADS = 12;
 
     static void setMaxThreads(int maxThreads)
@@ -32,7 +31,7 @@ private static JSONObject sanitizeJSON(final String rawJSON) throws JSONExceptio
     {
         StringBuilder result = new StringBuilder(rawJSON.length());
 
-        // Remove elements that default JSON implementation can't parse
+        // Remove elements that the default JSON implementation can't parse
         for (final String str : rawJSON.split("\n"))
         {
             // Strip out whole-line comments
@@ -80,7 +79,6 @@ private static Object getRemoteVersionFile(final String versionFileURL)
              Scanner scanner = new Scanner(stream, "UTF-8").useDelimiter("\\A"))
         {
             return new VersionFile(sanitizeJSON(scanner.next()), true);
-
         }
         catch (MalformedURLException ex)
         {