diff --git a/README.md b/README.md index ff8e687e..9853b931 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # TotalFreedomMod # +[![Build Status](https://travis-ci.org/Wild1145/TotalFreedomMod.svg?branch=maventravisci)](https://travis-ci.org/Wild1145/TotalFreedomMod) + TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](http://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server. This plugin was originally coded by StevenLawson (Madgeek1450), with Jerom van der Sar (Prozza) becoming heavily involved in its development some time later. It consists of over 85 custom coded commands and a large variety of distinguishable features not included in any other plugin. The plugin has since its beginning grown immensely. Together, with the main TotalFreedom server, TotalFreedomMod has a long-standing reputation of effectiveness whilst maintaining a clear feeling of openness towards the administrators and the players themselves. diff --git a/pom.xml b/pom.xml index 62df513f..2b392006 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ UTF-8 ${project.version} Electrum - ${maven.buildnumber} + ${maven.build.timestamp} ${buildAuthor} ${buildHead} @@ -43,67 +43,83 @@ - spigot - https://hub.spigotmc.org/nexus/content/groups/public/ + ess-repo + http://repo.ess3.net + + + jitpack.io + https://jitpack.io + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + sk89q-snapshots + http://maven.sk89q.com/artifactory/repo + + org.apache.commons + commons-lang3 + 3.6 + + + + commons-io + commons-io + 2.5 + org.projectlombok lombok 1.16.6 - provided org.spigotmc - spigot-server - 1.12 - system - ${project.basedir}/lib/Spigot-1.12.jar + spigot-api + 1.12-pre5-SNAPSHOT + compile - net.pravian - aero - 2.0 - system - ${project.basedir}/lib/Aero-2.0.jar + com.github.Pravian + Aero + a0e1dc5 - net.totalfreedom - bukkittelnet - 4.2 - system - ${project.basedir}/lib/BukkitTelnet-4.3.jar + com.github.TotalFreedom + BukkitTelnet + 4.5-pre1 - net.totalfreedom - tf-worldedit + net.ess3 + Essentials + 2.13.1 + + + + com.github.TotalFreedom.TF-WorldEdit + worldedit-bukkit 6.1.0-TF - system - ${project.basedir}/lib/TF-WorldEdit-6.1.1.jar - net.totalfreedom - tf-essentials - 2.0-TF - system - ${project.basedir}/lib/TF-Essentials-2.1.jar + com.github.TotalFreedom.TF-WorldEdit + worldedit-core + 6.1.0-TF - - me.libaryaddict.disguise - LibsDisguises - 9.0.9 - system - ${project.basedir}/lib/LibsDisguises-9.0.9.jar - diff --git a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java index 9efa98e3..67469bdf 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java @@ -168,15 +168,15 @@ public class LoginProcess extends FreedomService return; } - // Whitelist - if (plugin.si.isWhitelisted()) - { - if (!plugin.si.getWhitelisted().contains(username.toLowerCase())) - { - event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server."); - return; - } - } +// // Whitelist +// if (plugin.si.isWhitelisted()) +// { +// if (!plugin.si.getWhitelisted().contains(username.toLowerCase())) +// { +// event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server."); +// return; +// } +// } } @EventHandler(priority = EventPriority.MONITOR) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java index d050790c..90df9edf 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java @@ -1,14 +1,7 @@ package me.totalfreedom.totalfreedommod; -import java.util.Arrays; -import java.util.List; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; -import net.minecraft.server.v1_12_R1.EntityPlayer; -import net.minecraft.server.v1_12_R1.MinecraftServer; -import net.minecraft.server.v1_12_R1.PropertyManager; -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_12_R1.CraftServer; public class ServerInterface extends FreedomService { @@ -41,52 +34,52 @@ public class ServerInterface extends FreedomService } } - public void setOnlineMode(boolean mode) - { - final PropertyManager manager = getServer().getPropertyManager(); - manager.setProperty("online-mode", mode); - manager.savePropertiesFile(); - } - - public int purgeWhitelist() - { - String[] whitelisted = getServer().getPlayerList().getWhitelisted(); - int size = whitelisted.length; - for (EntityPlayer player : getServer().getPlayerList().players) - { - getServer().getPlayerList().getWhitelist().remove(player.getProfile()); - } - - try - { - getServer().getPlayerList().getWhitelist().save(); - } - catch (Exception ex) - { - FLog.warning("Could not purge the whitelist!"); - FLog.warning(ex); - } - return size; - } - - public boolean isWhitelisted() - { - return getServer().getPlayerList().getHasWhitelist(); - } - - public List getWhitelisted() - { - return Arrays.asList(getServer().getPlayerList().getWhitelisted()); - } - - public String getVersion() - { - return getServer().getVersion(); - } - - private MinecraftServer getServer() - { - return ((CraftServer) Bukkit.getServer()).getServer(); - } +// public void setOnlineMode(boolean mode) +// { +// final PropertyManager manager = getServer().getPropertyManager(); +// manager.setProperty("online-mode", mode); +// manager.savePropertiesFile(); +// } +// +// public int purgeWhitelist() +// { +// String[] whitelisted = getServer().getPlayerList().getWhitelisted(); +// int size = whitelisted.length; +// for (EntityPlayer player : getServer().getPlayerList().players) +// { +// getServer().getPlayerList().getWhitelist().remove(player.getProfile()); +// } +// +// try +// { +// getServer().getPlayerList().getWhitelist().save(); +// } +// catch (Exception ex) +// { +// FLog.warning("Could not purge the whitelist!"); +// FLog.warning(ex); +// } +// return size; +// } +// +// public boolean isWhitelisted() +// { +// return getServer().getPlayerList().getHasWhitelist(); +// } +// +// public List getWhitelisted() +// { +// return Arrays.asList(getServer().getPlayerList().getWhitelisted()); +// } +// +// public String getVersion() +// { +// return getServer().getVersion(); +// } +// +// private MinecraftServer getServer() +// { +// return ((CraftServer) Bukkit.getServer()).getServer(); +// } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java index 1c500838..8bd6748f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java @@ -55,7 +55,8 @@ public class ServerPing extends FreedomService return; } - String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", plugin.si.getVersion()); +// String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", plugin.si.getVersion()); + String baseMotd = ConfigEntry.SERVER_MOTD.getString(); baseMotd = baseMotd.replace("\\n", "\n"); baseMotd = FUtil.colorize(baseMotd); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java index ed7bc978..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; -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,5 +134,5 @@ public class LibsDisguisesBridge extends FreedomService } return ld.isEnabled(); - } -} + }*/ +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java index ed6548a6..ecf398d3 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java @@ -2,8 +2,16 @@ package me.totalfreedom.totalfreedommod.bridge; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.util.FUtil; -import me.totalfreedom.worldedit.LimitChangedEvent; -import me.totalfreedom.worldedit.SelectionChangedEvent; +// These imports are not in the latest releases of WorldEdit, and the new versions of WorldEdit do not build properly. This will need to be reverted once the new WorldEdit builds are building properly. +// +//import me.totalfreedom.worldedit.LimitChangedEvent; +//import me.totalfreedom.worldedit.SelectionChangedEvent; +// +//The following two imports are a temporary measure as mentioned above. +// +import me.StevenLawson.worldedit.LimitChangedEvent; +import me.StevenLawson.worldedit.SelectionChangedEvent; +// import net.pravian.aero.component.PluginListener; import org.bukkit.ChatColor; import org.bukkit.entity.Player; 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_onlinemode.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java index df6884e1..199f8e8f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java @@ -1,7 +1,6 @@ package me.totalfreedom.totalfreedommod.command; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -44,26 +43,27 @@ public class Command_onlinemode extends FreedomCommand return false; } - try - { - plugin.si.setOnlineMode(onlineMode); - - if (onlineMode) - { - for (Player player : server.getOnlinePlayers()) - { - player.kickPlayer("Server is activating \"online-mode=true\". Please reconnect."); - } - } - - FUtil.adminAction(sender.getName(), "Turning player validation " + (onlineMode ? "on" : "off") + ".", true); - - server.reload(); - } - catch (Exception ex) - { - FLog.severe(ex); - } +// try +// { +// plugin.si.setOnlineMode(onlineMode); +// +// if (onlineMode) +// { +// for (Player player : server.getOnlinePlayers()) +// { +// player.kickPlayer("Server is activating \"online-mode=true\". Please reconnect."); +// } +// } +// +// FUtil.adminAction(sender.getName(), "Turning player validation " + (onlineMode ? "on" : "off") + ".", true); +// +// server.reload(); +// } +// catch (Exception ex) +// { +// FLog.severe(ex); +// } + FUtil.adminAction(sender.getName(), "Online-Mode toggling is temporarily disabled.", true); } 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; } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java index e8cc7dc2..fe8cc084 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java @@ -158,8 +158,10 @@ public class Command_whitelist extends FreedomCommand //purge if (args[0].equalsIgnoreCase("purge")) { - FUtil.adminAction(sender.getName(), "Removing all players from the whitelist.", false); - msg("Removed " + plugin.si.purgeWhitelist() + " players from the whitelist."); +// FUtil.adminAction(sender.getName(), "Removing all players from the whitelist.", false); +// msg("Removed " + plugin.si.purgeWhitelist() + " players from the whitelist."); + + FUtil.adminAction(sender.getName(), "Whitelist purging is temporarily disabled.", true); return true; }