chore: Move ItemSlotType to package of ItemSlot (#7598)

Author: MukjepScarlet

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/cheststealer/ModuleChestStealer.kt

@@ -28,7 +28,6 @@ import net.ccbluex.liquidbounce.features.module.modules.player.cheststealer.feat
 import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.CleanupPlanGenerator
 import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.InventoryCleanupPlan
 import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ItemCategorization
-import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ItemSlotType
 import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ModuleInventoryCleaner
 import net.ccbluex.liquidbounce.utils.inventory.CheckScreenHandlerTypeConfigurable
 import net.ccbluex.liquidbounce.utils.inventory.CheckScreenTitleConfigurable
@@ -231,7 +230,7 @@ object ModuleChestStealer : ClientModule("ChestStealer", Category.PLAYER) {
         val freeSlotsInInv = mainInventory.count { it.itemStack.isEmpty }
 
         val spaceGainedThroughMerge = cleanupPlan.mergeableItems.entries.sumOf { (id, slots) ->
-            val slotsInChest = slots.count { it.slotType == ItemSlotType.CONTAINER }
+            val slotsInChest = slots.count { it.slotType == ItemSlot.Type.CONTAINER }
             val totalCount = slots.sumOf { it.itemStack.count }
 
             val mergedStackCount = ceil(totalCount.toDouble() / id.item.defaultMaxStackSize.toDouble()).toInt()
@@ -255,7 +254,7 @@ object ModuleChestStealer : ClientModule("ChestStealer", Category.PLAYER) {
         for (i in cleanupPlan.swaps.indices) {
             val hotbarSwap = cleanupPlan.swaps[i]
             // We only care about swaps from the chest to the hotbar
-            if (hotbarSwap.from.slotType != ItemSlotType.CONTAINER) {
+            if (hotbarSwap.from.slotType != ItemSlot.Type.CONTAINER) {
                 continue
             }
 

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/invcleaner/CleanupPlanGenerator.kt

@@ -164,15 +164,3 @@ class CleanupPlanPlacementTemplate(
     val forbiddenSlots: Set<ItemSlot>,
     val forbiddenSlotsToFill: Set<ItemSlot>
 )
-
-enum class ItemSlotType {
-    HOTBAR,
-    OFFHAND,
-    ARMOR,
-    INVENTORY,
-
-    /**
-     * e.g. chests
-     */
-    CONTAINER,
-}

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/invcleaner/ItemCategorization.kt

@@ -178,7 +178,7 @@ class ItemCategorization(
     companion object {
         @JvmStatic
         private fun constructArmorPiece(item: Item, id: Int): ArmorPiece {
-            return ArmorPiece(VirtualItemSlot(item.defaultInstance, ItemSlotType.ARMOR, id))
+            return ArmorPiece(VirtualItemSlot(item.defaultInstance, ItemSlot.Type.ARMOR, id))
         }
 
         /**
@@ -196,7 +196,7 @@ class ItemCategorization(
     /**
      * Sometimes there are situations where armor pieces are not the best ones with the current armor, but become
      * the best ones as soon as we upgrade one of the other armor pieces.
-     * In those cases we don't want to miss out on this armor piece in the future thus we keep it.
+     * In those cases, we don't want to miss out on this armor piece in the future thus we keep it.
      */
     private val futureArmorToKeep: List<ItemSlot>
     private val armorComparator: ArmorComparator

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/player/invcleaner/items/ItemFacet.kt

@@ -21,7 +21,6 @@ package net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.items
 import it.unimi.dsi.fastutil.objects.ObjectIntPair
 import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ItemCategory
 import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ItemFunction
-import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ItemSlotType
 import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ItemType
 import net.ccbluex.liquidbounce.utils.inventory.ItemSlot
 import net.ccbluex.liquidbounce.utils.item.durability
@@ -40,7 +39,7 @@ open class ItemFacet(val itemSlot: ItemSlot) : Comparable<ItemFacet> {
         get() = this.itemSlot.itemStack
 
     val isInHotbar: Boolean
-        get() = this.itemSlot.slotType == ItemSlotType.HOTBAR || this.itemSlot.slotType == ItemSlotType.OFFHAND
+        get() = this.itemSlot.slotType == ItemSlot.Type.HOTBAR || this.itemSlot.slotType == ItemSlot.Type.OFFHAND
 
     open fun isSignificantlyBetter(other: ItemFacet): Boolean {
         return false

src/main/kotlin/net/ccbluex/liquidbounce/utils/inventory/ItemSlot.kt

@@ -18,7 +18,6 @@
  */
 package net.ccbluex.liquidbounce.utils.inventory
 
-import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ItemSlotType
 import net.ccbluex.liquidbounce.utils.client.SilentHotbar
 import net.ccbluex.liquidbounce.utils.client.mc
 import net.ccbluex.liquidbounce.utils.client.player
@@ -36,7 +35,7 @@ import kotlin.math.abs
  */
 sealed interface ItemSlot {
     val itemStack: ItemStack
-    val slotType: ItemSlotType
+    val slotType: Type
 
     /**
      * Used for example for slot click packets
@@ -73,14 +72,26 @@ sealed interface ItemSlot {
         @JvmField
         val PREFER_MORE_ITEM: Comparator<ItemSlot> = PreferStackSize.PREFER_MORE.asItemSlotComparator()
     }
+
+    enum class Type {
+        HOTBAR,
+        OFFHAND,
+        ARMOR,
+        INVENTORY,
+
+        /**
+         * e.g. chests
+         */
+        CONTAINER,
+    }
 }
 
 /**
  * @param id the id this slot is identified by. Two virtual slots that have the same id are considered equal.
  */
 class VirtualItemSlot(
     override val itemStack: ItemStack,
-    override val slotType: ItemSlotType,
+    override val slotType: ItemSlot.Type,
     val id: Int
 ) : ItemSlot {
     override fun getIdForServer(screen: AbstractContainerScreen<*>?): Nothing =
@@ -109,8 +120,8 @@ class ContainerItemSlot(val slotInContainer: Int) : ItemSlot {
     override val itemStack: ItemStack
         get() = this.screen.menu.slots[this.slotInContainer].item
 
-    override val slotType: ItemSlotType
-        get() = ItemSlotType.CONTAINER
+    override val slotType: ItemSlot.Type
+        get() = ItemSlot.Type.CONTAINER
 
     override fun getIdForServer(screen: AbstractContainerScreen<*>?): Int = this.slotInContainer
 
@@ -151,8 +162,8 @@ open class HotbarItemSlot(val hotbarSlot: Int) : ItemSlot {
     override val itemStack: ItemStack
         get() = player.inventory.getItem(this.hotbarSlot)
 
-    override val slotType: ItemSlotType
-        get() = ItemSlotType.HOTBAR
+    override val slotType: ItemSlot.Type
+        get() = ItemSlot.Type.HOTBAR
 
     open val hotbarSlotForServer: Int = hotbarSlot
 
@@ -207,8 +218,8 @@ class InventoryItemSlot(private val inventorySlot: Int) : ItemSlot {
     override val itemStack: ItemStack
         get() = player.inventory.getItem(9 + this.inventorySlot)
 
-    override val slotType: ItemSlotType
-        get() = ItemSlotType.INVENTORY
+    override val slotType: ItemSlot.Type
+        get() = ItemSlot.Type.INVENTORY
 
     override fun getIdForServer(screen: AbstractContainerScreen<*>?): Int {
         return if (screen == null) 9 + inventorySlot else screen.itemCount() - 36 + this.inventorySlot
@@ -234,8 +245,8 @@ class ArmorItemSlot(private val equipmentSlot: EquipmentSlot) : ItemSlot {
     override val itemStack: ItemStack
         get() = player.getItemBySlot(equipmentSlot)
 
-    override val slotType: ItemSlotType
-        get() = ItemSlotType.ARMOR
+    override val slotType: ItemSlot.Type
+        get() = ItemSlot.Type.ARMOR
 
     override fun getIdForServer(screen: AbstractContainerScreen<*>?) =
         if (screen == null) 8 - this.equipmentSlot.index else null
@@ -258,8 +269,8 @@ data object OffHandSlot : HotbarItemSlot(-1) {
     override val itemStack: ItemStack
         get() = player.offhandItem
 
-    override val slotType: ItemSlotType
-        get() = ItemSlotType.OFFHAND
+    override val slotType: ItemSlot.Type
+        get() = ItemSlot.Type.OFFHAND
 
     override val hotbarSlotForServer: Int = 40
 

src/main/kotlin/net/ccbluex/liquidbounce/utils/item/ArmorPiece.kt

@@ -18,12 +18,11 @@
  */
 package net.ccbluex.liquidbounce.utils.item
 
-import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ItemSlotType
 import net.ccbluex.liquidbounce.utils.inventory.ItemSlot
 import net.minecraft.world.entity.EquipmentSlot
 
 /**
- * @see net.minecraft.item.equipment.ArmorMaterial.createAttributeModifiers
+ * @see net.minecraft.world.item.equipment.ArmorMaterial.createAttributes
  */
 @JvmInline
 value class ArmorPiece(val itemSlot: ItemSlot) {
@@ -34,9 +33,9 @@ value class ArmorPiece(val itemSlot: ItemSlot) {
     val inventorySlot: Int
         get() = 36 + entitySlotId
     val isAlreadyEquipped: Boolean
-        get() = itemSlot.slotType == ItemSlotType.ARMOR
+        get() = itemSlot.slotType == ItemSlot.Type.ARMOR
     val isReachableByHand: Boolean
-        get() = itemSlot.slotType == ItemSlotType.HOTBAR
+        get() = itemSlot.slotType == ItemSlot.Type.HOTBAR
 
     val toughness: Float
         get() = itemSlot.itemStack.armorToughness!!.toFloat()