Skip to content

Commit

Permalink
feat: 1.21.4!
Browse files Browse the repository at this point in the history
  • Loading branch information
MC-XiaoHei committed Dec 26, 2024
1 parent b8a44df commit 385ad33
Show file tree
Hide file tree
Showing 66 changed files with 833 additions and 8,716 deletions.
3 changes: 0 additions & 3 deletions docs/DefaultModifiedConfigList.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ unsupported-settings:
allow-piston-duplication: true
allow-grindstone-overstacking: true
allow-unsafe-end-portal-teleportation: true
allow-tripwire-disarming-exploits: true
```
### paper-world-defaults.yml
```yaml
Expand All @@ -41,8 +40,6 @@ entities:
mode: warn
filter-bad-tile-entity-nbt-from-falling-blocks: false
filtered-entity-tag-nbt-paths: []
fixes:
disable-unloaded-chunk-enderpearl-exploit: false
hopper:
cooldown-when-full: false
maps:
Expand Down
5 changes: 3 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
group=org.leavesmc.lumina
version=1.20.6-R0.1-SNAPSHOT
foliaRef=d79708296e75ee4f26e78c2925f6e7d4217d0575
version=1.21.4-R0.1-SNAPSHOT
mcVersion=1.21.4
foliaRef=8af1aef1f14630ede6575a72632e7f943d8fb903
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.vfs.watch=false
Expand Down
4 changes: 2 additions & 2 deletions patches/api/0001-Rebrand-to-Lumina.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand to Lumina


diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
index 9df9d09aa477d4cd3c496ba0933c816df1ef0964..2a88bfed4f9afaaea8e26a50353cb084ab3b7886 100644
index 652ff54e7c50412503725d628bfe72ed03059790..d1d6be2ff49882aea62022aec413c039d22db656 100644
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
@@ -16,7 +16,7 @@ public interface ServerBuildInfo {
@@ -17,7 +17,7 @@ public interface ServerBuildInfo {
/**
* The brand id for Paper.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ This patch is copied from Leaves(https://github.com/LeavesMC/Leaves)
License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) (https://github.com/LeavesMC/Leaves?tab=License-1-ov-file)

diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 15049641b8123abf03edcbb49257fb4f3db0a5ec..b51cd40f1924fe275f9b84c65dcb83991010e0ec 100644
index 8ab94f8189ebd9d4158231871abdebec399deb2c..271d61c95465e269362ec9c2f71dbe6740c8a7a2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2917,6 +2917,17 @@ public final class Bukkit {
@@ -2964,6 +2964,17 @@ public final class Bukkit {
}
// Folia end - region threading API
// Paper end - Folia region threading API

+ // Leaves start - Bot API
+ /**
Expand All @@ -29,22 +29,21 @@ index 15049641b8123abf03edcbb49257fb4f3db0a5ec..b51cd40f1924fe275f9b84c65dcb8399
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1f51f80e8516cfac7ed4078ed96e535389a31f25..f41dbe5987e1d143b18d901015e3c919a695d45d 100644
index ad816538b30079c62d5e1eb98c6f4b61e12e8d47..dd81f645be86b57cc0a27add8a085d030c0d4c71 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -61,6 +61,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -62,6 +62,7 @@ import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.leavesmc.leaves.entity.BotManager;

/**
* Represents a server implementation.
@@ -2552,4 +2553,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@@ -2592,6 +2593,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
public boolean isGlobalTickThread();
// Folia end - region threading API
+
// Paper end - Folia region threading API
+ // Leaves start - Bot API
+ /**
+ * Returns a bot manager.
Expand All @@ -53,7 +52,10 @@ index 1f51f80e8516cfac7ed4078ed96e535389a31f25..f41dbe5987e1d143b18d901015e3c919
+ */
+ @NotNull BotManager getBotManager();
+ // Leaves end - Bot API
}
+
// Paper start - API to check if the server is sleeping
/**
* Returns whether the server is sleeping/paused.
diff --git a/src/main/java/org/leavesmc/leaves/entity/Bot.java b/src/main/java/org/leavesmc/leaves/entity/Bot.java
new file mode 100644
index 0000000000000000000000000000000000000000..7a1ee45d571687317883b896f3ec0a837a8ef450
Expand Down
Loading

0 comments on commit 385ad33

Please sign in to comment.