strips/foundation
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/foundation.git synced 2026-04-01 20:30:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Heimdall: Keep track of block data.

Browse Source
This commit is contained in:
Alex Zenla
2023-02-07 20:36:30 -05:00
parent 760b77364a
commit 688106a6e6
13 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/BlockBreak.kt
View File

@@ -16,12 +16,14 @@ class BlockBreak(
val playerUniqueIdentity: UUID,
val location: Location,
val material: Material,
val blockData: String? = null,
val timestamp: Instant = Instant.now()
) : HeimdallEvent() {
constructor(event: BlockBreakEvent) : this(
event.player.uniqueId,
event.block.location,
event.block.type
event.block.type,
event.block.blockData.asString
)
override fun store(transaction: Transaction) {
@@ -29,6 +31,7 @@ class BlockBreak(
BlockBreakTable.insert {
putPlayerTimedLocalEvent(it, timestamp, location, playerUniqueIdentity)
it[block] = material.key.toString()
it[blockData] = this@BlockBreak.blockData
}
}
}

5
foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/event/BlockPlace.kt
View File

@@ -16,12 +16,14 @@ class BlockPlace(
val playerUniqueIdentity: UUID,
val location: Location,
val material: Material,
val blockData: String? = null,
val timestamp: Instant = Instant.now()
) : HeimdallEvent() {
constructor(event: BlockPlaceEvent) : this(
event.player.uniqueId,
event.block.location,
event.block.type
event.block.type,
event.block.blockData.asString
)
override fun store(transaction: Transaction) {
@@ -29,6 +31,7 @@ class BlockPlace(
BlockPlaceTable.insert {
putPlayerTimedLocalEvent(it, timestamp, location, playerUniqueIdentity)
it[block] = material.key.toString()
it[blockData] = this@BlockPlace.blockData
}
}
}

15
foundation-heimdall/src/main/kotlin/gay/pizza/foundation/heimdall/plugin/load/WorldReassembler.kt
View File

@@ -1,5 +1,6 @@
package gay.pizza.foundation.heimdall.plugin.load
import gay.pizza.foundation.heimdall.export.ExportedBlock
import gay.pizza.foundation.heimdall.load.WorldLoadFormat
import gay.pizza.foundation.heimdall.load.WorldLoadWorld
import org.bukkit.Location
@@ -24,7 +25,7 @@ class WorldReassembler(val plugin: Plugin, val server: Server, val format: World
continue
}
val blocksToMake = mutableListOf<Pair<Location, Material>>()
val blocksToMake = mutableListOf<Pair<Location, ExportedBlock>>()
for ((x, zBlocks) in load.blocks) {
for ((z, yBlocks) in zBlocks) {
@@ -36,7 +37,7 @@ class WorldReassembler(val plugin: Plugin, val server: Server, val format: World
continue
}
blocksToMake.add(Location(world, x.toDouble(), y.toDouble(), z.toDouble()) to material)
blocksToMake.add(Location(world, x.toDouble(), y.toDouble(), z.toDouble()) to block)
}
}
}
@@ -50,9 +51,15 @@ class WorldReassembler(val plugin: Plugin, val server: Server, val format: World
val copy = section.toList()
val runnable = object : BukkitRunnable() {
override fun run() {
for ((location, material) in copy) {
for ((location, blk) in copy) {
val block = world.getBlockAt(location)
block.type = material
val blockData = if (blk.data != null) server.createBlockData(blk.data!!) else null
if (blockData != null) {
block.blockData = blockData
} else {
val material = Material.matchMaterial(blk.type)!!
block.type = material
}
count.incrementAndGet()
}
feedback("Placed ${count.get()} blocks in ${world.name}")