TFM-2062

.travis.yml

@@ -0,0 +1,12 @@
+language: java
+jdk:
+  - oraclejdk8
+notifications:
+  email: false
+addons:
+  apt:
+    packages:
+      - sshpass
+script: mvn clean install
+after_success:
+  - ./travis-upload.sh

README.md

@@ -1,5 +1,7 @@
 # TotalFreedomMod #
 
+[![Build Status](https://travis-ci.org/TotalFreedom/TotalFreedomMod.svg?branch=devel)](https://travis-ci.org/TotalFreedom/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.

pom.xml

@@ -11,7 +11,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <tfm.build.version>${project.version}</tfm.build.version>
         <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.author>${buildAuthor}</tfm.build.author>
         <tfm.build.head>${buildHead}</tfm.build.head>
@@ -43,67 +43,83 @@
 
     <repositories>
         <repository>
-            <id>spigot</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+            <id>ess-repo</id>
+            <url>http://repo.ess3.net</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <!--        <repository>
+            <id>elmakers-repo</id>
+            <url>http://maven.elmakers.com/repository/</url>
+        </repository>-->
+        <repository>
+            <id>sk89q-snapshots</id>
+            <url>http://maven.sk89q.com/artifactory/repo</url>
         </repository>
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.5</version>
+        </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.16.6</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-server</artifactId>
-            <version>1.12</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/Spigot-1.12.jar</systemPath>
+            <artifactId>spigot-api</artifactId>
+            <version>1.12-pre5-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>net.pravian</groupId>
-            <artifactId>aero</artifactId>
-            <version>2.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/Aero-2.0.jar</systemPath>
+            <groupId>com.github.Pravian</groupId>
+            <artifactId>Aero</artifactId>
+            <version>a0e1dc5</version>
         </dependency>
 
         <dependency>
-            <groupId>net.totalfreedom</groupId>
-            <artifactId>bukkittelnet</artifactId>
-            <version>4.2</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/BukkitTelnet-4.3.jar</systemPath>
+            <groupId>com.github.TotalFreedom</groupId>
+            <artifactId>BukkitTelnet</artifactId>
+            <version>4.5-pre1</version>
         </dependency>
 
         <dependency>
-            <groupId>net.totalfreedom</groupId>
-            <artifactId>tf-worldedit</artifactId>
-            <version>6.1.0-TF</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/TF-WorldEdit-6.1.1.jar</systemPath>
+            <groupId>net.ess3</groupId>
+            <artifactId>Essentials</artifactId>
+            <version>2.13.1</version>
         </dependency>
 
         <dependency>
-            <groupId>net.totalfreedom</groupId>
-            <artifactId>tf-essentials</artifactId>
-            <version>2.0-TF</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/TF-Essentials-2.1.jar</systemPath>
+            <groupId>com.github.TotalFreedom.TF-WorldEdit</groupId>
+            <artifactId>worldedit-bukkit</artifactId>
+            <version>6.1.0-TF</version>
         </dependency>
 
         <dependency>
-            <groupId>me.libaryaddict.disguise</groupId>
-            <artifactId>LibsDisguises</artifactId>
-            <version>9.0.9</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/LibsDisguises-9.0.9.jar</systemPath>
+            <groupId>com.github.TotalFreedom.TF-WorldEdit</groupId>
+            <artifactId>worldedit-core</artifactId>
+            <version>6.1.0-TF</version>
         </dependency>
+
     </dependencies>
 
     <build>

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

@@ -51,10 +51,10 @@ private void handleChatEvent(AsyncPlayerChatEvent event)
         // Strip color from messages
         message = ChatColor.stripColor(message);
 
-        // Truncate messages that are too long - 100 characters is vanilla client max
-        if (message.length() > 100)
+        // Truncate messages that are too long - 256 characters is vanilla client max
+        if (message.length() > 256)
         {
-            message = message.substring(0, 100);
+            message = message.substring(0, 256);
             FSync.playerMsg(player, "Message was shortened because it was too long to send.");
         }
 

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

@@ -354,7 +354,7 @@ public void run()
                     case 3: // Displays a message
                     {
                         FUtil.bcastMsg("TotalFreedom rocks!!", ChatColor.BLUE);
-                        FUtil.bcastMsg("To join this great server, join " + ChatColor.GOLD + "tf.sauc.in", ChatColor.BLUE);
+                        FUtil.bcastMsg("To join this great server, join " + ChatColor.GOLD + "play.totalfreedom.me", ChatColor.BLUE);
                         break;
                     }
 
@@ -472,7 +472,7 @@ else if (ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
                             sign.setLine(0, ChatColor.BLUE + "TotalFreedom");
                             sign.setLine(1, ChatColor.DARK_GREEN + "is");
                             sign.setLine(2, ChatColor.YELLOW + "Awesome!");
-                            sign.setLine(3, ChatColor.DARK_GRAY + "tf.sauc.in");
+                            sign.setLine(3, ChatColor.DARK_GRAY + "play.totalfreedom.me");
                             sign.update();
                         }
                         break;
@@ -501,7 +501,7 @@ else if (ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
                                 ChatColor.DARK_GREEN + "Why you should go to TotalFreedom instead\n"
                                 + ChatColor.DARK_GRAY + "---------\n"
                                 + ChatColor.BLACK + "TotalFreedom is the original TotalFreedomMod server. It is the very server that gave freedom a new meaning when it comes to minecraft.\n"
-                                + ChatColor.BLUE + "Join now! " + ChatColor.RED + "tf.sauc.in");
+                                + ChatColor.BLUE + "Join now! " + ChatColor.RED + "play.totalfreedom.me");
                         bookStack.setItemMeta(book);
 
                         for (Player player : Bukkit.getOnlinePlayers())

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

@@ -0,0 +1,106 @@
+package me.totalfreedom.totalfreedommod;
+
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.scheduler.BukkitRunnable;
+
+public class Invsee extends FreedomService
+{
+
+    public Invsee(TotalFreedomMod plugin)
+    {
+        super(plugin);
+    }
+
+    @Override
+    protected void onStart()
+    {
+
+    }
+
+    @Override
+    protected void onStop()
+    {
+
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onInventoryClickEvent(final InventoryClickEvent event)
+    {
+        Player refreshPlayer = null;
+        final Inventory top = event.getView().getTopInventory();
+        final InventoryType type = top.getType();
+        final Player playerdata = (Player) event.getWhoClicked();
+        FPlayer fPlayer = plugin.pl.getPlayer(playerdata);
+        if (type == InventoryType.PLAYER && fPlayer.isInvsee())
+        {
+            final InventoryHolder invHolder = top.getHolder();
+            if (invHolder != null && invHolder instanceof HumanEntity)
+            {
+                final Player invOwner = (Player) invHolder;
+                final Rank recieverRank = plugin.rm.getRank(playerdata);
+                final Rank playerRank = plugin.rm.getRank(invOwner);
+                if (playerRank.ordinal() >= recieverRank.ordinal() || !(invOwner.isOnline()))
+                {
+                    event.setCancelled(true);
+                    refreshPlayer = playerdata;
+                }
+            }
+        }
+
+        if (refreshPlayer != null)
+        {
+            final Player player = refreshPlayer;
+            new BukkitRunnable()
+            {
+
+                @Override
+                public void run()
+                {
+                    player.updateInventory();
+                }
+
+            }.runTaskLater(this.plugin, 20);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onInventoryCloseEvent(final InventoryCloseEvent event)
+    {
+        Player refreshPlayer = null;
+        final Inventory top = event.getView().getTopInventory();
+        final InventoryType type = top.getType();
+        final Player playerdata = (Player) event.getPlayer();
+        FPlayer fPlayer = plugin.pl.getPlayer(playerdata);
+        if (type == InventoryType.PLAYER && fPlayer.isInvsee())
+        {
+            fPlayer.setInvsee(false);
+            refreshPlayer = playerdata;
+        }
+
+        if (refreshPlayer != null)
+        {
+            final Player player = refreshPlayer;
+            new BukkitRunnable()
+            {
+
+                @Override
+                public void run()
+                {
+                    player.updateInventory();
+                }
+
+            }.runTaskLater(this.plugin, 20);
+        }
+    }
+
+}