AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-15 18:34:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

falling block entity

Browse Source
This commit is contained in:
Moritz Zwerger 2023-11-10 21:38:17 +01:00
parent 57eac06abf
commit d0fb324fe3
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/bixilon/minosoft/data/entities/entities/item/FallingBlockEntity.kt
View File

@ -14,6 +14,7 @@ package de.bixilon.minosoft.data.entities.entities.item
import de.bixilon.kotlinglm.vec3.Vec3d
import de.bixilon.kotlinglm.vec3.Vec3i
import de.bixilon.kutil.observer.DataObserver.Companion.observed
import de.bixilon.minosoft.data.entities.EntityRotation
import de.bixilon.minosoft.data.entities.data.EntityData
import de.bixilon.minosoft.data.entities.data.EntityDataField
@ -30,7 +31,7 @@ import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
class FallingBlockEntity(connection: PlayConnection, entityType: EntityType, data: EntityData, position: Vec3d, rotation: EntityRotation) : Entity(connection, entityType, data, position, rotation) {
@get:SynchronizedEntityData
var blockState: BlockState? = null
var blockState: BlockState? by observed(null)
private set
@get:SynchronizedEntityData

6
src/main/java/de/bixilon/minosoft/gui/rendering/entities/factory/DefaultEntityModels.kt
View File

@ -15,7 +15,8 @@ package de.bixilon.minosoft.gui.rendering.entities.factory
import de.bixilon.kutil.latch.AbstractLatch
import de.bixilon.minosoft.data.registries.factory.DefaultFactory
import de.bixilon.minosoft.gui.rendering.entities.renderer.PrimedTNTEntityRenderer
import de.bixilon.minosoft.gui.rendering.entities.renderer.item.FallingBlockEntityRenderer
import de.bixilon.minosoft.gui.rendering.entities.renderer.item.PrimedTNTEntityRenderer
import de.bixilon.minosoft.gui.rendering.entities.renderer.living.animal.PigRenderer
import de.bixilon.minosoft.gui.rendering.entities.renderer.living.player.PlayerRenderer
import de.bixilon.minosoft.gui.rendering.models.loader.ModelLoader
@ -25,7 +26,8 @@ import de.bixilon.minosoft.util.logging.LogMessageType
object DefaultEntityModels : DefaultFactory<RegisteredEntityModelFactory<*>>(
PlayerRenderer,
PigRenderer, PrimedTNTEntityRenderer,
PigRenderer,
PrimedTNTEntityRenderer, FallingBlockEntityRenderer,
) {
fun load(loader: ModelLoader, latch: AbstractLatch?) {

37
src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/item/FallingBlockEntityRenderer.kt Normal file
View File

@ -0,0 +1,37 @@
/*
* Minosoft
* Copyright (C) 2020-2023 Moritz Zwerger
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.gui.rendering.entities.renderer.item
import de.bixilon.kutil.observer.DataObserver.Companion.observe
import de.bixilon.minosoft.data.entities.entities.item.FallingBlockEntity
import de.bixilon.minosoft.data.registries.identified.Identified
import de.bixilon.minosoft.gui.rendering.entities.EntitiesRenderer
import de.bixilon.minosoft.gui.rendering.entities.factory.RegisteredEntityModelFactory
import de.bixilon.minosoft.gui.rendering.entities.feature.block.BlockFeature
import de.bixilon.minosoft.gui.rendering.entities.renderer.EntityRenderer
class FallingBlockEntityRenderer(renderer: EntitiesRenderer, entity: FallingBlockEntity) : EntityRenderer<FallingBlockEntity>(renderer, entity) {
val block = BlockFeature(this, null).register()
init {
entity::blockState.observe(this, true) { block.state = it }
}
companion object : RegisteredEntityModelFactory<FallingBlockEntity>, Identified {
override val identifier get() = FallingBlockEntity.identifier
override fun create(renderer: EntitiesRenderer, entity: FallingBlockEntity) = FallingBlockEntityRenderer(renderer, entity)
}
}

3
src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/PrimedTNTEntityRenderer.kt → src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/item/PrimedTNTEntityRenderer.kt
View File

@ -11,7 +11,7 @@
* This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/
package de.bixilon.minosoft.gui.rendering.entities.renderer
package de.bixilon.minosoft.gui.rendering.entities.renderer.item
import de.bixilon.minosoft.data.entities.entities.item.PrimedTNT
import de.bixilon.minosoft.data.registries.blocks.MinecraftBlocks
@ -19,6 +19,7 @@ import de.bixilon.minosoft.data.registries.identified.Identified
import de.bixilon.minosoft.gui.rendering.entities.EntitiesRenderer
import de.bixilon.minosoft.gui.rendering.entities.factory.RegisteredEntityModelFactory
import de.bixilon.minosoft.gui.rendering.entities.feature.block.flashing.FlashingBlockFeature
import de.bixilon.minosoft.gui.rendering.entities.renderer.EntityRenderer
class PrimedTNTEntityRenderer(renderer: EntitiesRenderer, entity: PrimedTNT) : EntityRenderer<PrimedTNT>(renderer, entity) {
val block = FlashingBlockFeature(this, renderer.connection.registries.block[MinecraftBlocks.TNT]?.states?.default).register()