[Feature] Sign rework api (part 1 of 2 for sign rework PR)

Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java

@@ -23,7 +23,6 @@
 import net.countercraft.movecraft.config.Settings;
 import net.countercraft.movecraft.craft.ChunkManager;
 import net.countercraft.movecraft.craft.CraftManager;
-import net.countercraft.movecraft.craft.datatag.CraftDataTagRegistry;
 import net.countercraft.movecraft.features.contacts.ContactsCommand;
 import net.countercraft.movecraft.features.contacts.ContactsManager;
 import net.countercraft.movecraft.features.contacts.ContactsSign;
@@ -59,6 +58,7 @@ public class Movecraft extends JavaPlugin {
     private SmoothTeleport smoothTeleport;
     private AsyncManager asyncManager;
     private WreckManager wreckManager;
+    private SignListener abstractSignListener;
 
     public static synchronized Movecraft getInstance() {
         return instance;
@@ -213,22 +213,25 @@ public void onEnable() {
         getServer().getPluginManager().registerEvents(new PlayerListener(), this);
         getServer().getPluginManager().registerEvents(new ChunkManager(), this);
         getServer().getPluginManager().registerEvents(new AscendSign(), this);
-        getServer().getPluginManager().registerEvents(new CraftSign(), this);
         getServer().getPluginManager().registerEvents(new CruiseSign(), this);
         getServer().getPluginManager().registerEvents(new DescendSign(), this);
         getServer().getPluginManager().registerEvents(new HelmSign(), this);
         getServer().getPluginManager().registerEvents(new MoveSign(), this);
         getServer().getPluginManager().registerEvents(new NameSign(), this);
         getServer().getPluginManager().registerEvents(new PilotSign(), this);
         getServer().getPluginManager().registerEvents(new RelativeMoveSign(), this);
-        getServer().getPluginManager().registerEvents(new ReleaseSign(), this);
         getServer().getPluginManager().registerEvents(new RemoteSign(), this);
         getServer().getPluginManager().registerEvents(new SpeedSign(), this);
         getServer().getPluginManager().registerEvents(new SubcraftRotateSign(), this);
         getServer().getPluginManager().registerEvents(new TeleportSign(), this);
         getServer().getPluginManager().registerEvents(new ScuttleSign(), this);
         getServer().getPluginManager().registerEvents(new CraftPilotListener(), this);
         getServer().getPluginManager().registerEvents(new CraftReleaseListener(), this);
+        getServer().getPluginManager().registerEvents(new CraftTypeListener(), this);
+        getServer().getPluginManager().registerEvents(new SignListener(), this);
+
+        // Signs
+        AbstractMovecraftSign.register("Release", new ReleaseSign());
 
         var contactsManager = new ContactsManager();
         contactsManager.runTaskTimerAsynchronously(this, 0, 20);
@@ -340,4 +343,8 @@ public AsyncManager getAsyncManager() {
     public @NotNull WreckManager getWreckManager(){
         return wreckManager;
     }
+
+    public SignListener getAbstractSignListener() {
+        return abstractSignListener;
+    }
 }

Movecraft/src/main/java/net/countercraft/movecraft/craft/CraftManager.java

@@ -31,6 +31,8 @@
 import net.countercraft.movecraft.processing.effects.Effect;
 import net.countercraft.movecraft.processing.functions.CraftSupplier;
 import net.countercraft.movecraft.processing.tasks.detection.DetectionTask;
+import net.countercraft.movecraft.sign.AbstractMovecraftSign;
+import net.countercraft.movecraft.sign.CraftPilotSign;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
@@ -96,6 +98,9 @@ private CraftManager(boolean loadCraftTypes) {
             craftTypes = loadCraftTypes();
         else
             craftTypes = new HashSet<>();
+
+        // Since the event is only created in reload cases...
+        AbstractMovecraftSign.registerCraftPilotSigns(CraftManager.getInstance().getCraftTypes(), CraftPilotSign::new);
     }
 
     @NotNull

Movecraft/src/main/java/net/countercraft/movecraft/listener/CraftTypeListener.java

@@ -0,0 +1,17 @@
+package net.countercraft.movecraft.listener;
+
+import net.countercraft.movecraft.craft.CraftManager;
+import net.countercraft.movecraft.events.TypesReloadedEvent;
+import net.countercraft.movecraft.sign.AbstractMovecraftSign;
+import net.countercraft.movecraft.sign.CraftPilotSign;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class CraftTypeListener implements Listener {
+
+    @EventHandler
+    public void onReload(TypesReloadedEvent event) {
+        AbstractMovecraftSign.registerCraftPilotSigns(CraftManager.getInstance().getCraftTypes(), CraftPilotSign::new);
+    }
+
+}

Movecraft/src/main/java/net/countercraft/movecraft/mapUpdater/update/CraftRotateCommand.java

@@ -14,7 +14,7 @@
 import net.countercraft.movecraft.craft.SinkingCraft;
 import net.countercraft.movecraft.craft.type.CraftType;
 import net.countercraft.movecraft.events.CraftReleaseEvent;
-import net.countercraft.movecraft.events.SignTranslateEvent;
+import net.countercraft.movecraft.sign.SignListener;
 import net.countercraft.movecraft.util.CollectionUtils;
 import net.countercraft.movecraft.util.MathUtils;
 import net.countercraft.movecraft.util.Tags;
@@ -201,55 +201,7 @@ public void doUpdate() {
     }
 
     private void sendSignEvents() {
-        Object2ObjectMap<String[], List<MovecraftLocation>> signs = new Object2ObjectOpenCustomHashMap<>(new Hash.Strategy<String[]>() {
-            @Override
-            public int hashCode(String[] strings) {
-                return Arrays.hashCode(strings);
-            }
-
-            @Override
-            public boolean equals(String[] a, String[] b) {
-                return Arrays.equals(a, b);
-            }
-        });
-        Map<MovecraftLocation, Sign> signStates = new HashMap<>();
-
-        for (MovecraftLocation location : craft.getHitBox()) {
-            Block block = location.toBukkit(craft.getWorld()).getBlock();
-            BlockState state = block.getState();
-            if (state instanceof Sign) {
-                Sign sign = (Sign) block.getState();
-                if (!signs.containsKey(sign.getLines()))
-                    signs.put(sign.getLines(), new ArrayList<>());
-                signs.get(sign.getLines()).add(location);
-                signStates.put(location, sign);
-            }
-        }
-        for (Map.Entry<String[], List<MovecraftLocation>> entry : signs.entrySet()) {
-            SignTranslateEvent event = new SignTranslateEvent(craft, entry.getKey(), entry.getValue());
-            Bukkit.getServer().getPluginManager().callEvent(event);
-            // if(!event.isUpdated()){
-            //     continue;
-            // }
-            // TODO: This is implemented only to fix client caching
-            //  ideally we wouldn't do the update and would instead fake it out to the player
-            for (MovecraftLocation location : entry.getValue()) {
-                Block block = location.toBukkit(craft.getWorld()).getBlock();
-                BlockState state = block.getState();
-                BlockData data = block.getBlockData();
-                if (!(state instanceof Sign)) {
-                    continue;
-                }
-                Sign sign = signStates.get(location);
-                if (event.isUpdated()) {
-                    for (int i = 0; i < 4; i++) {
-                        sign.setLine(i, entry.getKey()[i]);
-                    }
-                }
-                sign.update(false, false);
-                block.setBlockData(data);
-            }
-        }
+        SignListener.INSTANCE.processSignTranslation(craft, true);
     }
 
     @NotNull

Movecraft/src/main/java/net/countercraft/movecraft/mapUpdater/update/CraftTranslateCommand.java

@@ -14,7 +14,7 @@
 import net.countercraft.movecraft.craft.SinkingCraft;
 import net.countercraft.movecraft.craft.type.CraftType;
 import net.countercraft.movecraft.events.CraftReleaseEvent;
-import net.countercraft.movecraft.events.SignTranslateEvent;
+import net.countercraft.movecraft.sign.SignListener;
 import net.countercraft.movecraft.util.MathUtils;
 import net.countercraft.movecraft.util.Tags;
 import net.countercraft.movecraft.util.hitboxes.HitBox;
@@ -303,54 +303,7 @@ private LinkedList<MovecraftLocation> hullSearch(SetHitBox validExterior) {
     }
 
     private void sendSignEvents(){
-        Object2ObjectMap<String[], List<MovecraftLocation>> signs = new Object2ObjectOpenCustomHashMap<>(new Hash.Strategy<String[]>() {
-            @Override
-            public int hashCode(String[] strings) {
-                return Arrays.hashCode(strings);
-            }
-
-            @Override
-            public boolean equals(String[] a, String[] b) {
-                return Arrays.equals(a, b);
-            }
-        });
-        Map<MovecraftLocation, Sign> signStates = new HashMap<>();
-
-        for (MovecraftLocation location : craft.getHitBox()) {
-            Block block = location.toBukkit(craft.getWorld()).getBlock();
-            if(!Tag.SIGNS.isTagged(block.getType())){
-                continue;
-            }
-            BlockState state = block.getState();
-            if (state instanceof Sign) {
-                Sign sign = (Sign) state;
-                if(!signs.containsKey(sign.getLines()))
-                    signs.put(sign.getLines(), new ArrayList<>());
-                signs.get(sign.getLines()).add(location);
-                signStates.put(location, sign);
-            }
-        }
-        for(Map.Entry<String[], List<MovecraftLocation>> entry : signs.entrySet()){
-            SignTranslateEvent event = new SignTranslateEvent(craft, entry.getKey(), entry.getValue());
-            Bukkit.getServer().getPluginManager().callEvent(event);
-            // if(!event.isUpdated()){
-            //     continue;
-            // }
-            // TODO: This is implemented only to fix client caching
-            //  ideally we wouldn't do the update and would instead fake it out to the player
-            for(MovecraftLocation location : entry.getValue()){
-                Block block = location.toBukkit(craft.getWorld()).getBlock();
-                BlockState state = block.getState();
-                if (!(state instanceof Sign)) {
-                    continue;
-                }
-                Sign sign = signStates.get(location);
-                for(int i = 0; i<4; i++){
-                    sign.setLine(i, entry.getKey()[i]);
-                }
-                sign.update(false, false);
-            }
-        }
+        SignListener.INSTANCE.processSignTranslation(craft, false);
     }
 
     @NotNull