mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-12-24 17:47:42 +01:00
Updated Upstream (Travertine)
This commit is contained in:
unknown
commit
77ecb034de
@ -1,5 +1,5 @@
|
||||
FlameCord
|
||||
=========
|
||||
=======
|
||||
|
||||
FlameCord is a patch for Travertine to fix possible exploits and add useful functionalities.
|
||||
|
||||
@ -8,7 +8,7 @@ FlameCord is compiled like Travertine does; Please follow the CONTRIBUTING.md fi
|
||||
<a href="https://discord.gg/gF36AT3"><img src="https://discord.com/assets/4ff060e44afc171e9622fbe589c2c09e.png" width=10% height=10%><img/><a/> <a href="https://www.mc-market.org/resources/13492/"><img src="https://www.mc-market.org/styles/mcmarketv2/xenforo/logo.png" width=10% height=10%><img/><a/>
|
||||
|
||||
Travertine [](https://papermc.io/ci/job/Travertine/)
|
||||
=========
|
||||
=======
|
||||
|
||||
Travertine is Waterfall with additional protocols. Waterfall is a fork of the well-known [BungeeCord](https://github.com/SpigotMC/BungeeCord) server teleportation suite.
|
||||
|
||||
@ -32,7 +32,7 @@ Travertine will track upstream Waterfall and merge changes as needed.
|
||||
|
||||
## How to (Server Admins)
|
||||
|
||||
Download a copy of Travertine.jar from our buildserver here: [Travertine](https://papermc.io/ci/job/Travertine/)
|
||||
Download a copy of Travertine.jar from our homepage here: [Travertine](https://papermc.io/downloads#Travertine)
|
||||
|
||||
Travertine requires **Java 8** or above.
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 72503bfab4967978c8cdc62d56bf6dc9c3164d6b
|
||||
Subproject commit 9a1d6a1711e2ab0615dd0440705a033b7c121675
|
||||
@ -1,11 +1,11 @@
|
||||
From 79314f3f9562434dc995c3f78d5957280f74ffdf Mon Sep 17 00:00:00 2001
|
||||
From 676a3f5461fa6f63942a92a5c3eba35f4c0b1084 Mon Sep 17 00:00:00 2001
|
||||
From: Troy Frew <fuzzy_bot@arenaga.me>
|
||||
Date: Tue, 15 Nov 2016 08:56:43 -0500
|
||||
Subject: [PATCH] POM Changes
|
||||
|
||||
|
||||
diff --git a/api/pom.xml b/api/pom.xml
|
||||
index 87b279b8..d3016c10 100644
|
||||
index c2b55587..1cd99ed3 100644
|
||||
--- a/api/pom.xml
|
||||
+++ b/api/pom.xml
|
||||
@@ -5,41 +5,41 @@
|
||||
@ -14,14 +14,14 @@ index 87b279b8..d3016c10 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-api</artifactId>
|
||||
+ <artifactId>travertine-api</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-API</name>
|
||||
@ -58,7 +58,7 @@ index 87b279b8..d3016c10 100644
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
|
||||
index a43db907..078c5b1a 100644
|
||||
index c51531eb..b7f932d4 100644
|
||||
--- a/bootstrap/pom.xml
|
||||
+++ b/bootstrap/pom.xml
|
||||
@@ -5,18 +5,18 @@
|
||||
@ -67,14 +67,14 @@ index a43db907..078c5b1a 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-bootstrap</artifactId>
|
||||
+ <artifactId>travertine-bootstrap</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-Bootstrap</name>
|
||||
@ -102,7 +102,7 @@ index a43db907..078c5b1a 100644
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
diff --git a/chat/pom.xml b/chat/pom.xml
|
||||
index 8523d99a..29094871 100644
|
||||
index 85309233..5cc62141 100644
|
||||
--- a/chat/pom.xml
|
||||
+++ b/chat/pom.xml
|
||||
@@ -5,18 +5,18 @@
|
||||
@ -111,14 +111,14 @@ index 8523d99a..29094871 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-chat</artifactId>
|
||||
+ <artifactId>travertine-chat</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-Chat</name>
|
||||
@ -129,7 +129,7 @@ index 8523d99a..29094871 100644
|
||||
<dependencies>
|
||||
<dependency>
|
||||
diff --git a/config/pom.xml b/config/pom.xml
|
||||
index 5f4f2b33..18f0a14e 100644
|
||||
index 38db2292..7cdcbd8b 100644
|
||||
--- a/config/pom.xml
|
||||
+++ b/config/pom.xml
|
||||
@@ -5,18 +5,18 @@
|
||||
@ -138,14 +138,14 @@ index 5f4f2b33..18f0a14e 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-config</artifactId>
|
||||
+ <artifactId>travertine-config</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-Config</name>
|
||||
@ -156,7 +156,7 @@ index 5f4f2b33..18f0a14e 100644
|
||||
<dependencies>
|
||||
<dependency>
|
||||
diff --git a/event/pom.xml b/event/pom.xml
|
||||
index f4f7fdb0..592bef24 100644
|
||||
index 82a411b0..b1a990c9 100644
|
||||
--- a/event/pom.xml
|
||||
+++ b/event/pom.xml
|
||||
@@ -5,16 +5,16 @@
|
||||
@ -165,14 +165,14 @@ index f4f7fdb0..592bef24 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-event</artifactId>
|
||||
+ <artifactId>travertine-event</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-Event</name>
|
||||
@ -181,7 +181,7 @@ index f4f7fdb0..592bef24 100644
|
||||
+ <description>Generic java event dispatching API intended for use with Travertine.</description>
|
||||
</project>
|
||||
diff --git a/log/pom.xml b/log/pom.xml
|
||||
index 93bd4bcc..3ef8acf2 100644
|
||||
index 646dbfae..00f7b9c9 100644
|
||||
--- a/log/pom.xml
|
||||
+++ b/log/pom.xml
|
||||
@@ -5,18 +5,18 @@
|
||||
@ -190,14 +190,14 @@ index 93bd4bcc..3ef8acf2 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-log</artifactId>
|
||||
+ <artifactId>travertine-log</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-Log</name>
|
||||
@ -217,7 +217,7 @@ index 93bd4bcc..3ef8acf2 100644
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
diff --git a/log4j/pom.xml b/log4j/pom.xml
|
||||
index 1cd12d6a..ca18158f 100644
|
||||
index 8baf329b..060a8ec7 100644
|
||||
--- a/log4j/pom.xml
|
||||
+++ b/log4j/pom.xml
|
||||
@@ -4,18 +4,18 @@
|
||||
@ -226,14 +226,14 @@ index 1cd12d6a..ca18158f 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-log4j</artifactId>
|
||||
+ <artifactId>travertine-log4j</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-Log</name>
|
||||
@ -269,7 +269,7 @@ index 1cd12d6a..ca18158f 100644
|
||||
</dependencies>
|
||||
</project>
|
||||
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
|
||||
index 8eea364f..83bc7a7d 100644
|
||||
index 472314c2..8eb06572 100644
|
||||
--- a/module/cmd-alert/pom.xml
|
||||
+++ b/module/cmd-alert/pom.xml
|
||||
@@ -5,13 +5,13 @@
|
||||
@ -278,18 +278,18 @@ index 8eea364f..83bc7a7d 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module</artifactId>
|
||||
+ <artifactId>travertine-module</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module-cmd-alert</artifactId>
|
||||
+ <artifactId>travertine-module-cmd-alert</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
|
||||
index 9a2eb779..42fb0a11 100644
|
||||
index de8faee0..09e2835a 100644
|
||||
--- a/module/cmd-find/pom.xml
|
||||
+++ b/module/cmd-find/pom.xml
|
||||
@@ -5,13 +5,13 @@
|
||||
@ -298,18 +298,18 @@ index 9a2eb779..42fb0a11 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module</artifactId>
|
||||
+ <artifactId>travertine-module</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module-cmd-find</artifactId>
|
||||
+ <artifactId>travertine-module-cmd-find</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
|
||||
index 57b0cdd8..cc2e55f9 100644
|
||||
index 0cab9a7a..5d1ff042 100644
|
||||
--- a/module/cmd-list/pom.xml
|
||||
+++ b/module/cmd-list/pom.xml
|
||||
@@ -5,13 +5,13 @@
|
||||
@ -318,18 +318,18 @@ index 57b0cdd8..cc2e55f9 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module</artifactId>
|
||||
+ <artifactId>travertine-module</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module-cmd-list</artifactId>
|
||||
+ <artifactId>travertine-module-cmd-list</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
|
||||
index 990c0a6d..af82bb2c 100644
|
||||
index 240c9548..1f6a7c68 100644
|
||||
--- a/module/cmd-send/pom.xml
|
||||
+++ b/module/cmd-send/pom.xml
|
||||
@@ -5,13 +5,13 @@
|
||||
@ -338,18 +338,18 @@ index 990c0a6d..af82bb2c 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module</artifactId>
|
||||
+ <artifactId>travertine-module</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module-cmd-send</artifactId>
|
||||
+ <artifactId>travertine-module-cmd-send</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
|
||||
index 1b4e0455..8d96679e 100644
|
||||
index 4c13d517..c353e829 100644
|
||||
--- a/module/cmd-server/pom.xml
|
||||
+++ b/module/cmd-server/pom.xml
|
||||
@@ -5,13 +5,13 @@
|
||||
@ -358,18 +358,18 @@ index 1b4e0455..8d96679e 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module</artifactId>
|
||||
+ <artifactId>travertine-module</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module-cmd-server</artifactId>
|
||||
+ <artifactId>travertine-module-cmd-server</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
diff --git a/module/pom.xml b/module/pom.xml
|
||||
index 0b9fc4aa..ca1f7487 100644
|
||||
index c9849b6c..ca0a9c87 100644
|
||||
--- a/module/pom.xml
|
||||
+++ b/module/pom.xml
|
||||
@@ -5,18 +5,18 @@
|
||||
@ -378,14 +378,14 @@ index 0b9fc4aa..ca1f7487 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module</artifactId>
|
||||
+ <artifactId>travertine-module</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
- <name>Waterfall Modules</name>
|
||||
@ -405,7 +405,7 @@ index 0b9fc4aa..ca1f7487 100644
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
|
||||
index 0d3a3b70..e6ee3cd8 100644
|
||||
index 45910b0e..d1a2d86c 100644
|
||||
--- a/module/reconnect-yaml/pom.xml
|
||||
+++ b/module/reconnect-yaml/pom.xml
|
||||
@@ -5,13 +5,13 @@
|
||||
@ -414,18 +414,18 @@ index 0d3a3b70..e6ee3cd8 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module</artifactId>
|
||||
+ <artifactId>travertine-module</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-module-reconnect-yaml</artifactId>
|
||||
+ <artifactId>travertine-module-reconnect-yaml</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
diff --git a/native/pom.xml b/native/pom.xml
|
||||
index ec465dd3..28d1a02c 100644
|
||||
index db15febb..a2efb5e5 100644
|
||||
--- a/native/pom.xml
|
||||
+++ b/native/pom.xml
|
||||
@@ -5,18 +5,18 @@
|
||||
@ -434,14 +434,14 @@ index ec465dd3..28d1a02c 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-native</artifactId>
|
||||
+ <artifactId>travertine-native</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-Native</name>
|
||||
@ -452,7 +452,7 @@ index ec465dd3..28d1a02c 100644
|
||||
<dependencies>
|
||||
<dependency>
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 3ddd74d4..61920717 100644
|
||||
index fa4dd98d..7757ce6f 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -5,19 +5,19 @@
|
||||
@ -468,7 +468,7 @@ index 3ddd74d4..61920717 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
- <name>Waterfall-Parent</name>
|
||||
@ -480,7 +480,7 @@ index 3ddd74d4..61920717 100644
|
||||
<inceptionYear>2015</inceptionYear>
|
||||
<organization>
|
||||
<name>WaterfallMC</name>
|
||||
@@ -65,17 +65,17 @@
|
||||
@@ -65,13 +65,13 @@
|
||||
</modules>
|
||||
|
||||
<scm>
|
||||
@ -496,15 +496,10 @@ index 3ddd74d4..61920717 100644
|
||||
- <url>https://github.com/PaperMC/Waterfall/issues</url>
|
||||
+ <url>https://github.com/PaperMC/Travertine/issues</url>
|
||||
</issueManagement>
|
||||
<ciManagement>
|
||||
<system>jenkins</system>
|
||||
- <url>https://papermc.io/ci/job/Waterfall/</url>
|
||||
+ <url>https://papermc.io/ci/job/Travertine/</url>
|
||||
</ciManagement>
|
||||
|
||||
<distributionManagement>
|
||||
diff --git a/protocol/pom.xml b/protocol/pom.xml
|
||||
index 8571f378..ba3ffe3d 100644
|
||||
index 402266ca..993cbca9 100644
|
||||
--- a/protocol/pom.xml
|
||||
+++ b/protocol/pom.xml
|
||||
@@ -5,18 +5,18 @@
|
||||
@ -513,14 +508,14 @@ index 8571f378..ba3ffe3d 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-protocol</artifactId>
|
||||
+ <artifactId>travertine-protocol</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-Protocol</name>
|
||||
@ -540,7 +535,7 @@ index 8571f378..ba3ffe3d 100644
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
diff --git a/proxy/pom.xml b/proxy/pom.xml
|
||||
index f0c36550..4bda0d62 100644
|
||||
index 7a872a54..330697bc 100644
|
||||
--- a/proxy/pom.xml
|
||||
+++ b/proxy/pom.xml
|
||||
@@ -5,17 +5,17 @@
|
||||
@ -549,14 +544,14 @@ index f0c36550..4bda0d62 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-proxy</artifactId>
|
||||
+ <artifactId>travertine-proxy</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-Proxy</name>
|
||||
@ -602,20 +597,20 @@ index f0c36550..4bda0d62 100644
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
|
||||
index 9b20d0df..2637b9e2 100644
|
||||
index 338c30d3..c0499252 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
|
||||
@@ -18,7 +18,7 @@ public class JenkinsModuleSource implements ModuleSource
|
||||
System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
|
||||
try
|
||||
@@ -20,7 +20,7 @@ public class JenkinsModuleSource implements ModuleSource
|
||||
{
|
||||
- URL website = new URL( "https://papermc.io/ci/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
|
||||
+ URL website = new URL( "https://papermc.io/ci/job/Travertine/" + version.getBuild() + "/artifact/Travertine-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
|
||||
URLConnection con = website.openConnection();
|
||||
// 15 second timeout at various stages
|
||||
con.setConnectTimeout( 15000 );
|
||||
final String url = String.format(
|
||||
"https://papermc.io/api/v2/projects/%1$s/versions/%2$s/builds/%3$s/downloads/%4$s-%2$s-%3$s.jar",
|
||||
- "waterfall",
|
||||
+ "travertine", // Travertine
|
||||
net.md_5.bungee.api.ProxyServer.getInstance().getVersion().split(":")[2].split("-")[0],
|
||||
version.getBuild(),
|
||||
module.getName()
|
||||
diff --git a/query/pom.xml b/query/pom.xml
|
||||
index 1c845a6d..0f2ea00b 100644
|
||||
index 8ce88f4a..813696e4 100644
|
||||
--- a/query/pom.xml
|
||||
+++ b/query/pom.xml
|
||||
@@ -5,18 +5,18 @@
|
||||
@ -624,14 +619,14 @@ index 1c845a6d..0f2ea00b 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-parent</artifactId>
|
||||
+ <artifactId>travertine-parent</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
- <artifactId>waterfall-query</artifactId>
|
||||
+ <artifactId>travertine-query</artifactId>
|
||||
<version>1.16-R0.4-SNAPSHOT</version>
|
||||
<version>1.16-R0.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
- <name>Waterfall-Query</name>
|
||||
@ -651,5 +646,5 @@ index 1c845a6d..0f2ea00b 100644
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
--
|
||||
2.27.0.windows.1
|
||||
2.30.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 233bdfc84602018866f1734a59acd7283cff9637 Mon Sep 17 00:00:00 2001
|
||||
From 137ac0179db533a6f030c034a467af2f129848ea Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@techcable.net>
|
||||
Date: Mon, 6 Jun 2016 13:47:46 -0600
|
||||
Subject: [PATCH] Rename references from Waterfall to Travertine
|
||||
@ -53,18 +53,9 @@ index 2938f2f1..f7f1e7cc 100644
|
||||
|
||||
@Override
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
|
||||
index dc2c584d..ad9a6d0c 100644
|
||||
index e830198d..cc05b1fc 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
|
||||
@@ -49,7 +49,7 @@ public class BungeeCordLauncher
|
||||
if ( buildDate.before( deadline.getTime() ) )
|
||||
{
|
||||
System.err.println( "*** Hey! This build is potentially outdated :( ***" );
|
||||
- System.err.println( "*** Please check for a new build from https://papermc.io/ci/job/Waterfall/ ***" );
|
||||
+ System.err.println( "*** Please check for a new build from https://papermc.io/ci/job/Travertine/ ***" );
|
||||
System.err.println( "*** Should this build be outdated, you will get NO support for it. ***" );
|
||||
System.err.println( "*** Server will start in 10 seconds ***" );
|
||||
Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
|
||||
@@ -58,7 +58,7 @@ public class BungeeCordLauncher
|
||||
|
||||
BungeeCord bungee = new BungeeCord();
|
||||
@ -114,5 +105,5 @@ index 65121ba2..d4fad294 100644
|
||||
SocketAddress address = Util.getAddr( addr );
|
||||
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
|
||||
--
|
||||
2.27.0.windows.1
|
||||
2.29.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From b6b69ea63842698a6908a856501862117321908f Mon Sep 17 00:00:00 2001
|
||||
From 645dd7b625e6cda74114262e66edec565f7fda58 Mon Sep 17 00:00:00 2001
|
||||
From: Troy Frew <fuzzy_bot@arenaga.me>
|
||||
Date: Tue, 15 Nov 2016 10:31:04 -0500
|
||||
Subject: [PATCH] 1.7.x Protocol Patch
|
||||
@ -101,10 +101,10 @@ index 00000000..90064112
|
||||
+ }
|
||||
+}
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
|
||||
index f6e4859f..6ba7ae70 100644
|
||||
index 31a95495..93d17f6b 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
|
||||
@@ -267,6 +267,11 @@ public abstract class DefinedPacket
|
||||
@@ -266,6 +266,11 @@ public abstract class DefinedPacket
|
||||
read( buf );
|
||||
}
|
||||
|
||||
@ -116,7 +116,7 @@ index f6e4859f..6ba7ae70 100644
|
||||
public void write(ByteBuf buf)
|
||||
{
|
||||
throw new UnsupportedOperationException( "Packet must implement write method" );
|
||||
@@ -277,6 +282,11 @@ public abstract class DefinedPacket
|
||||
@@ -276,6 +281,11 @@ public abstract class DefinedPacket
|
||||
write( buf );
|
||||
}
|
||||
|
||||
@ -129,26 +129,13 @@ index f6e4859f..6ba7ae70 100644
|
||||
|
||||
@Override
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
|
||||
index 1a647f2b..ec932e92 100644
|
||||
index ac9f114d..2caadfed 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
|
||||
@@ -5,10 +5,11 @@ import io.netty.buffer.ByteBufUtil;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.handler.codec.DecoderException;
|
||||
import io.netty.handler.codec.MessageToMessageDecoder;
|
||||
-import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
+import java.util.List;
|
||||
+
|
||||
@AllArgsConstructor
|
||||
public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
|
||||
{
|
||||
@@ -56,7 +57,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
|
||||
if ( packet != null )
|
||||
@@ -57,7 +57,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
|
||||
{
|
||||
packetTypeInfo = packet.getClass();
|
||||
doLengthSanityChecks(in, packet, prot.getDirection(), packetId); // Waterfall: Additional DoS mitigations
|
||||
- packet.read( in, prot.getDirection(), protocolVersion );
|
||||
+ packet.read0( in, prot.getDirection(), protocolVersion );
|
||||
|
||||
@ -462,7 +449,7 @@ index d372933d..1feee418 100644
|
||||
|
||||
java.util.function.Supplier<? extends DefinedPacket> constructor = protocolData.packetConstructors[id]; // Waterfall - speed up packet construction
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
|
||||
index 30b4d059..e0400383 100644
|
||||
index 2202c4d3..6600185b 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
|
||||
@@ -6,6 +6,8 @@ import java.util.List;
|
||||
@ -476,7 +463,7 @@ index 30b4d059..e0400383 100644
|
||||
public static final int MINECRAFT_1_9_1 = 108;
|
||||
@@ -34,6 +36,7 @@ public class ProtocolConstants
|
||||
public static final int MINECRAFT_1_16_3 = 753;
|
||||
public static final int MINECRAFT_1_16_4 = 754; // Waterfall
|
||||
public static final int MINECRAFT_1_16_4 = 754;
|
||||
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
|
||||
+ "1.7.x",
|
||||
"1.8.x",
|
||||
@ -695,7 +682,7 @@ index a29524ca..8d9f4ccb 100644
|
||||
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
|
||||
{
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
|
||||
index 388f6cdb..7f124322 100644
|
||||
index 53575ce0..1a41da75 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1571,24 +1558,19 @@ index 9e180c30..d54d8539 100644
|
||||
con.unsafe().sendPacket( pluginMessage );
|
||||
throw CancelSendSignal.INSTANCE;
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index 7e6027aa..fe6ff143 100644
|
||||
index b7ecd828..3b82219d 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -12,6 +12,13 @@ import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.logging.Level;
|
||||
import javax.crypto.SecretKey;
|
||||
+
|
||||
+import com.google.common.base.Charsets;
|
||||
+import com.google.common.base.Preconditions;
|
||||
+import com.google.gson.Gson;
|
||||
+
|
||||
@@ -3,6 +3,8 @@ package net.md_5.bungee.connection;
|
||||
import com.google.common.base.Charsets;
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.google.gson.Gson;
|
||||
+import com.google.gson.JsonElement;
|
||||
+import com.google.gson.JsonObject;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import net.md_5.bungee.BungeeCord;
|
||||
@@ -255,12 +262,28 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
import java.math.BigInteger;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.SocketAddress;
|
||||
@@ -257,12 +259,28 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
@Override
|
||||
public void done(ProxyPingEvent pingResult, Throwable error)
|
||||
{
|
||||
@ -1659,7 +1641,7 @@ index 4d7b1b23..ad3bdee5 100644
|
||||
con.getServer().disconnect( "Quitting" );
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
|
||||
index 84c20c68..fa8fbf9d 100644
|
||||
index db93d883..a3a12e19 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
|
||||
@@ -35,6 +35,10 @@ public abstract class EntityMap
|
||||
@ -2028,5 +2010,5 @@ index daf12f74..e33861ab 100644
|
||||
|
||||
@Override
|
||||
--
|
||||
2.27.0.windows.1
|
||||
2.30.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user