add super pom

2024-12-24 01:27:39 +01:00 · 2016-12-09 20:55:05 -05:00 · 2016-12-09 20:55:05 -05:00 · 94bb00787a
commit 94bb00787a
parent ccaf0f0d9b
5 changed files with 62 additions and 30 deletions
--- a/Waterfall-Proxy-Patches/0001-POM-Changes.patch
+++ b/Waterfall-Proxy-Patches/0001-POM-Changes.patch
@ -1,4 +1,4 @@
-From 0e4409169712d77a930e548f4ae21b9206422eff Mon Sep 17 00:00:00 2001
+From 5a8caa35c270d39bab6cddba4a7bffa3255f628f 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
@ -408,10 +408,17 @@ index 18861da..ed1e917 100644
     <dependencies>
         <dependency>
 diff --git a/pom.xml b/pom.xml
-index 10ddfab..87cb499 100644
+index 569c424..953e8a4 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -10,17 +10,17 @@
+@@ -5,23 +5,23 @@
+ 
+     <parent>
+         <groupId>io.github.waterfallmc</groupId>
+-        <artifactId>waterfall-super</artifactId>
+        <artifactId>travertine-super</artifactId>
+         <version>dev-SNAPSHOT</version>
+         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
@ -435,7 +442,7 @@ index 10ddfab..87cb499 100644
     </organization>
     <licenses>
         <license>
-@@ -63,17 +63,17 @@
+@@ -64,17 +64,17 @@
     </modules>
 
     <scm>
--- a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
+++ b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
@ -1,4 +1,4 @@
-From 96883951819674b115671a282d1f1a3550a7b85a Mon Sep 17 00:00:00 2001
+From 2e94ba6e7c9113ea09c401939135d9c6fbd75256 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
@ -66,10 +66,10 @@ index 446dfe2..f068a38 100644
 
         while ( bungee.isRunning )
 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 910bb02..8ff6e3c 100644
+index 4a33b9d..014ea5f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -179,7 +179,7 @@ public class BungeeCord extends ProxyServer
+@@ -178,7 +178,7 @@ public class BungeeCord extends ProxyServer
     public BungeeCord() throws IOException
     {
         // Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
@ -78,7 +78,7 @@ index 910bb02..8ff6e3c 100644
 
         try
         {
-@@ -470,7 +470,7 @@ public class BungeeCord extends ProxyServer
+@@ -469,7 +469,7 @@ public class BungeeCord extends ProxyServer
     @Override
     public String getName()
     {
--- a/Waterfall-Proxy-Patches/0003-Metrics.patch
+++ b/Waterfall-Proxy-Patches/0003-Metrics.patch
@ -1,14 +1,14 @@
-From ff461b8c47aadc617c4c7f322e44db80473906db Mon Sep 17 00:00:00 2001
+From 3597a1aa6a5228dbe8ce426e082c87b43214d79b Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 6 Jun 2016 13:49:46 -0600
 Subject: [PATCH] Metrics


-diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java
-index ae5a2a9..4b70e8c 100644
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java
-+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/Metrics.java
-@@ -73,7 +73,7 @@ public class Metrics extends TimerTask
+diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java
+index e482e98..86d7a5a 100644
+--- a/proxy/src/main/java/net/md_5/bungee/Metrics.java
+++ b/proxy/src/main/java/net/md_5/bungee/Metrics.java
+@@ -72,7 +72,7 @@ public class Metrics extends TimerTask
         }
 
         // Create the url
@ -18,5 +18,5 @@ index ae5a2a9..4b70e8c 100644
         // Connect to the website
         URLConnection connection;
 -- 
-2.8.3
+2.7.4 (Apple Git-66)

--- a/Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch
+++ b/Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch
@ -1,4 +1,4 @@
-From 79ff4204a4d9f17ef850b60b00ef03a729ecfd67 Mon Sep 17 00:00:00 2001
+From 8fdb71b40367d2cc2d40672ba113cd2b1300753d 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
@ -991,10 +991,10 @@ index b470579..da1066c 100644
     public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
 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 8ff6e3c..ad7e85f 100644
+index 014ea5f..d4d0212 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -154,6 +154,14 @@ public class BungeeCord extends ProxyServer
+@@ -153,6 +153,14 @@ public class BungeeCord extends ProxyServer
             .registerTypeAdapter( TranslatableComponent.class, new TranslatableComponentSerializer() )
             .registerTypeAdapter( ServerPing.PlayerInfo.class, new PlayerInfoSerializer() )
             .registerTypeAdapter( Favicon.class, Favicon.getFaviconTypeAdapter() ).create();
@ -1146,7 +1146,7 @@ index 5d72a56..adcb211 100644
             throw CancelSendSignal.INSTANCE;
         } else
 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 3f1b133..cf0d274 100644
+index 9cc7f3f..dfff280 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -210,6 +210,7 @@ public final class UserConnection implements ProxiedPlayer
@ -1157,25 +1157,25 @@ index 3f1b133..cf0d274 100644
         displayName = name;
     }
 
