mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Java16 Sonar Changes - 8 (done again)
This commit is contained in:
parent
809530fccd
commit
5f525fbf74
@ -111,8 +111,8 @@ public class GPSNetwork {
|
|||||||
for (Location l : locations) {
|
for (Location l : locations) {
|
||||||
SlimefunItem item = BlockStorage.check(l);
|
SlimefunItem item = BlockStorage.check(l);
|
||||||
|
|
||||||
if (item instanceof GPSTransmitter) {
|
if (item instanceof GPSTransmitter transmitter) {
|
||||||
level += ((GPSTransmitter) item).getMultiplier(Math.max(l.getBlockY(), 0));
|
level += transmitter.getMultiplier(Math.max(l.getBlockY(), 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -172,10 +172,10 @@ public class GPSNetwork {
|
|||||||
|
|
||||||
SlimefunItem sfi = BlockStorage.check(l);
|
SlimefunItem sfi = BlockStorage.check(l);
|
||||||
|
|
||||||
if (sfi instanceof GPSTransmitter) {
|
if (sfi instanceof GPSTransmitter transmitter) {
|
||||||
int slot = inventory[index];
|
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());
|
menu.addMenuClickHandler(slot, ChestMenuUtils.getEmptyClickHandler());
|
||||||
|
|
||||||
index++;
|
index++;
|
||||||
|
@ -61,8 +61,8 @@ public final class HashedArmorpiece {
|
|||||||
this.hash = copy.hashCode();
|
this.hash = copy.hashCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item instanceof SlimefunArmorPiece slimefunArmorPiece) {
|
if (item instanceof SlimefunArmorPiece armorPiece) {
|
||||||
this.item = Optional.of(slimefunArmorPiece);
|
this.item = Optional.of(armorPiece);
|
||||||
} else {
|
} else {
|
||||||
this.item = Optional.empty();
|
this.item = Optional.empty();
|
||||||
}
|
}
|
||||||
|
@ -51,7 +51,7 @@ public class StomperBoots extends SlimefunItem {
|
|||||||
player.setVelocity(new Vector(0, 0.7, 0));
|
player.setVelocity(new Vector(0, 0.7, 0));
|
||||||
|
|
||||||
for (Entity entity : player.getNearbyEntities(4, 4, 4)) {
|
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());
|
Vector velocity = getShockwave(player.getLocation(), entity.getLocation());
|
||||||
entity.setVelocity(velocity);
|
entity.setVelocity(velocity);
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ public class StomperBoots extends SlimefunItem {
|
|||||||
Bukkit.getPluginManager().callEvent(event);
|
Bukkit.getPluginManager().callEvent(event);
|
||||||
|
|
||||||
if (!event.isCancelled()) {
|
if (!event.isCancelled()) {
|
||||||
((LivingEntity) entity).damage(event.getDamage());
|
livingEntity.damage(event.getDamage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,9 +47,9 @@ public class EnhancedFurnaceListener implements Listener {
|
|||||||
|
|
||||||
SlimefunItem furnace = BlockStorage.check(e.getBlock());
|
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 burnTime = e.getBurnTime();
|
||||||
int newBurnTime = ((EnhancedFurnace) furnace).getFuelEfficiency() * burnTime;
|
int newBurnTime = enhancedFurnace.getFuelEfficiency() * burnTime;
|
||||||
|
|
||||||
e.setBurnTime(Math.min(newBurnTime, Short.MAX_VALUE - 1));
|
e.setBurnTime(Math.min(newBurnTime, Short.MAX_VALUE - 1));
|
||||||
}
|
}
|
||||||
@ -64,14 +64,14 @@ public class EnhancedFurnaceListener implements Listener {
|
|||||||
|
|
||||||
SlimefunItem sfItem = BlockStorage.check(e.getBlock());
|
SlimefunItem sfItem = BlockStorage.check(e.getBlock());
|
||||||
|
|
||||||
if (sfItem instanceof EnhancedFurnace) {
|
if (sfItem instanceof EnhancedFurnace enhancedFurnace) {
|
||||||
BlockState state = PaperLib.getBlockState(e.getBlock(), false).getState();
|
BlockState state = PaperLib.getBlockState(e.getBlock(), false).getState();
|
||||||
|
|
||||||
if (state instanceof Furnace) {
|
if (state instanceof Furnace furnace) {
|
||||||
FurnaceInventory inventory = ((Furnace) state).getInventory();
|
FurnaceInventory inventory = furnace.getInventory();
|
||||||
|
|
||||||
boolean multiplier = SlimefunTag.ENHANCED_FURNACE_LUCK_MATERIALS.isTagged(inventory.getSmelting().getType());
|
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<ItemStack> result = Slimefun.getMinecraftRecipeService().getFurnaceOutput(inventory.getSmelting());
|
Optional<ItemStack> result = Slimefun.getMinecraftRecipeService().getFurnaceOutput(inventory.getSmelting());
|
||||||
|
|
||||||
if (result.isPresent()) {
|
if (result.isPresent()) {
|
||||||
|
@ -137,8 +137,8 @@ public final class ChestMenuUtils {
|
|||||||
ItemMeta im = item.getItemMeta();
|
ItemMeta im = item.getItemMeta();
|
||||||
im.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
|
im.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
|
||||||
|
|
||||||
if (im instanceof Damageable) {
|
if (im instanceof Damageable damageable) {
|
||||||
((Damageable) im).setDamage(getDurability(item, timeLeft, time));
|
damageable.setDamage(getDurability(item, timeLeft, time));
|
||||||
}
|
}
|
||||||
|
|
||||||
im.setDisplayName(" ");
|
im.setDisplayName(" ");
|
||||||
|
Loading…
Reference in New Issue
Block a user