Rebase to Minecraft 1.11

api/pom.xml

@@ -4,13 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.md-5</groupId>
+        <groupId>tc.oc</groupId>
         <artifactId>bungeecord-parent</artifactId>
         <version>1.11-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>net.md-5</groupId>
     <artifactId>bungeecord-api</artifactId>
     <version>1.11-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -20,25 +19,30 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>tc.oc</groupId>
+            <artifactId>minecraft-api</artifactId>
+            <version>1.11-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>tc.oc</groupId>
             <artifactId>bungeecord-chat</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>tc.oc</groupId>
             <artifactId>bungeecord-config</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>tc.oc</groupId>
             <artifactId>bungeecord-event</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>net.md-5</groupId>
+            <groupId>tc.oc</groupId>
             <artifactId>bungeecord-protocol</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>

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

@@ -1,27 +1,10 @@
 package net.md_5.bungee.api;
 
-import net.md_5.bungee.api.chat.BaseComponent;
-
 import java.util.Collection;
 
-public interface CommandSender
+public interface CommandSender extends tc.oc.minecraft.api.command.CommandSender
 {
 
-    /**
-     * Get the unique name of this command sender.
-     *
-     * @return the senders username
-     */
-    public String getName();
-
-    /**
-     * Send a message to this sender.
-     *
-     * @param message the message to send
-     */
-    @Deprecated
-    public void sendMessage(String message);
-
     /**
      * Send several messages to this sender. Each message will be sent
      * separately.
@@ -31,20 +14,6 @@ public interface CommandSender
     @Deprecated
     public void sendMessages(String... messages);
 
-    /**
-     * Send a message to this sender.
-     *
-     * @param message the message to send
-     */
-    public void sendMessage(BaseComponent... message);
-
-    /**
-     * Send a message to this sender.
-     *
-     * @param message the message to send
-     */
-    public void sendMessage(BaseComponent message);
-
     /**
      * Get all groups this user is part of. This returns an unmodifiable
      * collection.
@@ -67,14 +36,6 @@ public interface CommandSender
      */
     public void removeGroups(String... groups);
 
-    /**
-     * Checks if this user has the specified permission node.
-     *
-     * @param permission the node to check
-     * @return whether they have this node
-     */
-    public boolean hasPermission(String permission);
-
     /**
      * Set a permission node for this user.
      *

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

@@ -32,9 +32,75 @@ public interface ProxyConfig
 
     /**
      * Set of all servers.
+     *
+     * @deprecated The returned map may be modified concurrently by the proxy.
+     *             The safe alternative is {@link #getServersCopy()}.
      */
+    @Deprecated
     Map<String, ServerInfo> getServers();
 
+    /**
+     * Return all servers registered to this proxy, keyed by name. The returned map
+     * is an immutable snapshot of the actual server collection. It cannot be modified,
+     * and it will not change.
+     *
+     * @return all registered remote server destinations
+     */
+    Map<String, ServerInfo> getServersCopy();
+
+    /**
+     * Gets the server info of a server.
+     *
+     * @param name the name of the configured server
+     * @return the server info belonging to the specified server
+     */
+    ServerInfo getServerInfo(String name);
+
+    /**
+     * Register the given server to the proxy.
+     * Any currently registered server with the same name will be replaced.
+     *
+     * @return the previously registered server with the same name, or null if there was no such server.
+     */
+    ServerInfo addServer(ServerInfo server);
+
+    /**
+     * Register all of the given servers to the proxy.
+     *
+     * @return true if any servers were added or replaced.
+     */
+    boolean addServers(Collection<ServerInfo> servers);
+
+    /**
+     * Un-register the server with the given name from the proxy.
+     *
+     * @return the server that was removed, or null if there is no server with the given name.
+     */
+    ServerInfo removeServerNamed(String name);
+
+    /**
+     * Un-register the given server from the proxy.
+     * The server is matched by name only, other fields in the given {@link ServerInfo} are ignored.
+     *
+     * @return the server that was removed, or null if there is no server with a matching name.
+     */
+    ServerInfo removeServer(ServerInfo server);
+
+    /**
+     * Un-register servers with any of the given names from the proxy.
+     *
+     * @return true if any servers were removed.
+     */
+    boolean removeServersNamed(Collection<String> names);
+
+    /**
+     * Un-register all of the given servers from the proxy.
+     * The servers are matched by name only, other fields in the given {@link ServerInfo} are ignored.
+     *
+     * @return true if any servers were removed.
+     */
+    boolean removeServers(Collection<ServerInfo> servers);
+
     /**
      * Does the server authenticate with mojang
      */
@@ -79,4 +145,9 @@ public interface ProxyConfig
      * The favicon used for the server ping list.
      */
     Favicon getFaviconObject();
+
+    /**
+     * Shutdown immediately if any plugins fail to load
+     */
+    boolean isRequireAllPlugins();
 }

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

@@ -16,7 +16,7 @@
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.scheduler.TaskScheduler;
 
