Skip to content

Commit

Permalink
Update to 1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
@IzzelAliz
IzzelAliz committed Jun 8, 2023
1 parent 359676f commit a76009b
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion Waterfall
Submodule Waterfall updated from 73e6de to 310243
88 changes: 44 additions & 44 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 79ca0f06c5f99636b9c13348c79791fd469eec86 Mon Sep 17 00:00:00 2001
From 7ad255d2e9eb63b2ac409aa63cb03ff82e6b83e2 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 92bd6c03..1d248bc7 100644
index 01b8f888..4260e2b5 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,47 @@
Expand All @@ -16,13 +16,13 @@ index 92bd6c03..1d248bc7 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

- <name>Waterfall-API</name>
Expand Down Expand Up @@ -70,7 +70,7 @@ index 92bd6c03..1d248bc7 100644
</dependency>
@@ -81,5 +86,11 @@
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>1.7.36</version>
</dependency>
+ <!-- lightfall - Add API -->
+ <dependency>
Expand All @@ -81,7 +81,7 @@ index 92bd6c03..1d248bc7 100644
</dependencies>
</project>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index f9ec2c1c..69e5225e 100644
index 8328e576..2a1ee7de 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,19 +4,18 @@
Expand All @@ -92,14 +92,14 @@ index f9ec2c1c..69e5225e 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-bootstrap</artifactId>
+ <artifactId>lightfall-bootstrap</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-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 003b3f6c..5d19b566 100644
index 040aa0f7..424259c9 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -153,14 +153,14 @@ index 003b3f6c..5d19b566 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

- <name>Waterfall-Chat</name>
Expand All @@ -169,7 +169,7 @@ index 003b3f6c..5d19b566 100644

<dependencies>
diff --git a/config/pom.xml b/config/pom.xml
index 91da386a..e7159f39 100644
index 7e2d07a7..616f9bca 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -180,14 +180,14 @@ index 91da386a..e7159f39 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

- <name>Waterfall-Config</name>
Expand All @@ -196,7 +196,7 @@ index 91da386a..e7159f39 100644

<dependencies>
diff --git a/event/pom.xml b/event/pom.xml
index ac85fc82..913e11ef 100644
index b2541c62..bb7a8689 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,16 @@
Expand All @@ -207,14 +207,14 @@ index ac85fc82..913e11ef 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

- <name>Waterfall-Event</name>
Expand All @@ -223,7 +223,7 @@ index ac85fc82..913e11ef 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 d61dba6f..8e34ad15 100644
index 8368f7b3..153780a0 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -234,14 +234,14 @@ index d61dba6f..8e34ad15 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

- <name>Waterfall-Log</name>
Expand All @@ -261,7 +261,7 @@ index d61dba6f..8e34ad15 100644
<scope>compile</scope>
</dependency>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index fb091698..949f6288 100644
index e83b2f21..20a7eccd 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -3,18 +3,17 @@
Expand All @@ -272,23 +272,23 @@ index fb091698..949f6288 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

- <name>Waterfall-Log</name>
+ <name>lightfall-Log</name>
- <name>Waterfall-Log4J</name>
+ <name>lightfall-log4j</name>
<description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>

<properties>
diff --git a/module/pom.xml b/module/pom.xml
index 0de7979e..9a7c3c63 100644
index 89c34e80..58b3e668 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,8 +4,8 @@
Expand All @@ -299,11 +299,11 @@ index 0de7979e..9a7c3c63 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -15,7 +15,7 @@
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>

- <name>Waterfall Modules</name>
Expand All @@ -321,7 +321,7 @@ index 0de7979e..9a7c3c63 100644
<version>${project.version}</version>
<scope>compile</scope>
diff --git a/native/pom.xml b/native/pom.xml
index e137dfcc..bbe8548b 100644
index 2412768b..db027938 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -332,14 +332,14 @@ index e137dfcc..bbe8548b 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

- <name>Waterfall-Native</name>
Expand All @@ -348,7 +348,7 @@ index e137dfcc..bbe8548b 100644

<dependencies>
diff --git a/pom.xml b/pom.xml
index c7a036c3..408116cc 100644
index d333a528..13fc68be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,24 +4,23 @@
Expand All @@ -366,7 +366,7 @@ index c7a036c3..408116cc 100644
- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>

- <name>Waterfall-Parent</name>
Expand Down Expand Up @@ -414,7 +414,7 @@ index c7a036c3..408116cc 100644

<distributionManagement>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 221469b9..3bf4f136 100644
index c6105b87..bdfc14f5 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -425,14 +425,14 @@ index 221469b9..3bf4f136 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

- <name>Waterfall-Protocol</name>
Expand All @@ -452,7 +452,7 @@ index 221469b9..3bf4f136 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 61172190..175ab820 100644
index 83d8719b..e08289d2 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -463,14 +463,14 @@ index 61172190..175ab820 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

- <name>Waterfall-Proxy</name>
Expand Down Expand Up @@ -521,7 +521,7 @@ index 61172190..175ab820 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 d88c296a..2fefda94 100644
index a7091ab6..1fa98f14 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -545,7 +545,7 @@ public class BungeeCord extends ProxyServer
Expand Down Expand Up @@ -598,7 +598,7 @@ index d3abee44..f7aaf001 100644
System.out.println( "Attempting to update plugin from " + moduleVersion + " to " + bungeeVersion );
module.getProvider().retrieve( module, bungeeVersion );
diff --git a/query/pom.xml b/query/pom.xml
index 81af5457..9e19d1c0 100644
index fc864f83..4d96b6b3 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,18 +4,17 @@
Expand All @@ -609,14 +609,14 @@ index 81af5457..9e19d1c0 100644
- <artifactId>waterfall-parent</artifactId>
+ <groupId>io.izzel.lightfall</groupId>
+ <artifactId>lightfall-parent</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<version>1.20-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

- <name>Waterfall-Query</name>
Expand All @@ -634,5 +634,5 @@ index 81af5457..9e19d1c0 100644
<version>${project.version}</version>
<scope>compile</scope>
--
2.36.1.windows.1
2.40.1

0 comments on commit a76009b

Please sign in to comment.