Merge branch '1.21.5' into refactor/collection-codec

Author: beanbag44

src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.config.settings.comparable
 
+import com.google.gson.JsonElement
 import com.google.gson.reflect.TypeToken
 import com.lambda.brigadier.CommandResult.Companion.failure
 import com.lambda.brigadier.CommandResult.Companion.success
@@ -52,6 +53,11 @@ class EnumSetting<T : Enum<T>>(
         value = value.enumValues[to % value.enumValues.size]
     }
 
+    override fun loadFromJson(serialized: JsonElement) {
+        super.loadFromJson(serialized)
+        index = value.ordinal // super bug fix for imgui
+    }
+
     override fun ImGuiBuilder.buildLayout() {
         val values = value.enumValues
         val currentDisplay = value.displayValue