Merge branch 'develop' into vbl-exclusions

RPTools · Nov 6, 2024 · 82e8666 · 82e8666
2 parents e9fa79b + dc948f9
commit 82e8666
Show file tree

Hide file tree

Showing 201 changed files with 7,312 additions and 6,608 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -68,11 +68,11 @@ jobs:
       #   | |/ |/ // // / / // /_/ // /_/ /| |/ |/ /(__  )
       #   |__/|__//_//_/ /_/ \__,_/ \____/ |__/|__//____/
       #
-    - name: Copy Windows Release Files
+    - name: Rename Windows Release Files
       if: matrix.os == 'windows-latest'
       run: |
-        cp releases/MapTool*.exe releases/MapTool-${{ github.event.release.tag_name }}.exe
-        cp releases/MapTool*.msi releases/MapTool-${{ github.event.release.tag_name }}.msi
+        mv releases/MapTool*.exe releases/MapTool-${{ github.event.release.tag_name }}.exe
+        mv releases/MapTool*.msi releases/MapTool-${{ github.event.release.tag_name }}.msi
       continue-on-error: true
     - name: Upload Windows EXE Release Asset
       id: upload-release-asset-exe
@@ -113,12 +113,12 @@ jobs:
       #    / /___ / // / / // /_/ /_>  <
       #   /_____//_//_/ /_/ \__,_//_/|_|
       #
-    - name: Copy Linux Release Files
+    - name: Rename Linux Release Files
       if: matrix.os == 'ubuntu-latest'
       run: |
-        cp releases/maptool*.x86_64.rpm releases/maptool-${{ github.event.release.tag_name }}.x86_64.rpm
-        cp releases/maptool*_amd64.deb releases/maptool_${{ github.event.release.tag_name }}_amd64.deb
-        cp package/archlinux/maptool/maptool-*-x86_64.pkg.tar.zst releases/maptool-${{ github.event.release.tag_name }}-x86_64.pkg.tar.zst
+        mv -n releases/maptool*.x86_64.rpm releases/maptool-${{ github.event.release.tag_name }}.x86_64.rpm
+        mv -n releases/maptool*_amd64.deb releases/maptool_${{ github.event.release.tag_name }}_amd64.deb
+        mv -n package/archlinux/maptool/maptool-*-x86_64.pkg.tar.zst releases/maptool-${{ github.event.release.tag_name }}-x86_64.pkg.tar.zst
       continue-on-error: true
     - name: Upload Linux RPM Release Asset
       id: upload-release-asset-rpm
@@ -159,11 +159,11 @@ jobs:
       #    / / / / / // /_/ // /__ / /_/ /___/ /
       #   /_/ /_/ /_/ \__,_/ \___/ \____//____/
       #
-    - name: Copy Mac OS Release Files
+    - name: Rename Mac OS Release Files
       if: matrix.os == 'macOS-13'
       run: |
-        cp releases/MapTool*.dmg releases/MapTool-${{ github.event.release.tag_name }}.dmg
-        cp releases/MapTool*.pkg releases/MapTool-${{ github.event.release.tag_name }}.pkg
+        mv releases/MapTool*.dmg releases/MapTool-${{ github.event.release.tag_name }}.dmg
+        mv releases/MapTool*.pkg releases/MapTool-${{ github.event.release.tag_name }}.pkg
       continue-on-error: true
     - name: Upload Mac DMG Release Asset
       id: upload-release-asset-dmg

