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

hide arm when player in spectator mode

Browse Source
This commit is contained in:
Bixilon 2023-05-06 20:00:29 +02:00
parent bd431f0b74
commit 15f06e3980
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/de/bixilon/minosoft/gui/rendering/camera/view/person/FirstPersonView.kt
View File

@ -15,7 +15,9 @@ package de.bixilon.minosoft.gui.rendering.camera.view.person
import de.bixilon.kotlinglm.vec2.Vec2d import de.bixilon.kotlinglm.vec2.Vec2d
import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.kotlinglm.vec3.Vec3
import de.bixilon.minosoft.data.abilities.Gamemodes
import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.EntityRotation
import de.bixilon.minosoft.data.entities.entities.player.PlayerEntity
import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.RenderContext
import de.bixilon.minosoft.gui.rendering.camera.Camera import de.bixilon.minosoft.gui.rendering.camera.Camera
import de.bixilon.minosoft.gui.rendering.camera.view.CameraView import de.bixilon.minosoft.gui.rendering.camera.view.CameraView
@ -25,7 +27,14 @@ class FirstPersonView(override val camera: Camera) : PersonView {
override val context: RenderContext get() = camera.context override val context: RenderContext get() = camera.context
override val renderSelf: Boolean get() = false override val renderSelf: Boolean get() = false
override val renderArm: Boolean get() = true override val renderArm: Boolean
get() {
val entity = camera.context.connection.camera.entity
if (entity is PlayerEntity && entity.gamemode == Gamemodes.SURVIVAL) {
return false
}
return true
}
override val renderOverlays: Boolean get() = true override val renderOverlays: Boolean get() = true
override var eyePosition: Vec3 = Vec3.EMPTY override var eyePosition: Vec3 = Vec3.EMPTY
@ -41,7 +50,7 @@ class FirstPersonView(override val camera: Camera) : PersonView {
} }
private fun update() { private fun update() {
val entity = camera.context.connection.camera.entity val entity = context.connection.camera.entity
this.eyePosition = entity.renderInfo.eyePosition this.eyePosition = entity.renderInfo.eyePosition
this.rotation = entity.physics.rotation this.rotation = entity.physics.rotation
this.front = this.rotation.front this.front = this.rotation.front

2
src/main/java/de/bixilon/minosoft/gui/rendering/world/light/RenderLight.kt
View File

@ -50,7 +50,7 @@ class RenderLight(val context: RenderContext) {
"minosoft:toggle_fullbright".toResourceLocation(), "minosoft:toggle_fullbright".toResourceLocation(),
KeyBinding( KeyBinding(
KeyActions.MODIFIER to setOf(KeyCodes.KEY_F4), KeyActions.MODIFIER to setOf(KeyCodes.KEY_F4),
KeyActions.CHANGE to setOf(KeyCodes.KEY_C), KeyActions.STICKY to setOf(KeyCodes.KEY_C),
), ),
defaultPressed = connection.profiles.rendering.light.fullbright, defaultPressed = connection.profiles.rendering.light.fullbright,
) { ) {