diff --git a/mappings/net/minecraft/client/gl/DummyUniform.mapping b/mappings/net/minecraft/client/gl/DummyUniform.mapping
new file mode 100644
index 0000000000..4663dfe673
--- /dev/null
+++ b/mappings/net/minecraft/client/gl/DummyUniform.mapping
@@ -0,0 +1,10 @@
+CLASS none/bwj net/minecraft/client/gl/DummyUniform
+	METHOD a setFloat1 (F)V
+	METHOD a setFloat2 (FF)V
+	METHOD a setFloat3 (FFF)V
+	METHOD a setFloat4 (FFFF)V
+	METHOD a setMatrix4 (FFFFFFFFFFFFFFFF)V
+	METHOD a setInts (IIII)V
+	METHOD a setMatrix4 (Lorg/lwjgl/util/vector/Matrix4f;)V
+	METHOD a set ([F)V
+	METHOD b setFloats (FFFF)V
diff --git a/mappings/net/minecraft/client/gl/GlProgram.mapping b/mappings/net/minecraft/client/gl/GlProgram.mapping
index d5636dc944..43d45f4004 100644
--- a/mappings/net/minecraft/client/gl/GlProgram.mapping
+++ b/mappings/net/minecraft/client/gl/GlProgram.mapping
@@ -1,11 +1,14 @@
 CLASS none/bwk net/minecraft/client/gl/GlProgram
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b dummyUniform Lnone/bwj;
 	FIELD c activeProgram Lnone/bwk;
 	FIELD d activeProgramRef I
 	FIELD f samplerBinds Ljava/util/Map;
 	FIELD g samplerNames Ljava/util/List;
 	FIELD h samplerShaderLocs Ljava/util/List;
+	FIELD i uniformData Ljava/util/List;
 	FIELD j uniformLocs Ljava/util/List;
+	FIELD k uniformByName Ljava/util/Map;
 	FIELD l programRef I
 	FIELD m name Ljava/lang/String;
 	FIELD n useCullFace Z
@@ -18,11 +21,15 @@ CLASS none/bwk net/minecraft/client/gl/GlProgram
 		ARG 0 resource
 		ARG 1 name
 	METHOD a addSampler (Lcom/google/gson/JsonElement;)V
+	METHOD a getUniformByName (Ljava/lang/String;)Lnone/bwp;
+		ARG 0 name
 	METHOD a bindSampler (Ljava/lang/String;Ljava/lang/Object;)V
 		ARG 0 samplerName
 		ARG 1 texture
 	METHOD b disable ()V
 	METHOD b addUniform (Lcom/google/gson/JsonElement;)V
+	METHOD b getUniformByNameOrDummy (Ljava/lang/String;)Lnone/bwp;
+		ARG 0 name
 	METHOD c enable ()V
 	METHOD d markUniformStateDirty ()V
 	METHOD e getVertexShader ()Lnone/bwn;
diff --git a/mappings/net/minecraft/client/gl/GlUniform.mapping b/mappings/net/minecraft/client/gl/GlUniform.mapping
index a250673bca..1815e81a7b 100644
--- a/mappings/net/minecraft/client/gl/GlUniform.mapping
+++ b/mappings/net/minecraft/client/gl/GlUniform.mapping
@@ -1,6 +1,32 @@
 CLASS none/bwp net/minecraft/client/gl/GlUniform
+	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD b loc I
+	FIELD d dataType I
+	FIELD e intData Ljava/nio/IntBuffer;
+	FIELD f floatData Ljava/nio/FloatBuffer;
+	FIELD g name Ljava/lang/String;
 	FIELD h stateIsDirty Z
 	FIELD i program Lnone/bwk;
 	METHOD <init> (Ljava/lang/String;IILnone/bwk;)V
+		ARG 0 name
+		ARG 1 dataType
 		ARG 3 program
+	METHOD a getName ()Ljava/lang/String;
+	METHOD a setFloat1 (F)V
+	METHOD a setFloat2 (FF)V
+	METHOD a setFloat3 (FFF)V
+	METHOD a setFloat4 (FFFF)V
+	METHOD a setMatrix4 (FFFFFFFFFFFFFFFF)V
+	METHOD a setInts (IIII)V
+	METHOD a getTypeIndex (Ljava/lang/String;)I
+		ARG 0 typeName
+	METHOD a setMatrix4 (Lorg/lwjgl/util/vector/Matrix4f;)V
+	METHOD a set ([F)V
+	METHOD b upload ()V
+	METHOD b setFloats (FFFF)V
+	METHOD b setLoc (I)V
+		ARG 0 loc
 	METHOD h markStateDirty ()V
+	METHOD i uploadInts ()V
+	METHOD j uploadFloats ()V
+	METHOD k uploadMatrix ()V