Merge upstream

2025-01-19 06:02:02 +01:00 · 2017-10-28 20:51:33 +01:00 · 2017-10-28 20:51:33 +01:00 · 71b76653f2
commit 71b76653f2
parent b5d048b57a
7 changed files with 59 additions and 64 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8d494242265790df1dc6d92121d1a37b726ac405
+Subproject commit 0fc5694b6a08e07d7c31a512995239fe8ffd047e
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@ -1,4 +1,4 @@
-From 97e3515b113cdc9dbd767ee506dede54cb7240ac Mon Sep 17 00:00:00 2001
+From 40e8d009682f0b5b23430f50f501e8f85669b2b1 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 10:33:31 -0700
 Subject: [PATCH] POM Changes
@ -494,24 +494,22 @@ index 082f0908..8b045e3b 100644
     <dependencies>
         <dependency>
 diff --git a/pom.xml b/pom.xml
-index 714d421d..8ab84091 100644
+index fbbe6717..8ab84091 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -4,23 +4,24 @@
+@@ -3,18 +3,25 @@
+          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-     <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>9</version>
+-    <groupId>net.md-5</groupId>
+-    <artifactId>bungeecord-parent</artifactId>
+    <parent>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-super</artifactId>
 +        <version>dev-SNAPSHOT</version>
 +        <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-    <groupId>net.md-5</groupId>
-    <artifactId>bungeecord-parent</artifactId>
+    </parent>
+
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-parent</artifactId>
     <version>1.12-SNAPSHOT</version>
@ -533,7 +531,7 @@ index 714d421d..8ab84091 100644
     </organization>
     <licenses>
         <license>
-@@ -32,7 +33,19 @@
+@@ -26,7 +33,19 @@
 
     <developers>
         <developer>
@ -554,7 +552,7 @@ index 714d421d..8ab84091 100644
         </developer>
     </developers>
 
-@@ -51,24 +64,36 @@
+@@ -45,31 +64,36 @@
     </modules>
 
     <scm>
@ -576,17 +574,19 @@ index 714d421d..8ab84091 100644
 +        <url>https://ci.aquifermc.org/job/Waterfall/</url>
     </ciManagement>
 
-+    <distributionManagement>
+     <distributionManagement>
 +        <repository>
 +            <id>destroystokyo-releases</id>
 +            <url>https://repo.destroystokyo.com/repository/maven-releases/</url>
 +        </repository>
-+        <snapshotRepository>
+         <snapshotRepository>
+-            <id>sonatype-nexus-snapshots</id>
+-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
 +            <id>destroystokyo-snapshots</id>
 +            <url>https://repo.destroystokyo.com/repository/maven-snapshots/</url>
-+        </snapshotRepository>
-+    </distributionManagement>
-+
+         </snapshotRepository>
+     </distributionManagement>
+ 
     <properties>
         <build.number>unknown</build.number>
         <netty.version>4.1.15.Final</netty.version>
@ -598,14 +598,15 @@ index 714d421d..8ab84091 100644
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-@@ -117,31 +142,14 @@
+@@ -118,24 +142,13 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+            <!-- OSS Parent 9 uses 2.7, 2.10+ is broken anyway -->
+             <plugin>
 -                <groupId>org.codehaus.mojo</groupId>
 -                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>1.15</version>
+-                <version>1.16</version>
 -                <executions>
 -                    <execution>
 -                        <phase>process-classes</phase>
@ -614,26 +615,20 @@ index 714d421d..8ab84091 100644
 -                        </goals>
 -                    </execution>
 -                </executions>
-                <configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.7</version>
+                 <configuration>
 -                    <signature>
 -                        <groupId>org.codehaus.mojo.signature</groupId>
 -                        <artifactId>java17</artifactId>
 -                        <version>1.0</version>
 -                    </signature>
-                </configuration>
-            </plugin>
-             <!-- OSS Parent 9 uses 2.7, 2.10+ is broken anyway -->
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-javadoc-plugin</artifactId>
-                 <version>2.7</version>
-+                <configuration>
 +                    <additionalparam>-Xdoclint:none</additionalparam>
-+                </configuration>
+                 </configuration>
             </plugin>
         </plugins>
-         <pluginManagement>
-@@ -176,4 +184,49 @@
+@@ -171,4 +184,49 @@
             </plugins>
         </pluginManagement>
     </build>
