Add branch and commit info to server starting message

AirflowMC · Sep 22, 2024 · c4679b4 · c4679b4
1 parent 8120d74
commit c4679b4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Airflow-Server/patches/0001-Let-the-air-flow.patch b/Airflow-Server/patches/0001-Let-the-air-flow.patch
@@ -70,7 +70,7 @@ index 8f55652820ee340addf8e221f792d4f29b47e726..9e7502f04edc25977b90662718617cb4
 +    // Airflow end
  }
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index b406930be0d896371c7d2ee0a22b987bc2408bef..492c3117f2eee29a7054fda2c0e4e4b5886eb2af 100644
+index b406930be0d896371c7d2ee0a22b987bc2408bef..ca468cf3a3835b6db81bd0918645ea643d1df56f 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -80,6 +80,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -105,7 +105,7 @@ index b406930be0d896371c7d2ee0a22b987bc2408bef..492c3117f2eee29a7054fda2c0e4e4b5
          thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(LOGGER));
          thread.start();
 -        LOGGER.info("Starting minecraft server version {}", SharedConstants.getCurrentVersion().getName());
-+        LOGGER.info("Starting {} minecraft server version {}", getServerModName(), SharedConstants.getCurrentVersion().getName());
++        LOGGER.info("Starting {} minecraft server version {}-{}@{}", getServerModName(), SharedConstants.getCurrentVersion().getName(), airflow.version.getBranch(), airflow.version.getShortCommit());
          if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {
              LOGGER.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
          }

diff --git a/Airflow-Server/patches/0003-Command-API.patch b/Airflow-Server/patches/0003-Command-API.patch
@@ -324,7 +324,7 @@ index ebacf8b467cae4224a5ba2ed651de56b14f84041..b17d18f8c07a506c0022175d3e439191
          public void close() {
              IOUtils.closeQuietly((Writer)this.output);
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index 492c3117f2eee29a7054fda2c0e4e4b5886eb2af..a7f9ed38ec466485f91c31354da07c9fad87de21 100644
+index ca468cf3a3835b6db81bd0918645ea643d1df56f..427928e13bb6004a6761e85180fd6f720e95e5fd 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -67,7 +67,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface

diff --git a/Airflow-Server/patches/0009-Better-terminal.patch b/Airflow-Server/patches/0009-Better-terminal.patch
@@ -22,7 +22,7 @@ index 72732dff3952d60b2639da255f3be648292f2646..ec526493a1e0a0c7c8637a0ec06dd41c
 
      public KeyPair getKeyPair() {
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index a7f9ed38ec466485f91c31354da07c9fad87de21..13baf0b2c53fbcc093fa1fc09791f4b5b0c19a85 100644
+index 427928e13bb6004a6761e85180fd6f720e95e5fd..184e8b65a8b361a9b39023890ebe4890eab638c3 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -108,6 +108,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface

diff --git a/...ovider/AirPlainTextComponentProvider.java → ...PlainTextComponentSerializerProvider.java b/...ovider/AirPlainTextComponentProvider.java → ...PlainTextComponentSerializerProvider.java
@@ -7,7 +7,7 @@
 import java.util.function.Consumer;
 
 @SuppressWarnings("UnstableApiUsage")
-public class AirPlainTextComponentProvider implements PlainTextComponentSerializer.Provider {
+public class AirPlainTextComponentSerializerProvider implements PlainTextComponentSerializer.Provider {
     @Override
     public @NotNull PlainTextComponentSerializer plainTextSimple() {
         return PlainTextComponentSerializer.builder().flattener(AdventureUtils.FLATTENER).build();

diff --git a/.../services/net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.Provider b/.../services/net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.Provider
@@ -1 +1 @@
-me.glicz.airflow.adventure.provider.AirPlainTextComponentProvider
+me.glicz.airflow.adventure.provider.AirPlainTextComponentSerializerProvider
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		me.glicz.airflow.adventure.provider.AirPlainTextComponentProvider
		me.glicz.airflow.adventure.provider.AirPlainTextComponentSerializerProvider