Code clean up

build.gradle.kts

@@ -4,8 +4,10 @@ plugins {
     id("java")
 }
 
-val commitID : String = versionBanner()
+val git : String = versionBanner()
-ext["commitID"] = commitID
+val builder : String = builder()
+ext["git_version"] = git
+ext["builder"] = builder
 
 subprojects {
 
@@ -23,13 +25,15 @@ subprojects {
     tasks.processResources {
         filteringCharset = "UTF-8"
 
-        filesMatching(arrayListOf("library-version.properties")) {
+        filesMatching(arrayListOf("custom-fishing.properties")) {
             expand(rootProject.properties)
+            expand(Pair("builder", builder), Pair("git_version", git))
         }
 
         filesMatching(arrayListOf("plugin.yml", "*.yml", "*/*.yml")) {
             expand(
-                Pair("git_version", commitID),
+                Pair("git_version", git),
+                Pair("builder", builder),
                 Pair("project_version", rootProject.properties["project_version"]),
                 Pair("config_version", rootProject.properties["config_version"])
             )
@@ -44,4 +48,13 @@ fun versionBanner(): String {
         standardOutput = os
     }
     return String(os.toByteArray()).trim()
+}
+
+fun builder(): String {
+    val os = ByteArrayOutputStream()
+    project.exec {
+        commandLine = "git config user.name".split(" ")
+        standardOutput = os
+    }
+    return String(os.toByteArray()).trim()
 }

common/src/main/java/net/momirealms/customfishing/common/dependency/CustomFishingProperties.java

@@ -23,27 +23,27 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-public class DependencyProperties {
+public class CustomFishingProperties {
 
-    private final HashMap<String, String> versionMap;
+    private final HashMap<String, String> propertyMap;
 
-    private DependencyProperties(HashMap<String, String> versionMap) {
+    private CustomFishingProperties(HashMap<String, String> propertyMap) {
-        this.versionMap = versionMap;
+        this.propertyMap = propertyMap;
     }
 
-    public static String getDependencyVersion(String dependencyID) {
+    public static String getValue(String key) {
-        if (!SingletonHolder.INSTANCE.versionMap.containsKey(dependencyID)) {
+        if (!SingletonHolder.INSTANCE.propertyMap.containsKey(key)) {
-            throw new RuntimeException("Unknown dependency: " + dependencyID);
+            throw new RuntimeException("Unknown key: " + key);
         }
-        return SingletonHolder.INSTANCE.versionMap.get(dependencyID);
+        return SingletonHolder.INSTANCE.propertyMap.get(key);
     }
 
     private static class SingletonHolder {
 
-        private static final DependencyProperties INSTANCE = getInstance();
+        private static final CustomFishingProperties INSTANCE = getInstance();
 
-        private static DependencyProperties getInstance() {
+        private static CustomFishingProperties getInstance() {
-             try (InputStream inputStream = DependencyProperties.class.getClassLoader().getResourceAsStream("library-version.properties")) {
+             try (InputStream inputStream = CustomFishingProperties.class.getClassLoader().getResourceAsStream("custom-fishing.properties")) {
                  HashMap<String, String> versionMap = new HashMap<>();
                  Properties properties = new Properties();
                  properties.load(inputStream);
@@ -52,7 +52,7 @@ public class DependencyProperties {
                          versionMap.put(key, value);
                      }
                  }
-                 return new DependencyProperties(versionMap);
+                 return new CustomFishingProperties(versionMap);
              } catch (IOException e) {
                  throw new RuntimeException(e);
              }

common/src/main/java/net/momirealms/customfishing/common/dependency/Dependency.java

@@ -307,7 +307,7 @@ public enum Dependency {
     }
 
     public String getVersion() {
-        return DependencyProperties.getDependencyVersion(customArtifactID);
+        return CustomFishingProperties.getValue(customArtifactID);
     }
 
     private static String rewriteEscaping(String s) {

common/src/main/resources/custom-fishing.properties

@@ -1,3 +1,5 @@
+builder=${builder}
+git=${git_version}
 config=${config_version}
 asm=${asm_version}
 asm-commons=${asm_commons_version}

core/build.gradle.kts

@@ -1,4 +1,4 @@
-val commitID: String by project
+val git_version: String by project
 
 plugins {
     id("io.github.goooler.shadow") version "8.1.8"
@@ -58,7 +58,7 @@ dependencies {
 
 tasks {
     shadowJar {
-        archiveFileName = "CustomFishing-${rootProject.properties["project_version"]}-${commitID}.jar"
+        archiveFileName = "CustomFishing-${rootProject.properties["project_version"]}-${git_version}.jar"
         destinationDirectory.set(file("$rootDir/target"))
         relocate("net.kyori", "net.momirealms.customfishing.libraries")
         relocate("org.incendo", "net.momirealms.customfishing.libraries")

core/src/main/java/net/momirealms/customfishing/bukkit/BukkitCustomFishingPluginImpl.java

@@ -47,6 +47,7 @@ import net.momirealms.customfishing.bukkit.sender.BukkitSenderFactory;
 import net.momirealms.customfishing.bukkit.statistic.BukkitStatisticsManager;
 import net.momirealms.customfishing.bukkit.storage.BukkitStorageManager;
 import net.momirealms.customfishing.bukkit.totem.BukkitTotemManager;
+import net.momirealms.customfishing.common.dependency.CustomFishingProperties;
 import net.momirealms.customfishing.common.dependency.Dependency;
 import net.momirealms.customfishing.common.dependency.DependencyManagerImpl;
 import net.momirealms.customfishing.common.helper.VersionHelper;
@@ -148,7 +149,7 @@ public class BukkitCustomFishingPluginImpl extends BukkitCustomFishingPlugin {
         if (downloadFromPolymart || downloadFromBBB) {
             this.getPluginLogger().info("License holder: " + username + "." + user);
         } else {
-            this.debug("You are using a compiled version from Github.");
+            this.getPluginLogger().info("You are using a compiled version. Built by: " + CustomFishingProperties.getValue("builder") + " Commit ID: " + CustomFishingProperties.getValue("git"));
         }
 
         if (ConfigManager.checkUpdate()) {

core/src/main/java/net/momirealms/customfishing/bukkit/bag/BukkitBagManager.java

@@ -29,7 +29,6 @@ import net.momirealms.customfishing.api.mechanic.bag.FishingBagHolder;
 import net.momirealms.customfishing.api.mechanic.context.Context;
 import net.momirealms.customfishing.api.mechanic.requirement.Requirement;
 import net.momirealms.customfishing.api.mechanic.requirement.RequirementManager;
-import net.momirealms.customfishing.api.storage.DataStorageProvider;
 import net.momirealms.customfishing.api.storage.user.UserData;
 import net.momirealms.customfishing.api.util.EventUtils;
 import net.momirealms.customfishing.bukkit.config.BukkitConfigManager;

core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java

@@ -67,7 +67,7 @@ import net.momirealms.customfishing.bukkit.totem.particle.ParticleSetting;
 import net.momirealms.customfishing.bukkit.util.ItemStackUtils;
 import net.momirealms.customfishing.bukkit.util.ParticleUtils;
 import net.momirealms.customfishing.common.config.node.Node;
-import net.momirealms.customfishing.common.dependency.DependencyProperties;
+import net.momirealms.customfishing.common.dependency.CustomFishingProperties;
 import net.momirealms.customfishing.common.helper.AdventureHelper;
 import net.momirealms.customfishing.common.helper.VersionHelper;
 import net.momirealms.customfishing.common.item.AbstractItem;
@@ -116,7 +116,7 @@ public class BukkitConfigManager extends ConfigManager {
 
     @Override
     public void load() {
-        String configVersion = DependencyProperties.getDependencyVersion("config");
+        String configVersion = CustomFishingProperties.getValue("config");
         try (InputStream inputStream = new FileInputStream(resolveConfig("config.yml").toFile())) {
             MAIN_CONFIG = YamlDocument.create(
                     inputStream,