From f04680f98e0407a993eede4466509efc2069f052 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Sat, 16 Jul 2016 21:12:39 -0400 Subject: [PATCH] Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final --- BungeeCord | 2 +- BungeeCord-Patches/0001-POM-Changes.patch | 56 ++++++++++++++++--- ...erences-from-BungeeCord-to-Waterfall.patch | 30 +++++----- .../0008-Upgrade-to-netty-4.1.patch | 18 +++--- ...ration-of-the-log-file-path-filename.patch | 26 ++++----- ...ize-to-8MB-and-don-t-append-to-exist.patch | 16 +++--- ...the-console-to-tab-complete-commands.patch | 8 +-- 7 files changed, 97 insertions(+), 59 deletions(-) diff --git a/BungeeCord b/BungeeCord index 1250088..c43f25e 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 1250088f98fc59d28736932fac88586594329ec2 +Subproject commit c43f25e23b68f684e1ed06ee42e9d0e6cffa62b6 diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch index dbb1d55..7fe47be 100644 --- a/BungeeCord-Patches/0001-POM-Changes.patch +++ b/BungeeCord-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From e719f30fe98f178110c6a8343c389829e93c4f9f Mon Sep 17 00:00:00 2001 +From 87f0343cc2c61facdaa577f2ae03c5297db9f905 Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 10:33:31 -0700 Subject: [PATCH] POM Changes @@ -235,6 +235,36 @@ index 6688153..f9615cf 100644 + Waterfall-Event + Generic java event dispatching API intended for use with Waterfall. +diff --git a/log/pom.xml b/log/pom.xml +index b970df0..081923b 100644 +--- a/log/pom.xml ++++ b/log/pom.xml +@@ -4,19 +4,19 @@ + 4.0.0 + + +- net.md-5 +- bungeecord-parent ++ io.github.waterfallmc ++ waterfall-parent + 1.10-SNAPSHOT + ../pom.xml + + +- net.md-5 +- bungeecord-log ++ io.github.waterfallmc ++ waterfall-log + 1.10-SNAPSHOT + jar + +- BungeeCord-Log +- Simplistic and performant java.util.Logger based logger and console API designed for use with BungeeCord and Minecraft related applications. ++ Waterfall-Log ++ Simplistic and performant java.util.Logger based logger and console API designed for use with Waterfall and Minecraft related applications. + + + diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml index 3156334..0c076f9 100644 --- a/module/cmd-alert/pom.xml @@ -445,7 +475,7 @@ index a3bd632..a2b422c 100644 diff --git a/pom.xml b/pom.xml -index 299f6fa..309f43d 100644 +index 53d3db1..ead929e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,18 +9,18 @@ @@ -490,7 +520,7 @@ index 299f6fa..309f43d 100644 -@@ -50,24 +56,36 @@ +@@ -51,24 +57,36 @@ @@ -526,7 +556,7 @@ index 299f6fa..309f43d 100644 + unknown - 4.0.33.Final + 4.0.39.Final - 1.7 - 1.7 + @@ -535,7 +565,7 @@ index 299f6fa..309f43d 100644 UTF-8 -@@ -116,36 +134,14 @@ +@@ -117,36 +135,14 @@ @@ -575,7 +605,7 @@ index 299f6fa..309f43d 100644 -@@ -180,4 +176,49 @@ +@@ -181,4 +177,49 @@ @@ -663,7 +693,7 @@ index bac4690..7a74143 100644 compile diff --git a/proxy/pom.xml b/proxy/pom.xml -index 700e327..9d792b5 100644 +index 55bba90..f7277d6 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -4,18 +4,18 @@ @@ -690,7 +720,7 @@ index 700e327..9d792b5 100644 Proxy component of the Elastic Portal Suite -@@ -39,26 +39,26 @@ +@@ -33,32 +33,32 @@ compile @@ -703,6 +733,14 @@ index 700e327..9d792b5 100644 - net.md-5 +- bungeecord-log ++ io.github.waterfallmc ++ waterfall-log + ${project.version} + compile + + +- net.md-5 - bungeecord-native + io.github.waterfallmc + waterfall-native @@ -767,5 +805,5 @@ index 8df9b12..1d76633 100644 compile -- -2.8.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch b/BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch index 58e8323..7669a8e 100644 --- a/BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch +++ b/BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch @@ -1,4 +1,4 @@ -From 3daf09a3028b210960c6e169859f3d81513d93b2 Mon Sep 17 00:00:00 2001 +From 22e693910307942ab8c324265daca16231ecb8e6 Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 11:28:45 -0700 Subject: [PATCH] Rename references from BungeeCord to Waterfall @@ -26,6 +26,19 @@ index 3c1bbe9..5e1773c 100644 bungee.start(); 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 +--- 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 + + public LogDispatcher(BungeeLogger logger) + { +- super( "BungeeCord Logger Thread" ); ++ super( "Waterfall Logger Thread" ); + this.logger = logger; + } + diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java index 9d51608..446dfe2 100644 --- a/proxy/src/main/java/Test.java @@ -40,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 ac08d8e..8ce4ced 100644 +index 9825b99..bed662d 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -172,7 +172,7 @@ public class BungeeCord extends ProxyServer @@ -100,19 +113,6 @@ index c7547c7..82ff91a 100644 boolean restricted = get( "restricted", false, val ); InetSocketAddress address = Util.getAddr( addr ); ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted ); -diff --git a/proxy/src/main/java/net/md_5/bungee/log/LogDispatcher.java b/proxy/src/main/java/net/md_5/bungee/log/LogDispatcher.java -index f1ccd4f..d703d6d 100644 ---- a/proxy/src/main/java/net/md_5/bungee/log/LogDispatcher.java -+++ b/proxy/src/main/java/net/md_5/bungee/log/LogDispatcher.java -@@ -12,7 +12,7 @@ public class LogDispatcher extends Thread - - public LogDispatcher(BungeeLogger logger) - { -- super( "BungeeCord Logger Thread" ); -+ super( "Waterfall Logger Thread" ); - this.logger = logger; - } - -- 2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch b/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch index 3e36659..10ae956 100644 --- a/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch +++ b/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch @@ -1,4 +1,4 @@ -From dedf4862695f0f2aae5d43f3acb1ac2f7e0104cb Mon Sep 17 00:00:00 2001 +From 9815eaa1ddf85d5d73c6b2b2b5b67d8d8e6d3a59 Mon Sep 17 00:00:00 2001 From: Techcable Date: Tue, 3 May 2016 20:31:52 -0700 Subject: [PATCH] Upgrade to netty 4.1 @@ -7,15 +7,15 @@ Don't access a ByteBuf's underlying array with ByteBuf.array() - ByteBuf.array() returns the underlying array storage, and does *not* return a view of the buffer as an array diff --git a/pom.xml b/pom.xml -index 309f43d..6fe9ef4 100644 +index ead929e..bd19538 100644 --- a/pom.xml +++ b/pom.xml -@@ -82,7 +82,7 @@ +@@ -83,7 +83,7 @@ unknown -- 4.0.33.Final -+ 4.1.0.CR7 +- 4.0.39.Final ++ 4.1.3.Final 1.8 1.8 @@ -72,27 +72,27 @@ index bbaef39..e1344b3 100644 * Allow this packet to be sent as an "extended" packet. */ diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -index dd00192..e941803 100644 +index 977b3de..e941803 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -199,7 +199,7 @@ public class ServerConnector extends PacketHandler ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer(); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand ); -- user.unsafe().sendPacket( new PluginMessage( "MC|Brand", brand.array().clone(), handshakeHandler.isServerForge() ) ); +- user.unsafe().sendPacket( new PluginMessage( "MC|Brand", DefinedPacket.readArray( brand ), handshakeHandler.isServerForge() ) ); + user.unsafe().sendPacket( new PluginMessage( "MC|Brand", brand, handshakeHandler.isServerForge() ) ); brand.release(); } else { diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java -index cb9dbaf..2fcc7db 100644 +index 3daab36..2fcc7db 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java @@ -235,7 +235,7 @@ public class DownstreamBridge extends PacketHandler brand.release(); brand = ByteBufAllocator.DEFAULT.heapBuffer(); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand ); -- pluginMessage.setData( brand.array().clone() ); +- pluginMessage.setData( DefinedPacket.readArray( brand ) ); + pluginMessage.setData( brand ); brand.release(); // changes in the packet are ignored so we need to send it manually diff --git a/BungeeCord-Patches/0009-Allow-configuration-of-the-log-file-path-filename.patch b/BungeeCord-Patches/0009-Allow-configuration-of-the-log-file-path-filename.patch index 362a3cf..12761f8 100644 --- a/BungeeCord-Patches/0009-Allow-configuration-of-the-log-file-path-filename.patch +++ b/BungeeCord-Patches/0009-Allow-configuration-of-the-log-file-path-filename.patch @@ -1,22 +1,22 @@ -From 8a70c2911d76569ad26348f69161a8d425b8999d Mon Sep 17 00:00:00 2001 +From 150ebe200bbed2b5822168b258f8b6443c8c6e89 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 11 Sep 2015 23:50:52 -0400 Subject: [PATCH] Allow configuration of the log file path/filename -diff --git a/proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java b/proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java -index 94e924b..cde3194 100644 ---- a/proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java -+++ b/proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java -@@ -27,7 +27,7 @@ public class BungeeLogger extends Logger +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 177f4d7..4e7702bd 100644 +--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java ++++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +@@ -206,7 +206,7 @@ public class BungeeCord extends ProxyServer + consoleReader = new ConsoleReader(); + consoleReader.setExpandEvents( false ); - try - { -- FileHandler fileHandler = new FileHandler( "proxy.log", 1 << 24, 8, true ); -+ FileHandler fileHandler = new FileHandler( System.getProperty("bungee.log-file", "proxy.log"), 1 << 24, 8, true ); - fileHandler.setFormatter( formatter ); - addHandler( fileHandler ); +- logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader ); ++ logger = new BungeeLogger( "BungeeCord", System.getProperty("bungee.log-file", "proxy.log"), consoleReader ); + System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) ); + System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) ); -- -2.8.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0025-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch b/BungeeCord-Patches/0025-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch index 33f8507..cb52cfb 100644 --- a/BungeeCord-Patches/0025-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch +++ b/BungeeCord-Patches/0025-Reduce-max-log-size-to-8MB-and-don-t-append-to-exist.patch @@ -1,23 +1,23 @@ -From 585b5449ed9e6be1f52a33e6eb19dd9ed7a5a41e Mon Sep 17 00:00:00 2001 +From 122422dc3cd5b263372cd535c229ed716a5fc9f2 Mon Sep 17 00:00:00 2001 From: Tux Date: Sun, 14 Feb 2016 01:03:27 -0500 Subject: [PATCH] Reduce max log size to 8MB and don't append to existing log files -diff --git a/proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java b/proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java -index cde3194..54275f6 100644 ---- a/proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java -+++ b/proxy/src/main/java/net/md_5/bungee/log/BungeeLogger.java +diff --git a/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java b/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java +index 9598fff..2a2e0ed 100644 +--- a/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java ++++ b/log/src/main/java/net/md_5/bungee/log/BungeeLogger.java @@ -27,7 +27,7 @@ public class BungeeLogger extends Logger try { -- FileHandler fileHandler = new FileHandler( System.getProperty("bungee.log-file", "proxy.log"), 1 << 24, 8, true ); -+ FileHandler fileHandler = new FileHandler( System.getProperty("bungee.log-file", "proxy.log"), 1 << 23, 8, false ); +- FileHandler fileHandler = new FileHandler( filePattern, 1 << 24, 8, true ); ++ FileHandler fileHandler = new FileHandler( filePattern, 1 << 23, 8, false ); fileHandler.setFormatter( formatter ); addHandler( fileHandler ); -- -2.8.3 +2.7.4 (Apple Git-66) diff --git a/BungeeCord-Patches/0036-Allow-the-console-to-tab-complete-commands.patch b/BungeeCord-Patches/0036-Allow-the-console-to-tab-complete-commands.patch index 6ecbc35..e5dae30 100644 --- a/BungeeCord-Patches/0036-Allow-the-console-to-tab-complete-commands.patch +++ b/BungeeCord-Patches/0036-Allow-the-console-to-tab-complete-commands.patch @@ -1,11 +1,11 @@ -From 5c2ffee089e1c972084acee916d54c5f8802bb1f Mon Sep 17 00:00:00 2001 +From f2c7fc036031311e09d1aad4b28c227993bf6fc5 Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Sun, 14 Feb 2016 15:54:40 +0000 Subject: [PATCH] Allow the console to tab complete commands 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 d0739c1..fc5ca3a 100644 +index f676f0e..5600b70 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -205,6 +205,7 @@ public class BungeeCord extends ProxyServer @@ -14,7 +14,7 @@ index d0739c1..fc5ca3a 100644 consoleReader.setExpandEvents( false ); + consoleReader.addCompleter( new ConsoleCommandCompleter( this ) ); - logger = new BungeeLogger( this ); + logger = new BungeeLogger( "BungeeCord", System.getProperty("bungee.log-file", "proxy.log"), consoleReader ); System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) ); diff --git a/proxy/src/main/java/net/md_5/bungee/ConsoleCommandCompleter.java b/proxy/src/main/java/net/md_5/bungee/ConsoleCommandCompleter.java new file mode 100644 @@ -95,5 +95,5 @@ index 0000000..455b078 + } +} -- -2.8.3 +2.7.4 (Apple Git-66)