Refactoring -

src/main/java/net/rptools/maptool/client/events/ChatMessageAdded.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.TextMessage;
 
-public record ChatMessageAdded(TextMessage message) {}
+public record ChatMessageAdded(TextMessage message) implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/OverlayVisibilityChanged.java

@@ -15,5 +15,7 @@
 package net.rptools.maptool.client.events;
 
 import net.rptools.maptool.client.ui.htmlframe.HTMLOverlayManager;
+import net.rptools.maptool.events.MTEvent;
 
-public record OverlayVisibilityChanged(HTMLOverlayManager overlay, boolean isVisible) {}
+public record OverlayVisibilityChanged(HTMLOverlayManager overlay, boolean isVisible)
+    implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/PlayerConnected.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.player.Player;
 
-public record PlayerConnected(Player player, boolean isLocal) {}
+public record PlayerConnected(Player player, boolean isLocal) implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/PlayerDisconnected.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.player.Player;
 
-public record PlayerDisconnected(Player player) {}
+public record PlayerDisconnected(Player player) implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/PlayerStatusChanged.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.player.Player;
 
-public record PlayerStatusChanged(Player player) {}
+public record PlayerStatusChanged(Player player) implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/PreferencesChanged.java

@@ -14,4 +14,6 @@
  */
 package net.rptools.maptool.client.events;
 
-public record PreferencesChanged() {}
+import net.rptools.maptool.events.MTEvent;
+
+public record PreferencesChanged() implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/RepaintZoneRequested.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record RepaintZoneRequested(Zone zone) {}
+public record RepaintZoneRequested(Zone zone) implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/ServerDisconnected.java

@@ -14,4 +14,6 @@
  */
 package net.rptools.maptool.client.events;
 
-public record ServerDisconnected() {}
+import net.rptools.maptool.events.MTEvent;
+
+public record ServerDisconnected() implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/TokenHoverEnter.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Token;
 import net.rptools.maptool.model.Zone;
 
@@ -27,4 +28,5 @@
  * @param altDown is the alt-key down.
  */
 public record TokenHoverEnter(
-    Token token, Zone zone, boolean shiftDown, boolean controlDown, boolean altDown) {}
+    Token token, Zone zone, boolean shiftDown, boolean controlDown, boolean altDown)
+    implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/TokenHoverExit.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Token;
 import net.rptools.maptool.model.Zone;
 
@@ -27,4 +28,5 @@
  * @param altDown is the alt-key down.
  */
 public record TokenHoverExit(
-    Token token, Zone zone, boolean shiftDown, boolean controlDown, boolean altDown) {}
+    Token token, Zone zone, boolean shiftDown, boolean controlDown, boolean altDown)
+    implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/ZoneActivated.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record ZoneActivated(Zone zone) {}
+public record ZoneActivated(Zone zone) implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/ZoneDeactivated.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record ZoneDeactivated(Zone zone) {}
+public record ZoneDeactivated(Zone zone) implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/ZoneLoaded.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record ZoneLoaded(Zone zone) {}
+public record ZoneLoaded(Zone zone) implements MTEvent {}

src/main/java/net/rptools/maptool/client/events/ZoneLoading.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.client.events;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record ZoneLoading(Zone zone) {}
+public record ZoneLoading(Zone zone) implements MTEvent {}

src/main/java/net/rptools/maptool/client/ui/theme/ThemeLoadedEvent.java

@@ -15,5 +15,6 @@
 package net.rptools.maptool.client.ui.theme;
 
 import net.rptools.maptool.client.ui.theme.ThemeSupport.ThemeDetails;
+import net.rptools.maptool.events.MTEvent;
 
-public record ThemeLoadedEvent(ThemeDetails themeDetails) {}
+public record ThemeLoadedEvent(ThemeDetails themeDetails) implements MTEvent {}

src/main/java/net/rptools/maptool/client/ui/zone/SelectionModel.java

