diff --git a/mappings/net/minecraft/util/Iterable.json b/mappings/net/minecraft/util/Iterable.json
new file mode 100644
index 0000000000..3da01e8d48
--- /dev/null
+++ b/mappings/net/minecraft/util/Iterable.json
@@ -0,0 +1,8 @@
+{
+  "obf": "cw",
+  "name": "net/minecraft/util/Iterable",
+  "field": [],
+  "constructors": [],
+  "method": [],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/util/registry/DefaultMappedRegistry.json b/mappings/net/minecraft/util/registry/DefaultMappedRegistry.json
new file mode 100644
index 0000000000..825d72b1ae
--- /dev/null
+++ b/mappings/net/minecraft/util/registry/DefaultMappedRegistry.json
@@ -0,0 +1,111 @@
+{
+  "obf": "cs",
+  "name": "net/minecraft/util/registry/DefaultMappedRegistry",
+  "field": [
+    {
+      "obf": "d",
+      "name": "defaultKey",
+      "type": "Ljava/lang/Object;"
+    },
+    {
+      "obf": "e",
+      "name": "defaultValue",
+      "type": "Ljava/lang/Object;"
+    }
+  ],
+  "constructors": [
+    {
+      "signature": "(Ljava/lang/Object;)V",
+      "args": [
+        {
+          "index": 0,
+          "name": "defaultKey"
+        }
+      ],
+      "statics": false
+    }
+  ],
+  "method": [
+    {
+      "obf": "a",
+      "name": "checkDefault",
+      "signature": "()V",
+      "args": []
+    },
+    {
+      "obf": "a",
+      "name": "get",
+      "signature": "(I)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "id"
+        }
+      ]
+    },
+    {
+      "obf": "a",
+      "name": "register",
+      "signature": "(ILjava/lang/Object;Ljava/lang/Object;)V",
+      "args": [
+        {
+          "index": 0,
+          "name": "id"
+        },
+        {
+          "index": 1,
+          "name": "key"
+        },
+        {
+          "index": 2,
+          "name": "value"
+        }
+      ]
+    },
+    {
+      "obf": "a",
+      "name": "getId",
+      "signature": "(Ljava/lang/Object;)I",
+      "args": [
+        {
+          "index": 0,
+          "name": "value"
+        }
+      ]
+    },
+    {
+      "obf": "a",
+      "name": "getRandom",
+      "signature": "(Ljava/util/Random;)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "random"
+        }
+      ]
+    },
+    {
+      "obf": "b",
+      "name": "getKey",
+      "signature": "(Ljava/lang/Object;)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "value"
+        }
+      ]
+    },
+    {
+      "obf": "c",
+      "name": "get",
+      "signature": "(Ljava/lang/Object;)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        }
+      ]
+    }
+  ],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/util/registry/IRegistry.json b/mappings/net/minecraft/util/registry/IRegistry.json
new file mode 100644
index 0000000000..46570d6fc4
--- /dev/null
+++ b/mappings/net/minecraft/util/registry/IRegistry.json
@@ -0,0 +1,41 @@
+{
+  "obf": "dg",
+  "name": "net/minecraft/util/registry/IRegistry",
+  "field": [],
+  "constructors": [],
+  "method": [
+    {
+      "obf": "a",
+      "name": "put",
+      "signature": "(Ljava/lang/Object;Ljava/lang/Object;)V",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        },
+        {
+          "index": 1,
+          "name": "value"
+        }
+      ]
+    },
+    {
+      "obf": "c",
+      "name": "getKeys",
+      "signature": "()Ljava/util/Set;",
+      "args": []
+    },
+    {
+      "obf": "c",
+      "name": "get",
+      "signature": "(Ljava/lang/Object;)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        }
+      ]
+    }
+  ],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/util/registry/IdRegistry.json b/mappings/net/minecraft/util/registry/IdRegistry.json
new file mode 100644
index 0000000000..4c93c78169
--- /dev/null
+++ b/mappings/net/minecraft/util/registry/IdRegistry.json
@@ -0,0 +1,106 @@
+{
+  "obf": "db",
+  "name": "net/minecraft/util/registry/IdRegistry",
+  "field": [
+    {
+      "obf": "a",
+      "name": "idStore",
+      "type": "Lnone/of;"
+    },
+    {
+      "obf": "b",
+      "name": "valueKeyMap",
+      "type": "Ljava/util/Map;"
+    }
+  ],
+  "constructors": [],
+  "method": [
+    {
+      "obf": "a",
+      "name": "get",
+      "signature": "(I)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "id"
+        }
+      ]
+    },
+    {
+      "obf": "a",
+      "name": "register",
+      "signature": "(ILjava/lang/Object;Ljava/lang/Object;)V",
+      "args": [
+        {
+          "index": 0,
+          "name": "id"
+        },
+        {
+          "index": 1,
+          "name": "key"
+        },
+        {
+          "index": 2,
+          "name": "value"
+        }
+      ]
+    },
+    {
+      "obf": "a",
+      "name": "getId",
+      "signature": "(Ljava/lang/Object;)I",
+      "args": [
+        {
+          "index": 0,
+          "name": "value"
+        }
+      ]
+    },
+    {
+      "obf": "b",
+      "name": "createMap",
+      "signature": "()Ljava/util/Map;",
+      "args": []
+    },
+    {
+      "obf": "b",
+      "name": "getKey",
+      "signature": "(Ljava/lang/Object;)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "value"
+        }
+      ]
+    },
+    {
+      "obf": "c",
+      "name": "get",
+      "signature": "(Ljava/lang/Object;)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        }
+      ]
+    },
+    {
+      "obf": "d",
+      "name": "containsKey",
+      "signature": "(Ljava/lang/Object;)Z",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        }
+      ]
+    },
+    {
+      "obf": "iterator",
+      "name": "iterator",
+      "signature": "()Ljava/util/Iterator;",
+      "args": []
+    }
+  ],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/util/registry/IdStore.json b/mappings/net/minecraft/util/registry/IdStore.json
new file mode 100644
index 0000000000..29113755d5
--- /dev/null
+++ b/mappings/net/minecraft/util/registry/IdStore.json
@@ -0,0 +1,97 @@
+{
+  "obf": "of",
+  "name": "net/minecraft/util/registry/IdStore",
+  "field": [
+    {
+      "obf": "a",
+      "name": "NULL",
+      "type": "Ljava/lang/Object;"
+    },
+    {
+      "obf": "d",
+      "name": "keys",
+      "type": "[Ljava/lang/Object;"
+    }
+  ],
+  "constructors": [
+    {
+      "signature": "(I)V",
+      "args": [
+        {
+          "index": 0,
+          "name": "size"
+        }
+      ],
+      "statics": false
+    }
+  ],
+  "method": [
+    {
+      "obf": "a",
+      "name": "reset",
+      "signature": "()V",
+      "args": []
+    },
+    {
+      "obf": "a",
+      "name": "getKey",
+      "signature": "(I)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "id"
+        }
+      ]
+    },
+    {
+      "obf": "a",
+      "name": "getId",
+      "signature": "(Ljava/lang/Object;)I",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        }
+      ]
+    },
+    {
+      "obf": "a",
+      "name": "set",
+      "signature": "(Ljava/lang/Object;I)V",
+      "args": []
+    },
+    {
+      "obf": "b",
+      "name": "validateID",
+      "signature": "(Ljava/lang/Object;I)I",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        },
+        {
+          "index": 1,
+          "name": "id"
+        }
+      ]
+    },
+    {
+      "obf": "d",
+      "name": "getIdInternal",
+      "signature": "(Ljava/lang/Object;)I",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        }
+      ]
+    },
+    {
+      "obf": "iterator",
+      "name": "iterator",
+      "signature": "()Ljava/util/Iterator;",
+      "args": []
+    }
+  ],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/util/registry/Registry.json b/mappings/net/minecraft/util/registry/Registry.json
new file mode 100644
index 0000000000..80a303f5f3
--- /dev/null
+++ b/mappings/net/minecraft/util/registry/Registry.json
@@ -0,0 +1,91 @@
+{
+  "obf": "di",
+  "name": "net/minecraft/util/registry/Registry",
+  "field": [
+    {
+      "obf": "a",
+      "name": "LOGGER",
+      "type": "Lorg/apache/logging/log4j/Logger;"
+    },
+    {
+      "obf": "b",
+      "name": "valueCache",
+      "type": "[Ljava/lang/Object;"
+    },
+    {
+      "obf": "c",
+      "name": "map",
+      "type": "Ljava/util/Map;"
+    }
+  ],
+  "constructors": [],
+  "method": [
+    {
+      "obf": "a",
+      "name": "put",
+      "signature": "(Ljava/lang/Object;Ljava/lang/Object;)V",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        },
+        {
+          "index": 1,
+          "name": "value"
+        }
+      ]
+    },
+    {
+      "obf": "a",
+      "name": "getRandom",
+      "signature": "(Ljava/util/Random;)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "random"
+        }
+      ]
+    },
+    {
+      "obf": "b",
+      "name": "createMap",
+      "signature": "()Ljava/util/Map;",
+      "args": []
+    },
+    {
+      "obf": "c",
+      "name": "getKeys",
+      "signature": "()Ljava/util/Set;",
+      "args": []
+    },
+    {
+      "obf": "c",
+      "name": "get",
+      "signature": "(Ljava/lang/Object;)Ljava/lang/Object;",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        }
+      ]
+    },
+    {
+      "obf": "d",
+      "name": "containsKey",
+      "signature": "(Ljava/lang/Object;)Z",
+      "args": [
+        {
+          "index": 0,
+          "name": "key"
+        }
+      ]
+    },
+    {
+      "obf": "iterator",
+      "name": "iterator",
+      "signature": "()Ljava/util/Iterator;",
+      "args": []
+    }
+  ],
+  "innerClass": []
+}
\ No newline at end of file