Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-27 11:07:39 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord)

Browse Source 
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

BungeeCord Changes:
75af27ac Fix missing static on ChatColor.values
d0fd673b Minecraft 1.16 support + RGB ChatColor preview
This commit is contained in:
Shane Freeder 2020-06-23 22:13:11 +01:00
parent b3296adf72
commit d61b93a1e7
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
15 changed files with 204 additions and 1482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 2f54c943720aea0c2c83049a37644fd67f6718bb
Subproject commit 75af27acf1554381bdfe7bd2e8c2b8571df63ab9

113
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 03b72d293bb4598ca28422582d010a72b292d3e2 Mon Sep 17 00:00:00 2001
From ddb902d29524d2ddab37a2c5f49a0ee12145f84c Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes
@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
- Deploy to papermc mvn repo
diff --git a/api/pom.xml b/api/pom.xml
index a3f6a6a9..15228459 100644
index 9f41b24e..989365aa 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -18,7 +18,7 @@ index a3f6a6a9..15228459 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -26,7 +26,7 @@ index a3f6a6a9..15228459 100644
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
@ -67,7 +67,7 @@ index a3f6a6a9..15228459 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 3e63a0bf..66ed2128 100644
index 4f282347..65d4ea6b 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -78,7 +78,7 @@ index 3e63a0bf..66ed2128 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -86,7 +86,7 @@ index 3e63a0bf..66ed2128 100644
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
@ -145,18 +145,19 @@ index 6be22739..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index 4ca669f9..0bd76ea5 100644
index 6a648ac3..bc8eab68 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,19 +4,19 @@
@@ -4,19 +4,20 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -164,7 +165,7 @@ index 4ca669f9..0bd76ea5 100644
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
@ -175,7 +176,7 @@ index 4ca669f9..0bd76ea5 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 95449790..4bf7237f 100644
index de72662b..c12f6f81 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -186,7 +187,7 @@ index 95449790..4bf7237f 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -194,7 +195,7 @@ index 95449790..4bf7237f 100644
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
@ -205,7 +206,7 @@ index 95449790..4bf7237f 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index e86d9887..5eb97c1f 100644
index 604def0a..9537382c 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -216,7 +217,7 @@ index e86d9887..5eb97c1f 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -224,7 +225,7 @@ index e86d9887..5eb97c1f 100644
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
@ -233,7 +234,7 @@ index e86d9887..5eb97c1f 100644
+ <description>Generic java event dispatching API intended for use with Waterfall.</description>
</project>
diff --git a/log/pom.xml b/log/pom.xml
index 59beca1b..23dacb1d 100644
index 82487507..063232fb 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -244,7 +245,7 @@ index 59beca1b..23dacb1d 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -252,7 +253,7 @@ index 59beca1b..23dacb1d 100644
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
@ -274,7 +275,7 @@ index 59beca1b..23dacb1d 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 36a7bca2..9340d58a 100644
index 78f1ce41..1ae342d3 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -285,7 +286,7 @@ index 36a7bca2..9340d58a 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -293,11 +294,11 @@ index 36a7bca2..9340d58a 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 3dc2fe1e..c7106fe9 100644
index 2fef2fa5..8c594f47 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -308,7 +309,7 @@ index 3dc2fe1e..c7106fe9 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -316,11 +317,11 @@ index 3dc2fe1e..c7106fe9 100644
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 3077f1b7..e14d18e7 100644
index 24aee73e..52c500da 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -331,7 +332,7 @@ index 3077f1b7..e14d18e7 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -339,11 +340,11 @@ index 3077f1b7..e14d18e7 100644
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 54cbc090..68f526b1 100644
index 1d08b6ff..a8da255b 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -354,7 +355,7 @@ index 54cbc090..68f526b1 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -362,11 +363,11 @@ index 54cbc090..68f526b1 100644
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index 875e8eb1..d8ebf472 100644
index 22bec872..04122421 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -377,7 +378,7 @@ index 875e8eb1..d8ebf472 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -385,11 +386,11 @@ index 875e8eb1..d8ebf472 100644
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index 088fc997..261c8d75 100644
index 1bf6e5f8..59b62472 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -400,7 +401,7 @@ index 088fc997..261c8d75 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -408,7 +409,7 @@ index 088fc997..261c8d75 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
@ -438,7 +439,7 @@ index 088fc997..261c8d75 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index a6cc954d..c29ac52f 100644
index e373f98e..64530b81 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@
@ -449,7 +450,7 @@ index a6cc954d..c29ac52f 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -457,11 +458,11 @@ index a6cc954d..c29ac52f 100644
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index f11cad04..f8b549dc 100644
index dee2199f..c5c1f9e3 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -472,7 +473,7 @@ index f11cad04..f8b549dc 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -480,7 +481,7 @@ index f11cad04..f8b549dc 100644
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
@ -491,7 +492,7 @@ index f11cad04..f8b549dc 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 8681a688..872f8fc1 100644
index cc3d8cf2..6f2737e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -509,7 +510,7 @@ index 8681a688..872f8fc1 100644
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
@ -700,7 +701,7 @@ index 8681a688..872f8fc1 100644
</profiles>
</project>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index e11af008..4592e2b3 100644
index 65e61f99..04196782 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,19 +4,19 @@
@ -711,7 +712,7 @@ index e11af008..4592e2b3 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -719,7 +720,7 @@ index e11af008..4592e2b3 100644
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
@ -741,7 +742,7 @@ index e11af008..4592e2b3 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index c2b454ff..e6052fbf 100644
index d536be02..7ff2f551 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -752,7 +753,7 @@ index c2b454ff..e6052fbf 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -760,7 +761,7 @@ index c2b454ff..e6052fbf 100644
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
@ -812,7 +813,7 @@ index c2b454ff..e6052fbf 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index 9c7d6f5a..c3a29122 100644
index ad01212b..352eb37a 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -823,7 +824,7 @@ index 9c7d6f5a..c3a29122 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -831,7 +832,7 @@ index 9c7d6f5a..c3a29122 100644
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
@ -853,5 +854,5 @@ index 9c7d6f5a..c3a29122 100644
<scope>compile</scope>
</dependency>
--
2.26.2
2.27.0

