From a17186b0c8561efb2fdb146d0eee096d0a7d3d3e Mon Sep 17 00:00:00 2001
From: asiekierka <asiekierka@gmail.com>
Date: Tue, 23 Aug 2016 11:54:39 +0200
Subject: [PATCH] make sense of IdStore

---
 .../net/minecraft/client/GlHandler.mapping    |  6 ++--
 .../minecraft/util/registry/IdStore.mapping   | 30 ++++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/mappings/net/minecraft/client/GlHandler.mapping b/mappings/net/minecraft/client/GlHandler.mapping
index a7f8649e82..4fa048fc76 100644
--- a/mappings/net/minecraft/client/GlHandler.mapping
+++ b/mappings/net/minecraft/client/GlHandler.mapping
@@ -13,9 +13,9 @@ CLASS none/bos net/minecraft/client/GlHandler
 		FIELD a cap I
 		FIELD b state Z
 		METHOD a disable ()V
-		METHOD b enable ()V
 		METHOD a setState (Z)V
 			ARG 0 newState
+		METHOD b enable ()V
 	CLASS none/bos$d ClearState
 		FIELD a clearDepth D
 		FIELD b clearColor Lnone/bos$e;
@@ -206,8 +206,8 @@ CLASS none/bos net/minecraft/client/GlHandler
 	METHOD a cullFace (Lnone/bos$i;)V
 	METHOD a fogMode (Lnone/bos$m;)V
 	METHOD a logicOp (Lnone/bos$o;)V
-	METHOD a blendFunc (Lnone/bos$r;Lnone/bos$l;)V
 	METHOD a beginRenderMode (Lnone/bos$q;)V
+	METHOD a blendFunc (Lnone/bos$r;Lnone/bos$l;)V
 	METHOD a blendFuncSeparate (Lnone/bos$r;Lnone/bos$l;Lnone/bos$r;Lnone/bos$l;)V
 	METHOD a enableTextureGen (Lnone/bos$u;)V
 	METHOD a texGenMode (Lnone/bos$u;I)V
@@ -222,13 +222,13 @@ CLASS none/bos net/minecraft/client/GlHandler
 	METHOD b rotate (FFFF)V
 	METHOD b disableLight (I)V
 	METHOD b blendFunc (II)V
-	METHOD b fog (ILjava/nio/FloatBuffer;)V
 	METHOD b texParameter (IIF)V
 	METHOD b texParameter (III)V
 	METHOD b viewport (IIII)V
 	METHOD b texSubImage2D (IIIIIIIILjava/nio/IntBuffer;)V
 	METHOD b vertexPointer (IIILjava/nio/ByteBuffer;)V
 	METHOD b texEnv (IILjava/nio/FloatBuffer;)V
+	METHOD b fog (ILjava/nio/FloatBuffer;)V
 	METHOD b endRenderMode (Lnone/bos$q;)V
 	METHOD b disableTextureGen (Lnone/bos$u;)V
 	METHOD c popAttrib ()V
diff --git a/mappings/net/minecraft/util/registry/IdStore.mapping b/mappings/net/minecraft/util/registry/IdStore.mapping
index 8027f38bd4..77bfbc2e7c 100644
--- a/mappings/net/minecraft/util/registry/IdStore.mapping
+++ b/mappings/net/minecraft/util/registry/IdStore.mapping
@@ -1,17 +1,33 @@
 CLASS none/of net/minecraft/util/registry/IdStore
 	FIELD a NULL Ljava/lang/Object;
-	FIELD d keys [Ljava/lang/Object;
+	FIELD b values [Ljava/lang/Object;
+	FIELD c ids [I
+	FIELD d valuesById [Ljava/lang/Object;
+	FIELD e highestId I
+	FIELD f entries I
 	METHOD <init> (I)V
 		ARG 0 size
 	METHOD a reset ()V
-	METHOD a getKey (I)Ljava/lang/Object;
+	METHOD a get (I)Ljava/lang/Object;
 		ARG 0 id
 	METHOD a getId (Ljava/lang/Object;)I
-		ARG 0 key
+		ARG 0 value
 	METHOD a set (Ljava/lang/Object;I)V
-	METHOD b validateID (Ljava/lang/Object;I)I
-		ARG 0 key
+		ARG 0 value
 		ARG 1 id
-	METHOD d getIdInternal (Ljava/lang/Object;)I
-		ARG 0 key
+	METHOD b getEntryCount ()I
+	METHOD b findByInternalId (Ljava/lang/Object;I)I
+		ARG 0 value
+		ARG 1 id
+	METHOD c getHighestId ()I
+	METHOD c getId (I)I
+		ARG 0 id
+	METHOD c register (Ljava/lang/Object;)I
+		ARG 0 value
+	METHOD d resize (I)V
+		ARG 0 newSize
+	METHOD d getInitialInternalId (Ljava/lang/Object;)I
+		ARG 0 value
+	METHOD e getNextFreeInternalId (I)I
+		ARG 0 start
 	METHOD iterator iterator ()Ljava/util/Iterator;