From e90b8c18f7bd7d81e25e7c142d2adcdcabeff31b Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Mon, 30 Dec 2019 01:21:47 +0100 Subject: [PATCH] [CI skip] Reduced technical debt --- .../java/me/mrCookieSlime/Slimefun/GPS/Elevator.java | 1 + .../java/me/mrCookieSlime/Slimefun/Lists/Categories.java | 2 +- .../me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java | 2 +- .../mrCookieSlime/Slimefun/listeners/ItemListener.java | 9 ++------- .../mrCookieSlime/Slimefun/listeners/ToolListener.java | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java b/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java index ae79ba218..b37af8125 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/GPS/Elevator.java @@ -60,6 +60,7 @@ public final class Elevator { TellRawMessage tellraw = new TellRawMessage(); tellraw.addText("&3- Pick a Destination -\n\n"); + int index = 1; for (int y = b.getWorld().getMaxHeight(); y > 0; y--) { Block block = b.getWorld().getBlockAt(b.getX(), y, b.getZ()); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Lists/Categories.java b/src/main/java/me/mrCookieSlime/Slimefun/Lists/Categories.java index 30ddc0e92..06c63377a 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Lists/Categories.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Lists/Categories.java @@ -2,8 +2,8 @@ package me.mrCookieSlime.Slimefun.Lists; import org.bukkit.Material; +import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.slimefun4.core.utils.ChatUtils; -import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.LockedCategory; import me.mrCookieSlime.Slimefun.Objects.SeasonalCategory; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java b/src/main/java/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java index c7267a19d..42ea6f259 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java @@ -17,8 +17,8 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.cscorelib2.skull.SkullItem; -import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomPotion; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.items.StormStaff; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/listeners/ItemListener.java b/src/main/java/me/mrCookieSlime/Slimefun/listeners/ItemListener.java index 94a46d039..b51fcd831 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/listeners/ItemListener.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/listeners/ItemListener.java @@ -1,7 +1,6 @@ package me.mrCookieSlime.Slimefun.listeners; import java.util.List; -import java.util.logging.Level; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -37,11 +36,11 @@ import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import io.github.thebusybiscuit.cscorelib2.skull.SkullBlock; import io.github.thebusybiscuit.slimefun4.core.guide.GuideSettings; import io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuideLayout; import io.github.thebusybiscuit.slimefun4.implementation.listeners.BackpackListener; import me.mrCookieSlime.CSCoreLibPlugin.events.ItemUseEvent; -import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull; import me.mrCookieSlime.Slimefun.SlimefunGuide; import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; @@ -139,11 +138,7 @@ public class ItemListener implements Listener { if (p.isSneaking()) { Block b = e.getClickedBlock().getRelative(e.getBlockFace()); b.setType(Material.PLAYER_HEAD); - try { - CustomSkull.setSkull(b, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTllYjlkYTI2Y2YyZDMzNDEzOTdhN2Y0OTEzYmEzZDM3ZDFhZDEwZWFlMzBhYjI1ZmEzOWNlYjg0YmMifX19"); - } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, "An Error occured while using the Debug-Fish for Slimefun " + Slimefun.getVersion(), x); - } + SkullBlock.setFromBase64(b, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTllYjlkYTI2Y2YyZDMzNDEzOTdhN2Y0OTEzYmEzZDM3ZDFhZDEwZWFlMzBhYjI1ZmEzOWNlYjg0YmMifX19"); } else if (BlockStorage.hasBlockInfo(e.getClickedBlock())) { p.sendMessage(" "); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/listeners/ToolListener.java b/src/main/java/me/mrCookieSlime/Slimefun/listeners/ToolListener.java index 6078dd29f..c4ddf07ac 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/listeners/ToolListener.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/listeners/ToolListener.java @@ -27,8 +27,8 @@ import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.inventory.ItemStack; import io.github.thebusybiscuit.cscorelib2.inventory.ItemUtils; +import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import io.github.thebusybiscuit.slimefun4.core.utils.FireworkUtils; -import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunBlockHandler;