9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-06 15:51:31 +00:00

Updated Upstream (Gale)

This commit is contained in:
Dreeam
2023-02-16 22:04:01 -05:00
parent 524a9500d0
commit 774d728f65
14 changed files with 37 additions and 35 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
index e19c9544c346e7f505cfdd379be7f8f059d9e53d..8d9ba1fc13cbd71b50dfcaa942cb824109af6b8b 100644
index 1f8ce35cbc0802917d6fb166fe276a22b03835ed..97a482d26bab77fc027f78665bbbedcbb15bae39 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,14 +24,14 @@ configurations.api {
@@ -55,7 +55,7 @@ index e19c9544c346e7f505cfdd379be7f8f059d9e53d..8d9ba1fc13cbd71b50dfcaa942cb8241
compileOnly(annotations)
testCompileOnly(annotations)
@@ -63,8 +63,8 @@ dependencies {
@@ -64,8 +64,8 @@ dependencies {
testImplementation("org.apache.commons:commons-lang3:3.12.0")
testImplementation("junit:junit:4.13.2")
@@ -66,7 +66,7 @@ index e19c9544c346e7f505cfdd379be7f8f059d9e53d..8d9ba1fc13cbd71b50dfcaa942cb8241
}
configure<PublishingExtension> {
@@ -110,9 +110,9 @@ tasks.withType<Javadoc> {
@@ -111,9 +111,9 @@ tasks.withType<Javadoc> {
options.use()
options.isDocFilesSubDirs = true
options.links(
@@ -78,7 +78,7 @@ index e19c9544c346e7f505cfdd379be7f8f059d9e53d..8d9ba1fc13cbd71b50dfcaa942cb8241
// Paper start
//"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat
"https://jd.adventure.kyori.net/api/$adventureVersion/",
@@ -152,6 +152,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
@@ -153,6 +153,9 @@ val scanJar = tasks.register("scanJarForBadCalls", io.papermc.paperweight.tasks.
jarToScan.set(tasks.jar.flatMap { it.archiveFile })
classpath.from(configurations.compileClasspath)
}

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 a9f50779740e7fcec98ac8a88742858776a1fe05..ffbdc96d4fad7d603c5510675357ca06e828fb44 100644
index 6acdd0c9a6ea65b06ad5dad4758efb64884daaf3..49b7960390cef1f2e00105ed07186608376b4ddf 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3,6 +3,9 @@ package org.bukkit.entity;
@@ -20,7 +20,7 @@ index a9f50779740e7fcec98ac8a88742858776a1fe05..ffbdc96d4fad7d603c5510675357ca06
import com.destroystokyo.paper.ClientOption; // Paper
import com.destroystokyo.paper.Title; // Paper
import net.kyori.adventure.text.Component;
@@ -2956,4 +2959,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3010,4 +3013,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

View File

@@ -7,10 +7,10 @@ Original license: MIT
Original project: https://github.com/Cryptite/Slice
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index ffbdc96d4fad7d603c5510675357ca06e828fb44..989563b2cd8318c7d84ea40a5eacd56a22087289 100644
index 49b7960390cef1f2e00105ed07186608376b4ddf..04da082de862bef1d345266fc763d480e3bed0bc 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2819,6 +2819,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2873,6 +2873,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
String getClientBrandName();
// Paper end