Merge branch 'master' into add-pylon-guide

Author: LordIdra

pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/block/BlockListener.kt

@@ -16,7 +16,6 @@ import io.papermc.paper.event.player.PlayerLecternPageChangeEvent
 import io.papermc.paper.event.player.PlayerOpenSignEvent
 import org.bukkit.GameMode
 import org.bukkit.Material
-import org.bukkit.block.BlockFace
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
@@ -50,10 +49,7 @@ internal object BlockListener : Listener {
         val player = event.player
 
         val pylonItem = PylonItem.fromStack(item)
-        val relative = event.blockPlaced.position - event.blockAgainst.position
-        val blockFace = BlockFace.entries.find { it.modX == relative.x && it.modY == relative.y && it.modZ == relative.z }
-            ?: BlockFace.SELF
-        val pylonBlock = pylonItem?.place(BlockCreateContext.PlayerPlace(player, item, event.blockPlaced, blockFace))
+        val pylonBlock = pylonItem?.place(BlockCreateContext.PlayerPlace(player, item, event))
 
         if (pylonItem != null && pylonBlock == null) {
             event.isCancelled = true

pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/block/context/BlockCreateContext.kt

@@ -1,8 +1,8 @@
 package io.github.pylonmc.pylon.core.block.context
 
 import org.bukkit.block.Block
-import org.bukkit.block.BlockFace
 import org.bukkit.entity.Player
+import org.bukkit.event.block.BlockPlaceEvent
 import org.bukkit.inventory.ItemStack
 
 interface BlockCreateContext {
@@ -12,9 +12,10 @@ interface BlockCreateContext {
     data class PlayerPlace(
         val player: Player,
         val item: ItemStack,
-        override val block: Block,
-        val clickedFace: BlockFace
-    ) : BlockCreateContext
+        val event: BlockPlaceEvent
+    ) : BlockCreateContext {
+        override val block = event.blockPlaced
+    }
 
     data class Default(override val block: Block) : BlockCreateContext
 }

pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/util/ItemUtils.kt

@@ -55,6 +55,7 @@ inline fun <reified T> ItemStack?.isPylonAndIsNot(): Boolean {
     return pylonItem != null && pylonItem !is T
 }
 
+@JvmName("recipeChoiceFromItem")
 fun ItemStack.asRecipeChoice(): RecipeChoice {
     return if (PylonItem.isPylonItem(this)) {
         RecipeChoice.ExactChoice(this)

pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/util/PylonUtils.kt

@@ -4,15 +4,10 @@ package io.github.pylonmc.pylon.core.util
 
 import io.github.pylonmc.pylon.core.addon.PylonAddon
 import io.github.pylonmc.pylon.core.entity.display.transform.TransformUtil.yawToCardinalDirection
-import net.kyori.adventure.text.Component
-import org.bukkit.Color
-import org.bukkit.Location
 import org.bukkit.NamespacedKey
 import org.bukkit.block.BlockFace
 import org.bukkit.entity.Player
-import org.bukkit.entity.TextDisplay
 import org.bukkit.util.Vector
-import org.joml.Matrix4f
 import org.joml.RoundingMode
 import org.joml.Vector3f
 import org.joml.Vector3i
@@ -58,16 +53,4 @@ fun rotateToPlayerFacing(player: Player, face: BlockFace, allowVertical: Boolean
         vector = vector.rotateAroundNonUnitAxis(rightVector, -yawToCardinalDirection(player.eyeLocation.pitch).toDouble())
     }
     return vectorToBlockFace(vector)
-}
-
-fun spawnUnitSquareTextDisplay(location: Location, color: Color): TextDisplay {
-    val display = location.world!!.spawn(location, TextDisplay::class.java)
-    display.setTransformationMatrix( // https://github.com/TheCymaera/minecraft-hologram/blob/d67eb43308df61bdfe7283c6821312cca5f9dea9/src/main/java/com/heledron/hologram/utilities/rendering/textDisplays.kt#L15
-        Matrix4f()
-            .translate(-0.1f + .5f, -0.5f + .5f, 0f)
-            .scale(8.0f, 4.0f, 1f)
-    )
-    display.text(Component.text(" "))
-    display.backgroundColor = color
-    return display
 }