From bdee1ea852893bc185cdfc1cb42ec167106c4b6b Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Tue, 16 Feb 2021 13:00:47 +0100
Subject: [PATCH] remove some java warnings

---
 src/main/java/de/bixilon/minosoft/data/EntityClassMappings.kt  | 1 +
 .../bixilon/minosoft/data/mappings/tweaker/VersionTweaker.java | 1 +
 .../de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt   | 2 +-
 .../java/de/bixilon/minosoft/gui/rendering/chunk/WorldMesh.kt  | 3 +--
 .../protocol/packets/clientbound/play/PacketJoinGame.kt        | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/data/EntityClassMappings.kt b/src/main/java/de/bixilon/minosoft/data/EntityClassMappings.kt
index ed9358d17..a1ca78c69 100644
--- a/src/main/java/de/bixilon/minosoft/data/EntityClassMappings.kt
+++ b/src/main/java/de/bixilon/minosoft/data/EntityClassMappings.kt
@@ -45,6 +45,7 @@ import de.bixilon.minosoft.data.entities.entities.vehicle.*
 import de.bixilon.minosoft.data.mappings.ModIdentifier
 
 object EntityClassMappings {
+    @SuppressWarnings("deprecation")
     private val ENTITY_CLASS_MAPPINGS: HashBiMap<Class<out Entity>, ModIdentifier> = HashBiMap.create(
         mapOf(
             AreaEffectCloud::class.java to ModIdentifier("area_effect_cloud"),
diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/tweaker/VersionTweaker.java b/src/main/java/de/bixilon/minosoft/data/mappings/tweaker/VersionTweaker.java
index f972dd3ec..863c3af43 100644
--- a/src/main/java/de/bixilon/minosoft/data/mappings/tweaker/VersionTweaker.java
+++ b/src/main/java/de/bixilon/minosoft/data/mappings/tweaker/VersionTweaker.java
@@ -32,6 +32,7 @@ import static de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_8_9;
 
 public class VersionTweaker {
     // 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) {
         if (fakeClass == ZombiePigman.class) {
             return ZombifiedPiglin.class;
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt
index 92c873813..88aea8067 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/ChunkRenderer.kt
@@ -96,7 +96,7 @@ class ChunkRenderer(private val connection: Connection, private val world: World
 
         for ((_, map) in chunkSectionsToDraw) {
             for ((_, mesh) in map) {
-                mesh.draw(chunkShader)
+                mesh.draw()
             }
         }
         glDisable(GL_CULL_FACE)
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldMesh.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldMesh.kt
index 97fe27eee..be84cefc9 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldMesh.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldMesh.kt
@@ -1,6 +1,5 @@
 package de.bixilon.minosoft.gui.rendering.chunk
 
-import de.bixilon.minosoft.gui.rendering.shader.Shader
 import glm_.BYTES
 import org.lwjgl.opengl.GL11.GL_FLOAT
 import org.lwjgl.opengl.GL20.glEnableVertexAttribArray
@@ -28,7 +27,7 @@ class WorldMesh(data: FloatArray) {
         glBindBuffer(GL_ARRAY_BUFFER, 0)
     }
 
-    fun draw(chunkShader: Shader) {
+    fun draw() {
         glBindVertexArray(vAO)
         glDrawArrays(GL_TRIANGLES, 0, trianglesCount)
     }
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.kt
index 25f1b769d..ab2fcab8f 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.kt
@@ -77,7 +77,7 @@ class PacketJoinGame : ClientboundPacket() {
             buffer.readByte() // previous game mode
         }
         if (buffer.versionId >= ProtocolVersions.V_20W22A) {
-            val worlds = buffer.readStringArray()
+            buffer.readStringArray() // world
         }
         if (buffer.versionId < ProtocolVersions.V_20W21A) {
             dimension = buffer.connection.mapping.getDimension(buffer.readInt())!!