Skip to content

Commit

Permalink
Update upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@IzzelAliz
IzzelAliz committed Dec 3, 2021
1 parent a422b68 commit aa78061
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 58 deletions.
90 changes: 45 additions & 45 deletions Waterfall-Proxy-Patches/0001-Change-brand-to-lightfall.patch
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
From 6f08a06dd6c6a47ca47003994b6bafc6297c03b4 Mon Sep 17 00:00:00 2001
From 3cf80e6589e421d592b95a3b4084def67243efdd Mon Sep 17 00:00:00 2001
From: IzzelAliz <[email protected]>
Date: Sun, 7 Mar 2021 19:26:00 +0800
Subject: [PATCH] Change brand to lightfall


diff --git a/api/pom.xml b/api/pom.xml
index 0680a5a5..ecb67cb3 100644
index 9b29dfca..98d0030d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,47 @@
Expand All @@ -16,13 +16,13 @@ index 0680a5a5..ecb67cb3 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-api</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-API</name>
Expand Down Expand Up @@ -81,7 +81,7 @@ index 0680a5a5..ecb67cb3 100644
</dependencies>
</project>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 7a9e8258..1dc17920 100644
index 00ce099c..7e937de5 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,19 +4,18 @@
Expand All @@ -92,14 +92,14 @@ index 7a9e8258..1dc17920 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-bootstrap</artifactId>
+ <artifactId>lightfall-bootstrap</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-Bootstrap</name>
Expand Down Expand Up @@ -142,7 +142,7 @@ index a4516ed9..1bb5dbce 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index cfa0e16e..67a0e17e 100644
index 0ad5dd16..98b328c6 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -153,14 +153,14 @@ index cfa0e16e..67a0e17e 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-chat</artifactId>
+ <artifactId>lightfall-chat</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-Chat</name>
Expand All @@ -169,7 +169,7 @@ index cfa0e16e..67a0e17e 100644

<dependencies>
diff --git a/config/pom.xml b/config/pom.xml
index 67e2500f..cb00f988 100644
index 2caffc27..7a268a24 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -180,14 +180,14 @@ index 67e2500f..cb00f988 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-config</artifactId>
+ <artifactId>lightfall-config</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-Config</name>
Expand All @@ -196,7 +196,7 @@ index 67e2500f..cb00f988 100644

<dependencies>
diff --git a/event/pom.xml b/event/pom.xml
index 563783e9..7d93f3a5 100644
index e2432463..c6e46f4a 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,16 @@
Expand All @@ -207,14 +207,14 @@ index 563783e9..7d93f3a5 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-event</artifactId>
+ <artifactId>lightfall-event</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-Event</name>
Expand All @@ -223,7 +223,7 @@ index 563783e9..7d93f3a5 100644
+ <description>Generic java event dispatching API intended for use with lightfall.</description>
</project>
diff --git a/log/pom.xml b/log/pom.xml
index 3663d6d9..deb1b5be 100644
index 465ebbf2..01f22ae8 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -234,14 +234,14 @@ index 3663d6d9..deb1b5be 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log</artifactId>
+ <artifactId>lightfall-log</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-Log</name>
Expand All @@ -261,7 +261,7 @@ index 3663d6d9..deb1b5be 100644
<scope>compile</scope>
</dependency>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index 7ec6e530..33f9cfdc 100644
index 34740637..d41964cc 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -3,18 +3,17 @@
Expand All @@ -272,14 +272,14 @@ index 7ec6e530..33f9cfdc 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log4j</artifactId>
+ <artifactId>lightfall-log4j</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-Log</name>
Expand All @@ -288,7 +288,7 @@ index 7ec6e530..33f9cfdc 100644

<properties>
diff --git a/module/pom.xml b/module/pom.xml
index 0ef98d58..a991abf8 100644
index 350a49b8..4efab2c4 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,8 +4,8 @@
Expand All @@ -299,11 +299,11 @@ index 0ef98d58..a991abf8 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -15,7 +15,7 @@
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>

- <name>Waterfall Modules</name>
Expand All @@ -321,7 +321,7 @@ index 0ef98d58..a991abf8 100644
<version>${project.version}</version>
<scope>compile</scope>
diff --git a/native/pom.xml b/native/pom.xml
index 652a869d..8c983ee9 100644
index 1eff2c93..ebd778b3 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -332,14 +332,14 @@ index 652a869d..8c983ee9 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-native</artifactId>
+ <artifactId>lightfall-native</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-Native</name>
Expand All @@ -348,7 +348,7 @@ index 652a869d..8c983ee9 100644

<dependencies>
diff --git a/pom.xml b/pom.xml
index 8d86e36c..9a06c1ac 100644
index 94fad2cc..409cab18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,24 +4,23 @@
Expand All @@ -366,7 +366,7 @@ index 8d86e36c..9a06c1ac 100644
- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>

- <name>Waterfall-Parent</name>
Expand Down Expand Up @@ -414,7 +414,7 @@ index 8d86e36c..9a06c1ac 100644

<distributionManagement>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index dbc0a3ab..a0f912c5 100644
index c62e0175..4cae232e 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -425,22 +425,22 @@ index dbc0a3ab..a0f912c5 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-protocol</artifactId>
+ <artifactId>lightfall-protocol</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-Protocol</name>
+ <name>lightfall-Protocol</name>
<description>Minimal implementation of the Minecraft protocol for use in Waterfall</description>

<!-- We really shouldn't depend on external repositories, but at least this is the Central staging one -->
@@ -41,8 +40,8 @@
<dependencies>
@@ -26,8 +25,8 @@
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -452,7 +452,7 @@ index dbc0a3ab..a0f912c5 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index c3a2eeb6..fc6de463 100644
index 22c4f71b..929d8ec8 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -463,14 +463,14 @@ index c3a2eeb6..fc6de463 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-proxy</artifactId>
+ <artifactId>lightfall-proxy</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-Proxy</name>
Expand Down Expand Up @@ -521,7 +521,7 @@ index c3a2eeb6..fc6de463 100644
<scope>compile</scope>
</dependency>
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 c7b0ab25..59fda993 100644
index 07d74c67..7294e161 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -539,7 +539,7 @@ public class BungeeCord extends ProxyServer
Expand All @@ -534,10 +534,10 @@ index c7b0ab25..59fda993 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 35680528..9bf9054b 100644
index 0db3d76a..68394d25 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -76,7 +76,7 @@ public class BungeeCordLauncher
@@ -63,7 +63,7 @@ public class BungeeCordLauncher

BungeeCord bungee = new BungeeCord();
ProxyServer.setInstance( bungee );
Expand Down Expand Up @@ -585,7 +585,7 @@ index 338c30d3..211fbbaf 100644
);
URL website = new URL( url );
diff --git a/query/pom.xml b/query/pom.xml
index dea7d85f..349d41e3 100644
index 081bff62..1f078635 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -596,14 +596,14 @@ index dea7d85f..349d41e3 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-query</artifactId>
+ <artifactId>lightfall-query</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>

- <name>Waterfall-Query</name>
Expand All @@ -621,5 +621,5 @@ index dea7d85f..349d41e3 100644
<version>${project.version}</version>
<scope>compile</scope>
--
2.30.1.windows.1
2.17.1

Loading

0 comments on commit aa78061

Please sign in to comment.