-@@ -441,7 +442,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -446,7 +447,7 @@ public final class UserConnection implements ProxiedPlayer
     public void sendMessage(ChatMessageType position, BaseComponent... message)
     {
         // Action bar on 1.8 doesn't display the new JSON formattings, legacy works - send it using this for now
 -        if ( position == ChatMessageType.ACTION_BAR && getPendingConnection().getVersion() <= ProtocolConstants.MINECRAFT_1_8 )
 +        if ( position == ChatMessageType.ACTION_BAR && getPendingConnection().getVersion() == ProtocolConstants.MINECRAFT_1_8 ) // Travertine
         {
-             sendMessage( position, ComponentSerializer.toString( new TextComponent( TextComponent.toLegacyText( message ) ) ) );
+             sendMessage( position, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) );
         } else
-@@ -454,7 +455,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -459,7 +460,7 @@ public final class UserConnection implements ProxiedPlayer
     public void sendMessage(ChatMessageType position, BaseComponent message)
     {
         // Action bar on 1.8 doesn't display the new JSON formattings, legacy works - send it using this for now
 -        if ( position == ChatMessageType.ACTION_BAR && getPendingConnection().getVersion() <= ProtocolConstants.MINECRAFT_1_8 )
 +        if ( position == ChatMessageType.ACTION_BAR && getPendingConnection().getVersion() == ProtocolConstants.MINECRAFT_1_8 ) // Travertine
         {
-             sendMessage( position, ComponentSerializer.toString( new TextComponent( TextComponent.toLegacyText( message ) ) ) );
+             sendMessage( position, ComponentSerializer.toString( new TextComponent( BaseComponent.toLegacyText( message ) ) ) );
         } else
-@@ -591,6 +592,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -596,6 +597,7 @@ public final class UserConnection implements ProxiedPlayer
     @Override
     public void setTabHeader(BaseComponent header, BaseComponent footer)
     {
@ -1183,7 +1183,7 @@ index 3f1b133..cf0d274 100644
         unsafe().sendPacket( new PlayerListHeaderFooter(
                 ( header != null ) ? ComponentSerializer.toString( header ) : EMPTY_TEXT,
                 ( footer != null ) ? ComponentSerializer.toString( footer ) : EMPTY_TEXT
-@@ -600,6 +602,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -605,6 +607,7 @@ public final class UserConnection implements ProxiedPlayer
     @Override
     public void setTabHeader(BaseComponent[] header, BaseComponent[] footer)
     {
@ -1191,7 +1191,7 @@ index 3f1b133..cf0d274 100644
         unsafe().sendPacket( new PlayerListHeaderFooter(
                 ( header != null ) ? ComponentSerializer.toString( header ) : EMPTY_TEXT,
                 ( footer != null ) ? ComponentSerializer.toString( footer ) : EMPTY_TEXT
-@@ -626,6 +629,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -631,6 +634,7 @@ public final class UserConnection implements ProxiedPlayer
 
     public void setCompressionThreshold(int compressionThreshold)
     {
@ -1200,7 +1200,7 @@ index 3f1b133..cf0d274 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 cb0f08c..d0b8b43 100644
+index 30ee7d1..5ac00ae 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
@@ -30,6 +30,7 @@ import net.md_5.bungee.netty.ChannelWrapper;
@ -1211,7 +1211,7 @@ index cb0f08c..d0b8b43 100644
 import net.md_5.bungee.protocol.packet.BossBar;
 import net.md_5.bungee.protocol.packet.EntityEffect;
 import net.md_5.bungee.protocol.packet.EntityRemoveEffect;
-@@ -249,16 +250,28 @@ public class DownstreamBridge extends PacketHandler
+@@ -248,16 +249,28 @@ public class DownstreamBridge extends PacketHandler
 
         if ( pluginMessage.getTag().equals( "MC|Brand" ) )
         {
@ -1251,7 +1251,7 @@ index cb0f08c..d0b8b43 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 61158d5..a83b6b2 100644
+index 88bc825..718668e 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,9 @@ import java.util.UUID;
@ -1759,5 +1759,5 @@ index daf12f7..e33861a 100644
 
     @Override
 -- 
-2.10.2.windows.1
+2.7.4 (Apple Git-66)

--- a/pom.xml
+++ b/pom.xml
@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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>io.github.waterfallmc</groupId>
+    <artifactId>travertine-super</artifactId>
+    <version>dev-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>Travertine-Super</name>
+    <description>Super project for Travertine.</description>
+    <url>https://github.com/WaterfallMC/Travertine</url>
+
+    <modules>
+        <module>Travertine-Proxy</module>
+    </modules>
+
+    <build>
+        <defaultGoal>clean install</defaultGoal>
+    </build>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+</project>