Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-10-01 16:07:38 +02:00
Code Issues Projects Releases Wiki Activity

Update Waterfall

Browse Source
This commit is contained in:
Shane Freeder 2018-12-21 15:48:19 +00:00
parent f7ad8b173a
commit abf38c696e
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
4 changed files with 62 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit bea8aacdbe935c2c28e881ab82bfb52c3cb07598
Subproject commit 61b6cadebb232df0082e2d76bfaeac6303473782

26
Waterfall-Proxy-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 6754ff868200176601a4d21ccf6a252e6a53c421 Mon Sep 17 00:00:00 2001
From 7c3eeb8ba477719096c376953dbd4d13d5c4293e 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
@ -58,7 +58,7 @@ index 0e46cbbe..6058e11c 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index e7bc7a5d..21990c32 100644
index 6cacf112..82ea6916 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -5,18 +5,18 @@
@ -84,7 +84,7 @@ index e7bc7a5d..21990c32 100644
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
@@ -28,7 +28,7 @@
@@ -28,14 +28,14 @@
<dependencies>
<dependency>
<groupId>io.github.waterfallmc</groupId>
@ -93,7 +93,6 @@ index e7bc7a5d..21990c32 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -41,7 +41,7 @@
</dependencies>
<build>
@ -130,7 +129,7 @@ index c9328ac3..04daec40 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index febc4af0..52fbf681 100644
index 1bc01b9a..793719e4 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -5,18 +5,18 @@
@ -218,7 +217,7 @@ index e24b3e40..95dd1a83 100644
<scope>compile</scope>
</dependency>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index a085a39c..87ee1371 100644
index 33f1b659..7a20d5ca 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -4,17 +4,17 @@
@ -451,7 +450,7 @@ index 7073b404..15fa568a 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 565e70a4..4f762ccf 100644
index 5c9fefbe..a89ea60b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,19 +5,19 @@
@ -503,10 +502,10 @@ index 565e70a4..4f762ccf 100644
<distributionManagement>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 333ae1e8..88ddcfb9 100644
index ee513895..f53ace34 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -5,23 +5,23 @@
@@ -5,18 +5,18 @@
<parent>
<groupId>io.github.waterfallmc</groupId>
@ -527,7 +526,10 @@ index 333ae1e8..88ddcfb9 100644
+ <name>Travertine-Protocol</name>
+ <description>Minimal implementation of the Minecraft protocol for use in Travertine</description>
<dependencies>
<!-- We really shouldn't depend on external repositories, but at least this is the Central staging one -->
<repositories>
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-chat</artifactId>
@ -536,7 +538,7 @@ index 333ae1e8..88ddcfb9 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index df84d6f1..f25ee27e 100644
index f0497f59..d83cf34f 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -5,17 +5,17 @@
@ -664,5 +666,5 @@ index 4ae682ee..c8f62a78 100644
<scope>compile</scope>
</dependency>
--
2.19.1
2.20.1

65
Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
View File

