Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-30 20:39:21 +00:00
Code Issues Releases Activity

Updated Upstream (Gale/Purpur/Dependencies)

Browse Source
This commit is contained in:
Dreeam
2024-04-24 03:49:00 -04:00
parent 3327fb69cc
commit 4927109016
16 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0003-Purpur-API-Changes.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
Original license: MIT
Original project: https://github.com/PurpurMC/Purpur
Commit: b7e80840c6a96e1132bb0eb01ef34233334461d4
Commit: 6b1ee98f813ee19f8046b3c528feeee61840a35b
Patches below are removed in this patch:
Pufferfish-API-Changes.patch
@@ -547,10 +547,10 @@ index 80499cd30914ca97576532bd86967cbfaabe2577..98311ea5696f722b431444a569f0f172
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 35fb5047dd8a8521586a9ca9f8d70881355fb7f5..c2fc3c7158b65a875515afda0d69e2d6529db976 100644
index e6f66d70d024cf4f0536a5bf8e51bf7b306335df..07e75978b4fc0e446e8aa46a40be5e371dc1c11b 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4222,6 +4222,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4233,6 +4233,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public DragonBattle getEnderDragonBattle();
@@ -996,10 +996,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 019237c2e536a118f7cd3d81fc59b74f21c34609..a9f119ea2a006158429a90d67517ccc74a0027ac 100644
index db3dfc95ca2997745092cf4632c60705d05a6640..6a9ce422d1def472ef4bbd3cc716426385be0cc4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3721,4 +3721,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3762,4 +3762,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

17
patches/api/0005-Bump-Dependencies.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
index 4a9deabf03236533aa86860326f0da21650dd38f..5cd6853b555778fd198280790968fee390c85a8f 100644
index 4a9deabf03236533aa86860326f0da21650dd38f..673548d13590cb99f293f0799b05d974e6cd660b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,11 +9,11 @@ java {
@@ -41,7 +41,7 @@ index 4a9deabf03236533aa86860326f0da21650dd38f..5cd6853b555778fd198280790968fee3
apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
apiAndDocs("net.kyori:adventure-api")
apiAndDocs("net.kyori:adventure-text-minimessage")
@@ -51,7 +51,7 @@ dependencies {
@@ -51,28 +51,30 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
api("org.apache.logging.log4j:log4j-api:$log4jVersion")
api("org.slf4j:slf4j-api:$slf4jVersion")
@@ -50,7 +50,16 @@ index 4a9deabf03236533aa86860326f0da21650dd38f..5cd6853b555778fd198280790968fee3
implementation("org.ow2.asm:asm:9.7")
implementation("org.ow2.asm:asm-commons:9.7")
@@ -66,13 +66,15 @@ dependencies {
// Paper end
api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
- compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
- compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.19")
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.19")
val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations...
compileOnly(annotations)
testCompileOnly(annotations)
// Paper start - add checker
@@ -92,7 +101,7 @@ index 4a9deabf03236533aa86860326f0da21650dd38f..5cd6853b555778fd198280790968fee3
+ "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/2.20.0", // Leaf - Bump Dependencies
// Paper end
- "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper
+ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.18", // Paper // Leaf - Bump Dependencies
+ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.19", // Paper // Leaf - Bump Dependencies
)
options.tags("apiNote:a:API Note:")

4
patches/api/0007-KeYi-Player-Skull-API.patch
View File

@@ -7,7 +7,7 @@ Original license: MIT
Original project: https://github.com/KeYiMC/KeYi
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index a9f119ea2a006158429a90d67517ccc74a0027ac..69ba1660dae4ac69ec4e92f94dd6f95e9f70427d 100644
index 6a9ce422d1def472ef4bbd3cc716426385be0cc4..89d124342522743206f8065a32f6e36b954b3b73 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -9,6 +9,10 @@ import java.util.Date;
@@ -21,7 +21,7 @@ index a9f119ea2a006158429a90d67517ccc74a0027ac..69ba1660dae4ac69ec4e92f94dd6f95e
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -3840,4 +3844,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3881,4 +3885,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
sendDeathScreen(message);
}
// Purpur end