Revert "inventory manager start :doom:, and cleanup. Also moved the onStart call when in creative mode before onBlockBreak to keep proper order"

This reverts commit 61d6528.

Author: beanbag44

common/src/main/kotlin/com/lambda/config/groups/InventoryConfig.kt

@@ -20,23 +20,26 @@ package com.lambda.config.groups
 import com.lambda.interaction.material.ContainerSelection
 import com.lambda.interaction.material.ContainerSelection.Companion.selectContainer
 import com.lambda.interaction.material.StackSelection
+import com.lambda.interaction.material.StackSelection.Companion.selectStack
 import com.lambda.interaction.material.container.MaterialContainer
-import com.lambda.interaction.request.RequestConfig
-import com.lambda.interaction.request.inventory.InventoryRequest
+import com.lambda.util.item.ItemUtils
 import net.minecraft.block.Block
+import net.minecraft.item.Item
+import net.minecraft.item.Items
+import net.minecraft.item.ToolItem
+import net.minecraft.item.ToolMaterial
+import net.minecraft.item.ToolMaterials
 
-abstract class InventoryConfig(
-    prio: Int
-) : RequestConfig<InventoryRequest>(prio) {
-    abstract val disposables: Set<Block>
-    abstract val swapWithDisposables: Boolean
-    abstract val providerPriority: Priority
-    abstract val storePriority: Priority
+interface InventoryConfig {
+    val disposables: Set<Block>
+    val swapWithDisposables: Boolean
+    val providerPriority: Priority
+    val storePriority: Priority
 
-    abstract val accessShulkerBoxes: Boolean
-    abstract val accessEnderChest: Boolean
-    abstract val accessChests: Boolean
-    abstract val accessStashes: Boolean
+    val accessShulkerBoxes: Boolean
+    val accessEnderChest: Boolean
+    val accessChests: Boolean
+    val accessStashes: Boolean
 
     val containerSelection: ContainerSelection get() = selectContainer {
         val allowedContainers = mutableSetOf<MaterialContainer.Rank>().apply {
@@ -49,6 +52,27 @@ abstract class InventoryConfig(
         ofAnyType(*allowedContainers.toTypedArray())
     }
 
+    val useWoodenTools: Boolean
+    val useStoneTools: Boolean
+    val useIronTools: Boolean
+    val useDiamondTools: Boolean
+    val useNetheriteTools: Boolean
+    val useGoldTools: Boolean
+    val useShears: Boolean
+    val useFlintAndSteel: Boolean
+
+    val allowedTools get() = mutableSetOf<Item>().apply {
+        addAll(ItemUtils.tools)
+        if (!useWoodenTools) removeIf { it is ToolItem && it.material == ToolMaterials.WOOD }
+        if (!useStoneTools) removeIf { it is ToolItem && it.material == ToolMaterials.STONE }
+        if (!useIronTools) removeIf { it is ToolItem && it.material == ToolMaterials.IRON }
+        if (!useDiamondTools) removeIf { it is ToolItem && it.material == ToolMaterials.DIAMOND }
+        if (!useNetheriteTools) removeIf { it is ToolItem && it.material == ToolMaterials.NETHERITE }
+        if (!useGoldTools) removeIf { it is ToolItem && it.material == ToolMaterials.GOLD }
+        if (!useShears) removeIf { it == Items.SHEARS }
+        if (!useFlintAndSteel) removeIf { it == Items.FLINT_AND_STEEL }
+    }
+
     enum class Priority {
         WithMinItems,
         WithMaxItems;

common/src/main/kotlin/com/lambda/config/groups/InventorySettings.kt

@@ -18,30 +18,32 @@
 package com.lambda.config.groups
 
 import com.lambda.config.Configurable
-import com.lambda.interaction.request.inventory.InventoryManager
-import com.lambda.interaction.request.inventory.InventoryRequest
 import com.lambda.util.item.ItemUtils
 
 class InventorySettings(
     c: Configurable,
-    prio: Int = 0,
     vis: () -> Boolean = { true },
-) : InventoryConfig(prio) {
+) : InventoryConfig {
     val page by c.setting("Inventory Page", Page.Container, "The page to open when the module is enabled", vis)
 
     override val disposables by c.setting("Disposables", ItemUtils.defaultDisposables, "Items that will be included when checking for a free slot / are allowed to be droped when inventory is full") { vis() && page == Page.Container}
     override val swapWithDisposables by c.setting("Swap With Disposables", true, "Swap items with disposable ones") { vis() && page == Page.Container}
-    override val providerPriority by c.setting("Provider Priority", Priority.WithMinItems, "What container to prefer when retrieving the item from") { vis() && page == Page.Container}
-    override val storePriority by c.setting("Store Priority", Priority.WithMinItems, "What container to prefer when storing the item to") { vis() && page == Page.Container}
+    override val providerPriority by c.setting("Provider Priority", InventoryConfig.Priority.WithMinItems, "What container to prefer when retrieving the item from") { vis() && page == Page.Container}
+    override val storePriority by c.setting("Store Priority", InventoryConfig.Priority.WithMinItems, "What container to prefer when storing the item to") { vis() && page == Page.Container}
 
     override val accessShulkerBoxes by c.setting("Access Shulker Boxes", true, "Allow access to the player's shulker boxes") { vis() && page == Page.Access}
     override val accessEnderChest by c.setting("Access Ender Chest", false, "Allow access to the player's ender chest") { vis() && page == Page.Access}
     override val accessChests by c.setting("Access Chests", false, "Allow access to the player's normal chests") { vis() && page == Page.Access}
     override val accessStashes by c.setting("Access Stashes", false, "Allow access to the player's stashes") { vis() && page == Page.Access}
 
-    override fun requestInternal(request: InventoryRequest, queueIfClosed: Boolean) {
-        InventoryManager.request(request)
-    }
+    override val useWoodenTools by c.setting("Use Wooden Tools", false, "Use wooden tools to mine blocks") { vis() && page == Page.Tools}
+    override val useStoneTools by c.setting("Use Stone Tools", false, "Use stone tools to mine blocks") { vis() && page == Page.Tools}
+    override val useIronTools by c.setting("Use Iron Tools", false, "Use iron tools to mine blocks") { vis() && page == Page.Tools}
+    override val useDiamondTools by c.setting("Use Diamond Tools", true, "Use diamond tools to mine blocks") { vis() && page == Page.Tools}
+    override val useNetheriteTools by c.setting("Use Netherite Tools", true, "Use netherite tools to mine blocks") { vis() && page == Page.Tools}
+    override val useGoldTools by c.setting("Use Gold Tools", false, "Use gold tools to mine blocks") { vis() && page == Page.Tools}
+    override val useShears by c.setting("Use Shears", true, "Use shears to mine blocks") { vis() && page == Page.Tools}
+    override val useFlintAndSteel by c.setting("Use Flint and Steel", true, "Use flint and steel to mine blocks?") { vis() && page == Page.Tools}
 
     enum class Page {
         Container, Access, Tools

common/src/main/kotlin/com/lambda/event/events/UpdateManagerEvent.kt

@@ -20,9 +20,8 @@ package com.lambda.event.events
 import com.lambda.event.Event
 
 sealed class UpdateManagerEvent {
-    data object Rotation : Event
-    data object Inventory : Event
-    data object Hotbar : Event
-    data object Break : Event
-    data object Place : Event
+    class Rotation : Event
+    class Hotbar : Event
+    class Break : Event
+    class Place : Event
 }

common/src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -629,8 +629,8 @@ object BreakManager : RequestHandler<BreakRequest>(
 
         if (gamemode.isCreative) {
             lastPosStarted = ctx.expectedPos
-            info.request.onStart?.invoke(ctx.expectedPos)
             onBlockBreak(info)
+            info.request.onStart?.invoke(ctx.expectedPos)
             info.startBreakPacket(world, interaction)
             breakCooldown = info.breakConfig.breakDelay
             return true
@@ -683,5 +683,5 @@ object BreakManager : RequestHandler<BreakRequest>(
         return inRange && correctMaterial
     }
 
-    override fun preEvent(): Event = UpdateManagerEvent.Break.post()
+    override fun preEvent(): Event = UpdateManagerEvent.Break().post()
 }

common/src/main/kotlin/com/lambda/interaction/request/hotbar/HotbarManager.kt

@@ -42,6 +42,7 @@ object HotbarManager : RequestHandler<HotbarRequest>(
     TickEvent.Input.Pre,
     TickEvent.Input.Post,
     TickEvent.Player.Post,
+    // ToDo: Post interact
     onClose = { checkResetSwap() }
 ) {
     val serverSlot get() = runSafe {
@@ -121,5 +122,5 @@ object HotbarManager : RequestHandler<HotbarRequest>(
         }
     }
 
-    override fun preEvent(): Event = UpdateManagerEvent.Hotbar.post()
+    override fun preEvent(): Event = UpdateManagerEvent.Hotbar().post()
 }

common/src/main/kotlin/com/lambda/interaction/request/inventory/InventoryManager.kt

@@ -365,5 +365,5 @@ object PlaceManager : RequestHandler<PlaceRequest>(
         )
     }
 
-    override fun preEvent(): Event = UpdateManagerEvent.Place.post()
+    override fun preEvent(): Event = UpdateManagerEvent.Place().post()
 }

common/src/main/kotlin/com/lambda/interaction/request/inventory/InventoryRequest.kt

@@ -290,5 +290,5 @@ object RotationManager : RequestHandler<RotationRequest>(
         }
     }
 
-    override fun preEvent(): Event = UpdateManagerEvent.Rotation.post()
+    override fun preEvent(): Event = UpdateManagerEvent.Rotation().post()
 }