data objects for update manager events, moved on start callback above on block break for proper order, and cleaned up unused settings in inventory config

Author: beanbag44

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

@@ -20,15 +20,8 @@ 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.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
 
 interface InventoryConfig {
     val disposables: Set<Block>
@@ -52,27 +45,6 @@ interface 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/event/events/UpdateManagerEvent.kt

@@ -20,8 +20,8 @@ package com.lambda.event.events
 import com.lambda.event.Event
 
 sealed class UpdateManagerEvent {
-    class Rotation : Event
-    class Hotbar : Event
-    class Break : Event
-    class Place : Event
+    data object Rotation : Event
+    data object Hotbar : Event
+    data object Break : Event
+    data object 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
-            onBlockBreak(info)
             info.request.onStart?.invoke(ctx.expectedPos)
+            onBlockBreak(info)
             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

@@ -122,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/placing/PlaceManager.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/rotation/RotationManager.kt

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