Merge pull request #4318 from Jmr3366/onChangeMap-upd

onChangeMap add-on compliance, output added
RPTools · Nov 3, 2023 · 574115a · 574115a
2 parents fdfddbb + 2d80b51
commit 574115a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/functions/MapFunctions.java b/src/main/java/net/rptools/maptool/client/functions/MapFunctions.java
@@ -39,7 +39,6 @@
 import net.rptools.parser.function.AbstractFunction;
 
 public class MapFunctions extends AbstractFunction {
-  public static final String ON_CHANGE_MAP_CALLBACK = "onChangeMap";
   private static final MapFunctions instance = new MapFunctions();
 
   private MapFunctions() {

diff --git a/src/main/java/net/rptools/maptool/client/ui/syntax/MapToolScriptSyntax.java b/src/main/java/net/rptools/maptool/client/ui/syntax/MapToolScriptSyntax.java
@@ -22,6 +22,7 @@
 import net.rptools.maptool.client.functions.DefinesSpecialVariables;
 import net.rptools.maptool.client.functions.TokenMoveFunctions;
 import net.rptools.maptool.client.functions.UserDefinedMacroFunctions;
+import net.rptools.maptool.events.ZoneLoadedListener;
 import net.rptools.maptool.model.InitiativeList;
 import net.rptools.maptool.model.TokenProperty;
 import net.rptools.parser.function.Function;
@@ -97,9 +98,9 @@ public class MapToolScriptSyntax extends MapToolScriptTokenMaker {
 
   static String[] RESERVED_WORDS_2 = {
     "onCampaignLoad",
-    "onChangeMap",
     "onChangeSelection",
     "onMouseOverEvent",
+    ZoneLoadedListener.ON_CHANGE_MAP_CALLBACK,
     TokenMoveFunctions.ON_MULTIPLE_TOKENS_MOVED_COMPLETE_CALLBACK,
     TokenMoveFunctions.ON_TOKEN_MOVE_COMPLETE_CALLBACK,
     InitiativeList.ON_INITIATIVE_CHANGE_VETOABLE_MACRO_CALLBACK,

diff --git a/src/main/java/net/rptools/maptool/events/ZoneLoadedListener.java b/src/main/java/net/rptools/maptool/events/ZoneLoadedListener.java
@@ -14,28 +14,51 @@
  */
 package net.rptools.maptool.events;
 
-import static net.rptools.maptool.client.functions.MapFunctions.ON_CHANGE_MAP_CALLBACK;
-
 import com.google.common.eventbus.Subscribe;
 import java.util.Collections;
+import java.util.concurrent.ExecutionException;
+import net.rptools.maptool.client.MapTool;
 import net.rptools.maptool.client.events.ZoneLoaded;
-import net.rptools.maptool.model.Token;
+import net.rptools.maptool.client.ui.zone.ZoneRenderer;
+import net.rptools.maptool.language.I18N;
+import net.rptools.maptool.model.library.Library;
+import net.rptools.maptool.model.library.LibraryManager;
 import net.rptools.maptool.util.EventMacroUtil;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 
 public class ZoneLoadedListener {
+  private static final Logger LOGGER = LogManager.getLogger(EventMacroUtil.class);
+  public static final String ON_CHANGE_MAP_CALLBACK = "onChangeMap";
 
   public ZoneLoadedListener() {
     new MapToolEventBus().getMainEventBus().register(this);
   }
 
   @Subscribe
   public void OnChangedMap(ZoneLoaded event) {
-    var libTokens = EventMacroUtil.getEventMacroTokens(ON_CHANGE_MAP_CALLBACK);
-    String prefix = ON_CHANGE_MAP_CALLBACK + "@";
-
-    for (Token handler : libTokens) {
-      EventMacroUtil.callEventHandlerOld(
-          prefix + handler.getName(), "", handler, Collections.emptyMap(), true);
+    ZoneRenderer currentZR = MapTool.getFrame().getCurrentZoneRenderer();
+    try {
+      var libs = new LibraryManager().getLegacyEventTargets(ON_CHANGE_MAP_CALLBACK).get();
+      if (libs.isEmpty()) {
+        return;
+      }
+      for (Library handler : libs) {
+        try {
+          String libraryNamespace = handler.getNamespace().get();
+          EventMacroUtil.callEventHandler(
+              ON_CHANGE_MAP_CALLBACK,
+              libraryNamespace,
+              currentZR.getZone().getId().toString(),
+              null,
+              Collections.emptyMap());
+        } catch (InterruptedException | ExecutionException e) {
+          LOGGER.error(I18N.getText("library.error.notFound"), e);
+          throw new AssertionError("Error retrieving library namespace");
+        }
+      }
+    } catch (InterruptedException | ExecutionException e) {
+      LOGGER.error(I18N.getText("library.error.retrievingEventHandler"), e);
     }
   }
 }