From da14c28f9a2d41ecd69deb492ee4033b26d59693 Mon Sep 17 00:00:00 2001 From: GnomeffinWay Date: Tue, 12 Mar 2013 22:24:31 -0500 Subject: [PATCH] mcMMO is now handled in Depenizen --- pom.xml | 10 ------ .../denizen/tags/core/PlayerTags.java | 10 ------ .../denizen/utilities/depends/Depends.java | 11 ------ .../utilities/depends/MCMMOUtilities.java | 36 ------------------- 4 files changed, 67 deletions(-) delete mode 100644 src/main/java/net/aufdemrand/denizen/utilities/depends/MCMMOUtilities.java diff --git a/pom.xml b/pom.xml index c3098292a2..20c0385598 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,6 @@ - - mcMMO-repo - http://repo.mcmmo.info/ - vault-repo http://ci.herocraftonline.com/plugin/repository/everything/ @@ -100,12 +96,6 @@ 5.6.6-SNAPSHOT provided - - com.gmail.nossr50.mcMMO - mcMMO - 1.4.00-dev4 - provided - org.json org.json diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java index bf6e2e9be6..976aae4c77 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/PlayerTags.java @@ -9,7 +9,6 @@ import net.aufdemrand.denizen.utilities.arguments.aH; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; -import net.aufdemrand.denizen.utilities.depends.MCMMOUtilities; import net.aufdemrand.denizen.utilities.nbt.NBTItem; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; @@ -389,15 +388,6 @@ else if (subType.equalsIgnoreCase("CURRENCY")) dB.echoError("Cannot check group! No permissions loaded!"); } - } else if (type.equalsIgnoreCase("MCMMO")) { - if(Depends.mcmmo != null) { - if (subType.equalsIgnoreCase("LEVEL")) { - event.setReplaced(String.valueOf(MCMMOUtilities.getPlayerSkillLevel(p.getName(), subTypeContext))); - } - } else { - dB.echoError("mcMMO not loaded! Have you installed the mcMMO plugin?"); - } - } else if (type.equalsIgnoreCase("GAMEMODE")) { if (subType.equalsIgnoreCase("ID")) event.setReplaced(String.valueOf(p.getGameMode().getValue())); diff --git a/src/main/java/net/aufdemrand/denizen/utilities/depends/Depends.java b/src/main/java/net/aufdemrand/denizen/utilities/depends/Depends.java index 9452e5c2c0..51cadbf3e5 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/depends/Depends.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/depends/Depends.java @@ -10,13 +10,11 @@ import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolManager; -import com.gmail.nossr50.mcMMO; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; public class Depends { public static WorldGuardPlugin worldGuard = null; - public static mcMMO mcmmo = null; public static Citizens citizens = null; public static Economy economy = null; @@ -30,7 +28,6 @@ public void initialize() { setupPermissions(); setupChat(); setupWorldGuard(); - setupMCMMO(); setupCitizens(); setupProtocolManager(); } @@ -85,14 +82,6 @@ private boolean setupWorldGuard() { worldGuard = (WorldGuardPlugin) Bukkit.getServer().getPluginManager().getPlugin("WorldGuard"); return worldGuard != null; } - - private boolean setupMCMMO() { - if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") == null) { - return false; - } - mcmmo = (mcMMO) Bukkit.getServer().getPluginManager().getPlugin("mcMMO"); - return mcmmo != null; - } private boolean setupCitizens() { citizens = (Citizens) Bukkit.getServer().getPluginManager().getPlugin("Citizens"); diff --git a/src/main/java/net/aufdemrand/denizen/utilities/depends/MCMMOUtilities.java b/src/main/java/net/aufdemrand/denizen/utilities/depends/MCMMOUtilities.java deleted file mode 100644 index c2c95d7310..0000000000 --- a/src/main/java/net/aufdemrand/denizen/utilities/depends/MCMMOUtilities.java +++ /dev/null @@ -1,36 +0,0 @@ -package net.aufdemrand.denizen.utilities.depends; - -import net.aufdemrand.denizen.utilities.debugging.dB; - -import com.gmail.nossr50.datatypes.PlayerProfile; -import com.gmail.nossr50.skills.utilities.SkillType; - -public class MCMMOUtilities { - - public static String getPlayerSkillLevel(String player, String skill) { - try { - return String.valueOf(getPlayerProfileFrom(player).getSkillLevel(getSkillTypeFrom(skill))); - } catch(NullPointerException e) { - // debug should have already caught this - } - return null; - } - - public static PlayerProfile getPlayerProfileFrom(String arg) { - PlayerProfile profile = Depends.mcmmo.getPlayerProfile(arg); - if(profile == null) - dB.echoError("Could not find mcMMO data for " + arg + "!"); - return profile; - } - - public static SkillType getSkillTypeFrom(String arg) { - SkillType skill = null; - try { - skill = SkillType.getSkill(arg); - } catch(Exception e) { - dB.echoError("McMMO skill " + arg + " not recognized!"); - } - return skill; - } - -}