refactor: pass initial argument in withGeary block

MineInAbyss · Oct 27, 2024 · 43a8bc9 · 43a8bc9
1 parent 25668ec
commit 43a8bc9
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/geary-papermc-core/src/main/kotlin/com/mineinabyss/geary/papermc/Helpers.kt b/geary-papermc-core/src/main/kotlin/com/mineinabyss/geary/papermc/Helpers.kt
@@ -5,10 +5,13 @@ import com.mineinabyss.geary.prefabs.PrefabKey
 import com.mineinabyss.geary.prefabs.entityOfOrNull
 import com.mineinabyss.idofront.typealiases.BukkitEntity
 import org.bukkit.block.Block
+import org.bukkit.block.TileState
 
 context(Geary)
 fun PrefabKey.toEntityOrNull() = entityOfOrNull(this)
 
-inline fun <T> BukkitEntity.withGeary(run: Geary.() -> T) = with(world.toGeary()) { run() }
+inline fun <T, R : BukkitEntity> R.withGeary(run: Geary.(R) -> T) = with(world.toGeary()) { run(this@withGeary) }
 
-inline fun <T> Block.withGeary(run: Geary.() -> T) = with(world.toGeary()) { run() }
+inline fun <T, R : TileState> R.withGeary(run: Geary.(R) -> T) = with(world.toGeary()) { run(this@withGeary) }
+
+inline fun <T, R : Block> R.withGeary(run: Geary.(R) -> T) = with(world.toGeary()) { run(this@withGeary) }