Dev to master, v1.5.2 (#7)

* Optimize imports, change package structure

* Refactor utilities location

* Reset config to correct values

ScanThoseGates.version

@@ -6,8 +6,8 @@
 	{
 		"major":1,
 		"minor":5,
-		"patch":1,
+		"patch":2,
 	},
-	"starsectorVersion":"0.95.1a-RC6",
-	"directDownloadURL":"https://github.com/AEROassault/ScanThoseGates/releases/download/v1.5.1/ScanThoseGates.zip",
+	"starsectorVersion":"0.96a-RC9",
+	"directDownloadURL":"https://github.com/AEROassault/ScanThoseGates/releases/download/v1.5.2/ScanThoseGates.zip",
 }

data/campaign/abilities.csv

@@ -1,6 +1,6 @@
 name,id,type,tags,activationDays,activationCooldown,durationDays,deactivationDays,deactivationCooldown,unlockedAtStart,defaultForAIFleet,musicSuppression,uiOn,uiOff,uiLoop,worldOn,worldOff,worldLoop,icon,plugin,ai,desc,sortOrder
-Remote Gate Scan,stg_GateScanner,DURATION,,0.05,,0.05,0.05,1,TRUE,FALSE,,,,,,,,graphics/ScanThoseGates/icons/abilities/stg_gate_scanner.png,ScanThoseGates.campaign.econ.abilities.GateScanner,,Allows for remote scanning of gates after obtaining the Janus Device.,2000
-Remote Hypershunt Survey,stg_HypershuntScanner,DURATION,,0.05,,0.05,0.05,1,TRUE,FALSE,,,,,,,,graphics/ScanThoseGates/icons/abilities/stg_hypershunt_scanner.png,ScanThoseGates.campaign.econ.abilities.HypershuntScanner,,Allows for remotely identifying hypershunts on the intel screen.,2001
-Remote Cryosleeper Survey,stg_CryosleeperScanner,DURATION,,0.05,,0.05,0.05,1,TRUE,FALSE,,,,,,,,graphics/ScanThoseGates/icons/abilities/stg_cryosleeper_scanner.png,ScanThoseGates.campaign.econ.abilities.CryosleeperScanner,,Allows for remotely identifying cryosleepers on the intel screen.,2002
+Remote Gate Scan,stg_GateScanner,DURATION,,0.05,,0.05,0.05,1,TRUE,FALSE,,,,,,,,graphics/scanthosegates/icons/abilities/stg_gate_scanner.png,scanthosegates.campaign.econ.abilities.GateScanner,,Allows for remote scanning of gates after obtaining the Janus Device.,2000
+Remote Hypershunt Survey,stg_HypershuntScanner,DURATION,,0.05,,0.05,0.05,1,TRUE,FALSE,,,,,,,,graphics/scanthosegates/icons/abilities/stg_hypershunt_scanner.png,scanthosegates.campaign.econ.abilities.HypershuntScanner,,Allows for remotely identifying hypershunts on the intel screen.,2001
+Remote Cryosleeper Survey,stg_CryosleeperScanner,DURATION,,0.05,,0.05,0.05,1,TRUE,FALSE,,,,,,,,graphics/scanthosegates/icons/abilities/stg_cryosleeper_scanner.png,scanthosegates.campaign.econ.abilities.CryosleeperScanner,,Allows for remotely identifying cryosleepers on the intel screen.,2002
 ,,,,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,,,,

data/config/settings.json

@@ -1,7 +1,7 @@
 {
   # Setting to true will add Inactive Gates to the intel screen when the gate scan occurs, revealing their location
-  "AddInactiveGatesToIntel": true, # Default false
+  "AddInactiveGatesToIntel": false, # Default false
 
   # Setting to true will scan all gates, regardless of whether there is a non-hidden market or not
-  "ScanAllGates": true, # Default false
+  "ScanAllGates": false, # Default false
 }

data/console/commands.csv

@@ -1,2 +1,2 @@
 command,class,tags,syntax,help,
