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

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
59 changes: 32 additions & 27 deletions src/main/kotlin/com/lambda/interaction/material/container/containers/ChestContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,39 +29,44 @@ 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.BlockEntity
import net.minecraft.block.entity.LockableContainerBlockEntity
import net.minecraft.item.ItemStack
import net.minecraft.screen.slot.Slot
import net.minecraft.util.math.BlockPos

data class ChestContainer(
override var stacks: List<ItemStack>,
val blockPos: BlockPos,
val containedInStash: StashContainer? = null
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)
safeContext.player.currentScreenHandler.containerSlots
else emptyList()
context(safeContext: SafeContext)
override val slots
get(): List<Slot> =
if (isContainerLike(ContainerManager.lastInteractedBlockEntity))
safeContext.player.currentScreenHandler.containerSlots
else emptyList()

override val description =
buildText {
literal("Chest at ")
highlighted(blockPos.toShortString())
containedInStash?.let { stash ->
literal(" (contained in ")
highlighted(stash.name)
literal(")")
}
}
override val description =
buildText {
literal("Chest at ")
highlighted(blockPos.toShortString())
containedInStash?.let { stash ->
literal(" (contained in ")
highlighted(stash.name)
literal(")")
}
}

context(automatedSafeContext: AutomatedSafeContext)
override fun accessThen(exitAfter: Boolean, taskGenerator: TaskGenerator<Unit>): Task<*> =
OpenContainerTask(blockPos, automatedSafeContext).then {
taskGenerator.invoke(automatedSafeContext, Unit).finally {
if (exitAfter) automatedSafeContext.player.closeScreen()
}
}
context(automatedSafeContext: AutomatedSafeContext)
override fun accessThen(exitAfter: Boolean, taskGenerator: TaskGenerator<Unit>): Task<*> =
OpenContainerTask(blockPos, automatedSafeContext).then {
taskGenerator.invoke(automatedSafeContext, Unit).finally {
if (exitAfter) automatedSafeContext.player.closeScreen()
}
}

companion object {
fun isContainerLike(blockEntity: BlockEntity?) = blockEntity is LockableContainerBlockEntity
}
}