Bugfixes (#21)

- Fix NPE in Military Regulations when checking blacklist against pristine ships.
- Fix Stelnet compatiblity.
- Add support for auto-updater in Mod Manager.

Author: jaghaimo

assets/mod_info.json

@@ -3,7 +3,7 @@
     "name": "Starpocalypse",
     "author": "Jaghaimo",
     "utility": true,
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "More apocalyptic settings for Starsector",
     "gameVersion": "0.95.1a-RC6",
     "modPlugin": "starpocalypse.StarpocalypseMod",

assets/starpocalypse.version

@@ -5,7 +5,7 @@
     "modVersion": {
         "major": 2,
         "minor": 1,
-        "patch": 0
+        "patch": 1
     },
-    "directDownloadURL": "https://github.com/jaghaimo/starpocalypse/releases/download/2.1.0/starpocalypse-2.1.0.zip"
+    "directDownloadURL": "https://github.com/jaghaimo/starpocalypse/releases/download/2.1.1/starpocalypse-2.1.1.zip"
 }

src/starpocalypse/submarket/MilitaryRegulation.java

@@ -4,6 +4,7 @@
 import com.fs.starfarer.api.campaign.CargoStackAPI;
 import com.fs.starfarer.api.campaign.FleetDataAPI;
 import com.fs.starfarer.api.campaign.econ.SubmarketAPI;
+import com.fs.starfarer.api.combat.ShipHullSpecAPI;
 import com.fs.starfarer.api.combat.ShipHullSpecAPI.ShipTypeHints;
 import com.fs.starfarer.api.fleet.FleetMemberAPI;
 import com.fs.starfarer.api.impl.campaign.ids.HullMods;
@@ -72,7 +73,11 @@ protected boolean isBlacklisted(SimpleSet blacklist, CargoStackAPI stack) {
     }
 
     protected boolean isBlacklisted(SimpleSet blacklist, FleetMemberAPI ship) {
-        return blacklist.has(ship.getHullSpec().getBaseHull().getHullName());
+        ShipHullSpecAPI hullSpec = ship.getHullSpec().getBaseHull();
+        if (hullSpec == null) {
+            hullSpec = ship.getHullSpec();
+        }
+        return blacklist.has(hullSpec.getHullName());
     }
 
     private void addToMilitary(CargoStackAPI stack) {

src/starpocalypse/submarket/ShyBlackMarketListener.java

@@ -7,7 +7,6 @@
 import com.fs.starfarer.api.campaign.econ.SubmarketAPI;
 import com.fs.starfarer.api.campaign.listeners.ColonyInteractionListener;
 import com.fs.starfarer.api.impl.campaign.ids.Submarkets;
-import com.fs.starfarer.api.impl.campaign.submarkets.BaseSubmarketPlugin;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
@@ -46,34 +45,19 @@ public void reportPlayerMarketTransaction(PlayerMarketTransaction transaction) {
 
     private void processSubmarkets(MarketAPI market) {
         for (SubmarketAPI submarket : getSortedSubmarkets(market)) {
+            update(submarket);
             process(submarket);
         }
     }
 
     private void process(SubmarketAPI submarket) {
-        if (!okToUpdate(submarket)) {
-            log.debug("Skipping already updated submarket " + submarket.getNameOneLine());
-            return;
-        }
-        update(submarket);
         log.debug("Processing submarket " + submarket.getNameOneLine());
         for (SubmarketChanger changer : changers) {
             log.debug("Trying " + changer.getClass().getSimpleName());
             changer.change(submarket);
         }
     }
 
-    private boolean okToUpdate(SubmarketAPI submarket) {
-        boolean okToUpdate = true;
-        try {
-            SubmarketPlugin plugin = submarket.getPlugin();
-            okToUpdate = ((BaseSubmarketPlugin) plugin).okToUpdateShipsAndWeapons();
-        } catch (ClassCastException exception) {
-            log.warn("Incompatible plugin for submarket " + submarket.getNameOneLine());
-        }
-        return okToUpdate;
-    }
-
     private void update(SubmarketAPI submarket) {
         SubmarketPlugin plugin = submarket.getPlugin();
         if (plugin == null) {