9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +00:00

Updated Upstream (Paper)

This commit is contained in:
Dreeam
2023-12-13 22:49:59 -05:00
parent 07a2ca6b82
commit b69f76dc1b
125 changed files with 894 additions and 810 deletions

View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/build.gradle.kts b/build.gradle.kts
index e827ee211e3c65dc68ac5867fd8476639df63645..d48dade97bbae435fafbd5508664c9b66308cad7 100644
index 9d817bf3f26ffd484945a00a6538970eca22ee20..4f979f05a05448d46f866779729fc57c98e46dd5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -106,6 +106,15 @@ val generateApiVersioningFile by tasks.registering {
@@ -109,6 +109,15 @@ val generateApiVersioningFile by tasks.registering {
}
}
@@ -26,7 +26,7 @@ index e827ee211e3c65dc68ac5867fd8476639df63645..d48dade97bbae435fafbd5508664c9b6
tasks.jar {
from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
into("META-INF/maven/${project.group}/${project.name}")
@@ -163,6 +172,8 @@ tasks.withType<Javadoc> {
@@ -166,6 +175,8 @@ tasks.withType<Javadoc> {
into("build/docs/javadoc")
}
}

View File

@@ -46,10 +46,10 @@ index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/build.gradle.kts b/build.gradle.kts
index d48dade97bbae435fafbd5508664c9b66308cad7..8ca9d7dfdad93c5d162c75399816d704c5184ca8 100644
index 4f979f05a05448d46f866779729fc57c98e46dd5..2ae5fc85ed538da29af0faa68421175942fcbeb6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -124,6 +124,12 @@ tasks.jar {
@@ -127,6 +127,12 @@ tasks.jar {
"Automatic-Module-Name" to "org.bukkit"
)
}

View File

@@ -13,10 +13,10 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/build.gradle.kts b/build.gradle.kts
index 8ca9d7dfdad93c5d162c75399816d704c5184ca8..6be021dcdef8283db51baa25e74570473afb9063 100644
index 2ae5fc85ed538da29af0faa68421175942fcbeb6..2149d23d695e0dd8ebab9f049ee6c3a164b5918b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -112,6 +112,7 @@ tasks.withType<JavaCompile> {
@@ -115,6 +115,7 @@ tasks.withType<JavaCompile> {
compilerArgs.add("-Xlint:-module")
compilerArgs.add("-Xlint:-removal")
compilerArgs.add("-Xlint:-dep-ann")
@@ -24,7 +24,7 @@ index 8ca9d7dfdad93c5d162c75399816d704c5184ca8..6be021dcdef8283db51baa25e7457047
}
// Gale end - hide irrelevant compilation warnings
@@ -180,6 +181,7 @@ tasks.withType<Javadoc> {
@@ -183,6 +184,7 @@ tasks.withType<Javadoc> {
}
options.addStringOption("Xdoclint:none", "-quiet") // Gale - hide irrelevant compilation warnings

View File

@@ -37,19 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 47fcfa2a3358766dfda2efc9bbcf5b50e3f2f7c1..a47be0fb0220e46cc360729fdf6cc113cdd05a39 100644
index a8d3451ccfcd21a9e80adc2feab8fc9c2926c753..d323109ef01bcd31970a749854eeaf8805e8de6b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -7,6 +7,8 @@ import java.time.Instant;
import java.util.Collection;
import java.util.Date;
import java.util.Map;
+import java.util.UUID;
+
import org.bukkit.BanEntry;
import org.bukkit.DyeColor;
import org.bukkit.Effect;
@@ -1927,6 +1929,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1928,6 +1928,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
boolean listPlayer(@NotNull Player other);
// Paper end