Skip to content

fix(ChestContainer): Fix chest containers not recognizing some chest like containers #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IceTank wants to merge 1 commit into
base: 1.21.11
Choose a base branch
from
Open

fix(ChestContainer): Fix chest containers not recognizing some chest like containers #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/main/kotlin/com/lambda/interaction/material/container/ContainerManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ 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.containers.ChestContainer
import com.lambda.interaction.material.container.containers.LootableContainer
import com.lambda.interaction.material.container.containers.EnderChestContainer
import com.lambda.util.BlockUtils.blockEntity
import com.lambda.util.extension.containerStacks
import com.lambda.util.reflections.getInstances
import net.minecraft.block.entity.BlockEntity
import net.minecraft.block.entity.ChestBlockEntity
import net.minecraft.block.entity.EnderChestBlockEntity
import net.minecraft.block.entity.LootableContainerBlockEntity
import net.minecraft.screen.GenericContainerScreenHandler
import net.minecraft.screen.ScreenHandlerType
import net.minecraft.screen.slot.Slot
Expand Down Expand Up @@ -67,16 +67,14 @@ object ContainerManager : Loadable {
EnderChestContainer.update(handler.containerStacks)
}

is ChestBlockEntity -> {
// ToDo: Handle double chests and single chests
if (handler.type != ScreenHandlerType.GENERIC_9X6) return@listen
is LootableContainerBlockEntity -> {
Copy link
Copy Markdown
Member

@beanbag44 beanbag44 Apr 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you removed the todo for handling double chests but this does not fix the double chest issue. This is part of my worry about merging all external containers aside from ender chests into one. It removes flexibility for unique containers. Also, there will likely be cases where the type of container needs to be known. I think we should just stick to separate types.

Copy link
Copy Markdown
Contributor Author

@IceTank IceTank Apr 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double chests could be fixed by combining both inventories into one container location. I have done that with my stash movers before. I think if you need a more specific container type, you can always extend this one.

Copy link
Copy Markdown
Member

@beanbag44 beanbag44 Apr 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that there should be a base open class for containers, but this class isnt suited towards that. It takes a blockPos in the constructor, which wouldnt apply well for double chests as they consist of two positions. The class also isnt open, and its a data class which cant be inherited from, etc

val stacks = handler.containerStacks

containers
.filterIsInstance<ChestContainer>()
.filterIsInstance<LootableContainer>()
.find {
it.blockPos == block.pos
}?.update(stacks) ?: runtimeContainers.add(ChestContainer(stacks, block.pos))
}?.update(stacks) ?: runtimeContainers.add(LootableContainer(stacks, block.pos))
}
}
lastInteractedBlockEntity = null
Expand Down
8 changes: 4 additions & 4 deletions ...al/container/containers/ChestContainer.kt → ...container/containers/LootableContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@ import com.lambda.util.extension.containerSlots
import com.lambda.util.text.buildText
import com.lambda.util.text.highlighted
import com.lambda.util.text.literal
import net.minecraft.block.entity.ChestBlockEntity
import net.minecraft.block.entity.LootableContainerBlockEntity
import net.minecraft.item.ItemStack
import net.minecraft.screen.slot.Slot
import net.minecraft.util.math.BlockPos

data class ChestContainer(
data class LootableContainer(
override var stacks: List<ItemStack>,
val blockPos: BlockPos,
val containedInStash: StashContainer? = null
) : MaterialContainer(Rank.Chest), ExternalContainer {
context(safeContext: SafeContext)
override val slots
get(): List<Slot> =
if (ContainerManager.lastInteractedBlockEntity is ChestBlockEntity)
if (ContainerManager.lastInteractedBlockEntity is LootableContainerBlockEntity)
safeContext.player.currentScreenHandler.containerSlots
else emptyList()

override val description =
buildText {
literal("Chest at ")
literal("Container at ")
highlighted(blockPos.toShortString())
containedInStash?.let { stash ->
literal(" (contained in ")
Expand Down
8 changes: 4 additions & 4 deletions src/main/kotlin/com/lambda/interaction/material/container/containers/StashContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ import net.minecraft.screen.slot.Slot
import net.minecraft.util.math.Box

data class StashContainer(
val chests: Set<ChestContainer>,
val container: Set<LootableContainer>,
val pos: Box,
) : MaterialContainer(Rank.Stash) {
context(_: SafeContext)
override val slots: List<Slot>
get() = chests.flatMap { it.slots }
get() = container.flatMap { it.slots }
override var stacks: List<ItemStack>
get() = chests.flatMap { it.stacks }
get() = container.flatMap { it.stacks }
set(_) {}

override val description = buildText {
Expand All @@ -46,7 +46,7 @@ data class StashContainer(

context(_: SafeContext)
override fun materialAvailable(selection: StackSelection): Int =
chests.sumOf {
container.sumOf {
it.materialAvailable(selection)
}
}