xtex/quaedam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: smart instrument block entity serialization

Browse Source
This commit is contained in:
xtex 2023-07-30 10:33:10 +08:00
parent b574d8a3d4
commit fd7766b38c
Signed by: xtex
GPG Key ID: B918086ED8045B91
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/kotlin/quaedam/projection/music/SmartInstrument.kt
View File

@ -153,6 +153,8 @@ class SmartInstrumentBlockEntity(pos: BlockPos, state: BlockState) :
const val TAG_MUSIC = "Music" const val TAG_MUSIC = "Music"
} }
// delay MusicPlayer initialization until level is available
var playerData: CompoundTag? = null
var player: MusicPlayer? = null var player: MusicPlayer? = null
override fun getUpdateTag(): CompoundTag = saveWithoutMetadata() override fun getUpdateTag(): CompoundTag = saveWithoutMetadata()
@ -162,9 +164,13 @@ class SmartInstrumentBlockEntity(pos: BlockPos, state: BlockState) :
override fun load(tag: CompoundTag) { override fun load(tag: CompoundTag) {
super.load(tag) super.load(tag)
if (TAG_MUSIC in tag) { if (TAG_MUSIC in tag) {
if (level == null) {
playerData = tag.getCompound(TAG_MUSIC)
} else {
player = MusicPlayer(tag.getCompound(TAG_MUSIC), level!!, blockPos) player = MusicPlayer(tag.getCompound(TAG_MUSIC), level!!, blockPos)
} }
} }
}
override fun saveAdditional(tag: CompoundTag) { override fun saveAdditional(tag: CompoundTag) {
super.saveAdditional(tag) super.saveAdditional(tag)
@ -199,10 +205,14 @@ class SmartInstrumentBlockEntity(pos: BlockPos, state: BlockState) :
} }
fun tick() { fun tick() {
if (playerData != null) {
player = MusicPlayer(playerData!!, level!!, blockPos)
}
if (player != null) {
if (checkProjections()) { if (checkProjections()) {
player?.tick() player!!.tick()
if (!level!!.isClientSide) { if (!level!!.isClientSide) {
if (player?.isEnd == true) { if (player!!.isEnd == true) {
player = null player = null
setChanged() setChanged()
sendBlockUpdated() sendBlockUpdated()
@ -217,5 +227,6 @@ class SmartInstrumentBlockEntity(pos: BlockPos, state: BlockState) :
sendBlockUpdated() sendBlockUpdated()
} }
} }
}
} }