1.5.2

Fix mod not loading Vigilance dependencies and made Config cleaner

build.gradle

@@ -28,6 +28,13 @@ archivesBaseName = modBaseName
 sourceCompatibility = targetCompatibility = 1.8
 compileJava.options.encoding = 'UTF-8'
 
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+        freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+    }
+}
+
 minecraft {
     version = project.forgeVersion
     runDir = "run"
@@ -89,14 +96,15 @@ shadowJar {
         include(dependency('com.github.wyvest:WyLib:0d5efa2c9a'))
 		include(dependency('club.sk1er:Vigilance:100-10809-SNAPSHOT'))
 		include(dependency('org.projectlombok:lombok:1.18.16'))
+        include(dependency('club.sk1er:UniversalCraft:98-10809-SNAPSHOT'))
+        include(dependency('club.sk1er:Elementa:255-10809-SNAPSHOT'))
     	}
 
-    relocate 'club.sk1er', 'wyvest.sk1er'
+    relocate("club.sk1er", "wyvest.sk1er")
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     archiveName = "$baseName.$extension"
     classifier = ''
     exclude "dummyThing"
-    exclude "club/sk1er/vigilance/example"
     exclude "module-info.class"
 }
 

gradle.properties

@@ -1,5 +1,5 @@
 modGroup=net.wyvest
-modVersion=1.5.1
+modVersion=1.5.2
 modBaseName=TimerHUD
 forgeVersion=1.8.9-11.15.1.2318-1.8.9
 mcpVersion=stable_22

src/main/java/net/wyvest/timer/TimerHUD.java

@@ -27,11 +27,11 @@
  */
 
 @Getter
-@Mod(name = "TimerHUD", version = "1.5.1", modid = "timer")
+@Mod(name = "TimerHUD", version = "1.5.2", modid = "timer")
 public class TimerHUD {
 
     public String modName = "TimerHUD";
-    public String version = "1.5.1";
+    public String version = "1.5.2";
     public String modId = "timer";
     @Setter @Getter private boolean running;
     @Setter @Getter private JsonResponse onlineData;

src/main/java/net/wyvest/timer/config/TimerConfig.kt

@@ -2,12 +2,14 @@
 package net.wyvest.timer.config
 
 import club.sk1er.vigilance.Vigilant
+import club.sk1er.vigilance.data.Category
 import club.sk1er.vigilance.data.Property
 import club.sk1er.vigilance.data.PropertyType
+import club.sk1er.vigilance.data.SortingBehavior
 import java.awt.Color
 import java.io.File
 
-object TimerConfig : Vigilant(File("./config/timerhud.toml"))  {
+object TimerConfig : Vigilant(File("./config/timerhud.toml"), "TimerHUD", sortingBehavior = ConfigSorting)  {
 
     @Property(type = PropertyType.TEXT, name = "Info", description = "You are using TimerHUD Version 1.5.1, made by Wyvest.", category = "General")
     var paragraph = ""
@@ -75,4 +77,21 @@ object TimerConfig : Vigilant(File("./config/timerhud.toml"))  {
     @Property(type = PropertyType.TEXT, name = "chachy", description = "For fixing parts of the build.gradle in v1.5.0.", category = "Credits")
     var credits4 = ""
 
+    init {
+        ::oneColorChroma dependsOn ::chroma
+        initialize()
+    }
+
+    private object ConfigSorting : SortingBehavior() {
+        override fun getCategoryComparator(): Comparator<in Category> {
+            return Comparator { o1, o2 ->
+                if (o1.name == "General") return@Comparator -1
+                if (o2.name == "General") return@Comparator 1
+                else compareValuesBy(o2, o1) {
+                    it.name
+                }
+            }
+        }
+    }
+
 }