diff --git a/src/me/staartvin/utils/pluginlibrary/Library.java b/src/me/staartvin/utils/pluginlibrary/autorank/Library.java similarity index 98% rename from src/me/staartvin/utils/pluginlibrary/Library.java rename to src/me/staartvin/utils/pluginlibrary/autorank/Library.java index be7b53c..ee41a91 100644 --- a/src/me/staartvin/utils/pluginlibrary/Library.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/Library.java @@ -1,6 +1,6 @@ -package me.staartvin.utils.pluginlibrary; +package me.staartvin.utils.pluginlibrary.autorank; -import me.staartvin.utils.pluginlibrary.hooks.*; +import me.staartvin.utils.pluginlibrary.autorank.hooks.*; import org.bukkit.Bukkit; import java.util.Optional; diff --git a/src/me/staartvin/utils/pluginlibrary/PluginLibrary.java b/src/me/staartvin/utils/pluginlibrary/autorank/PluginLibrary.java similarity index 85% rename from src/me/staartvin/utils/pluginlibrary/PluginLibrary.java rename to src/me/staartvin/utils/pluginlibrary/autorank/PluginLibrary.java index 967ce8a..1621cc9 100644 --- a/src/me/staartvin/utils/pluginlibrary/PluginLibrary.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/PluginLibrary.java @@ -1,6 +1,6 @@ -package me.staartvin.utils.pluginlibrary; +package me.staartvin.utils.pluginlibrary.autorank; -import me.staartvin.utils.pluginlibrary.hooks.LibraryHook; +import me.staartvin.utils.pluginlibrary.autorank.hooks.LibraryHook; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.plugin.ServicePriority; @@ -17,7 +17,7 @@ */ public class PluginLibrary { - private final static List loadedLibraries = new ArrayList<>(); + private final static List loadedLibraries = new ArrayList<>(); public HashMap requestTimes = new HashMap<>(); /** @@ -29,7 +29,7 @@ public class PluginLibrary { * @throws IllegalArgumentException When no plugin with the given name was found. */ public static Optional getLibrary(String pluginName) throws IllegalArgumentException { - return me.staartvin.utils.pluginlibrary.Library.getEnum(pluginName).getHook(); + return Library.getEnum(pluginName).getHook(); } /** @@ -39,7 +39,7 @@ public static Optional getLibrary(String pluginName) throws Illegal * @return {@link Library} class or an error. * @see #getLibrary(String) */ - public static Optional getLibrary(me.staartvin.utils.pluginlibrary.Library lib) { + public static Optional getLibrary(Library lib) { return lib.getHook(); } @@ -49,7 +49,7 @@ public static Optional getLibrary(me.staartvin.utils.pluginlibrary. * @param lib Library to check. * @return true if the library is loaded; false otherwise. */ - public static boolean isLibraryLoaded(me.staartvin.utils.pluginlibrary.Library lib) { + public static boolean isLibraryLoaded(Library lib) { return loadedLibraries.contains(lib); } @@ -67,7 +67,7 @@ public static PluginLibrary getPluginLibrary(JavaPlugin plugin) { if (library == null) { loadNewInstance = true; } else { - System.out.println("Found PluginLibrary instance and using that"); + plugin.getLogger().info("Found PluginLibrary instance and using that"); } } else { // It hasn't loaded, so we should definitely create a new one. @@ -78,7 +78,7 @@ public static PluginLibrary getPluginLibrary(JavaPlugin plugin) { if (loadNewInstance) { library = new PluginLibrary(); - System.out.println("Generating new PluginLibrary instance"); + plugin.getLogger().info("Generating new PluginLibrary instance"); // Also register this so we don't have to create one again. Bukkit.getServer().getServicesManager().register(PluginLibrary.class, library, plugin, @@ -121,7 +121,7 @@ public void disablePluginLibrary() { public int loadLibraries() { int count = 0; - for (me.staartvin.utils.pluginlibrary.Library l : me.staartvin.utils.pluginlibrary.Library.values()) { + for (Library l : Library.values()) { if (LibraryHook.isPluginAvailable(l)) { try { Optional libraryHook = l.getHook(); @@ -154,7 +154,7 @@ public void logMessage(String message) { * * @return a list of loaded libraries. */ - public List getLoadedLibraries() { + public List getLoadedLibraries() { return Collections.unmodifiableList(loadedLibraries); } @@ -162,7 +162,7 @@ private String getLoadedLibrariesAsString() { StringBuilder builder = new StringBuilder(); for (int i = 0, l = loadedLibraries.size(); i < l; i++) { - me.staartvin.utils.pluginlibrary.Library library = loadedLibraries.get(i); + Library library = loadedLibraries.get(i); String addedString = ChatColor.DARK_AQUA + library.getHumanPluginName() + ChatColor.DARK_GREEN + " (by " + library diff --git a/src/me/staartvin/utils/pluginlibrary/events/PlayerVotedEvent.java b/src/me/staartvin/utils/pluginlibrary/autorank/events/PlayerVotedEvent.java similarity index 92% rename from src/me/staartvin/utils/pluginlibrary/events/PlayerVotedEvent.java rename to src/me/staartvin/utils/pluginlibrary/autorank/events/PlayerVotedEvent.java index df13af9..1789124 100644 --- a/src/me/staartvin/utils/pluginlibrary/events/PlayerVotedEvent.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/events/PlayerVotedEvent.java @@ -1,4 +1,4 @@ -package me.staartvin.utils.pluginlibrary.events; +package me.staartvin.utils.pluginlibrary.autorank.events; import org.bukkit.entity.Player; import org.bukkit.event.Event; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/AFKTerminatorHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/AFKTerminatorHook.java similarity index 94% rename from src/me/staartvin/utils/pluginlibrary/hooks/AFKTerminatorHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/AFKTerminatorHook.java index bb1a274..326172f 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/AFKTerminatorHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/AFKTerminatorHook.java @@ -1,9 +1,9 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import me.edge209.afkTerminator.AfkDetect; import me.edge209.afkTerminator.AfkDetect.AFKMACHINES; -import me.staartvin.utils.pluginlibrary.Library; -import me.staartvin.utils.pluginlibrary.hooks.afkmanager.AFKManager; +import me.staartvin.utils.pluginlibrary.autorank.Library; +import me.staartvin.utils.pluginlibrary.autorank.hooks.afkmanager.AFKManager; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/ASkyBlockHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/ASkyBlockHook.java similarity index 93% rename from src/me/staartvin/utils/pluginlibrary/hooks/ASkyBlockHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/ASkyBlockHook.java index 1b0bf22..8bb73d0 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/ASkyBlockHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/ASkyBlockHook.java @@ -1,8 +1,8 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.wasteofplastic.askyblock.ASkyBlock; import com.wasteofplastic.askyblock.ASkyBlockAPI; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/AcidIslandHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/AcidIslandHook.java similarity index 93% rename from src/me/staartvin/utils/pluginlibrary/hooks/AcidIslandHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/AcidIslandHook.java index 1504c15..8c45c68 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/AcidIslandHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/AcidIslandHook.java @@ -1,8 +1,8 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.wasteofplastic.acidisland.ASkyBlock; import com.wasteofplastic.acidisland.ASkyBlockAPI; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/AdvancedAchievementsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/AdvancedAchievementsHook.java similarity index 94% rename from src/me/staartvin/utils/pluginlibrary/hooks/AdvancedAchievementsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/AdvancedAchievementsHook.java index 421ca40..72d29e2 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/AdvancedAchievementsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/AdvancedAchievementsHook.java @@ -1,7 +1,7 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.hm.achievement.AdvancedAchievements; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/AureliumSkillsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/AureliumSkillsHook.java similarity index 95% rename from src/me/staartvin/utils/pluginlibrary/hooks/AureliumSkillsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/AureliumSkillsHook.java index b500a7d..44c32d3 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/AureliumSkillsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/AureliumSkillsHook.java @@ -1,9 +1,9 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.archyx.aureliumskills.api.AureliumAPI; import com.archyx.aureliumskills.skills.Skill; import com.archyx.aureliumskills.stats.Stat; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/AutorankHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/AutorankHook.java similarity index 97% rename from src/me/staartvin/utils/pluginlibrary/hooks/AutorankHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/AutorankHook.java index fcb9642..ab5df6c 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/AutorankHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/AutorankHook.java @@ -1,9 +1,9 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import me.armar.plugins.autorank.Autorank; import me.armar.plugins.autorank.pathbuilder.requirement.AbstractRequirement; import me.armar.plugins.autorank.pathbuilder.result.AbstractResult; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/BattleLevelsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/BattleLevelsHook.java similarity index 96% rename from src/me/staartvin/utils/pluginlibrary/hooks/BattleLevelsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/BattleLevelsHook.java index 79bb6aa..2aad755 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/BattleLevelsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/BattleLevelsHook.java @@ -1,7 +1,7 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import me.robin.battlelevels.api.BattleLevelsAPI; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/CMIHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/CMIHook.java similarity index 81% rename from src/me/staartvin/utils/pluginlibrary/hooks/CMIHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/CMIHook.java index bdd4751..e9847d5 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/CMIHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/CMIHook.java @@ -1,9 +1,9 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.Zrips.CMI.CMI; import com.Zrips.CMI.Containers.CMIUser; -import me.staartvin.utils.pluginlibrary.Library; -import me.staartvin.utils.pluginlibrary.hooks.afkmanager.AFKManager; +import me.staartvin.utils.pluginlibrary.autorank.Library; +import me.staartvin.utils.pluginlibrary.autorank.hooks.afkmanager.AFKManager; import java.util.UUID; @@ -14,7 +14,7 @@ * * @author Staartvin */ -public class CMIHook extends me.staartvin.utils.pluginlibrary.hooks.LibraryHook implements AFKManager { +public class CMIHook extends LibraryHook implements AFKManager { @Override diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/EssentialsXHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/EssentialsXHook.java similarity index 92% rename from src/me/staartvin/utils/pluginlibrary/hooks/EssentialsXHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/EssentialsXHook.java index 80a1a38..886e495 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/EssentialsXHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/EssentialsXHook.java @@ -1,9 +1,9 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.earth2me.essentials.Essentials; import com.earth2me.essentials.User; -import me.staartvin.utils.pluginlibrary.Library; -import me.staartvin.utils.pluginlibrary.hooks.afkmanager.AFKManager; +import me.staartvin.utils.pluginlibrary.autorank.Library; +import me.staartvin.utils.pluginlibrary.autorank.hooks.afkmanager.AFKManager; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/FactionsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/FactionsHook.java similarity index 97% rename from src/me/staartvin/utils/pluginlibrary/hooks/FactionsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/FactionsHook.java index 34c49d5..a442282 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/FactionsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/FactionsHook.java @@ -1,4 +1,4 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.massivecraft.factions.Factions; import com.massivecraft.factions.entity.BoardColl; @@ -6,7 +6,7 @@ import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.ps.PS; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.Location; import org.bukkit.plugin.Plugin; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/GriefPreventionHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/GriefPreventionHook.java similarity index 96% rename from src/me/staartvin/utils/pluginlibrary/hooks/GriefPreventionHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/GriefPreventionHook.java index b4bbd12..b315ff0 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/GriefPreventionHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/GriefPreventionHook.java @@ -1,9 +1,9 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import me.ryanhamshire.GriefPrevention.Claim; import me.ryanhamshire.GriefPrevention.GriefPrevention; import me.ryanhamshire.GriefPrevention.PlayerData; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.Location; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/JobsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/JobsHook.java similarity index 96% rename from src/me/staartvin/utils/pluginlibrary/hooks/JobsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/JobsHook.java index ce33dd3..bf20cb0 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/JobsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/JobsHook.java @@ -1,12 +1,12 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.container.Job; import com.gamingmesh.jobs.container.JobProgression; import com.gamingmesh.jobs.container.JobsPlayer; import com.gamingmesh.jobs.container.PlayerPoints; -import me.staartvin.utils.pluginlibrary.Library; -import me.staartvin.utils.pluginlibrary.util.Util; +import me.staartvin.utils.pluginlibrary.autorank.Library; +import me.staartvin.utils.pluginlibrary.autorank.util.Util; import org.bukkit.entity.Player; import java.util.List; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/LibraryHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/LibraryHook.java similarity index 92% rename from src/me/staartvin/utils/pluginlibrary/hooks/LibraryHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/LibraryHook.java index 0470719..98dcb44 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/LibraryHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/LibraryHook.java @@ -1,7 +1,7 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; -import me.staartvin.utils.pluginlibrary.Library; -import me.staartvin.utils.pluginlibrary.PluginLibrary; +import me.staartvin.utils.pluginlibrary.autorank.Library; +import me.staartvin.utils.pluginlibrary.autorank.PluginLibrary; import org.bukkit.Bukkit; import org.bukkit.Server; import org.bukkit.plugin.Plugin; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/McMMOHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/McMMOHook.java similarity index 99% rename from src/me/staartvin/utils/pluginlibrary/hooks/McMMOHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/McMMOHook.java index 6f89888..52b60bd 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/McMMOHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/McMMOHook.java @@ -1,4 +1,4 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.gmail.nossr50.api.*; import com.gmail.nossr50.api.exceptions.InvalidFormulaTypeException; @@ -7,7 +7,7 @@ import com.gmail.nossr50.api.exceptions.InvalidXPGainReasonException; import com.gmail.nossr50.datatypes.party.Party; import com.gmail.nossr50.mcMMO; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.OfflinePlayer; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/McRPGHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/McRPGHook.java similarity index 95% rename from src/me/staartvin/utils/pluginlibrary/hooks/McRPGHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/McRPGHook.java index 4df32a2..d67511c 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/McRPGHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/McRPGHook.java @@ -1,6 +1,6 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import us.eunoians.mcrpg.players.McRPGPlayer; import us.eunoians.mcrpg.players.PlayerManager; import us.eunoians.mcrpg.types.Skills; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/NuVotifierHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/NuVotifierHook.java similarity index 88% rename from src/me/staartvin/utils/pluginlibrary/hooks/NuVotifierHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/NuVotifierHook.java index 35724d8..349edc9 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/NuVotifierHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/NuVotifierHook.java @@ -1,8 +1,8 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.vexsoftware.votifier.NuVotifierBukkit; -import me.staartvin.utils.pluginlibrary.Library; -import me.staartvin.utils.pluginlibrary.listeners.VoteListener; +import me.staartvin.utils.pluginlibrary.autorank.Library; +import me.staartvin.utils.pluginlibrary.autorank.listeners.VoteListener; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/OnTimeHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/OnTimeHook.java similarity index 97% rename from src/me/staartvin/utils/pluginlibrary/hooks/OnTimeHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/OnTimeHook.java index d15b0bb..68e8a39 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/OnTimeHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/OnTimeHook.java @@ -1,10 +1,10 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import me.edge209.OnTime.DataIO; import me.edge209.OnTime.OnTimeAPI; import me.edge209.OnTime.OnTimeAPI.topData; import me.edge209.OnTime.PlayingTime; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import java.util.HashMap; import java.util.Map; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/PlayerPointsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/PlayerPointsHook.java similarity index 94% rename from src/me/staartvin/utils/pluginlibrary/hooks/PlayerPointsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/PlayerPointsHook.java index 0a5f2e1..8d56532 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/PlayerPointsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/PlayerPointsHook.java @@ -1,6 +1,6 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.black_ixx.playerpoints.PlayerPoints; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/QuestsAlternative.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/QuestsAlternative.java similarity index 96% rename from src/me/staartvin/utils/pluginlibrary/hooks/QuestsAlternative.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/QuestsAlternative.java index 89a5f4a..b0cc631 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/QuestsAlternative.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/QuestsAlternative.java @@ -1,11 +1,11 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.leonardobishop.quests.Quests; import com.leonardobishop.quests.player.QPlayer; import com.leonardobishop.quests.player.questprogressfile.QuestProgress; import com.leonardobishop.quests.quests.Quest; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.plugin.Plugin; import java.util.Map; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/QuestsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/QuestsHook.java similarity index 96% rename from src/me/staartvin/utils/pluginlibrary/hooks/QuestsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/QuestsHook.java index 60ceaed..60ac707 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/QuestsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/QuestsHook.java @@ -1,8 +1,8 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import me.blackvein.quests.Quester; import me.blackvein.quests.Quests; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.plugin.Plugin; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/RPGmeHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/RPGmeHook.java similarity index 97% rename from src/me/staartvin/utils/pluginlibrary/hooks/RPGmeHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/RPGmeHook.java index 5a6be90..70998e4 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/RPGmeHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/RPGmeHook.java @@ -1,6 +1,6 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import net.flamedek.rpgme.RPGme; import net.flamedek.rpgme.player.RPGPlayer; import net.flamedek.rpgme.skills.SkillType; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/RoyalCommandsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/RoyalCommandsHook.java similarity index 94% rename from src/me/staartvin/utils/pluginlibrary/hooks/RoyalCommandsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/RoyalCommandsHook.java index 38996a2..b1f6e18 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/RoyalCommandsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/RoyalCommandsHook.java @@ -1,7 +1,7 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; -import me.staartvin.utils.pluginlibrary.Library; -import me.staartvin.utils.pluginlibrary.hooks.afkmanager.AFKManager; +import me.staartvin.utils.pluginlibrary.autorank.Library; +import me.staartvin.utils.pluginlibrary.autorank.hooks.afkmanager.AFKManager; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/SavageFactionsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/SavageFactionsHook.java similarity index 98% rename from src/me/staartvin/utils/pluginlibrary/hooks/SavageFactionsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/SavageFactionsHook.java index 6e2ff48..1152781 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/SavageFactionsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/SavageFactionsHook.java @@ -1,7 +1,7 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.massivecraft.factions.*; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.Location; import org.bukkit.OfflinePlayer; import org.bukkit.plugin.Plugin; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/StatsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/StatsHook.java similarity index 99% rename from src/me/staartvin/utils/pluginlibrary/hooks/StatsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/StatsHook.java index e57c434..3ba44a4 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/StatsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/StatsHook.java @@ -1,6 +1,6 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import nl.lolmewn.stats.BukkitMain; import nl.lolmewn.stats.Util; import nl.lolmewn.stats.player.PlayerManager; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/StatzHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/StatzHook.java similarity index 96% rename from src/me/staartvin/utils/pluginlibrary/hooks/StatzHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/StatzHook.java index 27e8b66..2974133 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/StatzHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/StatzHook.java @@ -1,9 +1,9 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import me.staartvin.statz.Statz; import me.staartvin.statz.database.datatype.RowRequirement; import me.staartvin.statz.datamanager.player.PlayerStat; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.Statistic; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/TownyAdvancedHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/TownyAdvancedHook.java similarity index 96% rename from src/me/staartvin/utils/pluginlibrary/hooks/TownyAdvancedHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/TownyAdvancedHook.java index 3492e0f..428405e 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/TownyAdvancedHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/TownyAdvancedHook.java @@ -1,8 +1,8 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.palmergames.bukkit.towny.TownyAPI; import com.palmergames.bukkit.towny.object.Resident; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import java.util.Optional; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/UHCStatsHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/UHCStatsHook.java similarity index 95% rename from src/me/staartvin/utils/pluginlibrary/hooks/UHCStatsHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/UHCStatsHook.java index 1f82640..ff8eee0 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/UHCStatsHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/UHCStatsHook.java @@ -1,7 +1,7 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.gmail.mezymc.stats.*; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.plugin.Plugin; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/UltimateCoreHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/UltimateCoreHook.java similarity index 85% rename from src/me/staartvin/utils/pluginlibrary/hooks/UltimateCoreHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/UltimateCoreHook.java index 0b0468c..3dd9cac 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/UltimateCoreHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/UltimateCoreHook.java @@ -1,7 +1,7 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; -import me.staartvin.utils.pluginlibrary.Library; -import me.staartvin.utils.pluginlibrary.hooks.afkmanager.AFKManager; +import me.staartvin.utils.pluginlibrary.autorank.Library; +import me.staartvin.utils.pluginlibrary.autorank.hooks.afkmanager.AFKManager; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/VaultHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/VaultHook.java similarity index 95% rename from src/me/staartvin/utils/pluginlibrary/hooks/VaultHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/VaultHook.java index b43ac4d..525318c 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/VaultHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/VaultHook.java @@ -1,6 +1,6 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/WorldGuardHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/WorldGuardHook.java similarity index 96% rename from src/me/staartvin/utils/pluginlibrary/hooks/WorldGuardHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/WorldGuardHook.java index 1099cd5..71b2aa7 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/WorldGuardHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/WorldGuardHook.java @@ -1,11 +1,11 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.RegionContainer; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/afkmanager/AFKManager.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/afkmanager/AFKManager.java similarity index 63% rename from src/me/staartvin/utils/pluginlibrary/hooks/afkmanager/AFKManager.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/afkmanager/AFKManager.java index 89c2ba2..dd4a084 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/afkmanager/AFKManager.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/afkmanager/AFKManager.java @@ -1,4 +1,4 @@ -package me.staartvin.utils.pluginlibrary.hooks.afkmanager; +package me.staartvin.utils.pluginlibrary.autorank.hooks.afkmanager; import java.util.UUID; diff --git a/src/me/staartvin/utils/pluginlibrary/hooks/uSkyBlockHook.java b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/uSkyBlockHook.java similarity index 92% rename from src/me/staartvin/utils/pluginlibrary/hooks/uSkyBlockHook.java rename to src/me/staartvin/utils/pluginlibrary/autorank/hooks/uSkyBlockHook.java index f753612..34ff729 100644 --- a/src/me/staartvin/utils/pluginlibrary/hooks/uSkyBlockHook.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/hooks/uSkyBlockHook.java @@ -1,6 +1,6 @@ -package me.staartvin.utils.pluginlibrary.hooks; +package me.staartvin.utils.pluginlibrary.autorank.hooks; -import me.staartvin.utils.pluginlibrary.Library; +import me.staartvin.utils.pluginlibrary.autorank.Library; import org.bukkit.entity.Player; import us.talabrek.ultimateskyblock.api.uSkyBlockAPI; diff --git a/src/me/staartvin/utils/pluginlibrary/listeners/VoteListener.java b/src/me/staartvin/utils/pluginlibrary/autorank/listeners/VoteListener.java similarity index 89% rename from src/me/staartvin/utils/pluginlibrary/listeners/VoteListener.java rename to src/me/staartvin/utils/pluginlibrary/autorank/listeners/VoteListener.java index e1b55fb..38b17bf 100644 --- a/src/me/staartvin/utils/pluginlibrary/listeners/VoteListener.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/listeners/VoteListener.java @@ -1,7 +1,7 @@ -package me.staartvin.utils.pluginlibrary.listeners; +package me.staartvin.utils.pluginlibrary.autorank.listeners; import com.vexsoftware.votifier.model.VotifierEvent; -import me.staartvin.utils.pluginlibrary.events.PlayerVotedEvent; +import me.staartvin.utils.pluginlibrary.autorank.events.PlayerVotedEvent; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/me/staartvin/utils/pluginlibrary/util/Util.java b/src/me/staartvin/utils/pluginlibrary/autorank/util/Util.java similarity index 89% rename from src/me/staartvin/utils/pluginlibrary/util/Util.java rename to src/me/staartvin/utils/pluginlibrary/autorank/util/Util.java index 3f66292..b90e22b 100644 --- a/src/me/staartvin/utils/pluginlibrary/util/Util.java +++ b/src/me/staartvin/utils/pluginlibrary/autorank/util/Util.java @@ -1,4 +1,4 @@ -package me.staartvin.utils.pluginlibrary.util; +package me.staartvin.utils.pluginlibrary.autorank.util; import java.math.BigDecimal; import java.math.RoundingMode;