Begin 1.21.5 update

Author: Pascalpex

.github/workflows/build.yml

@@ -24,4 +24,4 @@ jobs:
       uses: actions/[email protected]
       with:
         name: DeepslateMC
-        path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.4-R0.1-SNAPSHOT-mojmap.jar
+        path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.5-R0.1-SNAPSHOT-mojmap.jar

.gitignore

@@ -50,8 +50,6 @@ deepslateMC-server/build.gradle.kts
 deepslateMC-server/src/minecraft
 leaf-api
 leaf-server
-gale-api
-gale-server
 paper-api
 paper-server
 

build.gradle.kts

@@ -25,11 +25,6 @@ paperweight {
             patchesDir = file("deepslateMC-api/paper-patches")
             outputDir = file("paper-api")
         }
-        patchRepo("galeApi") {
-            upstreamPath = "gale-api"
-            patchesDir = file("deepslateMC-api/gale-patches")
-            outputDir = file("gale-api")
-        }
         patchDir("leafApi") {
             upstreamPath = "leaf-api"
             excludes = listOf("build.gradle.kts", "build.gradle.kts.patch", "paper-patches")

deepslateMC-api/build.gradle.kts.patch

@@ -1,27 +1,24 @@
 --- a/leaf-api/build.gradle.kts
 +++ b/leaf-api/build.gradle.kts
-@@ -121,20 +_,24 @@
-             // Gale start - project setup
+@@ -120,17 +_,21 @@
+             srcDir(generatedDir)
+             // Leaf start - project setup
              srcDir(file("../paper-api/src/main/java"))
-             srcDir(file("../gale-api/src/main/java")) // Leaf - project setup
 +            srcDir(file("../leaf-api/src/main/java")) // Deepslate - project setup
          }
          resources {
              srcDir(file("../paper-api/src/main/resources"))
-             srcDir(file("../gale-api/src/main/resources")) // Leaf - project setup
 +            srcDir(file("../leaf-api/src/main/resources")) // Deepslate - project setup
          }
      }
      test {
          java {
              srcDir(file("../paper-api/src/test/java"))
-             srcDir(file("../gale-api/src/test/java")) // Leaf - project setup
 +            srcDir(file("../leaf-api/src/test/java")) // Deepslate - project setup
          }
          resources {
              srcDir(file("../paper-api/src/test/resources"))
-             srcDir(file("../gale-api/src/test/resources")) // Leaf - project setup
 +            srcDir(file("../leaf-api/src/test/resources")) // Deepslate - project setup
-             // Gale end - project setup
+             // Leaf end - project setup
          }
      }

deepslateMC-api/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfo.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-@@ -44,6 +_,13 @@
+@@ -34,6 +_,13 @@
      Key BRAND_LEAF_ID = Key.key("winds-studio", "leaf");
      // Leaf end - Rebrand
 

deepslateMC-server/build.gradle.kts.patch

@@ -1,6 +1,6 @@
 --- a/leaf-server/build.gradle.kts
 +++ b/leaf-server/build.gradle.kts
-@@ -54,7 +_,36 @@
+@@ -39,7 +_,30 @@
          }
      }
 
@@ -13,16 +13,10 @@
 +            patchesDir = rootDirectory.dir("deepslateMC-server/paper-patches")
 +            outputDir = rootDirectory.dir("paper-server")
 +        }
