diff --git a/mappings/none/apx.mapping b/mappings/net/minecraft/block/impl/BlockGlassPaneStained.mapping
similarity index 83%
rename from mappings/none/apx.mapping
rename to mappings/net/minecraft/block/impl/BlockGlassPaneStained.mapping
index bc6ac9cff2..f53f127bf9 100644
--- a/mappings/none/apx.mapping
+++ b/mappings/net/minecraft/block/impl/BlockGlassPaneStained.mapping
@@ -1,4 +1,4 @@
-CLASS none/apx
+CLASS none/apx net/minecraft/block/impl/BlockGlassPaneStained
 	METHOD a deserializeState (I)Lnone/asj;
 	METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V
 	METHOD b createStateFactory ()Lnone/ask;
diff --git a/mappings/net/minecraft/item/impl/ItemDye.mapping b/mappings/net/minecraft/item/impl/ItemDye.mapping
index a9a17fc9d8..bd5880ea4a 100644
--- a/mappings/net/minecraft/item/impl/ItemDye.mapping
+++ b/mappings/net/minecraft/item/impl/ItemDye.mapping
@@ -1,2 +1,3 @@
 CLASS none/adu net/minecraft/item/impl/ItemDye
+	FIELD a COLOR [I
 	METHOD f_ getTranslationKey (Lnone/aeq;)Ljava/lang/String;
diff --git a/mappings/net/minecraft/util/ChatFormat.mapping b/mappings/net/minecraft/util/ChatFormat.mapping
new file mode 100644
index 0000000000..d5b29d83ba
--- /dev/null
+++ b/mappings/net/minecraft/util/ChatFormat.mapping
@@ -0,0 +1,24 @@
+CLASS none/a net/minecraft/util/ChatFormat
+	FIELD a BLACK Lnone/a;
+	FIELD b DARK_BLUE Lnone/a;
+	FIELD c DARK_GREEN Lnone/a;
+	FIELD d DARK_AQUA Lnone/a;
+	FIELD e DARK_RED Lnone/a;
+	FIELD f DARK_PURPLE Lnone/a;
+	FIELD g GOLD Lnone/a;
+	FIELD h GRAY Lnone/a;
+	FIELD i DARK_GRAY Lnone/a;
+	FIELD j BLUE Lnone/a;
+	FIELD k GREEN Lnone/a;
+	FIELD l AQUA Lnone/a;
+	FIELD m RED Lnone/a;
+	FIELD n LIGHT_PURPLE Lnone/a;
+	FIELD o YELLOW Lnone/a;
+	FIELD p WHITE Lnone/a;
+	FIELD q OBFUSCATED Lnone/a;
+	FIELD r BOLD Lnone/a;
+	FIELD s STRIKETHROUGH Lnone/a;
+	FIELD t UDNERLINE Lnone/a;
+	FIELD u ITALIC Lnone/a;
+	FIELD v RESET Lnone/a;
+	FIELD x FORMAT_PATTERN Ljava/util/regex/Pattern;
diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping
index a16b421bb0..cba0a663b1 100644
--- a/mappings/net/minecraft/util/DyeColor.mapping
+++ b/mappings/net/minecraft/util/DyeColor.mapping
@@ -15,4 +15,17 @@ CLASS none/adt net/minecraft/util/DyeColor
 	FIELD n GREEN Lnone/adt;
 	FIELD o RED Lnone/adt;
 	FIELD p BLACK Lnone/adt;
+	FIELD q WOOL_MAP [Lnone/adt;
+	FIELD r DYE_MAP [Lnone/adt;
+	FIELD s woolId I
+	FIELD t dyeId I
+	FIELD w mapColor Lnone/ayp;
+	FIELD x chatFormat Lnone/a;
+	METHOD a getWoolId ()I
+	METHOD a getWoolColor (I)Lnone/adt;
+		ARG 0 id
+	METHOD b getDyeId ()I
+	METHOD b getDyeColor (I)Lnone/adt;
+		ARG 0 id
+	METHOD e getMapColor ()Lnone/ayp;
 	METHOD m asString ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/world/IBlockView.mapping b/mappings/net/minecraft/world/IBlockView.mapping
index 75d243a97d..d3481b7214 100644
--- a/mappings/net/minecraft/world/IBlockView.mapping
+++ b/mappings/net/minecraft/world/IBlockView.mapping
@@ -1,4 +1,7 @@
 CLASS none/aiy net/minecraft/world/IBlockView
 	METHOD d isAir (Lnone/cn;)Z
+		ARG 0 pos
 	METHOD o getBlockState (Lnone/cn;)Lnone/asj;
+		ARG 0 pos
 	METHOD r getTileEntity (Lnone/cn;)Lnone/arb;
+		ARG 0 pos