8
BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
View File

@ -1,14 +1,14 @@
From 8fcf80f3a4a5fd0c9b8d096a996f8e90f803492a Mon Sep 17 00:00:00 2001
From 7d64d748a2d40d627fe51b3123f00f967e32491f Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Wed, 18 Jul 2018 20:23:03 +0300
Subject: [PATCH] Copy license files into jar
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 9ac3c1af..1e1df054 100644
index 7ff2f551..485c3f3c 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -105,6 +105,20 @@
@@ -99,6 +99,20 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
@ -30,5 +30,5 @@ index 9ac3c1af..1e1df054 100644
</build>
</project>
--
2.25.0
2.27.0

10
BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
View File

@ -1,15 +1,15 @@
From 35be73ccc5dc4c5a577aef66e610c423c18a8015 Mon Sep 17 00:00:00 2001
From 252f0e5b68aa460e00f646a57ee66040b8ac2381 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 09:07:51 -0500
Subject: [PATCH] Fixup ProtocolConstants
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 ad587d28..cd987c8a 100644
index 3248d18a..7da62425 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
@@ -63,6 +63,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_15_2
@@ -66,6 +66,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_16
);
+ public static final boolean isBeforeOrEq(int before, int other)
@ -26,5 +26,5 @@ index ad587d28..cd987c8a 100644
{
--
2.25.0
2.27.0

8
BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch
View File

@ -1,14 +1,14 @@
From 4d2ab0a0763157aa7018b8db62964ad865455d0a Mon Sep 17 00:00:00 2001
From bf47475d013d6745d394ce1019f1c5efd4f6eafa Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API
diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
index df38e297..563b6911 100644
index 54ec98fd..47bc52de 100644
--- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
+++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
@@ -322,6 +322,26 @@ public class ComponentsTest
@@ -323,6 +323,26 @@ public class ComponentsTest
Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
}
@ -53,5 +53,5 @@ index 9e37eed0..a25a01b8 100644
+ }
}
--
2.24.1
2.27.0

