From 46c84495fd1e78303f34db70034c1e7d56291655 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 29 Aug 2020 12:12:21 +0100 Subject: [PATCH 01/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 8075dbe Updated Upstream (BungeeCord) --- Waterfall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Waterfall b/Waterfall index 056d668..8075dbe 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 056d6687ef3c6ce080bac254ba86b306a4d233d4 +Subproject commit 8075dbe95dbc5da9dd9fecd61263a5ce85d3c4e3 From e92af6a3c71d1e2fc30b459610354f22859b11f6 Mon Sep 17 00:00:00 2001 From: "Five (Xer)" Date: Thu, 10 Sep 2020 18:03:11 +0200 Subject: [PATCH 02/16] 1.16.3-patch --- .../0004-Travertine-1.16.3-Patch.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Waterfall-Proxy-Patches/0004-Travertine-1.16.3-Patch.patch diff --git a/Waterfall-Proxy-Patches/0004-Travertine-1.16.3-Patch.patch b/Waterfall-Proxy-Patches/0004-Travertine-1.16.3-Patch.patch new file mode 100644 index 0000000..fee863a --- /dev/null +++ b/Waterfall-Proxy-Patches/0004-Travertine-1.16.3-Patch.patch @@ -0,0 +1,31 @@ +From e8c93c149c23d9d6d57acee204780c952a3394bf Mon Sep 17 00:00:00 2001 +From: "Five (Xer)" +Date: Thu, 10 Sep 2020 17:59:48 +0200 +Subject: [PATCH] Travertine-1.16.3-Patch + + +diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +index 6f72983f..659382c0 100644 +--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java ++++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +@@ -33,6 +33,7 @@ public class ProtocolConstants + public static final int MINECRAFT_1_16 = 735; + public static final int MINECRAFT_1_16_1 = 736; + public static final int MINECRAFT_1_16_2 = 751; ++ public static final int MINECRAFT_1_16_3 = 753; + public static final List SUPPORTED_VERSIONS = Arrays.asList( + "1.7.x", + "1.8.x", +@@ -72,7 +73,8 @@ public class ProtocolConstants + ProtocolConstants.MINECRAFT_1_15_2, + ProtocolConstants.MINECRAFT_1_16, + ProtocolConstants.MINECRAFT_1_16_1, +- ProtocolConstants.MINECRAFT_1_16_2 ++ ProtocolConstants.MINECRAFT_1_16_2, ++ ProtocolConstants.MINECRAFT_1_16_3 + ); + + public static final boolean isBeforeOrEq(int before, int other) +-- +2.24.0 + From 55f272fc4babf07526f398ef6557e6e933cedadf Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 11 Sep 2020 00:47:38 +0100 Subject: [PATCH 03/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 5aa8f70 Updated Upstream (BungeeCord) 61700eb Preliminary 1.16.3 support (#566) --- Waterfall | 2 +- .../0003-1.7.x-Protocol-Patch.patch | 16 +++++----- .../0004-Travertine-1.16.3-Patch.patch | 31 ------------------- 3 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 Waterfall-Proxy-Patches/0004-Travertine-1.16.3-Patch.patch diff --git a/Waterfall b/Waterfall index 8075dbe..5aa8f70 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 8075dbe95dbc5da9dd9fecd61263a5ce85d3c4e3 +Subproject commit 5aa8f709bbae4356c02b75120477e4002d02b9e7 diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index 7d50c19..4e98b8c 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From d0c1b725cdfa4e07a4a8f9bf6bb810290f4e361e Mon Sep 17 00:00:00 2001 +From f7c69bedede5970d764bbd1e80f9849ffd63ff9e Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -462,7 +462,7 @@ index d372933d..1feee418 100644 java.util.function.Supplier constructor = protocolData.packetConstructors[id]; // Waterfall - speed up packet construction diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java -index aa1b770c..6f72983f 100644 +index f33bb5c4..659382c0 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java @@ -6,6 +6,8 @@ import java.util.List; @@ -474,15 +474,15 @@ index aa1b770c..6f72983f 100644 public static final int MINECRAFT_1_8 = 47; public static final int MINECRAFT_1_9 = 107; public static final int MINECRAFT_1_9_1 = 108; -@@ -32,6 +34,7 @@ public class ProtocolConstants - public static final int MINECRAFT_1_16_1 = 736; +@@ -33,6 +35,7 @@ public class ProtocolConstants public static final int MINECRAFT_1_16_2 = 751; + public static final int MINECRAFT_1_16_3 = 753; public static final List SUPPORTED_VERSIONS = Arrays.asList( + "1.7.x", "1.8.x", "1.9.x", "1.10.x", -@@ -43,6 +46,8 @@ public class ProtocolConstants +@@ -44,6 +47,8 @@ public class ProtocolConstants "1.16.x" ); public static final List SUPPORTED_VERSION_IDS = Arrays.asList( @@ -1512,7 +1512,7 @@ index b0125245..8c2a743a 100644 { this.compressionThreshold = compressionThreshold; 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 44e6ed3f..585afa36 100644 +index 443d19bd..326de178 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 @@ -20,6 +20,7 @@ import io.netty.buffer.Unpooled; @@ -1581,7 +1581,7 @@ index 44e6ed3f..585afa36 100644 con.unsafe().sendPacket( pluginMessage ); throw CancelSendSignal.INSTANCE; diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 4b40b465..13deb6c9 100644 +index 7e6027aa..fe6ff143 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java @@ -12,6 +12,13 @@ import java.util.List; @@ -2038,5 +2038,5 @@ index daf12f74..e33861ab 100644 @Override -- -2.27.0 +2.28.0 diff --git a/Waterfall-Proxy-Patches/0004-Travertine-1.16.3-Patch.patch b/Waterfall-Proxy-Patches/0004-Travertine-1.16.3-Patch.patch deleted file mode 100644 index fee863a..0000000 --- a/Waterfall-Proxy-Patches/0004-Travertine-1.16.3-Patch.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e8c93c149c23d9d6d57acee204780c952a3394bf Mon Sep 17 00:00:00 2001 -From: "Five (Xer)" -Date: Thu, 10 Sep 2020 17:59:48 +0200 -Subject: [PATCH] Travertine-1.16.3-Patch - - -diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java -index 6f72983f..659382c0 100644 ---- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java -+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java -@@ -33,6 +33,7 @@ public class ProtocolConstants - public static final int MINECRAFT_1_16 = 735; - public static final int MINECRAFT_1_16_1 = 736; - public static final int MINECRAFT_1_16_2 = 751; -+ public static final int MINECRAFT_1_16_3 = 753; - public static final List SUPPORTED_VERSIONS = Arrays.asList( - "1.7.x", - "1.8.x", -@@ -72,7 +73,8 @@ public class ProtocolConstants - ProtocolConstants.MINECRAFT_1_15_2, - ProtocolConstants.MINECRAFT_1_16, - ProtocolConstants.MINECRAFT_1_16_1, -- ProtocolConstants.MINECRAFT_1_16_2 -+ ProtocolConstants.MINECRAFT_1_16_2, -+ ProtocolConstants.MINECRAFT_1_16_3 - ); - - public static final boolean isBeforeOrEq(int before, int other) --- -2.24.0 - From 0883f3cee79b6da0d3f53231a58c51acdc56b379 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 15 Sep 2020 18:15:17 +0100 Subject: [PATCH 04/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: dd1fbb9 Add the ability to generate decoder traces for debugging d1d1b58 Updated Upstream (BungeeCord) 46fa4cf Rebuild patches fae68b0 Allow to disable tablist rewrite --- Waterfall | 2 +- .../0003-1.7.x-Protocol-Patch.patch | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Waterfall b/Waterfall index 5aa8f70..dd1fbb9 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 5aa8f709bbae4356c02b75120477e4002d02b9e7 +Subproject commit dd1fbb948b867405b0273cc346959a793a5d9d48 diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index 4e98b8c..bff0e17 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From f7c69bedede5970d764bbd1e80f9849ffd63ff9e Mon Sep 17 00:00:00 2001 +From 625904bd6432d8424530b17e58f498acd862b60d Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -1512,7 +1512,7 @@ index b0125245..8c2a743a 100644 { this.compressionThreshold = compressionThreshold; 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 443d19bd..326de178 100644 +index 9e180c30..d54d8539 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 @@ -20,6 +20,7 @@ import io.netty.buffer.Unpooled; @@ -1523,7 +1523,7 @@ index 443d19bd..326de178 100644 import java.util.ArrayList; import java.util.HashMap; // Waterfall import java.util.List; -@@ -173,7 +174,7 @@ public class DownstreamBridge extends PacketHandler +@@ -179,7 +180,7 @@ public class DownstreamBridge extends PacketHandler switch ( objective.getAction() ) { case 0: @@ -1532,7 +1532,7 @@ index 443d19bd..326de178 100644 break; case 1: serverScoreboard.removeObjective( objective.getName() ); -@@ -183,7 +184,7 @@ public class DownstreamBridge extends PacketHandler +@@ -189,7 +190,7 @@ public class DownstreamBridge extends PacketHandler if ( oldObjective != null ) { oldObjective.setValue( objective.getValue() ); @@ -1541,7 +1541,7 @@ index 443d19bd..326de178 100644 } break; default: -@@ -280,16 +281,28 @@ public class DownstreamBridge extends PacketHandler +@@ -286,16 +287,28 @@ public class DownstreamBridge extends PacketHandler if ( pluginMessage.getTag().equals( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand" ) ) { @@ -1669,7 +1669,7 @@ index 4d7b1b23..ad3bdee5 100644 con.getServer().disconnect( "Quitting" ); } diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java -index 45f4449c..77274ec4 100644 +index a5acf512..67b68a3b 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java @@ -35,6 +35,10 @@ public abstract class EntityMap From 2872444b12c487ead30658f7c595d229b0dc94f6 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 29 Sep 2020 00:30:12 +0100 Subject: [PATCH 05/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 27e2885 Bump netty to 4.1.52.Final 9bbec04 Updated Upstream (BungeeCord) 899d687 [CI-SKIP] Add plugin developers section in README.md (#556) --- Waterfall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Waterfall b/Waterfall index dd1fbb9..27e2885 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit dd1fbb948b867405b0273cc346959a793a5d9d48 +Subproject commit 27e2885ab3759536fb5a16a3ff388511f3665ad8 From e24d6b22894670d06a25dc7cd0a3612bc2f42392 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 2 Nov 2020 20:01:49 +0000 Subject: [PATCH 06/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 72503bf Preliminary 1.16.4 protocol support a2d39ae Updated Upstream (BungeeCord) (#574) --- Waterfall | 2 +- .../0003-1.7.x-Protocol-Patch.patch | 50 ++++++++----------- 2 files changed, 21 insertions(+), 31 deletions(-) diff --git a/Waterfall b/Waterfall index 27e2885..72503bf 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 27e2885ab3759536fb5a16a3ff388511f3665ad8 +Subproject commit 72503bfab4967978c8cdc62d56bf6dc9c3164d6b diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index bff0e17..7dd1d3b 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From 625904bd6432d8424530b17e58f498acd862b60d Mon Sep 17 00:00:00 2001 +From 26a4a525e697ec23dde6a9009cabc122362988d5 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -462,7 +462,7 @@ index d372933d..1feee418 100644 java.util.function.Supplier constructor = protocolData.packetConstructors[id]; // Waterfall - speed up packet construction diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java -index f33bb5c4..659382c0 100644 +index 30b4d059..e0400383 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java @@ -6,6 +6,8 @@ import java.util.List; @@ -474,15 +474,15 @@ index f33bb5c4..659382c0 100644 public static final int MINECRAFT_1_8 = 47; public static final int MINECRAFT_1_9 = 107; public static final int MINECRAFT_1_9_1 = 108; -@@ -33,6 +35,7 @@ public class ProtocolConstants - public static final int MINECRAFT_1_16_2 = 751; +@@ -34,6 +36,7 @@ public class ProtocolConstants public static final int MINECRAFT_1_16_3 = 753; + public static final int MINECRAFT_1_16_4 = 754; // Waterfall public static final List SUPPORTED_VERSIONS = Arrays.asList( + "1.7.x", "1.8.x", "1.9.x", "1.10.x", -@@ -44,6 +47,8 @@ public class ProtocolConstants +@@ -45,6 +48,8 @@ public class ProtocolConstants "1.16.x" ); public static final List SUPPORTED_VERSION_IDS = Arrays.asList( @@ -526,7 +526,7 @@ index c0d37142..a07e25b1 100644 if ( in.readableBytes() < length ) diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java -index d2a4dea6..ac47302b 100644 +index 828a5dbe..195ec088 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java @@ -1,5 +1,6 @@ @@ -535,20 +535,20 @@ index d2a4dea6..ac47302b 100644 +import io.github.waterfallmc.travertine.protocol.MultiVersionPacketV17; import io.netty.buffer.ByteBuf; import java.util.UUID; - import lombok.AllArgsConstructor; -@@ -14,7 +15,7 @@ import net.md_5.bungee.protocol.ProtocolConstants; + import lombok.Data; +@@ -12,7 +13,7 @@ import net.md_5.bungee.protocol.ProtocolConstants; + @Data @NoArgsConstructor - @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -public class Chat extends DefinedPacket +public class Chat extends MultiVersionPacketV17 { private static final UUID EMPTY_UUID = new UUID( 0L, 0L ); -@@ -32,6 +33,14 @@ public class Chat extends DefinedPacket - this( message, position, EMPTY_UUID ); +@@ -36,6 +37,13 @@ public class Chat extends DefinedPacket + this.position = position; + this.sender = sender == null ? EMPTY_UUID : sender; } - + // Travertine start + @Override + public void v17Read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) @@ -556,11 +556,10 @@ index d2a4dea6..ac47302b 100644 + message = readString( buf ); + } + // Travertine end -+ + @Override public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) - { -@@ -51,6 +60,14 @@ public class Chat extends DefinedPacket +@@ -56,6 +64,14 @@ public class Chat extends DefinedPacket } } @@ -1457,7 +1456,7 @@ index b486f2aa..c12085e1 100644 throw CancelSendSignal.INSTANCE; } diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -index b0125245..8c2a743a 100644 +index 7ec119ea..986a9d05 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -193,6 +193,7 @@ public final class UserConnection implements ProxiedPlayer @@ -1468,7 +1467,7 @@ index b0125245..8c2a743a 100644 displayName = name; } -@@ -474,7 +475,8 @@ public final class UserConnection implements ProxiedPlayer +@@ -497,7 +498,8 @@ public final class UserConnection implements ProxiedPlayer // transform score components message = ChatComponentTransformer.getInstance().transform( this, true, message ); @@ -1478,16 +1477,7 @@ index b0125245..8c2a743a 100644 { // Versions older than 1.11 cannot send the Action bar with the new JSON formattings // Fix by converting to a legacy message, see https://bugs.mojang.com/browse/MC-119145 -@@ -500,7 +502,7 @@ public final class UserConnection implements ProxiedPlayer - message = ChatComponentTransformer.getInstance().transform( this, true, message )[0]; - - // Action bar doesn't display the new JSON formattings, legacy works - send it using this for now -- if ( position == ChatMessageType.ACTION_BAR ) -+ if ( position == ChatMessageType.ACTION_BAR && getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_8 ) // Travertine - { - sendMessage( position, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) ); - } else -@@ -685,6 +687,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -693,6 +695,7 @@ public final class UserConnection implements ProxiedPlayer @Override public void setTabHeader(BaseComponent header, BaseComponent footer) { @@ -1495,7 +1485,7 @@ index b0125245..8c2a743a 100644 header = ChatComponentTransformer.getInstance().transform( this, true, header )[0]; footer = ChatComponentTransformer.getInstance().transform( this, true, footer )[0]; -@@ -697,6 +700,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -705,6 +708,7 @@ public final class UserConnection implements ProxiedPlayer @Override public void setTabHeader(BaseComponent[] header, BaseComponent[] footer) { @@ -1503,7 +1493,7 @@ index b0125245..8c2a743a 100644 header = ChatComponentTransformer.getInstance().transform( this, true, header ); footer = ChatComponentTransformer.getInstance().transform( this, true, footer ); -@@ -726,6 +730,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -734,6 +738,7 @@ public final class UserConnection implements ProxiedPlayer public void setCompressionThreshold(int compressionThreshold) { @@ -1669,7 +1659,7 @@ index 4d7b1b23..ad3bdee5 100644 con.getServer().disconnect( "Quitting" ); } diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java -index a5acf512..67b68a3b 100644 +index 84c20c68..fa8fbf9d 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java @@ -35,6 +35,10 @@ public abstract class EntityMap From 1866a16c0f04e408330844b8a1ae4905ae64cbc2 Mon Sep 17 00:00:00 2001 From: Olivia Date: Sun, 22 Nov 2020 22:48:18 -0600 Subject: [PATCH 07/16] Updated Upstream (Waterfall) (#145) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 85f0a0c Capture some script failure states better 7bf2352 Updated Upstream (BungeeCord) c617bbf Updated Upstream (BungeeCord) (#579) --- Waterfall | 2 +- .../0003-1.7.x-Protocol-Patch.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Waterfall b/Waterfall index 72503bf..85f0a0c 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 72503bfab4967978c8cdc62d56bf6dc9c3164d6b +Subproject commit 85f0a0c69a5d1ffbf759ae5553a3b09d1f520eda diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index 7dd1d3b..4a8a6fe 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From 26a4a525e697ec23dde6a9009cabc122362988d5 Mon Sep 17 00:00:00 2001 +From f9955fcb4091c2ede107ebc8a1c09848e933e839 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -462,7 +462,7 @@ index d372933d..1feee418 100644 java.util.function.Supplier constructor = protocolData.packetConstructors[id]; // Waterfall - speed up packet construction diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java -index 30b4d059..e0400383 100644 +index 2202c4d3..6600185b 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java @@ -6,6 +6,8 @@ import java.util.List; @@ -476,7 +476,7 @@ index 30b4d059..e0400383 100644 public static final int MINECRAFT_1_9_1 = 108; @@ -34,6 +36,7 @@ public class ProtocolConstants public static final int MINECRAFT_1_16_3 = 753; - public static final int MINECRAFT_1_16_4 = 754; // Waterfall + public static final int MINECRAFT_1_16_4 = 754; public static final List SUPPORTED_VERSIONS = Arrays.asList( + "1.7.x", "1.8.x", @@ -1659,7 +1659,7 @@ index 4d7b1b23..ad3bdee5 100644 con.getServer().disconnect( "Quitting" ); } diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java -index 84c20c68..fa8fbf9d 100644 +index db93d883..a3a12e19 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java @@ -35,6 +35,10 @@ public abstract class EntityMap @@ -2028,5 +2028,5 @@ index daf12f74..e33861ab 100644 @Override -- -2.28.0 +2.29.2 From 629df465cbcabad99fafb2e929589b18963ced5d Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 2 Dec 2020 19:13:52 +0000 Subject: [PATCH 08/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: e6b1b10 Brrrrr --- Waterfall | 2 +- .../0003-1.7.x-Protocol-Patch.patch | 25 ++++++++----------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Waterfall b/Waterfall index 85f0a0c..e6b1b10 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 85f0a0c69a5d1ffbf759ae5553a3b09d1f520eda +Subproject commit e6b1b105d08a0dddb0b78a99ce893c918683b9c7 diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index 4a8a6fe..735ee73 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From f9955fcb4091c2ede107ebc8a1c09848e933e839 Mon Sep 17 00:00:00 2001 +From 682bb544387936931880d662162b2fe107a4289b Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -1571,24 +1571,19 @@ index 9e180c30..d54d8539 100644 con.unsafe().sendPacket( pluginMessage ); throw CancelSendSignal.INSTANCE; diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 7e6027aa..fe6ff143 100644 +index b7ecd828..3b82219d 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -12,6 +12,13 @@ import java.util.List; - import java.util.UUID; - import java.util.logging.Level; - import javax.crypto.SecretKey; -+ -+import com.google.common.base.Charsets; -+import com.google.common.base.Preconditions; -+import com.google.gson.Gson; -+ +@@ -3,6 +3,8 @@ package net.md_5.bungee.connection; + import com.google.common.base.Charsets; + import com.google.common.base.Preconditions; + import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; - import lombok.Getter; - import lombok.RequiredArgsConstructor; - import net.md_5.bungee.BungeeCord; -@@ -255,12 +262,28 @@ public class InitialHandler extends PacketHandler implements PendingConnection + import java.math.BigInteger; + import java.net.InetSocketAddress; + import java.net.SocketAddress; +@@ -257,12 +259,28 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public void done(ProxyPingEvent pingResult, Throwable error) { From bad1151110aaf14e52499ecbe6c0405b885f18aa Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 30 Dec 2020 00:15:56 +0000 Subject: [PATCH 09/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: a112cfe Fetch modules from the API endpoint --- Waterfall | 2 +- .../0001-POM-Changes.patch | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Waterfall b/Waterfall index e6b1b10..a112cfe 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit e6b1b105d08a0dddb0b78a99ce893c918683b9c7 +Subproject commit a112cfe996753861d51f72b684f728bc674228ef diff --git a/Waterfall-Proxy-Patches/0001-POM-Changes.patch b/Waterfall-Proxy-Patches/0001-POM-Changes.patch index 76b6015..d64980b 100644 --- a/Waterfall-Proxy-Patches/0001-POM-Changes.patch +++ b/Waterfall-Proxy-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From f830225f2c26d8807de43f16843b5132f5c48c30 Mon Sep 17 00:00:00 2001 +From cd812233e8e74d5c0a7b753df0076a2a9baab06a Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 08:56:43 -0500 Subject: [PATCH] POM Changes diff --git a/api/pom.xml b/api/pom.xml -index 87b279b8..d3016c10 100644 +index 10db38b7..1a378da2 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -5,41 +5,41 @@ @@ -58,7 +58,7 @@ index 87b279b8..d3016c10 100644 compile diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index a43db907..078c5b1a 100644 +index 0a890393..85b98651 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -5,18 +5,18 @@ @@ -129,7 +129,7 @@ index 8523d99a..29094871 100644 diff --git a/config/pom.xml b/config/pom.xml -index 5f4f2b33..18f0a14e 100644 +index 099a4643..babab703 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -5,18 +5,18 @@ @@ -452,7 +452,7 @@ index ec465dd3..28d1a02c 100644 diff --git a/pom.xml b/pom.xml -index 3ca7ca91..94e4aca2 100644 +index fd03c640..1b773cc5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,19 +5,19 @@ @@ -602,18 +602,18 @@ index f0c36550..4bda0d62 100644 compile diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java -index 9b20d0df..2637b9e2 100644 +index 338c30d3..c0499252 100644 --- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java +++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java -@@ -18,7 +18,7 @@ public class JenkinsModuleSource implements ModuleSource - System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() ); - try +@@ -20,7 +20,7 @@ public class JenkinsModuleSource implements ModuleSource { -- URL website = new URL( "https://papermc.io/ci/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" ); -+ URL website = new URL( "https://papermc.io/ci/job/Travertine/" + version.getBuild() + "/artifact/Travertine-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" ); - URLConnection con = website.openConnection(); - // 15 second timeout at various stages - con.setConnectTimeout( 15000 ); + final String url = String.format( + "https://papermc.io/api/v2/projects/%1$s/versions/%2$s/builds/%3$s/downloads/%4$s-%2$s-%3$s.jar", +- "waterfall", ++ "travertine", // Travertine + net.md_5.bungee.api.ProxyServer.getInstance().getVersion().split(":")[2].split("-")[0], + version.getBuild(), + module.getName() diff --git a/query/pom.xml b/query/pom.xml index 1c845a6d..0f2ea00b 100644 --- a/query/pom.xml @@ -651,5 +651,5 @@ index 1c845a6d..0f2ea00b 100644 compile -- -2.25.1 +2.29.2 From 35af3c4c5923fd57fa623e70f84d1a3fd6f9b6b0 Mon Sep 17 00:00:00 2001 From: Aurora <21148213+aurorasmiles@users.noreply.github.com> Date: Wed, 6 Jan 2021 15:21:41 +0100 Subject: [PATCH 10/16] [CI-SKIP] Remove jenkins references (#148) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dfb5e9f..58fc3b9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Travertine [![Build Status](https://papermc.io/ci/job/Travertine/badge/icon)](https://papermc.io/ci/job/Travertine/) +Travertine ========= Travertine is Waterfall with additional protocols. Waterfall is a fork of the well-known [BungeeCord](https://github.com/SpigotMC/BungeeCord) server teleportation suite. @@ -23,7 +23,7 @@ Travertine will track upstream Waterfall and merge changes as needed. ## How to (Server Admins) -Download a copy of Travertine.jar from our buildserver here: [Travertine](https://papermc.io/ci/job/Travertine/) +Download a copy of Travertine.jar from our homepage here: [Travertine](https://papermc.io/downloads#Travertine) Travertine requires **Java 8** or above. From a6ec94205cec2a83e1f6acd98203dfc009cef4e6 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 11 Jan 2021 16:37:55 +0000 Subject: [PATCH 11/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 281e731 Remove remaining CI references caea6e6 Remove Jenkins references (#591) --- Waterfall | 2 +- Waterfall-Proxy-Patches/0001-POM-Changes.patch | 11 +++-------- ...-references-from-Waterfall-to-Travertine.patch | 15 +++------------ 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/Waterfall b/Waterfall index a112cfe..281e731 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit a112cfe996753861d51f72b684f728bc674228ef +Subproject commit 281e7310b8999ef9cbaaf3ba348bfa50f9d531f9 diff --git a/Waterfall-Proxy-Patches/0001-POM-Changes.patch b/Waterfall-Proxy-Patches/0001-POM-Changes.patch index d64980b..d70e476 100644 --- a/Waterfall-Proxy-Patches/0001-POM-Changes.patch +++ b/Waterfall-Proxy-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From cd812233e8e74d5c0a7b753df0076a2a9baab06a Mon Sep 17 00:00:00 2001 +From dde9291ad00dd3ac85eef03195cf32dab89ec5f3 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 08:56:43 -0500 Subject: [PATCH] POM Changes @@ -452,7 +452,7 @@ index ec465dd3..28d1a02c 100644 diff --git a/pom.xml b/pom.xml -index fd03c640..1b773cc5 100644 +index d2bed7b5..10911a08 100644 --- a/pom.xml +++ b/pom.xml @@ -5,19 +5,19 @@ @@ -480,7 +480,7 @@ index fd03c640..1b773cc5 100644 2015 WaterfallMC -@@ -65,17 +65,17 @@ +@@ -65,13 +65,13 @@ @@ -496,11 +496,6 @@ index fd03c640..1b773cc5 100644 - https://github.com/PaperMC/Waterfall/issues + https://github.com/PaperMC/Travertine/issues - - jenkins -- https://papermc.io/ci/job/Waterfall/ -+ https://papermc.io/ci/job/Travertine/ - diff --git a/protocol/pom.xml b/protocol/pom.xml diff --git a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch index 59b77e8..d43aae4 100644 --- a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch +++ b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch @@ -1,4 +1,4 @@ -From 0017e5e4bc7a1c73963e5555d1acec8cd023e850 Mon Sep 17 00:00:00 2001 +From 137ac0179db533a6f030c034a467af2f129848ea Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 6 Jun 2016 13:47:46 -0600 Subject: [PATCH] Rename references from Waterfall to Travertine @@ -53,18 +53,9 @@ index 2938f2f1..f7f1e7cc 100644 @Override diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java -index dc2c584d..ad9a6d0c 100644 +index e830198d..cc05b1fc 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java -@@ -49,7 +49,7 @@ public class BungeeCordLauncher - if ( buildDate.before( deadline.getTime() ) ) - { - System.err.println( "*** Hey! This build is potentially outdated :( ***" ); -- System.err.println( "*** Please check for a new build from https://papermc.io/ci/job/Waterfall/ ***" ); -+ System.err.println( "*** Please check for a new build from https://papermc.io/ci/job/Travertine/ ***" ); - System.err.println( "*** Should this build be outdated, you will get NO support for it. ***" ); - System.err.println( "*** Server will start in 10 seconds ***" ); - Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) ); @@ -58,7 +58,7 @@ public class BungeeCordLauncher BungeeCord bungee = new BungeeCord(); @@ -114,5 +105,5 @@ index 65121ba2..d4fad294 100644 SocketAddress address = Util.getAddr( addr ); ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted ); -- -2.27.0 +2.29.2 From 19326faf3b014a9fcc146335d44cd8c883f625fc Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 21 Jan 2021 11:20:41 +0000 Subject: [PATCH 12/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 3bac1f3 Limit login request data to 16 bytes (#597) e585e7c Exchange Spigot IRC with Esper (#592) --- Waterfall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Waterfall b/Waterfall index 281e731..3bac1f3 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 281e7310b8999ef9cbaaf3ba348bfa50f9d531f9 +Subproject commit 3bac1f36312d771acbe3908940deb5341b4f00f8 From 4323ca94dcb4bf4038108322edf29e30819450d2 Mon Sep 17 00:00:00 2001 From: "FivePB (Xer)" Date: Fri, 29 Jan 2021 11:44:37 +0100 Subject: [PATCH 13/16] Updated Upstream (Waterfall) (#151) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: b3e5814 Updated Upstream (BungeeCord) (#601) 3bac1f3 Limit login request data to 16 bytes (#597) --- Waterfall | 2 +- .../0001-POM-Changes.patch | 116 +++++++++--------- .../0003-1.7.x-Protocol-Patch.patch | 10 +- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Waterfall b/Waterfall index 3bac1f3..b3e5814 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 3bac1f36312d771acbe3908940deb5341b4f00f8 +Subproject commit b3e581412f97006061ed33e3069cf0f9cfb460fc diff --git a/Waterfall-Proxy-Patches/0001-POM-Changes.patch b/Waterfall-Proxy-Patches/0001-POM-Changes.patch index d70e476..ed90d0d 100644 --- a/Waterfall-Proxy-Patches/0001-POM-Changes.patch +++ b/Waterfall-Proxy-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From dde9291ad00dd3ac85eef03195cf32dab89ec5f3 Mon Sep 17 00:00:00 2001 +From 676a3f5461fa6f63942a92a5c3eba35f4c0b1084 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 08:56:43 -0500 Subject: [PATCH] POM Changes diff --git a/api/pom.xml b/api/pom.xml -index 10db38b7..1a378da2 100644 +index c2b55587..1cd99ed3 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -5,41 +5,41 @@ @@ -14,14 +14,14 @@ index 10db38b7..1a378da2 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-api + travertine-api - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-API @@ -58,7 +58,7 @@ index 10db38b7..1a378da2 100644 compile diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml -index 0a890393..85b98651 100644 +index c51531eb..b7f932d4 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -5,18 +5,18 @@ @@ -67,14 +67,14 @@ index 0a890393..85b98651 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-bootstrap + travertine-bootstrap - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-Bootstrap @@ -102,7 +102,7 @@ index 0a890393..85b98651 100644 org.apache.maven.plugins diff --git a/chat/pom.xml b/chat/pom.xml -index 8523d99a..29094871 100644 +index 85309233..5cc62141 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -5,18 +5,18 @@ @@ -111,14 +111,14 @@ index 8523d99a..29094871 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-chat + travertine-chat - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-Chat @@ -129,7 +129,7 @@ index 8523d99a..29094871 100644 diff --git a/config/pom.xml b/config/pom.xml -index 099a4643..babab703 100644 +index 38db2292..7cdcbd8b 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -5,18 +5,18 @@ @@ -138,14 +138,14 @@ index 099a4643..babab703 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-config + travertine-config - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-Config @@ -156,7 +156,7 @@ index 099a4643..babab703 100644 diff --git a/event/pom.xml b/event/pom.xml -index f4f7fdb0..592bef24 100644 +index 82a411b0..b1a990c9 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -5,16 +5,16 @@ @@ -165,14 +165,14 @@ index f4f7fdb0..592bef24 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-event + travertine-event - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-Event @@ -181,7 +181,7 @@ index f4f7fdb0..592bef24 100644 + Generic java event dispatching API intended for use with Travertine. diff --git a/log/pom.xml b/log/pom.xml -index 93bd4bcc..3ef8acf2 100644 +index 646dbfae..00f7b9c9 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -5,18 +5,18 @@ @@ -190,14 +190,14 @@ index 93bd4bcc..3ef8acf2 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-log + travertine-log - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-Log @@ -217,7 +217,7 @@ index 93bd4bcc..3ef8acf2 100644 compile diff --git a/log4j/pom.xml b/log4j/pom.xml -index 1cd12d6a..ca18158f 100644 +index 8baf329b..060a8ec7 100644 --- a/log4j/pom.xml +++ b/log4j/pom.xml @@ -4,18 +4,18 @@ @@ -226,14 +226,14 @@ index 1cd12d6a..ca18158f 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-log4j + travertine-log4j - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-Log @@ -269,7 +269,7 @@ index 1cd12d6a..ca18158f 100644 diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml -index 8eea364f..83bc7a7d 100644 +index 472314c2..8eb06572 100644 --- a/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml @@ -5,13 +5,13 @@ @@ -278,18 +278,18 @@ index 8eea364f..83bc7a7d 100644 io.github.waterfallmc - waterfall-module + travertine-module - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-cmd-alert + travertine-module-cmd-alert - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml -index 9a2eb779..42fb0a11 100644 +index de8faee0..09e2835a 100644 --- a/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml @@ -5,13 +5,13 @@ @@ -298,18 +298,18 @@ index 9a2eb779..42fb0a11 100644 io.github.waterfallmc - waterfall-module + travertine-module - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-cmd-find + travertine-module-cmd-find - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml -index 57b0cdd8..cc2e55f9 100644 +index 0cab9a7a..5d1ff042 100644 --- a/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml @@ -5,13 +5,13 @@ @@ -318,18 +318,18 @@ index 57b0cdd8..cc2e55f9 100644 io.github.waterfallmc - waterfall-module + travertine-module - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-cmd-list + travertine-module-cmd-list - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml -index 990c0a6d..af82bb2c 100644 +index 240c9548..1f6a7c68 100644 --- a/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml @@ -5,13 +5,13 @@ @@ -338,18 +338,18 @@ index 990c0a6d..af82bb2c 100644 io.github.waterfallmc - waterfall-module + travertine-module - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-cmd-send + travertine-module-cmd-send - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml -index 1b4e0455..8d96679e 100644 +index 4c13d517..c353e829 100644 --- a/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml @@ -5,13 +5,13 @@ @@ -358,18 +358,18 @@ index 1b4e0455..8d96679e 100644 io.github.waterfallmc - waterfall-module + travertine-module - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-cmd-server + travertine-module-cmd-server - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar diff --git a/module/pom.xml b/module/pom.xml -index 0b9fc4aa..ca1f7487 100644 +index c9849b6c..ca0a9c87 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -5,18 +5,18 @@ @@ -378,14 +378,14 @@ index 0b9fc4aa..ca1f7487 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module + travertine-module - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT pom - Waterfall Modules @@ -405,7 +405,7 @@ index 0b9fc4aa..ca1f7487 100644 compile diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml -index 0d3a3b70..e6ee3cd8 100644 +index 45910b0e..d1a2d86c 100644 --- a/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml @@ -5,13 +5,13 @@ @@ -414,18 +414,18 @@ index 0d3a3b70..e6ee3cd8 100644 io.github.waterfallmc - waterfall-module + travertine-module - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-module-reconnect-yaml + travertine-module-reconnect-yaml - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar diff --git a/native/pom.xml b/native/pom.xml -index ec465dd3..28d1a02c 100644 +index db15febb..a2efb5e5 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -5,18 +5,18 @@ @@ -434,14 +434,14 @@ index ec465dd3..28d1a02c 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-native + travertine-native - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-Native @@ -452,7 +452,7 @@ index ec465dd3..28d1a02c 100644 diff --git a/pom.xml b/pom.xml -index d2bed7b5..10911a08 100644 +index fa4dd98d..7757ce6f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,19 +5,19 @@ @@ -468,7 +468,7 @@ index d2bed7b5..10911a08 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT pom - Waterfall-Parent @@ -499,7 +499,7 @@ index d2bed7b5..10911a08 100644 diff --git a/protocol/pom.xml b/protocol/pom.xml -index 8571f378..ba3ffe3d 100644 +index 402266ca..993cbca9 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -5,18 +5,18 @@ @@ -508,14 +508,14 @@ index 8571f378..ba3ffe3d 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-protocol + travertine-protocol - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-Protocol @@ -535,7 +535,7 @@ index 8571f378..ba3ffe3d 100644 compile diff --git a/proxy/pom.xml b/proxy/pom.xml -index f0c36550..4bda0d62 100644 +index 7a872a54..330697bc 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -5,17 +5,17 @@ @@ -544,14 +544,14 @@ index f0c36550..4bda0d62 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-proxy + travertine-proxy - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-Proxy @@ -610,7 +610,7 @@ index 338c30d3..c0499252 100644 version.getBuild(), module.getName() diff --git a/query/pom.xml b/query/pom.xml -index 1c845a6d..0f2ea00b 100644 +index 8ce88f4a..813696e4 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -5,18 +5,18 @@ @@ -619,14 +619,14 @@ index 1c845a6d..0f2ea00b 100644 io.github.waterfallmc - waterfall-parent + travertine-parent - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT ../pom.xml io.github.waterfallmc - waterfall-query + travertine-query - 1.16-R0.4-SNAPSHOT + 1.16-R0.5-SNAPSHOT jar - Waterfall-Query @@ -646,5 +646,5 @@ index 1c845a6d..0f2ea00b 100644 compile -- -2.29.2 +2.30.0 diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index 735ee73..5fd6cea 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From 682bb544387936931880d662162b2fe107a4289b Mon Sep 17 00:00:00 2001 +From 1b4ffe1cf8b23ba201de65722526f2bca18bb7fd Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -101,10 +101,10 @@ index 00000000..90064112 + } +} diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java -index f6e4859f..6ba7ae70 100644 +index d10cf2ed..09ebe3d8 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java -@@ -267,6 +267,11 @@ public abstract class DefinedPacket +@@ -264,6 +264,11 @@ public abstract class DefinedPacket read( buf ); } @@ -116,7 +116,7 @@ index f6e4859f..6ba7ae70 100644 public void write(ByteBuf buf) { throw new UnsupportedOperationException( "Packet must implement write method" ); -@@ -277,6 +282,11 @@ public abstract class DefinedPacket +@@ -274,6 +279,11 @@ public abstract class DefinedPacket write( buf ); } @@ -2023,5 +2023,5 @@ index daf12f74..e33861ab 100644 @Override -- -2.29.2 +2.30.0 From bd883ace262cbe1ab6d7d498622fbe773b7fb27d Mon Sep 17 00:00:00 2001 From: "FivePB (Xer)" Date: Sun, 31 Jan 2021 23:22:35 +0100 Subject: [PATCH 14/16] Updated Upstream (Waterfall) (#152) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 2c5c954 Additional DoS Mitigations for the login sequence (#603) b3e5814 Updated Upstream (BungeeCord) (#601) --- Waterfall | 2 +- .../0003-1.7.x-Protocol-Patch.patch | 29 +++++-------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/Waterfall b/Waterfall index b3e5814..2c5c954 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit b3e581412f97006061ed33e3069cf0f9cfb460fc +Subproject commit 2c5c9541c95282ad60a68b14d6f2ac40babef64d diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index 5fd6cea..92e9562 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From 1b4ffe1cf8b23ba201de65722526f2bca18bb7fd Mon Sep 17 00:00:00 2001 +From 645dd7b625e6cda74114262e66edec565f7fda58 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -101,10 +101,10 @@ index 00000000..90064112 + } +} diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java -index d10cf2ed..09ebe3d8 100644 +index 31a95495..93d17f6b 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java -@@ -264,6 +264,11 @@ public abstract class DefinedPacket +@@ -266,6 +266,11 @@ public abstract class DefinedPacket read( buf ); } @@ -116,7 +116,7 @@ index d10cf2ed..09ebe3d8 100644 public void write(ByteBuf buf) { throw new UnsupportedOperationException( "Packet must implement write method" ); -@@ -274,6 +279,11 @@ public abstract class DefinedPacket +@@ -276,6 +281,11 @@ public abstract class DefinedPacket write( buf ); } @@ -129,26 +129,13 @@ index d10cf2ed..09ebe3d8 100644 @Override diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java -index 1a647f2b..ec932e92 100644 +index ac9f114d..2caadfed 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java -@@ -5,10 +5,11 @@ import io.netty.buffer.ByteBufUtil; - import io.netty.channel.ChannelHandlerContext; - import io.netty.handler.codec.DecoderException; - import io.netty.handler.codec.MessageToMessageDecoder; --import java.util.List; - import lombok.AllArgsConstructor; - import lombok.Setter; - -+import java.util.List; -+ - @AllArgsConstructor - public class MinecraftDecoder extends MessageToMessageDecoder - { -@@ -56,7 +57,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder - if ( packet != null ) +@@ -57,7 +57,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder { packetTypeInfo = packet.getClass(); + doLengthSanityChecks(in, packet, prot.getDirection(), packetId); // Waterfall: Additional DoS mitigations - packet.read( in, prot.getDirection(), protocolVersion ); + packet.read0( in, prot.getDirection(), protocolVersion ); @@ -695,7 +682,7 @@ index a29524ca..8d9f4ccb 100644 public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) { diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java -index 388f6cdb..7f124322 100644 +index 53575ce0..1a41da75 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java @@ -1,5 +1,6 @@ From d56200761b940f66722ce8c74ba20d9e95ba6117 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 22 Feb 2021 16:50:30 +0000 Subject: [PATCH 15/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: bc3e393 Updated Upstream (BungeeCord) 565c857 Add support for hex color codes in console (#612) --- Waterfall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Waterfall b/Waterfall index 2c5c954..bc3e393 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 2c5c9541c95282ad60a68b14d6f2ac40babef64d +Subproject commit bc3e393b1419a2f0a350a746e8595deecc934d86 From 77b89f5fb32d76b24ba9b499cf5be8efb8fc8f36 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 23 Feb 2021 16:48:29 +0000 Subject: [PATCH 16/16] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 9a1d6a1 Port Log4J converter fixes from Paper (#614) --- Waterfall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Waterfall b/Waterfall index bc3e393..9a1d6a1 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit bc3e393b1419a2f0a350a746e8595deecc934d86 +Subproject commit 9a1d6a1711e2ab0615dd0440705a033b7c121675