Merge branch 'SpigotMC-master'

api/src/main/java/net/md_5/bungee/api/SkinConfiguration.java

@@ -0,0 +1,24 @@
+package net.md_5.bungee.api;
+
+/**
+ * Represents a player's skin settings. These settings can be changed by the
+ * player under Skin Configuration in the Options menu.
+ */
+public interface SkinConfiguration
+{
+
+    boolean hasCape();
+
+    boolean hasJacket();
+
+    boolean hasLeftSleeve();
+
+    boolean hasRightSleeve();
+
+    boolean hasLeftPants();
+
+    boolean hasRightPants();
+
+    boolean hasHat();
+
+}

api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java

@@ -6,6 +6,7 @@
 import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.SkinConfiguration;
 import net.md_5.bungee.api.Title;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.config.ServerInfo;
@@ -17,6 +18,34 @@
 public interface ProxiedPlayer extends Connection, CommandSender
 {
 
+    /**
+     * Represents the player's chat state.
+     */
+    public enum ChatMode
+    {
+
+        /**
+         * The player will see all chat.
+         */
+        SHOWN,
+        /**
+         * The player will only see everything except messages marked as chat.
+         */
+        COMMANDS_ONLY,
+        /**
+         * The chat is completely disabled, the player won't see anything.
+         */
+        HIDDEN;
+
+    }
+
+    public enum MainHand
+    {
+
+        LEFT,
+        RIGHT;
+    }
+
     /**
      * Gets this player's display name.
      *
@@ -142,6 +171,41 @@ public interface ProxiedPlayer extends Connection, CommandSender
      */
     Locale getLocale();
 
+    /**
+     * Gets this player's view distance.
+     *
+     * @return the view distance, or a reasonable default
+     */
+    byte getViewDistance();
+
+    /**
+     * Gets this player's chat mode.
+     *
+     * @return the chat flags set, or a reasonable default
+     */
+    ChatMode getChatMode();
+
+    /**
+     * Gets if this player has chat colors enabled or disabled.
+     *
+     * @return if chat colors are enabled
+     */
+    boolean hasChatColors();
+
+    /**
+     * Gets this player's skin settings.
+     *
+     * @return the players skin setting
+     */
+    SkinConfiguration getSkinParts();
+
+    /**
+     * Gets this player's main hand setting.
+     *
+     * @return main hand setting
+     */
+    MainHand getMainHand();
+
     /**
      * Set the header and footer displayed in the tab player list.
      *

api/src/main/java/net/md_5/bungee/api/score/Objective.java

@@ -22,5 +22,5 @@ public class Objective
     /**
      * Type; integer or hearts
      */
-    private final String type;
+    private String type;
 }

bootstrap/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>
-            <version>4.8</version>
+            <version>4.9</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -46,7 +46,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.0.2</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -60,7 +60,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.1</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>