From c98e6786a54d6969dceb0e5ec19fd5982d482ea5 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 31 Mar 2021 19:56:17 +0100
Subject: [PATCH] 21w13a fixes

---
 .../blaze3d/platform/TextureUtil.mapping      | 33 ++++++++++++++++
 .../client/texture/TextureUtil.mapping        | 38 -------------------
 .../minecraft/server/MinecraftServer.mapping  |  2 +-
 3 files changed, 34 insertions(+), 39 deletions(-)
 create mode 100644 mappings/com/mojang/blaze3d/platform/TextureUtil.mapping
 delete mode 100644 mappings/net/minecraft/client/texture/TextureUtil.mapping

diff --git a/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping
new file mode 100644
index 0000000000..6df6d42cff
--- /dev/null
+++ b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping
@@ -0,0 +1,33 @@
+CLASS com/mojang/blaze3d/platform/TextureUtil
+	METHOD bind (I)V
+		ARG 0 id
+	METHOD initTexture (Ljava/nio/IntBuffer;II)V
+		ARG 0 imageData
+		ARG 1 width
+		ARG 2 height
+	METHOD prepareImage (III)V
+		ARG 0 id
+		ARG 1 width
+		ARG 2 height
+	METHOD prepareImage (IIII)V
+		ARG 0 id
+		ARG 1 maxLevel
+		ARG 2 width
+		ARG 3 height
+	METHOD prepareImage (Lnet/minecraft/class_1011$class_1013;III)V
+		ARG 0 internalFormat
+		ARG 1 id
+		ARG 2 width
+		ARG 3 height
+	METHOD prepareImage (Lnet/minecraft/class_1011$class_1013;IIII)V
+		ARG 0 internalFormat
+		ARG 1 id
+		ARG 2 maxLevel
+		ARG 3 width
+		ARG 4 height
+	METHOD readResource (Ljava/io/InputStream;)Ljava/nio/ByteBuffer;
+		ARG 0 inputStream
+	METHOD readResourceAsString (Ljava/io/InputStream;)Ljava/lang/String;
+		ARG 0 inputStream
+	METHOD releaseTextureId (I)V
+		ARG 0 id
diff --git a/mappings/net/minecraft/client/texture/TextureUtil.mapping b/mappings/net/minecraft/client/texture/TextureUtil.mapping
deleted file mode 100644
index fc1479e1e8..0000000000
--- a/mappings/net/minecraft/client/texture/TextureUtil.mapping
+++ /dev/null
@@ -1,38 +0,0 @@
-CLASS com/mojang/blaze3d/platform/TextureUtil net/minecraft/client/texture/TextureUtil
-	METHOD bind (I)V
-		ARG 0 id
-	METHOD generateTextureId generateId ()I
-	METHOD initTexture uploadImage (Ljava/nio/IntBuffer;II)V
-		COMMENT Uploads {@code imageData} to the bound texture.
-		COMMENT Each integer is interpreted as 0xAARRGGBB.
-		ARG 0 imageData
-		ARG 1 width
-		ARG 2 height
-	METHOD prepareImage allocate (III)V
-		ARG 0 id
-		ARG 1 width
-		ARG 2 height
-	METHOD prepareImage allocate (IIII)V
-		ARG 0 id
-		ARG 1 maxLevel
-		ARG 2 width
-		ARG 3 height
-	METHOD prepareImage allocate (Lnet/minecraft/class_1011$class_1013;III)V
-		ARG 0 internalFormat
-		ARG 1 id
-		ARG 2 width
-		ARG 3 height
-	METHOD prepareImage allocate (Lnet/minecraft/class_1011$class_1013;IIII)V
-		COMMENT Allocate uninitialized backing memory for {@code maxLevel+1}
-		COMMENT mip levels to texture {@code id}.
-		ARG 0 internalFormat
-		ARG 1 id
-		ARG 2 maxLevel
-		ARG 3 width
-		ARG 4 height
-	METHOD readResource readAllToByteBuffer (Ljava/io/InputStream;)Ljava/nio/ByteBuffer;
-		ARG 0 inputStream
-	METHOD readResourceAsString readAllToString (Ljava/io/InputStream;)Ljava/lang/String;
-		ARG 0 inputStream
-	METHOD releaseTextureId deleteId (I)V
-		ARG 0 id
diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping
index 84b77f9351..392f914552 100644
--- a/mappings/net/minecraft/server/MinecraftServer.mapping
+++ b/mappings/net/minecraft/server/MinecraftServer.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer
+CLASS net/minecraft/server/MinecraftServer
 	COMMENT Represents a logical Minecraft server.
 	COMMENT
 	COMMENT <p>Since Minecraft uses a Client-Server architecture for the game, the server processes all logical game functions.