16
BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From b62228801e1e291129d01643e9eae09993feae06 Mon Sep 17 00:00:00 2001
From 039537507c3f69d0df0093fc0ebedeb91e70ac0d Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
@ -37,10 +37,10 @@ index ea44573d..5b32effe 100644
{
packet.read( in, prot.getDirection(), protocolVersion );
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 3e3cf99e..17f2bf4c 100644
index 3e1776f7..fa34de48 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -415,14 +415,23 @@ public enum Protocol
@@ -431,14 +431,23 @@ public enum Protocol
return protocol;
}
@ -66,7 +66,7 @@ index 3e3cf99e..17f2bf4c 100644
throw new BadPacketException( "Packet with id " + id + " outside of range " );
}
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 ccbc0e9e..4bf82153 100644
index 28e0d5f3..3abf2047 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -32,7 +32,9 @@ import net.md_5.bungee.forge.ForgeUtils;
@ -93,7 +93,7 @@ index ccbc0e9e..4bf82153 100644
ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
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 87c7b5dc..ecde76ec 100644
index 53b12482..001ee1c2 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -72,6 +72,7 @@ public final class UserConnection implements ProxiedPlayer
@ -105,10 +105,10 @@ index 87c7b5dc..ecde76ec 100644
@Getter
@NonNull
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 fe900fcf..ec84f339 100644
index 76fcce9f..8a16fa93 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
@@ -315,6 +315,12 @@ public abstract class EntityMap
@@ -317,6 +317,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index fe900fcf..ec84f339 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.26.2
2.27.0

10
BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From e46e3a153135557d4e3c3566bd4ae1960f4e2e60 Mon Sep 17 00:00:00 2001
From 5dc69c33d870ce55393fca54827d9a5ffb614c7c Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Improve server list ping logging
@ -7,10 +7,10 @@ This functionality of this patch was adopted upstream, however, this
patch remains for a few misc improvements around here
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 4bf82153..d431f514 100644
index 3abf2047..fa3094b0 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -423,6 +423,6 @@ public class ServerConnector extends PacketHandler
@@ -433,6 +433,6 @@ public class ServerConnector extends PacketHandler
@Override
public String toString()
{
@ -31,7 +31,7 @@ index ea905b07..6598781b 100644
}
}
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 5496a799..a9779fcc 100644
index 853d717a..7ca502c0 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
@@ -653,20 +653,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -69,5 +69,5 @@ index 31777d93..cc141a11 100644
}
}
--
2.26.2
2.27.0

8
BungeeCord-Patches/0027-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From 7fc91ed18f34eea6e1deada28cf9800af2635a68 Mon Sep 17 00:00:00 2001
From 806cb9fb4f30b81602e2174c59392dde0628f8b8 Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent
@ -62,10 +62,10 @@ index 0e1ef5c4..ee63732d 100644
@Deprecated
public String getKickReason()
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 d431f514..f594a287 100644
index fa3094b0..f5e7ef7b 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -346,7 +346,7 @@ public class ServerConnector extends PacketHandler
@@ -356,7 +356,7 @@ public class ServerConnector extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = user.updateAndGetNextServer( target );
@ -146,5 +146,5 @@ index 6598781b..d1654bcc 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.26.1
2.27.0

14
BungeeCord-Patches/0032-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From 14aad6dcfb2d749c4d0dc58c49220b2c59896107 Mon Sep 17 00:00:00 2001
From 65d5fb5b4c95876db09106773d3aeb3647422b3a Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -33,7 +33,7 @@ index ac31e435..252389bd 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 17f2bf4c..043e8562 100644
index fa34de48..ecf07c2e 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -17,6 +17,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
@ -45,9 +45,9 @@ index 17f2bf4c..043e8562 100644
import net.md_5.bungee.protocol.packet.Handshake;
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
@@ -98,6 +100,29 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_9, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_15, 0x0D )
@@ -103,6 +105,29 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_15, 0x0D ),
map( ProtocolConstants.MINECRAFT_1_16, 0x0C )
);
+ // Waterfall start
+ TO_CLIENT.registerPacket(
@ -169,7 +169,7 @@ index 00000000..7ed2dc3a
+ }
+}
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 2c689edf..0c36ab52 100644
index 7d0baabb..a254d998 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -1,7 +1,9 @@
@ -277,5 +277,5 @@ index d15044f4..bea2bbff 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.26.1
2.27.0