-+        upstream.patchRepo("galeServer") {
-+            upstreamRepo = leaf.patchedRepo("galeServer")
-+            patchesDir = rootDirectory.dir("deepslateMC-server/gale-patches")
-+            outputDir = rootDirectory.dir("gale-server")
-+        }
 +        upstream.patchDir("leafServer") {
 +            upstreamPath = "leaf-server"
 +            excludes = setOf(
 +                "src/minecraft",
-+                "gale-patches",
 +                "paper-patches",
 +                "minecraft-patches",
 +                "build.gradle.kts",
@@ -36,51 +30,49 @@
 +    activeFork = deepslateMC
 +    // Deepslate end - project setup
      // Leaf end - project setup
-     // Gale end - project setup
 
-@@ -146,12 +_,16 @@
+     spigot {
+@@ -128,10 +_,14 @@
+     main {
+         java { srcDir("../paper-server/src/main/java") }
          resources { srcDir("../paper-server/src/main/resources") }
-         java { srcDir("../gale-server/src/main/java") } // Leaf - project setup
-         resources { srcDir("../gale-server/src/main/resources") } // Leaf - project setup
 +        java { srcDir("../leaf-server/src/main/java") } // Deepslate - project setup
 +        resources { srcDir("../leaf-server/src/main/resources") } // Deepslate - project setup
      }
      test {
          java { srcDir("../paper-server/src/test/java") }
          resources { srcDir("../paper-server/src/test/resources") }
-         java { srcDir("../gale-server/src/test/java") } // Leaf - project setup
-         resources { srcDir("../gale-server/src/test/resources") } // Leaf - project setup
 +        java { srcDir("../leaf-server/src/test/java") } // Deepslate - project setup
 +        resources { srcDir("../leaf-server/src/test/resources") } // Deepslate - project setup
      }
  }
 
-@@ -176,7 +_,7 @@
+@@ -160,7 +_,7 @@
  }
 
  dependencies {
--    implementation(project(":leaf-api")) // Gale - project setup - Depend on own API // Leaf - project setup
-+    implementation(project(":deepslateMC-api")) // Gale - project setup - Depend on own API // Leaf - project setup // Deepslate - project setup
+-    implementation(project(":leaf-api")) // Leaf - project setup
++    implementation(project(":deepslateMC-api")) // Leaf - project setup // Deepslate - project setup
 
      // Leaf start - Libraries
      implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.3") { // Leaf config
-@@ -285,14 +_,14 @@
+@@ -270,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
--            "Implementation-Title" to "Leaf", // Gale - branding changes // Leaf - Rebrand
-+            "Implementation-Title" to "DeepslateMC", // Gale - branding changes // Leaf - Rebrand // Deepslate - Rebrand
+-            "Implementation-Title" to "Leaf", // Leaf - Rebrand
++            "Implementation-Title" to "DeepslateMC", // Leaf - Rebrand // Deepslate - Rebrand
              "Implementation-Version" to implementationVersion,
              "Implementation-Vendor" to date,
--            "Specification-Title" to "Leaf", // Gale - branding changes // Leaf - Rebrand
-+            "Specification-Title" to "DeepslateMC", // Gale - branding changes // Leaf - Rebrand // Deepslate - Rebrand
+-            "Specification-Title" to "Leaf", // Leaf - Rebrand
++            "Specification-Title" to "DeepslateMC", // Leaf - Rebrand // Deepslate - Rebrand
              "Specification-Version" to project.version,
--            "Specification-Vendor" to "Winds Studio", // Gale - branding changes // Leaf - Rebrand
--            "Brand-Id" to "winds-studio:leaf", // Gale - branding changes // Leaf - Rebrand
--            "Brand-Name" to "Leaf", // Gale - branding changes // Leaf - Rebrand
-+            "Specification-Vendor" to "Pascalpex", // Gale - branding changes // Leaf - Rebrand // Deepslate - Rebrand
-+            "Brand-Id" to "pascalpex:deepslate", // Gale - branding changes // Leaf - Rebrand // Deepslate - Rebrand
-+            "Brand-Name" to "DeepslateMC", // Gale - branding changes // Leaf - Rebrand // Deepslate - Rebrand
+-            "Specification-Vendor" to "Winds Studio", // Leaf - Rebrand
+-            "Brand-Id" to "winds-studio:leaf", // Leaf - Rebrand
+-            "Brand-Name" to "Leaf", // Leaf - Rebrand
++            "Specification-Vendor" to "Pascalpex", // Leaf - Rebrand // Deepslate - Rebrand
++            "Brand-Id" to "pascalpex:deepslate", // Leaf - Rebrand // Deepslate - Rebrand
++            "Brand-Name" to "DeepslateMC", // Leaf - Rebrand // Deepslate - Rebrand
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,

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

@@ -4,8 +4,8 @@
      private boolean trackingStackTrace = true;
      private StackTraceElement[] uncategorizedStackTrace = new StackTraceElement[0];
      private final SystemReport systemReport = new SystemReport();
--    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER OR GALE! REPORT TO LEAF INSTEAD!", ""); // Leaf - Rebrand
-+    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER, GALE OR LEAF! REPORT TO DEEPSLATEMC INSTEAD!", ""); // Leaf - Rebrand // Deepslate
+-    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO LEAF INSTEAD!", ""); // Leaf - Rebrand
++    private List<String> extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER OR LEAF! REPORT TO DEEPSLATEMC INSTEAD!", ""); // Leaf - Rebrand // Deepslate
 
      public CrashReport(String title, Throwable exception) {
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper

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

@@ -1,8 +1,8 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1671,6 +_,19 @@
+@@ -1500,6 +_,19 @@
      private ServerStatus.Players buildPlayerStatus() {
-         List<ServerPlayer> players = this.playerList.realPlayers; // Leaves - only real player
+         List<ServerPlayer> players = this.playerList.getPlayers();
          int maxPlayers = this.getMaxPlayers();
 +
 +        // Deepslate start - Custom playerlist hover text
@@ -20,7 +20,7 @@
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(maxPlayers, players.size(), List.of());
          } else {
-@@ -1933,7 +_,13 @@
+@@ -1697,7 +_,13 @@
 
      @DontObfuscate
      public String getServerModName() {
@@ -35,7 +35,7 @@
      }
 
      public SystemReport fillSystemReport(SystemReport systemReport) {
-@@ -2104,7 +_,18 @@
+@@ -1868,7 +_,18 @@
 
      public void setMotd(String motd) {
          // Paper start - Adventure

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

@@ -1,10 +1,10 @@
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -238,6 +_,7 @@
+@@ -186,6 +_,7 @@
+         thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
          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
 +        de.pascalpex.deepslatemc.commands.DeepslateCmdRegisterer.registerCommands(this); // Deepslate - register commands
          this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
-         /*// Purpur start - Purpur config files // Purpur - Configurable void damage height and damage
+         com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/gui/MinecraftServerGui.java.patch

@@ -1,29 +1,29 @@
 --- a/net/minecraft/server/gui/MinecraftServerGui.java
 +++ b/net/minecraft/server/gui/MinecraftServerGui.java
-@@ -51,7 +_,7 @@
+@@ -46,7 +_,7 @@
          } catch (Exception var3) {
          }
 
--        final JFrame jFrame = new JFrame(org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName); // Purpur - Improve GUI // Leaf - Configurable server GUI name
-+        final JFrame jFrame = new JFrame(org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName.equalsIgnoreCase("Leaf Console") ? "DeepslateMC Minecraft server" : org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName); // Purpur - Improve GUI // Leaf - Configurable server GUI name // Deepslate
+-        final JFrame jFrame = new JFrame(org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName); // Leaf - Configurable server GUI name
++        final JFrame jFrame = new JFrame(org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName.equalsIgnoreCase("Leaf Console") ? "DeepslateMC Minecraft server" : org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName); // Leaf - Configurable server GUI name // Deepslate
          final MinecraftServerGui minecraftServerGui = new MinecraftServerGui(server);
          jFrame.setDefaultCloseOperation(2);
          jFrame.add(minecraftServerGui);
-@@ -59,7 +_,7 @@
+@@ -54,7 +_,7 @@
          jFrame.setLocationRelativeTo(null);
          jFrame.setVisible(true);
          // Paper start - Improve ServerGUI
--        jFrame.setName(org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName); // Purpur - Improve GUI // Leaf - Configurable server GUI name
-+        jFrame.setName(org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName.equalsIgnoreCase("Leaf Console") ? "DeepslateMC Minecraft server" : org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName); // Purpur - Improve GUI // Leaf - Configurable server GUI name // Deepslate
+-        jFrame.setName(org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName); // Leaf - Configurable server GUI name
++        jFrame.setName(org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName.equalsIgnoreCase("Leaf Console") ? "DeepslateMC Minecraft server" : org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName); // Leaf - Configurable server GUI name // Deepslate
          try {
              jFrame.setIconImage(javax.imageio.ImageIO.read(java.util.Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("logo.png"))));
          } catch (java.io.IOException ignore) {
-@@ -69,7 +_,7 @@
+@@ -64,7 +_,7 @@
              @Override
              public void windowClosing(WindowEvent event) {
                  if (!minecraftServerGui.isClosing.getAndSet(true)) {
--                    jFrame.setTitle(org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName + " - shutting down!"); // Purpur - Improve GUI // Leaf - Configurable server GUI name
-+                    jFrame.setTitle((org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName.equalsIgnoreCase("Leaf Console") ? "DeepslateMC Minecraft server" : org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName) + " - shutting down!"); // Purpur - Improve GUI // Leaf - Configurable server GUI name // Deepslate
+-                    jFrame.setTitle(org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName + " - shutting down!"); // Leaf - Configurable server GUI name
++                    jFrame.setTitle((org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName.equalsIgnoreCase("Leaf Console") ? "DeepslateMC Minecraft server" : org.dreeam.leaf.config.modules.misc.ServerBrand.serverGUIName) + " - shutting down!"); // Leaf - Configurable server GUI name // Deepslate
                      server.halt(true);
                      minecraftServerGui.runFinalizers();
                  }