Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 08:49:28 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Martijn Muijsers
2023-06-14 08:35:01 +02:00
parent 30cbb377e1
commit 534445cd40
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@@ -1,8 +1,8 @@
group=org.galemc.gale group=org.galemc.gale
version=1.20-R0.1-SNAPSHOT version=1.20.1-R0.1-SNAPSHOT
mcVersion=1.20 mcVersion=1.20.1
paperRef=c287e921a96438964f32f3c4e394d6809e0d06fa paperRef=62262d73d2c3c3e111c9fd4e0c069cdb1324f186
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

4
patches/server/0001-Gale-project-setup.patch
View File

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org Gale - https://galemc.org
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 7a17e05b630517a6861c34a4561198db62acf82a..7617fe6903713893af8f6ef6564c97549709ff26 100644 index a0c5592530d2a59bfde87d1e9eb3752e7d4694da..77fc393c793cfe719b48255bffa29c5160f8aece 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -7,8 +7,14 @@ plugins { @@ -7,8 +7,14 @@ plugins {
@@ -20,7 +20,7 @@ index 7a17e05b630517a6861c34a4561198db62acf82a..7617fe6903713893af8f6ef6564c9754
+ // Depend on own API + // Depend on own API
+ implementation(project(":gale-api")) + implementation(project(":gale-api"))
+ // Depend on Paper MojangAPI + // Depend on Paper MojangAPI
+ implementation("io.papermc.paper:paper-mojangapi:1.20-R0.1-SNAPSHOT") { + implementation("io.papermc.paper:paper-mojangapi:1.20.1-R0.1-SNAPSHOT") {
+ exclude("io.papermc.paper", "paper-api") + exclude("io.papermc.paper", "paper-api")
+ } + }
+ // Gale end - project setup + // Gale end - project setup

8
patches/server/0006-Gale-branding-changes.patch
View File

@@ -11,7 +11,7 @@ License for non-image files: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org Gale - https://galemc.org
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 794aa5ec516d6d1f2c633bcdb53232515a06e32a..a35e8a5a66bcd1235edbf2ba1a245956f90117f7 100644 index 427749555a81724dbe36a99b70fb7aaba5f80151..47f235b641946b58afd18783e3dbca6432fcc268 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -79,7 +79,7 @@ tasks.jar { @@ -79,7 +79,7 @@ tasks.jar {
@@ -248,7 +248,7 @@ index d7ce4971d9271dbeff4adb9d852e4e7bdf60bf03..3dd7ee2e099199550b885947d33d8b27
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 8092db9de43ca4824374e1a76c85f71929521f6d..35da803d7679ba6d110764881dc7cad6823381b6 100644 index 83cef5ec27c31f133a23cd27349f722799c786ea..267f590126c22f5800d54200fca7c2a89a5364f6 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -470,7 +470,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -470,7 +470,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -460,7 +460,7 @@ index 0000000000000000000000000000000000000000..7fee1c2779ab390586b2d3f75f568908
+} +}
diff --git a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java diff --git a/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..4946618a2be455738a3b0222d91ed6611c472c74 index 0000000000000000000000000000000000000000..9b4bc17fed9dc7251159687082cf8de60dd49ba4
--- /dev/null --- /dev/null
+++ b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java +++ b/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
@@ -471,7 +471,7 @@ index 0000000000000000000000000000000000000000..4946618a2be455738a3b0222d91ed661
+public class GaleVersionFetcher extends AbstractPaperVersionFetcher { +public class GaleVersionFetcher extends AbstractPaperVersionFetcher {
+ +
+ public GaleVersionFetcher() { + public GaleVersionFetcher() {
+ super("ver/1.20", "https://github.com/GaleMC/Gale", "Gale", "GaleMC", "GaleMC", "Gale"); + super("ver/1.20.1", "https://github.com/GaleMC/Gale", "Gale", "GaleMC", "GaleMC", "Gale");
+ } + }
+ +
+} +}

4
patches/server/0080-Reduce-array-allocations.patch
View File

@@ -346,7 +346,7 @@ index a2920b8a9eff77d9c5d1d7f70ad3abdacba8f0fa..43f402d9032e4570a81a80e412215598
protected CipherBase(Cipher cipher) { protected CipherBase(Cipher cipher) {
this.cipher = cipher; this.cipher = cipher;
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
index c45c1d519aba414557bf1a4c9260f928bd8d9b14..e152e851db27ea4e43678b91a65ce303cb7004b3 100644 index 1b634b303105a0f8424e1e40b7c39f9938232d95..f98545988a081564581a5ff43d2d9087b676b725 100644
--- a/src/main/java/net/minecraft/network/Connection.java --- a/src/main/java/net/minecraft/network/Connection.java
+++ b/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java
@@ -21,7 +21,6 @@ import io.netty.channel.epoll.EpollSocketChannel; @@ -21,7 +21,6 @@ import io.netty.channel.epoll.EpollSocketChannel;
@@ -367,7 +367,7 @@ index c45c1d519aba414557bf1a4c9260f928bd8d9b14..e152e851db27ea4e43678b91a65ce303
import net.minecraft.Util; import net.minecraft.Util;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.MutableComponent;
@@ -316,7 +316,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> { @@ -322,7 +322,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
} }
public void setListener(PacketListener listener) { public void setListener(PacketListener listener) {