diff --git a/generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java b/generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java
index 2afc63662fc..c8d44f6a9ed 100644
--- a/generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java
+++ b/generator/src/main/java/org/spongepowered/vanilla/generator/GeneratorMain.java
@@ -55,7 +55,6 @@
 import net.minecraft.world.entity.animal.horse.Markings;
 import net.minecraft.world.entity.animal.horse.Variant;
 import net.minecraft.world.entity.vehicle.Boat;
-import net.minecraft.world.item.ArmorMaterials;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.Rarity;
@@ -221,7 +220,7 @@ private static List<Generator> generators(final Context context) {
                  "item",
                  "FireworkShapes",
                   FireworkExplosion.Shape.class,
-                 "getName",
+                 "getSerializedName",
                  "sponge"
             ),
             new EnumEntriesValidator<>(
@@ -238,12 +237,12 @@ private static List<Generator> generators(final Context context) {
                  "getName",
                  "sponge"
             ),
-            new EnumEntriesValidator<>(
+            new RegistryEntriesGenerator<>(
                  "data.type",
                  "ArmorMaterials",
-                 ArmorMaterials.class,
-                 "getName",
-                 "sponge"
+                 "ArmorMaterials",
+                 context.relativeClass("data.type", "ArmorMaterial"),
+                 Registries.ARMOR_MATERIAL
             ),
             new EnumEntriesValidator<>(
                  "data.type",
@@ -575,7 +574,8 @@ private static List<Generator> generators(final Context context) {
             ),
             new BlockStateDataProviderGenerator(),
             new BlockStatePropertiesGenerator(),
-            new BlockStatePropertyKeysGenerator(),
+            // TODO fix me
+            //new BlockStatePropertyKeysGenerator(),
             new RegistryEntriesGenerator<>(
                     "world.generation.feature",
                     "PlacedFeatures",