Reworked Contacts, Commodity and Trade boards

.github/workflows/prettier.yml

@@ -16,7 +16,7 @@ jobs:
             - name: Checkout
               uses: actions/checkout@v2
               with:
-                lfs: true
+                  lfs: true
 
             - name: Install Prettier
               run: npm install

.github/workflows/release.yml

@@ -1,23 +1,16 @@
 name: GitHub Release
 
 on:
-    # Triggers the workflow on pushing a tag only
     push:
         tags: "*"
         branches:
             - "!*"
 
-    # Allows you to run this workflow manually from the Actions tab
-    workflow_dispatch:
-
 jobs:
     build:
-        # The type of runner that the job will run on
         runs-on: ubuntu-latest
 
         steps:
-            # Checks-out repository under $GITHUB_WORKSPACE, so your job can access it
-            # GitHub Actions by default doesn't check out tags, so make sure those are included
             - name: Checkout
               uses: actions/checkout@v2
               with:

.github/workflows/tests.yml

@@ -0,0 +1,24 @@
+name: Build
+
+on:
+    pull_request:
+    push:
+        branches:
+            - master
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  lfs: true
+
+            - name: Run Tests
+              run: |
+                  chmod +x gradlew
+                  ./gradlew build --no-daemon
+
+# TODO: https://www.linkedin.com/pulse/static-code-analysis-sonarlint-github-actions-lucas-persson

.gitignore

@@ -3,6 +3,7 @@
 .gradle/
 .project
 .settings/
+.idea/
 /*.zip
 bin/
 build/

assets/data/config/LunaSettingsConfig.json

@@ -0,0 +1,5 @@
+{
+    "stelnet": {
+        "iconPath": "graphics/icons/stelnet.png"
+    }
+}

assets/data/l10n/commodity.json

@@ -1,4 +1,7 @@
 {
+    "ACTION_BUY": "Buy",
+    "ACTION_SELL": "Sell",
+    "ACTION_PROFIT": "Profit",
     "BOARD_DESCRIPTION": "Compare and track commodity prices among all known markets.",
     "BOARD_TITLE": "Commodity Market",
     "DELETE": "Delete",
@@ -34,4 +37,4 @@
     "INTEL_WITH_DEFICIT": "All commodities with deficit",
     "INTEL_WITH_EXCESS": "All commodities with excess",
     "PRICE_CHANGED": "{0} (was {1})"
-}
+}

assets/data/l10n/common.json

@@ -47,5 +47,20 @@
     "WEAPONS": "Weapons",
     "WING_BOMBERS": "Bombers",
     "WING_FIGHTERS": "Fighters",
-    "WING_INTERCEPTORS": "Interceptors"
+    "WING_INTERCEPTORS": "Interceptors",
+    "STACK_BLUEPRINT": "Blueprint",
+    "STACK_COMMODITY": "Commodity",
+    "STACK_FIGHTER": "Fighter Wing",
+    "STACK_MODSPEC": "Modspec",
+    "STACK_SPECIAL": "Special",
+    "STACK_WEAPON": "Weapon",
+    "ROLE_ASSAULT": "Assault",
+    "ROLE_BOMBER": "Bomber",
+    "ROLE_FIGHTER": "Fighter",
+    "ROLE_INTERCEPTOR": "Interceptor",
+    "ROLE_SUPPORT": "Support",
+    "HULL_CAPITAL_SHIP": "Capital Ship",
+    "HULL_CRUISER": "Cruiser",
+    "HULL_DESTROYER": "Destroyer",
+    "HULL_FRIGATE": "Frigate"
 }

assets/data/l10n/query.json

@@ -59,5 +59,10 @@
     "SUBMARKET_SHIPS": "{0} matching ships",
     "TITLE": "Queries",
     "WEAPON_MOUNTS": "Weapon Mounts",
-    "WING_ROLES": "Wing roles"
+    "WING_ROLES": "Wing roles",
+    "STATE_LIST": "List Queries",
+    "STATE_MANAGE": "Manage Results",
+    "STATE_NEW": "Add a New Query",
+    "BY_MARKET": "Group By Market",
+    "BY_SYSTEM": "Group By Star System"
 }

assets/data/l10n/widget.json

@@ -4,5 +4,9 @@
     "VIEWER_NO_MARKETS": "Please select a market to view.",
     "VIEWER_NO_SHIPS": "There are no matching ships to display.",
     "VIEWER_NO_STORAGES": "You do not have any storages.",
-    "VIEWER_UNIFIED_VIEW_TITLE": "Unified View"
+    "VIEWER_UNIFIED_VIEW_TITLE": "Unified View",
+    "PER_LOCATION": "Per Location",
+    "UNIFIED": "Unified",
+    "ITEMS": "Items",
+    "SHIPS": "Ships"
 }

assets/mod_info.json

@@ -3,7 +3,7 @@
     "name": "Stellar Networks",
     "author": "Jaghaimo",
     "utility": true,
-    "version": "3.1.3",
+    "version": "3.2.0",
     "description": "A collection of intel boards for Starsector",
     "gameVersion": "0.96a-RC10",
     "modPlugin": "stelnet.StelnetMod",

build.gradle

@@ -25,17 +25,17 @@ configurations {
 }
 
 // install dependencies from zipped releases
-task installDependencies(type: Sync) {
+tasks.register('installDependencies', Sync) {
     def extractDir = "${buildDir}/libs"
-    
+
     ext.extractedJars = fileTree(extractDir) {
         include "**/*.jar"
         exclude "stelnet.jar"
         builtBy "installDependencies"
     }
 
     dependsOn configurations.zipped
