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

remove some java warnings

Browse Source
This commit is contained in:
Bixilon 2021-02-16 13:00:47 +01:00
parent 4e2e1adbeb
commit bdee1ea852
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/bixilon/minosoft/data/EntityClassMappings.kt
View File

@ -45,6 +45,7 @@ import de.bixilon.minosoft.data.entities.entities.vehicle.*
import de.bixilon.minosoft.data.mappings.ModIdentifier import de.bixilon.minosoft.data.mappings.ModIdentifier
object EntityClassMappings { object EntityClassMappings {
@SuppressWarnings("deprecation")
private val ENTITY_CLASS_MAPPINGS: HashBiMap<Class<out Entity>, ModIdentifier> = HashBiMap.create( private val ENTITY_CLASS_MAPPINGS: HashBiMap<Class<out Entity>, ModIdentifier> = HashBiMap.create(
mapOf( mapOf(
AreaEffectCloud::class.java to ModIdentifier("area_effect_cloud"), AreaEffectCloud::class.java to ModIdentifier("area_effect_cloud"),

1
src/main/java/de/bixilon/minosoft/data/mappings/tweaker/VersionTweaker.java
View File

@ -32,6 +32,7 @@ import static de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_8_9;
public class VersionTweaker { public class VersionTweaker {
// some data was packed in mata data in early versions (1.8). This function converts it to the real identifier // some data was packed in mata data in early versions (1.8). This function converts it to the real identifier
@SuppressWarnings("deprecation")
public static Class<? extends Entity> getRealEntityClass(Class<? extends Entity> fakeClass, EntityMetaData metaData, int versionId) { public static Class<? extends Entity> getRealEntityClass(Class<? extends Entity> fakeClass, EntityMetaData metaData, int versionId) {
if (fakeClass == ZombiePigman.class) { if (fakeClass == ZombiePigman.class) {
return ZombifiedPiglin.class; return ZombifiedPiglin.class;

2
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt
View File

@ -96,7 +96,7 @@ class ChunkRenderer(private val connection: Connection, private val world: World
for ((_, map) in chunkSectionsToDraw) { for ((_, map) in chunkSectionsToDraw) {
for ((_, mesh) in map) { for ((_, mesh) in map) {
mesh.draw(chunkShader) mesh.draw()
} }
} }
glDisable(GL_CULL_FACE) glDisable(GL_CULL_FACE)

3
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldMesh.kt
View File

@ -1,6 +1,5 @@
package de.bixilon.minosoft.gui.rendering.chunk package de.bixilon.minosoft.gui.rendering.chunk
import de.bixilon.minosoft.gui.rendering.shader.Shader
import glm_.BYTES import glm_.BYTES
import org.lwjgl.opengl.GL11.GL_FLOAT import org.lwjgl.opengl.GL11.GL_FLOAT
import org.lwjgl.opengl.GL20.glEnableVertexAttribArray import org.lwjgl.opengl.GL20.glEnableVertexAttribArray
@ -28,7 +27,7 @@ class WorldMesh(data: FloatArray) {
glBindBuffer(GL_ARRAY_BUFFER, 0) glBindBuffer(GL_ARRAY_BUFFER, 0)
} }
fun draw(chunkShader: Shader) { fun draw() {
glBindVertexArray(vAO) glBindVertexArray(vAO)
glDrawArrays(GL_TRIANGLES, 0, trianglesCount) glDrawArrays(GL_TRIANGLES, 0, trianglesCount)
} }

2
src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.kt
View File

@ -77,7 +77,7 @@ class PacketJoinGame : ClientboundPacket() {
buffer.readByte() // previous game mode buffer.readByte() // previous game mode
} }
if (buffer.versionId >= ProtocolVersions.V_20W22A) { if (buffer.versionId >= ProtocolVersions.V_20W22A) {
val worlds = buffer.readStringArray() buffer.readStringArray() // world
} }
if (buffer.versionId < ProtocolVersions.V_20W21A) { if (buffer.versionId < ProtocolVersions.V_20W21A) {
dimension = buffer.connection.mapping.getDimension(buffer.readInt())!! dimension = buffer.connection.mapping.getDimension(buffer.readInt())!!