diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockBreakHandler.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockBreakHandler.java deleted file mode 100644 index 92c5d46b2..000000000 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockBreakHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -import java.util.List; - -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.inventory.ItemStack; - -@Deprecated -public abstract class BlockBreakHandler extends ItemHandler { - - public abstract boolean onBlockBreak(BlockBreakEvent e, ItemStack item, int fortune, List drops); - - @Override - public String toCodename() { - return "BlockBreakHandler"; - } -} \ No newline at end of file diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockPlaceHandler.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockPlaceHandler.java deleted file mode 100644 index 16f55ecfb..000000000 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockPlaceHandler.java +++ /dev/null @@ -1,15 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.inventory.ItemStack; - -@Deprecated -public abstract class BlockPlaceHandler extends ItemHandler { - - public abstract boolean onBlockPlace(BlockPlaceEvent e, ItemStack item); - - @Override - public String toCodename() { - return "BlockPlaceHandler"; - } -} \ No newline at end of file diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockTicker.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockTicker.java deleted file mode 100644 index b42812a72..000000000 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockTicker.java +++ /dev/null @@ -1,30 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -import org.bukkit.block.Block; - -import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; - -@Deprecated -public abstract class BlockTicker extends ItemHandler { - - public boolean unique = true; - - public void update() { - if (unique) { - uniqueTick(); - unique = false; - } - } - - - public abstract boolean isSynchronized(); - public abstract void uniqueTick(); - public abstract void tick(Block b, SlimefunItem item, Config data); - - @Override - public String toCodename() { - return "BlockTicker"; - } - -} diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemHandler.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemHandler.java deleted file mode 100644 index 8d9913f5b..000000000 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemHandler.java +++ /dev/null @@ -1,6 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -@Deprecated -public abstract class ItemHandler implements me.mrCookieSlime.Slimefun.Objects.handlers.ItemHandler { - -} diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemInteractionHandler.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemInteractionHandler.java deleted file mode 100644 index 484107a49..000000000 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemInteractionHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -import me.mrCookieSlime.CSCoreLibPlugin.events.ItemUseEvent; - -@Deprecated -public abstract class ItemInteractionHandler extends ItemHandler { - - public abstract boolean onRightClick(ItemUseEvent e, Player p, ItemStack item); - - @Override - public String toCodename() { - return "ItemInteractionHandler"; - } - -} \ No newline at end of file diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/MultiBlockInteractionHandler.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/MultiBlockInteractionHandler.java deleted file mode 100644 index c2810155e..000000000 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/MultiBlockInteractionHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -import org.bukkit.block.Block; -import org.bukkit.entity.Player; - -import me.mrCookieSlime.Slimefun.Objects.MultiBlock; - -@Deprecated -public abstract class MultiBlockInteractionHandler extends ItemHandler { - - public abstract boolean onInteract(Player p, MultiBlock mb, Block b); - - @Override - public String toCodename() { - return "MultiBlockInteractionHandler"; - } -} \ No newline at end of file diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index fd2750707..578b7d42d 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -941,7 +941,7 @@ public final class SlimefunSetup { p.setVelocity(p.getEyeLocation().getDirection().multiply(4)); p.getWorld().playSound(p.getLocation(), Sound.ENTITY_TNT_PRIMED, 1, 1); p.getWorld().playEffect(p.getLocation(), Effect.SMOKE, 1); - p.setFallDistance(0.0f); + p.setFallDistance(0F); } else { Messages.local.sendTranslation(p, "messages.hungry", true); @@ -1864,7 +1864,7 @@ public final class SlimefunSetup { } if (e.getPlayer().getInventory().getItemInMainHand().getEnchantments().containsKey(Enchantment.DURABILITY)) { - if (SlimefunStartup.randomize(100) <= (60 + 40 / (e.getPlayer().getInventory().getItemInMainHand().getEnchantmentLevel(Enchantment.DURABILITY) + 1))) PlayerInventory.damageItemInHand(e.getPlayer()); + if (new Random().nextInt(100) <= (60 + 40 / (e.getPlayer().getInventory().getItemInMainHand().getEnchantmentLevel(Enchantment.DURABILITY) + 1))) PlayerInventory.damageItemInHand(e.getPlayer()); } else PlayerInventory.damageItemInHand(e.getPlayer());