From 703131a72792ae8f27f6a0ae81fd0166f965df68 Mon Sep 17 00:00:00 2001
From: mohammed jasem alaajel <xrambad@gmail.com>
Date: Thu, 23 Mar 2023 15:33:29 +0400
Subject: [PATCH] remove all branch stuff

---
 .github/workflows/maven.yml                    |  2 +-
 RedisBungee-API/build.gradle.kts               | 18 +-----------------
 .../minecraft/redisbungee/Constants.java       |  5 ++++-
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ed84e2f..c787171 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -22,7 +22,7 @@ jobs:
         java-version: '11'
         distribution: 'adopt'
     - name: Build with gradle
-      run: ./gradlew shadowJar -Dbranch=${{ vars.GITHUB_REF_NAME }}
+      run: ./gradlew shadowJar
     - name: Upload Bungee
       uses: actions/upload-artifact@v2.2.3
       with:
diff --git a/RedisBungee-API/build.gradle.kts b/RedisBungee-API/build.gradle.kts
index 3f8a97a..71bee84 100644
--- a/RedisBungee-API/build.gradle.kts
+++ b/RedisBungee-API/build.gradle.kts
@@ -32,31 +32,15 @@ description = "RedisBungee interafaces"
 blossom {
     replaceToken("@version@", "$version")
     // GIT
-    var branch: String = ""
     var commit: String = ""
-    val branchProp = System.getProperty("branch")
-    if (branchProp != null) {
-        branch = branchProp;
-    } else {
-        val branchStdout = ByteArrayOutputStream()
-        rootProject.exec {
-            standardOutput = branchStdout
-            commandLine("git", "branch", "--show-current")
-        }
-        branch = branchStdout.toString().replace("\n", "")
-        branchStdout.close()
-    }
     val commitStdout = ByteArrayOutputStream()
     rootProject.exec {
         standardOutput = commitStdout
         commandLine("git", "rev-parse", "HEAD")
     }
-    commit = "$commitStdout".replace("\n", "");
+    commit = "$commitStdout".replace("\n", "") // for some reason it adds new line so remove it.
     commitStdout.close()
-
-    replaceToken("@git_branch@", branch)
     replaceToken("@git_commit@", commit)
-
 }
 
 java {
diff --git a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java
index 0d90c24..a8a980d 100644
--- a/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java
+++ b/RedisBungee-API/src/main/java/com/imaginarycode/minecraft/redisbungee/Constants.java
@@ -3,7 +3,10 @@ package com.imaginarycode.minecraft.redisbungee;
 public class Constants {
 
     public final static String VERSION = "@version@";
-    public final static String GIT_BRANCH = "@git_branch@";
     public final static String GIT_COMMIT = "@git_commit@";
 
+    public static String getGithubCommitLink() {
+        return "https://github.com/ProxioDev/RedisBungee/commit/" + GIT_COMMIT;
+    }
+
 }