Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord) (#844) 

Upstream has released updates that appear 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:
d0fa62d4 Minecraft 24w06a support
464ed018 Improve cookie support during login
eda268b4 Fix 24w05b spectate packet ID
3e100752 #3612: Error when disconnecting player on PostLoginEvent
b52b1469 Add PendingConnection#isTransferred API method
94d5b0d0 Minecraft 24w05b support
c3f228f6 #3610, 3611: inverted isEmpty method on ComponentStyle
02c5c1ee #3602: Minecraft 24w04a support
c69acf72 Add JetBrains java-annotations
a1cd6943 Bump version to 1.20-R0.3-SNAPSHOT
3e2bc8e2 Release 1.20-R0.2
ad7163d2 #3600: Bump io.netty:netty-bom from 4.1.104.Final to 4.1.106.Final
This commit is contained in:
LinsaFTW 2024-02-24 14:21:31 -03:00 committed by GitHub
parent c1f56949b8
commit 1efb2d439e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
32 changed files with 251 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 19918c694f0adc98976b255e99bc43d4c6e982ac
Subproject commit d0fa62d424c7533ca82e8b6f676e97d34480af48

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

@ -1,4 +1,4 @@
From 1ab877cf71af46ba9adbfe08ffe97e84b65898fc Mon Sep 17 00:00:00 2001
From bdfcc6b096129a10275b6f836665d66651e17523 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 57567988..3cd57d98 100644
index 4f520c31..a4ccb90c 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -16,10 +16,9 @@ index 57567988..3cd57d98 100644
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
- <version>1.20-R0.2-SNAPSHOT</version>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
+ <version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -27,7 +26,7 @@ index 57567988..3cd57d98 100644
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
@ -68,7 +67,7 @@ index 57567988..3cd57d98 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 2b80f83b..fc09cc11 100644
index bfb99f05..348ac8ef 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -79,7 +78,7 @@ index 2b80f83b..fc09cc11 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -87,7 +86,7 @@ index 2b80f83b..fc09cc11 100644
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
@ -146,7 +145,7 @@ index 6be22739..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index 87c2beb1..2aa2ad55 100644
index 4239d5a1..3cfa8ac3 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,19 +4,19 @@
@ -157,7 +156,7 @@ index 87c2beb1..2aa2ad55 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -165,7 +164,7 @@ index 87c2beb1..2aa2ad55 100644
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
@ -176,7 +175,7 @@ index 87c2beb1..2aa2ad55 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 06d2e13b..058e6fa8 100644
index e7a474c6..13b2481d 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -187,7 +186,7 @@ index 06d2e13b..058e6fa8 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -195,7 +194,7 @@ index 06d2e13b..058e6fa8 100644
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
@ -206,7 +205,7 @@ index 06d2e13b..058e6fa8 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index 13e71066..316f1e35 100644
index 1f36ab90..120d21b2 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -217,7 +216,7 @@ index 13e71066..316f1e35 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -225,7 +224,7 @@ index 13e71066..316f1e35 100644
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
@ -234,7 +233,7 @@ index 13e71066..316f1e35 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 47eb961c..9ee30d66 100644
index 1e2f2e96..09b75466 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -245,7 +244,7 @@ index 47eb961c..9ee30d66 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -253,7 +252,7 @@ index 47eb961c..9ee30d66 100644
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
@ -275,7 +274,7 @@ index 47eb961c..9ee30d66 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index e63a1dfb..2016f6a1 100644
index 62e1f137..095368b4 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -286,7 +285,7 @@ index e63a1dfb..2016f6a1 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -294,11 +293,11 @@ index e63a1dfb..2016f6a1 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 60b69834..7371de6a 100644
index 5ca1b4c3..6bf9bdcf 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -309,7 +308,7 @@ index 60b69834..7371de6a 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -317,11 +316,11 @@ index 60b69834..7371de6a 100644
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml
index 822babc6..9fac0511 100644
index 2a498c05..5e5cab83 100644
--- a/module/cmd-kick/pom.xml
+++ b/module/cmd-kick/pom.xml
@@ -4,14 +4,14 @@
@ -332,7 +331,7 @@ index 822babc6..9fac0511 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -340,11 +339,11 @@ index 822babc6..9fac0511 100644
- <artifactId>bungeecord-module-cmd-kick</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-kick</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index ba861252..d7324d89 100644
index 99090af7..670a55f4 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -355,7 +354,7 @@ index ba861252..d7324d89 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -363,11 +362,11 @@ index ba861252..d7324d89 100644
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 1a62e71d..00539f37 100644
index 5aee8173..6c65d8f4 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -378,7 +377,7 @@ index 1a62e71d..00539f37 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -386,11 +385,11 @@ index 1a62e71d..00539f37 100644
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index 57cbf1e9..6785f2a0 100644
index d33200e2..dc3af35e 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -401,7 +400,7 @@ index 57cbf1e9..6785f2a0 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -409,11 +408,11 @@ index 57cbf1e9..6785f2a0 100644
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index b1fd5afd..d78c9a25 100644
index 21ba8f2b..baa24b7d 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -424,7 +423,7 @@ index b1fd5afd..d78c9a25 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -432,7 +431,7 @@ index b1fd5afd..d78c9a25 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
@ -462,7 +461,7 @@ index b1fd5afd..d78c9a25 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index cf663eec..a426476d 100644
index e3a077f3..7d8cf5c4 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@
@ -473,7 +472,7 @@ index cf663eec..a426476d 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -481,11 +480,11 @@ index cf663eec..a426476d 100644
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index a4265e54..5e9d29d7 100644
index 56d505ab..f7bae2fe 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -496,7 +495,7 @@ index a4265e54..5e9d29d7 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -504,7 +503,7 @@ index a4265e54..5e9d29d7 100644
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
@ -515,25 +514,18 @@ index a4265e54..5e9d29d7 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index b6a01870..d8c23f4d 100644
index edadae52..18b596f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@@ -3,18 +3,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <parent>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-super</artifactId>
+ <version>dev-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
@ -552,7 +544,7 @@ index b6a01870..d8c23f4d 100644
</organization>
<licenses>
<license>
@@ -26,7 +33,19 @@
@@ -26,7 +26,19 @@
<developers>
<developer>
@ -573,7 +565,7 @@ index b6a01870..d8c23f4d 100644
</developer>
</developers>
@@ -46,28 +65,24 @@
@@ -46,28 +58,24 @@
</modules>
<scm>
@ -612,7 +604,7 @@ index b6a01870..d8c23f4d 100644
</distributionManagement>
<properties>
@@ -143,12 +158,21 @@
@@ -149,12 +157,21 @@
</execution>
</executions>
</plugin>
@ -634,7 +626,7 @@ index b6a01870..d8c23f4d 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.1</version>
@@ -173,6 +197,7 @@
@@ -179,6 +196,7 @@
</dependency>
</dependencies>
</plugin>
@ -642,7 +634,7 @@ index b6a01870..d8c23f4d 100644
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -285,6 +310,15 @@
@@ -291,6 +309,15 @@
</goals>
</execution>
</executions>
@ -658,7 +650,7 @@ index b6a01870..d8c23f4d 100644
</plugin>
<plugin>
<groupId>org.projectlombok</groupId>
@@ -333,6 +367,7 @@
@@ -339,6 +366,7 @@
<!-- lombok does not add @return or @param which causes warnings, so ignore -->
<doclint>none</doclint>
<sourcepath>${project.build.directory}/delombok</sourcepath>
@ -667,7 +659,7 @@ index b6a01870..d8c23f4d 100644
</execution>
</executions>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 4d611101..76a3510d 100644
index 6f5acbc2..db62c340 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,19 +4,19 @@
@ -678,7 +670,7 @@ index 4d611101..76a3510d 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -686,7 +678,7 @@ index 4d611101..76a3510d 100644
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
@ -708,7 +700,7 @@ index 4d611101..76a3510d 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 92d9d2fa..d1c4570d 100644
index cd90feeb..d8aae8fa 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -719,7 +711,7 @@ index 92d9d2fa..d1c4570d 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -727,7 +719,7 @@ index 92d9d2fa..d1c4570d 100644
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
@ -787,7 +779,7 @@ index 92d9d2fa..d1c4570d 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index edd3e11a..4e9bd6cc 100644
index e07828dd..4b6fdfc2 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -798,7 +790,7 @@ index edd3e11a..4e9bd6cc 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -806,7 +798,7 @@ index edd3e11a..4e9bd6cc 100644
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
@ -828,7 +820,7 @@ index edd3e11a..4e9bd6cc 100644
<scope>compile</scope>
</dependency>
diff --git a/slf4j/pom.xml b/slf4j/pom.xml
index acb5201f..b7529bf3 100644
index 3b944b85..1b61e3ad 100644
--- a/slf4j/pom.xml
+++ b/slf4j/pom.xml
@@ -4,18 +4,18 @@
@ -837,10 +829,9 @@ index acb5201f..b7529bf3 100644
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
- <version>1.20-R0.2-SNAPSHOT</version>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-super</artifactId>
+ <version>dev-SNAPSHOT</version>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -848,7 +839,7 @@ index acb5201f..b7529bf3 100644
- <artifactId>bungeecord-slf4j</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-slf4j</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-SLF4J</name>
@ -857,5 +848,5 @@ index acb5201f..b7529bf3 100644
<properties>
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
View File

@ -1,14 +1,14 @@
From 14cad935db7d6dbae502d46d976de2b9c65c9564 Mon Sep 17 00:00:00 2001
From a7831360e8f8300b9aa7d3f340b609991a8f6150 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 6cb4c798..680af7d3 100644
index fdfa1480..e158a2d3 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
@@ -116,6 +116,16 @@ public class ProtocolConstants
@@ -117,6 +117,16 @@ public class ProtocolConstants
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
}
@ -26,5 +26,5 @@ index 6cb4c798..680af7d3 100644
{
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch
View File

@ -1,4 +1,4 @@
From b78e74b5f2a330f2b4544b9d601dc0703cf99aa3 Mon Sep 17 00:00:00 2001
From 0cdb5fce7e1e629416846d4493d8eee5458b1263 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -43,10 +43,10 @@ index 70b292f0..91f71c09 100644
* Allow this packet to be sent as an "extended" packet.
*/
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index dc6a5a8f..d11f73fc 100644
index 47e06dcd..c60c7dd7 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -268,7 +268,7 @@ public class ServerConnector extends PacketHandler
@@ -277,7 +277,7 @@ public class ServerConnector extends PacketHandler
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@ -82,5 +82,5 @@ index 5b9c35d1..2d6885a9 100644
{
@Override
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
View File

@ -1,4 +1,4 @@
From c04feddfe062c0c5fe5b778a677aeb5d94f93cf7 Mon Sep 17 00:00:00 2001
From 3916ceec65caec4aaa4f049a5477856ccb69274a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions
@ -250,10 +250,10 @@ index e582808f..29cd91dd 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 b1b087aa..b51263a2 100644
index d9247fb2..43fb3208 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
@@ -721,7 +721,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -788,7 +788,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
@ -263,5 +263,5 @@ index b1b087aa..b51263a2 100644
@Override
--
2.43.0
2.43.0.windows.1

12
BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch
View File

@ -1,4 +1,4 @@
From 49b2baa3810475443e50eea4cb36919e94b87f3f Mon Sep 17 00:00:00 2001
From 5dc2020c97ea49af439b9277813faed5aea6eb52 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled
@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
No breaking changes occur due to this patch.
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 d11f73fc..b684df7d 100644
index c60c7dd7..3bc72011 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufAllocator;
@ -23,7 +23,7 @@ index d11f73fc..b684df7d 100644
import java.util.Queue;
import java.util.Set;
import java.util.UUID;
@@ -112,15 +113,39 @@ public class ServerConnector extends PacketHandler
@@ -115,15 +116,39 @@ public class ServerConnector extends PacketHandler
String newHost = copiedHandshake.getHost() + "\00" + AddressUtil.sanitizeAddress( user.getAddress() ) + "\00" + user.getUUID();
LoginResult profile = user.getPendingConnection().getLoginProfile();
@ -67,10 +67,10 @@ index d11f73fc..b684df7d 100644
}
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 04143a46..12bd18ed 100644
index 9edec410..c8d5648c 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -170,9 +170,12 @@ public final class UserConnection implements ProxiedPlayer
@@ -173,9 +173,12 @@ public final class UserConnection implements ProxiedPlayer
forgeClientHandler = new ForgeClientHandler( this );
@ -101,5 +101,5 @@ index 6dca2048..f5253b89 100644
* The FML 1.8 handshake token.
*/
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0013-Allow-removing-servers-or-changing-addresses-on-relo.patch
View File

@ -1,4 +1,4 @@
From 3a0cdd8be9488802c79ab27cc6f92ce0b661624a Mon Sep 17 00:00:00 2001
From 9a24ff623c14bd07b709f8620d978d6432d9048a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 28 Jan 2016 15:13:29 -0700
Subject: [PATCH] Allow removing servers or changing addresses on reload
@ -10,7 +10,7 @@ Kicks players on failure to move.
Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 54a6cb38..ecd3b619 100644
index 1a688179..fea0ec61 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -11,12 +11,15 @@ import java.util.UUID;
@ -29,7 +29,7 @@ index 54a6cb38..ecd3b619 100644
import net.md_5.bungee.util.CaseInsensitiveMap;
import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -116,20 +119,38 @@ public abstract class Configuration implements ProxyConfig
@@ -118,20 +121,38 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers );
} else
{
@ -79,5 +79,5 @@ index 54a6cb38..ecd3b619 100644
for ( ListenerInfo listener : listeners )
--
2.43.0
2.43.0.windows.1

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

@ -1,4 +1,4 @@
From 0a9a8b758119babf7b970b147ead38f68ee6775c Mon Sep 17 00:00:00 2001
From ed5c5e8d2a9aea5d027fef9f1b591271a9b38ee8 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 d79d5e5c..250e7620 100644
{
packet.read( in, protocol, 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 cc08447c..b55ebede 100644
index 88ffac74..c83b91af 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
@@ -770,14 +770,23 @@ public enum Protocol
@@ -851,14 +851,23 @@ public enum Protocol
return protocol;
}
@ -66,10 +66,10 @@ index cc08447c..b55ebede 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 b684df7d..4894b3ee 100644
index 3bc72011..780f46c4 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -225,6 +225,12 @@ public class ServerConnector extends PacketHandler
@@ -234,6 +234,12 @@ public class ServerConnector extends PacketHandler
public static void handleLogin(ProxyServer bungee, ChannelWrapper ch, UserConnection user, BungeeServerInfo target, ForgeServerHandler handshakeHandler, ServerConnection server, Login login) throws Exception
{
ServerConnectedEvent event = new ServerConnectedEvent( user, server );
@ -83,10 +83,10 @@ index b684df7d..4894b3ee 100644
ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
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 9a47f2ec..b768d54a 100644
index 2bf92a03..ccebe19f 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
@@ -340,6 +340,12 @@ public abstract class EntityMap
@@ -342,6 +342,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -100,5 +100,5 @@ index 9a47f2ec..b768d54a 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.43.0
2.43.0.windows.1

10
BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch
View File

@ -1,4 +1,4 @@
From fa78d85d4934194d4b6f0b47d30230fee35ce3db Mon Sep 17 00:00:00 2001
From 0aae040201bde6587860e6cc882beb6fd2fe80f0 Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling
@ -73,10 +73,10 @@ index 741ebfde..91743f01 100644
+ }
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 460aa491..84be12e5 100644
index 219e94b4..4162639f 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -49,6 +49,8 @@ public class UpstreamBridge extends PacketHandler
@@ -50,6 +50,8 @@ public class UpstreamBridge extends PacketHandler
private final ProxyServer bungee;
private final UserConnection con;
@ -85,7 +85,7 @@ index 460aa491..84be12e5 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con)
{
this.bungee = bungee;
@@ -222,6 +224,20 @@ public class UpstreamBridge extends PacketHandler
@@ -223,6 +225,20 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(TabCompleteRequest tabComplete) throws Exception
{
@ -107,5 +107,5 @@ index 460aa491..84be12e5 100644
boolean isRegisteredCommand = false;
boolean isCommand = tabComplete.getCursor().startsWith( "/" );
--
2.43.0
2.43.0.windows.1

16
BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 4cc999421f4825bfa3bc5bfd5c298f6e0990a254 Mon Sep 17 00:00:00 2001
From d3b6ff41a2efadd91fe9eb5ceb770f5ba9207cbb 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 4894b3ee..a8e938be 100644
index 780f46c4..e38f52d5 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -514,6 +514,6 @@ public class ServerConnector extends PacketHandler
@@ -522,6 +522,6 @@ public class ServerConnector extends PacketHandler
@Override
public String toString()
{
@ -31,10 +31,10 @@ index 61ce9ed6..976c8e26 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 b51263a2..ea3a9248 100644
index 43fb3208..4325fe23 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
@@ -727,20 +727,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -794,20 +794,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String toString()
{
@ -57,10 +57,10 @@ index b51263a2..ea3a9248 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 84be12e5..6acbf7bf 100644
index 4162639f..c08bf24b 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -382,6 +382,6 @@ public class UpstreamBridge extends PacketHandler
@@ -389,6 +389,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -69,5 +69,5 @@ index 84be12e5..6acbf7bf 100644
}
}
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch
View File

@ -1,4 +1,4 @@
From 024d2e2f36aa3bd5ba5bbf20c79eaf23f1c38c38 Mon Sep 17 00:00:00 2001
From 10ab9f8cff10028bd518507ce3a122897f32d202 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sun, 7 Feb 2016 00:01:19 -0700
Subject: [PATCH] Add a property to accept invalid ping packets
@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
Fixes #23
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 ea3a9248..7b02226f 100644
index 4325fe23..b7dd5fe3 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
@@ -299,10 +299,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -323,10 +323,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING;
}
@ -29,5 +29,5 @@ index ea3a9248..7b02226f 100644
disconnect( "" );
}
--
2.43.0
2.43.0.windows.1

10
BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch
View File

@ -1,14 +1,14 @@
From 507a31bafc173948203073eed02cf798677e522e Mon Sep 17 00:00:00 2001
From 07f87b89d0d17f8ffc963b5f574fb3de5d99161b Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 25 Oct 2016 12:34:41 -0400
Subject: [PATCH] Validate that chat messages are non-blank
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 6acbf7bf..05e3bd21 100644
index c08bf24b..4322dbad 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -199,6 +199,7 @@ public class UpstreamBridge extends PacketHandler
@@ -200,6 +200,7 @@ public class UpstreamBridge extends PacketHandler
private String handleChat(String message)
{
@ -16,7 +16,7 @@ index 6acbf7bf..05e3bd21 100644
for ( int index = 0, length = message.length(); index < length; index++ )
{
char c = message.charAt( index );
@@ -206,8 +207,14 @@ public class UpstreamBridge extends PacketHandler
@@ -207,8 +208,14 @@ public class UpstreamBridge extends PacketHandler
{
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
throw CancelSendSignal.INSTANCE;
@ -32,5 +32,5 @@ index 6acbf7bf..05e3bd21 100644
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
--
2.43.0
2.43.0.windows.1

14
BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From d07aa1be7cfc35595ea9d5924fcf2dc989b9ced3 Mon Sep 17 00:00:00 2001
From 89741f79f340eefb555ec55efb0eab6a8d3c0ba9 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.
@ -194,7 +194,7 @@ index 3501a4e9..5a3acccf 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index ecd3b619..7094fe0b 100644
index fea0ec61..37abb3c4 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -1,6 +1,7 @@
@ -221,15 +221,15 @@ index ecd3b619..7094fe0b 100644
/**
* Set of all servers.
*/
@@ -72,6 +75,7 @@ public abstract class Configuration implements ProxyConfig
private boolean preventProxyConnections;
@@ -73,6 +76,7 @@ public abstract class Configuration implements ProxyConfig
private boolean forgeSupport;
private boolean rejectTransfers;
+ @Synchronized("serversLock") // Waterfall
public void load()
{
ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter();
@@ -119,7 +123,7 @@ public abstract class Configuration implements ProxyConfig
@@ -121,7 +125,7 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers );
} else
{
@ -238,7 +238,7 @@ index ecd3b619..7094fe0b 100644
for ( ServerInfo oldServer : oldServers.values() )
{
@@ -182,4 +186,71 @@ public abstract class Configuration implements ProxyConfig
@@ -184,4 +188,71 @@ public abstract class Configuration implements ProxyConfig
{
return favicon;
}
@ -311,5 +311,5 @@ index ecd3b619..7094fe0b 100644
+ // Waterfall end
}
--
2.43.0
2.43.0.windows.1

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

@ -1,4 +1,4 @@
From 3955eb202eed2e2b2b49b8c403b0a72ad40f8f97 Mon Sep 17 00:00:00 2001
From 4035759e203567e189c3a3f4dee618f2fb2b8290 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
@ -68,10 +68,10 @@ index 3f9efaa8..5d2597ad 100644
/**
* @return the kick reason
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 a8e938be..43af8888 100644
index e38f52d5..031bf2b1 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -431,7 +431,7 @@ public class ServerConnector extends PacketHandler
@@ -439,7 +439,7 @@ public class ServerConnector extends PacketHandler
ServerKickEvent event = new ServerKickEvent( user, target, new BaseComponent[]
{
kick.getMessage()
@ -147,5 +147,5 @@ index 976c8e26..7e416a6d 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.43.0
2.43.0.windows.1

16
BungeeCord-Patches/0027-Add-timeout-variant-to-connect-methods.patch
View File

@ -1,4 +1,4 @@
From f5cc5bc2d7be2deb3fef2eba5c4280ccd50e69f7 Mon Sep 17 00:00:00 2001
From 5b69d2ace775a1dcbaa90faecdd258efd3f8ac87 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods
@ -6,10 +6,10 @@ Subject: [PATCH] Add timeout variant to connect methods
Also added more connect methods to ProxiedPlayer, in addition to the new method
diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
index ab879248..4db23b3f 100644
index 0fe647b8..32af4937 100644
--- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
+++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
@@ -126,6 +126,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
@@ -128,6 +128,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
*/
void connect(ServerInfo target, Callback<Boolean> callback);
@ -48,7 +48,7 @@ index ab879248..4db23b3f 100644
/**
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
@@ -139,6 +171,25 @@ public interface ProxiedPlayer extends Connection, CommandSender
@@ -141,6 +173,25 @@ public interface ProxiedPlayer extends Connection, CommandSender
*/
void connect(ServerInfo target, Callback<Boolean> callback, ServerConnectEvent.Reason reason);
@ -75,10 +75,10 @@ index ab879248..4db23b3f 100644
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
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 12bd18ed..f7160a66 100644
index c8d5648c..7e36c0eb 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -282,9 +282,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -285,9 +285,20 @@ public final class UserConnection implements ProxiedPlayer
public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason)
{
@ -99,7 +99,7 @@ index 12bd18ed..f7160a66 100644
if ( callback != null )
{
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
@@ -378,7 +389,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -381,7 +392,7 @@ public final class UserConnection implements ProxiedPlayer
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
sendMessage( bungee.getTranslation( "fallback_lobby" ) );
@ -109,5 +109,5 @@ index 12bd18ed..f7160a66 100644
{
disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
--
2.43.0
2.43.0.windows.1

16
BungeeCord-Patches/0030-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,18 +1,18 @@
From 5e0d7a57b4e2576b25facd443f0a41d66c277418 Mon Sep 17 00:00:00 2001
From f393428127f636000f82443d9f7c4bbd5016c196 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
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
index 4383dbb5..2b4e4298 100644
index 4b52c8b1..3a199578 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
@@ -243,4 +243,14 @@ public abstract class AbstractPacketHandler
public void handle(FinishConfiguration finishConfiguration) throws Exception
@@ -263,4 +263,14 @@ public abstract class AbstractPacketHandler
public void handle(CookieResponse cookieResponse) throws Exception
{
}
+
+
+ // Waterfall start
+ public void handle(net.md_5.bungee.protocol.packet.EntityEffect entityEffect) throws Exception
+ {
@ -117,7 +117,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 f7160a66..a5ddcdc3 100644
index 7e36c0eb..86223e17 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 @@
@ -130,7 +130,7 @@ index f7160a66..a5ddcdc3 100644
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -126,6 +128,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -129,6 +131,10 @@ public final class UserConnection implements ProxiedPlayer
private final Scoreboard serverSentScoreboard = new Scoreboard();
@Getter
private final Collection<UUID> sentBossBars = new HashSet<>();
@ -216,5 +216,5 @@ index d15044f4..bea2bbff 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.43.0
2.43.0.windows.1

26
BungeeCord-Patches/0034-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From fc3c0df45ca820c858052a420e1fc8985645fb87 Mon Sep 17 00:00:00 2001
From a7fd6d9b2d176e4f7f9e1c226e1e6e06103e20b8 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 fc09cc11..7fbac761 100644
index 348ac8ef..187c2138 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -39,7 +39,7 @@ index fc09cc11..7fbac761 100644
</build>
diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644
index 00000000..f9a169cc
index 00000000..4bb98d5a
--- /dev/null
+++ b/log4j/pom.xml
@@ -0,0 +1,48 @@
@ -50,13 +50,13 @@ index 00000000..f9a169cc
+ <parent>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
+ <version>1.20-R0.2-SNAPSHOT</version>
+ <version>1.20-R0.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log4j</artifactId>
+ <version>1.20-R0.2-SNAPSHOT</version>
+ <version>1.20-R0.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Waterfall-Log4J</name>
@ -233,10 +233,10 @@ index 00000000..cfd039cd
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index d8c23f4d..552c279e 100644
index 18b596f2..c31408a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,12 +55,13 @@
@@ -48,12 +48,13 @@
<module>chat</module>
<module>config</module>
<module>event</module>
@ -253,7 +253,7 @@ index d8c23f4d..552c279e 100644
</modules>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 18a5c526..9be9aa22 100644
index 1d2b4ec9..15887222 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -71,7 +71,7 @@
@ -561,7 +561,7 @@ index 7e465924..00000000
-</project-shared-configuration>
diff --git a/slf4j/pom.xml b/slf4j/pom.xml
deleted file mode 100644
index b7529bf3..00000000
index 1b61e3ad..00000000
--- a/slf4j/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
@ -572,14 +572,14 @@ index b7529bf3..00000000
-
- <parent>
- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-super</artifactId>
- <version>dev-SNAPSHOT</version>
- <artifactId>waterfall-parent</artifactId>
- <version>1.20-R0.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-slf4j</artifactId>
- <version>1.20-R0.2-SNAPSHOT</version>
- <version>1.20-R0.3-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Waterfall-SLF4J</name>
@ -1629,5 +1629,5 @@ index 21a48df6..00000000
-
-}
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
View File

@ -1,4 +1,4 @@
From 1f305141c3b140348228142d4d450900021a083b Mon Sep 17 00:00:00 2001
From f5bfae46f8cd47ff456069b21862f6efad233421 Mon Sep 17 00:00:00 2001
From: phenomax <phenomax@revayd.net>
Date: Thu, 10 Aug 2017 18:41:17 +0200
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@ -51,10 +51,10 @@ similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
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 7b02226f..bc98b6b1 100644
index b7dd5fe3..5fd26bf1 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
@@ -612,7 +612,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -644,7 +644,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
};
// fire login event
@ -64,5 +64,5 @@ index 7b02226f..bc98b6b1 100644
private void finish2()
--
2.43.0
2.43.0.windows.1

12
BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch
View File

@ -1,4 +1,4 @@
From 6bd04a3ed17d267336bf418a14f992d682c648d6 Mon Sep 17 00:00:00 2001
From 00cda9eb01af461e5569795a0c93db9e6cb565a0 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Thu, 8 Feb 2018 19:10:52 +0100
Subject: [PATCH] Optionally log InitialHandler connections
@ -61,12 +61,12 @@ index ef44d334..4ff8da6d 100644
public String getGameVersion() {
return gameVersion;
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 bc98b6b1..460a79a1 100644
index 5fd26bf1..ccc80506 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
@@ -354,7 +354,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
break;
case 2:
@@ -380,7 +380,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
case 3:
transferred = handshake.getRequestedProtocol() == 3;
// Login
- bungee.getLogger().log( Level.INFO, "{0} has connected", this );
+ if (BungeeCord.getInstance().getConfig().isLogInitialHandlerConnections() ) // Waterfall
@ -77,5 +77,5 @@ index bc98b6b1..460a79a1 100644
ch.setProtocol( Protocol.LOGIN );
--
2.43.0
2.43.0.windows.1

9
BungeeCord-Patches/0041-Forge-is-a-first-class-citizen.patch
View File

@ -1,4 +1,4 @@
From b7d1b3f0696f9447fb529e50f53dbb9718149f69 Mon Sep 17 00:00:00 2001
From 1c86494fe0900cb9dd18d095d8d79c2532349d59 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Mon, 28 May 2018 21:43:55 +0100
Subject: [PATCH] Forge is a first class citizen
@ -18,18 +18,19 @@ index 066e740d..f25ff75a 100644
isRunning = true;
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 7094fe0b..8911bee8 100644
index 37abb3c4..a468c5c4 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -73,7 +73,7 @@ public abstract class Configuration implements ProxyConfig
@@ -73,8 +73,8 @@ public abstract class Configuration implements ProxyConfig
private Favicon favicon;
private int compressionThreshold = 256;
private boolean preventProxyConnections;
- private boolean forgeSupport;
private boolean rejectTransfers;
+ private boolean forgeSupport = true; // Waterfall: default to enabled
@Synchronized("serversLock") // Waterfall
public void load()
--
2.43.0
2.43.0.windows.1

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

@ -1,4 +1,4 @@
From 30f946ce72014dcdcfe31aa7703a5d30b1e13d42 Mon Sep 17 00:00:00 2001
From a43f0b8886740a47f470609a8325528f2896739a 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,10 +57,10 @@ 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 43af8888..9a22a1f7 100644
index 031bf2b1..5fc9324e 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -255,7 +255,8 @@ public class ServerConnector extends PacketHandler
@@ -264,7 +264,8 @@ public class ServerConnector extends PacketHandler
ch.write( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:register" : "REGISTER", Joiner.on( "\0" ).join( registeredChannels ).getBytes( StandardCharsets.UTF_8 ), false ) );
}
@ -70,7 +70,7 @@ index 43af8888..9a22a1f7 100644
{
ch.write( user.getSettings() );
}
@@ -310,6 +311,7 @@ public class ServerConnector extends PacketHandler
@@ -319,6 +320,7 @@ public class ServerConnector extends PacketHandler
user.getTabListHandler().onServerChange();
Scoreboard serverScoreboard = user.getServerSentScoreboard();
@ -78,7 +78,7 @@ index 43af8888..9a22a1f7 100644
for ( Objective objective : serverScoreboard.getObjectives() )
{
user.unsafe().sendPacket( new ScoreboardObjective(
@@ -333,6 +335,7 @@ public class ServerConnector extends PacketHandler
@@ -342,6 +344,7 @@ public class ServerConnector extends PacketHandler
{
user.unsafe().sendPacket( new net.md_5.bungee.protocol.packet.Team( team.getName() ) );
}
@ -86,7 +86,7 @@ index 43af8888..9a22a1f7 100644
serverScoreboard.clear();
for ( UUID bossbar : user.getSentBossBars() )
@@ -351,13 +354,34 @@ public class ServerConnector extends PacketHandler
@@ -360,13 +363,34 @@ public class ServerConnector extends PacketHandler
}
user.setDimensionChange( true );
@ -110,7 +110,7 @@ index 43af8888..9a22a1f7 100644
+ }
+ Login modLogin = new Login( login.getEntityId(), login.isHardcore(), 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.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isLimitedCrafting(), login.isDebug(), login.isFlat(), login.getDeathLocation(),
+ login.getPortalCooldown() );
+ login.getPortalCooldown(), login.isSecureProfile() );
+ user.unsafe().sendPacket(modLogin);
+ // Only send if we're in the same dimension
+ if ( login.getDimension() == user.getDimension() ) // Waterfall - defer
@ -123,14 +123,13 @@ index 43af8888..9a22a1f7 100644
(byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
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 a5ddcdc3..1d3b7a9d 100644
index 86223e17..ee527938 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -791,4 +791,10 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
@@ -816,4 +816,9 @@ public final class UserConnection implements ProxiedPlayer
unsafe().sendPacket( new Transfer( host, port ) );
}
+
+ // Waterfall start
+ public boolean isDisableEntityMetadataRewrite() {
+ return entityRewrite == net.md_5.bungee.entitymap.EntityMap_Dummy.INSTANCE;
@ -158,7 +157,7 @@ index 8a10b057..249c3f46 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 b768d54a..e22e956d 100644
index ccebe19f..cb4f1098 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
@@ -27,6 +27,11 @@ public abstract class EntityMap
@ -173,7 +172,7 @@ index b768d54a..e22e956d 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -302,7 +307,13 @@ public abstract class EntityMap
@@ -304,7 +309,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
@ -226,5 +225,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.43.0
2.43.0.windows.1

18
BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch
View File

@ -1,4 +1,4 @@
From f7cabafe6a763350695c963966fd28baa303f3b2 Mon Sep 17 00:00:00 2001
From 35d2dacf92f05fdb842310189d371971ee72e7a8 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 25 Nov 2019 19:54:06 +0000
Subject: [PATCH] Speed up some common exceptions
@ -172,19 +172,19 @@ index 237955ab..d0bd4d75 100644
+ // Waterfall end
}
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 460a79a1..b0caf6d6 100644
index ccc80506..d8d65093 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
@@ -15,6 +15,8 @@ import java.util.Set;
import java.util.UUID;
import java.util.logging.Level;
import javax.crypto.SecretKey;
@@ -21,6 +21,8 @@ import javax.crypto.SecretKey;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.crypto.spec.SecretKeySpec;
+
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
@@ -470,6 +472,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
import lombok.ToString;
@@ -502,6 +504,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
@ -221,5 +221,5 @@ index ac99d02c..0c1ecfb8 100644
// Waterfall start
--
2.43.0
2.43.0.windows.1

10
BungeeCord-Patches/0053-Add-auth-url-option.patch
View File

@ -1,14 +1,14 @@
From c97c6f85ccca1dbf601500ee7b975788d7af7acc Mon Sep 17 00:00:00 2001
From a76ed2e6cec8c74791a1004e8cd4170b433b16b1 Mon Sep 17 00:00:00 2001
From: theminecoder <theminecoder.dev@gmail.com>
Date: Sun, 19 Jul 2020 10:18:23 +1000
Subject: [PATCH] Add auth url option
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 b0caf6d6..03608ef1 100644
index d8d65093..ffb078d6 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
@@ -74,6 +74,8 @@ import net.md_5.bungee.util.QuietException;
@@ -83,6 +83,8 @@ import net.md_5.bungee.util.QuietException;
public class InitialHandler extends PacketHandler implements PendingConnection
{
@ -17,7 +17,7 @@ index b0caf6d6..03608ef1 100644
private final BungeeCord bungee;
private ChannelWrapper ch;
@Getter
@@ -498,7 +500,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -530,7 +532,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" );
String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : "";
@ -27,5 +27,5 @@ index b0caf6d6..03608ef1 100644
Callback<String> handler = new Callback<String>()
{
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch
View File

@ -1,4 +1,4 @@
From 0e6a3432cad31d9827ed3e35568e93239b951d89 Mon Sep 17 00:00:00 2001
From 32dab04e234232ee5f41fbb099314ded4db6f253 Mon Sep 17 00:00:00 2001
From: FivePB <admin@fivepb.me>
Date: Tue, 16 Nov 2021 21:15:32 +0100
Subject: [PATCH] Configurable plugin messaging limits
@ -83,10 +83,10 @@ index b88e3c8a..da0efa36 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 03608ef1..97fcd106 100644
index ffb078d6..bb9063f6 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
@@ -763,9 +763,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -830,9 +830,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
for ( String id : content.split( "\0" ) )
{
@ -101,5 +101,5 @@ index 03608ef1..97fcd106 100644
}
} else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
--
2.43.0
2.43.0.windows.1

14
BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch
View File

@ -1,4 +1,4 @@
From 04ddae3da84541c43f749b212babe1304c24a35f Mon Sep 17 00:00:00 2001
From 798c4a8872b81f0bc4937528443943757d7af13a Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 16 Apr 2021 06:29:28 +0100
Subject: [PATCH] ServerConnectRequest#sendFeedback
@ -31,10 +31,10 @@ index c81b0a4e..d21370be 100644
}
}
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 1d3b7a9d..6c83039d 100644
index ee527938..2813c16f 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -295,12 +295,16 @@ public final class UserConnection implements ProxiedPlayer
@@ -298,12 +298,16 @@ public final class UserConnection implements ProxiedPlayer
connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout);
}
@ -53,7 +53,7 @@ index 1d3b7a9d..6c83039d 100644
builder.connectTimeout(timeout); // Waterfall
if ( callback != null )
{
@@ -348,7 +352,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -351,7 +355,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null );
}
@ -62,7 +62,7 @@ index 1d3b7a9d..6c83039d 100644
return;
}
if ( pendingConnects.contains( target ) )
@@ -358,7 +362,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -361,7 +365,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null );
}
@ -71,7 +71,7 @@ index 1d3b7a9d..6c83039d 100644
return;
}
@@ -394,14 +398,14 @@ public final class UserConnection implements ProxiedPlayer
@@ -397,14 +401,14 @@ public final class UserConnection implements ProxiedPlayer
ServerInfo def = updateAndGetNextServer( target );
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
@ -90,5 +90,5 @@ index 1d3b7a9d..6c83039d 100644
}
}
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0059-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch
View File