@ -1,4 +1,4 @@
From 04729d2b5c8d03b8b6844ad3ea61f69b06e2bd21 Mon Sep 17 00:00:00 2001
From 4c0346ac7c6d393270a7c6484fd8e92c1ac93fb9 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
@ -17,28 +17,6 @@ index a4516ed9..1f63a2c2 100644
System.out.println( "You can check your Java version with the command: java -version" );
return;
}
diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index f5270655..87ed8b88 100644
--- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -43,7 +43,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://ci.destroystokyo.com/job/Waterfall/ ***" );
+ System.err.println( "*** Please check for a new build from https://ci.destroystokyo.com/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 ) );
@@ -52,7 +52,7 @@ public class BungeeCordLauncher
BungeeCord bungee = new BungeeCord();
ProxyServer.setInstance( bungee );
- bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
+ bungee.getLogger().info( "Enabled Travertine version " + bungee.getVersion() );
bungee.start();
if ( !options.has( "noconsole" ) )
diff --git a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
index d703d6d2..d8dcdc1e 100644
--- a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
@ -52,19 +30,6 @@ index d703d6d2..d8dcdc1e 100644
this.logger = logger;
}
diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java
index f036efcd..c93c313a 100644
--- a/proxy/src/main/java/Test.java
+++ b/proxy/src/main/java/Test.java
@@ -19,7 +19,7 @@ public class Test
{
BungeeCord bungee = new BungeeCord();
ProxyServer.setInstance( bungee );
- bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
+ bungee.getLogger().info( "Enabled Travertine version " + bungee.getVersion() );
bungee.start();
// Waterfall start - Use TerminalConsoleAppender
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index c1c04995..670bcede 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@ -87,6 +52,28 @@ index c1c04995..670bcede 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 eeacd0c8..cd69896a 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -43,7 +43,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://ci.destroystokyo.com/job/Waterfall/ ***" );
+ System.err.println( "*** Please check for a new build from https://ci.destroystokyo.com/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 ) );
@@ -52,7 +52,7 @@ public class BungeeCordLauncher
BungeeCord bungee = new BungeeCord();
ProxyServer.setInstance( bungee );
- bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
+ bungee.getLogger().info( "Enabled Travertine version " + bungee.getVersion() );
bungee.start();
if ( !options.has( "noconsole" ) )
diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
index b26035cf..4e2c6129 100644
--- a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
@ -114,10 +101,10 @@ index f5c028dd..c50a05f7 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
index 5237182a..631eabcf 100644
index 44011a96..8cceac2d 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
@@ -219,7 +219,7 @@ public class YamlConfig implements ConfigurationAdapter
@@ -224,7 +224,7 @@ public class YamlConfig implements ConfigurationAdapter
Map<String, Object> val = entry.getValue();
String name = entry.getKey();
String addr = get( "address", "localhost:25565", val );
@ -127,5 +114,5 @@ index 5237182a..631eabcf 100644
InetSocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.19.1
2.20.1

42
Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From 002b21b81de8b335a223d48e1024b7bd398253c3 Mon Sep 17 00:00:00 2001
From c5e6f09649764e1e97d9e7539df69a70e69af4c2 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 10e16d79..04a34033 100644
index 28a3efde..6e811930 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
@@ -193,6 +193,11 @@ public abstract class DefinedPacket
@@ -206,6 +206,11 @@ public abstract class DefinedPacket
read( buf );
}
@ -116,7 +116,7 @@ index 10e16d79..04a34033 100644
public void write(ByteBuf buf)
{
throw new UnsupportedOperationException( "Packet must implement write method" );
@@ -203,6 +208,11 @@ public abstract class DefinedPacket
@@ -216,6 +221,11 @@ public abstract class DefinedPacket
write( buf );
}
@ -167,10 +167,10 @@ index d4b03843..9aac7ca9 100644
}
}
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 cc863d9b..bfa24ffa 100644
index 39affec6..d194f221 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
@@ -378,6 +378,8 @@ public enum Protocol
@@ -394,6 +394,8 @@ public enum Protocol
private final TIntObjectMap<List<Integer>> linkedProtocols = new TIntObjectHashMap<>();
{
linkedProtocols.put( ProtocolConstants.MINECRAFT_1_8, Arrays.asList(
@ -179,7 +179,7 @@ index cc863d9b..bfa24ffa 100644
ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_12,
ProtocolConstants.MINECRAFT_1_13
@@ -435,7 +437,11 @@ public enum Protocol
@@ -451,7 +453,11 @@ public enum Protocol
}
if ( !hasPacket(id, supportsForge) )
{
@ -1090,7 +1090,7 @@ index 491cf1a1..299a216c 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 1d75cd0d..5f086f4f 100644
index c7f081d4..41e26b9d 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf;
@ -1101,7 +1101,7 @@ index 1d75cd0d..5f086f4f 100644
import java.util.Queue;
import java.util.Set;
import java.util.UUID;
@@ -245,10 +246,20 @@ public class ServerConnector extends PacketHandler
@@ -247,10 +248,20 @@ public class ServerConnector extends PacketHandler
user.unsafe().sendPacket( modLogin );
@ -1126,7 +1126,7 @@ index 1d75cd0d..5f086f4f 100644
user.setDimension( login.getDimension() );
} else
@@ -259,7 +270,7 @@ public class ServerConnector extends PacketHandler
@@ -261,7 +272,7 @@ public class ServerConnector extends PacketHandler
Scoreboard serverScoreboard = user.getServerSentScoreboard();
for ( Objective objective : serverScoreboard.getObjectives() )
{
@ -1135,7 +1135,7 @@ index 1d75cd0d..5f086f4f 100644
}
for ( Score score : serverScoreboard.getScores() )
{
@@ -392,6 +403,14 @@ public class ServerConnector extends PacketHandler
@@ -397,6 +408,14 @@ public class ServerConnector extends PacketHandler
{
this.handshakeHandler.handle( pluginMessage );
@ -1213,10 +1213,10 @@ index 9c872a1c..32830770 100644
{
this.compressionThreshold = compressionThreshold;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 76dc13aa..242efd91 100644
index 56c81262..9d07568d 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -144,7 +144,7 @@ public class DownstreamBridge extends PacketHandler
@@ -153,7 +153,7 @@ public class DownstreamBridge extends PacketHandler
switch ( objective.getAction() )
{
case 0:
@ -1225,7 +1225,7 @@ index 76dc13aa..242efd91 100644
break;
case 1:
serverScoreboard.removeObjective( objective.getName() );
@@ -154,7 +154,7 @@ public class DownstreamBridge extends PacketHandler
@@ -163,7 +163,7 @@ public class DownstreamBridge extends PacketHandler
if ( oldObjective != null )
{
oldObjective.setValue( objective.getValue() );
@ -1234,7 +1234,7 @@ index 76dc13aa..242efd91 100644
}
break;
default:
@@ -251,16 +251,28 @@ public class DownstreamBridge extends PacketHandler
@@ -260,16 +260,28 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand" ) )
{
@ -1274,7 +1274,7 @@ index 76dc13aa..242efd91 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 5919d54a..0f7b1667 100644
index e84c8aa4..b5e397e0 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.UUID;
@ -1336,7 +1336,7 @@ index 5919d54a..0f7b1667 100644
ch.getHandle().pipeline().get( HandlerBoss.class ).setHandler( new UpstreamBridge( bungee, userCon ) );
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
index 76f496ce..eab2523d 100644
index 6bc14d67..2b3bc361 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
@@ -15,6 +15,7 @@ import net.md_5.bungee.protocol.MinecraftDecoder;
@ -1347,7 +1347,7 @@ index 76f496ce..eab2523d 100644
import net.md_5.bungee.protocol.packet.Handshake;
import net.md_5.bungee.protocol.packet.StatusRequest;
import net.md_5.bungee.protocol.packet.StatusResponse;
@@ -63,7 +64,7 @@ public class PingHandler extends PacketHandler
@@ -64,7 +65,7 @@ public class PingHandler extends PacketHandler
@SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR")
public void handle(StatusResponse statusResponse) throws Exception
{
@ -1357,10 +1357,10 @@ index 76f496ce..eab2523d 100644
channel.close();
}
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 e1be7cce..7a20078b 100644
index 9287d168..7348f817 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
@@ -79,7 +79,12 @@ public class UpstreamBridge extends PacketHandler
@@ -83,7 +83,12 @@ public class UpstreamBridge extends PacketHandler
} );
for ( ProxiedPlayer player : con.getServer().getInfo().getPlayers() )
{
@ -1965,5 +1965,5 @@ index daf12f74..e33861ab 100644
@Override
--
2.19.1
2.20.1