Upload all token overlay (state/bar) assets whenever adding a state or bar

Author: kwvanderlinde

src/main/java/net/rptools/maptool/client/MapToolUtil.java

@@ -16,6 +16,7 @@
 
 import java.awt.Color;
 import java.security.SecureRandom;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
@@ -24,6 +25,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import net.rptools.lib.MD5Key;
 import net.rptools.lib.StringUtil;
 import net.rptools.maptool.client.utilities.RandomSuffixFactory;
 import net.rptools.maptool.language.I18N;
@@ -265,6 +267,15 @@ public static Set<String> getColorNames() {
     return COLOR_MAP.keySet();
   }
 
+  public static void uploadAssetIds(Collection<MD5Key> assetIds) {
+    for (var assetId : assetIds) {
+      var asset = AssetManager.getAsset(assetId);
+      if (asset != null) {
+        uploadAsset(asset);
+      }
+    }
+  }
+
   public static void uploadTexture(DrawablePaint paint) {
     if (paint == null) {
       return;

src/main/java/net/rptools/maptool/client/macro/impl/AddTokenStateMacro.java

@@ -118,7 +118,9 @@ public void execute(MacroContext context, String aMacro, MapToolMacroContext exe
       MapTool.addLocalMessage(e.getMessage());
       return;
     }
+    MapToolUtil.uploadAssetIds(tokenOverlay.getAssetIds());
     MapTool.getCampaign().getTokenStatesMap().put(tokenOverlay.getName(), tokenOverlay);
+
     MapTool.addLocalMessage(I18N.getText("addtokenstate.added", tokenOverlay.getName()));
   }
 

src/main/java/net/rptools/maptool/client/macro/impl/LoadTokenStatesMacro.java

@@ -23,6 +23,7 @@
 import javax.swing.JFileChooser;
 import net.rptools.maptool.client.MapTool;
 import net.rptools.maptool.client.MapToolMacroContext;
+import net.rptools.maptool.client.MapToolUtil;
 import net.rptools.maptool.client.macro.Macro;
 import net.rptools.maptool.client.macro.MacroContext;
 import net.rptools.maptool.client.macro.MacroDefinition;
@@ -72,6 +73,7 @@ public void execute(MacroContext context, String macro, MapToolMacroContext exec
       List<BooleanTokenOverlay> overlays = (List<BooleanTokenOverlay>) decoder.readObject();
       decoder.close();
       for (BooleanTokenOverlay overlay : overlays) {
+        MapToolUtil.uploadAssetIds(overlay.getAssetIds());
         MapTool.getCampaign().getTokenStatesMap().put(overlay.getName(), overlay);
       } // endfor
       MapTool.addLocalMessage(I18N.getText("loadtokenstates.loaded", overlays.size()));

src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenBarController.java

@@ -42,6 +42,7 @@
 import net.rptools.lib.MD5Key;
 import net.rptools.maptool.client.AppConstants;
 import net.rptools.maptool.client.AppPreferences;
+import net.rptools.maptool.client.MapToolUtil;
 import net.rptools.maptool.client.swing.AbeillePanel;
 import net.rptools.maptool.client.swing.ColorWell;
 import net.rptools.maptool.client.ui.PreviewPanelFileChooser;
@@ -731,6 +732,8 @@ public void copyUIToCampaign(Campaign campaign) {
       BarTokenOverlay overlay = model.getElementAt(i);
       overlay.setOrder(i);
       states.put(overlay.getName(), overlay);
+
+      MapToolUtil.uploadAssetIds(overlay.getAssetIds());
     }
     campaign.getTokenBarsMap().clear();
     campaign.getTokenBarsMap().putAll(states);

src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenStatesController.java

@@ -31,6 +31,7 @@
 import net.rptools.lib.StringUtil;
 import net.rptools.maptool.client.AppConstants;
 import net.rptools.maptool.client.AppPreferences;
+import net.rptools.maptool.client.MapToolUtil;
 import net.rptools.maptool.client.swing.AbeillePanel;
 import net.rptools.maptool.client.swing.ColorWell;
 import net.rptools.maptool.client.ui.PreviewPanelFileChooser;
@@ -679,6 +680,8 @@ public void copyUIToCampaign(Campaign campaign) {
       BooleanTokenOverlay overlay = (BooleanTokenOverlay) model.getElementAt(i);
       overlay.setOrder(i);
       states.put(overlay.getName(), overlay);
+
+      MapToolUtil.uploadAssetIds(overlay.getAssetIds());
     }
     campaign.getTokenStatesMap().clear();
     campaign.getTokenStatesMap().putAll(states);