Added configurable tree support to clickgui

Ali00035 · Oct 18, 2021 · 99e1f21 · 99e1f21
1 parent 854b338
commit 99e1f21
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 12 deletions.
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/config/ConfigSystem.kt b/src/main/kotlin/net/ccbluex/liquidbounce/config/ConfigSystem.kt
@@ -18,7 +18,9 @@
  */
 package net.ccbluex.liquidbounce.config
 
-import com.google.gson.*
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonElement
+import com.google.gson.JsonParser
 import com.google.gson.reflect.TypeToken
 import net.ccbluex.liquidbounce.LiquidBounce
 import net.ccbluex.liquidbounce.config.adapter.*
@@ -84,7 +86,7 @@ object ConfigSystem {
      */
     fun load() {
         for (configurable in configurables) { // Make a new .json file to save our root configurable
-            File(rootFolder, "${configurable.name}.json").runCatching {
+            File(rootFolder, "${configurable.name.lowercase()}.json").runCatching {
                 if (!exists()) {
                     store()
                     return@runCatching
@@ -155,7 +157,7 @@ object ConfigSystem {
      */
     fun store() {
         for (configurable in configurables) { // Make a new .json file to save our root configurable
-            File(rootFolder, "${configurable.name}.json").runCatching {
+            File(rootFolder, "${configurable.name.lowercase()}.json").runCatching {
                 if (!exists()) {
                     createNewFile().let { logger.debug("Created new file (status: $it)") }
                 }

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/command/CommandManager.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/command/CommandManager.kt
@@ -97,7 +97,7 @@ object CommandManager : Iterable<Command> {
 
     internal val commands = mutableListOf<Command>()
 
-    object Options : Configurable("commands") {
+    object Options : Configurable("Commands") {
         /**
          * The prefix of the commands.
          *

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/misc/FriendManager.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/misc/FriendManager.kt
@@ -24,7 +24,7 @@ import net.ccbluex.liquidbounce.config.Configurable
 import net.ccbluex.liquidbounce.config.ListValueType
 import java.util.*
 
-object FriendManager : Configurable("friends") {
+object FriendManager : Configurable("Friends") {
 
     val friends by value(name, TreeSet<Friend>(), listType = ListValueType.Friend)
 

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/misc/ProxyManager.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/misc/ProxyManager.kt
@@ -32,7 +32,7 @@ import java.util.*
 /**
  * Proxy Manager
  */
-object ProxyManager : Configurable("proxies") {
+object ProxyManager : Configurable("Proxies") {
 
     val proxies by value(name, TreeSet<Proxy>(), listType = ListValueType.Proxy)
 

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/render/Fonts.kt b/src/main/kotlin/net/ccbluex/liquidbounce/render/Fonts.kt
@@ -42,7 +42,7 @@ object Fonts {
         }
     }
 
-    private object Options : Configurable("fonts") {
+    private object Options : Configurable("Fonts") {
 
         val fonts by value(
             "Fonts",

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/RotationsUtil.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/aiming/RotationsUtil.kt
@@ -38,7 +38,7 @@ import kotlin.math.sqrt
 /**
  * Configurable to configure the dynamic rotation engine
  */
-class RotationsConfigurable : Configurable("rotations") {
+class RotationsConfigurable : Configurable("Rotations") {
     val turnSpeed by curve("TurnSpeed", arrayOf(4f, 7f, 10f, 3f, 2f, 0.7f))
     val fixVelocity by boolean("FixVelocity", true)
 }

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/CombatExtensions.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/CombatExtensions.kt
@@ -37,7 +37,7 @@ val globalEnemyConfigurable = EnemyConfigurable()
 /**
  * Configurable to configure which entities and their state (like being dead) should be considered as enemy
  */
-class EnemyConfigurable : Configurable("enemies") {
+class EnemyConfigurable : Configurable("Enemies") {
 
     // Players should be considered as a enemy
     val players by boolean("Players", true)

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt
@@ -31,7 +31,7 @@ import net.minecraft.entity.LivingEntity
 /**
  * A target tracker to choose the best enemy to attack
  */
-class TargetTracker(defaultPriority: PriorityEnum = PriorityEnum.HEALTH) : Configurable("target") {
+class TargetTracker(defaultPriority: PriorityEnum = PriorityEnum.HEALTH) : Configurable("Target") {
 
     var lockedOnTarget: Entity? = null
     var maxDistanceSquared: Double = 0.0

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/item/InventoryExtensions.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/item/InventoryExtensions.kt
@@ -34,7 +34,7 @@ fun convertClientSlotToServerSlot(slot: Int): Int {
 /**
  * Configurable to configure the dynamic rotation engine
  */
-class InventoryConstraintsConfigurable : Configurable("inventoryConstraints") {
+class InventoryConstraintsConfigurable : Configurable("InventoryConstraints") {
     internal var delay by intRange("Delay", 2..4, 0..20)
     internal val invOpen by boolean("InvOpen", false)
     internal val simulateInventory by boolean("SimulateInventory", true)

diff --git a/theme b/theme