@ -1,4 +1,4 @@
From ad63d355a4d87b0b203c82583e792c53dc82fc88 Mon Sep 17 00:00:00 2001
From 91068a14930a6dea6267c8cc6c435b555d3d9b32 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 22 Mar 2022 14:56:44 +0000
Subject: [PATCH] Don't send exceptions to the client during kicks, etc
@ -13,10 +13,10 @@ allows for retaining much of the overall context here, i.e. who
was this exception assocated with?
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 6c83039d..553680ee 100644
index 2813c16f..f29a6f62 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -426,7 +426,8 @@ public final class UserConnection implements ProxiedPlayer
@@ -429,7 +429,8 @@ public final class UserConnection implements ProxiedPlayer
private String connectionFailMessage(Throwable cause)
{
@ -27,5 +27,5 @@ index 6c83039d..553680ee 100644
@Override
--
2.43.0
2.43.0.windows.1

10
BungeeCord-Patches/0060-Improve-login-state-transition.patch
View File

@ -1,14 +1,14 @@
From 9f02acf8b272fc63840c758087213c5d464abcf1 Mon Sep 17 00:00:00 2001
From 76146d50f70765ba260304699679fbd71f23c7c4 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 8 May 2022 12:04:30 +0100
Subject: [PATCH] Improve login state transition
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 97fcd106..9c322fb5 100644
index bb9063f6..f5959b66 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
@@ -472,6 +472,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -504,6 +504,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
@ -16,7 +16,7 @@ index 97fcd106..9c322fb5 100644
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
// Waterfall start
@@ -526,7 +527,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -558,7 +559,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
}
};
@ -26,5 +26,5 @@ index 97fcd106..9c322fb5 100644
}
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0061-Add-protocol-version-to-packet-not-found-message.patch
View File

