diff --git a/mappings/net/minecraft/block/Block.json b/mappings/net/minecraft/block/Block.json
index 56c1da37fa..765b7ba0be 100644
--- a/mappings/net/minecraft/block/Block.json
+++ b/mappings/net/minecraft/block/Block.json
@@ -231,6 +231,12 @@
           "name": "state"
         }
       ]
+    },
+    {
+      "obf": "x",
+      "name": "registerBlocks",
+      "signature": "()V",
+      "args": []
     }
   ],
   "innerClass": []
diff --git a/mappings/net/minecraft/block/impl/BlockDispenser.json b/mappings/net/minecraft/block/impl/BlockDispenser.json
index 67575f0364..d8ab71e3d8 100644
--- a/mappings/net/minecraft/block/impl/BlockDispenser.json
+++ b/mappings/net/minecraft/block/impl/BlockDispenser.json
@@ -1,7 +1,13 @@
 {
   "obf": "aly",
   "name": "net/minecraft/block/impl/BlockDispenser",
-  "field": [],
+  "field": [
+    {
+      "obf": "c",
+      "name": "BEHAVIORS",
+      "type": "Lnone/ct;"
+    }
+  ],
   "constructors": [],
   "method": [
     {
diff --git a/mappings/net/minecraft/block/impl/BlockMycelium.json b/mappings/net/minecraft/block/impl/BlockMycelium.json
new file mode 100644
index 0000000000..7ccadd0833
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockMycelium.json
@@ -0,0 +1,8 @@
+{
+  "obf": "aoa",
+  "name": "net/minecraft/block/impl/BlockMycelium",
+  "field": [],
+  "constructors": [],
+  "method": [],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/block/impl/BlockTripwireHook.json b/mappings/net/minecraft/block/impl/BlockTripwireHook.json
new file mode 100644
index 0000000000..63f4f7fa11
--- /dev/null
+++ b/mappings/net/minecraft/block/impl/BlockTripwireHook.json
@@ -0,0 +1,8 @@
+{
+  "obf": "aqo",
+  "name": "net/minecraft/block/impl/BlockTripwireHook",
+  "field": [],
+  "constructors": [],
+  "method": [],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/block/tile/TileEntity.json b/mappings/net/minecraft/block/tile/TileEntity.json
index b693c21bee..3762914cd0 100644
--- a/mappings/net/minecraft/block/tile/TileEntity.json
+++ b/mappings/net/minecraft/block/tile/TileEntity.json
@@ -4,7 +4,7 @@
   "field": [
     {
       "obf": "a",
-      "name": "logger",
+      "name": "LOGGER",
       "type": "Lorg/apache/logging/log4j/Logger;"
     },
     {
diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.json b/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.json
index fab94caf38..068845a43f 100644
--- a/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.json
+++ b/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.json
@@ -4,7 +4,7 @@
   "field": [
     {
       "obf": "a",
-      "name": "logger",
+      "name": "LOGGER",
       "type": "Lorg/apache/logging/log4j/Logger;"
     }
   ],
diff --git a/mappings/net/minecraft/client/Minecraft.json b/mappings/net/minecraft/client/Minecraft.json
index 76dd626e49..edd4ef8a7f 100644
--- a/mappings/net/minecraft/client/Minecraft.json
+++ b/mappings/net/minecraft/client/Minecraft.json
@@ -4,7 +4,7 @@
   "field": [
     {
       "obf": "J",
-      "name": "logger",
+      "name": "LOGGER",
       "type": "Lorg/apache/logging/log4j/Logger;"
     },
     {
diff --git a/mappings/net/minecraft/dispenser/DispenserBehavior.json b/mappings/net/minecraft/dispenser/DispenserBehavior.json
new file mode 100644
index 0000000000..4a8ff2cf7f
--- /dev/null
+++ b/mappings/net/minecraft/dispenser/DispenserBehavior.json
@@ -0,0 +1,14 @@
+{
+  "obf": "cv",
+  "name": "net/minecraft/dispenser/DispenserBehavior",
+  "field": [
+    {
+      "obf": "a",
+      "name": "DEFAULT",
+      "type": "Lnone/cv;"
+    }
+  ],
+  "constructors": [],
+  "method": [],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/entity/Entity.json b/mappings/net/minecraft/entity/Entity.json
index e95d3431bf..587dddcd2a 100644
--- a/mappings/net/minecraft/entity/Entity.json
+++ b/mappings/net/minecraft/entity/Entity.json
@@ -4,7 +4,7 @@
   "field": [
     {
       "obf": "a",
-      "name": "logger",
+      "name": "LOGGER",
       "type": "Lorg/apache/logging/log4j/Logger;"
     },
     {
diff --git a/mappings/net/minecraft/item/ItemArmor.json b/mappings/net/minecraft/item/ItemArmor.json
index 79a9fb34ca..5a3ec5ca89 100644
--- a/mappings/net/minecraft/item/ItemArmor.json
+++ b/mappings/net/minecraft/item/ItemArmor.json
@@ -4,5 +4,47 @@
   "field": [],
   "constructors": [],
   "method": [],
-  "innerClass": []
+  "innerClass": [
+    {
+      "obf": "acw$a",
+      "name": "ArmorMaterial",
+      "field": [
+        {
+          "obf": "a",
+          "name": "LEATHER",
+          "type": "Lnone/acw$a;"
+        },
+        {
+          "obf": "b",
+          "name": "CHAINMAIL",
+          "type": "Lnone/acw$a;"
+        },
+        {
+          "obf": "c",
+          "name": "IRON",
+          "type": "Lnone/acw$a;"
+        },
+        {
+          "obf": "d",
+          "name": "GOLD",
+          "type": "Lnone/acw$a;"
+        },
+        {
+          "obf": "e",
+          "name": "DIAMOND",
+          "type": "Lnone/acw$a;"
+        }
+      ],
+      "constructors": [],
+      "method": [
+        {
+          "obf": "d",
+          "name": "getName",
+          "signature": "()Ljava/lang/String;",
+          "args": []
+        }
+      ],
+      "innerClass": []
+    }
+  ]
 }
\ No newline at end of file
diff --git a/mappings/net/minecraft/item/impl/ItemArmorStand.json b/mappings/net/minecraft/item/impl/ItemArmorStand.json
new file mode 100644
index 0000000000..7137b157fd
--- /dev/null
+++ b/mappings/net/minecraft/item/impl/ItemArmorStand.json
@@ -0,0 +1,8 @@
+{
+  "obf": "acx",
+  "name": "net/minecraft/item/impl/ItemArmorStand",
+  "field": [],
+  "constructors": [],
+  "method": [],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/item/impl/ItemBookEnchanted.json b/mappings/net/minecraft/item/impl/ItemBookEnchanted.json
new file mode 100644
index 0000000000..e3fb060f0c
--- /dev/null
+++ b/mappings/net/minecraft/item/impl/ItemBookEnchanted.json
@@ -0,0 +1,8 @@
+{
+  "obf": "adz",
+  "name": "net/minecraft/item/impl/ItemBookEnchanted",
+  "field": [],
+  "constructors": [],
+  "method": [],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/reference/Blocks.json b/mappings/net/minecraft/reference/Blocks.json
index 20a0b19f26..c525a483db 100644
--- a/mappings/net/minecraft/reference/Blocks.json
+++ b/mappings/net/minecraft/reference/Blocks.json
@@ -4,117 +4,987 @@
   "field": [
     {
       "obf": "A",
-      "name": "sandstone",
+      "name": "SANDSTONE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "B",
+      "name": "NOTEBLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "C",
+      "name": "BED",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "D",
+      "name": "GOLDEN_RAIL",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "E",
+      "name": "DETECTOR_RAIL",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "F",
+      "name": "STICKY_PISTON",
+      "type": "Lnone/asa;"
+    },
+    {
+      "obf": "G",
+      "name": "WEB",
       "type": "Lnone/akw;"
     },
     {
       "obf": "H",
-      "name": "tallGrass",
+      "name": "TALLGRASS",
       "type": "Lnone/aqi;"
     },
+    {
+      "obf": "I",
+      "name": "DEADBUSH",
+      "type": "Lnone/alt;"
+    },
+    {
+      "obf": "J",
+      "name": "PISTON",
+      "type": "Lnone/asa;"
+    },
     {
       "obf": "K",
-      "name": "pistonHead",
+      "name": "PISTON_HEAD",
       "type": "Lnone/asb;"
     },
+    {
+      "obf": "L",
+      "name": "WOOL",
+      "type": "Lnone/akw;"
+    },
     {
       "obf": "M",
-      "name": "pistonExtension",
+      "name": "PISTON_EXTENSION",
       "type": "Lnone/asc;"
     },
+    {
+      "obf": "N",
+      "name": "YELLOW_FLOWER",
+      "type": "Lnone/amq;"
+    },
+    {
+      "obf": "O",
+      "name": "RED_FLOWER",
+      "type": "Lnone/amq;"
+    },
+    {
+      "obf": "P",
+      "name": "BROWN_MUSHROOM",
+      "type": "Lnone/alc;"
+    },
+    {
+      "obf": "Q",
+      "name": "RED_MUSHROOM",
+      "type": "Lnone/alc;"
+    },
+    {
+      "obf": "R",
+      "name": "GOLD_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "S",
+      "name": "IRON_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "T",
+      "name": "DOUBLE_STONE_SLAB",
+      "type": "Lnone/and;"
+    },
+    {
+      "obf": "U",
+      "name": "STONE_SLAB",
+      "type": "Lnone/and;"
+    },
+    {
+      "obf": "V",
+      "name": "BRICK_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "W",
+      "name": "TNT",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "X",
+      "name": "BOOKSHELF",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "Y",
+      "name": "MOSSY_COBBLESTONE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "Z",
+      "name": "OBSIDIAN",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aA",
+      "name": "IRON_DOOR",
+      "type": "Lnone/alz;"
+    },
+    {
+      "obf": "aB",
+      "name": "WOODEN_PRESSURE_PLATE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aC",
+      "name": "REDSTONE_ORE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aD",
+      "name": "LIT_REDSTONE_ORE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aE",
+      "name": "UNLIT_REDSTONE_TORCH",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aF",
+      "name": "REDSTONE_TORCH",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aG",
+      "name": "STONE_BUTTON",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aH",
+      "name": "SNOW_LAYER",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aI",
+      "name": "ICE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aJ",
+      "name": "SNOW",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aK",
+      "name": "CACTUS",
+      "type": "Lnone/ale;"
+    },
+    {
+      "obf": "aL",
+      "name": "CLAY",
+      "type": "Lnone/akw;"
+    },
     {
       "obf": "a",
-      "name": "air",
+      "name": "AIR",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aM",
+      "name": "REEDS",
+      "type": "Lnone/apf;"
+    },
+    {
+      "obf": "aN",
+      "name": "JUKEBOX",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aO",
+      "name": "OAK_FENCE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aP",
+      "name": "SPRUCE_FENCE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aQ",
+      "name": "BIRCH_FENCE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aR",
+      "name": "JUNGLE_FENCE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aS",
+      "name": "DARK_OAK_FENCE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aT",
+      "name": "ACACIA_FENCE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aU",
+      "name": "PUMPKIN",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aV",
+      "name": "NETHERRACK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aW",
+      "name": "SOUL_SAND",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aX",
+      "name": "GLOWSTONE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aY",
+      "name": "PORTAL",
+      "type": "Lnone/aop;"
+    },
+    {
+      "obf": "aZ",
+      "name": "PUMPKIN_LIT",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aa",
+      "name": "TORCH",
       "type": "Lnone/akw;"
     },
     {
       "obf": "ab",
-      "name": "fire",
+      "name": "FIRE",
       "type": "Lnone/amp;"
     },
+    {
+      "obf": "ac",
+      "name": "MOB_SPAWNER",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ad",
+      "name": "OAK_STAIRS",
+      "type": "Lnone/akw;"
+    },
     {
       "obf": "ae",
-      "name": "chest",
+      "name": "CHEST",
       "type": "Lnone/ali;"
     },
+    {
+      "obf": "af",
+      "name": "REDSTONE_WIRE",
+      "type": "Lnone/apc;"
+    },
+    {
+      "obf": "ag",
+      "name": "DIAMOND_ORE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ah",
+      "name": "DIAMOND_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ai",
+      "name": "CRAFTING_TABLE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aj",
+      "name": "WHEAT",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ak",
+      "name": "FARMLAND",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "al",
+      "name": "FURNACE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "am",
+      "name": "LIT_FURNACE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "an",
+      "name": "STANDING_SIGN",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ao",
+      "name": "OAK_DOOR",
+      "type": "Lnone/alz;"
+    },
+    {
+      "obf": "ap",
+      "name": "SPRUCE_DOOR",
+      "type": "Lnone/alz;"
+    },
+    {
+      "obf": "aq",
+      "name": "BIRCH_DOOR",
+      "type": "Lnone/alz;"
+    },
+    {
+      "obf": "ar",
+      "name": "JUNGLE_DOOR",
+      "type": "Lnone/alz;"
+    },
+    {
+      "obf": "as",
+      "name": "ACACIA_DOOR",
+      "type": "Lnone/alz;"
+    },
+    {
+      "obf": "at",
+      "name": "DARK_OAK_DOOR",
+      "type": "Lnone/alz;"
+    },
+    {
+      "obf": "au",
+      "name": "LADDER",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "av",
+      "name": "RAIL",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "aw",
+      "name": "STONE_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ax",
+      "name": "WALL_SIGN",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ay",
+      "name": "LEVER",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "az",
+      "name": "STONE_PRESSURE_PLATE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bA",
+      "name": "NETHER_BRICK_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bB",
+      "name": "NETHER_WART",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bC",
+      "name": "ENCHANTING_TABLE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bD",
+      "name": "BREWING_STAND",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bE",
+      "name": "CAULDRON",
+      "type": "Lnone/alh;"
+    },
+    {
+      "obf": "bF",
+      "name": "END_PORTAL",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bG",
+      "name": "END_PORTAL_FRAME",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bH",
+      "name": "END_STONE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bI",
+      "name": "DRAGON_EGG",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bJ",
+      "name": "REDSTONE_LAMP",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bK",
+      "name": "LIT_REDSTONE_LAMP",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bL",
+      "name": "DOUBLE_WOODEN_SLAB",
+      "type": "Lnone/and;"
+    },
     {
       "obf": "b",
-      "name": "stone",
+      "name": "STONE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bM",
+      "name": "WOODEN_SLAB",
+      "type": "Lnone/and;"
+    },
+    {
+      "obf": "bN",
+      "name": "COCOA",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bO",
+      "name": "SANDSTONE_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bP",
+      "name": "EMERALD_ORE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bQ",
+      "name": "ENDER_CHEST",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bR",
+      "name": "TRIPWIRE_HOOK",
+      "type": "Lnone/aqo;"
+    },
+    {
+      "obf": "bS",
+      "name": "TRIPWIRE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bT",
+      "name": "EMERALD_BLOOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bU",
+      "name": "SPRUCE_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bV",
+      "name": "BIRCH_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bW",
+      "name": "JUNGLE_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bX",
+      "name": "COMMAND_BLOCK",
       "type": "Lnone/akw;"
     },
     {
       "obf": "bY",
-      "name": "beacon",
+      "name": "BEACON",
       "type": "Lnone/akt;"
     },
     {
-      "obf": "cE",
-      "name": "slime",
+      "obf": "bZ",
+      "name": "COBBLESTONE_WALL",
       "type": "Lnone/akw;"
     },
+    {
+      "obf": "ba",
+      "name": "CAKE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bb",
+      "name": "REPEATER_UNPOWERED",
+      "type": "Lnone/aph;"
+    },
+    {
+      "obf": "bc",
+      "name": "REPEATER_POWERED",
+      "type": "Lnone/aph;"
+    },
+    {
+      "obf": "bd",
+      "name": "TRAPDOOR",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "be",
+      "name": "MONSTER_EGG",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bf",
+      "name": "STONE_BRICK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bg",
+      "name": "BROWN_MUSHROOM_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bh",
+      "name": "RED_MUSHROOM_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bi",
+      "name": "IRON_BARS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bj",
+      "name": "GLASS_PANE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bk",
+      "name": "MELON_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bl",
+      "name": "PUMPKIN_STEM",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bm",
+      "name": "MELON_STEM",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bn",
+      "name": "VINE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bo",
+      "name": "OAK_FENCE_GATE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bp",
+      "name": "SPRUCE_FENCE_GATE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bq",
+      "name": "BIRCH_FENCE_GATE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "br",
+      "name": "JUNGLE_FENCE_GATE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bs",
+      "name": "DARK_OAK_FENCE_GATE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bt",
+      "name": "ACACIA_FENCE_GATE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bu",
+      "name": "BRICK_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bv",
+      "name": "STONE_BRICK_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bw",
+      "name": "MYCELIUM",
+      "type": "Lnone/aoa;"
+    },
+    {
+      "obf": "bx",
+      "name": "WATERLILY",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "by",
+      "name": "NETHER_BRICK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "bz",
+      "name": "NETHER_BRICK_FENCE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cA",
+      "name": "COAL_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cB",
+      "name": "PACKED_ICE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cC",
+      "name": "ACACIA_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cD",
+      "name": "DARK_OAK_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cE",
+      "name": "SLIME",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cF",
+      "name": "DOUBLE_PLANT",
+      "type": "Lnone/ama;"
+    },
+    {
+      "obf": "cG",
+      "name": "STAINED_GLASS",
+      "type": "Lnone/apw;"
+    },
+    {
+      "obf": "cH",
+      "name": "STAINED_GLASS_PANE",
+      "type": "Lnone/apx;"
+    },
     {
       "obf": "cI",
-      "name": "prismarine",
+      "name": "PRISMARINE",
       "type": "Lnone/akw;"
     },
     {
       "obf": "cJ",
-      "name": "seaLantern",
+      "name": "SEA_LANTERN",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cK",
+      "name": "STANDING_BANNER",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cL",
+      "name": "WALL_BANNER",
       "type": "Lnone/akw;"
     },
     {
       "obf": "c",
-      "name": "grass",
+      "name": "GRASS",
       "type": "Lnone/amz;"
     },
     {
       "obf": "cM",
-      "name": "redSandstone",
+      "name": "RED_SANDSTONE",
       "type": "Lnone/akw;"
     },
     {
       "obf": "cN",
-      "name": "redSandstoneStairs",
+      "name": "RED_SANDSTONE_STAIRS",
       "type": "Lnone/akw;"
     },
+    {
+      "obf": "cO",
+      "name": "DOUBLE_STONE_SLAB2",
+      "type": "Lnone/and;"
+    },
+    {
+      "obf": "cP",
+      "name": "STONE_SLAB2",
+      "type": "Lnone/and;"
+    },
     {
       "obf": "cQ",
-      "name": "endRod",
+      "name": "END_ROD",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cR",
+      "name": "CHORUS_PLANT",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cS",
+      "name": "CHORUS_FLOWER",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cT",
+      "name": "PURPUR_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cU",
+      "name": "PURPUR_PILLAR",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cV",
+      "name": "PURPUR_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cW",
+      "name": "PURPUR_DOUBLE_SLAB",
+      "type": "Lnone/and;"
+    },
+    {
+      "obf": "cX",
+      "name": "PURPUR_SLAB",
+      "type": "Lnone/and;"
+    },
+    {
+      "obf": "cY",
+      "name": "END_BRICKS",
       "type": "Lnone/akw;"
     },
     {
       "obf": "cZ",
-      "name": "beetroots",
+      "name": "BEETROOTS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ca",
+      "name": "FLOWER_POT",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cb",
+      "name": "CARROTS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cc",
+      "name": "POTATOES",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cd",
+      "name": "WOODEN_BUTTON",
       "type": "Lnone/akw;"
     },
     {
       "obf": "ce",
-      "name": "skull",
+      "name": "SKULL",
       "type": "Lnone/app;"
     },
+    {
+      "obf": "cf",
+      "name": "ANVIL",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cg",
+      "name": "TRAPPED_CHJEST",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ch",
+      "name": "LIGHT_WEIGHTED_PRESSURE_PLATE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ci",
+      "name": "HEAVY_WEIGHTED_PRESSURE_PLATE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cj",
+      "name": "UNPOWERED_COMPARATOR",
+      "type": "Lnone/alp;"
+    },
+    {
+      "obf": "ck",
+      "name": "POWERED_COMPARATOR",
+      "type": "Lnone/alp;"
+    },
+    {
+      "obf": "cl",
+      "name": "DAYLIGHT_DETECTOR",
+      "type": "Lnone/als;"
+    },
+    {
+      "obf": "cm",
+      "name": "DAYLIGHT_DETECTOR_INVERTED",
+      "type": "Lnone/als;"
+    },
+    {
+      "obf": "cn",
+      "name": "REDSTONE_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "co",
+      "name": "QUARTZ_ORE",
+      "type": "Lnone/akw;"
+    },
     {
       "obf": "cp",
-      "name": "hopper",
+      "name": "HOPPER",
       "type": "Lnone/anj;"
     },
+    {
+      "obf": "cq",
+      "name": "QUARTZ_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cr",
+      "name": "QUARTZ_STAIRS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cs",
+      "name": "ACTIVATOR_RAIL",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "ct",
+      "name": "DROPPER",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cu",
+      "name": "STAINED_HARDENED_CLAY",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cv",
+      "name": "BARRIER",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cw",
+      "name": "IRON_TRAPDOOR",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cx",
+      "name": "HAY_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cy",
+      "name": "CARPET",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "cz",
+      "name": "HARDENED_CLAY",
+      "type": "Lnone/akw;"
+    },
     {
       "obf": "d",
-      "name": "dirt",
+      "name": "DIRT",
       "type": "Lnone/akw;"
     },
     {
       "obf": "da",
-      "name": "grassPath",
+      "name": "GRASS_PATH",
       "type": "Lnone/akw;"
     },
     {
       "obf": "db",
-      "name": "endGateway",
+      "name": "END_GATEWAY",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "dc",
+      "name": "REPEATING_COMMAND_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "dd",
+      "name": "CHAIN_COMMAND_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "de",
+      "name": "FROSTED_ICE",
       "type": "Lnone/akw;"
     },
     {
       "obf": "df",
-      "name": "magma",
+      "name": "MAGMA",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "dg",
+      "name": "NETHER_WART_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "dh",
+      "name": "RED_NETHER_BRICK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "di",
+      "name": "BONE_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "dj",
+      "name": "STRUCTURE_VOID",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "dk",
+      "name": "STRUCTURE_BLOCK",
       "type": "Lnone/akw;"
     },
     {
@@ -124,32 +994,112 @@
     },
     {
       "obf": "e",
-      "name": "cobblestone",
+      "name": "COBBLESTONE",
       "type": "Lnone/akw;"
     },
     {
       "obf": "f",
-      "name": "planks",
+      "name": "PLANKS",
       "type": "Lnone/akw;"
     },
     {
       "obf": "g",
-      "name": "sapling",
+      "name": "SAPLING",
       "type": "Lnone/akw;"
     },
     {
       "obf": "h",
-      "name": "bedrock",
+      "name": "BEDROCK",
       "type": "Lnone/akw;"
     },
+    {
+      "obf": "i",
+      "name": "FLOWING_WATER",
+      "type": "Lnone/amd;"
+    },
+    {
+      "obf": "j",
+      "name": "WATER",
+      "type": "Lnone/aqa;"
+    },
+    {
+      "obf": "k",
+      "name": "FLOWING_LAVA",
+      "type": "Lnone/amd;"
+    },
+    {
+      "obf": "l",
+      "name": "LAVA",
+      "type": "Lnone/aqa;"
+    },
     {
       "obf": "m",
-      "name": "sand",
+      "name": "SAND",
       "type": "Lnone/apk;"
     },
+    {
+      "obf": "n",
+      "name": "GRAVEL",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "o",
+      "name": "GOLD_ORE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "p",
+      "name": "IRON_ORE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "q",
+      "name": "COAL_ORE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "r",
+      "name": "LOG",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "s",
+      "name": "LOG2",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "t",
+      "name": "LEAVES",
+      "type": "Lnone/anp;"
+    },
+    {
+      "obf": "u",
+      "name": "LEAVES2",
+      "type": "Lnone/anp;"
+    },
     {
       "obf": "v",
-      "name": "sponge",
+      "name": "SPONGE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "w",
+      "name": "GLASS",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "x",
+      "name": "LAPIS_ORE",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "y",
+      "name": "LAPIS_BLOCK",
+      "type": "Lnone/akw;"
+    },
+    {
+      "obf": "z",
+      "name": "DISPENSER",
       "type": "Lnone/akw;"
     }
   ],
diff --git a/mappings/net/minecraft/reference/Bootstrap.json b/mappings/net/minecraft/reference/Bootstrap.json
new file mode 100644
index 0000000000..2c1e75b7ec
--- /dev/null
+++ b/mappings/net/minecraft/reference/Bootstrap.json
@@ -0,0 +1,31 @@
+{
+  "obf": "ks",
+  "name": "net/minecraft/reference/Bootstrap",
+  "field": [
+    {
+      "obf": "a",
+      "name": "OUTPUT",
+      "type": "Ljava/io/PrintStream;"
+    },
+    {
+      "obf": "b",
+      "name": "initialized",
+      "type": "Z"
+    },
+    {
+      "obf": "c",
+      "name": "LOGGER",
+      "type": "Lorg/apache/logging/log4j/Logger;"
+    }
+  ],
+  "constructors": [],
+  "method": [
+    {
+      "obf": "a",
+      "name": "isInitialized",
+      "signature": "()Z",
+      "args": []
+    }
+  ],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/reference/Items.json b/mappings/net/minecraft/reference/Items.json
new file mode 100644
index 0000000000..0ec6ed69ca
--- /dev/null
+++ b/mappings/net/minecraft/reference/Items.json
@@ -0,0 +1,1051 @@
+{
+  "obf": "aes",
+  "name": "net/minecraft/reference/Items",
+  "field": [
+    {
+      "obf": "A",
+      "name": "DIAMOND_AXE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "B",
+      "name": "STICK",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "C",
+      "name": "BOWL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "D",
+      "name": "MUSHROOM_STEW",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "E",
+      "name": "GOLDEN_SWORD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "F",
+      "name": "GODLEN_SHOVEL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "G",
+      "name": "GOLDEN_PICKAXE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "H",
+      "name": "GOLDEN_AXE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "I",
+      "name": "STRING",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "J",
+      "name": "FEATHER",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "K",
+      "name": "GUNPOWDER",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "L",
+      "name": "WOODEN_HOE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "M",
+      "name": "STONE_HOE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "N",
+      "name": "IRON_HOE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "O",
+      "name": "DIAMOND_HOE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "P",
+      "name": "GOLDEN_HOE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "Q",
+      "name": "WHEAT_SEEDS",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "R",
+      "name": "WHEAT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "S",
+      "name": "BREAD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "T",
+      "name": "LEATHER_HELMET",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "U",
+      "name": "LEATHER_CHESTPLATE",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "V",
+      "name": "LEATHER_LEGGINGS",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "W",
+      "name": "LEATHER_BOOTS",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "X",
+      "name": "CHAINMAIL_HELMET",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "Y",
+      "name": "CHAINMAIL_CHESTPLATE",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "Z",
+      "name": "CHAINMAIL_LEGGINGS",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "aA",
+      "name": "WATER_BUCKET",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aB",
+      "name": "LAVA_BUCKET",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aC",
+      "name": "MINECART",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aD",
+      "name": "SADDLE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aE",
+      "name": "IRON_DOOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aF",
+      "name": "REDSTONE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aG",
+      "name": "SNOWBALL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aH",
+      "name": "OAK_BOAT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aI",
+      "name": "SPRUCE_BOAT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aJ",
+      "name": "BIRCH_BOAT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aK",
+      "name": "JUNGLE_BOAT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aL",
+      "name": "ACACIA_BOAT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "a",
+      "name": "AIR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aM",
+      "name": "DARK_OAK_BOAT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aN",
+      "name": "LEATHER",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aO",
+      "name": "MILK_BUCKET",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aP",
+      "name": "BRICK",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aQ",
+      "name": "CLAY_BALL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aR",
+      "name": "REEDS",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aS",
+      "name": "PAPER",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aT",
+      "name": "BOOK",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aU",
+      "name": "SLIME_BALL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aV",
+      "name": "CHEST_MINECART",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aW",
+      "name": "FURNACE_MINECART",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aX",
+      "name": "EGG",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aY",
+      "name": "COMPASS",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aZ",
+      "name": "FISHING_ROD",
+      "type": "Lnone/aei;"
+    },
+    {
+      "obf": "aa",
+      "name": "CHAINMAIL_BOOTS",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "ab",
+      "name": "IRON_HELMET",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "ac",
+      "name": "IRON_CHESTPLATE",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "ad",
+      "name": "IRON_LEGGINGS",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "ae",
+      "name": "IRON_BOOTS",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "af",
+      "name": "DIAMOND_HELMET",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "ag",
+      "name": "DIAMOND_CHESTPLATE",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "ah",
+      "name": "DIAMOND_LEGGINGS",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "ai",
+      "name": "DIAMOND_BOOTS",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "aj",
+      "name": "GOLDEN_HELMET",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "ak",
+      "name": "GOLDEN_CHESTPLATE",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "al",
+      "name": "GOLDEN_LEGGINGS",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "am",
+      "name": "GOLDEN_BOOTS",
+      "type": "Lnone/acw;"
+    },
+    {
+      "obf": "an",
+      "name": "FLINT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ao",
+      "name": "PORKCHOP",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ap",
+      "name": "COOKED_PORKCHOP",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aq",
+      "name": "PAINTING",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ar",
+      "name": "GOLDEN_APPLE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "as",
+      "name": "SIGN",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "at",
+      "name": "OAK_DOOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "au",
+      "name": "SPRUCE_DOOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "av",
+      "name": "BIRCH_DOOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "aw",
+      "name": "JUNGLE_DOOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ax",
+      "name": "ACACIA_DOOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ay",
+      "name": "DARK_OAK_DOOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "az",
+      "name": "BUCKET",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bA",
+      "name": "RABBIT_HIDE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bB",
+      "name": "ROTTEN_FLESH",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bC",
+      "name": "ENDER_PEARL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bD",
+      "name": "BLAZE_ROD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bE",
+      "name": "GHAST_TEAR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bF",
+      "name": "GOLD_NUGGET",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bG",
+      "name": "NETHER_WART",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bH",
+      "name": "POTION",
+      "type": "Lnone/afd;"
+    },
+    {
+      "obf": "bI",
+      "name": "SPLASH_POTION",
+      "type": "Lnone/afd;"
+    },
+    {
+      "obf": "bJ",
+      "name": "LINGERING_POTION",
+      "type": "Lnone/afd;"
+    },
+    {
+      "obf": "bK",
+      "name": "GLASS_BOTTLE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bL",
+      "name": "DRAGON_BREATH",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "b",
+      "name": "IRON_SHOVEL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bM",
+      "name": "SPIDER_EYE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bN",
+      "name": "FERMENTED_SPIDER_EYE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bO",
+      "name": "BLAZE_POWDER",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bP",
+      "name": "MAGMA_CREAM",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bQ",
+      "name": "BREWING_STAND",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bR",
+      "name": "CAULDRON",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bS",
+      "name": "ENDER_EYE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bT",
+      "name": "SPECKLED_MELON",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bU",
+      "name": "SPAWN_EGG",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bV",
+      "name": "EXPERIERNCE_BOTTLE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bW",
+      "name": "FIRE_CHARGE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bX",
+      "name": "WRITABLE_BOOK",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bY",
+      "name": "WRITTEN_BOOK",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bZ",
+      "name": "EMERALD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ba",
+      "name": "CLOCK",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bb",
+      "name": "GLOWSTONE_DUST",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bc",
+      "name": "FISH",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bd",
+      "name": "COOKED_FISH",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "be",
+      "name": "DYE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bf",
+      "name": "BONE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bg",
+      "name": "SUGAR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bh",
+      "name": "CAKE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bi",
+      "name": "BED",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bj",
+      "name": "REPEATER",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bk",
+      "name": "COOKIE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bl",
+      "name": "FILLED_MAP",
+      "type": "Lnone/aew;"
+    },
+    {
+      "obf": "bm",
+      "name": "SHEARS",
+      "type": "Lnone/afl;"
+    },
+    {
+      "obf": "bn",
+      "name": "MELON",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bo",
+      "name": "PUMPKIN_SEEDS",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bp",
+      "name": "MELON_SEEDS",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bq",
+      "name": "BEEF",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "br",
+      "name": "COOKED_BEEF",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bs",
+      "name": "CHICKEN",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bt",
+      "name": "COOKED_CHICKEN",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bu",
+      "name": "MUTTON",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bv",
+      "name": "COOKED_MUTTON",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bw",
+      "name": "RABBIT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bx",
+      "name": "COOKED_RABBIT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "by",
+      "name": "RABBIT_STEW",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "bz",
+      "name": "RABBIT_FOOT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cA",
+      "name": "COMMAND_BLOCK_MINECART",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cB",
+      "name": "RECORD_13",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cC",
+      "name": "RECORD_CART",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cD",
+      "name": "RECORD_BLOCKS",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cE",
+      "name": "RECORD_CHIRP",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cF",
+      "name": "RECORD_FAR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cG",
+      "name": "RECORD_MALL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cH",
+      "name": "RECORD_MELLOHI",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cI",
+      "name": "RECORD_STAL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cJ",
+      "name": "RECORD_STRAD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cK",
+      "name": "RECORD_WARD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cL",
+      "name": "RECORD_11",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "c",
+      "name": "IRON_PICKAXE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cM",
+      "name": "RECORD_WAIT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cN",
+      "name": "PRISMARINE_SHARD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cO",
+      "name": "PRISMARINE_CRYSTALS",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cP",
+      "name": "BANNER",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cQ",
+      "name": "END_CRYSTAL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cR",
+      "name": "SHIELD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cS",
+      "name": "ELYTRA",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cT",
+      "name": "CHORUS_FRUIT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cU",
+      "name": "CHORUS_FRUIT_POPPED",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cV",
+      "name": "BEETROOT_SEEDS",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cW",
+      "name": "BEETROOT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cX",
+      "name": "BEETROOT_SOUP",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ca",
+      "name": "ITEM_FRAME",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cb",
+      "name": "FLOWER_POT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cc",
+      "name": "CARROT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cd",
+      "name": "POTATO",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ce",
+      "name": "BAKED_POTATO",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cf",
+      "name": "POISONOUS_POTATO",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cg",
+      "name": "MAP",
+      "type": "Lnone/ady;"
+    },
+    {
+      "obf": "ch",
+      "name": "GOLDEN_CARROT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ci",
+      "name": "SKULL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cj",
+      "name": "CARROT_ON_A_STICK",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ck",
+      "name": "NETHER_STAR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cl",
+      "name": "PUMPKIN_PIE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cm",
+      "name": "FIREWORK",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cn",
+      "name": "FIREWORK_CHARGE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "co",
+      "name": "ENCHANTED_BOOK",
+      "type": "Lnone/adz;"
+    },
+    {
+      "obf": "cp",
+      "name": "COMPARATOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cq",
+      "name": "NETHER_BRICK",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cr",
+      "name": "QUARTZ",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cs",
+      "name": "TNT_MINECART",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "ct",
+      "name": "HOPPER_MINECART",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cu",
+      "name": "ARMOR_STAND",
+      "type": "Lnone/acx;"
+    },
+    {
+      "obf": "cv",
+      "name": "IRON_HORSE_ARMOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cw",
+      "name": "GOLDEN_HORSE_ARMOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cx",
+      "name": "DIAMOND_HORDSE_ARMOR",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cy",
+      "name": "LEAD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "cz",
+      "name": "NAME_TG",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "d",
+      "name": "IRON_AXE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "e",
+      "name": "FLINT_AND_STEEL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "f",
+      "name": "APPLE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "g",
+      "name": "BOW",
+      "type": "Lnone/adh;"
+    },
+    {
+      "obf": "h",
+      "name": "ARROW",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "i",
+      "name": "SPECTRAL_ARROW",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "j",
+      "name": "TIPPED_ARROW",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "k",
+      "name": "COAL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "l",
+      "name": "DIAMOND",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "m",
+      "name": "IRON_INGOT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "n",
+      "name": "GOLD_INGOT",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "o",
+      "name": "IRON_SWORD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "p",
+      "name": "WOODEN_SWORD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "q",
+      "name": "WOODEN_SHOVEL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "r",
+      "name": "WOODEN_PICKAXE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "s",
+      "name": "WOODEN_AXE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "t",
+      "name": "STONE_SWORD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "u",
+      "name": "STONE_SHOVEL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "v",
+      "name": "STONE_PICKAXE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "w",
+      "name": "STONE_AXE",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "x",
+      "name": "DIAMOND_SWORD",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "y",
+      "name": "DIAMOND_SHOVEL",
+      "type": "Lnone/aeo;"
+    },
+    {
+      "obf": "z",
+      "name": "DIAMOND_PICKAXE",
+      "type": "Lnone/aeo;"
+    }
+  ],
+  "constructors": [],
+  "method": [
+    {
+      "obf": "a",
+      "name": "getItemFromId",
+      "signature": "(Ljava/lang/String;)Lnone/aeo;",
+      "args": [
+        {
+          "index": 0,
+          "name": "id"
+        }
+      ]
+    }
+  ],
+  "innerClass": []
+}
\ No newline at end of file
diff --git a/mappings/net/minecraft/server/IntegratedServer.json b/mappings/net/minecraft/server/IntegratedServer.json
index 117a337724..ff1442428a 100644
--- a/mappings/net/minecraft/server/IntegratedServer.json
+++ b/mappings/net/minecraft/server/IntegratedServer.json
@@ -4,7 +4,7 @@
   "field": [
     {
       "obf": "k",
-      "name": "logger",
+      "name": "LOGGER",
       "type": "Lorg/apache/logging/log4j/Logger;"
     }
   ],
diff --git a/mappings/net/minecraft/server/LanServerPinger.json b/mappings/net/minecraft/server/LanServerPinger.json
index f9f2f61ef7..02c3fa729a 100644
--- a/mappings/net/minecraft/server/LanServerPinger.json
+++ b/mappings/net/minecraft/server/LanServerPinger.json
@@ -4,7 +4,7 @@
   "field": [
     {
       "obf": "b",
-      "name": "logger",
+      "name": "LOGGER",
       "type": "Lorg/apache/logging/log4j/Logger;"
     },
     {
diff --git a/mappings/net/minecraft/util/math/BlockPos.json b/mappings/net/minecraft/util/math/BlockPos.json
index 52a1a12932..bd4cf2359f 100644
--- a/mappings/net/minecraft/util/math/BlockPos.json
+++ b/mappings/net/minecraft/util/math/BlockPos.json
@@ -9,7 +9,7 @@
     },
     {
       "obf": "b",
-      "name": "logger",
+      "name": "LOGGER",
       "type": "Lorg/apache/logging/log4j/Logger;"
     }
   ],