Devel

pom.xml

@@ -59,10 +59,10 @@
 
         <dependency>
             <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.10</version>
+            <artifactId>spigot-server</artifactId>
+            <version>1.12</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/lib/Spigot-1.10.jar</systemPath>
+            <systemPath>${project.basedir}/lib/Spigot-1.12.jar</systemPath>
         </dependency>
 
         <dependency>

src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java

@@ -4,16 +4,16 @@
 import java.util.List;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.minecraft.server.v1_10_R1.EntityPlayer;
-import net.minecraft.server.v1_10_R1.MinecraftServer;
-import net.minecraft.server.v1_10_R1.PropertyManager;
+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_10_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
 
 public class ServerInterface extends FreedomService
 {
 
-    public static final String COMPILE_NMS_VERSION = "v1_10_R1";
+    public static final String COMPILE_NMS_VERSION = "v1_12_R1";
 
     public ServerInterface(TotalFreedomMod plugin)
     {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java

@@ -0,0 +1,56 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.GameMode;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Quickly change your own gamemode to adventure, or define someone's username to change theirs.", usage = "/<command> <-a | [partialname]>", aliases = "gma")
+public class Command_adventure extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            if (isConsole())
+            {
+                sender.sendMessage("When used from the console, you must define a target player.");
+                return true;
+            }
+
+            playerSender.setGameMode(GameMode.ADVENTURE);
+            msg("Gamemode set to adventure.");
+            return true;
+        }
+
+        if (args[0].equals("-a"))
+        {
+            for (Player targetPlayer : server.getOnlinePlayers())
+            {
+                targetPlayer.setGameMode(GameMode.ADVENTURE);
+            }
+
+            FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to adventure", false);
+            return true;
+        }
+
+        Player player = getPlayer(args[0]);
+
+        if (player == null)
+        {
+            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            return true;
+        }
+
+        msg("Setting " + player.getName() + " to game mode adventure");
+        msg(player, sender.getName() + " set your game mode to adventure");
+        player.setGameMode(GameMode.ADVENTURE);
+
+        return true;
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java

@@ -11,20 +11,20 @@
 import org.bukkit.potion.PotionEffectType;
 
 @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Shows (optionally smites) invisisible players", usage = "/<command> (smite)")
+@CommandParameters(description = "Shows (and optionally clears) invisisible players", usage = "/<command> [clear]")
 public class Command_invis extends FreedomCommand
 {
 
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        boolean smite = false;
+        boolean clear = false;
         if (args.length >= 1)
         {
-            if (args[0].equalsIgnoreCase("smite"))
+            if (args[0].equalsIgnoreCase("clear"))
             {
-                FUtil.adminAction(sender.getName(), "Smiting all invisible players", true);
-                smite = true;
+                FUtil.adminAction(sender.getName(), "Clearing invisibility for all players", false);
+                clear = true;
             }
             else
             {
@@ -33,17 +33,17 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
         }
 
         List<String> players = new ArrayList<>();
-        int smites = 0;
+        int clears = 0;
 
         for (Player player : server.getOnlinePlayers())
         {
             if (player.hasPotionEffect(PotionEffectType.INVISIBILITY))
             {
                 players.add(player.getName());
-                if (smite && !plugin.al.isAdmin(player))
+                if (clear && !plugin.al.isAdmin(player))
                 {
-                    player.setHealth(0.0);
-                    smites++;
+                    player.removePotionEffect(PotionEffectType.INVISIBILITY);
+                    clears++;
                 }
             }
         }
@@ -54,9 +54,9 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin
             return true;
         }
 
-        if (smite)
+        if (clear)
         {
-            msg("Smitten " + smites + " players");
+            msg("Cleared invisibility effect from " + clears + " players");
         }
         else
         {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbownick.java

@@ -0,0 +1,60 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Essentials Interface Command - Rainbowify your nickname.", usage = "/<command> <nick>")
+public class Command_rainbownick extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length != 1)
+        {
+            return false;
+        }
+
+        final String nickPlain = ChatColor.stripColor(FUtil.colorize(args[0].trim()));
+
+        if (!nickPlain.matches("^[a-zA-Z_0-9" + ChatColor.COLOR_CHAR + "]+$"))
+        {
+            msg("That nickname contains invalid characters.");
+            return true;
+        }
+
+        if (nickPlain.length() < 4 || nickPlain.length() > 30)
+        {
+            msg("Your nickname must be between 4 and 30 characters long.");
+            return true;
+        }
+
+        for (Player player : Bukkit.getOnlinePlayers())
+        {
+            if (player == playerSender)
+            {
+                continue;
+            }
+            if (player.getName().equalsIgnoreCase(nickPlain) || ChatColor.stripColor(player.getDisplayName()).trim().equalsIgnoreCase(nickPlain))
+            {
+                msg("That nickname is already in use.");
+                return true;
+            }
+        }
+
+        final String newNick = FUtil.rainbowify(ChatColor.stripColor(FUtil.colorize(nickPlain)));
+
+        plugin.esb.setNickname(sender.getName(), newNick);
+
+        msg("Your nickname is now: " + newNick);
+
+        return true;
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java

@@ -0,0 +1,49 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import java.util.Iterator;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Gives you a rainbow tag", usage = "/<command> <tag>")
+public class Command_rainbowtag extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length < 1)
+        {
+            return false;
+        }
+
+        final String tag = ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " ")));
+
+        if(tag.length() > 20)
+        {
+            msg("That tag is too long (Max is 20 characters).");
+            return true;
+        }
+
+        for (String word : Command_tag.FORBIDDEN_WORDS) 
+        {
+            if (tag.contains(word))
+            {
+                msg("That tag contains a forbidden word.");
+                return true;
+            }
+        }
+
+        plugin.pl.getPlayer(playerSender).setTag(FUtil.rainbowify(tag));
+
+        msg("Set tag to " + tag);
+
+        return true;
+    }
+}
+

src/main/java/me/totalfreedom/totalfreedommod/command/Command_unloadchunks.java

@@ -0,0 +1,43 @@
+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.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Unloads chunks not currently in use", usage = "/<command>", aliases = "rc")
+public class Command_unloadchunks extends FreedomCommand {
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
+        FUtil.adminAction(sender.getName(), "Unloading unused chunks", false);
+
+        int numChunks = 0;
+
+        for (World world : server.getWorlds()) {
+            numChunks += unloadUnusedChunks(world);
+        }
+
+        FUtil.playerMsg(sender, numChunks + " chunks unloaded.");
+        return true;
+    }
+
+    private int unloadUnusedChunks(World world) {
+        int numChunks = 0;
+
+        for (Chunk loadedChunk : world.getLoadedChunks()) {
+            if (!world.isChunkInUse(loadedChunk.getX(), loadedChunk.getZ())) {
+                if (world.unloadChunk(loadedChunk)) {
+                    numChunks++;
+                }
+            }
+        }
+
+        return numChunks;
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java

@@ -36,7 +36,7 @@ public NanoHTTPD.Response getResponse()
         }
 
         // Admins
-        for (Admin admin : plugin.al.getAllAdmins().values())
+        for (Admin admin : plugin.al.getActiveAdmins())
         {
             final String username = admin.getName();