mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Replaced some deprecated methods.

Browse Source
This commit is contained in:
BuildTools 2019-01-18 20:38:02 +01:00
parent d88eaf9674
commit e950b264d8
2 changed files with 99 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java
View File

@ -412,28 +412,25 @@ public class SlimefunSetup {
if (removing != null) inv.removeItem(removing); if (removing != null) inv.removeItem(removing);
} }
p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_USE, 1, 1); p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_USE, 1, 1);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_USE, 1F, 2F); p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_USE, 1F, 2F);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_USE, 1F, 2F); p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_USE, 1F, 2F);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F);
inv.addItem(adding); inv.addItem(adding);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
else Messages.local.sendTranslation(p, "machines.full-inventory", true); else Messages.local.sendTranslation(p, "machines.full-inventory", true);
} }
@ -515,28 +512,25 @@ public class SlimefunSetup {
removing.setAmount(convert.getAmount()); removing.setAmount(convert.getAmount());
inv.removeItem(removing); inv.removeItem(removing);
p.getWorld().playSound(p.getLocation(), Sound.BLOCK_PISTON_EXTEND, 1, 1); p.getWorld().playSound(p.getLocation(), Sound.BLOCK_PISTON_EXTEND, 1, 1);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playSound(p.getLocation(), Sound.BLOCK_PISTON_CONTRACT, 1F, 2F); p.getWorld().playSound(p.getLocation(), Sound.BLOCK_PISTON_CONTRACT, 1F, 2F);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playSound(p.getLocation(), Sound.BLOCK_PISTON_EXTEND, 1F, 2F); p.getWorld().playSound(p.getLocation(), Sound.BLOCK_PISTON_EXTEND, 1F, 2F);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F);
inv.addItem(adding); inv.addItem(adding);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
else Messages.local.sendTranslation(p, "machines.full-inventory", true); else Messages.local.sendTranslation(p, "machines.full-inventory", true);
return true; return true;
@ -846,24 +840,21 @@ public class SlimefunSetup {
p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4); p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4);
p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4); p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4);
p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4); p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playSound(b.getLocation(), Sound.ENTITY_TNT_PRIMED, 1, 1); p.getWorld().playSound(b.getLocation(), Sound.ENTITY_TNT_PRIMED, 1, 1);
p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4); p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4);
p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4); p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4);
p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4); p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playSound(b.getLocation(), Sound.ENTITY_TNT_PRIMED, 1, 1); p.getWorld().playSound(b.getLocation(), Sound.ENTITY_TNT_PRIMED, 1, 1);
p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4); p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4);
p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4); p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4);
p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4); p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4); p.getWorld().playEffect(b.getRelative(BlockFace.UP).getLocation(), Effect.SMOKE, 4);
@ -872,11 +863,11 @@ public class SlimefunSetup {
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F);
inv.addItem(adding); inv.addItem(adding);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
else Messages.local.sendTranslation(p, "machines.full-inventory", true); else Messages.local.sendTranslation(p, "machines.full-inventory", true);
return true; return true;
@ -1274,22 +1265,19 @@ public class SlimefunSetup {
p.getWorld().playSound(b.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1, 1); p.getWorld().playSound(b.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1, 1);
p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1); p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1);
p.getWorld().playEffect(b.getLocation(), Effect.ENDER_SIGNAL, 1); p.getWorld().playEffect(b.getLocation(), Effect.ENDER_SIGNAL, 1);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playSound(b.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1, 1); p.getWorld().playSound(b.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1, 1);
p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1); p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1);
p.getWorld().playEffect(b.getLocation(), Effect.ENDER_SIGNAL, 1); p.getWorld().playEffect(b.getLocation(), Effect.ENDER_SIGNAL, 1);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playSound(b.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1, 1); p.getWorld().playSound(b.getLocation(), Sound.BLOCK_WOODEN_BUTTON_CLICK_ON, 1, 1);
p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1); p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1);
p.getWorld().playEffect(b.getLocation(), Effect.ENDER_SIGNAL, 1); p.getWorld().playEffect(b.getLocation(), Effect.ENDER_SIGNAL, 1);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1); p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1);
@ -1297,11 +1285,11 @@ public class SlimefunSetup {
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F);
inv.addItem(adding); inv.addItem(adding);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
else Messages.local.sendTranslation(p, "machines.full-inventory", true); else Messages.local.sendTranslation(p, "machines.full-inventory", true);
} }
@ -1976,27 +1964,23 @@ public class SlimefunSetup {
ores.clear(); ores.clear();
if (InvUtils.fits(inv, adding)) { if (InvUtils.fits(inv, adding)) {
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2004,15 +1988,15 @@ public class SlimefunSetup {
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F);
inv.addItem(adding); inv.addItem(adding);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
else Messages.local.sendTranslation(p, "machines.full-inventory", true); else Messages.local.sendTranslation(p, "machines.full-inventory", true);
} }
@ -2073,36 +2057,32 @@ public class SlimefunSetup {
ores.clear(); ores.clear();
if (InvUtils.fits(inv, adding)) { if (InvUtils.fits(inv, adding)) {
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore);
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F);
inv.addItem(adding); inv.addItem(adding);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
}, 20L); }.runTaskLater(SlimefunStartup.instance, 20L);
} }
else Messages.local.sendTranslation(p, "machines.full-inventory", true); else Messages.local.sendTranslation(p, "machines.full-inventory", true);
} }
@ -2155,68 +2135,57 @@ public class SlimefunSetup {
removing.setAmount(convert.getAmount()); removing.setAmount(convert.getAmount());
p.getInventory().removeItem(removing); p.getInventory().removeItem(removing);
final ItemStack adding = RecipeType.getRecipeOutput(machine, convert); final ItemStack adding = RecipeType.getRecipeOutput(machine, convert);
new BukkitRunnable() {
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType()); if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType());
else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK); else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType()); if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType());
else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK); else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType()); if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType());
else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK); else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType()); if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType());
else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK); else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType()); if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType());
else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK); else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType()); if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType());
else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK); else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType()); if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType());
else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK); else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType()); if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType());
else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK); else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType()); if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType());
else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK); else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType()); if (input.getType().isBlock()) b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType());
else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK); else b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, Material.HAY_BLOCK);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2225,27 +2194,27 @@ public class SlimefunSetup {
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F);
b.getWorld().dropItemNaturally(b.getRelative(BlockFace.UP).getLocation(), adding); b.getWorld().dropItemNaturally(b.getRelative(BlockFace.UP).getLocation(), adding);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
return true; return true;
} }
} }
@ -2335,32 +2304,27 @@ public class SlimefunSetup {
if (input != null) { if (input != null) {
if (input.getType() == Material.GRAVEL) { if (input.getType() == Material.GRAVEL) {
PlayerInventory.consumeItemInHand(p); PlayerInventory.consumeItemInHand(p);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL); b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL); b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL); b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL); b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL); b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2368,17 +2332,17 @@ public class SlimefunSetup {
if (drop != null) b.getWorld().dropItemNaturally(b.getLocation(), drop); if (drop != null) b.getWorld().dropItemNaturally(b.getLocation(), drop);
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 1F, 1F);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
} }
}, 30L); }.runTaskLater(SlimefunStartup.instance, 30L);
return true; return true;
} }
} }
@ -2504,7 +2468,7 @@ public class SlimefunSetup {
removing.setAmount(convert.getAmount()); removing.setAmount(convert.getAmount());
p.getInventory().removeItem(removing); p.getInventory().removeItem(removing);
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2522,7 +2486,7 @@ public class SlimefunSetup {
block.setBlockData(le, false); block.setBlockData(le, false);
block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F);
} }
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2540,7 +2504,7 @@ public class SlimefunSetup {
block.setBlockData(le, false); block.setBlockData(le, false);
block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F);
} }
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2558,7 +2522,7 @@ public class SlimefunSetup {
block.setBlockData(le, false); block.setBlockData(le, false);
block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F);
} }
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2576,7 +2540,7 @@ public class SlimefunSetup {
block.setBlockData(le, false); block.setBlockData(le, false);
block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F);
} }
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2594,7 +2558,7 @@ public class SlimefunSetup {
block.setBlockData(le, false); block.setBlockData(le, false);
block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F);
} }
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2612,7 +2576,7 @@ public class SlimefunSetup {
block.setBlockData(le, false); block.setBlockData(le, false);
block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F);
} }
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2630,7 +2594,7 @@ public class SlimefunSetup {
block.setBlockData(le, false); block.setBlockData(le, false);
block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F);
} }
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -2649,21 +2613,21 @@ public class SlimefunSetup {
block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F);
} }
} }
}, 50L); }.runTaskLater(SlimefunStartup.instance, 50L);
} }
}, 50L); }.runTaskLater(SlimefunStartup.instance, 50L);
} }
}, 50L); }.runTaskLater(SlimefunStartup.instance, 50L);
} }
}, 50L); }.runTaskLater(SlimefunStartup.instance, 50L);
} }
}, 50L); }.runTaskLater(SlimefunStartup.instance, 50L);
} }
}, 50L); }.runTaskLater(SlimefunStartup.instance, 50L);
} }
}, 50L); }.runTaskLater(SlimefunStartup.instance, 50L);
} }
}, 50L); }.runTaskLater(SlimefunStartup.instance, 50L);
return true; return true;
} }
} }
@ -3054,12 +3018,12 @@ public class SlimefunSetup {
block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, e.getItem().getType()); block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, e.getItem().getType());
if (d.getInventory().containsAtLeast(e.getItem(), 2)) d.getInventory().removeItem(new CustomItem(e.getItem(), 1)); if (d.getInventory().containsAtLeast(e.getItem(), 2)) d.getInventory().removeItem(new CustomItem(e.getItem(), 1));
else { else {
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
d.getInventory().removeItem(e.getItem()); d.getInventory().removeItem(e.getItem());
} }
}, 2L); }.runTaskLater(SlimefunStartup.instance, 2L);
} }
} }
} }
@ -3069,12 +3033,12 @@ public class SlimefunSetup {
block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, e.getItem().getType()); block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, e.getItem().getType());
if (d.getInventory().containsAtLeast(e.getItem(), 2)) d.getInventory().removeItem(new CustomItem(e.getItem(), 1)); if (d.getInventory().containsAtLeast(e.getItem(), 2)) d.getInventory().removeItem(new CustomItem(e.getItem(), 1));
else { else {
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
d.getInventory().removeItem(e.getItem()); d.getInventory().removeItem(e.getItem());
} }
}, 2L); }.runTaskLater(SlimefunStartup.instance, 2L);
} }
} }
} }
@ -5304,7 +5268,7 @@ public class SlimefunSetup {
@Override @Override
public void extraTick(final Location l) { public void extraTick(final Location l) {
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
for (Entity entity : ReactorHologram.getArmorStand(l).getNearbyEntities(5, 5, 5)) { for (Entity entity : ReactorHologram.getArmorStand(l).getNearbyEntities(5, 5, 5)) {
@ -5313,7 +5277,7 @@ public class SlimefunSetup {
} }
} }
} }
}, 0); }.runTaskLater(SlimefunStartup.instance, 0L);
} }
@Override @Override

3
src/me/mrCookieSlime/Slimefun/WorldEdit/WESlimefunManager.java
View File

@ -22,9 +22,8 @@ public class WESlimefunManager {
@Subscribe @Subscribe
public void wrapForLogging(final EditSessionEvent event) { public void wrapForLogging(final EditSessionEvent event) {
event.setExtent(new AbstractDelegateExtent(event.getExtent()) { event.setExtent(new AbstractDelegateExtent(event.getExtent()) {
@SuppressWarnings({ "rawtypes", "deprecation" })
@Override @Override
public boolean setBlock(BlockVector3 pos, BlockStateHolder block) throws WorldEditException { public boolean setBlock(BlockVector3 pos, BlockStateHolder block) throws WorldEditException {
if (block.getBlockType().getLegacyId() == 0) { if (block.getBlockType().getLegacyId() == 0) {