From a3cb46e28691c25e158ed1cebd15fcb64b3559b7 Mon Sep 17 00:00:00 2001 From: Mitch Talmadge Date: Thu, 19 Dec 2019 21:34:32 -0700 Subject: [PATCH] Change 'int blkid' to 'String material' for block and sign-change events. --- .../src/main/java/org/dynmap/DynmapCore.java | 6 +++--- .../org/dynmap/common/DynmapListenerManager.java | 16 ++++++++-------- .../main/java/org/dynmap/hdmap/TexturePack.java | 2 +- .../dynmap/markers/impl/MarkerSignManager.java | 2 +- .../main/java/org/dynmap/DynmapCommonAPI.java | 4 ++-- .../java/org/dynmap/bukkit/DynmapPlugin.java | 9 +++++---- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/DynmapCore/src/main/java/org/dynmap/DynmapCore.java b/DynmapCore/src/main/java/org/dynmap/DynmapCore.java index ad7a7007..b5bc847f 100644 --- a/DynmapCore/src/main/java/org/dynmap/DynmapCore.java +++ b/DynmapCore/src/main/java/org/dynmap/DynmapCore.java @@ -84,7 +84,7 @@ public class DynmapCore implements DynmapCommonAPI { */ public static abstract class EnableCoreCallbacks { /** - * Called during enableCore to report that confniguration.txt is loaded + * Called during enableCore to report that configuration.txt is loaded */ public abstract void configurationLoaded(); } @@ -2400,10 +2400,10 @@ public class DynmapCore implements DynmapCommonAPI { } @Override - public void processSignChange(int blkid, String world, int x, int y, int z, + public void processSignChange(String material, String world, int x, int y, int z, String[] lines, String playerid) { DynmapPlayer dp = server.getPlayer(playerid); - listenerManager.processSignChangeEvent(EventType.SIGN_CHANGE, blkid, world, x, y, z, lines, dp); + listenerManager.processSignChangeEvent(EventType.SIGN_CHANGE, material, world, x, y, z, lines, dp); } public MapStorage getDefaultMapStorage() { diff --git a/DynmapCore/src/main/java/org/dynmap/common/DynmapListenerManager.java b/DynmapCore/src/main/java/org/dynmap/common/DynmapListenerManager.java index 11205c36..82fddfd8 100644 --- a/DynmapCore/src/main/java/org/dynmap/common/DynmapListenerManager.java +++ b/DynmapCore/src/main/java/org/dynmap/common/DynmapListenerManager.java @@ -30,10 +30,10 @@ public class DynmapListenerManager { public void chatEvent(DynmapPlayer p, String msg); } public interface BlockEventListener extends EventListener { - public void blockEvent(int blkid, String w, int x, int y, int z); + public void blockEvent(String material, String w, int x, int y, int z); } public interface SignChangeEventListener extends EventListener { - public void signChangeEvent(int blkid, String w, int x, int y, int z, String[] lines, DynmapPlayer p); + public void signChangeEvent(String material, String w, int x, int y, int z, String[] lines, DynmapPlayer p); } public enum EventType { WORLD_LOAD, @@ -105,7 +105,7 @@ public class DynmapListenerManager { } } } - public void processBlockEvent(EventType type, int blkid, String world, int x, int y, int z) + public void processBlockEvent(EventType type, String material, String world, int x, int y, int z) { ArrayList lst = listeners.get(type); if(lst == null) return; @@ -114,14 +114,14 @@ public class DynmapListenerManager { EventListener el = lst.get(i); if(el instanceof BlockEventListener) { try { - ((BlockEventListener)el).blockEvent(blkid, world, x, y, z); + ((BlockEventListener)el).blockEvent(material, world, x, y, z); } catch (Throwable t) { - Log.warning("processBlockEvent(" + type + "," + blkid + "," + world + "," + x + "," + y + "," + z + ") - exception", t); + Log.warning("processBlockEvent(" + type + "," + material + "," + world + "," + x + "," + y + "," + z + ") - exception", t); } } } } - public void processSignChangeEvent(EventType type, int blkid, String world, int x, int y, int z, String[] lines, DynmapPlayer p) + public void processSignChangeEvent(EventType type, String material, String world, int x, int y, int z, String[] lines, DynmapPlayer p) { ArrayList lst = listeners.get(type); if(lst == null) return; @@ -130,9 +130,9 @@ public class DynmapListenerManager { EventListener el = lst.get(i); if(el instanceof SignChangeEventListener) { try { - ((SignChangeEventListener)el).signChangeEvent(blkid, world, x, y, z, lines, p); + ((SignChangeEventListener)el).signChangeEvent(material, world, x, y, z, lines, p); } catch (Throwable t) { - Log.warning("processSignChangeEvent(" + type + "," + blkid + "," + world + "," + x + "," + y + "," + z + ") - exception", t); + Log.warning("processSignChangeEvent(" + type + "," + material + "," + world + "," + x + "," + y + "," + z + ") - exception", t); } } } diff --git a/DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java b/DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java index b37d4fc1..b4686a3f 100644 --- a/DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java +++ b/DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java @@ -2603,7 +2603,7 @@ public class TexturePack { * @param ps - perspective state * @param mapiter - map iterator * @param rslt - color result (returned with value) - * @param blkid - block ID + * @param blk - block state * @param lastblocktype - last block ID * @param ss - shader state */ diff --git a/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerSignManager.java b/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerSignManager.java index f19d916e..8f092e73 100644 --- a/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerSignManager.java +++ b/DynmapCore/src/main/java/org/dynmap/markers/impl/MarkerSignManager.java @@ -28,7 +28,7 @@ public class MarkerSignManager { private static class SignListener implements DynmapListenerManager.SignChangeEventListener, Runnable { @Override - public void signChangeEvent(int blkid, String wname, int x, int y, int z, String[] lines, DynmapPlayer p) { + public void signChangeEvent(String material, String wname, int x, int y, int z, String[] lines, DynmapPlayer p) { if(mgr == null) return; diff --git a/DynmapCoreAPI/src/main/java/org/dynmap/DynmapCommonAPI.java b/DynmapCoreAPI/src/main/java/org/dynmap/DynmapCommonAPI.java index 2f8b525e..5cfe3be7 100644 --- a/DynmapCoreAPI/src/main/java/org/dynmap/DynmapCommonAPI.java +++ b/DynmapCoreAPI/src/main/java/org/dynmap/DynmapCommonAPI.java @@ -135,7 +135,7 @@ public interface DynmapCommonAPI { public boolean testIfPlayerInfoProtected(); /** * Process sign change - * @param blkid - block ID + * @param material - block's Material enum value as a string * @param world - world name * @param x - x coord * @param y - y coord @@ -143,5 +143,5 @@ public interface DynmapCommonAPI { * @param lines - sign lines (input and output) * @param playerid - player ID */ - public void processSignChange(int blkid, String world, int x, int y, int z, String[] lines, String playerid); + public void processSignChange(String material, String world, int x, int y, int z, String[] lines, String playerid); } diff --git a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java index a17ff15d..20b0bdae 100644 --- a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java +++ b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java @@ -100,6 +100,7 @@ import org.dynmap.common.DynmapListenerManager.EventType; import org.dynmap.hdmap.HDMap; import org.dynmap.markers.MarkerAPI; import org.dynmap.modsupport.ModSupportImpl; +import org.dynmap.renderer.DynmapBlockState; import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.Polygon; import org.dynmap.utils.VisibilityLimit; @@ -351,7 +352,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI { Block b = evt.getBlock(); if(b == null) return; /* Work around for stupid mods.... */ Location l = b.getLocation(); - core.listenerManager.processBlockEvent(EventType.BLOCK_BREAK, b.getType().getId(), + core.listenerManager.processBlockEvent(EventType.BLOCK_BREAK, b.getType().name(), getWorld(l.getWorld()).getName(), l.getBlockX(), l.getBlockY(), l.getBlockZ()); } }, DynmapPlugin.this); @@ -366,7 +367,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI { DynmapPlayer dp = null; Player p = evt.getPlayer(); if(p != null) dp = new BukkitPlayer(p); - core.listenerManager.processSignChangeEvent(EventType.SIGN_CHANGE, b.getType().getId(), + core.listenerManager.processSignChangeEvent(EventType.SIGN_CHANGE, b.getType().name(), getWorld(l.getWorld()).getName(), l.getBlockX(), l.getBlockY(), l.getBlockZ(), lines, dp); } }, DynmapPlugin.this); @@ -1631,9 +1632,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI { })); } @Override - public void processSignChange(int blkid, String world, int x, int y, int z, + public void processSignChange(String material, String world, int x, int y, int z, String[] lines, String playerid) { - core.processSignChange(blkid, world, x, y, z, lines, playerid); + core.processSignChange(material, world, x, y, z, lines, playerid); } Polygon getWorldBorder(World w) {