Skip to content

Commit

Permalink
Updated Upstream + Fixed Pom
Browse files Browse the repository at this point in the history
  • Loading branch information
@linsaftw
linsaftw committed Jun 14, 2024
1 parent 007f987 commit 43a3903
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion BungeeCord
Submodule BungeeCord updated 29 files
+2 −2 api/pom.xml
+2 −2 bootstrap/pom.xml
+2 −2 chat/pom.xml
+57 −80 chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
+25 −2 chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
+2 −2 config/pom.xml
+2 −2 event/pom.xml
+2 −2 log/pom.xml
+2 −2 module/cmd-alert/pom.xml
+2 −2 module/cmd-find/pom.xml
+2 −2 module/cmd-kick/pom.xml
+2 −2 module/cmd-list/pom.xml
+2 −2 module/cmd-send/pom.xml
+2 −2 module/cmd-server/pom.xml
+2 −2 module/pom.xml
+2 −2 module/reconnect-yaml/pom.xml
+2 −2 native/pom.xml
+2 −2 pom.xml
+2 −2 protocol/pom.xml
+10 −0 protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+22 −0 protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+7 −4 protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+55 −0 protocol/src/main/java/net/md_5/bungee/protocol/packet/DisconnectReportDetails.java
+92 −0 protocol/src/main/java/net/md_5/bungee/protocol/packet/ServerLinks.java
+3 −3 proxy/pom.xml
+1 −0 proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+3 −2 proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
+2 −2 query/pom.xml
+2 −2 slf4j/pom.xml
80 changes: 40 additions & 40 deletions BungeeCord-Patches/0001-POM-Changes.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ index 4f520c31..d125f700 100644
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
- <version>1.20-R0.3-SNAPSHOT</version>
- <version>1.21-R0.1-SNAPSHOT</version>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
+ <version>1.20-R0.3-SNAPSHOT</version>
+ <version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-API</name>
Expand Down Expand Up @@ -79,15 +79,15 @@ index 4dbf5e29..15546f07 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-Bootstrap</name>
Expand Down Expand Up @@ -157,15 +157,15 @@ index 4239d5a1..3cfa8ac3 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-Chat</name>
Expand All @@ -187,15 +187,15 @@ index e7a474c6..13b2481d 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-Config</name>
Expand All @@ -217,15 +217,15 @@ index 1f36ab90..120d21b2 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-Event</name>
Expand All @@ -245,15 +245,15 @@ index 1e2f2e96..09b75466 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-Log</name>
Expand Down Expand Up @@ -286,15 +286,15 @@ index 62e1f137..095368b4 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
Expand All @@ -309,15 +309,15 @@ index 5ca1b4c3..6bf9bdcf 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml
Expand All @@ -332,15 +332,15 @@ index 2a498c05..5e5cab83 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module-cmd-kick</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-kick</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
Expand All @@ -355,15 +355,15 @@ index 99090af7..670a55f4 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
Expand All @@ -378,15 +378,15 @@ index 5aee8173..6c65d8f4 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
Expand All @@ -401,15 +401,15 @@ index d33200e2..dc3af35e 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

diff --git a/module/pom.xml b/module/pom.xml
Expand All @@ -424,15 +424,15 @@ index 21ba8f2b..baa24b7d 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>

- <name>BungeeCord Modules</name>
Expand Down Expand Up @@ -473,15 +473,15 @@ index e3a077f3..7d8cf5c4 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

diff --git a/native/pom.xml b/native/pom.xml
Expand All @@ -496,15 +496,15 @@ index 56d505ab..f7bae2fe 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-Native</name>
Expand Down Expand Up @@ -533,7 +533,7 @@ index 5ceacdd8..58367c45 100644
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>

- <name>BungeeCord-Parent</name>
Expand Down Expand Up @@ -678,15 +678,15 @@ index 6f5acbc2..db62c340 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-Protocol</name>
Expand Down Expand Up @@ -719,15 +719,15 @@ index 574e36c9..63bc0b32 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-Proxy</name>
Expand Down Expand Up @@ -798,15 +798,15 @@ index e07828dd..4b6fdfc2 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-Query</name>
Expand Down Expand Up @@ -837,7 +837,7 @@ index 3b944b85..6d30d554 100644
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
- <version>1.20-R0.3-SNAPSHOT</version>
- <version>1.21-R0.1-SNAPSHOT</version>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-super</artifactId>
+ <version>dev-SNAPSHOT</version>
Expand All @@ -848,7 +848,7 @@ index 3b944b85..6d30d554 100644
- <artifactId>bungeecord-slf4j</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-slf4j</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>BungeeCord-SLF4J</name>
Expand Down

0 comments on commit 43a3903

Please sign in to comment.