Skip to content

Commit 76662f7

Browse files
Deploying to Daydream-API
1 parent bbad058 commit 76662f7

File tree

62 files changed

+1788
-1132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1788
-1132
lines changed

daydream-api/build.gradle.kts.patch

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
--- a/paper-api/build.gradle.kts
22
+++ b/paper-api/build.gradle.kts
3-
@@ -54,6 +_,8 @@
3+
@@ -51,6 +_,8 @@
44
api("org.apache.logging.log4j:log4j-api:$log4jVersion")
55
api("org.slf4j:slf4j-api:$slf4jVersion")
66
api("com.mojang:brigadier:1.3.10")
7-
+ api("com.mojang:authlib:6.0.57") // Daydream - Expose Player mojang profile (Mojang Authlib; keep in sync with major MC versions)
8-
+ api("io.netty:netty-handler:4.1.115.Final") // Daydream - Add Network API (Netty; keep in sync with major MC versions)
7+
+ api("com.mojang:authlib:6.0.58") // Daydream - Expose Player mojang profile (Mojang Authlib; keep in sync with major MC versions)
8+
+ api("io.netty:netty-handler:4.1.118.Final") // Daydream - Add Network API (Netty; keep in sync with major MC versions)
99

1010
// Deprecate bungeecord-chat in favor of adventure
11-
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") {
12-
@@ -93,7 +_,7 @@
11+
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") {
12+
@@ -90,7 +_,7 @@
1313
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
1414
}
1515

16-
-val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
17-
+val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
16+
-val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
17+
+val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
1818
idea {
1919
module {
20-
generatedSourceDirs.add(generatedApiPath.toFile())
21-
@@ -103,6 +_,18 @@
20+
generatedSourceDirs.add(generatedDir.toFile())
21+
@@ -100,6 +_,18 @@
2222
main {
2323
java {
24-
srcDir(generatedApiPath)
24+
srcDir(generatedDir)
2525
+ srcDir(file("../paper-api/src/main/java"))
2626
+ }
2727
+ resources {
@@ -37,16 +37,16 @@
3737
}
3838
}
3939
}
40-
@@ -169,7 +_,7 @@
40+
@@ -166,7 +_,7 @@
4141

42-
tasks.withType<Javadoc> {
42+
tasks.withType<Javadoc>().configureEach {
4343
val options = options as StandardJavadocDocletOptions
4444
- options.overview = "src/main/javadoc/overview.html"
4545
+ options.overview = "../paper-api/src/main/javadoc/overview.html"
4646
options.use()
4747
options.isDocFilesSubDirs = true
4848
options.links(
49-
@@ -202,11 +_,11 @@
49+
@@ -199,11 +_,11 @@
5050
}
5151

5252
// workaround for https://github.com/gradle/gradle/issues/4046

daydream-api/paper-patches/features/0001-Add-Daydream-Command.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ Subject: [PATCH] Add Daydream Command
55

66

77
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
8-
index 5df19bd701c67506689fc7f49d91f99ebfbc83f0..8cf79bc1e720840e129ee3c2759f73ff40611768 100644
8+
index ad1330d87223dfcf3c9da40aa5ece8c21141f0d6..47dfe4c829efc6c8c9529e74a6d48d08ab7b06cb 100644
99
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
1010
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
11-
@@ -35,7 +35,7 @@ public class SimpleCommandMap implements CommandMap {
11+
@@ -30,7 +30,7 @@ public class SimpleCommandMap implements CommandMap {
1212
setDefaultCommands();
1313
}
1414

1515
- private void setDefaultCommands() {
1616
+ protected void setDefaultCommands() { // Daydream - (feature) Add Daydream Command (private -> protected)
17-
register("bukkit", new VersionCommand("version"));
18-
register("bukkit", new ReloadCommand("reload"));
19-
//register("bukkit", new PluginsCommand("plugins")); // Paper
17+
final ReloadCommand reload = new ReloadCommand("reload");
18+
this.knownCommands.put("bukkit:reload", reload);
19+
this.knownCommands.put("bukkit:rl", reload);
2020
diff --git a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
2121
index 7763d6101ac61900db1e2310966b99584539fd0e..58582a83ba1702c0f2d2832da464f33d579c6210 100644
2222
--- a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java

0 commit comments

Comments
 (0)