From e646b45af6ef71b5284e2a4ef2bffe9ee98f2b06 Mon Sep 17 00:00:00 2001 From: Navoei Date: Sun, 4 Sep 2022 19:11:50 -0500 Subject: [PATCH] Bugfix: Spaces cannot be used in disc names --- gradle.properties | 2 +- .../me/Navoei/customdiscsplugin/CustomDiscs.java | 1 - .../Navoei/customdiscsplugin/HopperManager.java | 16 +++++++--------- .../command/SubCommands/CreateCommand.java | 6 ++---- .../Navoei/customdiscsplugin/event/JukeBox.java | 15 +++++++++------ 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/gradle.properties b/gradle.properties index ab119f2..1888317 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,6 +11,6 @@ mod_id=customdiscsplugin # Target an older API to make it compatible with older versions of Simple Voice Chat voicechat_api_version=2.3.3 -plugin_version=2.2.1 +plugin_version=2.2.2 maven_group=me.Navoei.customdiscsplugin archives_base_name=custom-discs \ No newline at end of file diff --git a/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java b/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java index 4c77ae8..1beaee9 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java +++ b/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java @@ -14,7 +14,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bukkit.NamespacedKey; import org.bukkit.block.Jukebox; -import org.bukkit.inventory.ItemFlag; import org.bukkit.persistence.PersistentDataType; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/me/Navoei/customdiscsplugin/HopperManager.java b/src/main/java/me/Navoei/customdiscsplugin/HopperManager.java index d6f20d9..a7a2f63 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/HopperManager.java +++ b/src/main/java/me/Navoei/customdiscsplugin/HopperManager.java @@ -1,7 +1,5 @@ package me.Navoei.customdiscsplugin; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -26,7 +24,7 @@ import java.util.Objects; public class HopperManager implements Listener { - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onHopperPickupFromOtherSource(InventoryMoveItemEvent event) { if (event.getDestination().getLocation() == null) return; @@ -62,7 +60,7 @@ public class HopperManager implements Listener { } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onHopperPickupItem(InventoryPickupItemEvent event) { if (!Objects.requireNonNull(event.getInventory().getLocation()).getChunk().isLoaded()) return; @@ -97,7 +95,7 @@ public class HopperManager implements Listener { } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onItemPlayerToHopper(InventoryClickEvent event) { if (event.getClickedInventory() == null) return; @@ -182,7 +180,7 @@ public class HopperManager implements Listener { } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onInventoryDrag(InventoryDragEvent event) { if (Objects.requireNonNull(event.getInventory()).getLocation() == null) return; @@ -204,7 +202,7 @@ public class HopperManager implements Listener { } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onChunkLoad(ChunkLoadEvent event) { for (BlockState blockState : event.getChunk().getTileEntities()) { if (blockState instanceof Jukebox) { @@ -215,7 +213,7 @@ public class HopperManager implements Listener { } } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onJukeboxPlace(BlockPlaceEvent event) { if (!event.getBlock().getType().equals(Material.JUKEBOX)) return; @@ -223,7 +221,7 @@ public class HopperManager implements Listener { } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onHopperPlace(BlockPlaceEvent event) { if (!event.getBlock().getType().equals(Material.HOPPER)) return; diff --git a/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/CreateCommand.java b/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/CreateCommand.java index 22e7a2e..46302a6 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/CreateCommand.java +++ b/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/CreateCommand.java @@ -41,7 +41,7 @@ public class CreateCommand extends SubCommand { @Override public void perform(Player player, String[] args) { if (isMusicDisc(player)) { - if (args.length == 3) { + if (args.length >= 3) { if (!player.hasPermission("customdiscs.create")) { player.sendMessage(ChatColor.RED + "You do not have permission to execute this command!"); @@ -94,10 +94,8 @@ public class CreateCommand extends SubCommand { player.sendMessage("Your filename is: " + ChatColor.GRAY + songname); player.sendMessage("Your custom name is: " + ChatColor.GRAY + customName(readQuotes(args))); - } else if (args.length < 3) { - player.sendMessage(ChatColor.RED + "Insufficient arguments! ( /customdisc create \"Custom Lore\" )"); } else { - player.sendMessage(ChatColor.RED + "Too many arguments! ( /customdisc create \"Custom Lore\" )"); + player.sendMessage(ChatColor.RED + "Insufficient arguments! ( /customdisc create \"Custom Lore\" )"); } } else { player.sendMessage(ChatColor.RED + "You are not holding a music disc in your main hand!"); diff --git a/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java b/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java index 40cdb99..a2d1ea5 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java +++ b/src/main/java/me/Navoei/customdiscsplugin/event/JukeBox.java @@ -13,16 +13,19 @@ import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.block.Block; +import org.bukkit.block.BlockState; import org.bukkit.block.Jukebox; +import org.bukkit.block.data.BlockData; +import org.bukkit.block.data.Directional; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockRedstoneEvent; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.inventory.ItemFlag; import org.bukkit.persistence.PersistentDataType; import java.io.FileNotFoundException; @@ -32,7 +35,7 @@ import java.util.Objects; public class JukeBox implements Listener{ - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onInsert(PlayerInteractEvent event) throws IOException { Player player = event.getPlayer(); @@ -69,7 +72,7 @@ public class JukeBox implements Listener{ } } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onEject(PlayerInteractEvent event) { Player player = event.getPlayer(); @@ -85,7 +88,7 @@ public class JukeBox implements Listener{ } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onJukeboxBreak(BlockBreakEvent event) { Block block = event.getBlock(); @@ -96,8 +99,8 @@ public class JukeBox implements Listener{ stopDisc(block, player); } - @EventHandler - public void onJukeBoxExplode(EntityExplodeEvent event) { + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onJukeboxExplode(EntityExplodeEvent event) { for (Block explodedBlock : event.blockList()) { if (explodedBlock.getType() == Material.JUKEBOX) {