-    from { 
+    from {
         configurations.zipped.collect { zipTree(it) }
     }
     into extractDir
@@ -49,6 +49,7 @@ java {
 
 // where to find sources
 sourceSets.main.java.srcDirs = ['src/']
+sourceSets.test.java.srcDirs = ['tests/']
 
 // build everything and make a jar
 build {
@@ -64,7 +65,7 @@ build {
 // compile time dependencies
 dependencies {
     implementation "jaghaimo:starsector-api:0.96a-RC10@starfarer.api.jar"
-    zipped "Lukas22041:LunaLib:1.7.6@LunaLib.zip"
+    zipped "Lukas22041:LunaLib:1.7.7@LunaLib.zip"
     implementation files({ tasks.installDependencies.extractedJars })
 
     // game dependencies
@@ -79,10 +80,14 @@ dependencies {
     // lombok
     compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.28'
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.28'
+
+    // tests
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:2.28.2'
 }
 
 // custom tasks
-task release(type: Zip) {
+tasks.register('release', Zip) {
     dependsOn build
     archiveFileName = "${project.name}-${readModInfoJson().version}.zip"
     destinationDirectory = file(rootDir)

src/stelnet/DelayedDialog.java

@@ -5,15 +5,15 @@
 import com.fs.starfarer.api.campaign.CampaignUIAPI;
 import lombok.RequiredArgsConstructor;
 
-@RequiredArgsConstructor
 /**
  * A delayed dialog that shows `message` after `delayInSeconds` time.
  */
+@RequiredArgsConstructor
 public class DelayedDialog implements EveryFrameScript {
 
-    private float advanced = 0;
     private final String message;
     private final float delayInSeconds;
+    private float advanced = 0;
 
     @Override
     public boolean isDone() {
@@ -26,8 +26,8 @@ public boolean runWhilePaused() {
     }
 
     @Override
-    public void advance(float amount) {
-        CampaignUIAPI campaignUi = Global.getSector().getCampaignUI();
+    public void advance(final float amount) {
+        final CampaignUIAPI campaignUi = Global.getSector().getCampaignUI();
         if (campaignUi == null) {
             unregister();
             return;

src/stelnet/EmptyIntel.java

@@ -2,6 +2,9 @@
 
 import com.fs.starfarer.api.impl.campaign.intel.BaseIntelPlugin;
 
+/**
+ * An empty intel that will be removed at next opportunity by IntelManager.
+ */
 public class EmptyIntel extends BaseIntelPlugin {
 
     @Override