-public abstract class ProxyServer
+public abstract class ProxyServer implements tc.oc.minecraft.api.server.LocalServer
 {
 
     @Getter
@@ -87,15 +87,41 @@ public static void setInstance(ProxyServer instance)
      */
     public abstract ProxiedPlayer getPlayer(UUID uuid);
 
+    @Override
+    public ProxiedPlayer getPlayerExact(String name)
+    {
+        return getPlayer( name );
+    }
+
+    @Override
+    public Collection<ProxiedPlayer> getOnlinePlayers()
+    {
+        return getPlayers();
+    }
+
     /**
      * Return all servers registered to this proxy, keyed by name. Unlike the
      * methods in {@link ConfigurationAdapter#getServers()}, this will not
      * return a fresh map each time.
      *
      * @return all registered remote server destinations
+     *
+     * @deprecated The returned map is part of the proxy's internal state,
+     *             and may be modified concurrently by the proxy.
+     *             The safe alternative is {@link #getServersCopy()}.
      */
+    @Deprecated
     public abstract Map<String, ServerInfo> getServers();
 
+    /**
+     * Return all servers registered to this proxy, keyed by name. The returned map
+     * is an immutable snapshot of the actual server collection. It cannot be modified,
+     * and it will not change.
+     *
+     * @return all registered remote server destinations
+     */
+    public abstract Map<String, ServerInfo> getServersCopy();
+
     /**
      * Gets the server info of a server.
      *

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

@@ -140,7 +140,7 @@ public void setFavicon(Favicon favicon)
     @Deprecated
     public void setDescription(String description)
     {
-        this.description = new TextComponent( TextComponent.fromLegacyText( description ) );
+        this.description = new TextComponent( TextComponent.fromLegacyText( description, false ) );
     }
 
     @Deprecated

api/src/main/java/net/md_5/bungee/api/config/ServerInfo.java

@@ -10,7 +10,7 @@
 /**
  * Class used to represent a server to connect to.
  */
-public interface ServerInfo
+public interface ServerInfo extends tc.oc.minecraft.api.server.Server
 {
 
     /**

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

@@ -2,7 +2,7 @@
 
 import java.util.Locale;
 import java.util.Map;
-import java.util.UUID;
+
 import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.CommandSender;
@@ -14,24 +14,9 @@
  * Represents a player who's connection is being connected to somewhere else,
  * whether it be a remote or embedded server.
  */
-public interface ProxiedPlayer extends Connection, CommandSender
+public interface ProxiedPlayer extends Connection, CommandSender, tc.oc.minecraft.api.entity.Player
 {
 
-    /**
-     * Gets this player's display name.
-     *
-     * @return the players current display name
-     */
-    String getDisplayName();
-
-    /**
-     * Sets this players display name to be used as their nametag and tab list
-     * name.
-     *
-     * @param name the name to set
-     */
-    void setDisplayName(String name);
-
     /**
      * Send a message to the specified screen position of this player.
      *
@@ -128,13 +113,6 @@ public interface ProxiedPlayer extends Connection, CommandSender
     @Deprecated
     String getUUID();
 
-    /**
-     * Get this connection's UUID, if set.
-     *
-     * @return the UUID
-     */
-    UUID getUniqueId();
-
     /**
      * Gets this player's locale.
      *
@@ -211,4 +189,6 @@ public interface ProxiedPlayer extends Connection, CommandSender
      * not occurred for this {@link ProxiedPlayer} yet.
      */
     Map<String, String> getModList();
+
+    Throwable getDisconnectException();
 }

api/src/main/java/net/md_5/bungee/api/event/ServerConnectEvent.java

@@ -34,6 +34,7 @@ public class ServerConnectEvent extends Event implements Cancellable
      * Cancelled state.
      */
     private boolean cancelled;
+    private String fakeUsername;
 
     public ServerConnectEvent(ProxiedPlayer player, ServerInfo target)
     {

api/src/main/java/net/md_5/bungee/api/plugin/CommandBypassException.java

@@ -0,0 +1,8 @@
+package net.md_5.bungee.api.plugin;
+
+/**
+ * Thrown from inside a command to tell the proxy to pass the command upstream
+ */
+public class CommandBypassException extends RuntimeException {
+
+}

api/src/main/java/net/md_5/bungee/api/plugin/Listener.java

@@ -3,6 +3,6 @@
 /**
  * Dummy interface which all event subscribers and listeners must implement.
  */
-public interface Listener
+public interface Listener extends tc.oc.minecraft.api.event.Listener
 {
 }

api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java

@@ -15,7 +15,7 @@
  * Represents any Plugin that may be loaded at runtime to enhance existing
  * functionality.
  */
-public class Plugin
+public class Plugin implements tc.oc.minecraft.api.plugin.Plugin
 {
 
     @Getter
@@ -50,6 +50,12 @@ public void onDisable()
     {
     }
 
+    @Override
+    public ProxyServer getServer()
+    {
+        return getProxy();
+    }
+
     /**
      * Gets the data folder where this plugin may store arbitrary data. It will
      * be a child of {@link ProxyServer#getPluginsFolder()}.
@@ -61,6 +67,12 @@ public final File getDataFolder()
         return new File( getProxy().getPluginsFolder(), getDescription().getName() );
     }
 
+    @Override
+    public InputStream getResource(String name)
+    {
+        return getResourceAsStream( name );
+    }
+
     /**
      * Get a resource from within this plugins jar or container. Care must be
      * taken to close the returned stream.
@@ -85,7 +97,7 @@ final void init(ProxyServer proxy, PluginDescription description)
         this.proxy = proxy;
         this.description = description;
         this.file = description.getFile();
-        this.logger = new PluginLogger( this );
+        this.logger = PluginLogger.get( this );
     }
 
     //