--- a/BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch
+++ b/BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch
@ -1,14 +1,14 @@
-From 152307e7f87fab326ac5c0d6658d3818c5395884 Mon Sep 17 00:00:00 2001
+From 518de0fcb50890c308f081520d29cef9ce3b436c Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:28:45 -0700
 Subject: [PATCH] Rename references from BungeeCord to Waterfall


 diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index 3c1bbe9..8766e04 100644
+index b6b2ceef..11526c9c 100644
 --- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -42,7 +42,7 @@ public class BungeeCordLauncher
+@@ -43,7 +43,7 @@ public class BungeeCordLauncher
             if ( buildDate.before( deadline.getTime() ) )
             {
                 System.err.println( "*** Warning, this build is outdated ***" );
@ -17,7 +17,7 @@ index 3c1bbe9..8766e04 100644
                 System.err.println( "*** You will get NO support regarding this build ***" );
                 System.err.println( "*** Server will start in 10 seconds ***" );
                 Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
-@@ -51,7 +51,7 @@ public class BungeeCordLauncher
+@@ -52,7 +52,7 @@ public class BungeeCordLauncher
 
         BungeeCord bungee = new BungeeCord();
         ProxyServer.setInstance( bungee );
@ -27,7 +27,7 @@ index 3c1bbe9..8766e04 100644
 
         if ( !options.has( "noconsole" ) )
 diff --git a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
-index f1ccd4f..d703d6d 100644
+index f1ccd4f6..d703d6d2 100644
 --- a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
 +++ b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
@@ -12,7 +12,7 @@ public class LogDispatcher extends Thread
@ -40,7 +40,7 @@ index f1ccd4f..d703d6d 100644
     }
 
 diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java
-index 9d51608..446dfe2 100644
+index 9d51608d..446dfe2f 100644
 --- a/proxy/src/main/java/Test.java
 +++ b/proxy/src/main/java/Test.java
@@ -19,7 +19,7 @@ public class Test
@ -53,7 +53,7 @@ index 9d51608..446dfe2 100644
 
         while ( bungee.isRunning )
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index 0d11201..de2158c 100644
+index b4c8bcfc..510841c7 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -178,7 +178,7 @@ public class BungeeCord extends ProxyServer
@ -75,7 +75,7 @@ index 0d11201..de2158c 100644
 
     @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
-index b079879..b26035c 100644
+index b0798791..b26035cf 100644
 --- a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
 +++ b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
@@ -16,6 +16,6 @@ public class CommandBungee extends Command
@ -87,7 +87,7 @@ index b079879..b26035c 100644
     }
 }
 diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
-index cbbe03c..4a49241 100644
+index cbbe03c7..4a492414 100644
 --- a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
 +++ b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
@@ -22,7 +22,7 @@ public class CommandReload extends Command
@ -101,10 +101,10 @@ index cbbe03c..4a49241 100644
     }
 }
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index 8d79b5a..754ae9a 100644
+index 408312fd..95590b6d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-@@ -200,7 +200,7 @@ public class YamlConfig implements ConfigurationAdapter
+@@ -207,7 +207,7 @@ public class YamlConfig implements ConfigurationAdapter
             Map<String, Object> val = entry.getValue();
             String name = entry.getKey();
             String addr = get( "address", "localhost:25565", val );
@ -114,5 +114,5 @@ index 8d79b5a..754ae9a 100644
             InetSocketAddress address = Util.getAddr( addr );
             ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.7.4 (Apple Git-66)
+2.14.1

--- a/BungeeCord-Patches/0003-Add-Waterfall-configuration-files.patch
+++ b/BungeeCord-Patches/0003-Add-Waterfall-configuration-files.patch
@ -1,4 +1,4 @@
-From 7709afb28954b5b82ad8ef51a3d501f6a3607533 Mon Sep 17 00:00:00 2001
+From 1893ed633fc97a855d0e657baa09feec9f007d11 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 25 Oct 2016 11:58:37 -0400
 Subject: [PATCH] Add Waterfall configuration files
