Fixed comments in metrics

Author: Pascalpex

deepslateMC-server/build.gradle.kts.patch

@@ -1,6 +1,17 @@
 --- a/leaf-server/build.gradle.kts
 +++ b/leaf-server/build.gradle.kts
-@@ -39,7 +_,30 @@
+@@ -17,8 +_,8 @@
+ 
+ dependencies {
+     mache("io.papermc:mache:1.21.5+build.1")
+-    paperclip("io.papermc:paperclip:3.0.3") // Temp fix until maven repo renew the SSL
+-    //paperclip("cn.dreeam:quantumleaper:1.0.0-SNAPSHOT") // Leaf - project setup - Use own paperclip fork
++    //paperclip("io.papermc:paperclip:3.0.3") // Temp fix until maven repo renew the SSL
++    paperclip("cn.dreeam:quantumleaper:1.0.0-SNAPSHOT") // Leaf - project setup - Use own paperclip fork
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+ }
+ 
+@@ -40,7 +_,30 @@
          }
      }
 
@@ -32,7 +43,7 @@
      // Leaf end - project setup
 
      spigot {
-@@ -128,10 +_,14 @@
+@@ -129,10 +_,14 @@
      main {
          java { srcDir("../paper-server/src/main/java") }
          resources { srcDir("../paper-server/src/main/resources") }
@@ -47,7 +58,7 @@
      }
  }
 
-@@ -160,7 +_,7 @@
+@@ -161,7 +_,7 @@
  }
 
  dependencies {
@@ -56,7 +67,7 @@
 
      // Leaf start - Libraries
      implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.3") { // Leaf config
-@@ -270,14 +_,14 @@
+@@ -271,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",

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
-@@ -1657,6 +_,19 @@
+@@ -1658,6 +_,19 @@
      private ServerStatus.Players buildPlayerStatus() {
          List<ServerPlayer> players = this.playerList.getPlayers();
          int maxPlayers = this.getMaxPlayers();
@@ -20,7 +20,7 @@
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(maxPlayers, players.size(), List.of());
          } else {
-@@ -1872,7 +_,13 @@
+@@ -1873,7 +_,13 @@
 
      @DontObfuscate
      public String getServerModName() {
@@ -35,7 +35,7 @@
      }
 
      public SystemReport fillSystemReport(SystemReport systemReport) {
-@@ -2043,7 +_,18 @@
+@@ -2044,7 +_,18 @@
 
      public void setMotd(String motd) {
          // Paper start - Adventure

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1482,7 +_,7 @@
+@@ -1477,7 +_,7 @@
                                              io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
                                                      toX, toY, toZ, toYaw, toPitch, true);
                                              if (!event.isAllowed()) {
@@ -9,7 +9,7 @@
                                                  LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getName().getString(), d3, d4, d5);
                                                  }
                                                  this.teleport(
-@@ -1559,7 +_,7 @@
+@@ -1554,7 +_,7 @@
                                              toX, toY, toZ, toYaw, toPitch, true);
                                      if (!event.isAllowed()) {
                                          movedWrongly = true;

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
-@@ -337,6 +_,19 @@
+@@ -344,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()) {
-@@ -688,6 +_,14 @@
+@@ -696,6 +_,14 @@
              }
          }
          this.cserver.getPluginManager().callEvent(event);

deepslateMC-server/paper-patches/files/src/main/java/com/destroystokyo/paper/Metrics.java.patch

@@ -5,7 +5,7 @@
              // Only start Metrics, if it's enabled in the config
              if (config.getBoolean("enabled", true)) {
 -                Metrics metrics = new Metrics("Leaf", serverUUID, logFailedRequests, Bukkit.getLogger()); // Gale - branding changes - metrics // Leaf - metrics
-+                Metrics metrics = new Metrics("DeepslateMC", serverUUID, logFailedRequests, Bukkit.getLogger()); // Gale - branding changes - metrics // Deepslate
++                Metrics metrics = new Metrics("DeepslateMC", serverUUID, logFailedRequests, Bukkit.getLogger()); // Gale - branding changes - metrics // Leaf - metrics // Deepslate
 
                  metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
                      String minecraftVersion = Bukkit.getVersion();
@@ -14,18 +14,18 @@
                  metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
                  metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline"));
 -                final String leafVersion; // Gale - branding changes - metrics // Leaf - metrics
-+                final String deepslateVersion; // Gale - branding changes - metrics // Deepslate
++                final String deepslateVersion; // Gale - branding changes - metrics // Leaf - metrics // Deepslate
                  final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
                  if (implVersion != null) {
                      final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
 -                    leafVersion = "git-Leaf-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - metrics // Leaf - metrics
-+                    deepslateVersion = "git-DeepslateMC-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - metrics // Deepslate
++                    deepslateVersion = "git-DeepslateMC-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - metrics // Leaf - metrics // Deepslate
                  } else {
 -                    leafVersion = "unknown"; // Gale - branding changes - metrics // Leaf - metrics
-+                    deepslateVersion = "unknown"; // Gale - branding changes - metrics // Deepslate
++                    deepslateVersion = "unknown"; // Gale - branding changes - metrics // Leaf - metrics // Deepslate
                  }
 -                metrics.addCustomChart(new Metrics.SimplePie("leaf_version", () -> leafVersion)); // Gale - branding changes - metrics // Leaf - metrics
-+                metrics.addCustomChart(new Metrics.SimplePie("deepslatemc_version", () -> deepslateVersion)); // Gale - branding changes - metrics // Deepslate
++                metrics.addCustomChart(new Metrics.SimplePie("deepslatemc_version", () -> deepslateVersion)); // Gale - branding changes - metrics // Leaf - metrics // Deepslate
 
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>(2); // Gale - metrics - reduce HashMap capacity

gradle.properties

@@ -1,7 +1,7 @@
 group=de.pascalpex.deepslatemc
 version=1.21.5-R0.1-SNAPSHOT
 mcVersion=1.21.5
-leafRef=5e1be48cf8cc010e0e145fe7cbbb6d02dc2f3800
+leafRef=5f084ba437c19630d86350d01a04092efe896905
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true