TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-06-30 17:59:02 +00:00
Code Issues Projects Releases Wiki Activity

Resolved dependency issues - Building correctly

Browse source
This commit is contained in:
Ryan Wild 2017-07-25 10:20:36 +01:00
parent c4ebbb74c7
commit e16714ea6c
4 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -11,7 +11,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tfm.build.version>${project.version}</tfm.build.version> <tfm.build.version>${project.version}</tfm.build.version>
<tfm.build.codename>Electrum</tfm.build.codename> <tfm.build.codename>Electrum</tfm.build.codename>
<tfm.build.number>${maven.buildnumber}</tfm.build.number> <!-- <tfm.build.number>${maven.buildnumber}</tfm.build.number> -->
<tfm.build.date>${maven.build.timestamp}</tfm.build.date> <tfm.build.date>${maven.build.timestamp}</tfm.build.date>
<tfm.build.author>${buildAuthor}</tfm.build.author> <tfm.build.author>${buildAuthor}</tfm.build.author>
<tfm.build.head>${buildHead}</tfm.build.head> <tfm.build.head>${buildHead}</tfm.build.head>

16
src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java
View file

@ -1,8 +1,8 @@
/* package me.totalfreedom.totalfreedommod.bridge; package me.totalfreedom.totalfreedommod.bridge;
import me.libraryaddict.disguise.DisallowedDisguises; //import me.libraryaddict.disguise.DisallowedDisguises;
import me.libraryaddict.disguise.LibsDisguises; //import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.DisguiseAPI; //import me.libraryaddict.disguise.DisguiseAPI;
import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FLog;
@ -13,7 +13,7 @@ import org.bukkit.plugin.Plugin;
public class LibsDisguisesBridge extends FreedomService public class LibsDisguisesBridge extends FreedomService
{ {
private LibsDisguises libsDisguisesPlugin = null; // private LibsDisguises libsDisguisesPlugin = null;
public LibsDisguisesBridge(TotalFreedomMod plugin) public LibsDisguisesBridge(TotalFreedomMod plugin)
{ {
@ -29,7 +29,7 @@ public class LibsDisguisesBridge extends FreedomService
protected void onStop() protected void onStop()
{ {
} }
/*
public LibsDisguises getLibsDisguisesPlugin() public LibsDisguises getLibsDisguisesPlugin()
{ {
if (libsDisguisesPlugin == null) if (libsDisguisesPlugin == null)
@ -134,7 +134,5 @@ public class LibsDisguisesBridge extends FreedomService
} }
return ld.isEnabled(); return ld.isEnabled();
} }*/
} }
*/

9
src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java
View file

@ -1,6 +1,6 @@
package me.totalfreedom.totalfreedommod.command; 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.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -15,7 +15,7 @@ public class Command_disguisetoggle extends FreedomCommand
@Override @Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {/*
if (!plugin.ldb.isPluginEnabled()) if (!plugin.ldb.isPluginEnabled())
{ {
msg(ChatColor.RED + "LibsDisguises is not enabled."); 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.")); msg("Disguises are now " + (!DisallowedDisguises.disabled ? "enabled." : "disabled."));
return true; return true;
*/
msg("This command has been disabled for technical reasons. Contact a developer for additional information.");
return true;
} }
} }

9
src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java
View file

@ -1,6 +1,6 @@
package me.totalfreedom.totalfreedommod.command; 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.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -14,7 +14,7 @@ public class Command_undisguiseall extends FreedomCommand
@Override @Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ { /*
if (!plugin.ldb.isPluginEnabled()) if (!plugin.ldb.isPluginEnabled())
{ {
msg("LibsDisguises is not enabled."); msg("LibsDisguises is not enabled.");
@ -32,5 +32,10 @@ public class Command_undisguiseall extends FreedomCommand
plugin.ldb.undisguiseAll(false); plugin.ldb.undisguiseAll(false);
return true; return true;
*/
msg("This command has been disabled for technical reasons. Contact a developer for additional information.");
return true;
} }
} }