Skip to content

Added Optional to BlockPlaceEventEntry block var #385

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

Closed
wants to merge 3 commits into from
Closed

Added Optional to BlockPlaceEventEntry block var #385

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4be0321
Create Typewriter Threads instead of using Dispatchers.IO
gabber235 Jan 14, 2025
e2b7d2b
cleanup
myiume Mar 13, 2025
1215b05
Added Optional to block, so a block place event can be considered wit…
myiume Sep 10, 2025
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
7 changes: 4 additions & 3 deletions ...sicExtension/src/main/kotlin/com/typewritermc/basic/entries/event/BlockPlaceEventEntry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class BlockPlaceEventEntry(
override val name: String = "",
override val triggers: List<Ref<TriggerableEntry>> = emptyList(),
val location: Optional<Var<Position>> = Optional.empty(),
@MaterialProperties(BLOCK)
val block: Material = Material.STONE,
@MaterialProperties(MaterialProperty.BLOCK)
val block: Optional<Material> = Optional.empty(),
) : EventEntry

enum class BlockPlaceContextKeys(override val klass: KClass<*>) : EntryContextKey {
Expand All @@ -52,7 +52,8 @@ fun onPlaceBlock(event: BlockPlaceEvent, query: Query<BlockPlaceEventEntry>) {
// Check if the player clicked on the correct location
if (!entry.location.map { it.get(player).toBlockPosition() == position.toBlockPosition() }.orElse(true)) return@findWhere false

entry.block == event.block.type
// Check if block type is correct
entry.block.map { it == event.block.type }.orElse(true)
}.startDialogueWithOrNextDialogue(player) {
BlockPlaceContextKeys.BLOCK_POSITION += position.toBlockPosition()
BlockPlaceContextKeys.CENTER_POSITION += position.mid()
Expand Down