@ -77,13 +77,13 @@ index 907246a9..4a55c0e2 100644
 
     /**
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index 754ae9a7..58e6fa47 100644
+index 95590b6d..1019c307 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-@@ -42,10 +42,15 @@ public class YamlConfig implements ConfigurationAdapter
+@@ -43,10 +43,15 @@ public class YamlConfig implements ConfigurationAdapter
     }
     private final Yaml yaml;
-     private Map config;
+     private Map<String, Object> config;
 -    private final File file = new File( "config.yml" );
 +    private final File file;
 
@ -98,7 +98,7 @@ index 754ae9a7..58e6fa47 100644
         DumperOptions options = new DumperOptions();
         options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
         yaml = new Yaml( options );
-@@ -53,6 +58,11 @@ public class YamlConfig implements ConfigurationAdapter
+@@ -54,6 +59,11 @@ public class YamlConfig implements ConfigurationAdapter
 
     @Override
     public void load()
@ -110,7 +110,7 @@ index 754ae9a7..58e6fa47 100644
     {
         try
         {
-@@ -75,6 +85,7 @@ public class YamlConfig implements ConfigurationAdapter
+@@ -82,6 +92,7 @@ public class YamlConfig implements ConfigurationAdapter
             throw new RuntimeException( "Could not load configuration!", ex );
         }
 
--- a/BungeeCord-Patches/0028-Add-dynamic-server-addition-removal-api.patch
+++ b/BungeeCord-Patches/0028-Add-dynamic-server-addition-removal-api.patch
@ -1,4 +1,4 @@
-From 8056f447e7f0ac8bc9f660a2b1e34918d5c6f750 Mon Sep 17 00:00:00 2001
+From e917f0bdcc43a2177e76d4c1d10fffcb7f59c50e Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 04:29:25 +0200
 Subject: [PATCH] Add dynamic server addition/removal api.
@ -144,10 +144,10 @@ index 967a1b2a..08aa6981 100644
     {
         int index = path.indexOf( SEPARATOR );
 diff --git a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
-index 36da83e2..c9ca6874 100644
+index b3ff750f..43d11cf2 100644
 --- a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
 +++ b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
-@@ -78,7 +78,7 @@ public class CommandServer extends Command implements TabExecutor
+@@ -83,7 +83,7 @@ public class CommandServer extends Command implements TabExecutor
     @Override
     public Iterable<String> onTabComplete(final CommandSender sender, final String[] args)
     {
--- a/BungeeCord-Patches/0038-Improve-outdated-build-message.patch
+++ b/BungeeCord-Patches/0038-Improve-outdated-build-message.patch
@ -1,14 +1,14 @@
-From 517a7f918b4e17e5512e6b36ccb3d86a33c37b49 Mon Sep 17 00:00:00 2001
+From 1b4c278288883e71acbd3e6ed3b67cdfd9cacbf8 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Sat, 10 Jun 2017 20:56:02 +0100
 Subject: [PATCH] Improve outdated build message


 diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index 8766e04b..ce1dd7a3 100644
+index 11526c9c..2efe7211 100644
 --- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -41,9 +41,9 @@ public class BungeeCordLauncher
+@@ -42,9 +42,9 @@ public class BungeeCordLauncher
             deadline.add( Calendar.WEEK_OF_YEAR, -4 );
             if ( buildDate.before( deadline.getTime() ) )
             {
--- a/BungeeCord-Patches/0040-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0040-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@ -1,4 +1,4 @@
-From f29ff52488dfaa77e80afb8e7544500edb6d48d2 Mon Sep 17 00:00:00 2001
+From b82d1273ed42f5c59a0fa7428521f551a9b7ca81 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -28,10 +28,10 @@ index 7bc2dff7..6e8dd81e 100644
         </plugins>
     </build>
 diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index ce1dd7a3..af4c024e 100644
+index 2efe7211..3e719f6e 100644
 --- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -56,6 +56,9 @@ public class BungeeCordLauncher
+@@ -57,6 +57,9 @@ public class BungeeCordLauncher
 
         if ( !options.has( "noconsole" ) )
         {
@ -41,8 +41,8 @@ index ce1dd7a3..af4c024e 100644
             String line;
             while ( bungee.isRunning && ( line = bungee.getConsoleReader().readLine( ">" ) ) != null )
             {
-@@ -64,6 +67,8 @@ public class BungeeCordLauncher
-                     bungee.getConsole().sendMessage( ChatColor.RED + "Command not found" );
+@@ -65,6 +68,8 @@ public class BungeeCordLauncher
+                     bungee.getConsole().sendMessage( new ComponentBuilder( "Command not found" ).color( ChatColor.RED ).create() );
                 }
             }
 +            */
@ -456,7 +456,7 @@ index b822f95b..da2904b0 100644
         if ( !Boolean.getBoolean( "net.md_5.bungee.native.disable" ) )
         {
 diff --git a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
-index 901fc5a3..8bb88bd4 100644
+index 10366c88..8c5cc949 100644
 --- a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
 +++ b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
@@ -42,7 +42,7 @@ public class ModuleManager