diff --git a/src/me/mrCookieSlime/Slimefun/GEO/OreGenSystem.java b/src/me/mrCookieSlime/Slimefun/GEO/OreGenSystem.java index 1ec6e4ab5..c6fe6d833 100644 --- a/src/me/mrCookieSlime/Slimefun/GEO/OreGenSystem.java +++ b/src/me/mrCookieSlime/Slimefun/GEO/OreGenSystem.java @@ -6,7 +6,7 @@ import org.bukkit.Chunk; import org.bukkit.block.Biome; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.api.BlockStorage; public final class OreGenSystem { @@ -14,11 +14,11 @@ public final class OreGenSystem { private OreGenSystem() {} public static Collection listResources() { - return SlimefunStartup.instance.getUtilities().resources.values(); + return SlimefunPlugin.getUtilities().resources.values(); } public static void registerResource(OreGenResource resource) { - SlimefunStartup.instance.getUtilities().resources.put(resource.getName(), resource); + SlimefunPlugin.getUtilities().resources.put(resource.getName(), resource); System.out.println("[Slimefun - GEO] Registering Ore Gen: " + resource.getName()); Config cfg = new Config("plugins/Slimefun/generators/" + resource.getName() + ".cfg"); @@ -29,7 +29,7 @@ public final class OreGenSystem { } public static OreGenResource getResource(String name) { - return SlimefunStartup.instance.getUtilities().resources.get(name); + return SlimefunPlugin.getUtilities().resources.get(name); } private static int getDefault(OreGenResource resource, Biome biome) { diff --git a/src/me/mrCookieSlime/Slimefun/GPS/Elevator.java b/src/me/mrCookieSlime/Slimefun/GPS/Elevator.java index 3b177ed91..7f3c67601 100644 --- a/src/me/mrCookieSlime/Slimefun/GPS/Elevator.java +++ b/src/me/mrCookieSlime/Slimefun/GPS/Elevator.java @@ -15,7 +15,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.CustomBookOverlay; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.MenuHelper; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Setup.Messages; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -53,7 +53,7 @@ public final class Elevator { } public static void openDialogue(Player p, Block b) { - Set elevatorUsers = SlimefunStartup.instance.getUtilities().elevatorUsers; + Set elevatorUsers = SlimefunPlugin.getUtilities().elevatorUsers; if (elevatorUsers.contains(p.getUniqueId())) { elevatorUsers.remove(p.getUniqueId()); diff --git a/src/me/mrCookieSlime/Slimefun/GPS/GPSNetwork.java b/src/me/mrCookieSlime/Slimefun/GPS/GPSNetwork.java index 9bb981814..c82d2d525 100644 --- a/src/me/mrCookieSlime/Slimefun/GPS/GPSNetwork.java +++ b/src/me/mrCookieSlime/Slimefun/GPS/GPSNetwork.java @@ -24,7 +24,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.MenuHelper; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.GEO.OreGenResource; import me.mrCookieSlime.Slimefun.GEO.OreGenSystem; import me.mrCookieSlime.Slimefun.Setup.Messages; @@ -249,14 +249,14 @@ public class GPSNetwork { } public static void openTeleporterGUI(Player p, UUID uuid, Block b, final int complexity) throws Exception { - if (SlimefunStartup.instance.getUtilities().teleporterUsers.contains(p.getUniqueId())) return; + if (SlimefunPlugin.getUtilities().teleporterUsers.contains(p.getUniqueId())) return; p.playSound(p.getLocation(), Sound.UI_BUTTON_CLICK, 1F, 1F); - SlimefunStartup.instance.getUtilities().teleporterUsers.add(p.getUniqueId()); + SlimefunPlugin.getUtilities().teleporterUsers.add(p.getUniqueId()); ChestMenu menu = new ChestMenu("&3Teleporter"); - menu.addMenuCloseHandler(pl -> SlimefunStartup.instance.getUtilities().teleporterUsers.remove(pl.getUniqueId())); + menu.addMenuCloseHandler(pl -> SlimefunPlugin.getUtilities().teleporterUsers.remove(pl.getUniqueId())); for (int slot : teleporter_border) { menu.addItem(slot, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "), diff --git a/src/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java b/src/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java index 7572a62c8..8e77769bc 100644 --- a/src/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java +++ b/src/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java @@ -13,14 +13,14 @@ import org.bukkit.potion.PotionEffectType; import me.mrCookieSlime.CSCoreLibPlugin.general.World.TitleBuilder; import me.mrCookieSlime.CSCoreLibPlugin.general.World.TitleBuilder.TitleType; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; public final class TeleportationSequence { private TeleportationSequence() {} public static void start(UUID uuid, int complexity, Location source, Location destination, boolean resistance) { - SlimefunStartup.instance.getUtilities().teleporterUsers.add(uuid); + SlimefunPlugin.getUtilities().teleporterUsers.add(uuid); updateProgress(uuid, getSpeed(complexity, source, destination), 1, source, destination, resistance); } @@ -48,7 +48,7 @@ public final class TeleportationSequence { } private static void cancel(UUID uuid, Player p) { - SlimefunStartup.instance.getUtilities().teleporterUsers.remove(uuid); + SlimefunPlugin.getUtilities().teleporterUsers.remove(uuid); if (p != null) { try { @@ -83,7 +83,7 @@ public final class TeleportationSequence { destination.getWorld().spawnParticle(Particle.PORTAL,new Location(destination.getWorld(), destination.getX(), destination.getY() + 1, destination.getZ()),progress * 2, 0.2F, 0.8F, 0.2F ); destination.getWorld().playSound(destination, Sound.ENTITY_BLAZE_DEATH, 2F, 1.4F); - SlimefunStartup.instance.getUtilities().teleporterUsers.remove(uuid); + SlimefunPlugin.getUtilities().teleporterUsers.remove(uuid); } else { TitleBuilder title = (TitleBuilder) new TitleBuilder(0, 60, 0).addText(ChatColor.translateAlternateColorCodes('&', "&3Teleporting...")); @@ -95,7 +95,7 @@ public final class TeleportationSequence { source.getWorld().spawnParticle(Particle.PORTAL, source, progress * 2, 0.2F, 0.8F, 0.2F); source.getWorld().playSound(source, Sound.UI_BUTTON_CLICK, 1.7F, 0.6F); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> updateProgress(uuid, speed, progress + speed, source, destination, resistance), 10L); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> updateProgress(uuid, speed, progress + speed, source, destination, resistance), 10L); } } catch (Exception e) { e.printStackTrace(); diff --git a/src/me/mrCookieSlime/Slimefun/Misc/BookDesign.java b/src/me/mrCookieSlime/Slimefun/Misc/BookDesign.java deleted file mode 100644 index d38730b91..000000000 --- a/src/me/mrCookieSlime/Slimefun/Misc/BookDesign.java +++ /dev/null @@ -1,9 +0,0 @@ -package me.mrCookieSlime.Slimefun.Misc; - -public enum BookDesign { - - BOOK, - CHEST, - CHEAT_SHEET; - -} diff --git a/src/me/mrCookieSlime/Slimefun/Objects/Research.java b/src/me/mrCookieSlime/Slimefun/Objects/Research.java index eec384d4a..b159491a1 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/Research.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/Research.java @@ -17,7 +17,7 @@ import org.bukkit.entity.Player; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Variable; import me.mrCookieSlime.CSCoreLibPlugin.general.Particles.FireworkShow; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Events.ResearchUnlockEvent; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Setup.Messages; @@ -80,7 +80,7 @@ public class Research { } public boolean isEnabled() { - return SlimefunStartup.instance.getSettings().researchesEnabled && enabled; + return SlimefunPlugin.getSettings().researchesEnabled && enabled; } /** @@ -214,7 +214,7 @@ public class Research { */ public boolean canUnlock(Player p) { if (!isEnabled()) return true; - return (p.getGameMode() == GameMode.CREATIVE && SlimefunStartup.instance.getSettings().researchesFreeInCreative) || p.getLevel() >= this.cost; + return (p.getGameMode() == GameMode.CREATIVE && SlimefunPlugin.getSettings().researchesFreeInCreative) || p.getLevel() >= this.cost; } /** @@ -247,29 +247,29 @@ public class Research { PlayerProfile.fromUUID(p.getUniqueId()).setResearched(this, true); Messages.local.sendTranslation(p, "messages.unlocked", true, new Variable("%research%", getName())); - if (SlimefunStartup.getCfg().getBoolean("options.research-unlock-fireworks")) { + if (SlimefunPlugin.getCfg().getBoolean("options.research-unlock-fireworks")) { FireworkShow.launchRandom(p, 1); } }; if (!event.isCancelled()) { if (instant) runnable.run(); - else if (!SlimefunStartup.instance.getUtilities().researching.contains(p.getUniqueId())){ - SlimefunStartup.instance.getUtilities().researching.add(p.getUniqueId()); + else if (!SlimefunPlugin.getUtilities().researching.contains(p.getUniqueId())){ + SlimefunPlugin.getUtilities().researching.add(p.getUniqueId()); Messages.local.sendTranslation(p, "messages.research.start", true, new Variable("%research%", getName())); for (int i = 1; i < research_progress.length + 1; i++) { int j = i; - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { p.playSound(p.getLocation(), Sound.ENTITY_BAT_TAKEOFF, 0.7F, 1F); Messages.local.sendTranslation(p, "messages.research.progress", true, new Variable("%research%", getName()), new Variable("%progress%", research_progress[j - 1] + "%")); }, i * 20L); } - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { runnable.run(); - SlimefunStartup.instance.getUtilities().researching.remove(p.getUniqueId()); + SlimefunPlugin.getUtilities().researching.remove(p.getUniqueId()); }, (research_progress.length + 1) * 20L); } } @@ -282,9 +282,9 @@ public class Research { * @since 4.0 */ public void register() { - SlimefunStartup.getResearchCfg().setDefaultValue("enable-researching", true); + SlimefunPlugin.getResearchCfg().setDefaultValue("enable-researching", true); - if (SlimefunStartup.getResearchCfg().contains(this.getID() + ".enabled") && !SlimefunStartup.getResearchCfg().getBoolean(this.getID() + ".enabled")) { + if (SlimefunPlugin.getResearchCfg().contains(this.getID() + ".enabled") && !SlimefunPlugin.getResearchCfg().getBoolean(this.getID() + ".enabled")) { Iterator iterator = items.iterator(); while (iterator.hasNext()) { SlimefunItem item = iterator.next(); @@ -294,16 +294,16 @@ public class Research { return; } - SlimefunStartup.getResearchCfg().setDefaultValue(this.getID() + ".name", this.getName()); - SlimefunStartup.getResearchCfg().setDefaultValue(this.getID() + ".cost", this.getCost()); - SlimefunStartup.getResearchCfg().setDefaultValue(this.getID() + ".enabled", true); + SlimefunPlugin.getResearchCfg().setDefaultValue(this.getID() + ".name", this.getName()); + SlimefunPlugin.getResearchCfg().setDefaultValue(this.getID() + ".cost", this.getCost()); + SlimefunPlugin.getResearchCfg().setDefaultValue(this.getID() + ".enabled", true); - this.name = SlimefunStartup.getResearchCfg().getString(this.getID() + ".name"); - this.cost = SlimefunStartup.getResearchCfg().getInt(this.getID() + ".cost"); - this.enabled = SlimefunStartup.getResearchCfg().getBoolean(this.getID() + ".enabled"); + this.name = SlimefunPlugin.getResearchCfg().getString(this.getID() + ".name"); + this.cost = SlimefunPlugin.getResearchCfg().getInt(this.getID() + ".cost"); + this.enabled = SlimefunPlugin.getResearchCfg().getBoolean(this.getID() + ".enabled"); list.add(this); - if (SlimefunStartup.getCfg().getBoolean("options.print-out-loading")) System.out.println("[Slimefun] Loaded Research \"" + this.getName() + "\""); + if (SlimefunPlugin.getCfg().getBoolean("options.print-out-loading")) System.out.println("[Slimefun] Loaded Research \"" + this.getName() + "\""); } /** @@ -327,7 +327,7 @@ public class Research { * @since 4.0 */ public static boolean isResearching(Player p) { - return SlimefunStartup.instance.getUtilities().researching.contains(p.getUniqueId()); + return SlimefunPlugin.getUtilities().researching.contains(p.getUniqueId()); } /** diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java index 443bbed0a..577afc924 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java @@ -15,7 +15,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.Category; @@ -213,41 +213,41 @@ public class SlimefunItem { if (this.recipe.length < 9) this.recipe = new ItemStack[] {null, null, null, null, null, null, null, null, null}; all.add(this); - SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".enabled", true); - SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".can-be-used-in-workbenches", this.replacing); - SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".hide-in-guide", this.hidden); - SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".allow-enchanting", this.enchantable); - SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".allow-disenchanting", this.disenchantable); - SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".required-permission", this.permission); + SlimefunPlugin.getItemCfg().setDefaultValue(this.id + ".enabled", true); + SlimefunPlugin.getItemCfg().setDefaultValue(this.id + ".can-be-used-in-workbenches", this.replacing); + SlimefunPlugin.getItemCfg().setDefaultValue(this.id + ".hide-in-guide", this.hidden); + SlimefunPlugin.getItemCfg().setDefaultValue(this.id + ".allow-enchanting", this.enchantable); + SlimefunPlugin.getItemCfg().setDefaultValue(this.id + ".allow-disenchanting", this.disenchantable); + SlimefunPlugin.getItemCfg().setDefaultValue(this.id + ".required-permission", this.permission); if (this.keys != null && this.values != null) { for (int i = 0; i < this.keys.length; i++) { - SlimefunStartup.getItemCfg().setDefaultValue(this.id + "." + this.keys[i], this.values[i]); + SlimefunPlugin.getItemCfg().setDefaultValue(this.id + "." + this.keys[i], this.values[i]); } } for (World world: Bukkit.getWorlds()) { - SlimefunStartup.getWhitelist().setDefaultValue(world.getName() + ".enabled", true); - SlimefunStartup.getWhitelist().setDefaultValue(world.getName() + ".enabled-items." + this.id, true); + SlimefunPlugin.getWhitelist().setDefaultValue(world.getName() + ".enabled", true); + SlimefunPlugin.getWhitelist().setDefaultValue(world.getName() + ".enabled-items." + this.id, true); } - if (this.ticking && !SlimefunStartup.getCfg().getBoolean("URID.enable-tickers")) { + if (this.ticking && !SlimefunPlugin.getCfg().getBoolean("URID.enable-tickers")) { this.state = State.DISABLED; return; } - if (SlimefunStartup.getItemCfg().getBoolean(id + ".enabled")) { + if (SlimefunPlugin.getItemCfg().getBoolean(id + ".enabled")) { if (!Category.list().contains(category)) category.register(); this.state = State.ENABLED; - this.replacing = SlimefunStartup.getItemCfg().getBoolean(this.id + ".can-be-used-in-workbenches"); - this.hidden = SlimefunStartup.getItemCfg().getBoolean(this.id + ".hide-in-guide"); - this.enchantable = SlimefunStartup.getItemCfg().getBoolean(this.id + ".allow-enchanting"); - this.disenchantable = SlimefunStartup.getItemCfg().getBoolean(this.id + ".allow-disenchanting"); - this.permission = SlimefunStartup.getItemCfg().getString(this.id + ".required-permission"); + this.replacing = SlimefunPlugin.getItemCfg().getBoolean(this.id + ".can-be-used-in-workbenches"); + this.hidden = SlimefunPlugin.getItemCfg().getBoolean(this.id + ".hide-in-guide"); + this.enchantable = SlimefunPlugin.getItemCfg().getBoolean(this.id + ".allow-enchanting"); + this.disenchantable = SlimefunPlugin.getItemCfg().getBoolean(this.id + ".allow-disenchanting"); + this.permission = SlimefunPlugin.getItemCfg().getString(this.id + ".required-permission"); items.add(this); - if (slimefun) SlimefunStartup.instance.getUtilities().vanillaItems++; + if (slimefun) SlimefunPlugin.getUtilities().vanillaItems++; mapID.put(this.id, this); this.create(); @@ -257,7 +257,7 @@ public class SlimefunItem { handlers.put(handler.toCodename(), handlerset); } - if (SlimefunStartup.getCfg().getBoolean("options.print-out-loading")) System.out.println("[Slimefun] Loaded Item \"" + this.id + "\""); + if (SlimefunPlugin.getCfg().getBoolean("options.print-out-loading")) System.out.println("[Slimefun] Loaded Item \"" + this.id + "\""); } else { if (this instanceof VanillaItem) this.state = State.VANILLA; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java index 7e27641a3..2e5ec43d9 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java @@ -24,7 +24,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.InvUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.Category; @@ -280,7 +280,7 @@ public abstract class AReactor extends SlimefunItem { if (space >= produced || !BlockStorage.getLocationInfo(l, "reactor-mode").equals("generator")) { progress.put(l, timeleft - 1); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { if (!l.getBlock().getRelative(cooling[new Random().nextInt(cooling.length)]).isLiquid()) explode.add(l); }); @@ -373,7 +373,7 @@ public abstract class AReactor extends SlimefunItem { if (explosion) { BlockStorage.getInventory(l).close(); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> ReactorHologram.remove(l), 0); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> ReactorHologram.remove(l), 0); explode.remove(l); processing.remove(l); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java index 3e61b63a7..1673148dd 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java @@ -19,7 +19,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.InvUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.EmeraldEnchants.EmeraldEnchants; import me.mrCookieSlime.EmeraldEnchants.ItemEnchantment; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; @@ -123,7 +123,7 @@ public class AutoEnchanter extends AContainer { specialAmount += EmeraldEnchants.getInstance().getRegistry().getEnchantments(target).size(); } - if (amount > 0 && specialAmount <= SlimefunStartup.instance.getSettings().emeraldEnchantsLimit) { + if (amount > 0 && specialAmount <= SlimefunPlugin.getSettings().emeraldEnchantsLimit) { ItemStack newItem = target.clone(); for (Map.Entry e: enchantments.entrySet()) { newItem.addUnsafeEnchantment(e.getKey(), e.getValue()); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/BlockPlacer.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/BlockPlacer.java index 25aebe13e..371cb5b3c 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/BlockPlacer.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/BlockPlacer.java @@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockDispenseEvent; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; @@ -52,7 +52,7 @@ public class BlockPlacer extends SlimefunItem { 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)); else { - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> d.getInventory().removeItem(e.getItem()), 2L); + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> d.getInventory().removeItem(e.getItem()), 2L); } } } @@ -61,7 +61,7 @@ public class BlockPlacer extends SlimefunItem { 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)); else { - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> d.getInventory().removeItem(e.getItem()), 2L); + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> d.getInventory().removeItem(e.getItem()), 2L); } } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Composter.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Composter.java index 7b8a23c40..f9eb96d9e 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Composter.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Composter.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.CSCoreLib; import me.mrCookieSlime.CSCoreLibPlugin.events.ItemUseEvent; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunGadget; @@ -49,7 +49,7 @@ public class Composter extends SlimefunGadget { for (int i = 1; i < 12; i++) { int j = i; - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { if (j < 11) { b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, input.getType().isBlock() ? input.getType() : Material.HAY_BLOCK); } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Crucible.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Crucible.java index d21199971..71a166c3b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Crucible.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Crucible.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.CSCoreLib; import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper; import me.mrCookieSlime.CSCoreLibPlugin.events.ItemUseEvent; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunGadget; @@ -49,7 +49,7 @@ public class Crucible extends SlimefunGadget { for (int i = 1; i < 9; i++) { int j = 8 - i; - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { if (input.getType() == Material.COBBLESTONE || input.getType() == Material.TERRACOTTA || MaterialHelper.isTerracotta(input.getType())) { block.setType(Material.LAVA); Levelled le = (Levelled) block.getBlockData(); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java index f86d54a03..fe7a8a408 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.meta.ItemMeta; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.InvUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.Category; @@ -81,7 +81,7 @@ public abstract class ElectricDustWasher extends AContainer { else { for (int slot: getInputSlots()) { if (SlimefunManager.isItemSimiliar(BlockStorage.getInventory(b).getItemInSlot(slot), SlimefunItems.SIFTED_ORE, true)) { - if (!SlimefunStartup.instance.getSettings().legacyDustWasher) { + if (!SlimefunPlugin.getSettings().legacyDustWasher) { boolean emptySlot = false; for (int output_slot: getOutputSlots()) { @@ -95,7 +95,7 @@ public abstract class ElectricDustWasher extends AContainer { ItemStack adding = OreWasher.items[new Random().nextInt(OreWasher.items.length)]; MachineRecipe r = new MachineRecipe(4 / getSpeed(), new ItemStack[0], new ItemStack[] {adding}); - if (SlimefunStartup.instance.getSettings().legacyDustWasher && !fits(b, r.getOutput())) return; + if (SlimefunPlugin.getSettings().legacyDustWasher && !fits(b, r.getOutput())) return; BlockStorage.getInventory(b).replaceExistingItem(slot, InvUtils.decreaseItem(BlockStorage.getInventory(b).getItemInSlot(slot), 1)); processing.put(b, r); progress.put(b, r.getTicks()); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/WitherAssembler.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/WitherAssembler.java index bce6377c7..67e3b1a4b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/WitherAssembler.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/WitherAssembler.java @@ -13,7 +13,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.InvUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.SlimefunBlockHandler; @@ -245,7 +245,7 @@ public class WitherAssembler extends SlimefunItem { final double offset = Double.parseDouble(BlockStorage.getLocationInfo(b.getLocation(), "offset")); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> b.getWorld().spawnEntity(new Location(b.getWorld(), b.getX() + 0.5D, b.getY() + offset, b.getZ() + 0.5D), EntityType.WITHER)); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> b.getWorld().spawnEntity(new Location(b.getWorld(), b.getX() + 0.5D, b.getY() + offset, b.getZ() + 0.5D), EntityType.WITHER)); } } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/ArmorForge.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/ArmorForge.java index d39b92896..4bdb30793 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/ArmorForge.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/ArmorForge.java @@ -13,7 +13,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.Categories; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; @@ -61,7 +61,7 @@ public class ArmorForge extends MultiBlockMachine { for (int j = 0; j < 4; j++) { int current = j; - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { if (current < 3) { p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ANVIL_USE, 1F, 2F); } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/AutomatedPanningMachine.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/AutomatedPanningMachine.java index 8e2b67c6a..26d2dd234 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/AutomatedPanningMachine.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/AutomatedPanningMachine.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Player.PlayerInventory; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.Categories; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Setup.Messages; @@ -52,7 +52,7 @@ public class AutomatedPanningMachine extends MultiBlockMachine { PlayerInventory.consumeItemInHand(p); for (int i = 1; i < 7; i++) { int j = i; - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { b.getWorld().playEffect(b.getRelative(BlockFace.DOWN).getLocation(), Effect.STEP_SOUND, Material.GRAVEL); if (j == 6) { if (drop != null) b.getWorld().dropItemNaturally(b.getLocation(), drop); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Compressor.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Compressor.java index 55672e00a..4c8f2a864 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Compressor.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Compressor.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.Categories; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; @@ -54,7 +54,7 @@ public class Compressor extends MultiBlockMachine { for (int i = 0; i < 4; i++) { int j = i; - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { if (j < 3) { p.getWorld().playSound(p.getLocation(), j == 1 ? Sound.BLOCK_PISTON_CONTRACT : Sound.BLOCK_PISTON_EXTEND, 1F, j == 0 ? 1F : 2F); } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/MagicWorkbench.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/MagicWorkbench.java index b4616e0ec..f70b40be4 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/MagicWorkbench.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/MagicWorkbench.java @@ -16,7 +16,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.Categories; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; @@ -143,7 +143,7 @@ public class MagicWorkbench extends MultiBlockMachine { } for (int j = 0; j < 4; j++) { int current = j; - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { p.getWorld().playEffect(b.getLocation(), Effect.MOBSPAWNER_FLAMES, 1); p.getWorld().playEffect(b.getLocation(), Effect.ENDER_SIGNAL, 1); if (current < 3) { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreWasher.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreWasher.java index 663428aed..5e274e5b2 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreWasher.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreWasher.java @@ -13,7 +13,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.InvUtils; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.Categories; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Setup.Messages; @@ -56,7 +56,7 @@ public class OreWasher extends MultiBlockMachine { ItemStack adding = items[new Random().nextInt(items.length)]; Inventory outputInv = null; - if (!SlimefunStartup.instance.getSettings().legacyOreWasher) { + if (!SlimefunPlugin.getSettings().legacyOreWasher) { // This is a fancy way of checking if there is empty space in the inv; by checking if an unobtainable item could fit in it. // However, due to the way the method findValidOutputInv() functions, the dummyAdding will never actually be added to the real inventory, // so it really doesn't matter what item the ItemStack is made by. SlimefunItems.DEBUG_FISH however, signals that it's diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/PressureChamber.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/PressureChamber.java index 766bfc7f7..b06a1d860 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/PressureChamber.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/PressureChamber.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.Categories; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; @@ -53,7 +53,7 @@ public class PressureChamber extends MultiBlockMachine { for (int i = 0; i < 4; i++) { int j = i; - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { 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); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Smeltery.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Smeltery.java index 6286e9a03..63c94189b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Smeltery.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Smeltery.java @@ -17,7 +17,7 @@ import org.bukkit.inventory.meta.Damageable; import org.bukkit.inventory.meta.ItemMeta; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.Categories; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; @@ -77,7 +77,7 @@ public class Smeltery extends MultiBlockMachine { Hopper chamber = findHopper(dispBlock, BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST); - if (new Random().nextInt(100) < SlimefunStartup.instance.getSettings().SMELTERY_FIRE_BREAK_CHANCE) { + if (new Random().nextInt(100) < SlimefunPlugin.getSettings().SMELTERY_FIRE_BREAK_CHANCE) { if (chamber != null) { if (chamber.getInventory().contains(Material.FLINT_AND_STEEL)) { ItemStack item = chamber.getInventory().getItem(chamber.getInventory().first(Material.FLINT_AND_STEEL)); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java index f7c0c7d3d..ac39fd937 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java @@ -16,16 +16,16 @@ import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Chat.Colors; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItemSerializer; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItemSerializer.ItemFlag; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; -import me.mrCookieSlime.Slimefun.Misc.PostSlimefunLoadingHandler; import me.mrCookieSlime.Slimefun.Objects.Research; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Alloy; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.ReplacingAlloy; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunMachine; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.AutomatedCraftingChamber; +import me.mrCookieSlime.Slimefun.Setup.PostSlimefunLoadingHandler; import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.SlimefunRecipes; import me.mrCookieSlime.Slimefun.utils.Settings; @@ -34,8 +34,6 @@ public final class MiscSetup { private MiscSetup() {} - public static List postHandlers = new ArrayList<>(); - public static void setupMisc() { if (SlimefunItem.getByID("COMMON_TALISMAN") != null && (Boolean) Slimefun.getItemValue("COMMON_TALISMAN", "recipe-requires-nether-stars")) { SlimefunItem.getByID("COMMON_TALISMAN").setRecipe(new ItemStack[] {SlimefunItems.MAGIC_LUMP_2, SlimefunItems.GOLD_8K, SlimefunItems.MAGIC_LUMP_2, null, new ItemStack(Material.NETHER_STAR), null, SlimefunItems.MAGIC_LUMP_2, SlimefunItems.GOLD_8K, SlimefunItems.MAGIC_LUMP_2}); @@ -205,22 +203,22 @@ public final class MiscSetup { CommandSender sender = Bukkit.getConsoleSender(); ChatColor color = Colors.getRandom(); - for (PostSlimefunLoadingHandler handler: postHandlers) { + for (PostSlimefunLoadingHandler handler: SlimefunPlugin.getUtilities().postHandlers) { handler.run(pre, init, post); } sender.sendMessage(color + "###################### - Slimefun - ######################"); sender.sendMessage(color + "Successfully loaded " + SlimefunItem.list().size() + " Items (" + Research.list().size() + " Researches)"); - sender.sendMessage(color + "( " + SlimefunStartup.instance.getUtilities().vanillaItems + " Items from Slimefun, " + (SlimefunItem.list().size() - SlimefunStartup.instance.getUtilities().vanillaItems) + " Items from Addons )"); + sender.sendMessage(color + "( " + SlimefunPlugin.getUtilities().vanillaItems + " Items from Slimefun, " + (SlimefunItem.list().size() - SlimefunPlugin.getUtilities().vanillaItems) + " Items from Addons )"); sender.sendMessage(color + "##########################################################"); - SlimefunStartup.getItemCfg().save(); - SlimefunStartup.getResearchCfg().save(); - SlimefunStartup.getWhitelist().save(); + SlimefunPlugin.getItemCfg().save(); + SlimefunPlugin.getResearchCfg().save(); + SlimefunPlugin.getWhitelist().save(); } public static void setupItemSettings() { for (World world: Bukkit.getWorlds()) { - SlimefunStartup.getWhitelist().setDefaultValue(world.getName() + ".enabled-items.SLIMEFUN_GUIDE", true); + SlimefunPlugin.getWhitelist().setDefaultValue(world.getName() + ".enabled-items.SLIMEFUN_GUIDE", true); } Slimefun.setItemVariable("ORE_CRUSHER", "double-ores", true); diff --git a/src/me/mrCookieSlime/Slimefun/Misc/PostSlimefunLoadingHandler.java b/src/me/mrCookieSlime/Slimefun/Setup/PostSlimefunLoadingHandler.java similarity index 86% rename from src/me/mrCookieSlime/Slimefun/Misc/PostSlimefunLoadingHandler.java rename to src/me/mrCookieSlime/Slimefun/Setup/PostSlimefunLoadingHandler.java index e75244127..d54b47b04 100644 --- a/src/me/mrCookieSlime/Slimefun/Misc/PostSlimefunLoadingHandler.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/PostSlimefunLoadingHandler.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.Misc; +package me.mrCookieSlime.Slimefun.Setup; import java.util.List; diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java index e67113894..9b6bf824f 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java @@ -9,7 +9,7 @@ import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.Categories; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; @@ -21,7 +21,7 @@ public final class SlimefunManager { private SlimefunManager() {} - public static SlimefunStartup plugin; + public static SlimefunPlugin plugin; public static String prefix; public static Map> drops = new EnumMap<>(EntityType.class); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index afdc2a83e..ba0e81de1 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -62,14 +62,13 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Player.PlayerInventory; import me.mrCookieSlime.CSCoreLibPlugin.general.Recipe.RecipeCalculator; import me.mrCookieSlime.CSCoreLibPlugin.general.String.StringUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.GPS.Elevator; import me.mrCookieSlime.Slimefun.GPS.GPSNetwork; import me.mrCookieSlime.Slimefun.GPS.NetworkStatus; import me.mrCookieSlime.Slimefun.Lists.Categories; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; -import me.mrCookieSlime.Slimefun.Misc.PostSlimefunLoadingHandler; import me.mrCookieSlime.Slimefun.Objects.MultiBlock; import me.mrCookieSlime.Slimefun.Objects.Research; import me.mrCookieSlime.Slimefun.Objects.SlimefunBlockHandler; @@ -679,7 +678,7 @@ public final class SlimefunSetup { new ItemStack[] {null, SlimefunItems.HOOK, SlimefunItems.HOOK, null, SlimefunItems.CHAIN, SlimefunItems.HOOK, SlimefunItems.CHAIN, null, null}) .register(true, new ItemInteractionHandler() { - private Utilities variables = SlimefunStartup.instance.getUtilities(); + private Utilities variables = SlimefunPlugin.getUtilities(); @Override public boolean onRightClick(ItemUseEvent e, Player p, ItemStack item) { @@ -1305,7 +1304,7 @@ public final class SlimefunSetup { if (InvUtils.fits(inv, adding)) { for (int i = 0; i < 4; i++) { int j = i; - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { if (j < 3) { b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); } else { @@ -1374,7 +1373,7 @@ public final class SlimefunSetup { if (InvUtils.fits(inv, adding)) { for (int i = 0; i < 4; i++) { int j = i; - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { if (j < 3) { b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, ore); } @@ -1444,8 +1443,8 @@ public final class SlimefunSetup { for (int z = -1; z <= 1; z++) { Block b = e.getBlock().getRelative(x, y, z); if (b.getType() != Material.AIR && !b.isLiquid() && !StringUtils.equals(b.getType().toString(), explosiveblacklist) && CSCoreLib.getLib().getProtectionManager().canBuild(e.getPlayer().getUniqueId(), b)) { - if (SlimefunStartup.instance.getHooks().isCoreProtectInstalled()) { - SlimefunStartup.instance.getHooks().getCoreProtectAPI().logRemoval(e.getPlayer().getName(), b.getLocation(), b.getType(), b.getBlockData()); + if (SlimefunPlugin.getHooks().isCoreProtectInstalled()) { + SlimefunPlugin.getHooks().getCoreProtectAPI().logRemoval(e.getPlayer().getName(), b.getLocation(), b.getType(), b.getBlockData()); } b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getType()); @@ -1509,8 +1508,8 @@ public final class SlimefunSetup { } if (correctType) { if (CSCoreLib.getLib().getProtectionManager().canBuild(e.getPlayer().getUniqueId(), b)) { - if (SlimefunStartup.instance.getHooks().isCoreProtectInstalled()) { - SlimefunStartup.instance.getHooks().getCoreProtectAPI().logRemoval(e.getPlayer().getName(), b.getLocation(), b.getType(), b.getBlockData()); + if (SlimefunPlugin.getHooks().isCoreProtectInstalled()) { + SlimefunPlugin.getHooks().getCoreProtectAPI().logRemoval(e.getPlayer().getName(), b.getLocation(), b.getType(), b.getBlockData()); } b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getType()); @@ -1734,7 +1733,7 @@ public final class SlimefunSetup { FallingBlock block = ground.getWorld().spawnFallingBlock(ground.getBlock().getRelative(BlockFace.UP).getLocation(), ground.getBlock().getBlockData()); block.setDropItem(false); block.setVelocity(new Vector(0, 0.4 + i * 0.01, 0)); - SlimefunStartup.instance.getUtilities().blocks.add(block.getUniqueId()); + SlimefunPlugin.getUtilities().blocks.add(block.getUniqueId()); } for (Entity n: ground.getChunk().getEntities()) { if (n instanceof LivingEntity && n.getLocation().distance(ground) <= 2.0D && !n.getUniqueId().equals(p.getUniqueId())) { @@ -1980,7 +1979,7 @@ public final class SlimefunSetup { @Override public boolean onHit(EntityDamageByEntityEvent e, LivingEntity n) { - if (SlimefunManager.isItemSimiliar(SlimefunStartup.instance.getUtilities().arrows.get(e.getDamager().getUniqueId()), SlimefunItems.EXPLOSIVE_BOW, true)) { + if (SlimefunManager.isItemSimiliar(SlimefunPlugin.getUtilities().arrows.get(e.getDamager().getUniqueId()), SlimefunItems.EXPLOSIVE_BOW, true)) { Vector vector = n.getVelocity(); vector.setY(0.6); n.setVelocity(vector); @@ -1998,7 +1997,7 @@ public final class SlimefunSetup { @Override public boolean onHit(EntityDamageByEntityEvent e, LivingEntity n) { - if (SlimefunManager.isItemSimiliar(SlimefunStartup.instance.getUtilities().arrows.get(e.getDamager().getUniqueId()), SlimefunItems.ICY_BOW, true)) { + if (SlimefunManager.isItemSimiliar(SlimefunPlugin.getUtilities().arrows.get(e.getDamager().getUniqueId()), SlimefunItems.ICY_BOW, true)) { n.getWorld().playEffect(n.getLocation(), Effect.STEP_SOUND, Material.ICE); n.getWorld().playEffect(n.getEyeLocation(), Effect.STEP_SOUND, Material.ICE); n.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 20 * 2, 10)); @@ -2194,7 +2193,7 @@ public final class SlimefunSetup { public boolean onBreak(Player p, Block b, SlimefunItem item, UnregisterReason reason) { Item stack = AncientAltarListener.findItem(b); if (stack != null) { - stack.removeMetadata("item_placed", SlimefunStartup.instance); + stack.removeMetadata("item_placed", SlimefunPlugin.instance); b.getWorld().dropItem(b.getLocation(), AncientAltarListener.fixItemStack(stack.getItemStack(), stack.getCustomName())); stack.remove(); } @@ -4042,7 +4041,7 @@ public final class SlimefunSetup { @Override public void extraTick(final Location l) { - Bukkit.getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { for (Entity entity : ReactorHologram.getArmorStand(l, true).getNearbyEntities(5, 5, 5)) { if (entity instanceof LivingEntity) { ((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.WITHER, 60, 1)); @@ -4278,7 +4277,7 @@ public final class SlimefunSetup { } public static void registerPostHandler(PostSlimefunLoadingHandler handler) { - MiscSetup.postHandlers.add(handler); + SlimefunPlugin.getUtilities().postHandlers.add(handler); } } diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java index c16510349..23ddb9d54 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java @@ -33,7 +33,6 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; import me.mrCookieSlime.CSCoreLibPlugin.general.String.StringUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull; import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Misc.BookDesign; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.LockedCategory; import me.mrCookieSlime.Slimefun.Objects.Research; @@ -46,6 +45,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AReactor; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel; import me.mrCookieSlime.Slimefun.Setup.Messages; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; +import me.mrCookieSlime.Slimefun.api.SlimefunGuideLayout; import me.mrCookieSlime.Slimefun.api.GuideHandler; import me.mrCookieSlime.Slimefun.api.PlayerProfile; import me.mrCookieSlime.Slimefun.api.Slimefun; @@ -72,10 +72,10 @@ public final class SlimefunGuide { @Deprecated public static ItemStack getItem() { - return getItem(BookDesign.CHEST); + return getItem(SlimefunGuideLayout.CHEST); } - public static ItemStack getItem(BookDesign design) { + public static ItemStack getItem(SlimefunGuideLayout design) { switch (design) { case BOOK: return new CustomItem(new ItemStack(Material.ENCHANTED_BOOK), "&aSlimefun Guide &7(Book GUI)", "", "&eRight Click &8\u21E8 &7Browse Items", "&eShift + Right Click &8\u21E8 &7Open Settings / Credits"); @@ -90,7 +90,7 @@ public final class SlimefunGuide { @Deprecated public static ItemStack getItem(boolean book) { - return getItem(book ? BookDesign.BOOK: BookDesign.CHEST); + return getItem(book ? SlimefunGuideLayout.BOOK: SlimefunGuideLayout.CHEST); } @Deprecated @@ -116,11 +116,11 @@ public final class SlimefunGuide { } - if (SlimefunManager.isItemSimiliar(guide, getItem(BookDesign.CHEST), true)) { + if (SlimefunManager.isItemSimiliar(guide, getItem(SlimefunGuideLayout.CHEST), true)) { if (p.hasPermission("slimefun.cheat.items")) { menu.addItem(19, new CustomItem(new ItemStack(Material.CHEST), "&7Guide Layout: &eChest GUI", "", "&aChest GUI", "&7Book GUI", "&7Cheat Sheet", "", "&e Click &8\u21E8 &7Change Layout")); menu.addMenuClickHandler(19, (pl, slot, item, action) -> { - pl.getInventory().setItemInMainHand(getItem(BookDesign.BOOK)); + pl.getInventory().setItemInMainHand(getItem(SlimefunGuideLayout.BOOK)); openSettings(pl, pl.getInventory().getItemInMainHand()); return false; }); @@ -128,17 +128,17 @@ public final class SlimefunGuide { else { menu.addItem(19, new CustomItem(new ItemStack(Material.CHEST), "&7Guide Layout: &eChest GUI", "", "&aChest GUI", "&7Book GUI", "", "&e Click &8\u21E8 &7Change Layout")); menu.addMenuClickHandler(19, (pl, slot, item, action) -> { - pl.getInventory().setItemInMainHand(getItem(BookDesign.BOOK)); + pl.getInventory().setItemInMainHand(getItem(SlimefunGuideLayout.BOOK)); openSettings(pl, pl.getInventory().getItemInMainHand()); return false; }); } } - else if (SlimefunManager.isItemSimiliar(guide, getItem(BookDesign.BOOK), true)) { + else if (SlimefunManager.isItemSimiliar(guide, getItem(SlimefunGuideLayout.BOOK), true)) { if (p.hasPermission("slimefun.cheat.items")) { menu.addItem(19, new CustomItem(new ItemStack(Material.CHEST), "&7Guide Layout: &eBook GUI", "", "&7Chest GUI", "&aBook GUI", "&7Cheat Sheet", "", "&e Click &8\u21E8 &7Change Layout")); menu.addMenuClickHandler(19, (pl, slot, item, action) -> { - pl.getInventory().setItemInMainHand(getItem(BookDesign.CHEAT_SHEET)); + pl.getInventory().setItemInMainHand(getItem(SlimefunGuideLayout.CHEAT_SHEET)); openSettings(pl, pl.getInventory().getItemInMainHand()); return false; }); @@ -146,22 +146,22 @@ public final class SlimefunGuide { else { menu.addItem(19, new CustomItem(new ItemStack(Material.CHEST), "&7Guide Layout: &eBook GUI", "", "&7Chest GUI", "&aBook GUI", "", "&e Click &8\u21E8 &7Change Layout")); menu.addMenuClickHandler(19, (pl, slot, item, action) -> { - pl.getInventory().setItemInMainHand(getItem(BookDesign.CHEST)); + pl.getInventory().setItemInMainHand(getItem(SlimefunGuideLayout.CHEST)); openSettings(pl, pl.getInventory().getItemInMainHand()); return false; }); } } - else if (SlimefunManager.isItemSimiliar(guide, getItem(BookDesign.CHEAT_SHEET), true)) { + else if (SlimefunManager.isItemSimiliar(guide, getItem(SlimefunGuideLayout.CHEAT_SHEET), true)) { menu.addItem(19, new CustomItem(new ItemStack(Material.CHEST), "&7Guide Layout: &eCheat Sheet", "", "&7Chest GUI", "&7Book GUI", "&aCheat Sheet", "", "&e Click &8\u21E8 &7Change Layout")); menu.addMenuClickHandler(19, (pl, slot, item, action) -> { - pl.getInventory().setItemInMainHand(getItem(BookDesign.CHEST)); + pl.getInventory().setItemInMainHand(getItem(SlimefunGuideLayout.CHEST)); openSettings(pl, pl.getInventory().getItemInMainHand()); return false; }); } - menu.addItem(1, new CustomItem(new ItemStack(Material.WRITABLE_BOOK), "&aCredits", "", "&7Version: &a" + SlimefunStartup.instance.getDescription().getVersion(), "&7Contributors: &e" + SlimefunStartup.instance.getUtilities().contributors.size(), "", "&7\u21E8 Click to see the people behind this Plugin")); + menu.addItem(1, new CustomItem(new ItemStack(Material.WRITABLE_BOOK), "&aCredits", "", "&7Version: &a" + SlimefunPlugin.instance.getDescription().getVersion(), "&7Contributors: &e" + SlimefunPlugin.getUtilities().contributors.size(), "", "&7\u21E8 Click to see the people behind this Plugin")); menu.addMenuClickHandler(1, (pl, slot, item, action) -> { openCredits(pl, guide); return false; @@ -219,11 +219,11 @@ public final class SlimefunGuide { int index = 9; double total = 0; - for (Contributor contributor : SlimefunStartup.instance.getUtilities().contributors) { + for (Contributor contributor : SlimefunPlugin.getUtilities().contributors) { total += contributor.getCommits(); } - for (final Contributor contributor: SlimefunStartup.instance.getUtilities().contributors) { + for (final Contributor contributor: SlimefunPlugin.getUtilities().contributors) { ItemStack skull = new ItemStack(Material.PLAYER_HEAD); try { @@ -269,8 +269,8 @@ public final class SlimefunGuide { } public static void openGuide(Player p, boolean book) { - if (!SlimefunStartup.getWhitelist().getBoolean(p.getWorld().getName() + ".enabled")) return; - if (!SlimefunStartup.getWhitelist().getBoolean(p.getWorld().getName() + ".enabled-items.SLIMEFUN_GUIDE")) return; + if (!SlimefunPlugin.getWhitelist().getBoolean(p.getWorld().getName() + ".enabled")) return; + if (!SlimefunPlugin.getWhitelist().getBoolean(p.getWorld().getName() + ".enabled-items.SLIMEFUN_GUIDE")) return; if (!getHistory().containsKey(p.getUniqueId())) openMainMenu(p, true, book, 1); else { Object last = getLastEntry(p, false); @@ -352,7 +352,7 @@ public final class SlimefunGuide { actions.add(new PlayerRunnable(1) { @Override public void run(final Player p) { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> openCategory(p, category, survival, 1, book), 1L); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> openCategory(p, category, survival, 1, book), 1L); } }); } @@ -363,7 +363,7 @@ public final class SlimefunGuide { actions.add(new PlayerRunnable(1) { @Override public void run(final Player p) { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> openCategory(p, category, survival, 1, book), 1L); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> openCategory(p, category, survival, 1, book), 1L); } }); } @@ -567,19 +567,19 @@ public final class SlimefunGuide { openCategory(p, category, true, selected_page, book); } else { - if (!(p.getGameMode() == GameMode.CREATIVE && SlimefunStartup.instance.getSettings().researchesFreeInCreative)) { + if (!(p.getGameMode() == GameMode.CREATIVE && SlimefunPlugin.getSettings().researchesFreeInCreative)) { p.setLevel(p.getLevel() - research.getCost()); } if (p.getGameMode() == GameMode.CREATIVE) { research.unlock(p, true); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> openCategory(p, category, survival, selected_page, book), 1L); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> openCategory(p, category, survival, selected_page, book), 1L); } else { research.unlock(p, false); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> openCategory(p, category, survival, selected_page, book), 103L); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> openCategory(p, category, survival, selected_page, book), 103L); } } } else Messages.local.sendTranslation(p, "messages.not-enough-xp", true); @@ -634,7 +634,7 @@ public final class SlimefunGuide { page.addClickEvent(new PlayerRunnable(2) { @Override public void run(final Player p) { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> openMainMenu(p, survival, true, 1), 1L); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> openMainMenu(p, survival, true, 1), 1L); } }); pages.add(page); @@ -706,17 +706,17 @@ public final class SlimefunGuide { openCategory(p, category, true, selected_page, book); } else { - if (!(pl.getGameMode() == GameMode.CREATIVE && SlimefunStartup.instance.getSettings().researchesFreeInCreative)) { + if (!(pl.getGameMode() == GameMode.CREATIVE && SlimefunPlugin.getSettings().researchesFreeInCreative)) { pl.setLevel(pl.getLevel() - research.getCost()); } if (pl.getGameMode() == GameMode.CREATIVE) { - research.unlock(pl, SlimefunStartup.instance.getSettings().researchesFreeInCreative); + research.unlock(pl, SlimefunPlugin.getSettings().researchesFreeInCreative); openCategory(pl, category, survival, selected_page, book); } else { research.unlock(pl, false); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> openCategory(pl, category, survival, selected_page, book), 103L); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> openCategory(pl, category, survival, selected_page, book), 103L); } } } @@ -780,7 +780,7 @@ public final class SlimefunGuide { final SlimefunItem sfItem = SlimefunItem.getByItem(item); - if (sfItem == null && !SlimefunStartup.instance.getSettings().guideShowVanillaRecipes) return; + if (sfItem == null && !SlimefunPlugin.getSettings().guideShowVanillaRecipes) return; ItemStack[] recipe = new ItemStack[9]; ItemStack recipeType = null; @@ -1031,7 +1031,7 @@ public final class SlimefunGuide { } private static Map> getHistory() { - return SlimefunStartup.instance.getUtilities().guideHistory; + return SlimefunPlugin.getUtilities().guideHistory; } public static void clearHistory(UUID uuid) { diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java b/src/me/mrCookieSlime/Slimefun/SlimefunPlugin.java similarity index 96% rename from src/me/mrCookieSlime/Slimefun/SlimefunStartup.java rename to src/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 0178cfd39..c71d8ac72 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -21,6 +21,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Reflection.ReflectionUtils; import me.mrCookieSlime.Slimefun.GEO.OreGenSystem; import me.mrCookieSlime.Slimefun.GEO.Resources.NetherIceResource; import me.mrCookieSlime.Slimefun.GEO.Resources.OilResource; +import me.mrCookieSlime.Slimefun.GPS.GPSNetwork; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.MultiBlock; import me.mrCookieSlime.Slimefun.Objects.Research; @@ -76,17 +77,18 @@ import me.mrCookieSlime.Slimefun.listeners.WorldListener; import me.mrCookieSlime.Slimefun.utils.Settings; import me.mrCookieSlime.Slimefun.utils.Utilities; -public final class SlimefunStartup extends JavaPlugin { +public final class SlimefunPlugin extends JavaPlugin { - public static SlimefunStartup instance; + public static SlimefunPlugin instance; - private static Config researches; - private static Config items; - private static Config whitelist; - private static Config config; + private Config researches; + private Config items; + private Config whitelist; + private Config config; public static TickerTask ticker; + public GPSNetwork gps = new GPSNetwork(); private Utilities utilities = new Utilities(); private Settings settings; private SlimefunHooks hooks; @@ -247,7 +249,7 @@ public final class SlimefunStartup extends JavaPlugin { new BlockStorage(world); } - if (SlimefunItem.getByID("ANCIENT_ALTAR") != null) new AncientAltarListener((SlimefunStartup) instance); + if (SlimefunItem.getByID("ANCIENT_ALTAR") != null) new AncientAltarListener((SlimefunPlugin) instance); }, 0); getCommand("slimefun").setExecutor(new SlimefunCommand(this)); @@ -356,11 +358,6 @@ public final class SlimefunStartup extends JavaPlugin { SlimefunBackup.start(); // Prevent Memory Leaks - config = null; - researches = null; - items = null; - whitelist = null; - instance = null; Messages.local = null; Files.config = null; Files.database = null; @@ -392,9 +389,10 @@ public final class SlimefunStartup extends JavaPlugin { EnergyNet.machinesStorage = null; CargoNet.faces = null; BlockStorage.universalInventories = null; - PlayerProfile.profiles = null; OreWasher.items = null; + instance = null; + for (Player p: Bukkit.getOnlinePlayers()) { p.closeInventory(); } @@ -406,19 +404,19 @@ public final class SlimefunStartup extends JavaPlugin { } public static Config getCfg() { - return config; + return instance.config; } public static Config getResearchCfg() { - return researches; + return instance.researches; } public static Config getItemCfg() { - return items; + return instance.items; } public static Config getWhitelist() { - return whitelist; + return instance.whitelist; } @Deprecated @@ -433,16 +431,16 @@ public final class SlimefunStartup extends JavaPlugin { return CSCoreLib.randomizer().nextInt(max) <= percentage; } - public SlimefunHooks getHooks() { - return hooks; + public static SlimefunHooks getHooks() { + return instance.hooks; } - public Utilities getUtilities() { - return utilities; + public static Utilities getUtilities() { + return instance.utilities; } - public Settings getSettings() { - return settings; + public static Settings getSettings() { + return instance.settings; } } diff --git a/src/me/mrCookieSlime/Slimefun/ancient_altar/AltarRecipe.java b/src/me/mrCookieSlime/Slimefun/ancient_altar/AltarRecipe.java index 1e9b94d50..70f827194 100644 --- a/src/me/mrCookieSlime/Slimefun/ancient_altar/AltarRecipe.java +++ b/src/me/mrCookieSlime/Slimefun/ancient_altar/AltarRecipe.java @@ -5,7 +5,7 @@ import java.util.List; import org.bukkit.inventory.ItemStack; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; public class AltarRecipe { @@ -29,7 +29,7 @@ public class AltarRecipe { this.output = output; - SlimefunStartup.instance.getUtilities().altarRecipes.add(this); + SlimefunPlugin.getUtilities().altarRecipes.add(this); } public ItemStack getCatalyst() { diff --git a/src/me/mrCookieSlime/Slimefun/ancient_altar/AncientAltarListener.java b/src/me/mrCookieSlime/Slimefun/ancient_altar/AncientAltarListener.java index 56ae6592f..b92a209ec 100644 --- a/src/me/mrCookieSlime/Slimefun/ancient_altar/AncientAltarListener.java +++ b/src/me/mrCookieSlime/Slimefun/ancient_altar/AncientAltarListener.java @@ -29,7 +29,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Variable; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.CSCoreLibPlugin.general.Player.PlayerInventory; import me.mrCookieSlime.CSCoreLibPlugin.general.String.StringUtils; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Setup.Messages; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -39,10 +39,10 @@ public class AncientAltarListener implements Listener { private Utilities utilities; - public AncientAltarListener(SlimefunStartup plugin) { + public AncientAltarListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); - utilities = plugin.getUtilities(); + utilities = SlimefunPlugin.getUtilities(); } private List altars = new ArrayList<>(); @@ -73,7 +73,7 @@ public class AncientAltarListener implements Listener { final UUID uuid = stack.getUniqueId(); removedItems.add(uuid); - SlimefunStartup.instance.getServer().getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + SlimefunPlugin.instance.getServer().getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { removedItems.remove(uuid); }, 30L); @@ -112,7 +112,7 @@ public class AncientAltarListener implements Listener { List consumed = new ArrayList<>(); consumed.add(catalyst); PlayerInventory.consumeItemInHand(e.getPlayer()); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new RitualAnimation(altars, b, b.getLocation().add(0.5, 1.3, 0.5), result, pedestals, consumed), 10L); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, new RitualAnimation(altars, b, b.getLocation().add(0.5, 1.3, 0.5), result, pedestals, consumed), 10L); } else { altars.remove(e.getClickedBlock()); @@ -172,7 +172,7 @@ public class AncientAltarListener implements Listener { String nametag = StringUtils.formatItemName(stack, false); Item entity = b.getWorld().dropItem(b.getLocation().add(0.5, 1.2, 0.5), new CustomItem(new CustomItem(stack, 1), "&5&dALTAR &3Probe - &e" + System.nanoTime())); entity.setVelocity(new Vector(0, 0.1, 0)); - entity.setMetadata("no_pickup", new FixedMetadataValue(SlimefunStartup.instance, "altar_item")); + entity.setMetadata("no_pickup", new FixedMetadataValue(SlimefunPlugin.instance, "altar_item")); entity.setCustomNameVisible(true); entity.setCustomName(nametag); p.playSound(b.getLocation(), Sound.ENTITY_ITEM_PICKUP, 0.3F, 0.3F); diff --git a/src/me/mrCookieSlime/Slimefun/ancient_altar/Pedestals.java b/src/me/mrCookieSlime/Slimefun/ancient_altar/Pedestals.java index 66b21b6b1..7b23a31b2 100644 --- a/src/me/mrCookieSlime/Slimefun/ancient_altar/Pedestals.java +++ b/src/me/mrCookieSlime/Slimefun/ancient_altar/Pedestals.java @@ -8,7 +8,7 @@ import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -65,7 +65,7 @@ public final class Pedestals { } private static ItemStack checkRecipe(ItemStack catalyst, List items) { - for (AltarRecipe recipe: SlimefunStartup.instance.getUtilities().altarRecipes) { + for (AltarRecipe recipe: SlimefunPlugin.getUtilities().altarRecipes) { if (SlimefunManager.isItemSimiliar(catalyst, recipe.getCatalyst(), true)) { for (int i = 0; i < 8; i++) { if (SlimefunManager.isItemSimiliar(items.get(i), recipe.getInput().get(0), true)) { diff --git a/src/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java b/src/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java index 5939e66de..cabc5ff42 100644 --- a/src/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java +++ b/src/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.utils.Utilities; import org.bukkit.Effect; @@ -33,7 +33,7 @@ public class RitualAnimation implements Runnable { private boolean running; private int stage; - private Utilities utilities = SlimefunStartup.instance.getUtilities(); + private Utilities utilities = SlimefunPlugin.getUtilities(); public RitualAnimation(List altars, Block altar, Location drop, ItemStack output, List pedestals, List items) { this.l = drop; @@ -72,7 +72,7 @@ public class RitualAnimation implements Runnable { } this.stage += 1; - SlimefunStartup.instance.getServer().getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, this, 8); + SlimefunPlugin.instance.getServer().getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, this, 8); } private boolean checkLockedItems() { @@ -120,7 +120,7 @@ public class RitualAnimation implements Runnable { itemLock.remove(item); item.remove(); - pedestal.removeMetadata("item_placed", SlimefunStartup.instance); + pedestal.removeMetadata("item_placed", SlimefunPlugin.instance); } } diff --git a/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java b/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java index 1b415be18..b038558a2 100644 --- a/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java +++ b/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java @@ -48,7 +48,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.MenuHelper; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull; import me.mrCookieSlime.ExoticGarden.ExoticGarden; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.Category; @@ -457,8 +457,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem { switch (BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"))) { case NORTH: if (n.getLocation().getZ() < b.getZ()) { - if (n.hasMetadata("android_killer")) n.removeMetadata("android_killer", SlimefunStartup.instance); - n.setMetadata("android_killer", new FixedMetadataValue(SlimefunStartup.instance, new AndroidObject(this, b))); + if (n.hasMetadata("android_killer")) n.removeMetadata("android_killer", SlimefunPlugin.instance); + n.setMetadata("android_killer", new FixedMetadataValue(SlimefunPlugin.instance, new AndroidObject(this, b))); ((LivingEntity) n).damage(damage); return; @@ -466,8 +466,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem { break; case EAST: if (n.getLocation().getX() > b.getX()) { - if (n.hasMetadata("android_killer")) n.removeMetadata("android_killer", SlimefunStartup.instance); - n.setMetadata("android_killer", new FixedMetadataValue(SlimefunStartup.instance, new AndroidObject(this, b))); + if (n.hasMetadata("android_killer")) n.removeMetadata("android_killer", SlimefunPlugin.instance); + n.setMetadata("android_killer", new FixedMetadataValue(SlimefunPlugin.instance, new AndroidObject(this, b))); ((LivingEntity) n).damage(damage); return; @@ -475,8 +475,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem { break; case SOUTH: if (n.getLocation().getZ() > b.getZ()) { - if (n.hasMetadata("android_killer")) n.removeMetadata("android_killer", SlimefunStartup.instance); - n.setMetadata("android_killer", new FixedMetadataValue(SlimefunStartup.instance, new AndroidObject(this, b))); + if (n.hasMetadata("android_killer")) n.removeMetadata("android_killer", SlimefunPlugin.instance); + n.setMetadata("android_killer", new FixedMetadataValue(SlimefunPlugin.instance, new AndroidObject(this, b))); ((LivingEntity) n).damage(damage); return; @@ -484,8 +484,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem { break; case WEST: if (n.getLocation().getX() < b.getX()) { - if (n.hasMetadata("android_killer")) n.removeMetadata("android_killer", SlimefunStartup.instance); - n.setMetadata("android_killer", new FixedMetadataValue(SlimefunStartup.instance, new AndroidObject(this, b))); + if (n.hasMetadata("android_killer")) n.removeMetadata("android_killer", SlimefunPlugin.instance); + n.setMetadata("android_killer", new FixedMetadataValue(SlimefunPlugin.instance, new AndroidObject(this, b))); ((LivingEntity) n).damage(damage); return; @@ -677,7 +677,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { private void exoticFarm(Block b, Block block) { farm(b, block); - if (SlimefunStartup.instance.getHooks().isExoticGardenInstalled()) { + if (SlimefunPlugin.getHooks().isExoticGardenInstalled()) { ItemStack drop = ExoticGarden.harvestPlant(block); if (drop != null && fits(b, drop)) { pushItems(b, drop); diff --git a/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java index f3debba95..961c11ce1 100644 --- a/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -27,7 +27,7 @@ import com.google.gson.JsonPrimitive; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; @@ -103,7 +103,7 @@ public class BlockStorage { System.err.println("[Slimefun] should probably look into it!"); } else if (file.getName().endsWith(".sfb")) { - if (timestamp + SlimefunStartup.instance.getSettings().blocksInfoLoadingDelay < System.currentTimeMillis()) { + if (timestamp + SlimefunPlugin.getSettings().blocksInfoLoadingDelay < System.currentTimeMillis()) { System.out.println("[Slimefun] Loading Blocks... " + Math.round((((done * 100.0F) / total) * 100.0F) / 100.0F) + "% done (\"" + w.getName() + "\")"); timestamp = System.currentTimeMillis(); } @@ -446,7 +446,7 @@ public class BlockStorage { } public static void clearBlockInfo(Location l, boolean destroy) { - SlimefunStartup.ticker.delete.put(l, destroy); + SlimefunPlugin.ticker.delete.put(l, destroy); } public static void _integrated_removeBlockInfo(Location l, boolean destroy) { @@ -481,7 +481,7 @@ public class BlockStorage { } public static void moveBlockInfo(Location from, Location to) { - SlimefunStartup.ticker.move.put(from, to); + SlimefunPlugin.ticker.move.put(from, to); } @Deprecated @@ -616,7 +616,7 @@ public class BlockStorage { if (menu != null) { for (HumanEntity human : new ArrayList<>(menu.toInventory().getViewers())) { // Prevents "java.lang.IllegalStateException: Asynchronous entity add!" when closing inventory while holding an item - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> human.closeInventory()); + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> human.closeInventory()); } inventories.get(l).delete(l); diff --git a/src/me/mrCookieSlime/Slimefun/api/ErrorReport.java b/src/me/mrCookieSlime/Slimefun/api/ErrorReport.java index 3624c00be..35032ff46 100644 --- a/src/me/mrCookieSlime/Slimefun/api/ErrorReport.java +++ b/src/me/mrCookieSlime/Slimefun/api/ErrorReport.java @@ -16,7 +16,7 @@ import org.bukkit.plugin.Plugin; import me.mrCookieSlime.CSCoreLibPlugin.CSCoreLib; import me.mrCookieSlime.CSCoreLibPlugin.general.Clock; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; public class ErrorReport { @@ -46,7 +46,7 @@ public class ErrorReport { stream.println(); stream.println("Slimefun Environment:"); stream.println(" CS-CoreLib v" + CSCoreLib.getLib().getDescription().getVersion()); - stream.println(" Slimefun v" + SlimefunStartup.instance.getDescription().getVersion()); + stream.println(" Slimefun v" + SlimefunPlugin.instance.getDescription().getVersion()); stream.println(); List plugins = new ArrayList<>(); diff --git a/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java b/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java index 2e715fec6..159c5b006 100644 --- a/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java +++ b/src/me/mrCookieSlime/Slimefun/api/PlayerProfile.java @@ -15,7 +15,7 @@ import org.bukkit.ChatColor; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.Research; import me.mrCookieSlime.Slimefun.api.inventory.BackpackInventory; @@ -27,8 +27,6 @@ import me.mrCookieSlime.Slimefun.api.inventory.BackpackInventory; */ public final class PlayerProfile { - public static Map profiles = new HashMap<>(); - private UUID uuid; private Config cfg; private boolean dirty = false; @@ -161,7 +159,7 @@ public final class PlayerProfile { } public String getTitle() { - List titles = SlimefunStartup.instance.getSettings().researchesTitles; + List titles = SlimefunPlugin.getSettings().researchesTitles; int index = Math.round(Float.valueOf(String.valueOf(Math.round(((researches.size() * 100.0F) / Research.list().size()) * 100.0F) / 100.0F)) / 100.0F) * titles.size(); if (index > 0) index--; @@ -169,11 +167,11 @@ public final class PlayerProfile { } public static PlayerProfile fromUUID(UUID uuid) { - PlayerProfile profile = profiles.get(uuid); + PlayerProfile profile = SlimefunPlugin.getUtilities().profiles.get(uuid); if (profile == null) { profile = new PlayerProfile(uuid); - profiles.put(uuid, profile); + SlimefunPlugin.getUtilities().profiles.put(uuid, profile); } else { profile.markedForDeletion = false; @@ -183,11 +181,11 @@ public final class PlayerProfile { } public static boolean isLoaded(UUID uuid) { - return profiles.containsKey(uuid); + return SlimefunPlugin.getUtilities().profiles.containsKey(uuid); } public static Iterator iterator() { - return profiles.values().iterator(); + return SlimefunPlugin.getUtilities().profiles.values().iterator(); } public static BackpackInventory getBackpack(ItemStack item) { diff --git a/src/me/mrCookieSlime/Slimefun/api/Slimefun.java b/src/me/mrCookieSlime/Slimefun/api/Slimefun.java index ca9e0fddb..42e5e4544 100644 --- a/src/me/mrCookieSlime/Slimefun/api/Slimefun.java +++ b/src/me/mrCookieSlime/Slimefun/api/Slimefun.java @@ -5,19 +5,20 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Logger; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.GPS.GPSNetwork; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.Research; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem.State; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.VanillaItem; import me.mrCookieSlime.Slimefun.Setup.Messages; +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.VanillaItem; /** * Provides a few convenience methods. @@ -27,11 +28,6 @@ import me.mrCookieSlime.Slimefun.Setup.Messages; public class Slimefun { public static Map> guideHandlers = new HashMap<>(); - - /** - * Instance of the GPSNetwork. - */ - private static GPSNetwork gps = new GPSNetwork(); /** * Whether EmeraldEnchants is enabled or not. @@ -56,7 +52,11 @@ public class Slimefun { * @return the GPSNetwork instance. */ public static GPSNetwork getGPSNetwork() { - return gps; + return SlimefunPlugin.instance.gps; + } + + public static Logger getLogger() { + return SlimefunPlugin.instance.getLogger(); } /** @@ -91,7 +91,7 @@ public class Slimefun { * @return the Items.yml Config instance. */ public static Config getItemConfig() { - return SlimefunStartup.getItemCfg(); + return SlimefunPlugin.getItemCfg(); } /** @@ -207,10 +207,10 @@ public class Slimefun { String world = p.getWorld().getName(); SlimefunItem sfItem = SlimefunItem.getByItem(item); if (sfItem == null) return !SlimefunItem.isDisabled(item); - if (SlimefunStartup.getWhitelist().contains(world + ".enabled")) { - if (SlimefunStartup.getWhitelist().getBoolean(world + ".enabled")) { - if (!SlimefunStartup.getWhitelist().contains(world + ".enabled-items." + sfItem.getID())) SlimefunStartup.getWhitelist().setDefaultValue(world + ".enabled-items." + sfItem.getID(), true); - if (SlimefunStartup.getWhitelist().getBoolean(world + ".enabled-items." + sfItem.getID())) return true; + if (SlimefunPlugin.getWhitelist().contains(world + ".enabled")) { + if (SlimefunPlugin.getWhitelist().getBoolean(world + ".enabled")) { + if (!SlimefunPlugin.getWhitelist().contains(world + ".enabled-items." + sfItem.getID())) SlimefunPlugin.getWhitelist().setDefaultValue(world + ".enabled-items." + sfItem.getID(), true); + if (SlimefunPlugin.getWhitelist().getBoolean(world + ".enabled-items." + sfItem.getID())) return true; else { if (message) Messages.local.sendTranslation(p, "messages.disabled-in-world", true); return false; @@ -236,10 +236,10 @@ public class Slimefun { */ public static boolean isEnabled(Player p, SlimefunItem sfItem, boolean message) { String world = p.getWorld().getName(); - if (SlimefunStartup.getWhitelist().contains(world + ".enabled")) { - if (SlimefunStartup.getWhitelist().getBoolean(world + ".enabled")) { - if (!SlimefunStartup.getWhitelist().contains(world + ".enabled-items." + sfItem.getID())) SlimefunStartup.getWhitelist().setDefaultValue(world + ".enabled-items." + sfItem.getID(), true); - if (SlimefunStartup.getWhitelist().getBoolean(world + ".enabled-items." + sfItem.getID())) return true; + if (SlimefunPlugin.getWhitelist().contains(world + ".enabled")) { + if (SlimefunPlugin.getWhitelist().getBoolean(world + ".enabled")) { + if (!SlimefunPlugin.getWhitelist().contains(world + ".enabled-items." + sfItem.getID())) SlimefunPlugin.getWhitelist().setDefaultValue(world + ".enabled-items." + sfItem.getID(), true); + if (SlimefunPlugin.getWhitelist().getBoolean(world + ".enabled-items." + sfItem.getID())) return true; else { if (message) Messages.local.sendTranslation(p, "messages.disabled-in-world", true); return false; diff --git a/src/me/mrCookieSlime/Slimefun/api/SlimefunGuideLayout.java b/src/me/mrCookieSlime/Slimefun/api/SlimefunGuideLayout.java new file mode 100644 index 000000000..d46fea780 --- /dev/null +++ b/src/me/mrCookieSlime/Slimefun/api/SlimefunGuideLayout.java @@ -0,0 +1,9 @@ +package me.mrCookieSlime.Slimefun.api; + +public enum SlimefunGuideLayout { + + BOOK, + CHEST, + CHEAT_SHEET; + +} diff --git a/src/me/mrCookieSlime/Slimefun/api/Soul.java b/src/me/mrCookieSlime/Slimefun/api/Soul.java index f6aa9b44a..a516a216e 100644 --- a/src/me/mrCookieSlime/Slimefun/api/Soul.java +++ b/src/me/mrCookieSlime/Slimefun/api/Soul.java @@ -7,25 +7,25 @@ import java.util.UUID; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; public final class Soul { private Soul() {} public static void storeItem(UUID uuid, int slot, ItemStack item) { - Map items = SlimefunStartup.instance.getUtilities().soulbound.get(uuid); + Map items = SlimefunPlugin.getUtilities().soulbound.get(uuid); if (items == null) { items = new HashMap<>(); - SlimefunStartup.instance.getUtilities().soulbound.put(uuid, items); + SlimefunPlugin.getUtilities().soulbound.put(uuid, items); } items.put(slot, item); } public static void retrieveItems(Player p) { - Map items = SlimefunStartup.instance.getUtilities().soulbound.get(p.getUniqueId()); + Map items = SlimefunPlugin.getUtilities().soulbound.get(p.getUniqueId()); if (items != null) { for (Map.Entry entry: items.entrySet()) { @@ -33,7 +33,7 @@ public final class Soul { } } - SlimefunStartup.instance.getUtilities().soulbound.remove(p.getUniqueId()); + SlimefunPlugin.getUtilities().soulbound.remove(p.getUniqueId()); } } diff --git a/src/me/mrCookieSlime/Slimefun/api/TickerTask.java b/src/me/mrCookieSlime/Slimefun/api/TickerTask.java index 1c45e5ba0..0dab94603 100644 --- a/src/me/mrCookieSlime/Slimefun/api/TickerTask.java +++ b/src/me/mrCookieSlime/Slimefun/api/TickerTask.java @@ -17,7 +17,7 @@ import org.bukkit.entity.Player; import me.mrCookieSlime.CSCoreLibPlugin.general.Chat.TellRawMessage; import me.mrCookieSlime.CSCoreLibPlugin.general.Chat.TellRawMessage.HoverAction; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; @@ -85,7 +85,7 @@ public class TickerTask implements Runnable { item.getBlockTicker().update(); if (item.getBlockTicker().isSynchronized()) { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { try { long timestamp3 = System.currentTimeMillis(); item.getBlockTicker().tick(b, item, BlockStorage.getLocationInfo(l)); @@ -120,7 +120,7 @@ public class TickerTask implements Runnable { BlockStorage._integrated_removeBlockInfo(l, true); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { l.getBlock().setType(Material.AIR); }); } @@ -162,7 +162,7 @@ public class TickerTask implements Runnable { BlockStorage._integrated_removeBlockInfo(l, true); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { l.getBlock().setType(Material.AIR); }); } diff --git a/src/me/mrCookieSlime/Slimefun/api/energy/ChargableBlock.java b/src/me/mrCookieSlime/Slimefun/api/energy/ChargableBlock.java index 1193beeeb..9c23572ed 100644 --- a/src/me/mrCookieSlime/Slimefun/api/energy/ChargableBlock.java +++ b/src/me/mrCookieSlime/Slimefun/api/energy/ChargableBlock.java @@ -8,7 +8,7 @@ import java.util.Set; import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.api.BlockStorage; import org.bukkit.Bukkit; @@ -106,7 +106,7 @@ public class ChargableBlock { } private static void updateTexture(final Location l) throws Exception { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { try { Block b = l.getBlock(); int charge = getCharge(b); diff --git a/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java b/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java index c923f0a89..aca8d89e3 100644 --- a/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java +++ b/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java @@ -9,7 +9,7 @@ import org.bukkit.Material; import org.bukkit.block.Block; import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.network.Network; @@ -141,7 +141,7 @@ public class EnergyNet extends Network { if (item.getEnergyTicker().explode(source)) { exploded.add(source); BlockStorage.clearBlockInfo(source); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { source.getBlock().setType(Material.LAVA); source.getWorld().createExplosion(source, 0F, false); }); @@ -149,7 +149,7 @@ public class EnergyNet extends Network { else { supply = supply + energy; } - SlimefunStartup.ticker.blockTimings.put(source, System.currentTimeMillis() - timestamp); + SlimefunPlugin.ticker.blockTimings.put(source, System.currentTimeMillis() - timestamp); } input.removeAll(exploded); diff --git a/src/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java b/src/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java index cbac22094..70ccf5175 100644 --- a/src/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java +++ b/src/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java @@ -12,7 +12,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow; public abstract class BlockMenuPreset extends ChestMenu { @@ -161,7 +161,7 @@ public abstract class BlockMenuPreset extends ChestMenu { } public void newInstance(final BlockMenu menu, final Location l) { - Bukkit.getScheduler().runTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().runTask(SlimefunPlugin.instance, () -> { newInstance(menu, l.getBlock()); }); } diff --git a/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java b/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java index 0e3a8629c..66c2063f0 100644 --- a/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java +++ b/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java @@ -24,7 +24,7 @@ import org.bukkit.inventory.meta.ItemMeta; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.MenuClickHandler; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; @@ -188,7 +188,7 @@ public class CargoNet extends Network { CargoNet self = this; final BlockStorage storage = BlockStorage.getStorage(b.getWorld()); - SlimefunStartup.instance.getServer().getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + SlimefunPlugin.instance.getServer().getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { if (BlockStorage.getLocationInfo(b.getLocation(), "visualizer") == null) { self.display(); } diff --git a/src/me/mrCookieSlime/Slimefun/api/item_transport/ChestManipulator.java b/src/me/mrCookieSlime/Slimefun/api/item_transport/ChestManipulator.java index a97d8f244..a562c90d3 100644 --- a/src/me/mrCookieSlime/Slimefun/api/item_transport/ChestManipulator.java +++ b/src/me/mrCookieSlime/Slimefun/api/item_transport/ChestManipulator.java @@ -3,18 +3,18 @@ package me.mrCookieSlime.Slimefun.api.item_transport; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; public final class ChestManipulator { private ChestManipulator() {} public static void registerListener(CargoTransportEvent listener) { - SlimefunStartup.instance.getUtilities().cargoTransportEvents.add(listener); + SlimefunPlugin.getUtilities().cargoTransportEvents.add(listener); } public static ItemStack trigger(Block b, int slot, ItemStack prev, ItemStack next) { - for (CargoTransportEvent listener: SlimefunStartup.instance.getUtilities().cargoTransportEvents) { + for (CargoTransportEvent listener: SlimefunPlugin.getUtilities().cargoTransportEvents) { next = listener.onEvent(b, slot, prev, next); } diff --git a/src/me/mrCookieSlime/Slimefun/api/network/Network.java b/src/me/mrCookieSlime/Slimefun/api/network/Network.java index 4bf4d5fea..c39c911d7 100644 --- a/src/me/mrCookieSlime/Slimefun/api/network/Network.java +++ b/src/me/mrCookieSlime/Slimefun/api/network/Network.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import org.bukkit.Location; import me.mrCookieSlime.CSCoreLibPlugin.general.Particles.MC_1_13.ParticleEffect; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; public abstract class Network { @@ -155,7 +155,7 @@ public abstract class Network { } public void display() { - SlimefunStartup.instance.getServer().getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + SlimefunPlugin.instance.getServer().getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { for(Location l: connectedLocations) { try { ParticleEffect.REDSTONE.display(l.clone().add(0.5, 0.5, 0.5), 0, 0, 0, 1, 1); diff --git a/src/me/mrCookieSlime/Slimefun/autosave/BlockAutoSaver.java b/src/me/mrCookieSlime/Slimefun/autosave/BlockAutoSaver.java index db39f8bbf..74cc141a5 100644 --- a/src/me/mrCookieSlime/Slimefun/autosave/BlockAutoSaver.java +++ b/src/me/mrCookieSlime/Slimefun/autosave/BlockAutoSaver.java @@ -6,7 +6,7 @@ import java.util.Set; import org.bukkit.Bukkit; import org.bukkit.World; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.api.BlockStorage; public class BlockAutoSaver implements Runnable { @@ -27,7 +27,7 @@ public class BlockAutoSaver implements Runnable { } if (!worlds.isEmpty()) { - System.out.println("[Slimefun] Auto-Saving Block Data... (Next Auto-Save: " + SlimefunStartup.getCfg().getInt("options.auto-save-delay-in-minutes") + "m)"); + System.out.println("[Slimefun] Auto-Saving Block Data... (Next Auto-Save: " + SlimefunPlugin.getCfg().getInt("options.auto-save-delay-in-minutes") + "m)"); for (BlockStorage storage: worlds) { storage.save(false); diff --git a/src/me/mrCookieSlime/Slimefun/commands/SlimefunCommand.java b/src/me/mrCookieSlime/Slimefun/commands/SlimefunCommand.java index 5a9efbfd0..761b6d72b 100644 --- a/src/me/mrCookieSlime/Slimefun/commands/SlimefunCommand.java +++ b/src/me/mrCookieSlime/Slimefun/commands/SlimefunCommand.java @@ -27,26 +27,26 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Reflection.ReflectionUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.World.TitleBuilder; import me.mrCookieSlime.CSCoreLibPlugin.general.World.TitleBuilder.TitleType; import me.mrCookieSlime.Slimefun.SlimefunGuide; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.GPS.GPSNetwork; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; -import me.mrCookieSlime.Slimefun.Misc.BookDesign; import me.mrCookieSlime.Slimefun.Objects.Research; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Setup.Messages; import me.mrCookieSlime.Slimefun.api.BlockStorage; +import me.mrCookieSlime.Slimefun.api.SlimefunGuideLayout; import me.mrCookieSlime.Slimefun.api.PlayerProfile; import me.mrCookieSlime.Slimefun.api.Slimefun; public class SlimefunCommand implements CommandExecutor, Listener { - public SlimefunStartup plugin; + public SlimefunPlugin plugin; public static List arguments = new ArrayList<>(); public static List descriptions = new ArrayList<>(); public static List tabs = new ArrayList<>(); - public SlimefunCommand(SlimefunStartup plugin) { + public SlimefunCommand(SlimefunPlugin plugin) { this.plugin = plugin; arguments.add("/sf help"); @@ -107,14 +107,14 @@ public class SlimefunCommand implements CommandExecutor, Listener { } else if (args[0].equalsIgnoreCase("guide")) { if (sender instanceof Player) { - if (sender.hasPermission("slimefun.command.guide")) ((Player) sender).getInventory().addItem(SlimefunGuide.getItem(SlimefunStartup.getCfg().getBoolean("guide.default-view-book") ? BookDesign.BOOK : BookDesign.CHEST)); + if (sender.hasPermission("slimefun.command.guide")) ((Player) sender).getInventory().addItem(SlimefunGuide.getItem(SlimefunPlugin.getCfg().getBoolean("guide.default-view-book") ? SlimefunGuideLayout.BOOK : SlimefunGuideLayout.CHEST)); else Messages.local.sendTranslation(sender, "messages.no-permission", true); } else Messages.local.sendTranslation(sender, "messages.only-players", true); } else if (args[0].equalsIgnoreCase("open_guide")) { if (sender instanceof Player) { - if (sender.hasPermission("slimefun.command.open_guide")) SlimefunGuide.openGuide((Player) sender, SlimefunStartup.getCfg().getBoolean("guide.default-view-book")); + if (sender.hasPermission("slimefun.command.open_guide")) SlimefunGuide.openGuide((Player) sender, SlimefunPlugin.getCfg().getBoolean("guide.default-view-book")); else Messages.local.sendTranslation(sender, "messages.no-permission", true); } else Messages.local.sendTranslation(sender, "messages.only-players", true); @@ -143,7 +143,7 @@ public class SlimefunCommand implements CommandExecutor, Listener { double z = Integer.parseInt(args[3]) + 0.5D; if (BlockStorage.getLocationInfo(((Player) sender).getWorld().getBlockAt(Integer.parseInt(args[1]), Integer.parseInt(args[2]), Integer.parseInt(args[3])).getLocation(), "floor") != null) { - plugin.getUtilities().elevatorUsers.add(((Player) sender).getUniqueId()); + SlimefunPlugin.getUtilities().elevatorUsers.add(((Player) sender).getUniqueId()); float yaw = ((Player) sender).getEyeLocation().getYaw() + 180; if (yaw > 180) yaw = -180 + (yaw - 180); ((Player) sender).teleport(new Location(((Player) sender).getWorld(), x, y, z, yaw, ((Player) sender).getEyeLocation().getPitch())); @@ -161,7 +161,7 @@ public class SlimefunCommand implements CommandExecutor, Listener { } else if (args[0].equalsIgnoreCase("timings")) { if (sender.hasPermission("slimefun.command.timings")|| sender instanceof ConsoleCommandSender) { - SlimefunStartup.ticker.info(sender); + SlimefunPlugin.ticker.info(sender); } else Messages.local.sendTranslation(sender, "messages.no-permission", true); } diff --git a/src/me/mrCookieSlime/Slimefun/holograms/CargoHologram.java b/src/me/mrCookieSlime/Slimefun/holograms/CargoHologram.java index e34b796de..c1db9d860 100644 --- a/src/me/mrCookieSlime/Slimefun/holograms/CargoHologram.java +++ b/src/me/mrCookieSlime/Slimefun/holograms/CargoHologram.java @@ -8,14 +8,14 @@ import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Entity; import me.mrCookieSlime.CSCoreLibPlugin.general.World.ArmorStandFactory; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; public final class CargoHologram { private CargoHologram() {} public static void update(final Block b, final String name) { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { ArmorStand hologram = getArmorStand(b, true); hologram.setCustomName(ChatColor.translateAlternateColorCodes('&', name)); }); diff --git a/src/me/mrCookieSlime/Slimefun/holograms/EnergyHologram.java b/src/me/mrCookieSlime/Slimefun/holograms/EnergyHologram.java index 583d4cb30..5625467e9 100644 --- a/src/me/mrCookieSlime/Slimefun/holograms/EnergyHologram.java +++ b/src/me/mrCookieSlime/Slimefun/holograms/EnergyHologram.java @@ -9,7 +9,7 @@ import org.bukkit.entity.Entity; import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; import me.mrCookieSlime.CSCoreLibPlugin.general.World.ArmorStandFactory; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; public final class EnergyHologram { @@ -20,14 +20,14 @@ public final class EnergyHologram { } public static void update(final Block b, final String name) { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { ArmorStand hologram = getArmorStand(b, true); hologram.setCustomName(ChatColor.translateAlternateColorCodes('&', name)); }); } public static void remove(final Block b) { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { ArmorStand hologram = getArmorStand(b, false); if (hologram != null) hologram.remove(); }); diff --git a/src/me/mrCookieSlime/Slimefun/holograms/ReactorHologram.java b/src/me/mrCookieSlime/Slimefun/holograms/ReactorHologram.java index 51a6ad6b9..f05dc9921 100644 --- a/src/me/mrCookieSlime/Slimefun/holograms/ReactorHologram.java +++ b/src/me/mrCookieSlime/Slimefun/holograms/ReactorHologram.java @@ -7,7 +7,7 @@ import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Entity; import me.mrCookieSlime.CSCoreLibPlugin.general.World.ArmorStandFactory; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; public final class ReactorHologram { @@ -29,7 +29,7 @@ public final class ReactorHologram { } public static void update(final Location l, final String name) { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { ArmorStand hologram = getArmorStand(l, true); if (!hologram.isCustomNameVisible()) hologram.setCustomNameVisible(true); hologram.setCustomName(ChatColor.translateAlternateColorCodes('&', name)); @@ -37,7 +37,7 @@ public final class ReactorHologram { } public static void remove(Location l) { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { ArmorStand hologram = getArmorStand(l, false); if (hologram != null) hologram.remove(); }); diff --git a/src/me/mrCookieSlime/Slimefun/hooks/ClearLagHook.java b/src/me/mrCookieSlime/Slimefun/hooks/ClearLagHook.java index a09402f5a..170e1c27b 100644 --- a/src/me/mrCookieSlime/Slimefun/hooks/ClearLagHook.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/ClearLagHook.java @@ -3,7 +3,7 @@ package me.mrCookieSlime.Slimefun.hooks; import java.util.Iterator; import me.minebuilders.clearlag.events.EntityRemoveEvent; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import org.bukkit.entity.Entity; import org.bukkit.entity.Item; @@ -12,7 +12,7 @@ import org.bukkit.event.Listener; public class ClearLagHook implements Listener { - public ClearLagHook(SlimefunStartup plugin) { + public ClearLagHook(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } diff --git a/src/me/mrCookieSlime/Slimefun/hooks/PlaceholderAPIHook.java b/src/me/mrCookieSlime/Slimefun/hooks/PlaceholderAPIHook.java index 8013f0475..11f0b9b6a 100644 --- a/src/me/mrCookieSlime/Slimefun/hooks/PlaceholderAPIHook.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/PlaceholderAPIHook.java @@ -6,7 +6,7 @@ import java.util.stream.Stream; import org.bukkit.OfflinePlayer; import me.clip.placeholderapi.expansion.PlaceholderExpansion; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.Research; import me.mrCookieSlime.Slimefun.api.PlayerProfile; import me.mrCookieSlime.Slimefun.api.Slimefun; @@ -15,7 +15,7 @@ public class PlaceholderAPIHook extends PlaceholderExpansion { @Override public String getAuthor() { - return SlimefunStartup.instance.getDescription().getAuthors().toString(); + return SlimefunPlugin.instance.getDescription().getAuthors().toString(); } @Override @@ -25,7 +25,7 @@ public class PlaceholderAPIHook extends PlaceholderExpansion { @Override public String getVersion() { - return SlimefunStartup.instance.getDescription().getVersion(); + return SlimefunPlugin.instance.getDescription().getVersion(); } @Override @@ -68,7 +68,7 @@ public class PlaceholderAPIHook extends PlaceholderExpansion { } if (params.equals("timings_lag")) { - return SlimefunStartup.ticker.getTime() + "ms"; + return SlimefunPlugin.ticker.getTime() + "ms"; } return null; diff --git a/src/me/mrCookieSlime/Slimefun/hooks/SlimefunHooks.java b/src/me/mrCookieSlime/Slimefun/hooks/SlimefunHooks.java index b3147e044..9ca1e5998 100644 --- a/src/me/mrCookieSlime/Slimefun/hooks/SlimefunHooks.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/SlimefunHooks.java @@ -1,6 +1,6 @@ package me.mrCookieSlime.Slimefun.hooks; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import net.coreprotect.CoreProtect; import net.coreprotect.CoreProtectAPI; @@ -14,7 +14,7 @@ public final class SlimefunHooks { private CoreProtectAPI coreProtectAPI; - public SlimefunHooks(SlimefunStartup plugin) { + public SlimefunHooks(SlimefunPlugin plugin) { if (plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) { placeHolderAPI = true; new PlaceholderAPIHook().register(); diff --git a/src/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java b/src/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java index 11538074b..c165ce4eb 100644 --- a/src/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java @@ -1,6 +1,6 @@ package me.mrCookieSlime.Slimefun.hooks.github; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; /** * Represents a contributor on Slimefun4's GitHub repository. @@ -69,6 +69,6 @@ public class Contributor { * @return A Base64-Head Texture */ public String getTexture() { - return SlimefunStartup.instance.getUtilities().contributorHeads.get(name); + return SlimefunPlugin.getUtilities().contributorHeads.get(name); } } diff --git a/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubConnector.java b/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubConnector.java index 0cc5f1bee..01da5119f 100644 --- a/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubConnector.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubConnector.java @@ -13,7 +13,7 @@ import java.nio.channels.ReadableByteChannel; import com.google.gson.JsonElement; import com.google.gson.JsonParser; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; public abstract class GitHubConnector { @@ -21,7 +21,7 @@ public abstract class GitHubConnector { public GitHubConnector() { this.file = new File("plugins/Slimefun/cache/github/" + this.getFileName() + ".json"); - SlimefunStartup.instance.getUtilities().connectors.add(this); + SlimefunPlugin.getUtilities().connectors.add(this); } public abstract String getFileName(); @@ -31,7 +31,7 @@ public abstract class GitHubConnector { public abstract void onFailure(); public void pullFile() { - if (SlimefunStartup.getCfg().getBoolean("options.print-out-github-data-retrieving")) System.out.println("[Slimefun - GitHub] Retrieving '" + this.getFileName() + ".json' from GitHub..."); + if (SlimefunPlugin.getCfg().getBoolean("options.print-out-github-data-retrieving")) System.out.println("[Slimefun - GitHub] Retrieving '" + this.getFileName() + ".json' from GitHub..."); try { URL website = new URL("https://api.github.com/repos/" + this.getRepository() + this.getURLSuffix()); @@ -48,7 +48,7 @@ public abstract class GitHubConnector { } } } catch (IOException e) { - if (SlimefunStartup.getCfg().getBoolean("options.print-out-github-data-retrieving")) System.err.println("[Slimefun - GitHub] ERROR - Could not connect to GitHub in time."); + if (SlimefunPlugin.getCfg().getBoolean("options.print-out-github-data-retrieving")) System.err.println("[Slimefun - GitHub] ERROR - Could not connect to GitHub in time."); if (hasData()) { this.parseData(); diff --git a/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java b/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java index ea3c9bfc6..fbda31bb9 100644 --- a/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java @@ -10,7 +10,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import me.mrCookieSlime.Slimefun.SlimefunGuide; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; public final class GitHubSetup { @@ -21,7 +21,7 @@ public final class GitHubSetup { @Override public void onSuccess(JsonElement element) { - SlimefunStartup.instance.getUtilities().contributors.clear(); + SlimefunPlugin.getUtilities().contributors.clear(); JsonArray array = element.getAsJsonArray(); for (int i = 0; i < array.size(); i++) { @@ -35,16 +35,16 @@ public final class GitHubSetup { if (!name.equals("invalid-email-address")) { Contributor contributor = new Contributor(name, job, commits); contributor.setProfile(profile); - SlimefunStartup.instance.getUtilities().contributors.add(contributor); + SlimefunPlugin.getUtilities().contributors.add(contributor); } } - SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0)); + SlimefunPlugin.getUtilities().contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0)); - SlimefunStartup.instance.getServer().getScheduler().runTaskAsynchronously(SlimefunStartup.instance, () -> { + SlimefunPlugin.instance.getServer().getScheduler().runTaskAsynchronously(SlimefunPlugin.instance, () -> { for (JsonElement e: array) { String name = e.getAsJsonObject().get("login").getAsString(); - if (SlimefunStartup.instance.getUtilities().contributorHeads.containsKey(name)) { + if (SlimefunPlugin.getUtilities().contributorHeads.containsKey(name)) { continue; } @@ -62,12 +62,12 @@ public final class GitHubSetup { for (JsonElement el: properties) { if (el.isJsonObject() && el.getAsJsonObject().get("name").getAsString().equals("textures")) { - SlimefunStartup.instance.getUtilities().contributorHeads.put(name, el.getAsJsonObject().get("value").getAsString()); + SlimefunPlugin.getUtilities().contributorHeads.put(name, el.getAsJsonObject().get("value").getAsString()); break; } } } catch (Exception x) { - SlimefunStartup.instance.getUtilities().contributorHeads.put(name, null); + SlimefunPlugin.getUtilities().contributorHeads.put(name, null); } finally { if (profileReader != null) { try { @@ -90,10 +90,10 @@ public final class GitHubSetup { @Override public void onFailure() { - SlimefunStartup.instance.getUtilities().contributors.clear(); - SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("TheBusyBiscuit", "&cAuthor", 3)); - SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("John000708", "&cAuthor", 2)); - SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0)); + SlimefunPlugin.getUtilities().contributors.clear(); + SlimefunPlugin.getUtilities().contributors.add(new Contributor("TheBusyBiscuit", "&cAuthor", 3)); + SlimefunPlugin.getUtilities().contributors.add(new Contributor("John000708", "&cAuthor", 2)); + SlimefunPlugin.getUtilities().contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0)); } @Override diff --git a/src/me/mrCookieSlime/Slimefun/listeners/AndroidKillingListener.java b/src/me/mrCookieSlime/Slimefun/listeners/AndroidKillingListener.java index 77444e6dc..36d33a926 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/AndroidKillingListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/AndroidKillingListener.java @@ -16,12 +16,12 @@ import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.CSCoreLib; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.androids.AndroidObject; public class AndroidKillingListener implements Listener { - public AndroidKillingListener(SlimefunStartup plugin) { + public AndroidKillingListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } @@ -30,7 +30,7 @@ public class AndroidKillingListener implements Listener { if (e.getEntity().hasMetadata("android_killer")) { final AndroidObject obj = (AndroidObject) e.getEntity().getMetadata("android_killer").get(0).value(); - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { List items = new ArrayList<>(); for (Entity n : e.getEntity().getNearbyEntities(0.5D, 0.5D, 0.5D)) { diff --git a/src/me/mrCookieSlime/Slimefun/listeners/ArmorListener.java b/src/me/mrCookieSlime/Slimefun/listeners/ArmorListener.java index f6092db7b..14eea8608 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/ArmorListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/ArmorListener.java @@ -1,6 +1,6 @@ package me.mrCookieSlime.Slimefun.listeners; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; @@ -28,7 +28,7 @@ import org.bukkit.util.Vector; public class ArmorListener implements Listener { - public ArmorListener(SlimefunStartup plugin) { + public ArmorListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/AutonomousToolsListener.java b/src/me/mrCookieSlime/Slimefun/listeners/AutonomousToolsListener.java index b821f28ae..41ccc545a 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/AutonomousToolsListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/AutonomousToolsListener.java @@ -9,7 +9,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockDispenseEvent; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.handlers.AutonomousMachineHandler; import me.mrCookieSlime.Slimefun.Objects.handlers.ItemHandler; @@ -17,7 +17,7 @@ import me.mrCookieSlime.Slimefun.api.BlockStorage; public class AutonomousToolsListener implements Listener { - public AutonomousToolsListener(SlimefunStartup plugin) { + public AutonomousToolsListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java b/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java index a0545dba6..bfcba58bb 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/BackpackListener.java @@ -17,7 +17,7 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Juice; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunBackpack; @@ -33,9 +33,9 @@ public class BackpackListener implements Listener { private Utilities utilities; - public BackpackListener(SlimefunStartup plugin) { + public BackpackListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); - utilities = plugin.getUtilities(); + utilities = SlimefunPlugin.getUtilities(); } @EventHandler diff --git a/src/me/mrCookieSlime/Slimefun/listeners/BlockListener.java b/src/me/mrCookieSlime/Slimefun/listeners/BlockListener.java index 5e0042bde..3da3d870c 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/BlockListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/BlockListener.java @@ -20,7 +20,7 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Block.BlockAdjacents; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Events.MultiBlockInteractEvent; import me.mrCookieSlime.Slimefun.Objects.MultiBlock; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; @@ -30,7 +30,7 @@ import me.mrCookieSlime.Slimefun.api.BlockStorage; public class BlockListener implements Listener { - public BlockListener(SlimefunStartup plugin) { + public BlockListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/BowListener.java b/src/me/mrCookieSlime/Slimefun/listeners/BowListener.java index ef8cb24b2..96509a083 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/BowListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/BowListener.java @@ -14,7 +14,7 @@ import org.bukkit.event.entity.EntityShootBowEvent; import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.util.Vector; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.handlers.BowShootHandler; import me.mrCookieSlime.Slimefun.Objects.handlers.ItemHandler; @@ -24,9 +24,9 @@ public class BowListener implements Listener { private Utilities utilities; - public BowListener(SlimefunStartup plugin) { + public BowListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); - utilities = plugin.getUtilities(); + utilities = SlimefunPlugin.getUtilities(); } @EventHandler @@ -37,7 +37,7 @@ public class BowListener implements Listener { @EventHandler public void onArrowHit(final ProjectileHitEvent e) { - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { if (!e.getEntity().isValid()) return; if (utilities.arrows.containsKey(e.getEntity().getUniqueId())) utilities.arrows.remove(e.getEntity().getUniqueId()); if (e.getEntity() instanceof Arrow) handleGrapplingHook((Arrow) e.getEntity()); @@ -58,7 +58,7 @@ public class BowListener implements Listener { n.remove(); } - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { utilities.jumpState.remove(p.getUniqueId()); utilities.remove.remove(p.getUniqueId()); }, 20L); @@ -87,7 +87,7 @@ public class BowListener implements Listener { n.remove(); } - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { utilities.jumpState.remove(p.getUniqueId()); utilities.remove.remove(p.getUniqueId()); }, 20L); diff --git a/src/me/mrCookieSlime/Slimefun/listeners/CoolerListener.java b/src/me/mrCookieSlime/Slimefun/listeners/CoolerListener.java index 81e3cf788..2f86191e3 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/CoolerListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/CoolerListener.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.PotionMeta; import org.bukkit.potion.PotionEffect; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; import me.mrCookieSlime.Slimefun.api.PlayerProfile; @@ -19,7 +19,7 @@ import me.mrCookieSlime.Slimefun.api.inventory.BackpackInventory; public class CoolerListener implements Listener { - public CoolerListener(SlimefunStartup plugin) { + public CoolerListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java b/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java index 4bad8a871..89d6fadd5 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java @@ -27,7 +27,7 @@ import org.bukkit.inventory.meta.SkullMeta; import me.mrCookieSlime.EmeraldEnchants.EmeraldEnchants; import me.mrCookieSlime.EmeraldEnchants.ItemEnchantment; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SoulboundItem; @@ -43,9 +43,9 @@ public class DamageListener implements Listener { private Utilities utilities; private Random random = new Random(); - public DamageListener(SlimefunStartup plugin) { + public DamageListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); - utilities = plugin.getUtilities(); + utilities = SlimefunPlugin.getUtilities(); } @EventHandler diff --git a/src/me/mrCookieSlime/Slimefun/listeners/FurnaceListener.java b/src/me/mrCookieSlime/Slimefun/listeners/FurnaceListener.java index 691e9995d..829fd1d14 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/FurnaceListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/FurnaceListener.java @@ -10,14 +10,14 @@ import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.CSCoreLibPlugin.general.Recipe.RecipeCalculator; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.EnhancedFurnace; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.api.BlockStorage; public class FurnaceListener implements Listener { - public FurnaceListener(SlimefunStartup plugin) { + public FurnaceListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/GearListener.java b/src/me/mrCookieSlime/Slimefun/listeners/GearListener.java index 438982cd8..cc197b9ec 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/GearListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/GearListener.java @@ -1,6 +1,6 @@ package me.mrCookieSlime.Slimefun.listeners; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.JetBoots; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Jetpack; @@ -19,7 +19,7 @@ import org.bukkit.event.player.PlayerToggleSneakEvent; public class GearListener implements Listener { - public GearListener(SlimefunStartup plugin) { + public GearListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } @@ -37,13 +37,13 @@ public class GearListener implements Listener { if (thrust > 0.2) { JetpackTask task = new JetpackTask(p, thrust); - task.setID(Bukkit.getScheduler().scheduleSyncRepeatingTask(SlimefunStartup.instance, task, 0L, 3L)); + task.setID(Bukkit.getScheduler().scheduleSyncRepeatingTask(SlimefunPlugin.instance, task, 0L, 3L)); } } } else if (item.isItem(SlimefunItems.PARACHUTE) && Slimefun.hasUnlocked(p, SlimefunItems.PARACHUTE, true)) { ParachuteTask task = new ParachuteTask(p); - task.setID(Bukkit.getScheduler().scheduleSyncRepeatingTask(SlimefunStartup.instance, task, 0L, 3L)); + task.setID(Bukkit.getScheduler().scheduleSyncRepeatingTask(SlimefunPlugin.instance, task, 0L, 3L)); } } if (SlimefunItem.getByItem(p.getInventory().getBoots()) != null) { @@ -53,13 +53,13 @@ public class GearListener implements Listener { double speed = ((JetBoots) item).getSpeed(); if (speed > 0.2) { JetBootsTask task = new JetBootsTask(p, speed); - task.setID(Bukkit.getScheduler().scheduleSyncRepeatingTask(SlimefunStartup.instance, task, 0L, 2L)); + task.setID(Bukkit.getScheduler().scheduleSyncRepeatingTask(SlimefunPlugin.instance, task, 0L, 2L)); } } } if (p.getInventory().containsAtLeast(SlimefunItems.INFUSED_MAGNET, 1)) { MagnetTask task = new MagnetTask(p); - task.setID(Bukkit.getScheduler().scheduleSyncRepeatingTask(SlimefunStartup.instance, task, 0L, 8L)); + task.setID(Bukkit.getScheduler().scheduleSyncRepeatingTask(SlimefunPlugin.instance, task, 0L, 8L)); } } } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/GuideOnJoinListener.java b/src/me/mrCookieSlime/Slimefun/listeners/GuideOnJoinListener.java index aa526499e..0dc47e2a6 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/GuideOnJoinListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/GuideOnJoinListener.java @@ -6,12 +6,12 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import me.mrCookieSlime.Slimefun.SlimefunGuide; -import me.mrCookieSlime.Slimefun.SlimefunStartup; -import me.mrCookieSlime.Slimefun.Misc.BookDesign; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; +import me.mrCookieSlime.Slimefun.api.SlimefunGuideLayout; public class GuideOnJoinListener implements Listener { - public GuideOnJoinListener(SlimefunStartup plugin) { + public GuideOnJoinListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } @@ -19,10 +19,10 @@ public class GuideOnJoinListener implements Listener { public void onJoin(PlayerJoinEvent e) { if (!e.getPlayer().hasPlayedBefore()) { Player p = e.getPlayer(); - if (!SlimefunStartup.getWhitelist().getBoolean(p.getWorld().getName() + ".enabled")) return; - if (!SlimefunStartup.getWhitelist().getBoolean(p.getWorld().getName() + ".enabled-items.SLIMEFUN_GUIDE")) return; + if (!SlimefunPlugin.getWhitelist().getBoolean(p.getWorld().getName() + ".enabled")) return; + if (!SlimefunPlugin.getWhitelist().getBoolean(p.getWorld().getName() + ".enabled-items.SLIMEFUN_GUIDE")) return; - BookDesign type = SlimefunStartup.getCfg().getBoolean("guide.default-view-book") ? BookDesign.BOOK : BookDesign.CHEST; + SlimefunGuideLayout type = SlimefunPlugin.getCfg().getBoolean("guide.default-view-book") ? SlimefunGuideLayout.BOOK : SlimefunGuideLayout.CHEST; p.getInventory().addItem(SlimefunGuide.getItem(type)); } } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java b/src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java index e04a52179..16f28b490 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java @@ -41,9 +41,8 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.InvUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.Player.PlayerInventory; import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull; import me.mrCookieSlime.Slimefun.SlimefunGuide; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; -import me.mrCookieSlime.Slimefun.Misc.BookDesign; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Juice; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.MultiTool; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; @@ -52,6 +51,7 @@ import me.mrCookieSlime.Slimefun.Objects.handlers.ItemInteractionHandler; import me.mrCookieSlime.Slimefun.Setup.Messages; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; import me.mrCookieSlime.Slimefun.api.BlockStorage; +import me.mrCookieSlime.Slimefun.api.SlimefunGuideLayout; import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock; import me.mrCookieSlime.Slimefun.api.energy.ItemEnergy; @@ -64,9 +64,9 @@ public class ItemListener implements Listener { private Utilities utilities; - public ItemListener(SlimefunStartup plugin) { + public ItemListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); - utilities = plugin.getUtilities(); + utilities = SlimefunPlugin.getUtilities(); } @EventHandler @@ -87,14 +87,14 @@ public class ItemListener implements Listener { e.setCancelled(true); - if (SlimefunManager.isItemSimiliar(slot0, SlimefunGuide.getItem(BookDesign.BOOK), true)) + if (SlimefunManager.isItemSimiliar(slot0, SlimefunGuide.getItem(SlimefunGuideLayout.BOOK), true)) e.setCancelled(true); - else if (SlimefunManager.isItemSimiliar(slot0, SlimefunGuide.getItem(BookDesign.CHEST), true)) + else if (SlimefunManager.isItemSimiliar(slot0, SlimefunGuide.getItem(SlimefunGuideLayout.CHEST), true)) e.setCancelled(true); - if (SlimefunManager.isItemSimiliar(slot1, SlimefunGuide.getItem(BookDesign.BOOK), true)) + if (SlimefunManager.isItemSimiliar(slot1, SlimefunGuide.getItem(SlimefunGuideLayout.BOOK), true)) e.setCancelled(true); - else if (SlimefunManager.isItemSimiliar(slot1, SlimefunGuide.getItem(BookDesign.CHEST), true)) + else if (SlimefunManager.isItemSimiliar(slot1, SlimefunGuide.getItem(SlimefunGuideLayout.CHEST), true)) e.setCancelled(true); } } @@ -158,14 +158,14 @@ public class ItemListener implements Listener { if (BlockStorage.check(e.getClickedBlock()).isTicking()) { p.sendMessage(ChatColor.translateAlternateColorCodes('&', "&dTicking: " + "&2\u2714")); p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dAsync: &e" + (BlockStorage.check(e.getClickedBlock()).getBlockTicker().isSynchronized() ? "&4\u2718": "&2\u2714"))); - p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTimings: &e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock()) + "ms")); - p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTotal Timings: &e" + SlimefunStartup.ticker.getTimings(BlockStorage.checkID(e.getClickedBlock())) + "ms")); - p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dChunk Timings: &e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock().getChunk()) + "ms")); + p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTimings: &e" + SlimefunPlugin.ticker.getTimings(e.getClickedBlock()) + "ms")); + p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTotal Timings: &e" + SlimefunPlugin.ticker.getTimings(BlockStorage.checkID(e.getClickedBlock())) + "ms")); + p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dChunk Timings: &e" + SlimefunPlugin.ticker.getTimings(e.getClickedBlock().getChunk()) + "ms")); } else if (BlockStorage.check(e.getClickedBlock()).getEnergyTicker() != null) { p.sendMessage(ChatColor.translateAlternateColorCodes('&', "&dTicking: " + "&b~ &3(Indirect)")); - p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTimings: &e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock()) + "ms")); - p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dChunk Timings: &e" + SlimefunStartup.ticker.getTimings(e.getClickedBlock().getChunk()) + "ms")); + p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTimings: &e" + SlimefunPlugin.ticker.getTimings(e.getClickedBlock()) + "ms")); + p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dChunk Timings: &e" + SlimefunPlugin.ticker.getTimings(e.getClickedBlock().getChunk()) + "ms")); } else { p.sendMessage(ChatColor.translateAlternateColorCodes('&', "&dTicking: " + "&4\u2718")); @@ -209,15 +209,15 @@ public class ItemListener implements Listener { } } - if (SlimefunManager.isItemSimiliar(item, SlimefunGuide.getItem(BookDesign.BOOK), true)) { + if (SlimefunManager.isItemSimiliar(item, SlimefunGuide.getItem(SlimefunGuideLayout.BOOK), true)) { if (p.isSneaking()) SlimefunGuide.openSettings(p, item); else SlimefunGuide.openGuide(p, true); } - else if (SlimefunManager.isItemSimiliar(item, SlimefunGuide.getItem(BookDesign.CHEST), true)) { + else if (SlimefunManager.isItemSimiliar(item, SlimefunGuide.getItem(SlimefunGuideLayout.CHEST), true)) { if (p.isSneaking()) SlimefunGuide.openSettings(p, item); else SlimefunGuide.openGuide(p, false); } - else if (SlimefunManager.isItemSimiliar(item, SlimefunGuide.getItem(BookDesign.CHEAT_SHEET), true)) { + else if (SlimefunManager.isItemSimiliar(item, SlimefunGuide.getItem(SlimefunGuideLayout.CHEAT_SHEET), true)) { if (p.isSneaking()) SlimefunGuide.openSettings(p, item); else p.chat("/sf cheat"); } @@ -361,7 +361,7 @@ public class ItemListener implements Listener { // Remove the glass bottle once drunk final int m = mode; - Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { + Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> { if (m == 0) p.getEquipment().setItemInMainHand(null); else if (m == 1) p.getEquipment().setItemInOffHand(null); else if (m == 2) p.getInventory().removeItem(new ItemStack(Material.GLASS_BOTTLE, 1)); @@ -421,11 +421,11 @@ public class ItemListener implements Listener { if (SlimefunItem.getByItem(slot0) != null && !SlimefunItem.isDisabled(slot0) || SlimefunItem.getByItem(slot1) != null && !SlimefunItem.isDisabled(slot1) || - SlimefunManager.isItemSimiliar(slot0, SlimefunGuide.getItem(BookDesign.BOOK), true) || - SlimefunManager.isItemSimiliar(slot0, SlimefunGuide.getItem(BookDesign.CHEST), true)|| + SlimefunManager.isItemSimiliar(slot0, SlimefunGuide.getItem(SlimefunGuideLayout.BOOK), true) || + SlimefunManager.isItemSimiliar(slot0, SlimefunGuide.getItem(SlimefunGuideLayout.CHEST), true)|| - SlimefunManager.isItemSimiliar(slot1, SlimefunGuide.getItem(BookDesign.BOOK), true) || - SlimefunManager.isItemSimiliar(slot1, SlimefunGuide.getItem(BookDesign.CHEST), true)) { + SlimefunManager.isItemSimiliar(slot1, SlimefunGuide.getItem(SlimefunGuideLayout.BOOK), true) || + SlimefunManager.isItemSimiliar(slot1, SlimefunGuide.getItem(SlimefunGuideLayout.CHEST), true)) { e.setCancelled(true); Messages.local.sendTranslation((Player) e.getWhoClicked(), "anvil.not-working", true); diff --git a/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener.java b/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener.java index 356b22159..e4cbc1882 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/ItemPickupListener.java @@ -1,6 +1,6 @@ package me.mrCookieSlime.Slimefun.listeners; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; @@ -17,7 +17,7 @@ import org.bukkit.event.inventory.InventoryPickupItemEvent; */ public class ItemPickupListener implements Listener { - public ItemPickupListener(SlimefunStartup plugin) { + public ItemPickupListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/NetworkListener.java b/src/me/mrCookieSlime/Slimefun/listeners/NetworkListener.java index 292a6fabe..5ea8b9556 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/NetworkListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/NetworkListener.java @@ -1,6 +1,6 @@ package me.mrCookieSlime.Slimefun.listeners; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.api.network.Network; import org.bukkit.event.EventHandler; @@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockPlaceEvent; public class NetworkListener implements Listener { - public NetworkListener(SlimefunStartup plugin) { + public NetworkListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/PlayerQuitListener.java b/src/me/mrCookieSlime/Slimefun/listeners/PlayerQuitListener.java index 6c8971653..f06f18fc9 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/PlayerQuitListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/PlayerQuitListener.java @@ -4,18 +4,18 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.api.PlayerProfile; public class PlayerQuitListener implements Listener { - public PlayerQuitListener(SlimefunStartup plugin) { + public PlayerQuitListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } @EventHandler public void onDisconnect(PlayerQuitEvent e) { - SlimefunStartup.instance.getUtilities().guideHistory.remove(e.getPlayer().getUniqueId()); + SlimefunPlugin.getUtilities().guideHistory.remove(e.getPlayer().getUniqueId()); if (PlayerProfile.isLoaded(e.getPlayer().getUniqueId())) { PlayerProfile.fromUUID(e.getPlayer().getUniqueId()).markForDeletion(); diff --git a/src/me/mrCookieSlime/Slimefun/listeners/TalismanListener.java b/src/me/mrCookieSlime/Slimefun/listeners/TalismanListener.java index 015acfe20..c12e3a2f7 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/TalismanListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/TalismanListener.java @@ -31,7 +31,7 @@ import org.bukkit.potion.PotionEffectType; import org.bukkit.util.Vector; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Talisman; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; @@ -41,7 +41,7 @@ public class TalismanListener implements Listener { private Random random = new Random(); - public TalismanListener(SlimefunStartup plugin) { + public TalismanListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } @@ -98,7 +98,7 @@ public class TalismanListener implements Listener { item.setItemMeta(meta); final int itemSlot = slot; - SlimefunStartup.instance.getServer().getScheduler().runTaskLater(SlimefunStartup.instance, () -> { + SlimefunPlugin.instance.getServer().getScheduler().runTaskLater(SlimefunPlugin.instance, () -> { inv.setItem(itemSlot, item); }, 1L); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/TeleporterListener.java b/src/me/mrCookieSlime/Slimefun/listeners/TeleporterListener.java index b71114d5d..c0ab19cb9 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/TeleporterListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/TeleporterListener.java @@ -1,6 +1,6 @@ package me.mrCookieSlime.Slimefun.listeners; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.GPS.Elevator; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.Teleporter; @@ -17,7 +17,7 @@ public class TeleporterListener implements Listener { private final BlockFace[] faces = {BlockFace.NORTH, BlockFace.NORTH_EAST, BlockFace.EAST, BlockFace.SOUTH_EAST, BlockFace.SOUTH, BlockFace.SOUTH_WEST, BlockFace.WEST, BlockFace.NORTH_WEST}; - public TeleporterListener(SlimefunStartup plugin) { + public TeleporterListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/ToolListener.java b/src/me/mrCookieSlime/Slimefun/listeners/ToolListener.java index 1a44ac18a..0d608b19c 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/ToolListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/ToolListener.java @@ -24,7 +24,7 @@ import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.CSCoreLibPlugin.general.Particles.FireworkShow; import me.mrCookieSlime.CSCoreLibPlugin.general.Player.PlayerInventory; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.HandledBlock; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; @@ -46,9 +46,9 @@ public class ToolListener implements Listener { private Random random = new Random(); private Utilities utilities; - public ToolListener(SlimefunStartup plugin) { + public ToolListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); - utilities = plugin.getUtilities(); + utilities = SlimefunPlugin.getUtilities(); sensitiveMaterials.add(Material.STONE_PRESSURE_PLATE); sensitiveMaterials.add(Material.LIGHT_WEIGHTED_PRESSURE_PLATE); diff --git a/src/me/mrCookieSlime/Slimefun/listeners/WorldListener.java b/src/me/mrCookieSlime/Slimefun/listeners/WorldListener.java index 0e1be152b..db83ad717 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/WorldListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/WorldListener.java @@ -5,12 +5,12 @@ import org.bukkit.event.Listener; import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.event.world.WorldUnloadEvent; -import me.mrCookieSlime.Slimefun.SlimefunStartup; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.api.BlockStorage; public class WorldListener implements Listener { - public WorldListener(SlimefunStartup plugin) { + public WorldListener(SlimefunPlugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } @@ -18,9 +18,9 @@ public class WorldListener implements Listener { public void onWorldLoad(WorldLoadEvent e) { BlockStorage.getForcedStorage(e.getWorld()); - SlimefunStartup.getWhitelist().setDefaultValue(e.getWorld().getName() + ".enabled", true); - SlimefunStartup.getWhitelist().setDefaultValue(e.getWorld().getName() + ".enabled-items.SLIMEFUN_GUIDE", true); - SlimefunStartup.getWhitelist().save(); + SlimefunPlugin.getWhitelist().setDefaultValue(e.getWorld().getName() + ".enabled", true); + SlimefunPlugin.getWhitelist().setDefaultValue(e.getWorld().getName() + ".enabled-items.SLIMEFUN_GUIDE", true); + SlimefunPlugin.getWhitelist().save(); } @EventHandler diff --git a/src/me/mrCookieSlime/Slimefun/utils/Utilities.java b/src/me/mrCookieSlime/Slimefun/utils/Utilities.java index 937d26451..ae30e0723 100644 --- a/src/me/mrCookieSlime/Slimefun/utils/Utilities.java +++ b/src/me/mrCookieSlime/Slimefun/utils/Utilities.java @@ -13,7 +13,9 @@ import org.bukkit.entity.Entity; import org.bukkit.inventory.ItemStack; import me.mrCookieSlime.Slimefun.GEO.OreGenResource; +import me.mrCookieSlime.Slimefun.Setup.PostSlimefunLoadingHandler; import me.mrCookieSlime.Slimefun.ancient_altar.AltarRecipe; +import me.mrCookieSlime.Slimefun.api.PlayerProfile; import me.mrCookieSlime.Slimefun.api.item_transport.CargoTransportEvent; import me.mrCookieSlime.Slimefun.hooks.github.Contributor; import me.mrCookieSlime.Slimefun.hooks.github.GitHubConnector; @@ -30,6 +32,10 @@ public final class Utilities { public int vanillaItems = 0; + public Map profiles = new HashMap<>(); + + public List postHandlers = new ArrayList<>(); + public Map jumpState = new HashMap<>(); public Set damage = new HashSet<>(); public Map remove = new HashMap<>(); diff --git a/src/plugin.yml b/src/plugin.yml index 7509adc2c..3381857ba 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -4,7 +4,7 @@ author: The Slimefun 4 Community description: Slimefun basically turns your entire Server into a FTB modpack without installing a single mod website: http://TheBusyBiscuit.github.io/ -main: me.mrCookieSlime.Slimefun.SlimefunStartup +main: me.mrCookieSlime.Slimefun.SlimefunPlugin softdepend: [CS-CoreLib, PlaceholderAPI] api-version: 1.14