From 4454c0e610fba678a6ed9920a6adda3101513283 Mon Sep 17 00:00:00 2001 From: Staartvin Date: Thu, 28 Jan 2016 11:25:06 +0100 Subject: [PATCH] General update. --- .classpath | 79 +++++----- .project | 6 - pom.xml | 146 ------------------ .../plugins/pluginlibrary/PluginLibrary.java | 3 - .../hooks/AFKTerminatorHook.java | 2 - .../pluginlibrary/hooks/AutorankHook.java | 5 - .../pluginlibrary/hooks/FactionsHook.java | 8 - .../pluginlibrary/hooks/LibraryHook.java | 2 - .../pluginlibrary/hooks/McMMOHook.java | 17 -- .../pluginlibrary/hooks/OnTimeHook.java | 4 - .../hooks/RoyalCommandsHook.java | 6 - .../pluginlibrary/hooks/StatsHook.java | 7 - .../pluginlibrary/hooks/UltimateCoreHook.java | 1 - .../hooks/customstats/FoodEatenStat.java | 4 - .../hooks/customstats/MobKilledStat.java | 4 - .../pluginlibrary/hooks/factions/Faction.java | 10 -- .../pluginlibrary/hooks/factions/MPlayer.java | 3 - .../listeners/PlayerEatsFoodListener.java | 9 -- .../listeners/PlayerKillsMobListener.java | 19 --- .../plugins/pluginlibrary/util/Util.java | 3 - 20 files changed, 37 insertions(+), 301 deletions(-) delete mode 100644 pom.xml diff --git a/.classpath b/.classpath index b7e6579..b367607 100644 --- a/.classpath +++ b/.classpath @@ -1,42 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project index 231375f..8eb019a 100644 --- a/.project +++ b/.project @@ -10,14 +10,8 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/pom.xml b/pom.xml deleted file mode 100644 index dcf46b8..0000000 --- a/pom.xml +++ /dev/null @@ -1,146 +0,0 @@ - - 4.0.0 - PluginLibrary - PluginLibrary - 1.0 - PluginLibrary - - src - - - src - - **/*.java - - - - - true - ${basedir} - - *.yml - - - - - - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - - - - - - Staartvin-Bitbucket-repo - https://bitbucket.org/Staartvin/maven-repo/raw/master/ - - - - stats-repo-snapshots - http://nexus.lolmewn.nl/content/repositories/snapshots/ - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - - - - ar.com.synergian - wagon-git - 0.2.5 - jar - - - - Autorank - Autorank - 3.6 - jar - - - - Factions - Factions - 2.8.0 - jar - - - - MassiveCore - MassiveCore - 2.8.0 - jar - - - - OnTime - OnTime - 4.1.3 - jar - - - - RoyalCommands - RoyalCommands - 4.1.2-SNAPSHOT-315 - jar - - - - UltimateCore - UltimateCore2 - 1.1.11 - jar - - - - afkTerminator - afkTerminator - 3.0.2 - jar - - - - mcMMO - mcMMO - 1.5.03-b66 - jar - - - - nl.lolmewn.stats - Stats - 3.0.2-SNAPSHOT - jar - - - - - org.spigotmc - spigot-api - 1.8.8-R0.1-SNAPSHOT - provided - jar - - - - org.bukkit - bukkit - 1.8.8-R0.1-SNAPSHOT - provided - jar - - - - \ No newline at end of file diff --git a/src/me/staartvin/plugins/pluginlibrary/PluginLibrary.java b/src/me/staartvin/plugins/pluginlibrary/PluginLibrary.java index c45d866..7c68c0f 100644 --- a/src/me/staartvin/plugins/pluginlibrary/PluginLibrary.java +++ b/src/me/staartvin/plugins/pluginlibrary/PluginLibrary.java @@ -6,9 +6,6 @@ import me.staartvin.plugins.pluginlibrary.hooks.LibraryHook; import me.staartvin.plugins.pluginlibrary.hooks.customstats.CustomStatsManager; -import net.md_5.bungee.api.ChatColor; - -import org.bukkit.plugin.java.JavaPlugin; /** * Main class of PluginLibrary diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/AFKTerminatorHook.java b/src/me/staartvin/plugins/pluginlibrary/hooks/AFKTerminatorHook.java index 2c70508..fd16ce3 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/AFKTerminatorHook.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/AFKTerminatorHook.java @@ -2,8 +2,6 @@ import java.util.UUID; -import me.edge209.afkTerminator.AfkDetect; -import me.edge209.afkTerminator.AfkDetect.AFKMACHINES; import me.staartvin.plugins.pluginlibrary.Library; /** diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/AutorankHook.java b/src/me/staartvin/plugins/pluginlibrary/hooks/AutorankHook.java index a4d0433..e09b245 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/AutorankHook.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/AutorankHook.java @@ -3,13 +3,8 @@ import java.util.List; import java.util.UUID; -import me.armar.plugins.autorank.Autorank; -import me.armar.plugins.autorank.playerchecker.requirement.Requirement; -import me.armar.plugins.autorank.playerchecker.result.Result; import me.staartvin.plugins.pluginlibrary.Library; -import org.bukkit.entity.Player; - /** * Autorank library, link. *

diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/FactionsHook.java b/src/me/staartvin/plugins/pluginlibrary/hooks/FactionsHook.java index 0b1d005..856e00f 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/FactionsHook.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/FactionsHook.java @@ -7,14 +7,6 @@ import me.staartvin.plugins.pluginlibrary.Library; import me.staartvin.plugins.pluginlibrary.hooks.factions.Faction; -import org.bukkit.Location; - -import com.massivecraft.factions.Factions; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.massivecore.ps.PS; - /** * Factions, link. diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/LibraryHook.java b/src/me/staartvin/plugins/pluginlibrary/hooks/LibraryHook.java index b8bdb94..73d7de1 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/LibraryHook.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/LibraryHook.java @@ -2,8 +2,6 @@ import me.staartvin.plugins.pluginlibrary.PluginLibrary; -import org.bukkit.Bukkit; - /** * Represents a hook to another plugin *

diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/McMMOHook.java b/src/me/staartvin/plugins/pluginlibrary/hooks/McMMOHook.java index 10c0d6d..5f4a0e2 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/McMMOHook.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/McMMOHook.java @@ -7,23 +7,6 @@ import me.staartvin.plugins.pluginlibrary.Library; -import org.bukkit.OfflinePlayer; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; - -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.api.AbilityAPI; -import com.gmail.nossr50.api.ChatAPI; -import com.gmail.nossr50.api.ExperienceAPI; -import com.gmail.nossr50.api.PartyAPI; -import com.gmail.nossr50.api.SkillAPI; -import com.gmail.nossr50.api.exceptions.InvalidFormulaTypeException; -import com.gmail.nossr50.api.exceptions.InvalidPlayerException; -import com.gmail.nossr50.api.exceptions.InvalidSkillException; -import com.gmail.nossr50.api.exceptions.InvalidXPGainReasonException; -import com.gmail.nossr50.datatypes.party.Party; - /** * mcMMO library, link. diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/OnTimeHook.java b/src/me/staartvin/plugins/pluginlibrary/hooks/OnTimeHook.java index 16f042e..0ed9f19 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/OnTimeHook.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/OnTimeHook.java @@ -3,10 +3,6 @@ import java.util.HashMap; import java.util.Map; -import me.edge209.OnTime.DataIO; -import me.edge209.OnTime.OnTimeAPI; -import me.edge209.OnTime.OnTimeAPI.topData; -import me.edge209.OnTime.PlayingTime; import me.staartvin.plugins.pluginlibrary.Library; /** diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/RoyalCommandsHook.java b/src/me/staartvin/plugins/pluginlibrary/hooks/RoyalCommandsHook.java index eda8789..514e9f2 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/RoyalCommandsHook.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/RoyalCommandsHook.java @@ -2,12 +2,6 @@ import me.staartvin.plugins.pluginlibrary.Library; -import org.bukkit.OfflinePlayer; -import org.bukkit.entity.Player; -import org.bukkit.inventory.Inventory; -import org.royaldev.royalcommands.RoyalCommands; -import org.royaldev.royalcommands.WorldManager; - /** * RoyalCommands library, link. diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/StatsHook.java b/src/me/staartvin/plugins/pluginlibrary/hooks/StatsHook.java index af38202..d4fb8f4 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/StatsHook.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/StatsHook.java @@ -8,13 +8,6 @@ import me.staartvin.plugins.pluginlibrary.Library; import me.staartvin.plugins.pluginlibrary.hooks.customstats.FoodEatenStat; import me.staartvin.plugins.pluginlibrary.hooks.customstats.MobKilledStat; -import nl.lolmewn.stats.api.stat.Stat; -import nl.lolmewn.stats.api.stat.StatEntry; -import nl.lolmewn.stats.api.user.StatsHolder; -import nl.lolmewn.stats.bukkit.BukkitMain; - -import org.bukkit.Material; -import org.bukkit.entity.EntityType; /** * Stats library, diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/customstats/MobKilledStat.java b/src/me/staartvin/plugins/pluginlibrary/hooks/customstats/MobKilledStat.java index 8364eae..b1d9b21 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/customstats/MobKilledStat.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/customstats/MobKilledStat.java @@ -3,10 +3,6 @@ import java.util.HashMap; import java.util.Map; -import nl.lolmewn.stats.api.stat.Stat; -import nl.lolmewn.stats.api.stat.StatEntry; -import nl.lolmewn.stats.api.storage.DataType; - /** * Stat that tracks special mobs killed, such as 'charged creeper' or 'elder * guardian' diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/factions/Faction.java b/src/me/staartvin/plugins/pluginlibrary/hooks/factions/Faction.java index da25e71..c7529ca 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/factions/Faction.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/factions/Faction.java @@ -6,16 +6,6 @@ import java.util.Set; import java.util.UUID; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.entity.Player; - -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.massivecore.ps.PS; - /** * Represents the {@link com.massivecraft.factions.entity.Faction} class. *
This class mirroring is used so developers don't have to import the API of Factions. diff --git a/src/me/staartvin/plugins/pluginlibrary/hooks/factions/MPlayer.java b/src/me/staartvin/plugins/pluginlibrary/hooks/factions/MPlayer.java index 5267f8f..0556391 100644 --- a/src/me/staartvin/plugins/pluginlibrary/hooks/factions/MPlayer.java +++ b/src/me/staartvin/plugins/pluginlibrary/hooks/factions/MPlayer.java @@ -2,9 +2,6 @@ import java.util.UUID; -import com.massivecraft.factions.Rel; -import com.massivecraft.factions.entity.FactionColl; - /** * Represents the {@link com.massivecraft.factions.entity.MPlayer} class. *
This class mirroring is used so developers don't have to import the API of Factions. diff --git a/src/me/staartvin/plugins/pluginlibrary/listeners/PlayerEatsFoodListener.java b/src/me/staartvin/plugins/pluginlibrary/listeners/PlayerEatsFoodListener.java index 14f94e1..a8e9590 100644 --- a/src/me/staartvin/plugins/pluginlibrary/listeners/PlayerEatsFoodListener.java +++ b/src/me/staartvin/plugins/pluginlibrary/listeners/PlayerEatsFoodListener.java @@ -5,15 +5,6 @@ import me.staartvin.plugins.pluginlibrary.hooks.StatsHook; import me.staartvin.plugins.pluginlibrary.hooks.customstats.FoodEatenStat; import me.staartvin.plugins.pluginlibrary.util.Util; -import nl.lolmewn.stats.api.stat.Stat; -import nl.lolmewn.stats.api.user.StatsHolder; -import nl.lolmewn.stats.stat.DefaultStatEntry; -import nl.lolmewn.stats.stat.MetadataPair; - -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerItemConsumeEvent; /** * This listener will listen to players eating food (for custom stat) diff --git a/src/me/staartvin/plugins/pluginlibrary/listeners/PlayerKillsMobListener.java b/src/me/staartvin/plugins/pluginlibrary/listeners/PlayerKillsMobListener.java index 2727b4f..84611e0 100644 --- a/src/me/staartvin/plugins/pluginlibrary/listeners/PlayerKillsMobListener.java +++ b/src/me/staartvin/plugins/pluginlibrary/listeners/PlayerKillsMobListener.java @@ -4,25 +4,6 @@ import me.staartvin.plugins.pluginlibrary.PluginLibrary; import me.staartvin.plugins.pluginlibrary.hooks.StatsHook; import me.staartvin.plugins.pluginlibrary.hooks.customstats.MobKilledStat; -import nl.lolmewn.stats.api.stat.Stat; -import nl.lolmewn.stats.api.user.StatsHolder; -import nl.lolmewn.stats.stat.DefaultStatEntry; -import nl.lolmewn.stats.stat.MetadataPair; - -import org.bukkit.entity.Chicken; -import org.bukkit.entity.Creeper; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Guardian; -import org.bukkit.entity.Player; -import org.bukkit.entity.Rabbit; -import org.bukkit.entity.Rabbit.Type; -import org.bukkit.entity.Skeleton; -import org.bukkit.entity.Skeleton.SkeletonType; -import org.bukkit.entity.Spider; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.EntityDeathEvent; /** * This listener will listen to players killing mobs (for custom stat) diff --git a/src/me/staartvin/plugins/pluginlibrary/util/Util.java b/src/me/staartvin/plugins/pluginlibrary/util/Util.java index 19ad2ed..bbb113f 100644 --- a/src/me/staartvin/plugins/pluginlibrary/util/Util.java +++ b/src/me/staartvin/plugins/pluginlibrary/util/Util.java @@ -1,8 +1,5 @@ package me.staartvin.plugins.pluginlibrary.util; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; - /** * Util class *