Merge branch '1.21.5' into improvement/build-simulator

Author: beanbag44

src/main/kotlin/com/lambda/config/settings/NumericSetting.kt

@@ -96,21 +96,23 @@ abstract class NumericSetting<T>(
         }
     }
 
-    @SettingGroup.SettingEditorDsl
-    @Suppress("unchecked_cast")
-    fun SettingGroup.TypedEditBuilder<T>.range(range: ClosedRange<T>) {
-        (settings as Collection<NumericSetting<T>>).forEach { it.range = range }
-    }
+    companion object {
+        @SettingGroup.SettingEditorDsl
+        @Suppress("unchecked_cast")
+        fun <T> SettingGroup.TypedEditBuilder<T>.range(range: ClosedRange<T>) where T : Number, T : Comparable<T> {
+            (settings as Collection<NumericSetting<T>>).forEach { it.range = range }
+        }
 
-    @SettingGroup.SettingEditorDsl
-    @Suppress("unchecked_cast")
-    fun SettingGroup.TypedEditBuilder<T>.step(step: T) {
-        (settings as Collection<NumericSetting<T>>).forEach { it.step = step }
-    }
+        @SettingGroup.SettingEditorDsl
+        @Suppress("unchecked_cast")
+        fun <T> SettingGroup.TypedEditBuilder<T>.step(step: T) where T : Number, T : Comparable<T> {
+            (settings as Collection<NumericSetting<T>>).forEach { it.step = step }
+        }
 
-    @SettingGroup.SettingEditorDsl
-    @Suppress("unchecked_cast")
-    fun SettingGroup.TypedEditBuilder<*>.unit(unit: String) {
-        (settings as Collection<NumericSetting<T>>).forEach { it.unit = unit}
+        @SettingGroup.SettingEditorDsl
+        @Suppress("unchecked_cast")
+        fun <T> SettingGroup.TypedEditBuilder<T>.unit(unit: String) where T : Number, T : Comparable<T> {
+            (settings as Collection<NumericSetting<T>>).forEach { it.unit = unit}
+        }
     }
 }

src/main/kotlin/com/lambda/config/settings/StringSetting.kt

@@ -63,15 +63,17 @@ class StringSetting(
         }
     }
 
-    @SettingGroup.SettingEditorDsl
-    @Suppress("unchecked_cast")
-    fun SettingGroup.TypedEditBuilder<String>.multiline(multiline: Boolean) {
-        (settings as Collection<StringSetting>).forEach { it.multiline = multiline }
-    }
+    companion object {
+        @SettingGroup.SettingEditorDsl
+        @Suppress("unchecked_cast")
+        fun SettingGroup.TypedEditBuilder<String>.multiline(multiline: Boolean) {
+            (settings as Collection<StringSetting>).forEach { it.multiline = multiline }
+        }
 
-    @SettingGroup.SettingEditorDsl
-    @Suppress("unchecked_cast")
-    fun SettingGroup.TypedEditBuilder<String>.flags(flags: Int) {
-        (settings as Collection<StringSetting>).forEach { it.flags = flags }
+        @SettingGroup.SettingEditorDsl
+        @Suppress("unchecked_cast")
+        fun SettingGroup.TypedEditBuilder<String>.flags(flags: Int) {
+            (settings as Collection<StringSetting>).forEach { it.flags = flags }
+        }
     }
 }

src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt

@@ -74,9 +74,11 @@ class ListSetting<T : Any>(
         value = strList
     }
 
-    @SettingGroup.SettingEditorDsl
-    @Suppress("unchecked_cast")
-    fun <T> SettingGroup.TypedEditBuilder<MutableList<T>>.immutableList(immutableList: List<T>) {
-        (settings as Collection<ListSetting<T>>).forEach { it.immutableList = immutableList }
+    companion object {
+        @SettingGroup.SettingEditorDsl
+        @Suppress("unchecked_cast")
+        fun <T : Any> SettingGroup.TypedEditBuilder<MutableList<T>>.immutableList(immutableList: List<T>) {
+            (settings as Collection<ListSetting<T>>).forEach { it.immutableList = immutableList }
+        }
     }
 }

src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt

@@ -75,9 +75,11 @@ class SetSetting<T : Any>(
         value = strSet
     }
 
-    @SettingGroup.SettingEditorDsl
-    @Suppress("unchecked_cast")
-    fun <T> SettingGroup.TypedEditBuilder<MutableSet<T>>.immutableSet(immutableSet: Set<T>) {
-        (settings as Collection<SetSetting<T>>).forEach { it.immutableSet = immutableSet }
+    companion object {
+        @SettingGroup.SettingEditorDsl
+        @Suppress("unchecked_cast")
+        fun <T : Any> SettingGroup.TypedEditBuilder<MutableSet<T>>.immutableSet(immutableSet: Set<T>) {
+            (settings as Collection<SetSetting<T>>).forEach { it.immutableSet = immutableSet }
+        }
     }
 }

src/main/kotlin/com/lambda/util/EnchantmentUtils.kt

@@ -34,34 +34,29 @@ object EnchantmentUtils {
         get() = getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT)
 
     /**
-     * Returns whether the given [ItemStack] has enchantments
+     * Returns whether the given [ItemStack] has enchantments, including enchantments on books
      */
     val ItemStack.hasEnchantments: Boolean
         get() = !getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT).isEmpty
-                || getOrDefault(DataComponentTypes.STORED_ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT).isEmpty
+                || !getOrDefault(DataComponentTypes.STORED_ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT).isEmpty
 
     /**
      * Returns the given enchantment level from a [net.minecraft.item.ItemStack]
      */
     fun ItemStack.getEnchantment(key: RegistryKey<Enchantment>) =
-        getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT)
-            .enchantmentEntries.find { it.key?.matchesKey(key) == true }
-            ?.intValue
-            ?: 0
+        enchantments.enchantmentEntries.find { it.key?.matchesKey(key) == true }?.intValue ?: 0
 
     /**
      * Iterates over all the enchantments for the given [ItemStack]
      */
     fun <T> ItemStack.forEachEnchantment(block: (RegistryEntry<Enchantment>, Int) -> T) =
-        enchantments.enchantmentEntries.asSequence()
-            .map { block(it.key, it.intValue) }
+        enchantments.enchantmentEntries.map { block(it.key, it.intValue) }
 
     /**
      * Iterates over all the enchantments of the given [net.minecraft.entity.LivingEntity]'s [EquipmentSlot]
      */
     fun <T> LivingEntity.forEachSlot(
         vararg slots: EquipmentSlot,
         block: (entry: RegistryEntry<Enchantment>, level: Int) -> T
-    ) =
-        slots.flatMap { getEquippedStack(it).forEachEnchantment(block) }
+    ) = slots.flatMap { getEquippedStack(it).forEachEnchantment(block) }
 }