mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2025-06-27 16:06:40 +00:00
Update Paper and fix compilation errors (again)
This commit is contained in:
41
patches/api/0001-Build-changes.patch
Normal file
41
patches/api/0001-Build-changes.patch
Normal file
@ -0,0 +1,41 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Telesphoreo <me@telesphoreo.me>
|
||||
Date: Fri, 6 Oct 2023 02:29:32 -0500
|
||||
Subject: [PATCH] Build changes
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 639651972fddce4dff63a0f0a7e566a15b9e2dd6..3152467db0ed68d2f077a738964da5cd08e1eb59 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -107,12 +107,12 @@ tasks.withType<Javadoc> {
|
||||
options.isDocFilesSubDirs = true
|
||||
options.links(
|
||||
"https://guava.dev/releases/32.1.2-jre/api/docs/",
|
||||
- "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
|
||||
- "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
|
||||
+ // "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/", // Scissors - comment out, webserver is down
|
||||
+ // "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Scissors - comment out, webserver is down > // Paper - we don't want Java 5 annotations
|
||||
// "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
|
||||
// Paper start - add missing javadoc links
|
||||
- "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
|
||||
- "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
|
||||
+ // "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html", // Scissors - comment out, webserver is down
|
||||
+ // "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", // Scissors - comment out, webserver is down
|
||||
// Paper end
|
||||
// Paper start
|
||||
"https://jd.advntr.dev/api/$adventureVersion/",
|
||||
@@ -121,10 +121,10 @@ tasks.withType<Javadoc> {
|
||||
"https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
|
||||
"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
|
||||
"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
|
||||
- "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
|
||||
- "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
|
||||
+ // "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/", // Scissors - comment out, webserver is down
|
||||
+ // "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/", // Scissors - comment out, webserver is down
|
||||
// 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.7.3", // Scissors - comment out, webserver is down > // Paper
|
||||
)
|
||||
options.tags("apiNote:a:API Note:")
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Add MasterBlockFireEvent
|
||||
|
||||
diff --git a/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java b/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..a24cb52a5af62012c5d5acc29e4c3558e92ae572
|
||||
index 0000000000000000000000000000000000000000..812e6ae9f1c8eb9558e5109c522d3ce3a7deb35c
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/me/totalfreedom/scissors/event/block/MasterBlockFireEvent.java
|
||||
@@ -0,0 +1,51 @@
|
@ -6,7 +6,7 @@ Subject: [PATCH] Add spectator teleport event
|
||||
|
||||
diff --git a/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java b/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..d7efa63c316ed99c3eccfeadc1b0873b2ccb5d8a
|
||||
index 0000000000000000000000000000000000000000..e4c9256c78f8b395aea86e9ea1a112f8e7426c1f
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/me/totalfreedom/scissors/event/player/SpectatorTeleportEvent.java
|
||||
@@ -0,0 +1,60 @@
|
Reference in New Issue
Block a user