From e16714ea6c4a0e454200187bbdcf66ae363d412d Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Tue, 25 Jul 2017 10:20:36 +0100 Subject: [PATCH] Resolved dependency issues - Building correctly --- pom.xml | 2 +- .../bridge/LibsDisguisesBridge.java | 18 ++++++++---------- .../command/Command_disguisetoggle.java | 9 +++++++-- .../command/Command_undisguiseall.java | 9 +++++++-- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 8de47369..b07aaaca 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ UTF-8 ${project.version} Electrum - ${maven.buildnumber} + ${maven.build.timestamp} ${buildAuthor} ${buildHead} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java index 330d8c1f..256fca0e 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java @@ -1,8 +1,8 @@ -/* package me.totalfreedom.totalfreedommod.bridge; +package me.totalfreedom.totalfreedommod.bridge; -import me.libraryaddict.disguise.DisallowedDisguises; -import me.libraryaddict.disguise.LibsDisguises; -import me.libraryaddict.disguise.DisguiseAPI; +//import me.libraryaddict.disguise.DisallowedDisguises; +//import me.libraryaddict.disguise.LibsDisguises; +//import me.libraryaddict.disguise.DisguiseAPI; import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.util.FLog; @@ -13,7 +13,7 @@ import org.bukkit.plugin.Plugin; public class LibsDisguisesBridge extends FreedomService { - private LibsDisguises libsDisguisesPlugin = null; + // private LibsDisguises libsDisguisesPlugin = null; public LibsDisguisesBridge(TotalFreedomMod plugin) { @@ -29,7 +29,7 @@ public class LibsDisguisesBridge extends FreedomService protected void onStop() { } - +/* public LibsDisguises getLibsDisguisesPlugin() { if (libsDisguisesPlugin == null) @@ -134,7 +134,5 @@ public class LibsDisguisesBridge extends FreedomService } return ld.isEnabled(); - } -} - -*/ \ No newline at end of file + }*/ +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java index eafacaab..ac31a704 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java @@ -1,6 +1,6 @@ package me.totalfreedom.totalfreedommod.command; -import me.libraryaddict.disguise.DisallowedDisguises; +//import me.libraryaddict.disguise.DisallowedDisguises; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.command.Command; @@ -15,7 +15,7 @@ public class Command_disguisetoggle extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { + {/* if (!plugin.ldb.isPluginEnabled()) { msg(ChatColor.RED + "LibsDisguises is not enabled."); @@ -38,5 +38,10 @@ public class Command_disguisetoggle extends FreedomCommand msg("Disguises are now " + (!DisallowedDisguises.disabled ? "enabled." : "disabled.")); return true; + +*/ + + msg("This command has been disabled for technical reasons. Contact a developer for additional information."); + return true; } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java index f0123d5a..b382ff78 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java @@ -1,6 +1,6 @@ package me.totalfreedom.totalfreedommod.command; -import me.libraryaddict.disguise.DisallowedDisguises; +//import me.libraryaddict.disguise.DisallowedDisguises; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.command.Command; @@ -14,7 +14,7 @@ public class Command_undisguiseall extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { + { /* if (!plugin.ldb.isPluginEnabled()) { msg("LibsDisguises is not enabled."); @@ -32,5 +32,10 @@ public class Command_undisguiseall extends FreedomCommand plugin.ldb.undisguiseAll(false); return true; + +*/ + + msg("This command has been disabled for technical reasons. Contact a developer for additional information."); + return true; } }