diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java index 295c28370..f2b65f821 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java @@ -111,8 +111,8 @@ public class GPSNetwork { for (Location l : locations) { SlimefunItem item = BlockStorage.check(l); - if (item instanceof GPSTransmitter) { - level += ((GPSTransmitter) item).getMultiplier(Math.max(l.getBlockY(), 0)); + if (item instanceof GPSTransmitter transmitter) { + level += transmitter.getMultiplier(Math.max(l.getBlockY(), 0)); } } @@ -172,10 +172,10 @@ public class GPSNetwork { SlimefunItem sfi = BlockStorage.check(l); - if (sfi instanceof GPSTransmitter) { + if (sfi instanceof GPSTransmitter transmitter) { int slot = inventory[index]; - menu.addItem(slot, new CustomItemStack(SlimefunItems.GPS_TRANSMITTER, "&bGPS Transmitter", "&8\u21E8 &7World: &f" + l.getWorld().getName(), "&8\u21E8 &7X: &f" + l.getX(), "&8\u21E8 &7Y: &f" + l.getY(), "&8\u21E8 &7Z: &f" + l.getZ(), "", "&8\u21E8 &7Signal Strength: &f" + ((GPSTransmitter) sfi).getMultiplier(l.getBlockY()), "&8\u21E8 &7Ping: &f" + NumberUtils.roundDecimalNumber(1000D / l.getY()) + "ms")); + menu.addItem(slot, new CustomItemStack(SlimefunItems.GPS_TRANSMITTER, "&bGPS Transmitter", "&8\u21E8 &7World: &f" + l.getWorld().getName(), "&8\u21E8 &7X: &f" + l.getX(), "&8\u21E8 &7Y: &f" + l.getY(), "&8\u21E8 &7Z: &f" + l.getZ(), "", "&8\u21E8 &7Signal Strength: &f" + transmitter.getMultiplier(l.getBlockY()), "&8\u21E8 &7Ping: &f" + NumberUtils.roundDecimalNumber(1000D / l.getY()) + "ms")); menu.addMenuClickHandler(slot, ChestMenuUtils.getEmptyClickHandler()); index++; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/HashedArmorpiece.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/HashedArmorpiece.java index bb6055555..ae31cb93c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/HashedArmorpiece.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/HashedArmorpiece.java @@ -61,8 +61,8 @@ public final class HashedArmorpiece { this.hash = copy.hashCode(); } - if (item instanceof SlimefunArmorPiece slimefunArmorPiece) { - this.item = Optional.of(slimefunArmorPiece); + if (item instanceof SlimefunArmorPiece armorPiece) { + this.item = Optional.of(armorPiece); } else { this.item = Optional.empty(); } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/StomperBoots.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/StomperBoots.java index 775f24576..efeab6843 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/StomperBoots.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/StomperBoots.java @@ -51,7 +51,7 @@ public class StomperBoots extends SlimefunItem { player.setVelocity(new Vector(0, 0.7, 0)); for (Entity entity : player.getNearbyEntities(4, 4, 4)) { - if (entity instanceof LivingEntity && canPush(player, (LivingEntity) entity)) { + if (entity instanceof LivingEntity livingEntity && canPush(player, livingEntity)) { Vector velocity = getShockwave(player.getLocation(), entity.getLocation()); entity.setVelocity(velocity); @@ -61,7 +61,7 @@ public class StomperBoots extends SlimefunItem { Bukkit.getPluginManager().callEvent(event); if (!event.isCancelled()) { - ((LivingEntity) entity).damage(event.getDamage()); + livingEntity.damage(event.getDamage()); } } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EnhancedFurnaceListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EnhancedFurnaceListener.java index 8c9a6215a..323be5c55 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EnhancedFurnaceListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EnhancedFurnaceListener.java @@ -47,9 +47,9 @@ public class EnhancedFurnaceListener implements Listener { SlimefunItem furnace = BlockStorage.check(e.getBlock()); - if (furnace instanceof EnhancedFurnace && ((EnhancedFurnace) furnace).getFuelEfficiency() > 0) { + if (furnace instanceof EnhancedFurnace enhancedFurnace && enhancedFurnace.getFuelEfficiency() > 0) { int burnTime = e.getBurnTime(); - int newBurnTime = ((EnhancedFurnace) furnace).getFuelEfficiency() * burnTime; + int newBurnTime = enhancedFurnace.getFuelEfficiency() * burnTime; e.setBurnTime(Math.min(newBurnTime, Short.MAX_VALUE - 1)); } @@ -64,14 +64,14 @@ public class EnhancedFurnaceListener implements Listener { SlimefunItem sfItem = BlockStorage.check(e.getBlock()); - if (sfItem instanceof EnhancedFurnace) { + if (sfItem instanceof EnhancedFurnace enhancedFurnace) { BlockState state = PaperLib.getBlockState(e.getBlock(), false).getState(); - if (state instanceof Furnace) { - FurnaceInventory inventory = ((Furnace) state).getInventory(); + if (state instanceof Furnace furnace) { + FurnaceInventory inventory = furnace.getInventory(); boolean multiplier = SlimefunTag.ENHANCED_FURNACE_LUCK_MATERIALS.isTagged(inventory.getSmelting().getType()); - int amount = multiplier ? ((EnhancedFurnace) sfItem).getRandomOutputAmount() : 1; + int amount = multiplier ? enhancedFurnace.getRandomOutputAmount() : 1; Optional result = Slimefun.getMinecraftRecipeService().getFurnaceOutput(inventory.getSmelting()); if (result.isPresent()) { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java index 85f20f08f..3df992835 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChestMenuUtils.java @@ -137,8 +137,8 @@ public final class ChestMenuUtils { ItemMeta im = item.getItemMeta(); im.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); - if (im instanceof Damageable) { - ((Damageable) im).setDamage(getDurability(item, timeLeft, time)); + if (im instanceof Damageable damageable) { + damageable.setDamage(getDurability(item, timeLeft, time)); } im.setDisplayName(" ");