Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-09-30 07:27:28 +02: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:
94c4fcba Bump version to 1.16-R0.3-SNAPSHOT
a99f62f6 Release 1.16-R0.2
This commit is contained in:
Shane Freeder 2020-07-14 12:01:47 +01:00
parent 4cd9150051
commit 7737b0ff0a
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit fd4864d475f705b348adec3fe8f48754b5ee11e6
Subproject commit 94c4fcbad7cd6f16b31de291ddec0d254d997550

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

@ -1,4 +1,4 @@
From 456f67c5ecc169999f42df9ae1aa2e50e12b486d Mon Sep 17 00:00:00 2001
From 9580c58394aeeadb27f83ea26bbacfa3dc142056 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 ba38814a..3a105ce5 100644
index 470c0611..fd8b40f2 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -18,7 +18,7 @@ index ba38814a..3a105ce5 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -26,7 +26,7 @@ index ba38814a..3a105ce5 100644
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
@ -67,7 +67,7 @@ index ba38814a..3a105ce5 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index deca32d9..15a829b6 100644
index a80047ad..3f3aaef4 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -78,7 +78,7 @@ index deca32d9..15a829b6 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -86,7 +86,7 @@ index deca32d9..15a829b6 100644
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
@ -145,7 +145,7 @@ index 6be22739..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index 4fea24f6..3055357b 100644
index b4efdd6a..4c08a151 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,19 +4,20 @@
@ -157,7 +157,7 @@ index 4fea24f6..3055357b 100644
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -165,7 +165,7 @@ index 4fea24f6..3055357b 100644
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
@ -176,7 +176,7 @@ index 4fea24f6..3055357b 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index e5ef0aa1..cec0e98a 100644
index 12fa6ad9..43542e86 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -187,7 +187,7 @@ index e5ef0aa1..cec0e98a 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -195,7 +195,7 @@ index e5ef0aa1..cec0e98a 100644
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
@ -206,7 +206,7 @@ index e5ef0aa1..cec0e98a 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index 1ec59451..5c634272 100644
index dc124c0f..c5c7f8b4 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -217,7 +217,7 @@ index 1ec59451..5c634272 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -225,7 +225,7 @@ index 1ec59451..5c634272 100644
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
@ -234,7 +234,7 @@ index 1ec59451..5c634272 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 9a08ac9a..ccba264a 100644
index 392559d1..5cb1bd19 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -245,7 +245,7 @@ index 9a08ac9a..ccba264a 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -253,7 +253,7 @@ index 9a08ac9a..ccba264a 100644
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
@ -275,7 +275,7 @@ index 9a08ac9a..ccba264a 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 31aa325e..8fb7bb6f 100644
index 0d829883..809f8bb6 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -286,7 +286,7 @@ index 31aa325e..8fb7bb6f 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -294,11 +294,11 @@ index 31aa325e..8fb7bb6f 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 8f813716..a247e1a7 100644
index 2ccf36f1..f4a45cec 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -309,7 +309,7 @@ index 8f813716..a247e1a7 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -317,11 +317,11 @@ index 8f813716..a247e1a7 100644
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index a68925b8..eac49ae2 100644
index 10e5ad4d..5c4c1717 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -332,7 +332,7 @@ index a68925b8..eac49ae2 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -340,11 +340,11 @@ index a68925b8..eac49ae2 100644
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 116cdc69..56cd2e2f 100644
index 651a0061..ed209b57 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -355,7 +355,7 @@ index 116cdc69..56cd2e2f 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -363,11 +363,11 @@ index 116cdc69..56cd2e2f 100644
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index a454cf16..d5d0c387 100644
index ddf23fbd..542d42c3 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -378,7 +378,7 @@ index a454cf16..d5d0c387 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -386,11 +386,11 @@ index a454cf16..d5d0c387 100644
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index 69296b14..39c5f9a7 100644
index 85c021bf..b195f687 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -401,7 +401,7 @@ index 69296b14..39c5f9a7 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -409,7 +409,7 @@ index 69296b14..39c5f9a7 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
@ -439,7 +439,7 @@ index 69296b14..39c5f9a7 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index 976fccc2..415674cc 100644
index 8779e12d..e46cf142 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@
@ -450,7 +450,7 @@ index 976fccc2..415674cc 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -458,11 +458,11 @@ index 976fccc2..415674cc 100644
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index 36afa264..c69672f9 100644
index e819249a..6453a6f0 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -473,7 +473,7 @@ index 36afa264..c69672f9 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -481,7 +481,7 @@ index 36afa264..c69672f9 100644
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
@ -492,7 +492,7 @@ index 36afa264..c69672f9 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index fb0133c4..ada53ad1 100644
index c0de9532..c5b8e7f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -510,7 +510,7 @@ index fb0133c4..ada53ad1 100644
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
@ -706,7 +706,7 @@ index fb0133c4..ada53ad1 100644
</profiles>
</project>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 533ddbed..e58a361e 100644
index 4ac6c453..cfc33af2 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,19 +4,19 @@
@ -717,7 +717,7 @@ index 533ddbed..e58a361e 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -725,7 +725,7 @@ index 533ddbed..e58a361e 100644
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
@ -747,7 +747,7 @@ index 533ddbed..e58a361e 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index ca83e9d0..8a7daedd 100644
index 7fbb0be4..3727c44b 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -758,7 +758,7 @@ index ca83e9d0..8a7daedd 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -766,7 +766,7 @@ index ca83e9d0..8a7daedd 100644
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
@ -818,7 +818,7 @@ index ca83e9d0..8a7daedd 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index a3f8b47c..15cc4166 100644
index c023c6bf..98abf706 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -829,7 +829,7 @@ index a3f8b47c..15cc4166 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -837,7 +837,7 @@ index a3f8b47c..15cc4166 100644
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.16-R0.2-SNAPSHOT</version>
<version>1.16-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
@ -859,5 +859,5 @@ index a3f8b47c..15cc4166 100644
<scope>compile</scope>
</dependency>
--
2.20.1.windows.1
2.27.0