From a4f60fd01e5fd80e6ed7129fe2945522158faf97 Mon Sep 17 00:00:00 2001 From: SBDeveloper Date: Thu, 30 Jun 2022 20:46:22 +0200 Subject: [PATCH] :bug: Fixed viewing issue --- .gitignore | 3 +- API/pom.xml | 36 ------------------- .../mapreflectionapi/api/ArrayImage.java | 33 ++++++++++++++++- .../mapreflectionapi/api/MapManager.java | 1 + .../nms/PacketListener_v1_12_R1.java | 2 +- .../nms/MapWrapper_v1_13_R2.java | 8 ++--- .../nms/PacketListener_v1_13_R2.java | 2 +- .../nms/MapWrapper_v1_14_R1.java | 8 ++--- .../nms/PacketListener_v1_14_R1.java | 2 +- .../nms/MapWrapper_v1_15_R1.java | 8 ++--- .../nms/PacketListener_v1_15_R1.java | 2 +- .../nms/MapWrapper_v1_16_R3.java | 8 ++--- .../nms/PacketListener_v1_16_R3.java | 2 +- .../nms/MapWrapper_v1_17_R1.java | 8 ++--- .../nms/PacketListener_v1_17_R1.java | 2 +- .../nms/MapWrapper_v1_18_R2.java | 8 ++--- .../nms/PacketListener_v1_18_R2.java | 2 +- .../nms/MapWrapper_v1_19_R1.java | 8 ++--- .../nms/PacketListener_v1_19_R1.java | 2 +- 19 files changed, 71 insertions(+), 74 deletions(-) diff --git a/.gitignore b/.gitignore index 61c025c..e3f5493 100644 --- a/.gitignore +++ b/.gitignore @@ -91,4 +91,5 @@ buildNumber.properties # Eclipse Core .project # JDT-specific (Eclipse Java Development Tools) -.classpath \ No newline at end of file +.classpath +/.idea/copyright/ diff --git a/API/pom.xml b/API/pom.xml index ac17197..172cb4c 100644 --- a/API/pom.xml +++ b/API/pom.xml @@ -34,13 +34,6 @@ MapReflectionAPI-API - - - nexus-snapshots - https://repo.sbdevelopment.tech/repository/maven-snapshots/ - - - 11 @@ -55,35 +48,6 @@ ${jdk.version} - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0-M2 - - true - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - - - default-deploy - deploy - - deploy - - - - - nexus-snapshots - https://repo.sbdevelopment.tech/ - true - - diff --git a/API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/ArrayImage.java b/API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/ArrayImage.java index 5747c86..47d0244 100644 --- a/API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/ArrayImage.java +++ b/API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/ArrayImage.java @@ -27,6 +27,8 @@ import com.bergerkiller.bukkit.common.map.MapColorPalette; import java.awt.*; import java.awt.image.BufferedImage; +import java.util.Arrays; +import java.util.Objects; public class ArrayImage { public byte[] array; @@ -53,7 +55,7 @@ public class ArrayImage { this.width = image.getWidth(); this.height = image.getHeight(); - BufferedImage temp = new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB); + BufferedImage temp = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_ARGB); Graphics2D graphics = temp.createGraphics(); graphics.drawImage(image, 0, 0, null); graphics.dispose(); @@ -68,4 +70,33 @@ public class ArrayImage { this.array = result; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof ArrayImage)) return false; + ArrayImage that = (ArrayImage) o; + return width == that.width && height == that.height && imageType == that.imageType && Arrays.equals(array, that.array); + } + + @Override + public int hashCode() { + int result = Objects.hash(width, height, imageType); + result = 31 * result + Arrays.hashCode(array); + return result; + } + + @Override + public String toString() { + return "ArrayImage{" + + "array=" + Arrays.toString(array) + + ", minX=" + minX + + ", minY=" + minY + + ", maxX=" + maxX + + ", maxY=" + maxY + + ", width=" + width + + ", height=" + height + + ", imageType=" + imageType + + '}'; + } } diff --git a/API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapManager.java b/API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapManager.java index 26d1e5a..f661e5c 100644 --- a/API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapManager.java +++ b/API/src/main/java/tech/sbdevelopment/mapreflectionapi/api/MapManager.java @@ -80,6 +80,7 @@ public class MapManager { return wrapper; } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) { + e.printStackTrace(); return null; } } diff --git a/NMS-v1_12_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_12_R1.java b/NMS-v1_12_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_12_R1.java index 1bb0a0a..1063510 100644 --- a/NMS-v1_12_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_12_R1.java +++ b/NMS-v1_12_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_12_R1.java @@ -55,7 +55,7 @@ public class PacketListener_v1_12_R1 extends PacketListener { if (id < 0) { //It's one of our maps, invert ID and let through! int newId = -id; - setField(packet, "a", newId); //mapId + setField(packetPlayOutMap, "a", newId); //mapId } else { boolean async = !plugin.getServer().isPrimaryThread(); MapCancelEvent event = new MapCancelEvent(p, id, async); diff --git a/NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_13_R2.java b/NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_13_R2.java index 9878916..13b0efa 100644 --- a/NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_13_R2.java +++ b/NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_13_R2.java @@ -135,7 +135,7 @@ public class MapWrapper_v1_13_R2 extends MapWrapper { CraftPlayer craftPlayer = (CraftPlayer) player; int windowId = craftPlayer.getHandle().defaultContainer.windowId; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); net.minecraft.server.v1_13_R2.ItemStack nmsStack = CraftItemStack.asNMSCopy(stack); PacketPlayOutSetSlot packet = new PacketPlayOutSetSlot(windowId, slot, nmsStack); @@ -149,7 +149,7 @@ public class MapWrapper_v1_13_R2 extends MapWrapper { @Override public void showInHand(Player player, boolean force) { - if (player.getInventory().getItemInMainHand().getType() != Material.MAP && !force) return; + if (player.getInventory().getItemInMainHand().getType() != Material.FILLED_MAP && !force) return; showInInventory(player, player.getInventory().getHeldItemSlot(), force); } @@ -165,7 +165,7 @@ public class MapWrapper_v1_13_R2 extends MapWrapper { @Override public void showInFrame(Player player, ItemFrame frame, boolean force) { - if (frame.getItem().getType() != Material.MAP && !force) return; + if (frame.getItem().getType() != Material.FILLED_MAP && !force) return; showInFrame(player, frame.getEntityId()); } @@ -178,7 +178,7 @@ public class MapWrapper_v1_13_R2 extends MapWrapper { public void showInFrame(Player player, int entityId, String debugInfo) { if (!isViewing(player)) return; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); if (debugInfo != null) { ItemMeta itemMeta = stack.getItemMeta(); itemMeta.setDisplayName(debugInfo); diff --git a/NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_13_R2.java b/NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_13_R2.java index 684f970..e8b28ce 100644 --- a/NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_13_R2.java +++ b/NMS-v1_13_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_13_R2.java @@ -55,7 +55,7 @@ public class PacketListener_v1_13_R2 extends PacketListener { if (id < 0) { //It's one of our maps, invert ID and let through! int newId = -id; - setField(packet, "a", newId); //mapId + setField(packetPlayOutMap, "a", newId); //mapId } else { boolean async = !plugin.getServer().isPrimaryThread(); MapCancelEvent event = new MapCancelEvent(p, id, async); diff --git a/NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_14_R1.java b/NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_14_R1.java index 8699978..4e526c9 100644 --- a/NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_14_R1.java +++ b/NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_14_R1.java @@ -135,7 +135,7 @@ public class MapWrapper_v1_14_R1 extends MapWrapper { CraftPlayer craftPlayer = (CraftPlayer) player; int windowId = craftPlayer.getHandle().defaultContainer.windowId; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); net.minecraft.server.v1_14_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(stack); PacketPlayOutSetSlot packet = new PacketPlayOutSetSlot(windowId, slot, nmsStack); @@ -149,7 +149,7 @@ public class MapWrapper_v1_14_R1 extends MapWrapper { @Override public void showInHand(Player player, boolean force) { - if (player.getInventory().getItemInMainHand().getType() != Material.MAP && !force) return; + if (player.getInventory().getItemInMainHand().getType() != Material.FILLED_MAP && !force) return; showInInventory(player, player.getInventory().getHeldItemSlot(), force); } @@ -165,7 +165,7 @@ public class MapWrapper_v1_14_R1 extends MapWrapper { @Override public void showInFrame(Player player, ItemFrame frame, boolean force) { - if (frame.getItem().getType() != Material.MAP && !force) return; + if (frame.getItem().getType() != Material.FILLED_MAP && !force) return; showInFrame(player, frame.getEntityId()); } @@ -178,7 +178,7 @@ public class MapWrapper_v1_14_R1 extends MapWrapper { public void showInFrame(Player player, int entityId, String debugInfo) { if (!isViewing(player)) return; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); if (debugInfo != null) { ItemMeta itemMeta = stack.getItemMeta(); itemMeta.setDisplayName(debugInfo); diff --git a/NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_14_R1.java b/NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_14_R1.java index a1c9e6a..1083801 100644 --- a/NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_14_R1.java +++ b/NMS-v1_14_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_14_R1.java @@ -55,7 +55,7 @@ public class PacketListener_v1_14_R1 extends PacketListener { if (id < 0) { //It's one of our maps, invert ID and let through! int newId = -id; - setField(packet, "a", newId); //mapId + setField(packetPlayOutMap, "a", newId); //mapId } else { boolean async = !plugin.getServer().isPrimaryThread(); MapCancelEvent event = new MapCancelEvent(p, id, async); diff --git a/NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_15_R1.java b/NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_15_R1.java index c6d7412..51db039 100644 --- a/NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_15_R1.java +++ b/NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_15_R1.java @@ -136,7 +136,7 @@ public class MapWrapper_v1_15_R1 extends MapWrapper { CraftPlayer craftPlayer = (CraftPlayer) player; int windowId = craftPlayer.getHandle().defaultContainer.windowId; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); net.minecraft.server.v1_15_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(stack); PacketPlayOutSetSlot packet = new PacketPlayOutSetSlot(windowId, slot, nmsStack); @@ -150,7 +150,7 @@ public class MapWrapper_v1_15_R1 extends MapWrapper { @Override public void showInHand(Player player, boolean force) { - if (player.getInventory().getItemInMainHand().getType() != Material.MAP && !force) return; + if (player.getInventory().getItemInMainHand().getType() != Material.FILLED_MAP && !force) return; showInInventory(player, player.getInventory().getHeldItemSlot(), force); } @@ -166,7 +166,7 @@ public class MapWrapper_v1_15_R1 extends MapWrapper { @Override public void showInFrame(Player player, ItemFrame frame, boolean force) { - if (frame.getItem().getType() != Material.MAP && !force) return; + if (frame.getItem().getType() != Material.FILLED_MAP && !force) return; showInFrame(player, frame.getEntityId()); } @@ -179,7 +179,7 @@ public class MapWrapper_v1_15_R1 extends MapWrapper { public void showInFrame(Player player, int entityId, String debugInfo) { if (!isViewing(player)) return; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); if (debugInfo != null) { ItemMeta itemMeta = stack.getItemMeta(); itemMeta.setDisplayName(debugInfo); diff --git a/NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_15_R1.java b/NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_15_R1.java index b34bf35..ba807c1 100644 --- a/NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_15_R1.java +++ b/NMS-v1_15_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_15_R1.java @@ -55,7 +55,7 @@ public class PacketListener_v1_15_R1 extends PacketListener { if (id < 0) { //It's one of our maps, invert ID and let through! int newId = -id; - setField(packet, "a", newId); //mapId + setField(packetPlayOutMap, "a", newId); //mapId } else { boolean async = !plugin.getServer().isPrimaryThread(); MapCancelEvent event = new MapCancelEvent(p, id, async); diff --git a/NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_16_R3.java b/NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_16_R3.java index 0e8d77a..061f41b 100644 --- a/NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_16_R3.java +++ b/NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_16_R3.java @@ -135,7 +135,7 @@ public class MapWrapper_v1_16_R3 extends MapWrapper { CraftPlayer craftPlayer = (CraftPlayer) player; int windowId = craftPlayer.getHandle().defaultContainer.windowId; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(stack); PacketPlayOutSetSlot packet = new PacketPlayOutSetSlot(windowId, slot, nmsStack); @@ -149,7 +149,7 @@ public class MapWrapper_v1_16_R3 extends MapWrapper { @Override public void showInHand(Player player, boolean force) { - if (player.getInventory().getItemInMainHand().getType() != Material.MAP && !force) return; + if (player.getInventory().getItemInMainHand().getType() != Material.FILLED_MAP && !force) return; showInInventory(player, player.getInventory().getHeldItemSlot(), force); } @@ -165,7 +165,7 @@ public class MapWrapper_v1_16_R3 extends MapWrapper { @Override public void showInFrame(Player player, ItemFrame frame, boolean force) { - if (frame.getItem().getType() != Material.MAP && !force) return; + if (frame.getItem().getType() != Material.FILLED_MAP && !force) return; showInFrame(player, frame.getEntityId()); } @@ -178,7 +178,7 @@ public class MapWrapper_v1_16_R3 extends MapWrapper { public void showInFrame(Player player, int entityId, String debugInfo) { if (!isViewing(player)) return; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); if (debugInfo != null) { ItemMeta itemMeta = stack.getItemMeta(); itemMeta.setDisplayName(debugInfo); diff --git a/NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_16_R3.java b/NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_16_R3.java index d4ab81a..3e846ba 100644 --- a/NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_16_R3.java +++ b/NMS-v1_16_R3/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_16_R3.java @@ -55,7 +55,7 @@ public class PacketListener_v1_16_R3 extends PacketListener { if (id < 0) { //It's one of our maps, invert ID and let through! int newId = -id; - setField(packet, "a", newId); //mapId + setField(packetPlayOutMap, "a", newId); //mapId } else { boolean async = !plugin.getServer().isPrimaryThread(); MapCancelEvent event = new MapCancelEvent(p, id, async); diff --git a/NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_17_R1.java b/NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_17_R1.java index 6481d83..e31eb45 100644 --- a/NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_17_R1.java +++ b/NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_17_R1.java @@ -139,7 +139,7 @@ public class MapWrapper_v1_17_R1 extends MapWrapper { int windowId = craftPlayer.getHandle().bU.j; //inventoryMenu containerId int stateId = craftPlayer.getHandle().bU.getStateId(); //inventoryMenu getStateId() - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); net.minecraft.world.item.ItemStack nmsStack = CraftItemStack.asNMSCopy(stack); PacketPlayOutSetSlot packet = new PacketPlayOutSetSlot(windowId, stateId, slot, nmsStack); @@ -153,7 +153,7 @@ public class MapWrapper_v1_17_R1 extends MapWrapper { @Override public void showInHand(Player player, boolean force) { - if (player.getInventory().getItemInMainHand().getType() != Material.MAP && !force) return; + if (player.getInventory().getItemInMainHand().getType() != Material.FILLED_MAP && !force) return; showInInventory(player, player.getInventory().getHeldItemSlot(), force); } @@ -169,7 +169,7 @@ public class MapWrapper_v1_17_R1 extends MapWrapper { @Override public void showInFrame(Player player, ItemFrame frame, boolean force) { - if (frame.getItem().getType() != Material.MAP && !force) return; + if (frame.getItem().getType() != Material.FILLED_MAP && !force) return; showInFrame(player, frame.getEntityId()); } @@ -182,7 +182,7 @@ public class MapWrapper_v1_17_R1 extends MapWrapper { public void showInFrame(Player player, int entityId, String debugInfo) { if (!isViewing(player)) return; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); if (debugInfo != null) { ItemMeta itemMeta = stack.getItemMeta(); itemMeta.setDisplayName(debugInfo); diff --git a/NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_17_R1.java b/NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_17_R1.java index f9450d9..1b26136 100644 --- a/NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_17_R1.java +++ b/NMS-v1_17_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_17_R1.java @@ -58,7 +58,7 @@ public class PacketListener_v1_17_R1 extends PacketListener { if (id < 0) { //It's one of our maps, invert ID and let through! int newId = -id; - setField(packet, "a", newId); //mapId + setField(packetPlayOutMap, "a", newId); //mapId } else { boolean async = !plugin.getServer().isPrimaryThread(); MapCancelEvent event = new MapCancelEvent(p, id, async); diff --git a/NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_18_R2.java b/NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_18_R2.java index 910f9ba..671c86e 100644 --- a/NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_18_R2.java +++ b/NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_18_R2.java @@ -139,7 +139,7 @@ public class MapWrapper_v1_18_R2 extends MapWrapper { int windowId = craftPlayer.getHandle().bU.j; //inventoryMenu containerId int stateId = craftPlayer.getHandle().bU.j(); //inventoryMenu getStateId() - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); net.minecraft.world.item.ItemStack nmsStack = CraftItemStack.asNMSCopy(stack); PacketPlayOutSetSlot packet = new PacketPlayOutSetSlot(windowId, stateId, slot, nmsStack); @@ -153,7 +153,7 @@ public class MapWrapper_v1_18_R2 extends MapWrapper { @Override public void showInHand(Player player, boolean force) { - if (player.getInventory().getItemInMainHand().getType() != Material.MAP && !force) return; + if (player.getInventory().getItemInMainHand().getType() != Material.FILLED_MAP && !force) return; showInInventory(player, player.getInventory().getHeldItemSlot(), force); } @@ -169,7 +169,7 @@ public class MapWrapper_v1_18_R2 extends MapWrapper { @Override public void showInFrame(Player player, ItemFrame frame, boolean force) { - if (frame.getItem().getType() != Material.MAP && !force) return; + if (frame.getItem().getType() != Material.FILLED_MAP && !force) return; showInFrame(player, frame.getEntityId()); } @@ -182,7 +182,7 @@ public class MapWrapper_v1_18_R2 extends MapWrapper { public void showInFrame(Player player, int entityId, String debugInfo) { if (!isViewing(player)) return; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); if (debugInfo != null) { ItemMeta itemMeta = stack.getItemMeta(); itemMeta.setDisplayName(debugInfo); diff --git a/NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_18_R2.java b/NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_18_R2.java index 93a9b85..ed14a73 100644 --- a/NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_18_R2.java +++ b/NMS-v1_18_R2/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_18_R2.java @@ -58,7 +58,7 @@ public class PacketListener_v1_18_R2 extends PacketListener { if (id < 0) { //It's one of our maps, invert ID and let through! int newId = -id; - setField(packet, "a", newId); //mapId + setField(packetPlayOutMap, "a", newId); //mapId } else { boolean async = !plugin.getServer().isPrimaryThread(); MapCancelEvent event = new MapCancelEvent(p, id, async); diff --git a/NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_19_R1.java b/NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_19_R1.java index f9a33d7..9267d6f 100644 --- a/NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_19_R1.java +++ b/NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/MapWrapper_v1_19_R1.java @@ -139,7 +139,7 @@ public class MapWrapper_v1_19_R1 extends MapWrapper { int windowId = craftPlayer.getHandle().bT.j; //inventoryMenu containerId int stateId = craftPlayer.getHandle().bT.j(); //inventoryMenu getStateId() - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); net.minecraft.world.item.ItemStack nmsStack = CraftItemStack.asNMSCopy(stack); PacketPlayOutSetSlot packet = new PacketPlayOutSetSlot(windowId, stateId, slot, nmsStack); @@ -153,7 +153,7 @@ public class MapWrapper_v1_19_R1 extends MapWrapper { @Override public void showInHand(Player player, boolean force) { - if (player.getInventory().getItemInMainHand().getType() != Material.MAP && !force) return; + if (player.getInventory().getItemInMainHand().getType() != Material.FILLED_MAP && !force) return; showInInventory(player, player.getInventory().getHeldItemSlot(), force); } @@ -169,7 +169,7 @@ public class MapWrapper_v1_19_R1 extends MapWrapper { @Override public void showInFrame(Player player, ItemFrame frame, boolean force) { - if (frame.getItem().getType() != Material.MAP && !force) return; + if (frame.getItem().getType() != Material.FILLED_MAP && !force) return; showInFrame(player, frame.getEntityId()); } @@ -182,7 +182,7 @@ public class MapWrapper_v1_19_R1 extends MapWrapper { public void showInFrame(Player player, int entityId, String debugInfo) { if (!isViewing(player)) return; - ItemStack stack = new ItemStack(Material.MAP, 1); + ItemStack stack = new ItemStack(Material.FILLED_MAP, 1); if (debugInfo != null) { ItemMeta itemMeta = stack.getItemMeta(); itemMeta.setDisplayName(debugInfo); diff --git a/NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_19_R1.java b/NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_19_R1.java index 99bcac2..3786d4d 100644 --- a/NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_19_R1.java +++ b/NMS-v1_19_R1/src/main/java/tech/sbdevelopment/mapreflectionapi/nms/PacketListener_v1_19_R1.java @@ -58,7 +58,7 @@ public class PacketListener_v1_19_R1 extends PacketListener { if (id < 0) { //It's one of our maps, invert ID and let through! int newId = -id; - setField(packet, "a", newId); //mapId + setField(packetPlayOutMap, "a", newId); //mapId } else { boolean async = !plugin.getServer().isPrimaryThread(); MapCancelEvent event = new MapCancelEvent(p, id, async);