@@ -21,13 +21,14 @@
 import java.util.List;
 import java.util.Set;
 import net.rptools.maptool.client.AppUtil;
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.events.MapToolEventBus;
 import net.rptools.maptool.model.GUID;
 import net.rptools.maptool.model.Zone;
 
 /** Models the current and historical selections for a ZoneRenderer. */
 public class SelectionModel {
-  public record SelectionChanged(Zone zone) {}
+  public record SelectionChanged(Zone zone) implements MTEvent {}
 
   /** The zone in which the selections are made. */
   private final Zone zone;

src/main/java/net/rptools/maptool/events/MTEvent.java

@@ -0,0 +1,25 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code.  If not, please visit
+ * <http://www.gnu.org/licenses/> and specifically the Affero license
+ * text at <http://www.gnu.org/licenses/agpl.html>.
+ */
+package net.rptools.maptool.events;
+
+/**
+ *
+ *
+ * <h3>Event for {@link MapToolEventBus}</h3>
+ *
+ * Implement this whenever creating a new Event type.<br>
+ * It makes it easier to find events no matter where they are hiding.
+ */
+public interface MTEvent {}

src/main/java/net/rptools/maptool/events/MapToolEventBus.java

@@ -25,7 +25,16 @@ public class MapToolEventBus {
   /**
    * Returns the main MapTool {@link EventBus}.
    *
-   * @return the main Maptool {@link EventBus}.
+   * @return the main MapTool {@link EventBus}.
+   */
+  public static EventBus get() {
+    return mainEventBus;
+  }
+
+  /**
+   * Returns the main MapTool {@link EventBus}.
+   *
+   * @return the main MapTool {@link EventBus}.
    */
   public EventBus getMainEventBus() {
     return mainEventBus;

src/main/java/net/rptools/maptool/model/library/AddOnsAddedEvent.java

@@ -15,5 +15,6 @@
 package net.rptools.maptool.model.library;
 
 import java.util.Set;
+import net.rptools.maptool.events.MTEvent;
 
-public record AddOnsAddedEvent(Set<LibraryInfo> addOns) {}
+public record AddOnsAddedEvent(Set<LibraryInfo> addOns) implements MTEvent {}

src/main/java/net/rptools/maptool/model/library/AddOnsRemovedEvent.java

@@ -15,5 +15,6 @@
 package net.rptools.maptool.model.library;
 
 import java.util.Set;
+import net.rptools.maptool.events.MTEvent;
 
-public record AddOnsRemovedEvent(Set<LibraryInfo> addOns) {}
+public record AddOnsRemovedEvent(Set<LibraryInfo> addOns) implements MTEvent {}

src/main/java/net/rptools/maptool/model/tokens/TokenMacroChanged.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.tokens;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Token;
 
-public record TokenMacroChanged(Token token) {}
+public record TokenMacroChanged(Token token) implements MTEvent {}

src/main/java/net/rptools/maptool/model/tokens/TokenPanelChanged.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.tokens;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Token;
 
-public record TokenPanelChanged(Token token) {}
+public record TokenPanelChanged(Token token) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/BoardChanged.java

@@ -16,6 +16,8 @@
 
 import java.awt.*;
 import net.rptools.lib.MD5Key;
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record BoardChanged(Zone zone, MD5Key asset, Point position, double scaleX, double scaleY) {}
+public record BoardChanged(Zone zone, MD5Key asset, Point position, double scaleX, double scaleY)
+    implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/DrawableAdded.java

@@ -14,7 +14,8 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 import net.rptools.maptool.model.drawing.DrawnElement;
 
-public record DrawableAdded(Zone zone, DrawnElement drawnElement) {}
+public record DrawableAdded(Zone zone, DrawnElement drawnElement) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/DrawableChanged.java

@@ -14,7 +14,8 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 import net.rptools.maptool.model.drawing.DrawnElement;
 
-public record DrawableChanged(Zone zone, DrawnElement drawnElement) {}
+public record DrawableChanged(Zone zone, DrawnElement drawnElement) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/DrawableRemoved.java

@@ -14,7 +14,8 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 import net.rptools.maptool.model.drawing.DrawnElement;
 
-public record DrawableRemoved(Zone zone, DrawnElement drawnElement) {}
+public record DrawableRemoved(Zone zone, DrawnElement drawnElement) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/FogChanged.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record FogChanged(Zone zone) {}
+public record FogChanged(Zone zone) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/GridChanged.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record GridChanged(Zone zone) {}
+public record GridChanged(Zone zone) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/InitiativeListChanged.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.InitiativeList;
 
-public record InitiativeListChanged(InitiativeList initiativeList) {}
+public record InitiativeListChanged(InitiativeList initiativeList) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/LabelAdded.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Label;
 
-public record LabelAdded(Label label) {}
+public record LabelAdded(Label label) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/LabelChanged.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Label;
 
-public record LabelChanged(Label label) {}
+public record LabelChanged(Label label) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/LabelRemoved.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Label;
 
-public record LabelRemoved(Label label) {}
+public record LabelRemoved(Label label) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/MaskTopologyChanged.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record MaskTopologyChanged(Zone zone) {}
+public record MaskTopologyChanged(Zone zone) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/TokenEdited.java

@@ -14,7 +14,8 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Token;
 import net.rptools.maptool.model.Zone;
 
-public record TokenEdited(Zone zone, Token token) {}
+public record TokenEdited(Zone zone, Token token) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/TokensAdded.java

@@ -15,7 +15,8 @@
 package net.rptools.maptool.model.zones;
 
 import java.util.List;
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Token;
 import net.rptools.maptool.model.Zone;
 
-public record TokensAdded(Zone zone, List<Token> tokens) {}
+public record TokensAdded(Zone zone, List<Token> tokens) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/TokensChanged.java

@@ -15,7 +15,8 @@
 package net.rptools.maptool.model.zones;
 
 import java.util.List;
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Token;
 import net.rptools.maptool.model.Zone;
 
-public record TokensChanged(Zone zone, List<Token> tokens) {}
+public record TokensChanged(Zone zone, List<Token> tokens) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/TokensRemoved.java

@@ -15,7 +15,8 @@
 package net.rptools.maptool.model.zones;
 
 import java.util.List;
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Token;
 import net.rptools.maptool.model.Zone;
 
-public record TokensRemoved(Zone zone, List<Token> tokens) {}
+public record TokensRemoved(Zone zone, List<Token> tokens) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/WallTopologyChanged.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record WallTopologyChanged(Zone zone) {}
+public record WallTopologyChanged(Zone zone) implements MTEvent {}

src/main/java/net/rptools/maptool/model/zones/ZoneAdded.java

@@ -14,6 +14,7 @@
  */
 package net.rptools.maptool.model.zones;
 
+import net.rptools.maptool.events.MTEvent;
 import net.rptools.maptool.model.Zone;
 
-public record ZoneAdded(Zone zone) {}
+public record ZoneAdded(Zone zone) implements MTEvent {}