-RemoveScanThoseGates,ScanThoseGates.console.RemoveScanThoseGates,"campaign, ScanThoseGates",RemoveScanThoseGates,"Removes all abilities and intel entries added by the Scan Those Gates mod. After running the command and saving your game, the mod can safely be removed.",
+RemoveScanThoseGates,scanthosegates.console.RemoveScanThoseGates,"campaign, scanthosegates",RemoveScanThoseGates,"Removes all abilities and intel entries added by the Scan Those Gates mod. After running the command and saving your game, the mod can safely be removed.",

mod_info.json

@@ -2,9 +2,9 @@
   "id":"scan_those_gates",
   "name":"Scan Those Gates",
   "author":"AERO",
-  "version":"1.5.1",
-  "description":"Scans all gates that are located in systems with at least one non-hidden market at save start",
-  "gameVersion":"0.95.1a-RC6",
+  "version":"1.5.2",
+  "description":"Adds abilities to scan gates and reveal megastructure locations.",
+  "gameVersion":"0.96a-RC9",
   "jars":["jars/ScanThoseGates.jar"],
-  "modPlugin":"ScanThoseGates.stg_ModPlugin"
+  "modPlugin":"scanthosegates.ModPlugin"
 }

src/ScanThoseGates/stg_ModPlugin.java → src/scanthosegates/ModPlugin.java

@@ -1,16 +1,16 @@
-package ScanThoseGates;
+package scanthosegates;
 
-import ScanThoseGates.campaign.econ.abilities.CryosleeperScanner;
-import ScanThoseGates.campaign.econ.abilities.GateScanner;
-import ScanThoseGates.campaign.econ.abilities.HypershuntScanner;
-import ScanThoseGates.campaign.listeners.RelocationListener;
-import ScanThoseGates.campaign.listeners.SalvagingListener;
+import scanthosegates.campaign.econ.abilities.CryosleeperScanner;
+import scanthosegates.campaign.econ.abilities.GateScanner;
+import scanthosegates.campaign.econ.abilities.HypershuntScanner;
+import scanthosegates.campaign.listeners.RelocationListener;
+import scanthosegates.campaign.listeners.SalvagingListener;
 import com.fs.starfarer.api.BaseModPlugin;
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.CharacterDataAPI;
 import com.fs.starfarer.api.campaign.rules.MemoryAPI;
 
