From 25d8f8a0e4efdb98a6ebe476bf86f123c7141b92 Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Fri, 21 Jun 2024 01:15:28 +0200
Subject: [PATCH] merge upstream

---
 core/build.gradle.kts                                       | 6 +++---
 .../main/java-templates/org/geysermc/geyser/BuildData.java  | 2 ++
 core/src/main/java/org/geysermc/geyser/GeyserImpl.java      | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 3e18d1ec2..fe2576462 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -75,7 +75,7 @@ tasks.processResources {
         expand(
             "branch" to info.branch,
             "buildNumber" to info.buildNumber,
-            "projectVersion" to project.version,
+            "projectVersion" to info.version,
             "commit" to info.commit,
             "commitAbbrev" to info.commitAbbrev,
             "commitMessage" to info.commitMessage,
@@ -95,13 +95,13 @@ sourceSets {
                 property("branch", info.branch)
                 property("commit", info.commit)
                 property("repository", info.repository)
-                property("devVersion", info.isDev)
+                property("devVersion", info.isDev.toString())
             }
         }
     }
 }
 
-fun Project.buildNumber(): Int =
+fun buildNumber(): Int =
     (System.getenv("BUILD_NUMBER"))?.let { Integer.parseInt(it) } ?: -1
 
 fun isDevBuild(branch: String, repository: String): Boolean {
diff --git a/core/src/main/java-templates/org/geysermc/geyser/BuildData.java b/core/src/main/java-templates/org/geysermc/geyser/BuildData.java
index d489d8d17..99171b9c8 100644
--- a/core/src/main/java-templates/org/geysermc/geyser/BuildData.java
+++ b/core/src/main/java-templates/org/geysermc/geyser/BuildData.java
@@ -34,4 +34,6 @@ public class BuildData {
     public static final String BRANCH = "{{ branch }}";
     public static final String COMMIT = "{{ commit }}";
     public static final String REPOSITORY = "{{ repository }}";
+
+    public static final String DEV = "{{ devVersion }}";
 }
diff --git a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
index 8416ed51c..f2ec30b31 100644
--- a/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
+++ b/core/src/main/java/org/geysermc/geyser/GeyserImpl.java
@@ -123,8 +123,7 @@ public class GeyserImpl implements GeyserApi {
     public static final String COMMIT = BuildData.COMMIT;
     public static final String REPOSITORY = BuildData.REPOSITORY;
 
-    @SuppressWarnings("ConstantValue")
-    public static final boolean IS_DEV = Boolean.parseBoolean("${dev}");
+    public static final boolean IS_DEV = Boolean.parseBoolean(BuildData.DEV);
 
     /**
      * Oauth client ID for Microsoft authentication