lambda-client · beanbag44 · Jun 24, 2026 · Jun 23, 2026 · Jun 23, 2026 · Jun 23, 2026
diff --git a/src/main/java/com/lambda/mixin/MinecraftClientMixin.java b/src/main/java/com/lambda/mixin/MinecraftClientMixin.java
@@ -17,7 +17,7 @@
 
 package com.lambda.mixin;
 
-import com.lambda.core.TimerHandler;
+import com.lambda.interaction.handlers.TimerHandler;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.*;
 import com.lambda.gui.DearImGui;

diff --git a/src/main/java/com/lambda/mixin/entity/ClientPlayInteractionManagerMixin.java b/src/main/java/com/lambda/mixin/entity/ClientPlayInteractionManagerMixin.java
@@ -20,7 +20,7 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.PlayerEvent;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
 import com.lambda.interaction.managers.inventory.InventoryManager;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
@@ -123,7 +123,7 @@ public void clickSlotHead(int syncId, int slotId, int button, SlotActionType act
      * }
      * }</pre>
      */
-    @Inject(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V", shift = At.Shift.BEFORE))
+    @Inject(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V"))
     public void overrideSelectedSlotSync(CallbackInfo ci) {
         EventFlow.post(new InventoryEvent.HotbarSlot.Update(lastSelectedSlot));
     }

diff --git a/src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java b/src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java
@@ -19,7 +19,7 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.*;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.movement.NoJumpCooldown;
 import com.lambda.module.modules.movement.elytrafly.ElytraFly;

diff --git a/src/main/java/com/lambda/mixin/entity/EntityMixin.java b/src/main/java/com/lambda/mixin/entity/EntityMixin.java
@@ -20,7 +20,7 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.EntityEvent;
 import com.lambda.event.events.PlayerEvent;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.movement.elytrafly.ElytraFly;
 import com.lambda.module.modules.render.NoRender;

diff --git a/src/main/java/com/lambda/mixin/entity/LivingEntityMixin.java b/src/main/java/com/lambda/mixin/entity/LivingEntityMixin.java
@@ -20,7 +20,8 @@
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
+import com.lambda.interaction.handlers.GlideHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.movement.Velocity;
 import com.lambda.module.modules.movement.elytrafly.ElytraFly;
@@ -204,13 +205,8 @@ private void injectTravelGliding(Vec3d movementInput, CallbackInfo ci) {
     }
 
     @ModifyExpressionValue(method = "canGlide", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;canGlideWith(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlot;)Z"))
-    private boolean injectCanGlide(boolean original) {
-        if (lambda$instance != Lambda.getMc().player) return original;
-        if (original) return true;
-        if (!ElytraFly.INSTANCE.getFakeFly()) return false;
-        return Boolean.TRUE.equals(runSafe(safeContext -> {
-            final var mode = ElytraFly.getMode().getElytraFly();
-            return mode.isEnabled() && mode.findElytra(safeContext) != null;
-        }));
+    private boolean modifyCanGlideWith(boolean original) {
+        if ((Object) this != Lambda.getMc().player) return original;
+        return runSafe(GlideHandler::canGlide);
     }
 }
diff --git a/src/main/java/com/lambda/mixin/entity/PlayerEntityMixin.java b/src/main/java/com/lambda/mixin/entity/PlayerEntityMixin.java
@@ -20,24 +20,21 @@
 import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
+import com.lambda.interaction.handlers.GlideHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
-import com.lambda.module.modules.movement.elytrafly.ElytraFly;
 import com.lambda.module.modules.player.Reach;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import kotlin.Unit;
 import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import static com.lambda.threading.ThreadingKt.runSafe;
-
 @Mixin(PlayerEntity.class)
-public class PlayerEntityMixin {
+public abstract class PlayerEntityMixin {
     @Inject(method = "clipAtLedge", at = @At(value = "HEAD"), cancellable = true)
     private void injectSafeWalk(CallbackInfoReturnable<Boolean> cir) {
         MovementEvent.ClipAtLedge event = new MovementEvent.ClipAtLedge(((PlayerEntity) (Object) this).isSneaking());
@@ -70,16 +67,9 @@ private double wrapGetEntityInteractionRange(Operation<Double> original) {
         return original.call();
     }
 
-    @WrapOperation(method = "checkGliding", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;startGliding()V"))
-    private void injectCheckGliding(PlayerEntity instance, Operation<Void> original) {
-        final var elytraFly = ElytraFly.getMode().getElytraFly();
-        if (!elytraFly.isEnabled() || !ElytraFly.INSTANCE.getFakeFly()) {
-            original.call(instance);
-            return;
-        }
-        runSafe(safeContext -> {
-            elytraFly.flyOrFakeFly(safeContext, null);
-            return Unit.INSTANCE;
-        });
+    @Inject(method = "checkGliding", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;startGliding()V"), cancellable = true)
+    private void injectCheckGliding(CallbackInfoReturnable<Boolean> cir) {
+        if ((Object) this != Lambda.getMc().player) return;
+        if (GlideHandler.getOverridingGlide()) cir.setReturnValue(false);
     }
 }
diff --git a/src/main/java/com/lambda/mixin/render/LivingEntityRendererMixin.java b/src/main/java/com/lambda/mixin/render/LivingEntityRendererMixin.java
@@ -18,7 +18,7 @@
 package com.lambda.mixin.render;
 
 import com.lambda.Lambda;
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.render.Nametags;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;

diff --git a/src/main/java/com/lambda/mixin/render/PlayerListHudMixin.java b/src/main/java/com/lambda/mixin/render/PlayerListHudMixin.java
@@ -17,7 +17,7 @@
 
 package com.lambda.mixin.render;
 
-import com.lambda.friend.FriendHandler;
+import com.lambda.interaction.handlers.FriendHandler;
 import com.lambda.module.modules.render.ExtraTab;
 import com.lambda.util.text.TextBuilder;
 import com.lambda.util.text.TextDslKt;

diff --git a/src/main/java/com/lambda/mixin/world/DirectionMixin.java b/src/main/java/com/lambda/mixin/world/DirectionMixin.java
@@ -17,7 +17,7 @@
 
 package com.lambda.mixin.world;
 
-import com.lambda.interaction.BaritoneHandler;
+import com.lambda.interaction.handlers.BaritoneHandler;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.entity.Entity;

diff --git a/src/main/kotlin/com/lambda/command/commands/FriendCommand.kt b/src/main/kotlin/com/lambda/command/commands/FriendCommand.kt
@@ -29,7 +29,7 @@ import com.lambda.brigadier.executeWithResult
 import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
 import com.lambda.config.categories.FriendCategory
-import com.lambda.friend.FriendHandler
+import com.lambda.interaction.handlers.FriendHandler
 import com.lambda.network.mojang.getProfile
 import com.lambda.threading.runIO
 import com.lambda.util.CommunicationUtils.info

diff --git a/src/main/kotlin/com/lambda/command/commands/TransferCommand.kt b/src/main/kotlin/com/lambda/command/commands/TransferCommand.kt
@@ -29,9 +29,9 @@ import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
 import com.lambda.config.automation.AutomationConfig
 import com.lambda.interaction.material.StackSelection.Companion.selectStack
-import com.lambda.interaction.material.container.ContainerHandler
-import com.lambda.interaction.material.container.ContainerHandler.findContainersWithMaterial
-import com.lambda.interaction.material.container.ContainerHandler.findContainersWithSpace
+import com.lambda.interaction.handlers.ContainerHandler
+import com.lambda.interaction.handlers.ContainerHandler.findContainersWithMaterial
+import com.lambda.interaction.handlers.ContainerHandler.findContainersWithSpace
 import com.lambda.task.RootTask
 import com.lambda.task.Task
 import com.lambda.threading.runSafeAutomated

diff --git a/src/main/kotlin/com/lambda/config/ConfigCategory.kt b/src/main/kotlin/com/lambda/config/ConfigCategory.kt
@@ -25,7 +25,7 @@ import com.lambda.config.migration.ConfigMigrationHandler
 import com.lambda.core.Loadable
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.listener.UnsafeListener.Companion.listenUnsafe
-import com.lambda.interaction.BaritoneHandler.primary
+import com.lambda.interaction.handlers.BaritoneHandler.primary
 import com.lambda.threading.runIO
 import com.lambda.util.CommunicationUtils.info
 import com.lambda.util.CommunicationUtils.logError

diff --git a/src/main/kotlin/com/lambda/config/blocks/EntityColorSettings.kt b/src/main/kotlin/com/lambda/config/blocks/EntityColorSettings.kt
@@ -20,7 +20,7 @@ package com.lambda.config.blocks
 import com.lambda.config.Config
 import com.lambda.config.ConfigBlock
 import com.lambda.context.SafeContext
-import com.lambda.friend.FriendHandler.isFriend
+import com.lambda.interaction.handlers.FriendHandler.isFriend
 import com.lambda.util.EntityUtils.EntityGroup
 import com.lambda.util.EntityUtils.entityGroup
 import com.lambda.util.extension.blockColor

diff --git a/src/main/kotlin/com/lambda/config/blocks/TargetingSettings.kt b/src/main/kotlin/com/lambda/config/blocks/TargetingSettings.kt
@@ -22,7 +22,7 @@ import com.lambda.config.ConfigBlock
 import com.lambda.config.ConfigEditor.hide
 import com.lambda.config.withEdits
 import com.lambda.context.SafeContext
-import com.lambda.friend.FriendHandler.isFriend
+import com.lambda.interaction.handlers.FriendHandler.isFriend
 import com.lambda.interaction.managers.rotating.Rotation.Companion.dist
 import com.lambda.interaction.managers.rotating.Rotation.Companion.rotation
 import com.lambda.interaction.managers.rotating.Rotation.Companion.rotationTo

diff --git a/src/main/kotlin/com/lambda/gui/MenuBar.kt b/src/main/kotlin/com/lambda/gui/MenuBar.kt
@@ -41,7 +41,7 @@ import com.lambda.imgui.flag.ImGuiCol
 import com.lambda.imgui.flag.ImGuiStyleVar
 import com.lambda.imgui.type.ImBoolean
 import com.lambda.imgui.flag.ImGuiWindowFlags
-import com.lambda.interaction.BaritoneHandler
+import com.lambda.interaction.handlers.BaritoneHandler
 import com.lambda.module.ModuleRegistry
 import com.lambda.module.ModuleRegistry.moduleNameMap
 import com.lambda.module.tag.ModuleTag

diff --git a/src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BasicChecker.kt b/src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BasicChecker.kt
@@ -25,7 +25,7 @@ import com.lambda.interaction.construction.simulation.SimDsl
 import com.lambda.interaction.construction.simulation.SimInfo
 import com.lambda.interaction.construction.simulation.result.results.GenericResult
 import com.lambda.interaction.construction.simulation.result.results.PreSimResult
-import com.lambda.util.player.gamemode
+import com.lambda.util.player.PlayerUtils.gamemode
 import com.lambda.util.world.WorldUtils.isLoaded
 import net.minecraft.block.OperatorBlock
 

diff --git a/src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BreakSim.kt b/src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BreakSim.kt
@@ -35,7 +35,7 @@ import com.lambda.interaction.material.ContainerSelection.Companion.selectContai
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.StackSelection.Companion.EVERYTHING
 import com.lambda.interaction.material.StackSelection.Companion.selectStack
-import com.lambda.interaction.material.container.ContainerHandler.findContainersWithMaterial
+import com.lambda.interaction.handlers.ContainerHandler.findContainersWithMaterial
 import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.BlockUtils.calcItemBlockBreakingDelta

diff --git a/src/main/kotlin/com/lambda/interaction/construction/simulation/checks/InteractSim.kt b/src/main/kotlin/com/lambda/interaction/construction/simulation/checks/InteractSim.kt
@@ -34,7 +34,7 @@ import com.lambda.interaction.managers.rotating.RotationManager
 import com.lambda.interaction.material.ContainerSelection.Companion.selectContainer
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.StackSelection.Companion.select
-import com.lambda.interaction.material.container.ContainerHandler.findContainersWithMaterial
+import com.lambda.interaction.handlers.ContainerHandler.findContainersWithMaterial
 import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.util.BlockUtils
 import com.lambda.util.BlockUtils.blockState
@@ -46,8 +46,8 @@ import com.lambda.util.math.MathUtils.floorToInt
 import com.lambda.util.math.minus
 import com.lambda.util.player.CheckedHit
 import com.lambda.util.player.MovementUtils.sneaking
+import com.lambda.util.player.PlayerUtils.copyPlayer
 import com.lambda.util.player.RotationUtils.lookInDirection
-import com.lambda.util.player.copyPlayer
 import com.lambda.util.world.raycast.RayCastUtils.blockResult
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel

diff --git a/src/main/kotlin/com/lambda/interaction/construction/simulation/result/results/BreakResult.kt b/src/main/kotlin/com/lambda/interaction/construction/simulation/result/results/BreakResult.kt
@@ -22,7 +22,7 @@ import baritone.api.pathing.goals.GoalInverted
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.graphics.mc.RenderBuilder
 import com.lambda.graphics.util.DirectionMask.mask
-import com.lambda.interaction.BaritoneHandler
+import com.lambda.interaction.handlers.BaritoneHandler
 import com.lambda.interaction.construction.simulation.context.BreakContext
 import com.lambda.interaction.construction.simulation.result.BuildResult
 import com.lambda.interaction.construction.simulation.result.ComparableResult
@@ -33,7 +33,7 @@ import com.lambda.interaction.construction.simulation.result.Navigable
 import com.lambda.interaction.construction.simulation.result.Rank
 import com.lambda.interaction.construction.simulation.result.Resolvable
 import com.lambda.interaction.material.StackSelection.Companion.selectStack
-import com.lambda.interaction.material.container.ContainerHandler.transferByTask
+import com.lambda.interaction.handlers.ContainerHandler.transferByTask
 import com.lambda.interaction.material.container.containers.HotbarContainer
 import com.lambda.task.Task
 import net.minecraft.block.BlockState

diff --git a/...ain/kotlin/com/lambda/interaction/construction/simulation/result/results/GenericResult.kt b/...ain/kotlin/com/lambda/interaction/construction/simulation/result/results/GenericResult.kt
@@ -20,15 +20,15 @@ package com.lambda.interaction.construction.simulation.result.results
 import baritone.api.pathing.goals.GoalNear
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.graphics.mc.RenderBuilder
-import com.lambda.interaction.BaritoneHandler
+import com.lambda.interaction.handlers.BaritoneHandler
 import com.lambda.interaction.construction.simulation.result.BuildResult
 import com.lambda.interaction.construction.simulation.result.ComparableResult
 import com.lambda.interaction.construction.simulation.result.Drawable
 import com.lambda.interaction.construction.simulation.result.Navigable
 import com.lambda.interaction.construction.simulation.result.Rank
 import com.lambda.interaction.construction.simulation.result.Resolvable
 import com.lambda.interaction.material.StackSelection
-import com.lambda.interaction.material.container.ContainerHandler.transferByTask
+import com.lambda.interaction.handlers.ContainerHandler.transferByTask
 import com.lambda.interaction.material.container.containers.HotbarContainer
 import com.lambda.task.Task
 import net.minecraft.client.data.TextureMap.side

diff --git a/...in/kotlin/com/lambda/interaction/construction/simulation/result/results/InteractResult.kt b/...in/kotlin/com/lambda/interaction/construction/simulation/result/results/InteractResult.kt
@@ -20,7 +20,7 @@ package com.lambda.interaction.construction.simulation.result.results
 import baritone.api.pathing.goals.GoalBlock
 import baritone.api.pathing.goals.GoalInverted
 import com.lambda.graphics.mc.RenderBuilder
-import com.lambda.interaction.BaritoneHandler
+import com.lambda.interaction.handlers.BaritoneHandler
 import com.lambda.interaction.construction.simulation.context.InteractContext
 import com.lambda.interaction.construction.simulation.result.BuildResult
 import com.lambda.interaction.construction.simulation.result.Contextual

diff --git a/...main/kotlin/com/lambda/interaction/construction/simulation/result/results/PreSimResult.kt b/...main/kotlin/com/lambda/interaction/construction/simulation/result/results/PreSimResult.kt
@@ -19,7 +19,7 @@ package com.lambda.interaction.construction.simulation.result.results
 
 import baritone.api.pathing.goals.GoalBlock
 import com.lambda.graphics.mc.RenderBuilder
-import com.lambda.interaction.BaritoneHandler
+import com.lambda.interaction.handlers.BaritoneHandler
 import com.lambda.interaction.construction.simulation.result.BuildResult
 import com.lambda.interaction.construction.simulation.result.ComparableResult
 import com.lambda.interaction.construction.simulation.result.Drawable

diff --git a/src/main/kotlin/com/lambda/interaction/construction/verify/TargetState.kt b/src/main/kotlin/com/lambda/interaction/construction/verify/TargetState.kt
@@ -19,7 +19,7 @@ package com.lambda.interaction.construction.verify
 
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.context.SafeContext
-import com.lambda.interaction.material.container.ContainerHandler.findDisposable
+import com.lambda.interaction.handlers.ContainerHandler.findDisposable
 import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.BlockUtils.emptyState
 import com.lambda.util.BlockUtils.isEmpty

diff --git a/...com/lambda/interaction/BaritoneHandler.kt → ...a/interaction/handlers/BaritoneHandler.kt b/...com/lambda/interaction/BaritoneHandler.kt → ...a/interaction/handlers/BaritoneHandler.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.interaction
+package com.lambda.interaction.handlers
 
 import baritone.api.BaritoneAPI
 import baritone.api.IBaritone
@@ -37,7 +37,7 @@ import net.minecraft.util.BlockRotation
 @Suppress("unused")
 object BaritoneHandler : Config(
     "baritone",
-    LambdaCategory
+	LambdaCategory
 ), Automated by AutomationConfig.DEFAULT {
     val baritoneAvailable by lazy {
         runCatching {
@@ -106,8 +106,8 @@ object BaritoneHandler : Config(
     }
 
     class BaritoneConfigSettings(
-        override val c: Config,
-        private val bSettings: Settings
+	    override val c: Config,
+	    private val bSettings: Settings
     ) : ConfigBlock {
         companion object {
             private const val GENERAL_TAB = "General"
@@ -373,4 +373,4 @@ object BaritoneHandler : Config(
         @Tab(ELYTRA_TAB) val elytraTermsAccepted by c.setting("Terms Accepted", bSettings.elytraTermsAccepted.value).onValueChange { _, it -> bSettings.elytraTermsAccepted.value = it }
         @Tab(ELYTRA_TAB) val elytraChatSpam by c.setting("Chat Spam", bSettings.elytraChatSpam.value).onValueChange { _, it -> bSettings.elytraChatSpam.value = it }
     }
-}
+}
diff --git a/...on/material/container/ContainerHandler.kt → .../interaction/handlers/ContainerHandler.kt b/...on/material/container/ContainerHandler.kt → .../interaction/handlers/ContainerHandler.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.interaction.material.container
+package com.lambda.interaction.handlers
 
 import com.lambda.context.AutomatedSafeContext
 import com.lambda.context.SafeContext
@@ -26,10 +26,11 @@ import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.material.ContainerSelection
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.StackSelection.Companion.select
+import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.interaction.material.container.containers.ChestContainer
 import com.lambda.interaction.material.container.containers.EnderChestContainer
 import com.lambda.util.BlockUtils.blockEntity
-import com.lambda.util.ReflectionUtils.getInstances
+import com.lambda.util.ReflectionUtils
 import com.lambda.util.extension.containerStacks
 import net.minecraft.block.entity.BlockEntity
 import net.minecraft.block.entity.ChestBlockEntity
@@ -44,7 +45,7 @@ object ContainerHandler : Loadable {
     private val containers: List<MaterialContainer>
         get() = compileContainers + runtimeContainers
 
-    private val compileContainers = getInstances<MaterialContainer>()
+    private val compileContainers = ReflectionUtils.getInstances<MaterialContainer>()
     private val runtimeContainers = mutableSetOf<MaterialContainer>()
 
     var lastInteractedBlockEntity: BlockEntity? = null
@@ -104,7 +105,7 @@ object ContainerHandler : Loadable {
 
     context(_: SafeContext)
     fun findContainer(
-        block: (MaterialContainer) -> Boolean,
+	    block: (MaterialContainer) -> Boolean,
     ): MaterialContainer? = containers().find(block)
 
     context(automatedSafeContext: AutomatedSafeContext)
@@ -114,7 +115,7 @@ object ContainerHandler : Loadable {
 
     context(automatedSafeContext: AutomatedSafeContext)
     fun StackSelection.findContainersWithMaterial(
-        containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection,
+	    containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection,
     ): List<MaterialContainer> =
         containers()
             .filter { containerSelection.matches(it) }
@@ -154,4 +155,4 @@ object ContainerHandler : Loadable {
     }
 
     class NoContainerFound(selection: StackSelection) : Exception("No container found matching $selection")
-}
+}