-public class stg_ModPlugin extends BaseModPlugin {
+public class ModPlugin extends BaseModPlugin {
     public static final String INTEL_MEGASTRUCTURES = "Megastructures";
 
     @Override

src/ScanThoseGates/scripts/stg_Utilities.java → src/scanthosegates/Utilities.java

@@ -1,11 +1,11 @@
-package ScanThoseGates.scripts;
+package scanthosegates;
 
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.SectorEntityToken;
 import com.fs.starfarer.api.campaign.StarSystemAPI;
 import com.fs.starfarer.api.util.Misc;
 
-public class stg_Utilities {
+public class Utilities {
     public static boolean isInUnexploredSystem(SectorEntityToken token) {
         if (token.getStarSystem() != null) {
             return !token.getStarSystem().isEnteredByPlayer();

src/ScanThoseGates/campaign/econ/abilities/CryosleeperScanner.java → src/scanthosegates/campaign/econ/abilities/CryosleeperScanner.java

@@ -1,6 +1,6 @@
-package ScanThoseGates.campaign.econ.abilities;
+package scanthosegates.campaign.econ.abilities;
 
-import ScanThoseGates.campaign.intel.CryosleeperIntel;
+import scanthosegates.campaign.intel.CryosleeperIntel;
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.CampaignFleetAPI;
 import com.fs.starfarer.api.campaign.SectorEntityToken;

src/ScanThoseGates/campaign/econ/abilities/GateScanner.java → src/scanthosegates/campaign/econ/abilities/GateScanner.java

@@ -1,4 +1,4 @@
-package ScanThoseGates.campaign.econ.abilities;
+package scanthosegates.campaign.econ.abilities;
 
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.CampaignFleetAPI;

src/ScanThoseGates/campaign/econ/abilities/HypershuntScanner.java → src/scanthosegates/campaign/econ/abilities/HypershuntScanner.java

@@ -1,6 +1,6 @@
-package ScanThoseGates.campaign.econ.abilities;
+package scanthosegates.campaign.econ.abilities;
 
-import ScanThoseGates.campaign.intel.CoronalHypershuntIntel;
+import scanthosegates.campaign.intel.CoronalHypershuntIntel;
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.CampaignFleetAPI;
 import com.fs.starfarer.api.campaign.SectorEntityToken;

src/ScanThoseGates/campaign/intel/BaseIntel.java → src/scanthosegates/campaign/intel/BaseIntel.java

@@ -1,6 +1,6 @@
-package ScanThoseGates.campaign.intel;
+package scanthosegates.campaign.intel;
 
-import ScanThoseGates.campaign.intel.button.IntelButton;
+import scanthosegates.campaign.intel.button.IntelButton;
 import com.fs.starfarer.api.campaign.SectorEntityToken;
 import com.fs.starfarer.api.impl.campaign.intel.BaseIntelPlugin;
 import com.fs.starfarer.api.ui.ButtonAPI;

src/ScanThoseGates/campaign/intel/CoronalHypershuntIntel.java → src/scanthosegates/campaign/intel/CoronalHypershuntIntel.java

@@ -1,7 +1,7 @@
-package ScanThoseGates.campaign.intel;
+package scanthosegates.campaign.intel;
 
-import ScanThoseGates.campaign.intel.button.LayInCourse;
-import ScanThoseGates.stg_ModPlugin;
+import scanthosegates.ModPlugin;
+import scanthosegates.campaign.intel.button.LayInCourse;
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.FactionAPI;
 import com.fs.starfarer.api.campaign.SectorEntityToken;
@@ -14,7 +14,7 @@
 import java.util.Set;
 
 public class CoronalHypershuntIntel extends BaseIntel {
-    public static final String INTEL_HYPERSHUNT = stg_ModPlugin.INTEL_MEGASTRUCTURES;
+    public static final String INTEL_HYPERSHUNT = ModPlugin.INTEL_MEGASTRUCTURES;
     private final SectorEntityToken hypershunt;
 
     public CoronalHypershuntIntel(SectorEntityToken hypershunt) {

src/ScanThoseGates/campaign/intel/CryosleeperIntel.java → src/scanthosegates/campaign/intel/CryosleeperIntel.java

@@ -1,7 +1,7 @@
-package ScanThoseGates.campaign.intel;
+package scanthosegates.campaign.intel;
 
-import ScanThoseGates.campaign.intel.button.LayInCourse;
-import ScanThoseGates.stg_ModPlugin;
+import scanthosegates.ModPlugin;
+import scanthosegates.campaign.intel.button.LayInCourse;
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.FactionAPI;
 import com.fs.starfarer.api.campaign.SectorEntityToken;
@@ -14,7 +14,7 @@
 import java.util.Set;
 
 public class CryosleeperIntel extends BaseIntel {
-    public static final String INTEL_CRYOSLEEPER = stg_ModPlugin.INTEL_MEGASTRUCTURES;
+    public static final String INTEL_CRYOSLEEPER = ModPlugin.INTEL_MEGASTRUCTURES;
     private final SectorEntityToken cryosleeper;
 
     public CryosleeperIntel(SectorEntityToken cryosleeper) {

src/ScanThoseGates/campaign/intel/CustomMessageIntel.java → src/scanthosegates/campaign/intel/CustomMessageIntel.java

@@ -1,9 +1,9 @@
-package ScanThoseGates.campaign.intel;
+package scanthosegates.campaign.intel;
 
-import ScanThoseGates.campaign.intel.button.IgnoreCustom;
-import ScanThoseGates.campaign.intel.button.LayInCourse;
-import ScanThoseGates.campaign.intel.button.ToggleCustom;
-import ScanThoseGates.scripts.stg_Utilities;
+import scanthosegates.campaign.intel.button.IgnoreCustom;
+import scanthosegates.campaign.intel.button.LayInCourse;
+import scanthosegates.campaign.intel.button.ToggleCustom;
+import scanthosegates.Utilities;
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.CampaignClockAPI;
 import com.fs.starfarer.api.campaign.LocationAPI;
@@ -36,7 +36,7 @@ public CustomMessageIntel(String message) {
     }
 
     private String getLocation() {
-        return stg_Utilities.getSystemNameOrHyperspace(locationCreated);
+        return Utilities.getSystemNameOrHyperspace(locationCreated);
     }
 
     public void toggleShow() {

src/ScanThoseGates/campaign/intel/button/IgnoreCustom.java → src/scanthosegates/campaign/intel/button/IgnoreCustom.java

@@ -1,6 +1,6 @@
-package ScanThoseGates.campaign.intel.button;
+package scanthosegates.campaign.intel.button;
 
-import ScanThoseGates.campaign.intel.CustomMessageIntel;
+import scanthosegates.campaign.intel.CustomMessageIntel;
 import com.fs.starfarer.api.ui.IntelUIAPI;
 import com.fs.starfarer.api.ui.TooltipMakerAPI;
 import org.lwjgl.input.Keyboard;

src/ScanThoseGates/campaign/intel/button/IntelButton.java → src/scanthosegates/campaign/intel/button/IntelButton.java

@@ -1,4 +1,4 @@
-package ScanThoseGates.campaign.intel.button;
+package scanthosegates.campaign.intel.button;
 
 import com.fs.starfarer.api.ui.IntelUIAPI;
 import com.fs.starfarer.api.ui.TooltipMakerAPI;

src/ScanThoseGates/campaign/intel/button/LayInCourse.java → src/scanthosegates/campaign/intel/button/LayInCourse.java

@@ -1,4 +1,4 @@
-package ScanThoseGates.campaign.intel.button;
+package scanthosegates.campaign.intel.button;
 
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.SectorEntityToken;

src/ScanThoseGates/campaign/intel/button/ToggleCustom.java → src/scanthosegates/campaign/intel/button/ToggleCustom.java

@@ -1,6 +1,6 @@
-package ScanThoseGates.campaign.intel.button;
+package scanthosegates.campaign.intel.button;
 
-import ScanThoseGates.campaign.intel.CustomMessageIntel;
+import scanthosegates.campaign.intel.CustomMessageIntel;
 import com.fs.starfarer.api.ui.IntelUIAPI;
 import com.fs.starfarer.api.ui.TooltipMakerAPI;
 import org.lwjgl.input.Keyboard;

src/ScanThoseGates/campaign/listeners/RelocationListener.java → src/scanthosegates/campaign/listeners/RelocationListener.java

@@ -1,7 +1,7 @@
-package ScanThoseGates.campaign.listeners;
+package scanthosegates.campaign.listeners;
 
-import ScanThoseGates.campaign.econ.abilities.CryosleeperScanner;
-import ScanThoseGates.campaign.econ.abilities.HypershuntScanner;
+import scanthosegates.campaign.econ.abilities.CryosleeperScanner;
+import scanthosegates.campaign.econ.abilities.HypershuntScanner;
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.LocationAPI;
 import com.fs.starfarer.api.campaign.SectorEntityToken;

src/ScanThoseGates/campaign/listeners/SalvagingListener.java → src/scanthosegates/campaign/listeners/SalvagingListener.java

@@ -1,7 +1,7 @@
-package ScanThoseGates.campaign.listeners;
+package scanthosegates.campaign.listeners;
 
-import ScanThoseGates.campaign.econ.abilities.CryosleeperScanner;
-import ScanThoseGates.campaign.econ.abilities.HypershuntScanner;
+import scanthosegates.campaign.econ.abilities.CryosleeperScanner;
+import scanthosegates.campaign.econ.abilities.HypershuntScanner;
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.SectorEntityToken;
 import com.fs.starfarer.api.campaign.listeners.DiscoverEntityListener;

src/ScanThoseGates/console/RemoveScanThoseGates.java → src/scanthosegates/console/RemoveScanThoseGates.java

@@ -1,7 +1,7 @@
-package ScanThoseGates.console;
+package scanthosegates.console;
 
-import ScanThoseGates.campaign.intel.CoronalHypershuntIntel;
-import ScanThoseGates.campaign.intel.CryosleeperIntel;
+import scanthosegates.campaign.intel.CoronalHypershuntIntel;
+import scanthosegates.campaign.intel.CryosleeperIntel;
 import com.fs.starfarer.api.Global;
 import com.fs.starfarer.api.campaign.CharacterDataAPI;
 import com.fs.starfarer.api.campaign.comm.IntelInfoPlugin;