Skip to content

Make the block lookup work #226

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
NicoNekoDev wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make the block lookup work #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
669fbc9
Update blocks
NicoNekoDev Jan 6, 2026
b29b2f1
Merge branch 'master' into custom-blocks
NicoNekoDev Mar 13, 2026
02b76c0
Fix TestableBlock being null
NicoNekoDev Mar 13, 2026
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
14 changes: 7 additions & 7 deletions core/common/src/main/kotlin/com/willfp/libreforge/effects/impl/EffectSetBlock.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package com.willfp.libreforge.effects.impl

import com.willfp.eco.core.blocks.Blocks
import com.willfp.eco.core.blocks.TestableBlock
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.libreforge.ViolationContext
import com.willfp.libreforge.arguments
import com.willfp.libreforge.effects.Effect
import com.willfp.libreforge.triggers.TriggerData
import com.willfp.libreforge.triggers.TriggerParameter
import org.bukkit.Material

object EffectSetBlock : Effect<Material?>("set_block") {
object EffectSetBlock : Effect<TestableBlock>("set_block") {
override val parameters = setOf(
TriggerParameter.BLOCK
)
Expand All @@ -17,16 +18,15 @@ object EffectSetBlock : Effect<Material?>("set_block") {
require("block", "You must specify the block!")
}

override fun onTrigger(config: Config, data: TriggerData, compileData: Material?): Boolean {
override fun onTrigger(config: Config, data: TriggerData, compileData: TestableBlock): Boolean {
val block = data.block ?: data.location?.block ?: return false
compileData ?: return false

block.type = compileData
compileData.place(block.location)

return true
}

override fun makeCompileData(config: Config, context: ViolationContext): Material? {
return Material.getMaterial(config.getString("block").uppercase())
override fun makeCompileData(config: Config, context: ViolationContext): TestableBlock {
return Blocks.lookup(config.getString("block"))
}
}
18 changes: 13 additions & 5 deletions core/common/src/main/kotlin/com/willfp/libreforge/filters/impl/FilterBlocks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
package com.willfp.libreforge.filters.impl

import com.willfp.eco.core.blocks.Blocks
import com.willfp.eco.core.blocks.TestableBlock
import com.willfp.eco.core.blocks.matches
import com.willfp.eco.core.config.interfaces.Config
import com.willfp.eco.util.containsIgnoreCase
import com.willfp.libreforge.NoCompileData
import com.willfp.libreforge.ViolationContext
import com.willfp.libreforge.filters.Filter
import com.willfp.libreforge.triggers.TriggerData

object FilterBlocks : Filter<NoCompileData, Collection<String>>("blocks") {
object FilterBlocks : Filter<Collection<TestableBlock>, Collection<String>>("blocks") {
override fun getValue(config: Config, data: TriggerData?, key: String): Collection<String> {
return config.getStrings(key)
}

override fun isMet(data: TriggerData, value: Collection<String>, compileData: NoCompileData): Boolean {
override fun isMet(data: TriggerData, value: Collection<String>, compileData: Collection<TestableBlock>): Boolean {
val block = data.block ?: return true

return value.containsIgnoreCase(block.type.name)
return compileData.matches(block)
}

override fun makeCompileData(
config: Config, context: ViolationContext, values: Collection<String>
): Collection<TestableBlock> {
return values.map { Blocks.lookup(it) }
}
}