From c3c211361941ce9cfd787416642eeb732ba371b8 Mon Sep 17 00:00:00 2001 From: Ardakaz Date: Thu, 6 Nov 2025 17:37:52 +0200 Subject: [PATCH] Doing some cleaning --- src/net/ardakaz/griefalert/GriefAlert.java | 81 +++++++++------------- 1 file changed, 33 insertions(+), 48 deletions(-) diff --git a/src/net/ardakaz/griefalert/GriefAlert.java b/src/net/ardakaz/griefalert/GriefAlert.java index af99328..868ca9d 100644 --- a/src/net/ardakaz/griefalert/GriefAlert.java +++ b/src/net/ardakaz/griefalert/GriefAlert.java @@ -14,7 +14,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.Cat; -import org.bukkit.entity.EntityType; import org.bukkit.entity.Tameable; import org.bukkit.entity.Wolf; import org.bukkit.entity.Player; @@ -215,8 +214,7 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { action == InventoryAction.PICKUP_ONE || action == InventoryAction.PICKUP_SOME || action == InventoryAction.MOVE_TO_OTHER_INVENTORY) && clickedInventory == inventory) { stealing = true; - } else if (action == InventoryAction.PLACE_ALL || action == InventoryAction.PLACE_SOME || - action == InventoryAction.PLACE_ONE || (action == InventoryAction.MOVE_TO_OTHER_INVENTORY && clickedInventory != inventory)) { + } else if (action == InventoryAction.PLACE_ALL || action == InventoryAction.PLACE_SOME || action == InventoryAction.PLACE_ONE || action == InventoryAction.MOVE_TO_OTHER_INVENTORY) { stealing = false; } else { return; @@ -245,10 +243,8 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { // Armor Stand break alerts @EventHandler(ignoreCancelled = true) public void onArmorStandBreak(EntityDamageByEntityEvent event) { - if (!(event.getEntity() instanceof ArmorStand)) return; - if (!(event.getDamager() instanceof Player)) return; - Player player = (Player) event.getDamager(); - ArmorStand armorStand = (ArmorStand) event.getEntity(); + if (!(event.getEntity() instanceof ArmorStand armorStand)) return; + if (!(event.getDamager() instanceof Player player)) return; int x = armorStand.getLocation().getBlockX(); int y = armorStand.getLocation().getBlockY(); int z = armorStand.getLocation().getBlockZ(); @@ -268,9 +264,8 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { // Armor Stand item interaction alerts @EventHandler(ignoreCancelled = true) public void onArmorStandInteract(PlayerInteractAtEntityEvent event) { - if (!(event.getRightClicked() instanceof ArmorStand)) return; + if (!(event.getRightClicked() instanceof ArmorStand armorStand)) return; Player player = event.getPlayer(); - ArmorStand armorStand = (ArmorStand) event.getRightClicked(); int x = armorStand.getLocation().getBlockX(); int y = armorStand.getLocation().getBlockY(); int z = armorStand.getLocation().getBlockZ(); @@ -287,18 +282,14 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { //org.bukkit.inventory.EquipmentSlot slot = event.getHand(); EntityEquipment equipment = armorStand.getEquipment(); ItemStack armorItem = null; - if (event.getClickedPosition() != null) { - // Approximate slot by Y position (not perfect, but Bukkit API is limited so it is what it is :3) - double yPos = event.getClickedPosition().getY(); - if (yPos > 1.6) armorItem = equipment.getHelmet(); - else if (yPos > 1.2) armorItem = equipment.getChestplate(); - else if (yPos > 0.8) armorItem = equipment.getLeggings(); - else if (yPos > 0.1) armorItem = equipment.getBoots(); - else armorItem = equipment.getItemInMainHand(); - } else { - armorItem = equipment.getItemInMainHand(); - } - boolean handEmpty = handItem == null || handItem.getType() == Material.AIR; + event.getClickedPosition();// Approximate slot by Y position (not perfect, but Bukkit API is limited so it is what it is :3) + double yPos = event.getClickedPosition().getY(); + if (yPos > 1.6) armorItem = equipment.getHelmet(); + else if (yPos > 1.2) armorItem = equipment.getChestplate(); + else if (yPos > 0.8) armorItem = equipment.getLeggings(); + else if (yPos > 0.1) armorItem = equipment.getBoots(); + else armorItem = equipment.getItemInMainHand(); + boolean handEmpty = handItem.getType() == Material.AIR; boolean armorEmpty = armorItem == null || armorItem.getType() == Material.AIR; String action; //this works at the instance of interaction before items get moved around @@ -306,22 +297,21 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { action = "took " + armorItem.getType().toString(); } else if (!handEmpty && armorEmpty) { action = "added " + handItem.getType().toString(); - } else if (!handEmpty && !armorEmpty) { + } else if (!handEmpty) { action = "swapped " + armorItem.getType().toString() + " with " + handItem.getType().toString(); } else { action = "interacted with"; } - String message = ChatColor.GRAY + playerName + " " + action + " on an armor stand owned by " + target + " at " + x + " " + y + " " + z + getHumanWorldName(worldName); + String message = ChatColor.GRAY + playerName + " " + action + " on an armor stand placed by " + target + " at " + x + " " + y + " " + z + getHumanWorldName(worldName); alert(message, playerName, "[Map Link](" + MAP_LINK + "/?worldname=" + worldName + "&zoom=7&x=" + x + "&y=" + y + "&z=" + z + ")", target, x, y, z, worldName); } } //event handler for item frames @EventHandler(ignoreCancelled = true) public void onPlayerInteractEntity(PlayerInteractEntityEvent event){ - if(!(event.getRightClicked() instanceof ItemFrame)) return; + if(!(event.getRightClicked() instanceof ItemFrame frame)) return; Player player = event.getPlayer(); - ItemFrame frame = (ItemFrame) event.getRightClicked(); int x = frame.getLocation().getBlockX(); int y = frame.getLocation().getBlockY(); int z = frame.getLocation().getBlockZ(); @@ -354,14 +344,12 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { - //breaking item frame item (uses a different event then placing an item) + // Breaking item frame item (uses a different event then placing an item) @EventHandler (ignoreCancelled = true) - public void onItemFrameDamage(EntityDamageByEntityEvent event){ - if (!(event.getEntity() instanceof ItemFrame)) return; - if (!(event.getDamager() instanceof Player)) return; + public void onItemFrameDamage(EntityDamageByEntityEvent event) { + if (!(event.getEntity() instanceof ItemFrame frame)) return; + if (!(event.getDamager() instanceof Player player)) return; - ItemFrame frame = (ItemFrame) event.getEntity(); - Player player = (Player) event.getDamager(); ItemStack item = frame.getItem(); String playerName = player.getName(); @@ -371,14 +359,14 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { String worldName = frame.getWorld().getName(); if (isLocationIgnored(x, y, z, worldName)) { - event.setCancelled(true); - return; - } - String target = inspectBlock(frame.getLocation().getBlock(), player); + event.setCancelled(true); + return; + } + + String target = inspectBlock(frame.getLocation().getBlock(), player); if (target == null || target.equals(player.getName())) return; - - if (item == null || item.getType() == Material.AIR) return; + if (item.getType() == Material.AIR) return; // At this point, the player is removing the item String action = "took " + item.getType(); String message = ChatColor.GRAY + playerName + " " + action + " from item frame owned by " + target + " at " + x + " " + y + " " + z + getHumanWorldName(worldName); @@ -388,14 +376,11 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { @EventHandler(ignoreCancelled = true) public void onItemFrameBreak(HangingBreakByEntityEvent event){ - if (!(event.getEntity() instanceof ItemFrame)) return; - if (!(event.getRemover() instanceof Player)) return; + if (!(event.getEntity() instanceof ItemFrame frame)) return; + if (!(event.getRemover() instanceof Player player)) return; - ItemFrame frame = (ItemFrame) event.getEntity(); - Player player = (Player) event.getRemover(); String playerName = player.getName(); - Location loc = frame.getLocation(); int x = loc.getBlockX(); int y = loc.getBlockY(); @@ -410,7 +395,7 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { if (target ==null || target.equals(player.getName())) return; String action = "broke an item frame"; - String message = ChatColor.GRAY + playerName + " " + action + " owned by " + target + " at " + x + " " + y + " " + z + getHumanWorldName(worldName); + String message = ChatColor.GRAY + playerName + " " + action + " placed by " + target + " at " + x + " " + y + " " + z + getHumanWorldName(worldName); alert(message, playerName, "[Map Link](" + MAP_LINK + "/?worldname=" + worldName + "&zoom=7&x=" + x + "&y=" + y + "&z=" + z + ")", target, x, y, z, worldName); } @@ -425,7 +410,7 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { String sub = args[0].toLowerCase(); if (sub.equals("ignore")) { if (!sender.hasPermission("griefalert.staff.ignore")) { - sender.sendMessage(ChatColor.RED + "You do not have permission."); + sender.sendMessage(ChatColor.RED + "You do not have a permission."); return true; } String world; @@ -633,7 +618,7 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { // Block inspector: only the most recent placement counts for ownership. private static String inspectBlock(Block block, Player player) { List lookup = coreProtectAPI.blockLookup(block, 50000000); - if (lookup == null || lookup.size() == 0) { + if (lookup == null || lookup.isEmpty()) { // Natural block return null; } @@ -680,7 +665,7 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { String worldName = event.getEntity().getWorld().getName(); String pet = event.getEntity().getType().name(); - String message = ChatColor.GRAY + killer.getName() + " killed" +" " + pet + " "+ "owned by " + Owner.getName() + " at " + x + " " + y + " " + z + getHumanWorldName(worldName); + String message = ChatColor.GRAY + killer.getName() + " killed" +" " + pet + " in " + Owner.getName() + "'s build at " + x + " " + y + " " + z + getHumanWorldName(worldName); alert(message, killer.getName(), "[Map Link](" + MAP_LINK + "/?worldname=" + worldName + "&zoom=7&x=" + x + "&y=" + y + "&z=" + z + ")", Owner.getName(), x, y, z, worldName); } @@ -708,7 +693,7 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { String worldName = event.getEntity().getWorld().getName(); - String message = ChatColor.GRAY + killer.getName() + " killed" +" " + typeName + " "+ "owned by " + animalOwner + " at " + x + " " + y + " " + z + getHumanWorldName(worldName); + String message = ChatColor.GRAY + killer.getName() + " killed" +" " + typeName + "in " + animalOwner + "'s build at " + x + " " + y + " " + z + getHumanWorldName(worldName); alert(message, killer.getName(), "[Map Link](" + MAP_LINK + "/?worldname=" + worldName + "&zoom=7&x=" + x + "&y=" + y + "&z=" + z + ")", animalOwner, x, y, z, worldName); @@ -731,7 +716,7 @@ public class GriefAlert extends JavaPlugin implements Listener, TabCompleter { private CoreProtectAPI getCoreProtect() { Plugin plugin = getServer().getPluginManager().getPlugin("CoreProtect"); - if (plugin == null || !(plugin instanceof CoreProtect)) { + if (!(plugin instanceof CoreProtect)) { return null; }