Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-11 11:34:18 +01:00
Code Issues Projects Releases Wiki Activity
6fbf437890
Waterfall/BungeeCord-Patches/0001-POM-Changes.patch

862 lines
32 KiB
Diff
Raw Normal View History

Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
From d002f1654018a69fdee68237fff9aa1442363bc2 Mon Sep 17 00:00:00 2001
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
From: Tux <write@imaginarycode.com>
Merge upstream - Minecraft 1.13-pre7 support
2018-07-15 12:58:44 +02:00
Date: Thu, 19 May 2016 19:33:31 +0200
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
Subject: [PATCH] POM Changes
Deploy to destroystokyo mvn repo Thanks @Z750 :D
2017-10-09 21:20:14 +02:00
- Require Java 8
Update maven POM information Issue tracker, CI, maven repository deployment
2018-09-30 04:15:31 +02:00
- Deploy to papermc mvn repo
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
diff --git a/api/pom.xml b/api/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index 30739518..bdccbd78 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
- <version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
+ <version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
+ <name>Waterfall-API</name>
<description>API implemented by the Elastic Portal Suite</description>
<dependencies>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index b10e7a38..07d49112 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
Updated Upstream (BungeeCord) 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: a52ea500 #2769: Guardian target beam lost on server change 17d5dd3f Add dist Maven profile to generate source and Javadoc jars 9e8ab747 Add JsonConfiguration support to bungeecord-config cdacc0b1 #2498: Add ServerConnectRequest accessor in ServerConnectEvent. b4b998b2 #2761: Add ClientConnectEvent
2020-02-10 23:39:19 +01:00
@@ -4,39 +4,40 @@
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
- <description>Java 1.6 loader for BungeeCord</description>
+ <name>Waterfall-Bootstrap</name>
+ <description>Java 1.6 loader for Waterfall</description>
<properties>
Merge upstream + Fix build
2017-06-21 23:19:45 +02:00
<maven.deploy.skip>true</maven.deploy.skip>
Updated Upstream (BungeeCord) 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: a52ea500 #2769: Guardian target beam lost on server change 17d5dd3f Add dist Maven profile to generate source and Javadoc jars 9e8ab747 Add JsonConfiguration support to bungeecord-config cdacc0b1 #2498: Add ServerConnectRequest accessor in ServerConnectEvent. b4b998b2 #2761: Add ClientConnectEvent
2020-02-10 23:39:19 +01:00
<maven.javadoc.skip>true</maven.javadoc.skip>
Ditch 1.6 bootstrap
2020-01-24 23:46:50 +01:00
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <!-- use java 1.8, literally nobody is using 1.6-7 anymore, and, if they are, that's their own stupidity. -->
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
</properties>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<dependencies>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
- <finalName>BungeeCord</finalName>
+ <finalName>Waterfall</finalName>
<plugins>
<plugin>
Merge upstream + Fix build
2017-06-21 23:19:45 +02:00
<groupId>org.apache.maven.plugins</groupId>
Updated Upstream (BungeeCord) 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: a52ea500 #2769: Guardian target beam lost on server change 17d5dd3f Add dist Maven profile to generate source and Javadoc jars 9e8ab747 Add JsonConfiguration support to bungeecord-config cdacc0b1 #2498: Add ServerConnectRequest accessor in ServerConnectEvent. b4b998b2 #2761: Add ClientConnectEvent
2020-02-10 23:39:19 +01:00
@@ -45,7 +46,7 @@
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<configuration>
<archive>
<manifestEntries>
- <Main-Class>net.md_5.bungee.Bootstrap</Main-Class>
+ <Main-Class>net.md_5.bungee.Bootstrap</Main-Class>
<Implementation-Version>${describe}</Implementation-Version>
<Specification-Version>${maven.build.timestamp}</Specification-Version>
</manifestEntries>
diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
Update Bungeecord
2018-12-21 16:24:26 +01:00
index 6be22739..a4516ed9 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
+++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
Update Bungeecord
2018-12-21 16:24:26 +01:00
@@ -7,7 +7,7 @@ public class Bootstrap
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
{
Update Bungeecord
2018-12-21 16:24:26 +01:00
if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 )
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
{
Update Bungeecord
2018-12-21 16:24:26 +01:00
- System.err.println( "*** ERROR *** BungeeCord requires Java 8 or above to function! Please download and install it!" );
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
+ System.err.println( "*** ERROR *** Waterfall requires Java 8 or above to function! Please download and install it!" );
System.out.println( "You can check your Java version with the command: java -version" );
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index 87c2beb1..2aa2ad55 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/chat/pom.xml
+++ b/chat/pom.xml
remove unneeded change in waterfall-chat
2023-06-07 23:10:42 +02:00
@@ -4,19 +4,19 @@
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
- <description>Minecraft JSON chat API intended for use with BungeeCord</description>
+ <name>Waterfall-Chat</name>
+ <description>Minecraft JSON chat API intended for use with Waterfall</description>
<dependencies>
Merge Upstream Less than 2 hours till liberation :D
2018-08-16 23:44:14 +02:00
<dependency>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
diff --git a/config/pom.xml b/config/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index 06d2e13b..058e6fa8 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
- <description>Generic java configuration API intended for use with BungeeCord</description>
+ <name>Waterfall-Config</name>
+ <description>Generic java configuration API intended for use with Waterfall</description>
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index 13e71066..316f1e35 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
- <description>Generic java event dispatching API intended for use with BungeeCord</description>
+ <name>Waterfall-Event</name>
+ <description>Generic java event dispatching API intended for use with Waterfall.</description>
</project>
Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final
2016-07-17 03:12:39 +02:00
diff --git a/log/pom.xml b/log/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index 47eb961c..9ee30d66 100644
Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final
2016-07-17 03:12:39 +02:00
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final
2016-07-17 03:12:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final
2016-07-17 03:12:39 +02:00
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
- <description>Simplistic and performant java.util.Logger based logger and console API designed for use with BungeeCord and Minecraft related applications.</description>
+ <name>Waterfall-Log</name>
+ <description>Simplistic and performant java.util.Logger based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
<dependencies>
<dependency>
waterfall-chat is under io.github.waterfallmc
2016-07-17 04:38:31 +02:00
@@ -26,8 +26,8 @@
<scope>compile</scope>
Fixed missed change in log/pom.xml
2016-07-17 04:33:11 +02:00
</dependency>
<dependency>
waterfall-chat is under io.github.waterfallmc
2016-07-17 04:38:31 +02:00
- <groupId>net.md-5</groupId>
Fixed missed change in log/pom.xml
2016-07-17 04:33:11 +02:00
- <artifactId>bungeecord-chat</artifactId>
waterfall-chat is under io.github.waterfallmc
2016-07-17 04:38:31 +02:00
+ <groupId>io.github.waterfallmc</groupId>
Fixed missed change in log/pom.xml
2016-07-17 04:33:11 +02:00
+ <artifactId>waterfall-chat</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index e63a1dfb..2016f6a1 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<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>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index 60b69834..7371de6a 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<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>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
Updated Upstream (BungeeCord) (#762) Co-authored-by: Thomas A <thomas.a@erisium.com>
2022-07-03 17:06:31 +02:00
diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index 822babc6..9fac0511 100644
Updated Upstream (BungeeCord) (#762) Co-authored-by: Thomas A <thomas.a@erisium.com>
2022-07-03 17:06:31 +02:00
--- a/module/cmd-kick/pom.xml
+++ b/module/cmd-kick/pom.xml
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Updated Upstream (BungeeCord) (#762) Co-authored-by: Thomas A <thomas.a@erisium.com>
2022-07-03 17:06:31 +02:00
<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>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Updated Upstream (BungeeCord) (#762) Co-authored-by: Thomas A <thomas.a@erisium.com>
2022-07-03 17:06:31 +02:00
<packaging>jar</packaging>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index ba861252..d7324d89 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<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>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index 1a62e71d..00539f37 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<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>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index 57cbf1e9..6785f2a0 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<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>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index b1fd5afd..d78c9a25 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
- <description>Parent project for all BungeeCord modules.</description>
+ <name>Waterfall Modules</name>
+ <description>Parent project for all Waterfall modules.</description>
<modules>
<module>cmd-alert</module>
Updated Upstream (BungeeCord) (#762) Co-authored-by: Thomas A <thomas.a@erisium.com>
2022-07-03 17:06:31 +02:00
@@ -29,15 +29,15 @@
Set module author to WaterfallMC
2016-08-17 02:21:26 +02:00
</modules>
<properties>
- <module.author>SpigotMC</module.author>
+ <module.author>WaterfallMC</module.author>
Merge upstream + Fix build
2017-06-21 23:19:45 +02:00
<maven.deploy.skip>true</maven.deploy.skip>
Updated Upstream (BungeeCord) 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: a52ea500 #2769: Guardian target beam lost on server change 17d5dd3f Add dist Maven profile to generate source and Javadoc jars 9e8ab747 Add JsonConfiguration support to bungeecord-config cdacc0b1 #2498: Add ServerConnectRequest accessor in ServerConnectEvent. b4b998b2 #2761: Add ClientConnectEvent
2020-02-10 23:39:19 +01:00
<maven.javadoc.skip>true</maven.javadoc.skip>
Set module author to WaterfallMC
2016-08-17 02:21:26 +02:00
</properties>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<dependencies>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index cf663eec..a426476d 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
@@ -4,14 +4,14 @@
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
- <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.2-SNAPSHOT</version>
<packaging>jar</packaging>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
diff --git a/native/pom.xml b/native/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index a4265e54..5e9d29d7 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
- <description>Optional native code to speed up and enhance BungeeCord functionality.</description>
+ <name>Waterfall-Native</name>
+ <description>Optional native code to speed up and enhance Waterfall functionality.</description>
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index ed3c1a87..a6684b7c 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/pom.xml
+++ b/pom.xml
Merge upstream
2017-10-28 21:51:33 +02:00
@@ -3,18 +3,25 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
Make waterfall-super the parent of waterfall-parent
2016-12-04 18:31:55 +01:00
<modelVersion>4.0.0</modelVersion>
Merge upstream
2017-10-28 21:51:33 +02:00
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <parent>
Make waterfall-super the parent of waterfall-parent
2016-12-04 18:31:55 +01:00
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-super</artifactId>
+ <version>dev-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
Merge upstream
2017-10-28 21:51:33 +02:00
+ </parent>
+
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
- <description>Parent project for all BungeeCord modules.</description>
- <url>https://github.com/SpigotMC/BungeeCord</url>
- <inceptionYear>2012</inceptionYear>
+ <name>Waterfall-Parent</name>
+ <description>Parent project for all Waterfall modules.</description>
+ <url>https://github.com/WaterfallMC/Waterfall</url>
+ <inceptionYear>2015</inceptionYear>
<organization>
- <name>SpigotMC</name>
- <url>https://github.com/SpigotMC</url>
+ <name>WaterfallMC</name>
+ <url>https://github.com/WaterfallMC</url>
</organization>
<licenses>
<license>
Merge upstream
2017-10-28 21:51:33 +02:00
@@ -26,7 +33,19 @@
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<developers>
<developer>
- <id>md_5</id>
+ <id>Tux</id>
+ </developer>
+ <developer>
+ <id>Techcable</id>
+ </developer>
+ <developer>
+ <id>kashike</id>
Update pom - Update developers list - Update ci link
2016-08-30 19:38:26 +02:00
+ </developer>
+ <developer>
+ <id>jamierocks</id>
+ </developer>
+ <developer>
+ <id>fuzzybot</id>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
</developer>
</developers>
Updated Upstream (BungeeCord) 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: f0908b66 Add optional 1.17 (21w19a) snapshot protocol support 5fa596fe #3084: (Regrettably) add a full SLF4J wrapper
2021-05-15 03:46:23 +02:00
@@ -46,28 +65,24 @@
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
</modules>
<scm>
- <connection>scm:git:git@github.com:SpigotMC/BungeeCord.git</connection>
- <developerConnection>scm:git:git@github.com:SpigotMC/BungeeCord.git</developerConnection>
- <url>git@github.com:SpigotMC/BungeeCord.git</url>
+ <connection>scm:git:git@github.com:com:WaterfallMC/Waterfall.git</connection>
+ <developerConnection>scm:git:git@github.com:WaterfallMC/Waterfall.git</developerConnection>
+ <url>git@github.com:WaterfallMC/Waterfall.git</url>
</scm>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/SpigotMC/BungeeCord/issues</url>
Update maven POM information Issue tracker, CI, maven repository deployment
2018-09-30 04:15:31 +02:00
+ <url>https://github.com/PaperMC/Waterfall/issues</url>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
</issueManagement>
Remove remaining CI references
2021-01-11 17:33:57 +01:00
- <ciManagement>
- <system>jenkins</system>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
- <url>http://ci.md-5.net/job/BungeeCord</url>
Remove remaining CI references
2021-01-11 17:33:57 +01:00
- </ciManagement>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
Merge upstream
2017-10-28 21:51:33 +02:00
<distributionManagement>
Fix POM
2020-06-24 18:58:51 +02:00
- <snapshotRepository>
Merge upstream
2017-10-28 21:51:33 +02:00
- <id>sonatype-nexus-snapshots</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
Fix POM
2020-06-24 18:58:51 +02:00
- </snapshotRepository>
<repository>
- <id>sonatype-nexus-staging</id>
- <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+ <id>papermc-releases</id>
+ <url>https://papermc.io/repo/repository/maven-releases/</url>
</repository>
+ <snapshotRepository>
Update maven POM information Issue tracker, CI, maven repository deployment
2018-09-30 04:15:31 +02:00
+ <id>papermc-snapshots</id>
+ <url>https://papermc.io/repo/repository/maven-snapshots/</url>
Fix POM
2020-06-24 18:58:51 +02:00
+ </snapshotRepository>
</distributionManagement>
Updated Upstream (BungeeCord) (#719) Upstream has released updates that appear 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: b4ccdaa5 #2715: Improve BadPacketException message in MinecraftDecoder 3a116569 #3116: Do not fill in LogRecord caller data by default in slf4j wrapper 2479fab6 #3221: Use computeIfAbsent method in EventBus 51eb1ac6 Dependency upgrades 879f37f0 Upgrade to SnakeYAML 1.30 release
2021-12-23 20:56:40 +01:00
<properties>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
@@ -143,12 +158,21 @@
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
</execution>
</executions>
</plugin>
Fix more javadoc issues
2019-03-30 18:18:24 +01:00
+ <!-- Use latest version of the javadoc plugin, fixes some issues with the javadoc tool on recent JDK builds on macOS at least -->
Merge upstream
2017-10-28 21:51:33 +02:00
<plugin>
Updated Upstream (BungeeCord) 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: 4f23b49f #3037: Update ProxiedPlayer#setDisplayName javadoc to current behaviour cfcc8b1a Pin GitHub workflow build to ubuntu-20.04 ebec582c Add full support for building on JDK [8, 14]
2021-02-22 17:45:35 +01:00
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
1.19.4 Support (#792)
2023-03-14 20:02:26 +01:00
<version>3.11.0</version>
Updated Upstream (BungeeCord) 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: 4f23b49f #3037: Update ProxiedPlayer#setDisplayName javadoc to current behaviour cfcc8b1a Pin GitHub workflow build to ubuntu-20.04 ebec582c Add full support for building on JDK [8, 14]
2021-02-22 17:45:35 +01:00
</plugin>
<plugin>
Merge upstream
2017-10-28 21:51:33 +02:00
+ <artifactId>maven-javadoc-plugin</artifactId>
Fix some build issues
2023-06-07 21:35:05 +02:00
+ <version>3.5.0</version>
Updated Upstream (BungeeCord) 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: af10f82d Apply and enforce import ordering rules 3f01748d Minecraft 1.14-pre5 support
2019-04-23 10:09:26 +02:00
+ <configuration>
Fix more javadoc issues
2019-03-30 18:18:24 +01:00
+ <doclint>none</doclint>
Updated Upstream (BungeeCord) 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: af10f82d Apply and enforce import ordering rules 3f01748d Minecraft 1.14-pre5 support
2019-04-23 10:09:26 +02:00
+ </configuration>
+ </plugin>
+ <!-- Alow manging of import orders to allow avoiding conflicts
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Updated Upstream (BungeeCord) (#804)
2023-06-04 19:12:26 +02:00
<version>3.3.0</version>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
@@ -173,6 +197,7 @@
Updated Upstream (BungeeCord) 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: af10f82d Apply and enforce import ordering rules 3f01748d Minecraft 1.14-pre5 support
2019-04-23 10:09:26 +02:00
</dependency>
</dependencies>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
</plugin>
Updated Upstream (BungeeCord) 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: af10f82d Apply and enforce import ordering rules 3f01748d Minecraft 1.14-pre5 support
2019-04-23 10:09:26 +02:00
+ -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
@@ -285,6 +310,15 @@
Actually set this on the correct module
2023-06-07 22:20:51 +02:00
</goals>
</execution>
</executions>
+ <!-- Waterfall start: TODO: Just convert this project to gradle.
+ Maven is a constant source of headaches, especially when we have crud like
+ lombok inflicted upon the project mangling the build setup. I don't have the will to
+ figure out where the duplicate artifact is coming from, I cannot reproduce this locally,
+ and so, we'll just do this for now.-->
+ <configuration>
+ <forceCreation>true</forceCreation>
+ </configuration>
+ <!-- Waterfall end -->
</plugin>
<plugin>
<groupId>org.projectlombok</groupId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
@@ -333,6 +367,7 @@
(Maybe) Fix javadoc search
2021-07-04 21:34:01 +02:00
<!-- lombok does not add @return or @param which causes warnings, so ignore -->
<doclint>none</doclint>
<sourcepath>${project.build.directory}/delombok</sourcepath>
+ <additionalJOption>--no-module-directories</additionalJOption> <!-- Waterfall -->
</configuration>
</execution>
</executions>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
diff --git a/protocol/pom.xml b/protocol/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index f1c169a9..12096614 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
Update Bungeecord
2018-12-21 16:24:26 +01:00
@@ -4,19 +4,19 @@
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
- <description>Minimal implementation of the Minecraft protocol for use in BungeeCord</description>
+ <name>Waterfall-Protocol</name>
+ <description>Minimal implementation of the Minecraft protocol for use in Waterfall</description>
Updated Upstream (BungeeCord) (#719) Upstream has released updates that appear 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: b4ccdaa5 #2715: Improve BadPacketException message in MinecraftDecoder 3a116569 #3116: Do not fill in LogRecord caller data by default in slf4j wrapper 2479fab6 #3221: Use computeIfAbsent method in EventBus 51eb1ac6 Dependency upgrades 879f37f0 Upgrade to SnakeYAML 1.30 release
2021-12-23 20:56:40 +01:00
<!-- We really shouldn't depend on external repositories, but at least this is the Central staging one -->
<repositories>
@@ -41,8 +41,8 @@
Update Bungeecord
2018-12-21 16:24:26 +01:00
<scope>compile</scope>
</dependency>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index 335ee3d5..5558adfb 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
+ <name>Waterfall-Proxy</name>
<description>Proxy component of the Elastic Portal Suite</description>
Merge upstream + Fix build
2017-06-21 23:19:45 +02:00
<properties>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
@@ -52,38 +52,38 @@
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.md-5</groupId>
Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final
2016-07-17 03:12:39 +02:00
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.md-5</groupId>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-slf4j</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-slf4j</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
diff --git a/query/pom.xml b/query/pom.xml
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
index edd3e11a..4e9bd6cc 100644
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
<version>1.20-R0.2-SNAPSHOT</version>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
- <description>Minecraft query implementation based on the BungeeCord API.</description>
+ <name>Waterfall-Query</name>
+ <description>Minecraft query implementation based on the Waterfall API.</description>
<dependencies>
<dependency>
Updated Upstream (BungeeCord) Upstream has released updates that appear 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: 77907839 #3436, #3441: Check if server icon image is null f4534c82 #3446: Fix < 1.19 support 76673f02 Apply dependabot configuration b47ae094 #3444: Use same duplicate player handling for online and offline modes
2023-03-15 19:37:00 +01:00
@@ -25,8 +25,8 @@
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
diff --git a/slf4j/pom.xml b/slf4j/pom.xml
index acb5201f..b7529bf3 100644
--- a/slf4j/pom.xml
+++ b/slf4j/pom.xml
@@ -4,18 +4,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
- <version>1.20-R0.2-SNAPSHOT</version>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-super</artifactId>
+ <version>dev-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-slf4j</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-slf4j</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-SLF4J</name>
+ <name>Waterfall-SLF4J</name>
<description>Wrapper over SLF4J for BungeeCord purposes.</description>
<properties>
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
--
Initial work on bringing up to 1.20.2
2023-09-21 12:33:23 +02:00
2.42.0
Turn waterfall into a patch-based fork like Spigot and Paper (WIP) Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)
2016-05-28 18:34:39 +02:00
Reference in New Issue Copy Permalink