diff --git a/build.gradle b/build.gradle
@@ -328,7 +328,7 @@ dependencies {
 
     // Image processing lib
     implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-core', version: '3.10.1'	// https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core
-    implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-jpeg', version: '3.10.1'	// https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core
+    implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-jpeg', version: '3.12.0'	// https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core
     implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-psd', version: '3.10.1'	// https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-psd
     implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-tiff', version: '3.11.0'
     implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-batik', version: '3.10.1'

diff --git a/src/main/java/net/rptools/lib/image/ImageUtil.java b/src/main/java/net/rptools/lib/image/ImageUtil.java
@@ -155,7 +155,7 @@ public static BufferedImage createCompatibleImage(
     Graphics2D g = null;
     try {
       g = compImg.createGraphics();
-      AppPreferences.getRenderQuality().setRenderingHints(g);
+      AppPreferences.renderQuality.get().setRenderingHints(g);
       g.drawImage(img, 0, 0, width, height, null);
     } finally {
       if (g != null) {
@@ -442,7 +442,7 @@ public static ImageIcon scaleImage(ImageIcon icon, int w, int h) {
    */
   public static BufferedImage scaleBufferedImage(BufferedImage image, int width, int height) {
     ResampleOp resampleOp =
-        new ResampleOp(width, height, AppPreferences.getRenderQuality().getResampleOpFilter());
+        new ResampleOp(width, height, AppPreferences.renderQuality.get().getResampleOpFilter());
     return resampleOp.filter(image, null);
   }
 }
diff --git a/src/main/java/net/rptools/lib/image/ThumbnailManager.java b/src/main/java/net/rptools/lib/image/ThumbnailManager.java
@@ -79,7 +79,7 @@ private Image createThumbnail(File file) throws IOException {
         new BufferedImage(imgSize.width, imgSize.height, ImageUtil.pickBestTransparency(image));
 
     Graphics2D g = thumbnailImage.createGraphics();
-    AppPreferences.getRenderQuality().setShrinkRenderingHints(g);
+    AppPreferences.renderQuality.get().setShrinkRenderingHints(g);
     g.drawImage(image, 0, 0, imgSize.width, imgSize.height, null);
     g.dispose();
 

diff --git a/src/main/java/net/rptools/maptool/client/AppActions.java b/src/main/java/net/rptools/maptool/client/AppActions.java
@@ -1195,7 +1195,7 @@ protected void executeAction() {
             MapTool.showError("msg.error.mustSelectRootGroup");
             return;
           }
-          AppPreferences.removeAssetRoot(dir.getPath());
+          AppStatePersisted.removeAssetRoot(dir.getPath());
           assetPanel.removeAssetRoot(dir);
         }
       };
@@ -2600,7 +2600,7 @@ protected void done() {
         ImageManager.flush(); // Clear out the old campaign's images
 
         AppState.setCampaignFile(campaignFile);
-        AppPreferences.setLoadDir(campaignFile.getParentFile());
+        AppPreferences.loadDirectory.set(campaignFile.getParentFile());
         AppMenuBar.getMruManager().addMRUCampaign(campaignFile);
         campaign.campaign.setName(AppState.getCampaignName()); // Update campaign name
 
@@ -2792,7 +2792,7 @@ private static void saveAndUpdateCampaignName(File selectedFile, Runnable onSucc
     }
     doSaveCampaign(campaignFile, onSuccess);
     AppState.setCampaignFile(campaignFile);
-    AppPreferences.setSaveDir(campaignFile.getParentFile());
+    AppPreferences.saveDirectory.set(campaignFile.getParentFile());
     AppMenuBar.getMruManager().addMRUCampaign(AppState.getCampaignFile());
     if (MapTool.isHostingServer() || MapTool.isPersonalServer()) {
       MapTool.serverCommand().setCampaignName(AppState.getCampaignName());
@@ -2846,7 +2846,7 @@ protected void executeAction() {
                   }
                 }
                 PersistenceUtil.saveMap(zr.getZone(), mapFile);
-                AppPreferences.setSaveMapDir(mapFile.getParentFile());
+                AppPreferences.mapSaveDirectory.set(mapFile.getParentFile());
                 MapTool.showInformation("msg.info.mapSaved");
               } catch (IOException ioe) {
                 MapTool.showError("msg.error.failedSaveMap", ioe);
@@ -2973,7 +2973,7 @@ protected void done() {
 
       try {
         PersistedMap map = get();
-        AppPreferences.setLoadDir(mapFile.getParentFile());
+        AppPreferences.loadDirectory.set(mapFile.getParentFile());
         if ((map.zone.getExposedArea() != null && !map.zone.getExposedArea().isEmpty())
             || (map.zone.getExposedAreaMetaData() != null
                 && !map.zone.getExposedAreaMetaData().isEmpty())) {