diff --git a/mappings/com/mojang/blaze3d/platform/GLX.mapping b/mappings/com/mojang/blaze3d/platform/GLX.mapping
new file mode 100644
index 0000000000..d085da408a
--- /dev/null
+++ b/mappings/com/mojang/blaze3d/platform/GLX.mapping
@@ -0,0 +1,131 @@
+CLASS com/mojang/blaze3d/platform/GLX
+	CLASS com/mojang/blaze3d/platform/GLX$a FBOMode
+		FIELD a BASE Lcom/mojang/blaze3d/platform/GLX$a;
+		FIELD b ARB Lcom/mojang/blaze3d/platform/GLX$a;
+		FIELD c EXT Lcom/mojang/blaze3d/platform/GLX$a;
+	METHOD glActiveTexture (I)V
+		ARG 0 texture
+	METHOD glAttachShader (II)V
+		ARG 0 program
+		ARG 1 shader
+	METHOD glBindBuffer (II)V
+		ARG 0 target
+		ARG 1 bufferId
+	METHOD glBindFramebuffer (II)V
+		ARG 0 target
+		ARG 1 framebuffer
+	METHOD glBindRenderbuffer (II)V
+		ARG 0 target
+		ARG 1 renderbuffer
+	METHOD glBlendFuncSeparate (IIII)V
+		ARG 0 sFactorRGB
+		ARG 1 dFactorRGB
+		ARG 2 sFactorAlpha
+		ARG 3 dFactorAlpha
+	METHOD glBufferData (ILjava/nio/ByteBuffer;I)V
+		ARG 0 target
+		ARG 1 data
+		ARG 2 usage
+	METHOD glCheckFramebufferStatus (I)I
+		ARG 0 target
+	METHOD glClientActiveTexture (I)V
+		ARG 0 texture
+	METHOD glCompileShader (I)V
+		ARG 0 shader
+	METHOD glCreateProgram ()I
+	METHOD glCreateShader (I)I
+		ARG 0 type
+	METHOD glDeleteBuffers (I)V
+		ARG 0 buffer
+	METHOD glDeleteFramebuffers (I)V
+		ARG 0 framebuffer
+	METHOD glDeleteProgram (I)V
+		ARG 0 program
+	METHOD glDeleteRenderbuffers (I)V
+		ARG 0 renderbuffer
+	METHOD glDeleteShader (I)V
+		ARG 0 shader
+	METHOD glFramebufferRenderbuffer (IIII)V
+		ARG 0 target
+		ARG 1 attachment
+		ARG 2 renderbufferTarget
+		ARG 3 renderbuffer
+	METHOD glFramebufferTexture2D (IIIII)V
+		ARG 0 target
+		ARG 1 attachment
+		ARG 2 texTarget
+		ARG 3 texture
+		ARG 4 level
+	METHOD glGenBuffers ()I
+	METHOD glGenFramebuffers ()I
+	METHOD glGenRenderbuffers ()I
+	METHOD glGetAttribLocation (ILjava/lang/CharSequence;)I
+		ARG 0 program
+		ARG 1 name
+	METHOD glGetProgramInfoLog (II)Ljava/lang/String;
+		ARG 0 program
+		ARG 1 maxLength
+	METHOD glGetProgrami (II)I
+		ARG 0 program
+		ARG 1 programName
+	METHOD glGetShaderInfoLog (II)Ljava/lang/String;
+		ARG 0 shader
+		ARG 1 maxLength
+	METHOD glGetShaderi (II)I
+		ARG 0 shader
+		ARG 1 programName
+	METHOD glGetUniformLocation (ILjava/lang/CharSequence;)I
+		ARG 0 program
+		ARG 1 name
+	METHOD glLinkProgram (I)V
+		ARG 0 program
+	METHOD glMultiTexCoord2f (IFF)V
+		ARG 0 target
+		ARG 1 s
+		ARG 2 t
+	METHOD glRenderbufferStorage (IIII)V
+		ARG 0 target
+		ARG 1 internalFormat
+		ARG 2 width
+		ARG 3 height
+	METHOD glUniform1 (ILjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 values
+	METHOD glUniform1 (ILjava/nio/IntBuffer;)V
+		ARG 0 location
+		ARG 1 values
+	METHOD glUniform1i (II)V
+		ARG 0 location
+		ARG 1 value
+	METHOD glUniform2 (ILjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 values
+	METHOD glUniform2 (ILjava/nio/IntBuffer;)V
+		ARG 0 location
+		ARG 1 values
+	METHOD glUniform3 (ILjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 values
+	METHOD glUniform3 (ILjava/nio/IntBuffer;)V
+		ARG 0 location
+		ARG 1 values
+	METHOD glUniform4 (ILjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 values
+	METHOD glUniform4 (ILjava/nio/IntBuffer;)V
+		ARG 0 location
+		ARG 1 values
+	METHOD glUniformMatrix2 (IZLjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 transpose
+		ARG 2 matrices
+	METHOD glUniformMatrix3 (IZLjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 transpose
+		ARG 2 matrices
+	METHOD glUniformMatrix4 (IZLjava/nio/FloatBuffer;)V
+		ARG 0 location
+		ARG 1 transpose
+		ARG 2 matrices
+	METHOD glUseProgram (I)V
+		ARG 0 program
diff --git a/mappings/net/minecraft/client/renderer/system/GLX.mapping b/mappings/net/minecraft/client/renderer/system/GLX.mapping
deleted file mode 100644
index 6057293109..0000000000
--- a/mappings/net/minecraft/client/renderer/system/GLX.mapping
+++ /dev/null
@@ -1,134 +0,0 @@
-CLASS com/mojang/blaze3d/platform/GLX net/minecraft/client/renderer/system/GLX
-	CLASS com/mojang/blaze3d/platform/GLX$a FBOMode
-		FIELD a BASE Lcom/mojang/blaze3d/platform/GLX$a;
-		FIELD b ARB Lcom/mojang/blaze3d/platform/GLX$a;
-		FIELD c EXT Lcom/mojang/blaze3d/platform/GLX$a;
-	METHOD glActiveTexture activeTexture (I)V
-		ARG 0 texture
-	METHOD glAttachShader attachShader (II)V
-		ARG 0 program
-		ARG 1 shader
-	METHOD glBindBuffer bindBuffer (II)V
-		ARG 0 target
-		ARG 1 bufferId
-	METHOD glBindFramebuffer bindFramebuffer (II)V
-		ARG 0 target
-		ARG 1 framebuffer
-	METHOD glBindRenderbuffer bindRenderbuffer (II)V
-		ARG 0 target
-		ARG 1 renderbuffer
-	METHOD glBlendFuncSeparate blendFuncSeparate (IIII)V
-		ARG 0 sFactorRGB
-		ARG 1 dFactorRGB
-		ARG 2 sFactorAlpha
-		ARG 3 dFactorAlpha
-	METHOD glBufferData bufferData (ILjava/nio/ByteBuffer;I)V
-		ARG 0 target
-		ARG 1 data
-		ARG 2 usage
-	METHOD glCheckFramebufferStatus checkFramebufferStatus (I)I
-		ARG 0 target
-	METHOD glClientActiveTexture clientActiveTexture (I)V
-		ARG 0 texture
-	METHOD glCompileShader compileShader (I)V
-		ARG 0 shader
-	METHOD glCreateProgram createProgram ()I
-	METHOD glCreateShader createShader (I)I
-		ARG 0 type
-	METHOD glDeleteBuffers deleteBuffers (I)V
-		ARG 0 buffer
-	METHOD glDeleteFramebuffers deleteFramebuffers (I)V
-		ARG 0 framebuffer
-	METHOD glDeleteProgram deleteProgram (I)V
-		ARG 0 program
-	METHOD glDeleteRenderbuffers deleteRenderbuffers (I)V
-		ARG 0 renderbuffer
-	METHOD glDeleteShader deleteShader (I)V
-		ARG 0 shader
-	METHOD glFramebufferRenderbuffer framebufferRenderbuffer (IIII)V
-		ARG 0 target
-		ARG 1 attachment
-		ARG 2 renderbufferTarget
-		ARG 3 renderbuffer
-	METHOD glFramebufferTexture2D framebufferTexture2D (IIIII)V
-		ARG 0 target
-		ARG 1 attachment
-		ARG 2 texTarget
-		ARG 3 texture
-		ARG 4 level
-	METHOD glGenBuffers genBuffers ()I
-	METHOD glGenFramebuffers genFramebuffers ()I
-	METHOD glGenRenderbuffers genRenderbuffers ()I
-	METHOD glGetAttribLocation getAttribLocation (ILjava/lang/CharSequence;)I
-		ARG 0 program
-		ARG 1 name
-	METHOD glGetProgramInfoLog getProgramInfoLog (II)Ljava/lang/String;
-		ARG 0 program
-		ARG 1 maxLength
-	METHOD glGetProgrami getProgrami (II)I
-		ARG 0 program
-		ARG 1 programName
-	METHOD glGetShaderInfoLog getShaderInfoLog (II)Ljava/lang/String;
-		ARG 0 shader
-		ARG 1 maxLength
-	METHOD glGetShaderi getShader (II)I
-		ARG 0 shader
-		ARG 1 programName
-	METHOD glGetUniformLocation getUniformLocation (ILjava/lang/CharSequence;)I
-		ARG 0 program
-		ARG 1 name
-	METHOD glLinkProgram linkProgram (I)V
-		ARG 0 program
-	METHOD glMultiTexCoord2f multiTexCoord2f (IFF)V
-		ARG 0 target
-		ARG 1 s
-		ARG 2 t
-	METHOD glRenderbufferStorage renderbufferStorage (IIII)V
-		ARG 0 target
-		ARG 1 internalFormat
-		ARG 2 width
-		ARG 3 height
-	METHOD glUniform1 uniform1fv (ILjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 values
-	METHOD glUniform1 uniform1iv (ILjava/nio/IntBuffer;)V
-		ARG 0 location
-		ARG 1 values
-	METHOD glUniform1i uniform1i (II)V
-		ARG 0 location
-		ARG 1 value
-	METHOD glUniform2 uniform2fv (ILjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 values
-	METHOD glUniform2 uniform2iv (ILjava/nio/IntBuffer;)V
-		ARG 0 location
-		ARG 1 values
-	METHOD glUniform3 uniform3fv (ILjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 values
-	METHOD glUniform3 uniform3iv (ILjava/nio/IntBuffer;)V
-		ARG 0 location
-		ARG 1 values
-	METHOD glUniform4 uniform4fv (ILjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 values
-	METHOD glUniform4 uniform4iv (ILjava/nio/IntBuffer;)V
-		ARG 0 location
-		ARG 1 values
-	METHOD glUniformMatrix2 uniformMatrix2fv (IZLjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 transpose
-		ARG 2 matrices
-	METHOD glUniformMatrix3 uniformMatrix3fv (IZLjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 transpose
-		ARG 2 matrices
-	METHOD glUniformMatrix4 uniformMatrix4fv (IZLjava/nio/FloatBuffer;)V
-		ARG 0 location
-		ARG 1 transpose
-		ARG 2 matrices
-	METHOD glUseProgram useProgram (I)V
-		ARG 0 program
-	METHOD isNextGen canUseShaders ()Z
-	METHOD isUsingFBOs useFramebufferObjects ()Z
-	METHOD useVbo useVertexBufferObjects ()Z