From 74520207277d13bcb2563478f66e10f1b4eadb0c Mon Sep 17 00:00:00 2001 From: Bixilon Date: Thu, 1 Apr 2021 22:18:34 +0200 Subject: [PATCH] remove some code warnings --- .../minosoft/data/assets/MinecraftAssetsManager.kt | 2 ++ .../java/de/bixilon/minosoft/gui/rendering/Camera.kt | 4 ++-- .../minosoft/gui/rendering/RenderConstants.kt | 2 +- .../bixilon/minosoft/gui/rendering/RenderWindow.kt | 2 +- .../de/bixilon/minosoft/gui/rendering/font/Font.kt | 2 +- .../minosoft/gui/rendering/hud/HUDRenderer.kt | 2 +- .../gui/rendering/hud/atlas/HUDAtlasElement.kt | 6 +++--- .../hud/elements/debug/HUDWorldDebugElement.kt | 7 +++---- .../clientbound/play/PacketMultiBlockChange.kt | 3 ++- .../packets/clientbound/play/PacketUpdateLight.kt | 12 +++++------- .../play/combat/CombatEventPacketFactory.kt | 6 +++--- .../play/combat/EnterCombatEventPacket.kt | 3 +-- .../clientbound/play/title/HideTitlePacket.kt | 3 +-- .../clientbound/play/title/ResetTitlePacket.kt | 3 +-- .../clientbound/play/title/TitlePacketFactory.kt | 4 ++-- .../java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt | 2 +- .../java/de/bixilon/minosoft/util/chunk/LightUtil.kt | 2 +- 17 files changed, 31 insertions(+), 34 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/data/assets/MinecraftAssetsManager.kt b/src/main/java/de/bixilon/minosoft/data/assets/MinecraftAssetsManager.kt index 8d7f0d4d9..b7c0da9fd 100644 --- a/src/main/java/de/bixilon/minosoft/data/assets/MinecraftAssetsManager.kt +++ b/src/main/java/de/bixilon/minosoft/data/assets/MinecraftAssetsManager.kt @@ -126,6 +126,8 @@ class MinecraftAssetsManager( ) ), hash, false) } + else -> { + } } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt index 5c82f11fc..167aa9740 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt @@ -96,8 +96,8 @@ class Camera( lastMouseY = yPos xOffset *= mouseSensitivity yOffset *= mouseSensitivity - var yaw = xOffset.toFloat() + (playerEntity.rotation?.headYaw ?: 0f) - var pitch = yOffset.toFloat() + (playerEntity.rotation?.pitch ?: 0f) + var yaw = xOffset.toFloat() + playerEntity.rotation.headYaw + var pitch = yOffset.toFloat() + playerEntity.rotation.pitch // make sure that when pitch is out of bounds, screen doesn't get flipped if (pitch > 89.9) { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt index d19ab9f0f..4e93b7013 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderConstants.kt @@ -50,7 +50,7 @@ object RenderConstants { const val MAXIMUM_CALLS_PER_FRAME = 10 - const val DISABLE_LIGHTING = true + const val DISABLE_LIGHTING = false const val RENDER_BLOCKS = true const val RENDER_FLUIDS = true diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt index 199f2c159..9d9e55984 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt @@ -250,7 +250,7 @@ class RenderWindow( textures.preLoad(connection.version.assetsManager) - font.loadAtlas(textures) + font.loadAtlas() textures.load() diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/font/Font.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/font/Font.kt index 00c73d6d0..564fb5dd7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/font/Font.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/font/Font.kt @@ -48,7 +48,7 @@ class Font { preLoaded = true } - fun loadAtlas(textureArray: TextureArray) { + fun loadAtlas() { check(!loaded) { "Font has already a atlas texture!" } check(preLoaded) { "Font hasn't been preloaded!" } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDRenderer.kt index 8ba907ee1..65a9fa964 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/HUDRenderer.kt @@ -52,7 +52,7 @@ class HUDRenderer(val connection: Connection, val renderWindow: RenderWindow) : override fun init() { hudShader.load(Minosoft.MINOSOFT_ASSETS_MANAGER) - val hudImages = HUDAtlasElement.deserialize(Minosoft.MINOSOFT_ASSETS_MANAGER.readJsonAsset(ResourceLocation(ProtocolDefinition.MINOSOFT_NAMESPACE, "mapping/atlas.json")).toResourceLocationMap(), connection.version.versionId) + val hudImages = HUDAtlasElement.deserialize(Minosoft.MINOSOFT_ASSETS_MANAGER.readJsonAsset(ResourceLocation(ProtocolDefinition.MINOSOFT_NAMESPACE, "mapping/atlas.json")).toResourceLocationMap()) this.hudAtlasElements = hudImages.second renderWindow.textures.allTextures.addAll(hudImages.first.toList()) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/atlas/HUDAtlasElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/atlas/HUDAtlasElement.kt index 899185db8..654426fe6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/atlas/HUDAtlasElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/atlas/HUDAtlasElement.kt @@ -41,16 +41,16 @@ data class HUDAtlasElement( private val UV_START_ADD = Vec2(0, 0.000015f) // ToDo: This fixes the "half pixel bug" - fun deserialize(json: Map, versionId: Int): Pair, Map> { + fun deserialize(json: Map): Pair, Map> { val textures: MutableMap = mutableMapOf() val ret: MutableMap = mutableMapOf() for ((resourceLocation, data) in json) { - ret[resourceLocation] = deserialize(data, textures, versionId) + ret[resourceLocation] = deserialize(data, textures) } return Pair(textures.values, ret) } - fun deserialize(json: JsonObject, textures: MutableMap, versionId: Int): HUDAtlasElement { + fun deserialize(json: JsonObject, textures: MutableMap): HUDAtlasElement { val keys: MutableSet = mutableSetOf() var textureResourceLocation: ResourceLocation? = json["texture"]?.asString?.let { ResourceLocation(it) } for (key in json["versions"].asJsonObject.keySet()) { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/elements/debug/HUDWorldDebugElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/elements/debug/HUDWorldDebugElement.kt index c04e16fdd..7c54513a2 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/hud/elements/debug/HUDWorldDebugElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/hud/elements/debug/HUDWorldDebugElement.kt @@ -107,8 +107,7 @@ class HUDWorldDebugElement(hudRenderer: HUDRenderer) : DebugScreen(hudRenderer) private fun getPosition(): String { - return "${formatCoordinate(camera.cameraPosition.x)} / ${formatCoordinate(camera.cameraPosition.y)} / ${formatCoordinate(camera.cameraPosition.z)}" - return "${formatCoordinate(camera.playerEntity.position?.x!!)} / ${formatCoordinate(camera.playerEntity.position?.y!!)} / ${formatCoordinate(camera.playerEntity.position?.z!!)}" + return "${formatCoordinate(camera.playerEntity.position.x)} / ${formatCoordinate(camera.playerEntity.position.y)} / ${formatCoordinate(camera.playerEntity.position.z)}" } private fun getBlockPosition(): String { @@ -120,8 +119,8 @@ class HUDWorldDebugElement(hudRenderer: HUDRenderer) : DebugScreen(hudRenderer) } private fun getFacing(): String { - val yaw = hudRenderer.renderWindow.camera.playerEntity.rotation?.yaw!! - val pitch = hudRenderer.renderWindow.camera.playerEntity.rotation?.pitch!! + val yaw = hudRenderer.renderWindow.camera.playerEntity.rotation.yaw + val pitch = hudRenderer.renderWindow.camera.playerEntity.rotation.pitch val direction = Directions.byDirection(camera.cameraFront) return "${Directions.byDirection(camera.cameraFront).name.toLowerCase()} ${direction.directionVector} (${formatRotation(yaw.toDouble())} / ${formatRotation(pitch.toDouble())})" } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMultiBlockChange.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMultiBlockChange.kt index d403d2ce8..3d78f3d40 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMultiBlockChange.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMultiBlockChange.kt @@ -41,7 +41,8 @@ class PacketMultiBlockChange() : ClientboundPacket() { buffer.readChunkPosition() } val count = buffer.readShort() - val dataSize = buffer.readInt() // should be count * 4 + val dataSize = buffer.readInt() + check(dataSize == count * 4) { "MultiBlockChangePacket needs 4 bytes per block change!" } for (i in 0 until count) { val raw = buffer.readInt() val meta = (raw and 0xF) diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateLight.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateLight.kt index 701dce19c..f5caeeb89 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateLight.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUpdateLight.kt @@ -40,22 +40,20 @@ class PacketUpdateLight(buffer: InByteBuffer) : ClientboundPacket() { val skyLightMask: BitSet val blockLightMask: BitSet - val emptySkyLightMask: BitSet - val emptyBlockLightMask: BitSet if (buffer.versionId < ProtocolVersions.V_20W49A) { skyLightMask = KUtil.bitSetOf(buffer.readVarLong()) blockLightMask = KUtil.bitSetOf(buffer.readVarLong()) - emptyBlockLightMask = KUtil.bitSetOf(buffer.readVarLong()) - emptySkyLightMask = KUtil.bitSetOf(buffer.readVarLong()) + buffer.readVarLong() // emptyBlockLightMask + buffer.readVarLong() // emptySkyLightMask } else { skyLightMask = BitSet.valueOf(buffer.readLongArray()) blockLightMask = BitSet.valueOf(buffer.readLongArray()) - emptySkyLightMask = BitSet.valueOf(buffer.readLongArray()) - emptyBlockLightMask = BitSet.valueOf(buffer.readLongArray()) + buffer.readLongArray() // emptySkyLightMask + buffer.readLongArray() // emptyBlockLightMask } - lightAccessor = readLightPacket(buffer, skyLightMask, blockLightMask, emptyBlockLightMask, emptySkyLightMask, buffer.connection.world.dimension!!) + lightAccessor = readLightPacket(buffer, skyLightMask, blockLightMask, buffer.connection.world.dimension!!) } override fun log() { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/combat/CombatEventPacketFactory.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/combat/CombatEventPacketFactory.kt index 2edb5b06c..27c5a9787 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/combat/CombatEventPacketFactory.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/combat/CombatEventPacketFactory.kt @@ -22,9 +22,9 @@ object CombatEventPacketFactory { fun createPacket(buffer: InByteBuffer): ClientboundPacket { return when (CombatEvents.VALUES[buffer.readVarInt()]) { - CombatEvents.ENTER_COMBAT -> EnterCombatEventPacket(buffer) - CombatEvents.END_COMBAT -> EnterCombatEventPacket(buffer) - CombatEvents.ENTITY_DEATH -> EnterCombatEventPacket(buffer) + CombatEvents.ENTER_COMBAT -> EnterCombatEventPacket() + CombatEvents.END_COMBAT -> EnterCombatEventPacket() + CombatEvents.ENTITY_DEATH -> EnterCombatEventPacket() } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/combat/EnterCombatEventPacket.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/combat/EnterCombatEventPacket.kt index bead989c7..eb44dbb5b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/combat/EnterCombatEventPacket.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/combat/EnterCombatEventPacket.kt @@ -14,10 +14,9 @@ package de.bixilon.minosoft.protocol.packets.clientbound.play.combat import de.bixilon.minosoft.protocol.packets.ClientboundPacket -import de.bixilon.minosoft.protocol.protocol.InByteBuffer import de.bixilon.minosoft.util.logging.Log -class EnterCombatEventPacket(buffer: InByteBuffer) : ClientboundPacket() { +class EnterCombatEventPacket : ClientboundPacket() { override fun log() { Log.protocol("[IN] Received enter combat event") diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/HideTitlePacket.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/HideTitlePacket.kt index 93609b24b..90e0b578d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/HideTitlePacket.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/HideTitlePacket.kt @@ -14,10 +14,9 @@ package de.bixilon.minosoft.protocol.packets.clientbound.play.title import de.bixilon.minosoft.protocol.packets.ClientboundPacket -import de.bixilon.minosoft.protocol.protocol.InByteBuffer import de.bixilon.minosoft.util.logging.Log -class HideTitlePacket(buffer: InByteBuffer) : ClientboundPacket() { +class HideTitlePacket : ClientboundPacket() { override fun log() { Log.protocol("[IN] Received hide title") diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/ResetTitlePacket.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/ResetTitlePacket.kt index fb838d559..d82628705 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/ResetTitlePacket.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/ResetTitlePacket.kt @@ -14,10 +14,9 @@ package de.bixilon.minosoft.protocol.packets.clientbound.play.title import de.bixilon.minosoft.protocol.packets.ClientboundPacket -import de.bixilon.minosoft.protocol.protocol.InByteBuffer import de.bixilon.minosoft.util.logging.Log -class ResetTitlePacket(buffer: InByteBuffer) : ClientboundPacket() { +class ResetTitlePacket : ClientboundPacket() { override fun log() { Log.protocol("[IN] Received reset title") diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/TitlePacketFactory.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/TitlePacketFactory.kt index 8a334fd51..1992a6218 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/TitlePacketFactory.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/title/TitlePacketFactory.kt @@ -26,8 +26,8 @@ object TitlePacketFactory { TitleActions.SET_SUBTITLE -> SetSubTitlePacket(buffer) TitleActions.SET_ACTION_BAR -> SetActionBarTextPacket(buffer) TitleActions.SET_TIMES_AND_DISPLAY -> SetTimesAndDisplayPacket(buffer) - TitleActions.HIDE -> HideTitlePacket(buffer) - TitleActions.RESET -> ResetTitlePacket(buffer) + TitleActions.HIDE -> HideTitlePacket() + TitleActions.RESET -> ResetTitlePacket() } } diff --git a/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt b/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt index ee62314be..f7f5a29d8 100644 --- a/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt @@ -68,7 +68,7 @@ object ChunkUtil { for (blockNumber in 0 until ProtocolDefinition.BLOCKS_PER_SECTION) { var blockId = (blockData[arrayPosition].toInt() and 0xFF) shl 4 - var blockMeta = 0 + var blockMeta: Int // get block meta and shift and add (merge) id if needed if (arrayPosition % 2 == 0) { // high bits diff --git a/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt b/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt index eaef7467e..ba6c3e1d6 100644 --- a/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt +++ b/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt @@ -22,7 +22,7 @@ import java.util.* object LightUtil { - fun readLightPacket(buffer: InByteBuffer, skyLightMask: BitSet, blockLightMask: BitSet, emptyBlockLightMask: BitSet, emptySkyLightMask: BitSet, dimension: Dimension): LightAccessor { + fun readLightPacket(buffer: InByteBuffer, skyLightMask: BitSet, blockLightMask: BitSet, dimension: Dimension): LightAccessor { // ToDo val skyLight = if (dimension.hasSkyLight) { readLightArray(buffer, skyLightMask, dimension)