12
BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 8682d0bf0119fff69a0dedd1470d4b678e07eec4 Mon Sep 17 00:00:00 2001
From 344d0b1bdeda05ce18b39a90d5b0dc7866cc49e7 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -6,7 +6,7 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 66ed2128..2876d8d6 100644
index 65d4ea6b..c291560d 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -233,7 +233,7 @@ index 00000000..93ce3b14
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index 872f8fc1..c9531d39 100644
index 6f2737e8..570b9ea1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
@ -245,7 +245,7 @@ index 872f8fc1..c9531d39 100644
<module>protocol</module>
<module>proxy</module>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 56a83e68..0341a6bc 100644
index 7cc2b4f0..d84b7143 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -65,7 +65,7 @@
@ -257,7 +257,7 @@ index 56a83e68..0341a6bc 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -105,6 +105,20 @@
@@ -99,6 +99,20 @@
<version>5.1.48</version>
<scope>runtime</scope>
</dependency>
@ -458,5 +458,5 @@ index 10366c88..8c5cc949 100644
}
--
2.26.2
2.27.0

53
BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From 7151de9564711a2024fecdbe477cbbb1cb8107f3 Mon Sep 17 00:00:00 2001
From a1bed894651e0c892edf0e590bd9ba70f09ce8dd Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting
@ -57,7 +57,7 @@ index 4ff8da6d..e860214f 100644
+ }
}
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 f594a287..35a19224 100644
index f5e7ef7b..bb4e7ec2 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -228,7 +228,7 @@ public class ServerConnector extends PacketHandler
@ -85,14 +85,16 @@ index f594a287..35a19224 100644
serverScoreboard.clear();
for ( UUID bossbar : user.getSentBossBars() )
@@ -292,12 +294,33 @@ public class ServerConnector extends PacketHandler
@@ -292,7 +294,7 @@ public class ServerConnector extends PacketHandler
}
user.setDimensionChange( true );
- if ( login.getDimension() == user.getDimension() )
+ if ( !user.isDisableEntityMetadataRewrite() && login.getDimension() == user.getDimension() ) // Waterfall - defer
- if ( login.getDimension().equals( user.getDimension() ) )
+ if ( !user.isDisableEntityMetadataRewrite() && login.getDimension().equals( user.getDimension() ) ) // Waterfall - defer
{
user.unsafe().sendPacket( new Respawn( ( login.getDimension() >= 0 ? -1 : 0 ), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) );
Object newDim;
String worldName = login.getWorldName();
@@ -308,6 +310,44 @@ public class ServerConnector extends PacketHandler
}
user.setServerEntityId( login.getEntityId() );
@ -103,25 +105,42 @@ index f594a287..35a19224 100644
+ user.setClientEntityId( login.getEntityId() );
+
+ // Only send if we are not in the same dimension
+ if (user.getDimension() != login.getDimension()) {
+ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType()));
+ if (!login.getDimension().equals( user.getDimension() ) ) // Waterfall - defer
+ {
+ Object newDim;
+ String worldName = login.getWorldName();
+ if (login.getDimension() instanceof Number) {
+ newDim = (((Number) login.getDimension()).intValue() >= 0 ? -1 : 0);
+ } else {
+ newDim = worldName = ("minecraft:overworld".equals(login.getDimension())) ? "minecraft:the_nether" : "minecraft:overworld";
+ }
+ user.unsafe().sendPacket( new Respawn( newDim, worldName, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+ }
+
+ Login modLogin = new Login( login.getEntityId(),login.getGameMode(), login.getDimension(), login.getSeed(),
+ login.getDifficulty(), login.getMaxPlayers(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn() );
+
+ Login modLogin = new Login( login.getEntityId(), login.getGameMode(), login.getPreviousGameMode(), login.getWorldNames(), login.getDimensions(), login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(),
+ (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat() );
+ user.unsafe().sendPacket(modLogin);
+
+ // Only send if we're in the same dimension
+ if (user.getDimension() == login.getDimension()) {
+ user.unsafe().sendPacket( new Respawn(user.getDimension() == 0 ? -1 : 0, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType()));
+ if (login.getDimension().equals( user.getDimension() ) ) // Waterfall - defer
+ {
+ Object newDim;
+ String worldName = login.getWorldName();
+ if (login.getDimension() instanceof Number) {
+ newDim = (((Number) login.getDimension()).intValue() >= 0 ? -1 : 0);
+ } else {
+ newDim = worldName = ("minecraft:overworld".equals(login.getDimension())) ? "minecraft:the_nether" : "minecraft:overworld";
+ }
+ user.unsafe().sendPacket( new Respawn( newDim, worldName, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+ }
+ }
+ // Waterfall end
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getLevelType() ) );
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 )
{
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 0c36ab52..87cff4ff 100644
index a254d998..4826f0d5 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -745,4 +745,10 @@ public final class UserConnection implements ProxiedPlayer
@ -156,7 +175,7 @@ index cfd25859..f845da09 100644
}
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 ec84f339..bc1de55a 100644
index 8a16fa93..ef2a66fa 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
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufInputStream;
@ -179,7 +198,7 @@ index ec84f339..bc1de55a 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -277,7 +283,13 @@ public abstract class EntityMap
@@ -279,7 +285,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
@ -232,5 +251,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.26.2
2.27.0

10
BungeeCord-Patches/0048-Use-proper-max-length-for-serverbound-chat-packet.patch
View File

@ -1,4 +1,4 @@
From 81ac6733c88e10cc48f33239946d69219fe9abd1 Mon Sep 17 00:00:00 2001
From d787491efd13f07ef27ced2319979b24b72847a0 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 20 Mar 2019 21:39:12 -0700
Subject: [PATCH] Use proper max length for serverbound chat packet
@ -44,10 +44,10 @@ index 57155c3b..9951c1f9 100644
{
if ( b.length > Short.MAX_VALUE )
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 ffcd815c..0ded6739 100644
index b5615a9f..d2a4dea6 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
@@ -27,6 +27,11 @@ public class Chat extends DefinedPacket
@@ -35,6 +35,11 @@ public class Chat extends DefinedPacket
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@ -59,7 +59,7 @@ index ffcd815c..0ded6739 100644
message = readString( buf );
if ( direction == ProtocolConstants.Direction.TO_CLIENT )
{
@@ -37,6 +42,11 @@ public class Chat extends DefinedPacket
@@ -49,6 +54,11 @@ public class Chat extends DefinedPacket
@Override
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@ -72,5 +72,5 @@ index ffcd815c..0ded6739 100644
if ( direction == ProtocolConstants.Direction.TO_CLIENT )
{
--
2.26.1
2.27.0

76
BungeeCord-Patches/0051-Speed-up-packet-construction.patch
View File

@ -1,11 +1,11 @@
From 7f97b50764317451f071dffa20673c408a6dfe6c Mon Sep 17 00:00:00 2001
From b5548fda27c9f5bc3f6d9da0bb18085d3b17d118 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Wed, 17 Apr 2019 09:24:38 +0300
Subject: [PATCH] Speed up packet construction
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 043e8562..aa1515f4 100644
index ecf07c2e..9a5a7982 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -54,6 +54,7 @@ public enum Protocol
@ -24,7 +24,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x21 ),
@@ -73,6 +75,7 @@ public enum Protocol
@@ -74,6 +76,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Login.class,
@ -32,7 +32,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x23 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x25 ),
@@ -80,6 +83,7 @@ public enum Protocol
@@ -82,6 +85,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Chat.class,
@ -40,7 +40,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
@@ -87,6 +91,7 @@ public enum Protocol
@@ -90,6 +94,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Respawn.class,
@ -48,14 +48,15 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x07 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x33 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x34 ),
@@ -97,12 +102,14 @@ public enum Protocol
@@ -101,6 +106,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
BossBar.class,
+ BossBar::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_9, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_15, 0x0D )
);
map( ProtocolConstants.MINECRAFT_1_15, 0x0D ),
map( ProtocolConstants.MINECRAFT_1_16, 0x0C )
@@ -108,6 +114,7 @@ public enum Protocol
// Waterfall start
TO_CLIENT.registerPacket(
EntityEffect.class,
@ -63,7 +64,7 @@ index 043e8562..aa1515f4 100644
map(ProtocolConstants.MINECRAFT_1_8, 0x1D),
map(ProtocolConstants.MINECRAFT_1_9, 0x4C),
map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B),
@@ -114,6 +121,7 @@ public enum Protocol
@@ -119,6 +126,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
EntityRemoveEffect.class,
@ -71,7 +72,7 @@ index 043e8562..aa1515f4 100644
map(ProtocolConstants.MINECRAFT_1_8, 0x1E),
map(ProtocolConstants.MINECRAFT_1_9, 0x31),
map(ProtocolConstants.MINECRAFT_1_12, 0x32),
@@ -125,6 +133,7 @@ public enum Protocol
@@ -130,6 +138,7 @@ public enum Protocol
// Waterfall end
TO_CLIENT.registerPacket(
PlayerListItem.class, // PlayerInfo
@ -79,7 +80,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x2D ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ),
@@ -134,6 +143,7 @@ public enum Protocol
@@ -140,6 +149,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
TabCompleteResponse.class,
@ -87,7 +88,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3A ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0E ),
map( ProtocolConstants.MINECRAFT_1_13, 0x10 ),
@@ -141,6 +151,7 @@ public enum Protocol
@@ -148,6 +158,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
ScoreboardObjective.class,
@ -95,7 +96,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3B ),
map( ProtocolConstants.MINECRAFT_1_9, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_12, 0x41 ),
@@ -151,6 +162,7 @@ public enum Protocol
@@ -158,6 +169,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
ScoreboardScore.class,
@ -103,7 +104,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3C ),
map( ProtocolConstants.MINECRAFT_1_9, 0x42 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x44 ),
@@ -161,6 +173,7 @@ public enum Protocol
@@ -168,6 +180,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
ScoreboardDisplay.class,
@ -111,7 +112,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3D ),
map( ProtocolConstants.MINECRAFT_1_9, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x3A ),
@@ -171,6 +184,7 @@ public enum Protocol
@@ -178,6 +191,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Team.class,
@ -119,7 +120,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3E ),
map( ProtocolConstants.MINECRAFT_1_9, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x43 ),
@@ -181,6 +195,7 @@ public enum Protocol
@@ -188,6 +202,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
PluginMessage.class,
@ -127,7 +128,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x19 ),
@@ -189,6 +204,7 @@ public enum Protocol
@@ -197,6 +212,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Kick.class,
@ -135,7 +136,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x40 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1B ),
@@ -197,6 +213,7 @@ public enum Protocol
@@ -206,6 +222,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Title.class,
@ -143,7 +144,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x45 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ),
@@ -206,6 +223,7 @@ public enum Protocol
@@ -216,6 +233,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
PlayerListHeaderFooter.class,
@ -151,7 +152,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x48 ),
map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
@@ -217,6 +235,7 @@ public enum Protocol
@@ -228,6 +246,7 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
EntityStatus.class,
@ -159,25 +160,30 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x1A ),
map( ProtocolConstants.MINECRAFT_1_9, 0x1B ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1C ),
@@ -225,21 +244,25 @@ public enum Protocol
@@ -237,17 +256,21 @@ public enum Protocol
);
TO_CLIENT.registerPacket(
Commands.class,
+ Commands::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_13, 0x11 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x12 )
map( ProtocolConstants.MINECRAFT_1_15, 0x12 ),
map( ProtocolConstants.MINECRAFT_1_16, 0x11 )
);
TO_CLIENT.registerPacket(
GameState.class,
+ GameState::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_15, 0x1F )
map( ProtocolConstants.MINECRAFT_1_15, 0x1F ),
- map( ProtocolConstants.MINECRAFT_1_16, 0x1E )
+ map( ProtocolConstants.MINECRAFT_1_16, 0x1E ),
+ map( ProtocolConstants.MINECRAFT_1_15, 0x1F )
);
TO_CLIENT.registerPacket(
ViewDistance.class,
+ ViewDistance::new, // Waterfall - speed up packet construction
map( ProtocolConstants.MINECRAFT_1_14, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x42 )
);
map( ProtocolConstants.MINECRAFT_1_15, 0x42 ),
map( ProtocolConstants.MINECRAFT_1_16, 0x41 )
@@ -255,6 +278,7 @@ public enum Protocol
TO_SERVER.registerPacket(
KeepAlive.class,
@ -185,7 +191,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x0B ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
@@ -249,6 +272,7 @@ public enum Protocol
@@ -265,6 +289,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
Chat.class,
@ -193,7 +199,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x03 ),
@@ -257,6 +281,7 @@ public enum Protocol
@@ -273,6 +298,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
TabCompleteRequest.class,
@ -201,7 +207,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x14 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x02 ),
@@ -266,6 +291,7 @@ public enum Protocol
@@ -282,6 +308,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
ClientSettings.class,
@ -209,7 +215,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x15 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x04 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x05 ),
@@ -274,6 +300,7 @@ public enum Protocol
@@ -290,6 +317,7 @@ public enum Protocol
);
TO_SERVER.registerPacket(
PluginMessage.class,
@ -217,7 +223,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x17 ),
map( ProtocolConstants.MINECRAFT_1_9, 0x09 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0A ),
@@ -290,19 +317,23 @@ public enum Protocol
@@ -306,19 +334,23 @@ public enum Protocol
{
TO_CLIENT.registerPacket(
StatusResponse.class,
@ -241,7 +247,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_8, 0x01 )
);
}
@@ -314,35 +345,43 @@ public enum Protocol
@@ -330,35 +362,43 @@ public enum Protocol
{
TO_CLIENT.registerPacket(
Kick.class,
@ -285,7 +291,7 @@ index 043e8562..aa1515f4 100644
map( ProtocolConstants.MINECRAFT_1_13, 0x02 )
);
}
@@ -393,7 +432,7 @@ public enum Protocol
@@ -409,7 +449,7 @@ public enum Protocol
private final int protocolVersion;
private final TObjectIntMap<Class<? extends DefinedPacket>> packetMap = new TObjectIntHashMap<>( MAX_PACKET_ID );
@ -294,7 +300,7 @@ index 043e8562..aa1515f4 100644
}
@Data
@@ -461,21 +500,24 @@ public enum Protocol
@@ -477,21 +517,24 @@ public enum Protocol
throw new BadPacketException( "Packet with id " + id + " outside of range " );
}
@ -323,7 +329,7 @@ index 043e8562..aa1515f4 100644
int mappingIndex = 0;
ProtocolMapping mapping = mappings[mappingIndex];
@@ -504,11 +546,32 @@ public enum Protocol
@@ -520,11 +563,32 @@ public enum Protocol
data.packetMap.put( packetClass, mapping.packetID );
data.packetConstructors[mapping.packetID] = constructor;
}
@ -357,5 +363,5 @@ index 043e8562..aa1515f4 100644
final int getId(Class<? extends DefinedPacket> packet, int version)
{
--
2.26.1
2.27.0

22
BungeeCord-Patches/0056-Remove-version-from-brand-info.patch
View File

@ -1,9 +1,29 @@
From 22dcd72ee1ac6342ce25148a5d0bc4822dba3b56 Mon Sep 17 00:00:00 2001
From 8b4c91510a061f133ce20defed7ca62869e3cd16 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 20 Jun 2020 18:21:17 +0100
Subject: [PATCH] Remove version from brand info
diff --git a/log4j/pom.xml b/log4j/pom.xml
index f5267567..e9d935ef 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-parent</artifactId>
- <version>1.15-SNAPSHOT</version>
+ <version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-log4j</artifactId>
- <version>1.15-SNAPSHOT</version>
+ <version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Waterfall-Log</name>
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 d7d0fafc..daac8604 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java

1324
BungeeCord-Patches/0057-Waterfall-1.16.patch
View File

File diff suppressed because it is too large Load Diff