diff --git a/src/main/java/org/spongepowered/api/advancement/AdvancementTypes.java b/src/main/java/org/spongepowered/api/advancement/AdvancementTypes.java
index 7ecb073722..1825847822 100644
--- a/src/main/java/org/spongepowered/api/advancement/AdvancementTypes.java
+++ b/src/main/java/org/spongepowered/api/advancement/AdvancementTypes.java
@@ -34,14 +34,12 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of all the available {@link AdvancementType}s in Minecraft.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class AdvancementTypes {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     /**
      * Represents the challenge completion advancement type.
      *
@@ -66,8 +64,6 @@ public final class AdvancementTypes {
      */
     public static final DefaultedRegistryReference<AdvancementType> TASK = AdvancementTypes.key(ResourceKey.sponge("task"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private AdvancementTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java b/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java
index 3d785100e3..5060b9e963 100644
--- a/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java
+++ b/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class Triggers {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<Trigger<?>> ALLAY_DROP_ITEM_ON_BLOCK = Triggers.key(ResourceKey.minecraft("allay_drop_item_on_block"));
 
     public static final DefaultedRegistryReference<Trigger<?>> AVOID_VIBRATION = Triggers.key(ResourceKey.minecraft("avoid_vibration"));
@@ -145,7 +144,6 @@ public final class Triggers {
 
     public static final DefaultedRegistryReference<Trigger<?>> VOLUNTARY_EXILE = Triggers.key(ResourceKey.minecraft("voluntary_exile"));
 
-    //@formatter:on
     private Triggers() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/block/BlockTypes.java b/src/main/java/org/spongepowered/api/block/BlockTypes.java
index fce72a982e..4be86c22e8 100644
--- a/src/main/java/org/spongepowered/api/block/BlockTypes.java
+++ b/src/main/java/org/spongepowered/api/block/BlockTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class BlockTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<BlockType> ACACIA_BUTTON = BlockTypes.key(ResourceKey.minecraft("acacia_button"));
 
     public static final DefaultedRegistryReference<BlockType> ACACIA_DOOR = BlockTypes.key(ResourceKey.minecraft("acacia_door"));
@@ -2157,7 +2156,6 @@ public final class BlockTypes {
 
     public static final DefaultedRegistryReference<BlockType> ZOMBIE_WALL_HEAD = BlockTypes.key(ResourceKey.minecraft("zombie_wall_head"));
 
-    //@formatter:on
     private BlockTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java b/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java
index b42fb18adb..a768ed3d17 100644
--- a/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java
+++ b/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class BlockEntityTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<BlockEntityType> BANNER = BlockEntityTypes.key(ResourceKey.minecraft("banner"));
 
     public static final DefaultedRegistryReference<BlockEntityType> BARREL = BlockEntityTypes.key(ResourceKey.minecraft("barrel"));
@@ -127,7 +126,6 @@ public final class BlockEntityTypes {
 
     public static final DefaultedRegistryReference<BlockEntityType> TRIAL_SPAWNER = BlockEntityTypes.key(ResourceKey.minecraft("trial_spawner"));
 
-    //@formatter:on
     private BlockEntityTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/ArmorMaterials.java b/src/main/java/org/spongepowered/api/data/type/ArmorMaterials.java
index 1b067997a2..1a0d0f0dd6 100644
--- a/src/main/java/org/spongepowered/api/data/type/ArmorMaterials.java
+++ b/src/main/java/org/spongepowered/api/data/type/ArmorMaterials.java
@@ -33,12 +33,13 @@
 import org.spongepowered.api.registry.RegistryScopes;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class ArmorMaterials {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<ArmorMaterial> CHAINMAIL = ArmorMaterials.key(ResourceKey.sponge("chainmail"));
 
     public static final DefaultedRegistryReference<ArmorMaterial> DIAMOND = ArmorMaterials.key(ResourceKey.sponge("diamond"));
@@ -53,8 +54,6 @@ public final class ArmorMaterials {
 
     public static final DefaultedRegistryReference<ArmorMaterial> TURTLE = ArmorMaterials.key(ResourceKey.sponge("turtle"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private ArmorMaterials() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/ArtTypes.java b/src/main/java/org/spongepowered/api/data/type/ArtTypes.java
index 2647ef96fa..1cb8ef2a21 100644
--- a/src/main/java/org/spongepowered/api/data/type/ArtTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/ArtTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class ArtTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<ArtType> ALBAN = ArtTypes.key(ResourceKey.minecraft("alban"));
 
     public static final DefaultedRegistryReference<ArtType> AZTEC = ArtTypes.key(ResourceKey.minecraft("aztec"));
@@ -101,7 +100,6 @@ public final class ArtTypes {
 
     public static final DefaultedRegistryReference<ArtType> WITHER = ArtTypes.key(ResourceKey.minecraft("wither"));
 
-    //@formatter:on
     private ArtTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/BambooLeavesTypes.java b/src/main/java/org/spongepowered/api/data/type/BambooLeavesTypes.java
index ecffa37e23..b2a2792410 100644
--- a/src/main/java/org/spongepowered/api/data/type/BambooLeavesTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/BambooLeavesTypes.java
@@ -33,18 +33,19 @@
 import org.spongepowered.api.registry.RegistryScopes;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class BambooLeavesTypes {
 
-    // @formatter:off
     public static final DefaultedRegistryReference<BambooLeavesType> LARGE = BambooLeavesTypes.key(ResourceKey.sponge("large"));
 
     public static final DefaultedRegistryReference<BambooLeavesType> NONE = BambooLeavesTypes.key(ResourceKey.sponge("none"));
 
     public static final DefaultedRegistryReference<BambooLeavesType> SMALL = BambooLeavesTypes.key(ResourceKey.sponge("small"));
 
-    // @formatter:on
     private BambooLeavesTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java b/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java
index 9f21579b90..b85746c74f 100644
--- a/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java
+++ b/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class BannerPatternShapes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<BannerPatternShape> BASE = BannerPatternShapes.key(ResourceKey.minecraft("base"));
 
     public static final DefaultedRegistryReference<BannerPatternShape> BORDER = BannerPatternShapes.key(ResourceKey.minecraft("border"));
@@ -123,7 +122,6 @@ public final class BannerPatternShapes {
 
     public static final DefaultedRegistryReference<BannerPatternShape> TRIANGLES_TOP = BannerPatternShapes.key(ResourceKey.minecraft("triangles_top"));
 
-    //@formatter:on
     private BannerPatternShapes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/BoatTypes.java b/src/main/java/org/spongepowered/api/data/type/BoatTypes.java
index adfff5dfc2..48d7b7c914 100644
--- a/src/main/java/org/spongepowered/api/data/type/BoatTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/BoatTypes.java
@@ -34,14 +34,12 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of vanilla {@link BoatType}s.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class BoatTypes {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<BoatType> ACACIA = BoatTypes.key(ResourceKey.sponge("acacia"));
 
     public static final DefaultedRegistryReference<BoatType> BAMBOO = BoatTypes.key(ResourceKey.sponge("bamboo"));
@@ -60,8 +58,6 @@ public final class BoatTypes {
 
     public static final DefaultedRegistryReference<BoatType> SPRUCE = BoatTypes.key(ResourceKey.sponge("spruce"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private BoatTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/CatTypes.java b/src/main/java/org/spongepowered/api/data/type/CatTypes.java
index c0a33b2704..8b00eab91b 100644
--- a/src/main/java/org/spongepowered/api/data/type/CatTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/CatTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class CatTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<CatType> ALL_BLACK = CatTypes.key(ResourceKey.minecraft("all_black"));
 
     public static final DefaultedRegistryReference<CatType> BLACK = CatTypes.key(ResourceKey.minecraft("black"));
@@ -63,7 +62,6 @@ public final class CatTypes {
 
     public static final DefaultedRegistryReference<CatType> WHITE = CatTypes.key(ResourceKey.minecraft("white"));
 
-    //@formatter:on
     private CatTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/DyeColors.java b/src/main/java/org/spongepowered/api/data/type/DyeColors.java
index 66cf59ba48..25b8a8a257 100644
--- a/src/main/java/org/spongepowered/api/data/type/DyeColors.java
+++ b/src/main/java/org/spongepowered/api/data/type/DyeColors.java
@@ -34,14 +34,12 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of vanilla {@link DyeColor}s.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class DyeColors {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<DyeColor> BLACK = DyeColors.key(ResourceKey.sponge("black"));
 
     public static final DefaultedRegistryReference<DyeColor> BLUE = DyeColors.key(ResourceKey.sponge("blue"));
@@ -74,8 +72,6 @@ public final class DyeColors {
 
     public static final DefaultedRegistryReference<DyeColor> YELLOW = DyeColors.key(ResourceKey.sponge("yellow"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private DyeColors() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/FoxTypes.java b/src/main/java/org/spongepowered/api/data/type/FoxTypes.java
index 6fd233ed4e..c9b60995cd 100644
--- a/src/main/java/org/spongepowered/api/data/type/FoxTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/FoxTypes.java
@@ -34,20 +34,16 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of vanilla {@link FoxType}s.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class FoxTypes {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<FoxType> RED = FoxTypes.key(ResourceKey.sponge("red"));
 
     public static final DefaultedRegistryReference<FoxType> SNOW = FoxTypes.key(ResourceKey.sponge("snow"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private FoxTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/FrogTypes.java b/src/main/java/org/spongepowered/api/data/type/FrogTypes.java
index ae6d037fe6..8d1ba3af23 100644
--- a/src/main/java/org/spongepowered/api/data/type/FrogTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/FrogTypes.java
@@ -40,14 +40,12 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class FrogTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<FrogType> COLD = FrogTypes.key(ResourceKey.minecraft("cold"));
 
     public static final DefaultedRegistryReference<FrogType> TEMPERATE = FrogTypes.key(ResourceKey.minecraft("temperate"));
 
     public static final DefaultedRegistryReference<FrogType> WARM = FrogTypes.key(ResourceKey.minecraft("warm"));
 
-    //@formatter:on
     private FrogTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/HorseColors.java b/src/main/java/org/spongepowered/api/data/type/HorseColors.java
index ba02ac51c5..331034535b 100644
--- a/src/main/java/org/spongepowered/api/data/type/HorseColors.java
+++ b/src/main/java/org/spongepowered/api/data/type/HorseColors.java
@@ -34,14 +34,12 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of vanilla {@link HorseColor}s.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class HorseColors {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<HorseColor> BLACK = HorseColors.key(ResourceKey.sponge("black"));
 
     public static final DefaultedRegistryReference<HorseColor> BROWN = HorseColors.key(ResourceKey.sponge("brown"));
@@ -56,8 +54,6 @@ public final class HorseColors {
 
     public static final DefaultedRegistryReference<HorseColor> WHITE = HorseColors.key(ResourceKey.sponge("white"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private HorseColors() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/HorseStyles.java b/src/main/java/org/spongepowered/api/data/type/HorseStyles.java
index 7b4516f51f..994141879c 100644
--- a/src/main/java/org/spongepowered/api/data/type/HorseStyles.java
+++ b/src/main/java/org/spongepowered/api/data/type/HorseStyles.java
@@ -34,14 +34,12 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of vanilla {@link HorseStyle}s.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class HorseStyles {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<HorseStyle> BLACK_DOTS = HorseStyles.key(ResourceKey.sponge("black_dots"));
 
     public static final DefaultedRegistryReference<HorseStyle> NONE = HorseStyles.key(ResourceKey.sponge("none"));
@@ -52,8 +50,6 @@ public final class HorseStyles {
 
     public static final DefaultedRegistryReference<HorseStyle> WHITE_FIELD = HorseStyles.key(ResourceKey.sponge("white_field"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private HorseStyles() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/InstrumentTypes.java b/src/main/java/org/spongepowered/api/data/type/InstrumentTypes.java
index 24d933ea84..a0ef22828f 100644
--- a/src/main/java/org/spongepowered/api/data/type/InstrumentTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/InstrumentTypes.java
@@ -34,14 +34,12 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of vanilla {@link InstrumentType}s.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class InstrumentTypes {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<InstrumentType> BANJO = InstrumentTypes.key(ResourceKey.sponge("banjo"));
 
     public static final DefaultedRegistryReference<InstrumentType> BASE_DRUM = InstrumentTypes.key(ResourceKey.sponge("basedrum"));
@@ -88,8 +86,6 @@ public final class InstrumentTypes {
 
     public static final DefaultedRegistryReference<InstrumentType> ZOMBIE = InstrumentTypes.key(ResourceKey.sponge("zombie"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private InstrumentTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java b/src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java
index 3dbad29013..5753f0647f 100644
--- a/src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class ProfessionTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<ProfessionType> ARMORER = ProfessionTypes.key(ResourceKey.minecraft("armorer"));
 
     public static final DefaultedRegistryReference<ProfessionType> BUTCHER = ProfessionTypes.key(ResourceKey.minecraft("butcher"));
@@ -71,7 +70,6 @@ public final class ProfessionTypes {
 
     public static final DefaultedRegistryReference<ProfessionType> WEAPONSMITH = ProfessionTypes.key(ResourceKey.minecraft("weaponsmith"));
 
-    //@formatter:on
     private ProfessionTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/TropicalFishShapes.java b/src/main/java/org/spongepowered/api/data/type/TropicalFishShapes.java
index 3f5521cca3..d2385f8413 100644
--- a/src/main/java/org/spongepowered/api/data/type/TropicalFishShapes.java
+++ b/src/main/java/org/spongepowered/api/data/type/TropicalFishShapes.java
@@ -26,7 +26,6 @@
 
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
-import org.spongepowered.api.entity.living.aquatic.fish.school.TropicalFish;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
 import org.spongepowered.api.registry.Registry;
 import org.spongepowered.api.registry.RegistryKey;
@@ -35,14 +34,12 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of vanilla shapes for {@link TropicalFish}.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class TropicalFishShapes {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<TropicalFishShape> BETTY = TropicalFishShapes.key(ResourceKey.sponge("betty"));
 
     public static final DefaultedRegistryReference<TropicalFishShape> BLOCKFISH = TropicalFishShapes.key(ResourceKey.sponge("blockfish"));
@@ -67,8 +64,6 @@ public final class TropicalFishShapes {
 
     public static final DefaultedRegistryReference<TropicalFishShape> SUNSTREAK = TropicalFishShapes.key(ResourceKey.sponge("sunstreak"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private TropicalFishShapes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/data/type/VillagerTypes.java b/src/main/java/org/spongepowered/api/data/type/VillagerTypes.java
index 7e1510fe18..73c40a57e6 100644
--- a/src/main/java/org/spongepowered/api/data/type/VillagerTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/VillagerTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class VillagerTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<VillagerType> DESERT = VillagerTypes.key(ResourceKey.minecraft("desert"));
 
     public static final DefaultedRegistryReference<VillagerType> JUNGLE = VillagerTypes.key(ResourceKey.minecraft("jungle"));
@@ -55,7 +54,6 @@ public final class VillagerTypes {
 
     public static final DefaultedRegistryReference<VillagerType> TAIGA = VillagerTypes.key(ResourceKey.minecraft("taiga"));
 
-    //@formatter:on
     private VillagerTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java b/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java
index 2120d6d4ab..369074ea39 100644
--- a/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java
+++ b/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class ParticleTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<ParticleType> AMBIENT_ENTITY_EFFECT = ParticleTypes.key(ResourceKey.minecraft("ambient_entity_effect"));
 
     public static final DefaultedRegistryReference<ParticleType> ANGRY_VILLAGER = ParticleTypes.key(ResourceKey.minecraft("angry_villager"));
@@ -243,7 +242,6 @@ public final class ParticleTypes {
 
     public static final DefaultedRegistryReference<ParticleType> WITCH = ParticleTypes.key(ResourceKey.minecraft("witch"));
 
-    //@formatter:on
     private ParticleTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java b/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java
index b66a2a63a1..d21bc70ae0 100644
--- a/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java
+++ b/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class PotionEffectTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<PotionEffectType> ABSORPTION = PotionEffectTypes.key(ResourceKey.minecraft("absorption"));
 
     public static final DefaultedRegistryReference<PotionEffectType> BAD_OMEN = PotionEffectTypes.key(ResourceKey.minecraft("bad_omen"));
@@ -107,7 +106,6 @@ public final class PotionEffectTypes {
 
     public static final DefaultedRegistryReference<PotionEffectType> WITHER = PotionEffectTypes.key(ResourceKey.minecraft("wither"));
 
-    //@formatter:on
     private PotionEffectTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java b/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java
index 2d44fb8aa6..70a373aec4 100644
--- a/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java
+++ b/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class SoundTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<SoundType> AMBIENT_BASALT_DELTAS_ADDITIONS = SoundTypes.key(ResourceKey.minecraft("ambient.basalt_deltas.additions"));
 
     public static final DefaultedRegistryReference<SoundType> AMBIENT_BASALT_DELTAS_LOOP = SoundTypes.key(ResourceKey.minecraft("ambient.basalt_deltas.loop"));
@@ -3119,7 +3118,6 @@ public final class SoundTypes {
 
     public static final DefaultedRegistryReference<SoundType> WEATHER_RAIN_ABOVE = SoundTypes.key(ResourceKey.minecraft("weather.rain.above"));
 
-    //@formatter:on
     private SoundTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/entity/EntityCategories.java b/src/main/java/org/spongepowered/api/entity/EntityCategories.java
index 98f6c09390..9a6fb0d8f5 100644
--- a/src/main/java/org/spongepowered/api/entity/EntityCategories.java
+++ b/src/main/java/org/spongepowered/api/entity/EntityCategories.java
@@ -30,6 +30,9 @@
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 public final class EntityCategories {
 
     public static final DefaultedRegistryReference<EntityCategory> AMBIENT = EntityCategories.key(ResourceKey.sponge("ambient"));
diff --git a/src/main/java/org/spongepowered/api/entity/EntityTypes.java b/src/main/java/org/spongepowered/api/entity/EntityTypes.java
index 8205dfe857..6d14073117 100644
--- a/src/main/java/org/spongepowered/api/entity/EntityTypes.java
+++ b/src/main/java/org/spongepowered/api/entity/EntityTypes.java
@@ -153,14 +153,15 @@
 import org.spongepowered.api.registry.RegistryScopes;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class EntityTypes {
 
     public static final DefaultedRegistryReference<EntityType<Allay>> ALLAY = EntityTypes.key(ResourceKey.minecraft("allay"));
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<EntityType<AreaEffectCloud>> AREA_EFFECT_CLOUD = EntityTypes.key(ResourceKey.minecraft("area_effect_cloud"));
 
     public static final DefaultedRegistryReference<EntityType<ArmorStand>> ARMOR_STAND = EntityTypes.key(ResourceKey.minecraft("armor_stand"));
@@ -413,8 +414,6 @@ public final class EntityTypes {
 
     public static final DefaultedRegistryReference<EntityType<ZombifiedPiglin>> ZOMBIFIED_PIGLIN = EntityTypes.key(ResourceKey.minecraft("zombified_piglin"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private EntityTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeTypes.java b/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeTypes.java
index 8fbe1c4dde..098b0a7c0f 100644
--- a/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeTypes.java
+++ b/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class AttributeTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<RangedAttributeType> GENERIC_ARMOR = AttributeTypes.key(ResourceKey.minecraft("generic.armor"));
 
     public static final DefaultedRegistryReference<RangedAttributeType> GENERIC_ARMOR_TOUGHNESS = AttributeTypes.key(ResourceKey.minecraft("generic.armor_toughness"));
@@ -69,7 +68,6 @@ public final class AttributeTypes {
 
     public static final DefaultedRegistryReference<RangedAttributeType> ZOMBIE_SPAWN_REINFORCEMENTS = AttributeTypes.key(ResourceKey.minecraft("zombie.spawn_reinforcements"));
 
-    //@formatter:on
     private AttributeTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/entity/display/BillboardTypes.java b/src/main/java/org/spongepowered/api/entity/display/BillboardTypes.java
index 2f5cf0a5e9..059cd07d62 100644
--- a/src/main/java/org/spongepowered/api/entity/display/BillboardTypes.java
+++ b/src/main/java/org/spongepowered/api/entity/display/BillboardTypes.java
@@ -33,11 +33,12 @@
 import org.spongepowered.api.registry.RegistryScopes;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class BillboardTypes {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<BillboardType> CENTER = BillboardTypes.key(ResourceKey.sponge("center"));
 
     public static final DefaultedRegistryReference<BillboardType> FIXED = BillboardTypes.key(ResourceKey.sponge("fixed"));
@@ -46,8 +47,6 @@ public final class BillboardTypes {
 
     public static final DefaultedRegistryReference<BillboardType> VERTICAL = BillboardTypes.key(ResourceKey.sponge("vertical"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private BillboardTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/entity/display/ItemDisplayTypes.java b/src/main/java/org/spongepowered/api/entity/display/ItemDisplayTypes.java
index d172a25fd9..ba0f680a0a 100644
--- a/src/main/java/org/spongepowered/api/entity/display/ItemDisplayTypes.java
+++ b/src/main/java/org/spongepowered/api/entity/display/ItemDisplayTypes.java
@@ -33,12 +33,13 @@
 import org.spongepowered.api.registry.RegistryScopes;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class ItemDisplayTypes {
 
-    // @formatter:off
-    // SORTFIELDS:OFF
     public static final DefaultedRegistryReference<ItemDisplayType> FIRSTPERSON_LEFTHAND = ItemDisplayTypes.key(ResourceKey.sponge("firstperson_lefthand"));
 
     public static final DefaultedRegistryReference<ItemDisplayType> FIRSTPERSON_RIGHTHAND = ItemDisplayTypes.key(ResourceKey.sponge("firstperson_righthand"));
@@ -57,8 +58,6 @@ public final class ItemDisplayTypes {
 
     public static final DefaultedRegistryReference<ItemDisplayType> THIRDPERSON_RIGHTHAND = ItemDisplayTypes.key(ResourceKey.sponge("thirdperson_righthand"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private ItemDisplayTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/entity/display/TextAlignments.java b/src/main/java/org/spongepowered/api/entity/display/TextAlignments.java
index e34e86aa3d..d0341c317a 100644
--- a/src/main/java/org/spongepowered/api/entity/display/TextAlignments.java
+++ b/src/main/java/org/spongepowered/api/entity/display/TextAlignments.java
@@ -33,20 +33,19 @@
 import org.spongepowered.api.registry.RegistryScopes;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class TextAlignments {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<TextAlignment> CENTER = TextAlignments.key(ResourceKey.sponge("center"));
 
     public static final DefaultedRegistryReference<TextAlignment> LEFT = TextAlignments.key(ResourceKey.sponge("left"));
 
     public static final DefaultedRegistryReference<TextAlignment> RIGHT = TextAlignments.key(ResourceKey.sponge("right"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private TextAlignments() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageEffects.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageEffects.java
index 9bce7d0d01..3dd6e9b1ba 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageEffects.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageEffects.java
@@ -33,12 +33,13 @@
 import org.spongepowered.api.registry.RegistryScopes;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class DamageEffects {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<DamageEffect> BURNING = DamageEffects.key(ResourceKey.sponge("burning"));
 
     public static final DefaultedRegistryReference<DamageEffect> DROWNING = DamageEffects.key(ResourceKey.sponge("drowning"));
@@ -51,8 +52,6 @@ public final class DamageEffects {
 
     public static final DefaultedRegistryReference<DamageEffect> THORNS = DamageEffects.key(ResourceKey.sponge("thorns"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private DamageEffects() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageScalings.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageScalings.java
index 79220645c6..81c3276acd 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageScalings.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageScalings.java
@@ -33,20 +33,19 @@
 import org.spongepowered.api.registry.RegistryScopes;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class DamageScalings {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<DamageScaling> ALWAYS = DamageScalings.key(ResourceKey.sponge("always"));
 
     public static final DefaultedRegistryReference<DamageScaling> NEVER = DamageScalings.key(ResourceKey.sponge("never"));
 
     public static final DefaultedRegistryReference<DamageScaling> WHEN_CAUSED_BY_LIVING_NON_PLAYER = DamageScalings.key(ResourceKey.sponge("when_caused_by_living_non_player"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private DamageScalings() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java
index 485f48fb32..f7898effcb 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class DamageTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<DamageType> ARROW = DamageTypes.key(ResourceKey.minecraft("arrow"));
 
     public static final DefaultedRegistryReference<DamageType> BAD_RESPAWN_POINT = DamageTypes.key(ResourceKey.minecraft("bad_respawn_point"));
@@ -129,7 +128,6 @@ public final class DamageTypes {
 
     public static final DefaultedRegistryReference<DamageType> WITHER_SKULL = DamageTypes.key(ResourceKey.minecraft("wither_skull"));
 
-    //@formatter:on
     private DamageTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/fluid/FluidTypes.java b/src/main/java/org/spongepowered/api/fluid/FluidTypes.java
index 80b7991564..bc9e48ffc0 100644
--- a/src/main/java/org/spongepowered/api/fluid/FluidTypes.java
+++ b/src/main/java/org/spongepowered/api/fluid/FluidTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class FluidTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<FluidType> EMPTY = FluidTypes.key(ResourceKey.minecraft("empty"));
 
     public static final DefaultedRegistryReference<FluidType> FLOWING_LAVA = FluidTypes.key(ResourceKey.minecraft("flowing_lava"));
@@ -51,7 +50,6 @@ public final class FluidTypes {
 
     public static final DefaultedRegistryReference<FluidType> WATER = FluidTypes.key(ResourceKey.minecraft("water"));
 
-    //@formatter:on
     private FluidTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/item/FireworkShapes.java b/src/main/java/org/spongepowered/api/item/FireworkShapes.java
index 959011901d..492451ab81 100644
--- a/src/main/java/org/spongepowered/api/item/FireworkShapes.java
+++ b/src/main/java/org/spongepowered/api/item/FireworkShapes.java
@@ -34,7 +34,7 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * A class containing known {@link FireworkShape}s.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/item/ItemRarities.java b/src/main/java/org/spongepowered/api/item/ItemRarities.java
index 59d4f59f91..89113952c8 100644
--- a/src/main/java/org/spongepowered/api/item/ItemRarities.java
+++ b/src/main/java/org/spongepowered/api/item/ItemRarities.java
@@ -33,12 +33,13 @@
 import org.spongepowered.api.registry.RegistryScopes;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class ItemRarities {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<ItemRarity> COMMON = ItemRarities.key(ResourceKey.sponge("common"));
 
     public static final DefaultedRegistryReference<ItemRarity> EPIC = ItemRarities.key(ResourceKey.sponge("epic"));
@@ -47,8 +48,6 @@ public final class ItemRarities {
 
     public static final DefaultedRegistryReference<ItemRarity> UNCOMMON = ItemRarities.key(ResourceKey.sponge("uncommon"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private ItemRarities() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/item/ItemTypes.java b/src/main/java/org/spongepowered/api/item/ItemTypes.java
index 4837571f89..45fae9436d 100644
--- a/src/main/java/org/spongepowered/api/item/ItemTypes.java
+++ b/src/main/java/org/spongepowered/api/item/ItemTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class ItemTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<ItemType> ACACIA_BOAT = ItemTypes.key(ResourceKey.minecraft("acacia_boat"));
 
     public static final DefaultedRegistryReference<ItemType> ACACIA_BUTTON = ItemTypes.key(ResourceKey.minecraft("acacia_button"));
@@ -2665,7 +2664,6 @@ public final class ItemTypes {
 
     public static final DefaultedRegistryReference<ItemType> ZOMBIFIED_PIGLIN_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("zombified_piglin_spawn_egg"));
 
-    //@formatter:on
     private ItemTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java
index c7b2bf068d..f9aa0c3a0d 100644
--- a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java
+++ b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java
@@ -34,16 +34,12 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of known {@link EnchantmentType}s.
- *
- * <p>In vanilla the minimum level of these is 1, while the max levels vary.</p>
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class EnchantmentTypes {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     /**
      * Increases regular underwater mining speed.
      *
@@ -279,8 +275,6 @@ public final class EnchantmentTypes {
      */
     public static final DefaultedRegistryReference<EnchantmentType> VANISHING_CURSE = EnchantmentTypes.key(ResourceKey.minecraft("vanishing_curse"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private EnchantmentTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java b/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java
index e639bec656..286fe0606e 100644
--- a/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java
+++ b/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class PotionTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<PotionType> AWKWARD = PotionTypes.key(ResourceKey.minecraft("awkward"));
 
     public static final DefaultedRegistryReference<PotionType> EMPTY = PotionTypes.key(ResourceKey.minecraft("empty"));
@@ -127,7 +126,6 @@ public final class PotionTypes {
 
     public static final DefaultedRegistryReference<PotionType> WEAKNESS = PotionTypes.key(ResourceKey.minecraft("weakness"));
 
-    //@formatter:on
     private PotionTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/item/recipe/RecipeTypes.java b/src/main/java/org/spongepowered/api/item/recipe/RecipeTypes.java
index 691fef96ae..2bf32eb484 100644
--- a/src/main/java/org/spongepowered/api/item/recipe/RecipeTypes.java
+++ b/src/main/java/org/spongepowered/api/item/recipe/RecipeTypes.java
@@ -38,14 +38,12 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of all {@link RecipeType}s in vanilla minecraft.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class RecipeTypes {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<RecipeType<CookingRecipe>> BLASTING = RecipeTypes.key(ResourceKey.minecraft("blasting"));
 
     public static final DefaultedRegistryReference<RecipeType<CookingRecipe>> CAMPFIRE_COOKING = RecipeTypes.key(ResourceKey.minecraft("campfire_cooking"));
@@ -60,8 +58,6 @@ public final class RecipeTypes {
 
     public static final DefaultedRegistryReference<RecipeType<StoneCutterRecipe>> STONECUTTING = RecipeTypes.key(ResourceKey.minecraft("stonecutting"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private RecipeTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/statistic/Statistics.java b/src/main/java/org/spongepowered/api/statistic/Statistics.java
index 8f6d10177a..fa2012023b 100644
--- a/src/main/java/org/spongepowered/api/statistic/Statistics.java
+++ b/src/main/java/org/spongepowered/api/statistic/Statistics.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class Statistics {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<Statistic> ANIMALS_BRED = Statistics.key(ResourceKey.minecraft("animals_bred"));
 
     public static final DefaultedRegistryReference<Statistic> AVIATE_ONE_CM = Statistics.key(ResourceKey.minecraft("aviate_one_cm"));
@@ -191,7 +190,6 @@ public final class Statistics {
 
     public static final DefaultedRegistryReference<Statistic> WALK_UNDER_WATER_ONE_CM = Statistics.key(ResourceKey.minecraft("walk_under_water_one_cm"));
 
-    //@formatter:on
     private Statistics() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/tag/BiomeTags.java b/src/main/java/org/spongepowered/api/tag/BiomeTags.java
index d8f2254554..244430edd8 100644
--- a/src/main/java/org/spongepowered/api/tag/BiomeTags.java
+++ b/src/main/java/org/spongepowered/api/tag/BiomeTags.java
@@ -37,7 +37,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class BiomeTags {
 
-    //@formatter:off
     public static final Tag<Biome> ALLOWS_SURFACE_SLIME_SPAWNS = BiomeTags.key(ResourceKey.minecraft("allows_surface_slime_spawns"));
 
     public static final Tag<Biome> ALLOWS_TROPICAL_FISH_SPAWNS_AT_ANY_HEIGHT = BiomeTags.key(ResourceKey.minecraft("allows_tropical_fish_spawns_at_any_height"));
@@ -176,7 +175,6 @@ public final class BiomeTags {
 
     public static final Tag<Biome> WITHOUT_ZOMBIE_SIEGES = BiomeTags.key(ResourceKey.minecraft("without_zombie_sieges"));
 
-    //@formatter:on
     private BiomeTags() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java b/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java
index 573c38ad05..28fcab9299 100644
--- a/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java
+++ b/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java
@@ -37,7 +37,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class BlockTypeTags {
 
-    //@formatter:off
     public static final Tag<BlockType> ACACIA_LOGS = BlockTypeTags.key(ResourceKey.minecraft("acacia_logs"));
 
     public static final Tag<BlockType> ALL_HANGING_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("all_hanging_signs"));
@@ -382,7 +381,6 @@ public final class BlockTypeTags {
 
     public static final Tag<BlockType> WOOL_CARPETS = BlockTypeTags.key(ResourceKey.minecraft("wool_carpets"));
 
-    //@formatter:on
     private BlockTypeTags() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java b/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java
index 0e0be13a19..e402deac3f 100644
--- a/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java
+++ b/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java
@@ -37,7 +37,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class DamageTypeTags {
 
-    //@formatter:off
     public static final Tag<DamageType> ALWAYS_HURTS_ENDER_DRAGONS = DamageTypeTags.key(ResourceKey.minecraft("always_hurts_ender_dragons"));
 
     public static final Tag<DamageType> ALWAYS_KILLS_ARMOR_STANDS = DamageTypeTags.key(ResourceKey.minecraft("always_kills_armor_stands"));
@@ -92,7 +91,6 @@ public final class DamageTypeTags {
 
     public static final Tag<DamageType> WITHER_IMMUNE_TO = DamageTypeTags.key(ResourceKey.minecraft("wither_immune_to"));
 
-    //@formatter:on
     private DamageTypeTags() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java b/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java
index eb61583a89..8d218f13c7 100644
--- a/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java
+++ b/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java
@@ -37,7 +37,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class EntityTypeTags {
 
-    //@formatter:off
     public static final Tag<EntityType<?>> ARROWS = EntityTypeTags.key(ResourceKey.minecraft("arrows"));
 
     public static final Tag<EntityType<?>> AXOLOTL_ALWAYS_HOSTILES = EntityTypeTags.key(ResourceKey.minecraft("axolotl_always_hostiles"));
@@ -72,7 +71,6 @@ public final class EntityTypeTags {
 
     public static final Tag<EntityType<?>> ZOMBIES = EntityTypeTags.key(ResourceKey.minecraft("zombies"));
 
-    //@formatter:on
     private EntityTypeTags() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java b/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java
index e57ca6ac41..7e6e151e92 100644
--- a/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java
+++ b/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java
@@ -37,12 +37,10 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class FluidTypeTags {
 
-    //@formatter:off
     public static final Tag<FluidType> LAVA = FluidTypeTags.key(ResourceKey.minecraft("lava"));
 
     public static final Tag<FluidType> WATER = FluidTypeTags.key(ResourceKey.minecraft("water"));
 
-    //@formatter:on
     private FluidTypeTags() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java b/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java
index 6c92949e69..45a5290347 100644
--- a/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java
+++ b/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java
@@ -37,7 +37,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class ItemTypeTags {
 
-    //@formatter:off
     public static final Tag<ItemType> ACACIA_LOGS = ItemTypeTags.key(ResourceKey.minecraft("acacia_logs"));
 
     public static final Tag<ItemType> ANVIL = ItemTypeTags.key(ResourceKey.minecraft("anvil"));
@@ -236,7 +235,6 @@ public final class ItemTypeTags {
 
     public static final Tag<ItemType> WOOL_CARPETS = ItemTypeTags.key(ResourceKey.minecraft("wool_carpets"));
 
-    //@formatter:on
     private ItemTypeTags() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/WorldTypes.java b/src/main/java/org/spongepowered/api/world/WorldTypes.java
index 22ae58d978..aca95c6a74 100644
--- a/src/main/java/org/spongepowered/api/world/WorldTypes.java
+++ b/src/main/java/org/spongepowered/api/world/WorldTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class WorldTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<WorldType> OVERWORLD = WorldTypes.key(ResourceKey.minecraft("overworld"));
 
     public static final DefaultedRegistryReference<WorldType> OVERWORLD_CAVES = WorldTypes.key(ResourceKey.minecraft("overworld_caves"));
@@ -49,7 +48,6 @@ public final class WorldTypes {
 
     public static final DefaultedRegistryReference<WorldType> THE_NETHER = WorldTypes.key(ResourceKey.minecraft("the_nether"));
 
-    //@formatter:on
     private WorldTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/biome/Biomes.java b/src/main/java/org/spongepowered/api/world/biome/Biomes.java
index ea9b42fb4c..046c61934e 100644
--- a/src/main/java/org/spongepowered/api/world/biome/Biomes.java
+++ b/src/main/java/org/spongepowered/api/world/biome/Biomes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.WORLD)
 public final class Biomes {
 
-    //@formatter:off
     public static final RegistryReference<Biome> BADLANDS = Biomes.key(ResourceKey.minecraft("badlands"));
 
     public static final RegistryReference<Biome> BAMBOO_JUNGLE = Biomes.key(ResourceKey.minecraft("bamboo_jungle"));
@@ -169,7 +168,6 @@ public final class Biomes {
 
     public static final RegistryReference<Biome> WOODED_BADLANDS = Biomes.key(ResourceKey.minecraft("wooded_badlands"));
 
-    //@formatter:on
     private Biomes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/chunk/ChunkStates.java b/src/main/java/org/spongepowered/api/world/chunk/ChunkStates.java
index b8c0811419..27bbfbc592 100644
--- a/src/main/java/org/spongepowered/api/world/chunk/ChunkStates.java
+++ b/src/main/java/org/spongepowered/api/world/chunk/ChunkStates.java
@@ -39,12 +39,13 @@
 import org.spongepowered.api.world.WorldLike;
 import org.spongepowered.api.world.biome.Biome;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class ChunkStates {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     /**
      * A {@link Chunk} that is having its {@link Biome biomes}
      * assigned.
@@ -125,8 +126,6 @@ public final class ChunkStates {
      */
     public static final DefaultedRegistryReference<ChunkState> SURFACE = ChunkStates.key(ResourceKey.minecraft("surface"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private ChunkStates() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java b/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java
index faacfa3c6e..1772e238d6 100644
--- a/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java
+++ b/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java
@@ -34,14 +34,12 @@
 import org.spongepowered.api.registry.RegistryTypes;
 
 /**
- * An enumeration of all the possible game rules in vanilla minecraft.
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class GameRules {
 
-    // @formatter:off
-    // SORTFIELDS:ON
     public static final DefaultedRegistryReference<GameRule<Boolean>> ANNOUNCE_ADVANCEMENTS = GameRules.key(ResourceKey.sponge("announce_advancements"));
 
     public static final DefaultedRegistryReference<GameRule<Boolean>> BLOCK_EXPLOSION_DROP_DECAY = GameRules.key(ResourceKey.sponge("block_explosion_drop_decay"));
@@ -142,8 +140,6 @@ public final class GameRules {
 
     public static final DefaultedRegistryReference<GameRule<Boolean>> WATER_SOURCE_CONVERSION = GameRules.key(ResourceKey.sponge("water_source_conversion"));
 
-    // SORTFIELDS:OFF
-    // @formatter:on
     private GameRules() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/carver/CarverTypes.java b/src/main/java/org/spongepowered/api/world/generation/carver/CarverTypes.java
index 3ff32a9b39..37960cc49e 100644
--- a/src/main/java/org/spongepowered/api/world/generation/carver/CarverTypes.java
+++ b/src/main/java/org/spongepowered/api/world/generation/carver/CarverTypes.java
@@ -40,14 +40,12 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class CarverTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<CarverType> CANYON = CarverTypes.key(ResourceKey.minecraft("canyon"));
 
     public static final DefaultedRegistryReference<CarverType> CAVE = CarverTypes.key(ResourceKey.minecraft("cave"));
 
     public static final DefaultedRegistryReference<CarverType> NETHER_CAVE = CarverTypes.key(ResourceKey.minecraft("nether_cave"));
 
-    //@formatter:on
     private CarverTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/carver/Carvers.java b/src/main/java/org/spongepowered/api/world/generation/carver/Carvers.java
index 302c8b58f6..7464144b26 100644
--- a/src/main/java/org/spongepowered/api/world/generation/carver/Carvers.java
+++ b/src/main/java/org/spongepowered/api/world/generation/carver/Carvers.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class Carvers {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<Carver> CANYON = Carvers.key(ResourceKey.minecraft("canyon"));
 
     public static final DefaultedRegistryReference<Carver> CAVE = Carvers.key(ResourceKey.minecraft("cave"));
@@ -49,7 +48,6 @@ public final class Carvers {
 
     public static final DefaultedRegistryReference<Carver> NETHER_CAVE = Carvers.key(ResourceKey.minecraft("nether_cave"));
 
-    //@formatter:on
     private Carvers() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfigs.java b/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfigs.java
index 456456dbf9..2181899203 100644
--- a/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfigs.java
+++ b/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfigs.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class FlatGeneratorConfigs {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<FlatGeneratorConfig> BOTTOMLESS_PIT = FlatGeneratorConfigs.key(ResourceKey.minecraft("bottomless_pit"));
 
     public static final DefaultedRegistryReference<FlatGeneratorConfig> CLASSIC_FLAT = FlatGeneratorConfigs.key(ResourceKey.minecraft("classic_flat"));
@@ -59,7 +58,6 @@ public final class FlatGeneratorConfigs {
 
     public static final DefaultedRegistryReference<FlatGeneratorConfig> WATER_WORLD = FlatGeneratorConfigs.key(ResourceKey.minecraft("water_world"));
 
-    //@formatter:on
     private FlatGeneratorConfigs() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunctions.java b/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunctions.java
index 9b7b2cd3d9..c1e91fd18c 100644
--- a/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunctions.java
+++ b/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunctions.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class DensityFunctions {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<DensityFunction> END_BASE_3D_NOISE = DensityFunctions.key(ResourceKey.minecraft("end/base_3d_noise"));
 
     public static final DefaultedRegistryReference<DensityFunction> END_SLOPED_CHEESE = DensityFunctions.key(ResourceKey.minecraft("end/sloped_cheese"));
@@ -111,7 +110,6 @@ public final class DensityFunctions {
 
     public static final DefaultedRegistryReference<DensityFunction> ZERO = DensityFunctions.key(ResourceKey.minecraft("zero"));
 
-    //@formatter:on
     private DensityFunctions() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfigs.java b/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfigs.java
index 8996548bea..ab6cbc2bab 100644
--- a/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfigs.java
+++ b/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfigs.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class NoiseGeneratorConfigs {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<NoiseGeneratorConfig> AMPLIFIED = NoiseGeneratorConfigs.key(ResourceKey.minecraft("amplified"));
 
     public static final DefaultedRegistryReference<NoiseGeneratorConfig> CAVES = NoiseGeneratorConfigs.key(ResourceKey.minecraft("caves"));
@@ -55,7 +54,6 @@ public final class NoiseGeneratorConfigs {
 
     public static final DefaultedRegistryReference<NoiseGeneratorConfig> OVERWORLD = NoiseGeneratorConfigs.key(ResourceKey.minecraft("overworld"));
 
-    //@formatter:on
     private NoiseGeneratorConfigs() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/config/noise/Noises.java b/src/main/java/org/spongepowered/api/world/generation/config/noise/Noises.java
index 035fef42f7..c9062e406b 100644
--- a/src/main/java/org/spongepowered/api/world/generation/config/noise/Noises.java
+++ b/src/main/java/org/spongepowered/api/world/generation/config/noise/Noises.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class Noises {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<Noise> AQUIFER_BARRIER = Noises.key(ResourceKey.minecraft("aquifer_barrier"));
 
     public static final DefaultedRegistryReference<Noise> AQUIFER_FLUID_LEVEL_FLOODEDNESS = Noises.key(ResourceKey.minecraft("aquifer_fluid_level_floodedness"));
@@ -161,7 +160,6 @@ public final class Noises {
 
     public static final DefaultedRegistryReference<Noise> VEGETATION_LARGE = Noises.key(ResourceKey.minecraft("vegetation_large"));
 
-    //@formatter:on
     private Noises() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/FeatureTypes.java b/src/main/java/org/spongepowered/api/world/generation/feature/FeatureTypes.java
index 0ef992e4dd..0e27af9f61 100644
--- a/src/main/java/org/spongepowered/api/world/generation/feature/FeatureTypes.java
+++ b/src/main/java/org/spongepowered/api/world/generation/feature/FeatureTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class FeatureTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<FeatureType> BAMBOO = FeatureTypes.key(ResourceKey.minecraft("bamboo"));
 
     public static final DefaultedRegistryReference<FeatureType> BASALT_COLUMNS = FeatureTypes.key(ResourceKey.minecraft("basalt_columns"));
@@ -163,7 +162,6 @@ public final class FeatureTypes {
 
     public static final DefaultedRegistryReference<FeatureType> WEEPING_VINES = FeatureTypes.key(ResourceKey.minecraft("weeping_vines"));
 
-    //@formatter:on
     private FeatureTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/Features.java b/src/main/java/org/spongepowered/api/world/generation/feature/Features.java
index 4bdbcb2f4e..3dc1e6b517 100644
--- a/src/main/java/org/spongepowered/api/world/generation/feature/Features.java
+++ b/src/main/java/org/spongepowered/api/world/generation/feature/Features.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class Features {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<Feature> ACACIA = Features.key(ResourceKey.minecraft("acacia"));
 
     public static final DefaultedRegistryReference<Feature> AMETHYST_GEODE = Features.key(ResourceKey.minecraft("amethyst_geode"));
@@ -431,7 +430,6 @@ public final class Features {
 
     public static final DefaultedRegistryReference<Feature> WEEPING_VINES = Features.key(ResourceKey.minecraft("weeping_vines"));
 
-    //@formatter:on
     private Features() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeatures.java b/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeatures.java
index 7b5517d9fb..745696b9b9 100644
--- a/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeatures.java
+++ b/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeatures.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class PlacedFeatures {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<PlacedFeature> ACACIA = PlacedFeatures.key(ResourceKey.minecraft("acacia"));
 
     public static final DefaultedRegistryReference<PlacedFeature> ACACIA_CHECKED = PlacedFeatures.key(ResourceKey.minecraft("acacia_checked"));
@@ -505,7 +504,6 @@ public final class PlacedFeatures {
 
     public static final DefaultedRegistryReference<PlacedFeature> WEEPING_VINES = PlacedFeatures.key(ResourceKey.minecraft("weeping_vines"));
 
-    //@formatter:on
     private PlacedFeatures() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierTypes.java b/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierTypes.java
index 218cf969ca..8746189a9e 100644
--- a/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierTypes.java
+++ b/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class PlacementModifierTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<PlacementModifierType> BIOME = PlacementModifierTypes.key(ResourceKey.minecraft("biome"));
 
     public static final DefaultedRegistryReference<PlacementModifierType> BLOCK_PREDICATE_FILTER = PlacementModifierTypes.key(ResourceKey.minecraft("block_predicate_filter"));
@@ -71,7 +70,6 @@ public final class PlacementModifierTypes {
 
     public static final DefaultedRegistryReference<PlacementModifierType> SURFACE_WATER_DEPTH_FILTER = PlacementModifierTypes.key(ResourceKey.minecraft("surface_water_depth_filter"));
 
-    //@formatter:on
     private PlacementModifierTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/StructureSets.java b/src/main/java/org/spongepowered/api/world/generation/structure/StructureSets.java
index 20a3098447..576335e52d 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/StructureSets.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/StructureSets.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class StructureSets {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<StructureSet> ANCIENT_CITIES = StructureSets.key(ResourceKey.minecraft("ancient_cities"));
 
     public static final DefaultedRegistryReference<StructureSet> BURIED_TREASURES = StructureSets.key(ResourceKey.minecraft("buried_treasures"));
@@ -79,7 +78,6 @@ public final class StructureSets {
 
     public static final DefaultedRegistryReference<StructureSet> WOODLAND_MANSIONS = StructureSets.key(ResourceKey.minecraft("woodland_mansions"));
 
-    //@formatter:on
     private StructureSets() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/StructureTypes.java b/src/main/java/org/spongepowered/api/world/generation/structure/StructureTypes.java
index 9a844f52c5..ed27f62471 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/StructureTypes.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/StructureTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class StructureTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<StructureType> BURIED_TREASURE = StructureTypes.key(ResourceKey.minecraft("buried_treasure"));
 
     public static final DefaultedRegistryReference<StructureType> DESERT_PYRAMID = StructureTypes.key(ResourceKey.minecraft("desert_pyramid"));
@@ -73,7 +72,6 @@ public final class StructureTypes {
 
     public static final DefaultedRegistryReference<StructureType> WOODLAND_MANSION = StructureTypes.key(ResourceKey.minecraft("woodland_mansion"));
 
-    //@formatter:on
     private StructureTypes() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/Structures.java b/src/main/java/org/spongepowered/api/world/generation/structure/Structures.java
index df5705c403..c97bcb128a 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/Structures.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/Structures.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class Structures {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<Structure> ANCIENT_CITY = Structures.key(ResourceKey.minecraft("ancient_city"));
 
     public static final DefaultedRegistryReference<Structure> BASTION_REMNANT = Structures.key(ResourceKey.minecraft("bastion_remnant"));
@@ -107,7 +106,6 @@ public final class Structures {
 
     public static final DefaultedRegistryReference<Structure> VILLAGE_TAIGA = Structures.key(ResourceKey.minecraft("village_taiga"));
 
-    //@formatter:on
     private Structures() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPools.java b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPools.java
index 1a2d5c8289..5606fe0a82 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPools.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPools.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class JigsawPools {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<JigsawPool> ANCIENT_CITY_CITY_ENTRANCE = JigsawPools.key(ResourceKey.minecraft("ancient_city/city/entrance"));
 
     public static final DefaultedRegistryReference<JigsawPool> ANCIENT_CITY_CITY_CENTER = JigsawPools.key(ResourceKey.minecraft("ancient_city/city_center"));
@@ -323,7 +322,6 @@ public final class JigsawPools {
 
     public static final DefaultedRegistryReference<JigsawPool> VILLAGE_TAIGA_ZOMBIE_VILLAGERS = JigsawPools.key(ResourceKey.minecraft("village/taiga/zombie/villagers"));
 
-    //@formatter:on
     private JigsawPools() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorLists.java b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorLists.java
index 553ff49a31..5a7e0a249d 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorLists.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorLists.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class ProcessorLists {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<ProcessorList> ANCIENT_CITY_GENERIC_DEGRADATION = ProcessorLists.key(ResourceKey.minecraft("ancient_city_generic_degradation"));
 
     public static final DefaultedRegistryReference<ProcessorList> ANCIENT_CITY_START_DEGRADATION = ProcessorLists.key(ResourceKey.minecraft("ancient_city_start_degradation"));
@@ -119,7 +118,6 @@ public final class ProcessorLists {
 
     public static final DefaultedRegistryReference<ProcessorList> ZOMBIE_TAIGA = ProcessorLists.key(ResourceKey.minecraft("zombie_taiga"));
 
-    //@formatter:on
     private ProcessorLists() {
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorTypes.java b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorTypes.java
index f669ae8a01..d48b847c38 100644
--- a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorTypes.java
+++ b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorTypes.java
@@ -40,7 +40,6 @@
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class ProcessorTypes {
 
-    //@formatter:off
     public static final DefaultedRegistryReference<ProcessorType> BLACKSTONE_REPLACE = ProcessorTypes.key(ResourceKey.minecraft("blackstone_replace"));
 
     public static final DefaultedRegistryReference<ProcessorType> BLOCK_AGE = ProcessorTypes.key(ResourceKey.minecraft("block_age"));
@@ -63,7 +62,6 @@ public final class ProcessorTypes {
 
     public static final DefaultedRegistryReference<ProcessorType> RULE = ProcessorTypes.key(ResourceKey.minecraft("rule"));
 
-    //@formatter:on
     private ProcessorTypes() {
     }