@ -1,4 +1,4 @@
From b53958447d57fd8bf97defa9550a0bd5577b086f Mon Sep 17 00:00:00 2001
From 3251af3cd2f65b41d5142959d55cde21ce2769d4 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 12 Jun 2022 06:45:54 +0100
Subject: [PATCH] Add protocol version to packet not found message
@ -6,7 +6,7 @@ Subject: [PATCH] Add protocol version to packet not found message
Also avoids a double get, but, this is probably trivial
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 b55ebede..27d4c2c4 100644
index c83b91af..37142e26 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
@@ -2,6 +2,8 @@ package net.md_5.bungee.protocol;
@ -18,7 +18,7 @@ index b55ebede..27d4c2c4 100644
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TIntObjectHashMap;
@@ -851,9 +853,12 @@ public enum Protocol
@@ -932,9 +934,12 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}
@ -34,5 +34,5 @@ index b55ebede..27d4c2c4 100644
}
}
--
2.43.0
2.43.0.windows.1

10
BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch
View File

@ -1,4 +1,4 @@
From 17682183ba6a38abcf489250d5a1806a6b9c835d Mon Sep 17 00:00:00 2001
From e7688bc1a3e0fbb881635096f464772f804ec2be Mon Sep 17 00:00:00 2001
From: Aurora <aurora@relanet.eu>
Date: Mon, 18 Jul 2022 15:56:05 +0200
Subject: [PATCH] Add message for outdated clients that don't support secure
@ -8,10 +8,10 @@ Clients before 1.19 don't support secure profiles, but since secure profiles is
things checked those outdated clients didn't get a useful message telling them to update.
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 9c322fb5..a9358a51 100644
index f5959b66..72d48c72 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
@@ -395,6 +395,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -427,6 +427,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 )
{
@ -20,7 +20,7 @@ index 9c322fb5..a9358a51 100644
if ( publicKey == null )
{
diff --git a/proxy/src/main/resources/messages.properties b/proxy/src/main/resources/messages.properties
index e42b798b..76ad621f 100644
index 149c742f..8d5075f6 100644
--- a/proxy/src/main/resources/messages.properties
+++ b/proxy/src/main/resources/messages.properties
@@ -25,6 +25,7 @@ offline_mode_player=\u00a7cNot authenticated with Minecraft.net
@ -32,5 +32,5 @@ index e42b798b..76ad621f 100644
error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details)
error_occurred_console=\u00a7cAn error occurred while parsing your message: {0}
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch
View File

@ -1,4 +1,4 @@
From 7feb3c8d993a4bf4a48b7705ff27d67e165f7368 Mon Sep 17 00:00:00 2001
From bae0045a3b7394ba2071ab4e5ac2d7fe8fa5a157 Mon Sep 17 00:00:00 2001
From: Janmm14 <gitconfig1@janmm14.de>
Date: Mon, 21 Jun 2021 23:43:39 +0200
Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
@ -32,10 +32,10 @@ index 377df7ec..8f531f85 100644
.handler( PipelineUtils.BASE_SERVERSIDE )
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
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 553680ee..2f996a69 100644
index f29a6f62..1d009633 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -411,7 +411,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -414,7 +414,7 @@ public final class UserConnection implements ProxiedPlayer
}
};
Bootstrap b = new Bootstrap()
@ -142,5 +142,5 @@ index af65e192..6a045d16 100644
{
return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
--
2.43.0
2.43.0.windows.1

8
BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch
View File

@ -1,14 +1,14 @@
From d3343b033840d723bfc103fca04c04cb2975c412 Mon Sep 17 00:00:00 2001
From 9605eefddbd1ad1ac004c9e12f9e9b8e239623ee Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 21 Apr 2023 15:32:33 +0100
Subject: [PATCH] reduce log spam from clients registeirng too many channels
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 a9358a51..5e74d0e2 100644
index 72d48c72..0b5bee55 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
@@ -162,7 +162,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -186,7 +186,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -28,5 +28,5 @@ index a9358a51..5e74d0e2 100644
@Override
--
2.43.0
2.43.0.windows.1

18
BungeeCord-Patches/0066-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch
View File

@ -1,14 +1,14 @@
From 674e934b2caa424135b34c4b246962f8767a4009 Mon Sep 17 00:00:00 2001
From 29e84de113d54895e028971010ba2d8b8467c269 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 15 Oct 2023 00:36:38 +0100
Subject: [PATCH] Prevent proxy commands from breaking the chat chain system
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
index 2b4e4298..1fad0818 100644
index 3a199578..52225870 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
@@ -252,5 +252,9 @@ public abstract class AbstractPacketHandler
@@ -272,5 +272,9 @@ public abstract class AbstractPacketHandler
public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
{
}
@ -19,10 +19,10 @@ index 2b4e4298..1fad0818 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 27d4c2c4..bd66e7a5 100644
index 37142e26..aba0f85e 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
@@ -496,6 +496,13 @@ public enum Protocol
@@ -538,6 +538,13 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_19, 0x04 ),
map( ProtocolConstants.MINECRAFT_1_19_1, 0x05 )
);
@ -90,10 +90,10 @@ index 887ff29f..d4700090 100644
+ }
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 05e3bd21..dff5e283 100644
index 4322dbad..c0a04846 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -194,10 +194,15 @@ public class UpstreamBridge extends PacketHandler
@@ -195,10 +195,15 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(ClientCommand command) throws Exception
{
@ -111,7 +111,7 @@ index 05e3bd21..dff5e283 100644
{
boolean empty = true;
for ( int index = 0, length = message.length(); index < length; index++ )
@@ -223,6 +228,12 @@ public class UpstreamBridge extends PacketHandler
@@ -224,6 +229,12 @@ public class UpstreamBridge extends PacketHandler
if ( !chatEvent.isCommand() || !bungee.getPluginManager().dispatchCommand( con, message.substring( 1 ) ) )
{
return message;
@ -125,5 +125,5 @@ index 05e3bd21..dff5e283 100644
}
throw CancelSendSignal.INSTANCE;
--
2.43.0
2.43.0.windows.1