diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java index 2ccad78..deb4fb5 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java @@ -138,11 +138,10 @@ public abstract class Talisman implements Listener, Watcher { return true; } - if (!(o instanceof Talisman)) { + if (!(o instanceof Talisman talisman)) { return false; } - Talisman talisman = (Talisman) o; return this.getKey().equals(talisman.getKey()); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/TalismanLevel.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/TalismanLevel.java index dbb9bb0..0ac4113 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/TalismanLevel.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/TalismanLevel.java @@ -195,10 +195,9 @@ public class TalismanLevel { if (this == o) { return true; } - if (!(o instanceof TalismanLevel)) { + if (!(o instanceof TalismanLevel that)) { return false; } - TalismanLevel that = (TalismanLevel) o; return getLevel() == that.getLevel() && Objects.equals(getTalisman(), that.getTalisman()); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/AlchemyTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/AlchemyTalisman.java index c245392..7f7ddd6 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/AlchemyTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/AlchemyTalisman.java @@ -20,12 +20,10 @@ public class AlchemyTalisman extends Talisman { if (event.getNewEffect() == null) { return; } - if (!(event.getEntity() instanceof Player)) { + if (!(event.getEntity() instanceof Player player)) { return; } - Player player = (Player) event.getEntity(); - if (player.hasMetadata(event.getNewEffect().toString())) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FluxTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FluxTalisman.java index 0b7ebde..960995c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FluxTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FluxTalisman.java @@ -22,7 +22,7 @@ public class FluxTalisman extends Talisman { return; } - if (!(event.getDamager() instanceof Player)) { + if (!(event.getDamager() instanceof Player attacker)) { return; } @@ -30,8 +30,6 @@ public class FluxTalisman extends Talisman { return; } - Player attacker = (Player) event.getDamager(); - if (this.getDisabledWorlds().contains(attacker.getWorld())) { return; } @@ -40,12 +38,10 @@ public class FluxTalisman extends Talisman { for (Entity nearbyEntity : attacker.getNearbyEntities(distance, distance, distance)) { - if (!(nearbyEntity instanceof Player)) { + if (!(nearbyEntity instanceof Player player)) { continue; } - Player player = (Player) nearbyEntity; - TalismanLevel level = TalismanChecks.getTalismanLevel(player, this); if (level == null) { diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/HealingTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/HealingTalisman.java index aa6b703..0ff1a2f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/HealingTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/HealingTalisman.java @@ -16,7 +16,7 @@ public class HealingTalisman extends Talisman { @EventHandler public void onHeal(@NotNull final EntityRegainHealthEvent event) { - if (!(event.getEntity() instanceof Player)) { + if (!(event.getEntity() instanceof Player player)) { return; } @@ -24,8 +24,6 @@ public class HealingTalisman extends Talisman { return; } - Player player = (Player) event.getEntity(); - if (this.getDisabledWorlds().contains(player.getWorld())) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java index 3c08afb..1b161bd 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java @@ -177,8 +177,7 @@ public class TalismanChecks { } BlockState state = shulkerMeta.getBlockState(); - if (state instanceof ShulkerBox) { - ShulkerBox shulkerBox = (ShulkerBox) state; + if (state instanceof ShulkerBox shulkerBox) { contents.addAll(Arrays.asList(shulkerBox.getInventory().getContents())); continue; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java index 5767fb1..9d97cdd 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java @@ -32,12 +32,10 @@ public class TalismanCraftListener extends PluginDependent implements Listener { */ @EventHandler public void onCraft(@NotNull final PrepareItemCraftEvent event) { - if (!(event.getRecipe() instanceof ShapedRecipe)) { + if (!(event.getRecipe() instanceof ShapedRecipe recipe)) { return; } - ShapedRecipe recipe = (ShapedRecipe) event.getRecipe(); - NamespacedKey key = this.getPlugin().getNamespacedKeyFactory().create(recipe.getKey().getKey().replace("_displayed", "")); Talisman talisman = Talismans.getByKey(key); @@ -66,12 +64,10 @@ public class TalismanCraftListener extends PluginDependent implements Listener { */ @EventHandler public void onCraft(@NotNull final CraftItemEvent event) { - if (!(event.getRecipe() instanceof ShapedRecipe)) { + if (!(event.getRecipe() instanceof ShapedRecipe recipe)) { return; } - ShapedRecipe recipe = (ShapedRecipe) event.getRecipe(); - NamespacedKey key = this.getPlugin().getNamespacedKeyFactory().create(recipe.getKey().getKey().replace("_displayed", "")); Talisman talisman = Talismans.getByKey(key); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java index 7167730..de1b388 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java @@ -61,11 +61,11 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getDamager() instanceof Arrow)) { + if (!(event.getDamager() instanceof Arrow arrow)) { return; } - if (!(event.getEntity() instanceof LivingEntity)) { + if (!(event.getEntity() instanceof LivingEntity victim)) { return; } @@ -73,14 +73,10 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(((Arrow) event.getDamager()).getShooter() instanceof Player)) { + if (!(((Arrow) event.getDamager()).getShooter() instanceof Player attacker)) { return; } - Player attacker = (Player) ((Arrow) event.getDamager()).getShooter(); - Arrow arrow = (Arrow) event.getDamager(); - LivingEntity victim = (LivingEntity) event.getEntity(); - if (victim.hasMetadata("NPC")) { return; } @@ -122,7 +118,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getDamager() instanceof Trident)) { + if (!(event.getDamager() instanceof Trident trident)) { return; } @@ -134,7 +130,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getEntity() instanceof LivingEntity)) { + if (!(event.getEntity() instanceof LivingEntity victim)) { return; } @@ -142,11 +138,8 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - Trident trident = (Trident) event.getDamager(); Player attacker = (Player) trident.getShooter(); - LivingEntity victim = (LivingEntity) event.getEntity(); - if (victim.hasMetadata("NPC")) { return; } @@ -230,11 +223,11 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getDamager() instanceof Player)) { + if (!(event.getDamager() instanceof Player attacker)) { return; } - if (!(event.getEntity() instanceof LivingEntity)) { + if (!(event.getEntity() instanceof LivingEntity victim)) { return; } @@ -242,9 +235,6 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - Player attacker = (Player) event.getDamager(); - LivingEntity victim = (LivingEntity) event.getEntity(); - if (victim.hasMetadata("NPC")) { return; } @@ -286,11 +276,10 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getEntity() instanceof Player)) { + if (!(event.getEntity() instanceof Player shooter)) { return; } - Player shooter = (Player) event.getEntity(); Arrow arrow = (Arrow) event.getProjectile(); TalismanChecks.getTalismansOnPlayer(shooter).forEach(talismanLevel -> { @@ -325,12 +314,10 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getEntity() instanceof Player)) { + if (!(event.getEntity() instanceof Player victim)) { return; } - Player victim = (Player) event.getEntity(); - TalismanChecks.getTalismansOnPlayer(victim).forEach(talismanLevel -> { if (event.isCancelled()) { return; @@ -359,7 +346,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getEntity().getShooter() instanceof Player)) { + if (!(event.getEntity().getShooter() instanceof Player shooter)) { return; } @@ -371,8 +358,6 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - Player shooter = (Player) event.getEntity().getShooter(); - TalismanChecks.getTalismansOnPlayer(shooter).forEach(talismanLevel -> { if (!talismanLevel.getTalisman().isEnabled()) { return; @@ -397,7 +382,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getEntity().getShooter() instanceof Player)) { + if (!(event.getEntity().getShooter() instanceof Player shooter)) { return; } @@ -405,13 +390,10 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getEntity() instanceof Trident)) { + if (!(event.getEntity() instanceof Trident trident)) { return; } - Trident trident = (Trident) event.getEntity(); - Player shooter = (Player) event.getEntity().getShooter(); - TalismanChecks.getTalismansOnPlayer(shooter).forEach(talismanLevel -> { if (!talismanLevel.getTalisman().isEnabled()) { return; @@ -475,12 +457,10 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getEntity() instanceof Player)) { + if (!(event.getEntity() instanceof Player victim)) { return; } - Player victim = (Player) event.getEntity(); - TalismanChecks.getTalismansOnPlayer(victim).forEach(talismanLevel -> { if (event.isCancelled()) { return; @@ -509,12 +489,10 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getEntity() instanceof Player)) { + if (!(event.getEntity() instanceof Player victim)) { return; } - Player victim = (Player) event.getEntity(); - TalismanChecks.getTalismansOnPlayer(victim).forEach(talismanLevel -> { if (event.isCancelled()) { return; @@ -578,7 +556,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getEntity() instanceof Trident)) { + if (!(event.getEntity() instanceof Trident trident)) { return; } @@ -586,7 +564,6 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - Trident trident = (Trident) event.getEntity(); Player shooter = (Player) trident.getShooter(); TalismanChecks.getTalismansOnPlayer(shooter).forEach(talismanLevel -> { @@ -617,18 +594,14 @@ public class WatcherTriggers extends PluginDependent implements Listener { return; } - if (!(event.getEntity() instanceof Player)) { + if (!(event.getEntity() instanceof Player blocker)) { return; } - if (!(event.getDamager() instanceof LivingEntity)) { + if (!(event.getDamager() instanceof LivingEntity attacker)) { return; } - Player blocker = (Player) event.getEntity(); - - LivingEntity attacker = (LivingEntity) event.getDamager(); - if (!blocker.isBlocking()) { return; }