Updated Upstream (Leaf)

Author: Pascalpex

build.gradle.kts

@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    id("io.papermc.paperweight.patcher") version "2.0.0-beta.15"
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.16"
 }
 
 paperweight {

deepslateMC-api/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/leaf-api/build.gradle.kts
 +++ b/leaf-api/build.gradle.kts
-@@ -119,20 +_,24 @@
+@@ -121,20 +_,24 @@
              // Gale start - project setup
              srcDir(file("../paper-api/src/main/java"))
              srcDir(file("../gale-api/src/main/java")) // Leaf - project setup

deepslateMC-server/build.gradle.kts.patch

@@ -63,7 +63,7 @@
 +    implementation(project(":deepslateMC-api")) // Gale - project setup - Depend on own API // Leaf - project setup // Deepslate - project setup
 
      // Leaf start - Libraries
-     implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.2") { // Leaf config
+     implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.3") { // Leaf config
 @@ -285,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1654,6 +_,19 @@
+@@ -1667,6 +_,19 @@
      private ServerStatus.Players buildPlayerStatus() {
          List<ServerPlayer> players = this.playerList.realPlayers; // Leaves - only real player
          int maxPlayers = this.getMaxPlayers();
@@ -20,7 +20,7 @@
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(maxPlayers, players.size(), List.of());
          } else {
-@@ -1867,7 +_,13 @@
+@@ -1924,7 +_,13 @@
 
      @DontObfuscate
      public String getServerModName() {
@@ -35,7 +35,7 @@
      }
 
      public SystemReport fillSystemReport(SystemReport systemReport) {
-@@ -2038,7 +_,18 @@
+@@ -2095,7 +_,18 @@
 
      public void setMotd(String motd) {
          // Paper start - Adventure

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -238,6 +_,7 @@
+@@ -239,6 +_,7 @@
          io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
          org.galemc.gale.command.GaleCommands.registerCommands(this); // Gale - Gale commands - register commands
          org.dreeam.leaf.command.LeafCommands.registerCommands(this); // Leaf - Leaf commands

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -442,6 +_,19 @@
+@@ -449,6 +_,19 @@
          player.containerMenu.transferTo(player.containerMenu, bukkitPlayer);
 
          org.bukkit.event.player.PlayerJoinEvent playerJoinEvent = new org.bukkit.event.player.PlayerJoinEvent(bukkitPlayer, getJoinMsg(mutableComponent, bukkitPlayer)); // Paper - Adventure // Leaf - Configurable connection message - join message
@@ -20,7 +20,7 @@
          this.cserver.getPluginManager().callEvent(playerJoinEvent);
 
          if (!player.connection.isAcceptingMessages()) {
-@@ -847,6 +_,14 @@
+@@ -854,6 +_,14 @@
              }
          }
          this.cserver.getPluginManager().callEvent(event);

deepslateMC-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -600,6 +_,17 @@
+@@ -601,6 +_,17 @@
              event.setUseItemInHand(Result.DENY);
          }
          // Paper end

gradle.properties

@@ -2,7 +2,7 @@ group=de.pascalpex.deepslatemc
 version=1.21.4-R0.1-SNAPSHOT
 packageVersion = 1_21_R3
 mcVersion=1.21.4
-leafRef=f6aa7635f3a969ca833b7771d79bd07169d43bf9
+leafRef=d3640fe0a43803442528f192ecb67cb7425c77bd
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true