mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Java16 Sonar Changes - 7 (done)
This commit is contained in:
parent
dbf55be230
commit
30e9c879e0
@ -61,9 +61,9 @@ public class PickaxeOfContainment extends SimpleSlimefunItem<ToolUseHandler> {
|
|||||||
private @Nonnull ItemStack breakSpawner(@Nonnull Block b) {
|
private @Nonnull ItemStack breakSpawner(@Nonnull Block b) {
|
||||||
AbstractMonsterSpawner spawner;
|
AbstractMonsterSpawner spawner;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* If the spawner's BlockStorage has BlockInfo, then it's not a vanilla spawner
|
If the spawner's BlockStorage has BlockInfo, then it's not a vanilla spawner
|
||||||
* and should not give a broken spawner but a repaired one instead.
|
and should not give a broken spawner but a repaired one instead.
|
||||||
*/
|
*/
|
||||||
if (BlockStorage.hasBlockInfo(b)) {
|
if (BlockStorage.hasBlockInfo(b)) {
|
||||||
spawner = (AbstractMonsterSpawner) SlimefunItems.REPAIRED_SPAWNER.getItem();
|
spawner = (AbstractMonsterSpawner) SlimefunItems.REPAIRED_SPAWNER.getItem();
|
||||||
@ -73,8 +73,8 @@ public class PickaxeOfContainment extends SimpleSlimefunItem<ToolUseHandler> {
|
|||||||
|
|
||||||
BlockState state = PaperLib.getBlockState(b, false).getState();
|
BlockState state = PaperLib.getBlockState(b, false).getState();
|
||||||
|
|
||||||
if (state instanceof CreatureSpawner) {
|
if (state instanceof CreatureSpawner creatureSpawner) {
|
||||||
EntityType entityType = ((CreatureSpawner) state).getSpawnedType();
|
EntityType entityType = creatureSpawner.getSpawnedType();
|
||||||
return spawner.getItemForEntityType(entityType);
|
return spawner.getItemForEntityType(entityType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,16 +36,14 @@ public class IcyBow extends SlimefunBow {
|
|||||||
@Override
|
@Override
|
||||||
public BowShootHandler onShoot() {
|
public BowShootHandler onShoot() {
|
||||||
return (e, n) -> {
|
return (e, n) -> {
|
||||||
if (n instanceof Player) {
|
if (n instanceof Player player) {
|
||||||
Player p = (Player) n;
|
|
||||||
|
|
||||||
// Fixes #3060 - Don't apply effects if the arrow was successfully blocked.
|
// Fixes #3060 - Don't apply effects if the arrow was successfully blocked.
|
||||||
if (p.isBlocking() && e.getFinalDamage() <= 0) {
|
if (player.isBlocking() && e.getFinalDamage() <= 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_17)) {
|
if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_17)) {
|
||||||
p.setFreezeTicks(60);
|
player.setFreezeTicks(60);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
n.getWorld().playEffect(n.getLocation(), Effect.STEP_SOUND, Material.ICE);
|
n.getWorld().playEffect(n.getLocation(), Effect.STEP_SOUND, Material.ICE);
|
||||||
|
@ -92,7 +92,7 @@ public class AutoCrafterListener implements Listener {
|
|||||||
@ParametersAreNonnullByDefault
|
@ParametersAreNonnullByDefault
|
||||||
private boolean hasUnlockedRecipe(Player p, ItemStack item) {
|
private boolean hasUnlockedRecipe(Player p, ItemStack item) {
|
||||||
for (Recipe recipe : Slimefun.getMinecraftRecipeService().getRecipesFor(item)) {
|
for (Recipe recipe : Slimefun.getMinecraftRecipeService().getRecipesFor(item)) {
|
||||||
if (recipe instanceof Keyed && !p.hasDiscoveredRecipe(((Keyed) recipe).getKey())) {
|
if (recipe instanceof Keyed keyed && !p.hasDiscoveredRecipe(keyed.getKey())) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -94,12 +94,12 @@ public class BackpackListener implements Listener {
|
|||||||
if (item != null) {
|
if (item != null) {
|
||||||
SlimefunItem backpack = SlimefunItem.getByItem(item);
|
SlimefunItem backpack = SlimefunItem.getByItem(item);
|
||||||
|
|
||||||
if (backpack instanceof SlimefunBackpack) {
|
if (backpack instanceof SlimefunBackpack slimefunBackpack) {
|
||||||
if (e.getClick() == ClickType.NUMBER_KEY) {
|
if (e.getClick() == ClickType.NUMBER_KEY) {
|
||||||
if (e.getClickedInventory().getType() != InventoryType.PLAYER) {
|
if (e.getClickedInventory().getType() != InventoryType.PLAYER) {
|
||||||
ItemStack hotbarItem = e.getWhoClicked().getInventory().getItem(e.getHotbarButton());
|
ItemStack hotbarItem = e.getWhoClicked().getInventory().getItem(e.getHotbarButton());
|
||||||
|
|
||||||
if (!isAllowed((SlimefunBackpack) backpack, hotbarItem)) {
|
if (!isAllowed(slimefunBackpack, hotbarItem)) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -107,10 +107,10 @@ public class BackpackListener implements Listener {
|
|||||||
// Fixes #3265
|
// Fixes #3265
|
||||||
ItemStack offHandItem = e.getWhoClicked().getInventory().getItemInOffHand();
|
ItemStack offHandItem = e.getWhoClicked().getInventory().getItemInOffHand();
|
||||||
|
|
||||||
if (!isAllowed((SlimefunBackpack) backpack, offHandItem)) {
|
if (!isAllowed(slimefunBackpack, offHandItem)) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
}
|
}
|
||||||
} else if (!isAllowed((SlimefunBackpack) backpack, e.getCurrentItem())) {
|
} else if (!isAllowed(slimefunBackpack, e.getCurrentItem())) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -49,8 +49,8 @@ public class ButcherAndroidListener implements Listener {
|
|||||||
|
|
||||||
// Collect any nearby dropped items
|
// Collect any nearby dropped items
|
||||||
for (Entity n : e.getEntity().getNearbyEntities(0.5D, 0.5D, 0.5D)) {
|
for (Entity n : e.getEntity().getNearbyEntities(0.5D, 0.5D, 0.5D)) {
|
||||||
if (n instanceof Item && n.isValid() && !SlimefunUtils.hasNoPickupFlag((Item) n)) {
|
if (n instanceof Item item && n.isValid() && !SlimefunUtils.hasNoPickupFlag(item)) {
|
||||||
items.add(((Item) n).getItemStack());
|
items.add(item.getItemStack());
|
||||||
n.remove();
|
n.remove();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -49,19 +49,17 @@ public class CoolerListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onHungerLoss(FoodLevelChangeEvent e) {
|
public void onHungerLoss(FoodLevelChangeEvent e) {
|
||||||
if (e.getEntity() instanceof Player) {
|
if (e.getEntity() instanceof Player player) {
|
||||||
Player p = (Player) e.getEntity();
|
if (e.getFoodLevel() < player.getFoodLevel()) {
|
||||||
|
checkAndConsume(player);
|
||||||
if (e.getFoodLevel() < p.getFoodLevel()) {
|
|
||||||
checkAndConsume(p);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onHungerDamage(EntityDamageEvent e) {
|
public void onHungerDamage(EntityDamageEvent e) {
|
||||||
if (e.getEntity() instanceof Player && e.getCause() == DamageCause.STARVATION) {
|
if (e.getEntity() instanceof Player player && e.getCause() == DamageCause.STARVATION) {
|
||||||
checkAndConsume((Player) e.getEntity());
|
checkAndConsume(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -168,8 +168,7 @@ public class DebugFishListener implements Listener {
|
|||||||
p.sendMessage(ChatColors.color(" &dChunk Timings: &e" + Slimefun.getProfiler().getTime(b.getChunk())));
|
p.sendMessage(ChatColors.color(" &dChunk Timings: &e" + Slimefun.getProfiler().getTime(b.getChunk())));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item instanceof EnergyNetComponent) {
|
if (item instanceof EnergyNetComponent component) {
|
||||||
EnergyNetComponent component = (EnergyNetComponent) item;
|
|
||||||
p.sendMessage(ChatColors.color("&dEnergyNet Component"));
|
p.sendMessage(ChatColors.color("&dEnergyNet Component"));
|
||||||
p.sendMessage(ChatColors.color(" &dType: &e" + component.getEnergyComponentType()));
|
p.sendMessage(ChatColors.color(" &dType: &e" + component.getEnergyComponentType()));
|
||||||
|
|
||||||
|
@ -46,8 +46,7 @@ public class DispenserListener implements Listener {
|
|||||||
machine.callItemHandler(BlockDispenseHandler.class, handler -> {
|
machine.callItemHandler(BlockDispenseHandler.class, handler -> {
|
||||||
BlockState state = PaperLib.getBlockState(b, false).getState();
|
BlockState state = PaperLib.getBlockState(b, false).getState();
|
||||||
|
|
||||||
if (state instanceof Dispenser) {
|
if (state instanceof Dispenser dispenser) {
|
||||||
Dispenser dispenser = (Dispenser) state;
|
|
||||||
BlockFace face = ((Directional) b.getBlockData()).getFacing();
|
BlockFace face = ((Directional) b.getBlockData()).getFacing();
|
||||||
Block block = b.getRelative(face);
|
Block block = b.getRelative(face);
|
||||||
handler.onBlockDispense(e, dispenser, block, machine);
|
handler.onBlockDispense(e, dispenser, block, machine);
|
||||||
|
@ -60,8 +60,8 @@ public class ElytraImpactListener implements Listener {
|
|||||||
e.setDamage(0);
|
e.setDamage(0);
|
||||||
p.playSound(p.getLocation(), Sound.BLOCK_STONE_HIT, 20, 1);
|
p.playSound(p.getLocation(), Sound.BLOCK_STONE_HIT, 20, 1);
|
||||||
|
|
||||||
if (item instanceof DamageableItem) {
|
if (item instanceof DamageableItem damageableItem) {
|
||||||
((DamageableItem) item).damageItem(p, p.getInventory().getHelmet());
|
damageableItem.damageItem(p, p.getInventory().getHelmet());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -70,8 +70,8 @@ public class GadgetsListener implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (chestplate instanceof Jetpack) {
|
if (chestplate instanceof Jetpack jetpack) {
|
||||||
double thrust = ((Jetpack) chestplate).getThrust();
|
double thrust = jetpack.getThrust();
|
||||||
|
|
||||||
if (thrust > 0.2) {
|
if (thrust > 0.2) {
|
||||||
new JetpackTask(p, (Jetpack) chestplate).scheduleRepeating(0, 3);
|
new JetpackTask(p, (Jetpack) chestplate).scheduleRepeating(0, 3);
|
||||||
@ -82,8 +82,8 @@ public class GadgetsListener implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void handleBoots(@Nonnull Player p, @Nullable SlimefunItem boots) {
|
private void handleBoots(@Nonnull Player p, @Nullable SlimefunItem boots) {
|
||||||
if (boots instanceof JetBoots && boots.canUse(p, true)) {
|
if (boots instanceof JetBoots jetBoots && boots.canUse(p, true)) {
|
||||||
double speed = ((JetBoots) boots).getSpeed();
|
double speed = jetBoots.getSpeed();
|
||||||
|
|
||||||
if (speed > 0.2) {
|
if (speed > 0.2) {
|
||||||
new JetBootsTask(p, (JetBoots) boots).scheduleRepeating(0, 2);
|
new JetBootsTask(p, (JetBoots) boots).scheduleRepeating(0, 2);
|
||||||
|
@ -61,8 +61,8 @@ public class GrapplingHookListener implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.getDamager() instanceof Arrow) {
|
if (e.getDamager() instanceof Arrow arrow) {
|
||||||
handleGrapplingHook((Arrow) e.getDamager());
|
handleGrapplingHook(arrow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -73,8 +73,8 @@ public class GrapplingHookListener implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Slimefun.runSync(() -> {
|
Slimefun.runSync(() -> {
|
||||||
if (e.getEntity() instanceof Arrow) {
|
if (e.getEntity() instanceof Arrow arrow) {
|
||||||
handleGrapplingHook((Arrow) e.getEntity());
|
handleGrapplingHook(arrow);
|
||||||
}
|
}
|
||||||
}, 2L);
|
}, 2L);
|
||||||
}
|
}
|
||||||
@ -86,8 +86,8 @@ public class GrapplingHookListener implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// This is called when the arrow shoots off a painting or an item frame
|
// This is called when the arrow shoots off a painting or an item frame
|
||||||
if (e.getRemover() instanceof Arrow) {
|
if (e.getRemover() instanceof Arrow arrow) {
|
||||||
handleGrapplingHook((Arrow) e.getRemover());
|
handleGrapplingHook(arrow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -130,8 +130,8 @@ public class GrapplingHookListener implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.getEntity() instanceof Arrow) {
|
if (e.getEntity() instanceof Arrow arrow) {
|
||||||
handleGrapplingHook((Arrow) e.getEntity());
|
handleGrapplingHook(arrow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -153,9 +153,8 @@ public class GrapplingHookListener implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void handleGrapplingHook(@Nullable Arrow arrow) {
|
private void handleGrapplingHook(@Nullable Arrow arrow) {
|
||||||
if (arrow != null && arrow.isValid() && arrow.getShooter() instanceof Player) {
|
if (arrow != null && arrow.isValid() && arrow.getShooter() instanceof Player player) {
|
||||||
Player p = (Player) arrow.getShooter();
|
GrapplingHookEntity hook = activeHooks.get(player.getUniqueId());
|
||||||
GrapplingHookEntity hook = activeHooks.get(p.getUniqueId());
|
|
||||||
|
|
||||||
if (hook != null) {
|
if (hook != null) {
|
||||||
Location target = arrow.getLocation();
|
Location target = arrow.getLocation();
|
||||||
@ -163,14 +162,14 @@ public class GrapplingHookListener implements Listener {
|
|||||||
|
|
||||||
Vector velocity = new Vector(0.0, 0.2, 0.0);
|
Vector velocity = new Vector(0.0, 0.2, 0.0);
|
||||||
|
|
||||||
if (p.getLocation().distance(target) < 3.0) {
|
if (player.getLocation().distance(target) < 3.0) {
|
||||||
if (target.getY() <= p.getLocation().getY()) {
|
if (target.getY() <= player.getLocation().getY()) {
|
||||||
velocity = target.toVector().subtract(p.getLocation().toVector());
|
velocity = target.toVector().subtract(player.getLocation().toVector());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Location l = p.getLocation();
|
Location l = player.getLocation();
|
||||||
l.setY(l.getY() + 0.5);
|
l.setY(l.getY() + 0.5);
|
||||||
p.teleport(l);
|
player.teleport(l);
|
||||||
|
|
||||||
double g = -0.08;
|
double g = -0.08;
|
||||||
double d = target.distance(l);
|
double d = target.distance(l);
|
||||||
@ -179,16 +178,16 @@ public class GrapplingHookListener implements Listener {
|
|||||||
double vY = (1.0 + 0.04 * t) * (target.getY() - l.getY()) / t - 0.5D * g * t;
|
double vY = (1.0 + 0.04 * t) * (target.getY() - l.getY()) / t - 0.5D * g * t;
|
||||||
double vZ = (1.0 + 0.08 * t) * (target.getZ() - l.getZ()) / t;
|
double vZ = (1.0 + 0.08 * t) * (target.getZ() - l.getZ()) / t;
|
||||||
|
|
||||||
velocity = p.getVelocity();
|
velocity = player.getVelocity();
|
||||||
velocity.setX(vX);
|
velocity.setX(vX);
|
||||||
velocity.setY(vY);
|
velocity.setY(vY);
|
||||||
velocity.setZ(vZ);
|
velocity.setZ(vZ);
|
||||||
}
|
}
|
||||||
|
|
||||||
p.setVelocity(velocity);
|
player.setVelocity(velocity);
|
||||||
|
|
||||||
hook.remove();
|
hook.remove();
|
||||||
Slimefun.runSync(() -> activeHooks.remove(p.getUniqueId()), 20L);
|
Slimefun.runSync(() -> activeHooks.remove(player.getUniqueId()), 20L);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -68,9 +68,9 @@ public class SlimefunBootsListener implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (boots instanceof StomperBoots) {
|
if (boots instanceof StomperBoots stomperBoots) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
((StomperBoots) boots).stomp(e);
|
stomperBoots.stomp(e);
|
||||||
} else if (boots instanceof LongFallBoots) {
|
} else if (boots instanceof LongFallBoots) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
|
|
||||||
|
@ -55,8 +55,8 @@ public class SlimefunBowListener implements Listener {
|
|||||||
if (e.getEntity() instanceof Player && e.getProjectile() instanceof Arrow) {
|
if (e.getEntity() instanceof Player && e.getProjectile() instanceof Arrow) {
|
||||||
SlimefunItem bow = SlimefunItem.getByItem(e.getBow());
|
SlimefunItem bow = SlimefunItem.getByItem(e.getBow());
|
||||||
|
|
||||||
if (bow instanceof SlimefunBow) {
|
if (bow instanceof SlimefunBow slimefunBow) {
|
||||||
projectiles.put(e.getProjectile().getUniqueId(), (SlimefunBow) bow);
|
projectiles.put(e.getProjectile().getUniqueId(), slimefunBow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -99,8 +99,8 @@ public class TalismanListener implements Listener {
|
|||||||
Talisman.trigger(e, SlimefunItems.TALISMAN_WARRIOR);
|
Talisman.trigger(e, SlimefunItems.TALISMAN_WARRIOR);
|
||||||
break;
|
break;
|
||||||
case PROJECTILE:
|
case PROJECTILE:
|
||||||
if (e instanceof EntityDamageByEntityEvent) {
|
if (e instanceof EntityDamageByEntityEvent entityDamageByEntityEvent) {
|
||||||
onProjectileDamage((EntityDamageByEntityEvent) e);
|
onProjectileDamage(entityDamageByEntityEvent);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@ -111,9 +111,7 @@ public class TalismanListener implements Listener {
|
|||||||
|
|
||||||
private void onProjectileDamage(@Nonnull EntityDamageByEntityEvent e) {
|
private void onProjectileDamage(@Nonnull EntityDamageByEntityEvent e) {
|
||||||
// "Fixes" #1022 - We just ignore Tridents now.
|
// "Fixes" #1022 - We just ignore Tridents now.
|
||||||
if (e.getDamager() instanceof Projectile && !(e.getDamager() instanceof Trident)) {
|
if (e.getDamager() instanceof Projectile projectile && !(e.getDamager() instanceof Trident)) {
|
||||||
Projectile projectile = (Projectile) e.getDamager();
|
|
||||||
|
|
||||||
if (Talisman.trigger(e, SlimefunItems.TALISMAN_WHIRLWIND)) {
|
if (Talisman.trigger(e, SlimefunItems.TALISMAN_WHIRLWIND)) {
|
||||||
Player p = (Player) e.getEntity();
|
Player p = (Player) e.getEntity();
|
||||||
returnProjectile(p, projectile);
|
returnProjectile(p, projectile);
|
||||||
@ -138,8 +136,7 @@ public class TalismanListener implements Listener {
|
|||||||
returnedProjectile.setShooter(projectile.getShooter());
|
returnedProjectile.setShooter(projectile.getShooter());
|
||||||
returnedProjectile.setVelocity(direction);
|
returnedProjectile.setVelocity(direction);
|
||||||
|
|
||||||
if (projectile instanceof AbstractArrow) {
|
if (projectile instanceof AbstractArrow firedArrow) {
|
||||||
AbstractArrow firedArrow = (AbstractArrow) projectile;
|
|
||||||
AbstractArrow returnedArrow = (AbstractArrow) returnedProjectile;
|
AbstractArrow returnedArrow = (AbstractArrow) returnedProjectile;
|
||||||
|
|
||||||
returnedArrow.setDamage(firedArrow.getDamage());
|
returnedArrow.setDamage(firedArrow.getDamage());
|
||||||
@ -188,14 +185,12 @@ public class TalismanListener implements Listener {
|
|||||||
List<ItemStack> items = new ArrayList<>(drops);
|
List<ItemStack> items = new ArrayList<>(drops);
|
||||||
|
|
||||||
// Prevent duplication of items stored inside a Horse's chest
|
// Prevent duplication of items stored inside a Horse's chest
|
||||||
if (entity instanceof ChestedHorse) {
|
if (entity instanceof ChestedHorse chestedHorse) {
|
||||||
ChestedHorse horse = (ChestedHorse) entity;
|
if (chestedHorse.isCarryingChest()) {
|
||||||
|
|
||||||
if (horse.isCarryingChest()) {
|
|
||||||
// The chest is not included in getStorageContents()
|
// The chest is not included in getStorageContents()
|
||||||
items.remove(new ItemStack(Material.CHEST));
|
items.remove(new ItemStack(Material.CHEST));
|
||||||
|
|
||||||
for (ItemStack item : horse.getInventory().getStorageContents()) {
|
for (ItemStack item : chestedHorse.getInventory().getStorageContents()) {
|
||||||
items.remove(item);
|
items.remove(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -252,8 +247,8 @@ public class TalismanListener implements Listener {
|
|||||||
ItemStack item = e.getBrokenItem().clone();
|
ItemStack item = e.getBrokenItem().clone();
|
||||||
ItemMeta meta = item.getItemMeta();
|
ItemMeta meta = item.getItemMeta();
|
||||||
|
|
||||||
if (meta instanceof Damageable) {
|
if (meta instanceof Damageable damageable) {
|
||||||
((Damageable) meta).setDamage(0);
|
damageable.setDamage(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
item.setItemMeta(meta);
|
item.setItemMeta(meta);
|
||||||
|
@ -64,7 +64,7 @@ public class TeleporterListener implements Listener {
|
|||||||
// Pressure plate was an elevator
|
// Pressure plate was an elevator
|
||||||
ElevatorPlate elevator = SlimefunItems.ELEVATOR_PLATE.getItem(ElevatorPlate.class);
|
ElevatorPlate elevator = SlimefunItems.ELEVATOR_PLATE.getItem(ElevatorPlate.class);
|
||||||
elevator.openInterface(p, b);
|
elevator.openInterface(p, b);
|
||||||
} else if (item instanceof AbstractTeleporterPlate && ((AbstractTeleporterPlate) item).hasAccess(p, b)) {
|
} else if (item instanceof AbstractTeleporterPlate abstractTeleporterPlate && abstractTeleporterPlate.hasAccess(p, b)) {
|
||||||
// Pressure plate was a teleporter
|
// Pressure plate was a teleporter
|
||||||
SlimefunItem teleporter = BlockStorage.check(b.getRelative(BlockFace.DOWN));
|
SlimefunItem teleporter = BlockStorage.check(b.getRelative(BlockFace.DOWN));
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ public class AnvilListener implements SlimefunCraftingListener {
|
|||||||
|
|
||||||
if (hasUnallowedItems(item1, item2)) {
|
if (hasUnallowedItems(item1, item2)) {
|
||||||
e.setResult(Result.DENY);
|
e.setResult(Result.DENY);
|
||||||
Slimefun.getLocalization().sendMessage((Player) e.getWhoClicked(), "anvil.not-working", true);
|
Slimefun.getLocalization().sendMessage(e.getWhoClicked(), "anvil.not-working", true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -34,7 +34,7 @@ public class CartographyTableListener implements SlimefunCraftingListener {
|
|||||||
|
|
||||||
if (hasUnallowedItems(item1, item2)) {
|
if (hasUnallowedItems(item1, item2)) {
|
||||||
e.setResult(Result.DENY);
|
e.setResult(Result.DENY);
|
||||||
Slimefun.getLocalization().sendMessage((Player) e.getWhoClicked(), "cartography_table.not-working", true);
|
Slimefun.getLocalization().sendMessage(e.getWhoClicked(), "cartography_table.not-working", true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,15 +28,14 @@ public class FireworksListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onResearchFireworkDamage(EntityDamageByEntityEvent e) {
|
public void onResearchFireworkDamage(EntityDamageByEntityEvent e) {
|
||||||
if (e.getDamager() instanceof Firework) {
|
if (e.getDamager() instanceof Firework firework) {
|
||||||
Firework firework = (Firework) e.getDamager();
|
|
||||||
FireworkMeta meta = firework.getFireworkMeta();
|
FireworkMeta meta = firework.getFireworkMeta();
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* We could use Peristent Data for this in the future, but ItemMeta display names
|
We could use Peristent Data for this in the future, but ItemMeta display names
|
||||||
* work pretty reliably too and they don't cause any memory leaks like metadata.
|
work pretty reliably too and they don't cause any memory leaks like metadata.
|
||||||
*
|
|
||||||
* Entity display names do not work either as Firework cannot be named.
|
Entity display names do not work either as Firework cannot be named.
|
||||||
*/
|
*/
|
||||||
if (meta.hasDisplayName() && meta.getDisplayName().equals(ChatColor.GREEN + "Slimefun Research")) {
|
if (meta.hasDisplayName() && meta.getDisplayName().equals(ChatColor.GREEN + "Slimefun Research")) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
|
@ -67,16 +67,16 @@ public class MobDropListener implements Listener {
|
|||||||
if (sfItem == null) {
|
if (sfItem == null) {
|
||||||
return true;
|
return true;
|
||||||
} else if (sfItem.canUse(p, true)) {
|
} else if (sfItem.canUse(p, true)) {
|
||||||
if (sfItem instanceof RandomMobDrop) {
|
if (sfItem instanceof RandomMobDrop randomMobDrop) {
|
||||||
int random = ThreadLocalRandom.current().nextInt(100);
|
int random = ThreadLocalRandom.current().nextInt(100);
|
||||||
|
|
||||||
if (((RandomMobDrop) sfItem).getMobDropChance() <= random) {
|
if (randomMobDrop.getMobDropChance() <= random) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sfItem instanceof BasicCircuitBoard) {
|
if (sfItem instanceof BasicCircuitBoard basicCircuitBoard) {
|
||||||
return ((BasicCircuitBoard) sfItem).isDroppedFromGolems();
|
return basicCircuitBoard.isDroppedFromGolems();
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -90,8 +90,8 @@ public class PiglinListener implements Listener {
|
|||||||
SlimefunItem sfi = SlimefunItem.getByItem(is);
|
SlimefunItem sfi = SlimefunItem.getByItem(is);
|
||||||
// Check the getBarteringLootChance and compare against a random number 0-100,
|
// Check the getBarteringLootChance and compare against a random number 0-100,
|
||||||
// if the random number is greater then replace the item.
|
// if the random number is greater then replace the item.
|
||||||
if (sfi instanceof PiglinBarterDrop) {
|
if (sfi instanceof PiglinBarterDrop piglinBarterDrop) {
|
||||||
int chance = ((PiglinBarterDrop) sfi).getBarteringLootChance();
|
int chance = piglinBarterDrop.getBarteringLootChance();
|
||||||
|
|
||||||
if (chance < 1 || chance >= 100) {
|
if (chance < 1 || chance >= 100) {
|
||||||
sfi.warn("The Piglin Bartering chance must be between 1-99% on item: " + sfi.getId());
|
sfi.warn("The Piglin Bartering chance must be between 1-99% on item: " + sfi.getId());
|
||||||
|
@ -36,9 +36,9 @@ public class WitherListener implements Listener {
|
|||||||
SlimefunItem item = BlockStorage.check(e.getBlock());
|
SlimefunItem item = BlockStorage.check(e.getBlock());
|
||||||
|
|
||||||
// Hardened Glass is excluded from here
|
// Hardened Glass is excluded from here
|
||||||
if (item instanceof WitherProof && !item.getId().equals(SlimefunItems.HARDENED_GLASS.getItemId())) {
|
if (item instanceof WitherProof witherProof && !item.getId().equals(SlimefunItems.HARDENED_GLASS.getItemId())) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
((WitherProof) item).onAttack(e.getBlock(), (Wither) e.getEntity());
|
witherProof.onAttack(e.getBlock(), (Wither) e.getEntity());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -193,9 +193,7 @@ public final class PostSetup {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (SlimefunItem item : Slimefun.getRegistry().getEnabledSlimefunItems()) {
|
for (SlimefunItem item : Slimefun.getRegistry().getEnabledSlimefunItems()) {
|
||||||
if (item instanceof AContainer) {
|
if (item instanceof AContainer machine) {
|
||||||
AContainer machine = (AContainer) item;
|
|
||||||
|
|
||||||
if (machine.getMachineIdentifier().equals("ELECTRIC_SMELTERY")) {
|
if (machine.getMachineIdentifier().equals("ELECTRIC_SMELTERY")) {
|
||||||
List<MachineRecipe> recipes = machine.getMachineRecipes();
|
List<MachineRecipe> recipes = machine.getMachineRecipes();
|
||||||
Collections.sort(recipes, Comparator.comparingInt(recipe -> recipe == null ? 0 : -recipe.getInput().length));
|
Collections.sort(recipes, Comparator.comparingInt(recipe -> recipe == null ? 0 : -recipe.getInput().length));
|
||||||
@ -233,12 +231,8 @@ public final class PostSetup {
|
|||||||
|
|
||||||
private static void registerMachineRecipe(String machine, int seconds, ItemStack[] input, ItemStack[] output) {
|
private static void registerMachineRecipe(String machine, int seconds, ItemStack[] input, ItemStack[] output) {
|
||||||
for (SlimefunItem item : Slimefun.getRegistry().getEnabledSlimefunItems()) {
|
for (SlimefunItem item : Slimefun.getRegistry().getEnabledSlimefunItems()) {
|
||||||
if (item instanceof AContainer) {
|
if (item instanceof AContainer container && container.getMachineIdentifier().equals(machine)) {
|
||||||
AContainer container = (AContainer) item;
|
container.registerRecipe(seconds, input, output);
|
||||||
|
|
||||||
if (container.getMachineIdentifier().equals(machine)) {
|
|
||||||
container.registerRecipe(seconds, input, output);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -137,8 +137,8 @@ public class ArmorTask implements Runnable {
|
|||||||
|
|
||||||
SlimefunItem item = SlimefunItem.getByItem(helmet);
|
SlimefunItem item = SlimefunItem.getByItem(helmet);
|
||||||
|
|
||||||
if (item instanceof SolarHelmet && item.canUse(p, true)) {
|
if (item instanceof SolarHelmet solarHelmet && item.canUse(p, true)) {
|
||||||
((SolarHelmet) item).rechargeItems(p);
|
solarHelmet.rechargeItems(p);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,9 +48,7 @@ public class InfusedMagnetTask extends AbstractPlayerTask {
|
|||||||
boolean playSound = false;
|
boolean playSound = false;
|
||||||
|
|
||||||
for (Entity n : p.getNearbyEntities(radius, radius, radius)) {
|
for (Entity n : p.getNearbyEntities(radius, radius, radius)) {
|
||||||
if (n instanceof Item) {
|
if (n instanceof Item item) {
|
||||||
Item item = (Item) n;
|
|
||||||
|
|
||||||
if (!SlimefunUtils.hasNoPickupFlag(item) && item.getPickupDelay() <= 0 && p.getLocation().distanceSquared(item.getLocation()) > 0.3) {
|
if (!SlimefunUtils.hasNoPickupFlag(item) && item.getPickupDelay() <= 0 && p.getLocation().distanceSquared(item.getLocation()) > 0.3) {
|
||||||
item.teleport(p.getLocation());
|
item.teleport(p.getLocation());
|
||||||
playSound = true;
|
playSound = true;
|
||||||
|
@ -41,7 +41,7 @@ class ClearLagIntegration implements Listener {
|
|||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
Entity n = iterator.next();
|
Entity n = iterator.next();
|
||||||
|
|
||||||
if (n instanceof Item && SlimefunUtils.hasNoPickupFlag((Item) n)) {
|
if (n instanceof Item item && SlimefunUtils.hasNoPickupFlag(item)) {
|
||||||
iterator.remove();
|
iterator.remove();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -82,8 +82,8 @@ class PlaceholderAPIIntegration extends PlaceholderExpansion {
|
|||||||
if (profile.isPresent()) {
|
if (profile.isPresent()) {
|
||||||
Stream<Research> stream = profile.get().getResearches().stream();
|
Stream<Research> stream = profile.get().getResearches().stream();
|
||||||
return String.valueOf(stream.mapToInt(Research::getCost).sum());
|
return String.valueOf(stream.mapToInt(Research::getCost).sum());
|
||||||
} else if (p instanceof Player) {
|
} else if (p instanceof Player player) {
|
||||||
return getProfilePlaceholder((Player) p);
|
return getProfilePlaceholder(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,8 +93,8 @@ class PlaceholderAPIIntegration extends PlaceholderExpansion {
|
|||||||
if (profile.isPresent()) {
|
if (profile.isPresent()) {
|
||||||
Set<Research> set = profile.get().getResearches();
|
Set<Research> set = profile.get().getResearches();
|
||||||
return String.valueOf(set.size());
|
return String.valueOf(set.size());
|
||||||
} else if (p instanceof Player) {
|
} else if (p instanceof Player player) {
|
||||||
return getProfilePlaceholder((Player) p);
|
return getProfilePlaceholder(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -108,8 +108,8 @@ class PlaceholderAPIIntegration extends PlaceholderExpansion {
|
|||||||
if (profile.isPresent()) {
|
if (profile.isPresent()) {
|
||||||
Set<Research> set = profile.get().getResearches();
|
Set<Research> set = profile.get().getResearches();
|
||||||
return String.valueOf(Math.round(((set.size() * 100.0F) / Slimefun.getRegistry().getResearches().size()) * 100.0F) / 100.0F);
|
return String.valueOf(Math.round(((set.size() * 100.0F) / Slimefun.getRegistry().getResearches().size()) * 100.0F) / 100.0F);
|
||||||
} else if (p instanceof Player) {
|
} else if (p instanceof Player player) {
|
||||||
return getProfilePlaceholder((Player) p);
|
return getProfilePlaceholder(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -118,8 +118,8 @@ class PlaceholderAPIIntegration extends PlaceholderExpansion {
|
|||||||
|
|
||||||
if (profile.isPresent()) {
|
if (profile.isPresent()) {
|
||||||
return profile.get().getTitle();
|
return profile.get().getTitle();
|
||||||
} else if (p instanceof Player) {
|
} else if (p instanceof Player player) {
|
||||||
return getProfilePlaceholder((Player) p);
|
return getProfilePlaceholder(player);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,8 +131,7 @@ class PlaceholderAPIIntegration extends PlaceholderExpansion {
|
|||||||
return Slimefun.getProfiler().getTime();
|
return Slimefun.getProfiler().getTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isPlaceholder(p, false, params, "language") && p instanceof Player) {
|
if (isPlaceholder(p, false, params, "language") && p instanceof Player player) {
|
||||||
Player player = (Player) p;
|
|
||||||
return Slimefun.getLocalization().getLanguage(player).getName(player);
|
return Slimefun.getLocalization().getLanguage(player).getName(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -132,8 +132,8 @@ public final class ItemStackWrapper extends ItemStack {
|
|||||||
public static @Nonnull ItemStackWrapper wrap(@Nonnull ItemStack itemStack) {
|
public static @Nonnull ItemStackWrapper wrap(@Nonnull ItemStack itemStack) {
|
||||||
Validate.notNull(itemStack, "The ItemStack cannot be null!");
|
Validate.notNull(itemStack, "The ItemStack cannot be null!");
|
||||||
|
|
||||||
if (itemStack instanceof ItemStackWrapper) {
|
if (itemStack instanceof ItemStackWrapper itemStackWrapper) {
|
||||||
return (ItemStackWrapper) itemStack;
|
return itemStackWrapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
return new ItemStackWrapper(itemStack);
|
return new ItemStackWrapper(itemStack);
|
||||||
|
@ -106,7 +106,7 @@ public class TagParser implements Keyed {
|
|||||||
JsonArray values = child.getAsJsonArray();
|
JsonArray values = child.getAsJsonArray();
|
||||||
|
|
||||||
for (JsonElement element : values) {
|
for (JsonElement element : values) {
|
||||||
if (element instanceof JsonPrimitive && ((JsonPrimitive) element).isString()) {
|
if (element instanceof JsonPrimitive jsonPrimitive && jsonPrimitive.isString()) {
|
||||||
// Strings will be parsed directly
|
// Strings will be parsed directly
|
||||||
parsePrimitiveValue(element.getAsString(), materials, tags, true);
|
parsePrimitiveValue(element.getAsString(), materials, tags, true);
|
||||||
} else if (element instanceof JsonObject) {
|
} else if (element instanceof JsonObject) {
|
||||||
@ -182,7 +182,7 @@ public class TagParser implements Keyed {
|
|||||||
JsonElement required = entry.get("required");
|
JsonElement required = entry.get("required");
|
||||||
|
|
||||||
// Check if the entry contains elements of the correct type
|
// Check if the entry contains elements of the correct type
|
||||||
if (id instanceof JsonPrimitive && ((JsonPrimitive) id).isString() && required instanceof JsonPrimitive && ((JsonPrimitive) required).isBoolean()) {
|
if (id instanceof JsonPrimitive idJson && idJson.isString() && required instanceof JsonPrimitive requiredJson && requiredJson.isBoolean()) {
|
||||||
boolean isRequired = required.getAsBoolean();
|
boolean isRequired = required.getAsBoolean();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -50,8 +50,8 @@ public class MenuListener implements Listener {
|
|||||||
|
|
||||||
if (handler == null) {
|
if (handler == null) {
|
||||||
e.setCancelled(!menu.isEmptySlotsClickable() && (e.getCurrentItem() == null || e.getCurrentItem().getType() == Material.AIR));
|
e.setCancelled(!menu.isEmptySlotsClickable() && (e.getCurrentItem() == null || e.getCurrentItem().getType() == Material.AIR));
|
||||||
} else if (handler instanceof AdvancedMenuClickHandler) {
|
} else if (handler instanceof AdvancedMenuClickHandler advancedMenuClickHandler) {
|
||||||
e.setCancelled(!((AdvancedMenuClickHandler) handler).onClick(e, (Player) e.getWhoClicked(), e.getSlot(), e.getCursor(), new ClickAction(e.isRightClick(), e.isShiftClick())));
|
e.setCancelled(!advancedMenuClickHandler.onClick(e, (Player) e.getWhoClicked(), e.getSlot(), e.getCursor(), new ClickAction(e.isRightClick(), e.isShiftClick())));
|
||||||
} else {
|
} else {
|
||||||
e.setCancelled(!handler.onClick((Player) e.getWhoClicked(), e.getSlot(), e.getCurrentItem(), new ClickAction(e.isRightClick(), e.isShiftClick())));
|
e.setCancelled(!handler.onClick((Player) e.getWhoClicked(), e.getSlot(), e.getCurrentItem(), new ClickAction(e.isRightClick(), e.isShiftClick())));
|
||||||
}
|
}
|
||||||
|
@ -233,8 +233,7 @@ public abstract class BlockMenuPreset extends ChestMenu {
|
|||||||
menu.addItem(size - 1, null);
|
menu.addItem(size - 1, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (menu instanceof BlockMenu) {
|
if (menu instanceof BlockMenu blockMenu) {
|
||||||
BlockMenu blockMenu = (BlockMenu) menu;
|
|
||||||
newInstance(blockMenu, blockMenu.getLocation());
|
newInstance(blockMenu, blockMenu.getLocation());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user