From b2216ba4ebe77b96e059441fbd2a067746e948bb Mon Sep 17 00:00:00 2001
From: Morpheus <ImMorpheus@users.noreply.github.com>
Date: Sun, 28 Mar 2021 12:07:15 +0000
Subject: [PATCH] Update checkstyle and fix style issues (#2237)

---
 checkstyle-suppressions.xml                   |  35 +-
 checkstyle.xml                                | 365 +++++++++++++++++-
 extra/ideal-checkstyle.xml                    | 279 -------------
 .../java/org/spongepowered/api/Client.java    |   2 +-
 .../java/org/spongepowered/api/Engine.java    |   1 +
 src/main/java/org/spongepowered/api/Game.java |   2 +-
 .../java/org/spongepowered/api/Server.java    |   4 +-
 .../api/UnsupportedEngineException.java       |   8 +-
 .../api/advancement/Advancement.java          |   2 +-
 .../api/advancement/AdvancementTypes.java     |   2 +-
 .../criteria/trigger/Triggers.java            |   2 +-
 .../org/spongepowered/api/asset/Asset.java    |   4 +-
 .../api/block/BlockSnapshot.java              |   2 +-
 .../spongepowered/api/block/BlockType.java    |   1 +
 .../spongepowered/api/block/BlockTypes.java   |   2 +-
 .../api/block/entity/BlockEntity.java         |   2 +-
 .../api/block/entity/BlockEntityTypes.java    |   2 +-
 .../api/block/entity/CommandBlock.java        |   2 +-
 .../api/block/entity/Comparator.java          |   1 +
 .../api/block/entity/Jukebox.java             |   1 +
 .../api/block/entity/NameableBlockEntity.java |   2 +
 .../api/block/entity/Piston.java              |   2 +
 .../api/block/entity/StructureBlock.java      |   9 +
 .../block/entity/carrier/BrewingStand.java    |   1 +
 .../api/block/entity/carrier/chest/Chest.java |   1 +
 .../transaction/BlockTransactionReceipt.java  |   3 +-
 .../api/block/transaction/Operations.java     |   2 +-
 .../api/command/CommandResults.java           |   4 +-
 .../command/parameter/CommonParameters.java   |  14 +-
 .../ClientCompletionTypes.java                |   2 +-
 .../standard/VariableValueParameters.java     |   5 +-
 .../registrar/tree/ClientCompletionKeys.java  |   2 +-
 .../selector/SelectorSortAlgorithms.java      |   2 +-
 .../api/command/selector/SelectorTypes.java   |   2 +-
 .../DataRegistrationNotFoundException.java    |   4 +-
 .../api/data/DataTransactionResult.java       |   5 +-
 .../data/ImmutableDataProviderBuilder.java    |   3 +
 .../java/org/spongepowered/api/data/Keys.java |   4 +-
 .../api/data/MutableDataProviderBuilder.java  |  10 +
 .../data/persistence/AbstractDataBuilder.java |   2 +-
 .../api/data/persistence/DataFormats.java     |   2 +-
 .../api/data/persistence/DataStore.java       |   2 +-
 .../api/data/persistence/DataView.java        |   4 +-
 .../api/data/type/ArmorMaterials.java         |   2 +-
 .../spongepowered/api/data/type/ArtTypes.java |   2 +-
 .../api/data/type/AttachmentSurfaces.java     |   2 +-
 .../api/data/type/BannerPatternShapes.java    |   2 +-
 .../api/data/type/BoatTypes.java              |   2 +-
 .../api/data/type/BodyParts.java              |   2 +-
 .../spongepowered/api/data/type/CatTypes.java |   2 +-
 .../api/data/type/ChestAttachmentTypes.java   |   2 +-
 .../api/data/type/ComparatorModes.java        |   2 +-
 .../api/data/type/DoorHinges.java             |   2 +-
 .../api/data/type/DyeColors.java              |   2 +-
 .../spongepowered/api/data/type/FoxTypes.java |   2 +-
 .../api/data/type/HandPreferences.java        |   2 +-
 .../api/data/type/HandTypes.java              |   2 +-
 .../api/data/type/HorseColors.java            |   2 +-
 .../api/data/type/HorseStyles.java            |   2 +-
 .../api/data/type/InstrumentTypes.java        |   2 +-
 .../api/data/type/ItemTiers.java              |   2 +-
 .../api/data/type/LlamaTypes.java             |   2 +-
 .../api/data/type/MooshroomTypes.java         |   2 +-
 .../api/data/type/NotePitches.java            |   2 +-
 .../api/data/type/PandaGenes.java             |   2 +-
 .../api/data/type/ParrotTypes.java            |   2 +-
 .../api/data/type/PhantomPhases.java          |   2 +-
 .../api/data/type/PickupRules.java            |   2 +-
 .../api/data/type/PistonTypes.java            |   2 +-
 .../api/data/type/PortionTypes.java           |   2 +-
 .../api/data/type/ProfessionTypes.java        |   2 +-
 .../api/data/type/RabbitTypes.java            |   2 +-
 .../api/data/type/RaidStatuses.java           |   2 +-
 .../api/data/type/RailDirections.java         |   2 +-
 .../api/data/type/SkinParts.java              |   2 +-
 .../api/data/type/SlabPortions.java           |   2 +-
 .../api/data/type/SpellTypes.java             |   2 +-
 .../api/data/type/StairShapes.java            |   2 +-
 .../api/data/type/StructureModes.java         |   2 +-
 .../api/data/type/TropicalFishShape.java      |   1 +
 .../api/data/type/TropicalFishShapes.java     |   2 +-
 .../api/data/type/VillagerTypes.java          |   2 +-
 .../api/data/type/WireAttachmentTypes.java    |   2 +-
 .../api/effect/particle/ParticleOptions.java  |   2 +-
 .../api/effect/particle/ParticleTypes.java    |   2 +-
 .../api/effect/potion/PotionEffectTypes.java  |   2 +-
 .../api/effect/sound/SoundTypes.java          |   2 +-
 .../api/effect/sound/music/MusicDiscs.java    |   2 +-
 .../api/entity/AreaEffectCloud.java           |  11 +
 .../org/spongepowered/api/entity/Entity.java  |  16 +-
 .../api/entity/EntityArchetype.java           |   2 +
 .../api/entity/EntityPredicates.java          |   2 +-
 .../api/entity/EntitySnapshot.java            |   2 +-
 .../spongepowered/api/entity/EntityType.java  |   4 +
 .../spongepowered/api/entity/EntityTypes.java |   2 +-
 .../api/entity/ExperienceOrb.java             |   1 +
 .../api/entity/FallingBlock.java              |   7 +
 .../org/spongepowered/api/entity/Item.java    |   1 +
 .../api/entity/ai/goal/GoalBuilder.java       |   3 +-
 .../api/entity/ai/goal/GoalExecutorTypes.java |   2 +-
 .../api/entity/ai/goal/GoalTypes.java         |   2 +-
 .../api/entity/attribute/AttributeHolder.java |   2 +
 .../entity/attribute/AttributeOperations.java |   2 +-
 .../entity/attribute/type/AttributeTypes.java |   2 +-
 .../api/entity/explosive/EndCrystal.java      |   2 +
 .../api/entity/explosive/Explosive.java       |   1 +
 .../explosive/fused/FusedExplosive.java       |   2 +
 .../api/entity/hanging/ItemFrame.java         |   2 +
 .../api/entity/hanging/Painting.java          |   1 +
 .../api/entity/living/Ageable.java            |   2 +
 .../api/entity/living/ArmorStand.java         |   6 +
 .../api/entity/living/Humanoid.java           |   4 +
 .../api/entity/living/Living.java             |  13 +
 .../api/entity/living/animal/Animal.java      |   4 +
 .../api/entity/living/animal/Cat.java         |   2 +
 .../api/entity/living/animal/Chicken.java     |   1 +
 .../api/entity/living/animal/Fox.java         |  10 +
 .../api/entity/living/animal/Ocelot.java      |   1 +
 .../api/entity/living/animal/Panda.java       |   5 +
 .../api/entity/living/animal/Parrot.java      |   1 +
 .../api/entity/living/animal/Sheep.java       |   2 +
 .../api/entity/living/animal/Sittable.java    |   1 +
 .../entity/living/animal/TameableAnimal.java  |   1 +
 .../api/entity/living/animal/Turtle.java      |   6 +
 .../entity/living/animal/cow/Mooshroom.java   |   1 +
 .../entity/living/animal/horse/PackHorse.java |   1 +
 .../animal/horse/llama/TraderLlama.java       |   1 +
 .../api/entity/living/aquatic/Dolphin.java    |   2 +
 .../aquatic/fish/school/TropicalFish.java     |   3 +
 .../api/entity/living/golem/IronGolem.java    |   1 +
 .../api/entity/living/golem/Shulker.java      |   2 +
 .../api/entity/living/monster/Blaze.java      |   1 +
 .../api/entity/living/monster/Creeper.java    |   1 +
 .../api/entity/living/monster/Enderman.java   |   1 +
 .../api/entity/living/monster/Endermite.java  |   1 +
 .../api/entity/living/monster/Patroller.java  |   3 +
 .../api/entity/living/monster/Phantom.java    |   2 +
 .../api/entity/living/monster/Vex.java        |   1 +
 .../api/entity/living/monster/boss/Boss.java  |   1 +
 .../entity/living/monster/boss/Wither.java    |   2 +-
 .../monster/boss/dragon/EnderDragon.java      |   1 +
 .../boss/dragon/phase/DragonPhaseTypes.java   |   2 +-
 .../living/monster/guardian/Guardian.java     |   4 +-
 .../entity/living/monster/raider/Ravager.java |   3 +
 .../monster/raider/illager/Vindicator.java    |   1 +
 .../raider/illager/spellcaster/Evoker.java    |   1 +
 .../living/monster/skeleton/SkeletonLike.java |   2 +-
 .../entity/living/monster/slime/Slime.java    |   1 +
 .../entity/living/monster/spider/Spider.java  |   3 +-
 .../living/monster/zombie/ZombieVillager.java |   2 +
 .../monster/zombie/ZombifiedPiglin.java       |   1 +
 .../living/player/PlayerChatRouter.java       |   2 +-
 .../living/player/chat/ChatVisibilities.java  |   2 +-
 .../living/player/gamemode/GameModes.java     |   2 +-
 .../living/player/server/ServerPlayer.java    |  11 +-
 .../api/entity/living/trader/Trader.java      |   1 +
 .../api/entity/living/trader/Villager.java    |   2 +
 .../entity/projectile/DamagingProjectile.java |   1 +
 .../projectile/EntityTargetingProjectile.java |   1 +
 .../api/entity/projectile/EyeOfEnder.java     |   1 +
 .../api/entity/projectile/FishingBobber.java  |   1 +
 .../api/entity/projectile/Projectile.java     |   1 +
 .../api/entity/projectile/ShulkerBullet.java  |   1 +
 .../entity/projectile/arrow/ArrowEntity.java  |   2 +
 .../projectile/explosive/FireworkRocket.java  |   1 +
 .../explosive/fireball/FireballEntity.java    |   1 +
 .../api/entity/vehicle/Boat.java              |   6 +
 .../minecart/BlockOccupiedMinecart.java       |   1 +
 .../vehicle/minecart/FurnaceMinecart.java     |   1 +
 .../entity/vehicle/minecart/MinecartLike.java |   5 +
 .../api/entity/weather/WeatherEffect.java     |   2 +
 .../org/spongepowered/api/event/Cause.java    |   5 +-
 .../spongepowered/api/event/EventContext.java |   6 +-
 .../api/event/EventContextKeys.java           |   2 +-
 .../api/event/action/CreateMapEvent.java      |  11 +-
 .../api/event/advancement/CriterionEvent.java |   2 +-
 .../event/block/NotifyNeighborBlockEvent.java |   2 +-
 .../api/event/block/entity/BrewingEvent.java  |   2 +
 .../event/block/entity/ChangeSignEvent.java   |   2 +
 .../api/event/cause/entity/DismountTypes.java |   2 +-
 .../api/event/cause/entity/MovementTypes.java |   2 +-
 .../api/event/cause/entity/SpawnTypes.java    |   2 +-
 .../cause/entity/damage/DamageFunction.java   |   2 +-
 .../entity/damage/DamageModifierTypes.java    |   2 +-
 .../cause/entity/damage/DamageTypes.java      |   2 +-
 .../event/command/ExecuteCommandEvent.java    |   2 +-
 .../api/event/entity/AffectEntityEvent.java   |  14 +-
 .../api/event/entity/DamageEntityEvent.java   |   2 +-
 .../api/event/entity/ai/goal/GoalEvent.java   |   2 +-
 .../PlayerChangeClientSettingsEvent.java      |   2 +-
 .../entity/AbstractAffectEntityEvent.java     |   4 +-
 .../entity/AbstractDamageEntityEvent.java     |   6 +-
 .../impl/entity/AbstractModifierEvent.java    |  10 +-
 .../item/inventory/AffectItemStackEvent.java  |   2 +-
 .../event/item/inventory/AffectSlotEvent.java |   2 +-
 .../api/event/message/PlayerChatEvent.java    |   3 +-
 .../api/event/user/BanUserEvent.java          |   2 +-
 .../api/event/user/PardonUserEvent.java       |   2 +-
 .../api/event/world/ExplosionEvent.java       |   2 +-
 .../spongepowered/api/fluid/FluidState.java   |   2 +-
 .../spongepowered/api/fluid/FluidTypes.java   |   2 +-
 .../api/item/FireworkShapes.java              |   2 +-
 .../org/spongepowered/api/item/ItemTypes.java |   2 +-
 .../item/enchantment/EnchantmentTypes.java    |   2 +-
 .../api/item/inventory/ContainerTypes.java    |   2 +-
 .../api/item/inventory/ItemStack.java         |   4 +
 .../inventory/ItemStackBuilderPopulators.java |  10 +-
 .../inventory/equipment/EquipmentGroups.java  |   2 +-
 .../equipment/EquipmentInventory.java         |   8 +-
 .../inventory/equipment/EquipmentTypes.java   |   2 +-
 .../api/item/inventory/menu/ClickTypes.java   |   2 +-
 .../menu/handler/SlotClickHandler.java        |   2 +-
 .../api/item/inventory/query/QueryTypes.java  |   2 +-
 .../inventory/type/ViewableInventory.java     |   4 +-
 .../api/item/merchant/TradeOffer.java         |   2 +-
 .../api/item/potion/PotionTypes.java          |   2 +-
 .../spongepowered/api/item/recipe/Recipe.java |   2 +-
 .../api/item/recipe/RecipeRegistration.java   |   2 +-
 .../api/item/recipe/RecipeTypes.java          |   2 +-
 .../item/recipe/crafting/RecipeResult.java    |   2 +-
 .../org/spongepowered/api/map/MapStorage.java |  50 +--
 .../api/map/color/MapShades.java              |  24 +-
 .../api/map/decoration/MapDecoration.java     |   3 +
 .../decoration/MapDecorationBannerType.java   |  11 +-
 .../MapDecorationOrientations.java            |  46 +--
 .../channel/packet/RequestPacketHandler.java  |   2 +-
 .../channel/packet/ResponsePacketHandler.java |   2 +-
 .../network/channel/raw/RawDataChannel.java   |   2 +-
 .../RawHandshakeDataRequestHandler.java       |   3 +-
 .../channel/raw/play/RawPlayDataHandler.java  |   2 +-
 .../api/placeholder/PlaceholderParsers.java   |   2 +-
 .../java/org/spongepowered/api/raid/Raid.java |   2 +-
 .../spongepowered/api/registry/Registry.java  |   2 +
 .../api/registry/RegistryTypes.java           |   4 +-
 .../api/scheduler/TaskPriorities.java         |   2 +-
 .../api/scoreboard/CollisionRules.java        |   2 +-
 .../api/scoreboard/Visibilities.java          |   2 +-
 .../api/scoreboard/criteria/Criteria.java     |   2 +-
 .../scoreboard/displayslot/DisplaySlots.java  |   2 +-
 .../displaymode/ObjectiveDisplayModes.java    |   2 +-
 .../api/service/ban/BanTypes.java             |   2 +-
 .../service/context/ContextCalculator.java    |   4 +-
 .../account/AccountDeletionResultTypes.java   |   2 +-
 .../economy/transaction/TransactionTypes.java |   2 +-
 .../service/permission/MemorySubjectData.java |  28 +-
 .../api/service/permission/NodeTree.java      |  18 +-
 .../service/permission/SubjectCollection.java |   4 +-
 .../org/spongepowered/api/sql/SqlManager.java |   1 -
 .../api/state/BooleanStateProperties.java     |   2 +-
 .../api/state/EnumStateProperties.java        |   2 +-
 .../api/state/IntegerStateProperties.java     |   2 +-
 .../api/statistic/Statistics.java             |   2 +-
 .../java/org/spongepowered/api/util/Axis.java |   6 +-
 .../api/util/BlockReaderAwareMatcher.java     |   4 +-
 .../org/spongepowered/api/util/Coerce.java    | 108 +++---
 .../spongepowered/api/util/Functional.java    |   4 +-
 .../api/util/InformativeMain.java             |   4 +-
 .../spongepowered/api/util/TypeTokens.java    |   4 +-
 .../api/util/mirror/Mirrors.java              |   2 +-
 .../api/util/orientation/Orientations.java    |   2 +-
 .../api/util/rotation/Rotations.java          |   2 +-
 .../api/util/weighted/ChanceTable.java        |  10 +-
 .../api/util/weighted/EmptyObject.java        |   4 +-
 .../api/util/weighted/RandomObjectTable.java  |   6 +-
 .../util/weighted/SeededVariableAmount.java   |   2 +-
 .../api/util/weighted/WeightedTable.java      |  26 +-
 .../api/world/BlockChangeFlag.java            |   1 +
 .../api/world/ChunkRegenerateFlags.java       |   2 +-
 .../spongepowered/api/world/HeightTypes.java  |   2 +-
 .../spongepowered/api/world/LightTypes.java   |   2 +-
 .../spongepowered/api/world/ProtoWorld.java   |   3 +-
 .../spongepowered/api/world/WorldType.java    |   4 +
 .../api/world/biome/BiomeAttributes.java      |   5 +
 .../spongepowered/api/world/biome/Biomes.java |   2 +-
 .../api/world/chunk/ChunkStates.java          |   2 +-
 .../api/world/difficulty/Difficulties.java    |   2 +-
 .../api/world/explosion/Explosion.java        |   2 +-
 .../api/world/gamerule/GameRules.java         |   2 +-
 .../world/generation/GenerationRegion.java    |   4 +-
 .../api/world/portal/PortalTypes.java         |   2 +-
 .../api/world/schematic/Palette.java          |   2 +-
 .../api/world/server/ServerLocation.java      |   2 +-
 .../api/world/server/ServerWorld.java         |   2 +-
 .../api/world/server/WorldManager.java        |   3 +
 .../world/teleport/TeleportHelperFilters.java |   2 +-
 .../api/world/volume/block/BlockVolume.java   |   2 +-
 .../api/world/volume/game/ChunkVolume.java    |   2 +-
 .../world/volume/stream/StreamOptions.java    |   1 +
 .../volume/stream/VolumeApplicators.java      |   2 +-
 .../world/volume/stream/VolumeCollectors.java |   2 +-
 .../world/volume/stream/VolumeElement.java    |   6 +-
 .../api/world/volume/stream/VolumeStream.java |   2 +-
 .../api/world/weather/Weather.java            |   1 +
 .../api/world/weather/WeatherTypes.java       |   2 +-
 294 files changed, 1028 insertions(+), 730 deletions(-)
 delete mode 100644 extra/ideal-checkstyle.xml

diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 98c15c566..5c677e151 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suppressions PUBLIC
-        "-//Puppy Crawl//DTD Suppressions 1.2//EN"
-        "http://checkstyle.sourceforge.net/dtds/suppressions_1_2.dtd">
+        "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+        "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
-    <suppress checks="JavadocMethod|SummaryJavadoc|AvoidEscapedUnicodeCharacters" files="src[\\/]test[\\/]java[\\/].*"/>
-    <suppress checks="Indentation" files="package-info\.java"/>
-    <suppress checks="AbbreviationAsWordInName" files="AI"/>
-    <suppress checks="AbbreviationAsWordInName" files="TNT"/>
-    <suppress checks="AbbreviationAsWordInName" files="PVP"/>
-    <suppress checks="AbbreviationAsWordInName" files="PEBKAC"/>
-    <suppress checks="AbbreviationAsWordInName" files="AABB"/>
-    <suppress checks=".*" files="SpongeEventFactory\.java"/>
-    <suppress checks="LineLength" files="IntegerTraits\.java"/>
-    <suppress checks="LineLength" files="BooleanTraits\.java"/>
-    <suppress checks="LineLength" files="SoundTypes\.java"/>
-    <suppress checks="LineLength" files="CraftingRecipes\.java"/>
-    <suppress checks="LineLength" files="QueryTypes\.java"/>
-    <suppress checks="LineLength" files="Keys\.java"/>
-    <suppress checks="LineLength|OneStatementPerLine|WhitespaceAround" files="TypeTokens\.java"/>
-    <suppress checks="AvoidStarImport" files="Keys\.java"/>
-    <suppress checks="AvoidStarImport" files="CatalogEntityData\.java"/>
-    <suppress checks="AvoidStarImport" files="CatalogTypes\.java"/>
+    <suppress checks="LineLength"/>
+    <suppress checks="SummaryJavadoc"/>
+    <suppress checks="MissingJavadocType"/>
+    <suppress checks="MissingJavadocMethod"/>
+    <suppress checks="OverloadMethodsDeclarationOrder"/>
+    <suppress checks="RequireEmptyLineBeforeBlockTagGroup"/>
+    <suppress checks="JavadocParagraph"/>
+    <suppress checks="JavadocTagContinuationIndentation"/>
+    <suppress checks="NonEmptyAtclauseDescription"/>
+    <suppress checks="AbbreviationAsWordInName"/>
+    <suppress checks="MethodTypeParameterName"/>
+    <suppress checks="CommentsIndentation"/>
+    <suppress checks="InterfaceTypeParameterName"/>
 </suppressions>
diff --git a/checkstyle.xml b/checkstyle.xml
index a02a4b107..55c6ceef4 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html.
+    that can be found at https://google.github.io/styleguide/javaguide.html
 
     Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.sf.net (or in your downloaded distribution).
+    http://checkstyle.org (or in your downloaded distribution).
 
     To completely disable a check, just comment it out or delete it from the file.
+    To suppress certain violations please review suppression filters.
 
     Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
  -->
@@ -18,24 +19,360 @@
 <module name = "Checker">
     <property name="charset" value="UTF-8"/>
 
-    <!--<property name="severity" value="warning"/>-->
-    <property name="severity" value="${severity}"/>
+    <property name="severity" value="warning"/>
 
     <property name="fileExtensions" value="java, properties, xml"/>
+    <!-- Excludes all 'module-info.java' files              -->
+    <!-- See https://checkstyle.org/config_filefilters.html -->
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
+    <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
+    <module name="SuppressionFilter">
+        <property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
+                  default="checkstyle-suppressions.xml" />
+        <property name="optional" value="true"/>
+    </module>
+
     <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+    <!-- See http://checkstyle.org/config_whitespace.html -->
     <module name="FileTabCharacter">
         <property name="eachLine" value="true"/>
     </module>
 
+    <module name="LineLength">
+        <property name="fileExtensions" value="java"/>
+        <!-- Sponge - Bump max line length to 150 -->
+        <property name="max" value="150"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
+        <module name="IllegalTokenText">
+            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+            <property name="format"
+                      value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message"
+                      value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+        </module>
+        <module name="AvoidEscapedUnicodeCharacters">
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
+        <module name="AvoidStarImport"/>
+        <module name="OneTopLevelClass"/>
+        <module name="NoLineWrap">
+            <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
+        </module>
+        <module name="EmptyBlock">
+            <property name="option" value="TEXT"/>
+            <property name="tokens"
+                      value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+        </module>
+        <module name="NeedBraces">
+            <property name="tokens"
+                      value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
+        </module>
+        <module name="LeftCurly">
+            <property name="tokens"
+                      value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
+                    INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT,
+                    LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
+                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
+                    OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
+        </module>
+        <module name="RightCurly">
+            <property name="id" value="RightCurlySame"/>
+            <property name="tokens"
+                      value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
+                    LITERAL_DO"/>
+        </module>
+        <module name="RightCurly">
+            <property name="id" value="RightCurlyAlone"/>
+            <property name="option" value="alone"/>
+            <property name="tokens"
+                      value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
+                    INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF, INTERFACE_DEF, RECORD_DEF,
+                    COMPACT_CTOR_DEF"/>
+        </module>
+        <module name="SuppressionXpathSingleFilter">
+            <!-- suppresion is required till https://github.com/checkstyle/checkstyle/issues/7541 -->
+            <property name="id" value="RightCurlyAlone"/>
+            <property name="query" value="//RCURLY[parent::SLIST[count(./*)=1]
+                                     or preceding-sibling::*[last()][self::LCURLY]]"/>
+        </module>
+        <module name="WhitespaceAfter">
+            <property name="tokens"
+                      value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE,
+                    LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, DO_WHILE"/>
+        </module>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="allowEmptyTypes" value="true"/>
+            <property name="allowEmptyLoops" value="true"/>
+            <property name="ignoreEnhancedForColon" value="false"/>
+            <property name="tokens"
+                      value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
+                    BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND,
+                    LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
+                    LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
+                    LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
+                    NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
+                    SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
+            <message key="ws.notFollowed"
+                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+            <message key="ws.notPreceded"
+                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="OneStatementPerLine"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="FallThrough"/>
+        <module name="UpperEll"/>
+        <module name="ModifierOrder"/>
+        <module name="EmptyLineSeparator">
+            <!-- Sponge - Allow NoEmptyLine for PACKAGE_DEF -->
+            <property name="tokens"
+                      value="IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                    STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF,
+                    COMPACT_CTOR_DEF"/>
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapDot"/>
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapComma"/>
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/259 -->
+            <property name="id" value="SeparatorWrapEllipsis"/>
+            <property name="tokens" value="ELLIPSIS"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/258 -->
+            <property name="id" value="SeparatorWrapArrayDeclarator"/>
+            <property name="tokens" value="ARRAY_DECLARATOR"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapMethodRef"/>
+            <property name="tokens" value="METHOD_REF"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+            <message key="name.invalidPattern"
+                     value="Package name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="TypeName">
+            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                    ANNOTATION_DEF, RECORD_DEF"/>
+            <message key="name.invalidPattern"
+                     value="Type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MemberName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern"
+                     value="Member name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ParameterName">
+            <!-- Sponge - Allow x or xTo -->
+            <property name="format" value="^[a-z]([a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LambdaParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="CatchParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LocalVariableName">
+            <!-- Sponge - Allow x or xTo -->
+            <property name="format" value="^[a-z]([a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="PatternVariableName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="RecordComponentName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Record component name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="RecordTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Record type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="InterfaceTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="NoFinalizer"/>
+        <module name="GenericWhitespace">
+            <message key="ws.followed"
+                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+            <message key="ws.preceded"
+                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+            <message key="ws.illegalFollow"
+                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+            <message key="ws.notPreceded"
+                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="Indentation">
+            <!-- Sponge - Bump basicOffset to 4 -->
+            <property name="basicOffset" value="4"/>
+            <!--      Sponge - TODO-->
+<!--            <property name="braceAdjustment" value="2"/>-->
+<!--            <property name="caseIndent" value="2"/>-->
+<!--            <property name="throwsIndent" value="4"/>-->
+<!--            <property name="lineWrappingIndentation" value="4"/>-->
+<!--            <property name="arrayInitIndent" value="2"/>-->
+        </module>
+        <module name="AbbreviationAsWordInName">
+            <property name="ignoreFinal" value="false"/>
+            <property name="allowedAbbreviationLength" value="0"/>
+            <property name="tokens"
+                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
+                    PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
+                    RECORD_COMPONENT_DEF"/>
+        </module>
+        <module name="OverloadMethodsDeclarationOrder"/>
+        <module name="VariableDeclarationUsageDistance"/>
+        <module name="CustomImportOrder">
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+            <property name="separateLineBetweenGroups" value="true"/>
+            <!-- Sponge - Custom import order -->
+            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS"/>
+            <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
+        </module>
+        <module name="MethodParamPad">
+            <property name="tokens"
+                      value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
+                    SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
+        </module>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens"
+                      value="COMMA, SEMI, POST_INC, POST_DEC, DOT,
+                    LABELED_STAT, METHOD_REF"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+        <module name="ParenPad">
+            <property name="tokens"
+                      value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
+                    EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW,
+                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
+                    METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA,
+                    RECORD_DEF"/>
+        </module>
+        <module name="OperatorWrap">
+            <property name="option" value="NL"/>
+            <property name="tokens"
+                      value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
+                    LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF,
+                    TYPE_EXTENSION_AND "/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationMostCases"/>
+            <property name="tokens"
+                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF,
+                      RECORD_DEF, COMPACT_CTOR_DEF"/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationVariables"/>
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="allowSamelineMultipleAnnotations" value="true"/>
+        </module>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="InvalidJavadocPosition"/>
+        <module name="JavadocTagContinuationIndentation"/>
+        <module name="SummaryJavadoc">
+            <property name="forbiddenSummaryFragments"
+                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+        </module>
+        <module name="JavadocParagraph"/>
+        <module name="RequireEmptyLineBeforeBlockTagGroup"/>
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+            <property name="target"
+                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+        </module>
+        <module name="JavadocMethod">
+            <property name="scope" value="public"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
+        </module>
+        <module name="MissingJavadocMethod">
+            <property name="scope" value="public"/>
+            <property name="minLineCount" value="2"/>
+            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,
+                                   COMPACT_CTOR_DEF"/>
+        </module>
+        <module name="MissingJavadocType">
+            <property name="scope" value="protected"/>
+            <property name="tokens"
+                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                      RECORD_DEF, ANNOTATION_DEF"/>
+            <property name="excludeScope" value="nothing"/>
+        </module>
+        <module name="MethodName">
+            <!-- Sponge - Allow y or yScale -->
+            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
+            <message key="name.invalidPattern"
+                     value="Method name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="SingleLineJavadoc"/>
+        <module name="EmptyCatchBlock">
+            <!-- Sponge - expected -> ignored -->
+            <property name="exceptionVariableName" value="ignored"/>
+        </module>
+        <module name="CommentsIndentation">
+            <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
+        </module>
+        <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
+        <module name="SuppressionXpathFilter">
+            <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
+                      default="checkstyle-xpath-suppressions.xml" />
+            <property name="optional" value="true"/>
+        </module>
+        <!--Sponge - start-->
+        <module name="RequireThis">
+            <property name="checkMethods" value="true"/>
+            <property name="checkFields" value="true"/>
+        </module>
+        <module name="FinalLocalVariable"/>
     </module>
-
-    <module name="NewlineAtEndOfFile"/>
-    <module name="SuppressionFilter">
-        <property name="file" value="${suppressions}"/>
-    </module>
-
-    <property name="basedir" value="${basedir}"/>
 </module>
diff --git a/extra/ideal-checkstyle.xml b/extra/ideal-checkstyle.xml
deleted file mode 100644
index 3e6cf7655..000000000
--- a/extra/ideal-checkstyle.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
-
-<!--
-    Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html.
-
-    Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.sf.net (or in your downloaded distribution).
-
-    To completely disable a check, just comment it out or delete it from the file.
-
-    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
- -->
-
-<module name = "Checker">
-    <property name="charset" value="UTF-8"/>
-
-    <!--<property name="severity" value="warning"/>-->
-    <property name="severity" value="${severity}"/>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
-    </module>
-
-    <module name="TreeWalker">
-        <module name="OuterTypeFilename"/>
-        <module name="IllegalTokenText">
-            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format" value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message" value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
-        </module>
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-        </module>
-        <module name="LineLength">
-            <property name="id" value="LineLengthCode"/>
-            <property name="max" value="150"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-            <message key="maxLineLen" value="Code line is longer than {0,number,integer} characters (found {1,number,integer})."/>
-        </module>
-        <module name="LineLength">
-            <property name="id" value="LineLengthComment"/>
-            <property name="max" value="80"/>
-            <property name="ignorePattern" value="^[ \t]*([a-zA-Z0-9\{\}\+\|\&amp;\&quot;@\(\)&gt;&lt;\.]|//)|@link|@see"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-            <message key="maxLineLen" value="Comment line is longer than {0,number,integer} characters (found {1,number,integer})."/>
-        </module>
-        <module name="AvoidStarImport"/>
-        <module name="OneTopLevelClass"/>
-        <module name="NoLineWrap"/>
-        <module name="EmptyBlock">
-            <property name="option" value="TEXT"/>
-            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-        </module>
-        <module name="NeedBraces"/>
-        <module name="LeftCurly"/>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlySame"/>
-            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlyAlone"/>
-            <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <message key="ws.notFollowed"
-                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-            <message key="ws.notPreceded"
-                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="OneStatementPerLine"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="ArrayTypeStyle"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="FallThrough"/>
-        <module name="UpperEll"/>
-        <module name="ModifierOrder"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-
-            <!-- No new line after the license header -->
-            <property name="tokens" value="IMPORT, CLASS_DEF, ENUM_DEF, INTERFACE_DEF, CTOR_DEF, METHOD_DEF, STATIC_INIT, INSTANCE_INIT, VARIABLE_DEF"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapDot"/>
-            <property name="tokens" value="DOT"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapComma"/>
-            <property name="tokens" value="COMMA"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
-            <property name="id" value="SeparatorWrapEllipsis"/>
-            <property name="tokens" value="ELLIPSIS"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
-            <property name="id" value="SeparatorWrapArrayDeclarator"/>
-            <property name="tokens" value="ARRAY_DECLARATOR"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapMethodRef"/>
-            <property name="tokens" value="METHOD_REF"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-            <message key="name.invalidPattern"
-                     value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="TypeName">
-            <message key="name.invalidPattern"
-                     value="Type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MemberName">
-            <!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
-            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Member name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ParameterName">
-            <!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
-            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="CatchParameterName">
-            <!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
-            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LocalVariableName">
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
-            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-            <property name="allowOneCharVarInForLoop" value="true"/>
-            <message key="name.invalidPattern"
-                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|(T[A-Z][a-zA-Z0-9]*$)"/>
-            <message key="name.invalidPattern"
-                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|(T[A-Z][a-zA-Z0-9]*$)"/>
-            <message key="name.invalidPattern"
-                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="InterfaceTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|(T[A-Z][a-zA-Z0-9]*$)"/>
-            <message key="name.invalidPattern"
-                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="NoFinalizer"/>
-        <module name="GenericWhitespace">
-            <message key="ws.followed"
-                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-            <message key="ws.preceded"
-                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-            <message key="ws.illegalFollow"
-                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-            <message key="ws.notPreceded"
-                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="Indentation">
-            <!--<property name="basicOffset" value="2"/>-->
-            <property name="basicOffset" value="4"/>
-            <property name="braceAdjustment" value="0"/>
-            <!--<property name="caseIndent" value="2"/>-->
-            <property name="caseIndent" value="4"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <!--<property name="arrayInitIndent" value="2"/>-->
-            <property name="arrayInitIndent" value="4"/>
-        </module>
-        <module name="AbbreviationAsWordInName">
-            <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="1"/>
-            <property name="allowedAbbreviations" value="AI, UTF, PVP"/>
-        </module>
-        <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="VariableDeclarationUsageDistance"/>
-        <module name="CustomImportOrder">
-            <!--<property name="specialImportsRegExp" value="com.google"/>-->
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
-
-            <property name="thirdPartyPackageRegExp" value=".*"/>
-
-        </module>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceBefore">
-            <property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
-            <property name="allowLineBreaks" value="true"/>
-        </module>
-        <module name="ParenPad"/>
-        <module name="OperatorWrap">
-            <property name="option" value="NL"/>
-            <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationMostCases"/>
-            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationVariables"/>
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="allowSamelineMultipleAnnotations" value="true"/>
-        </module>
-        <module name="NonEmptyAtclauseDescription"/>
-        <module name="JavadocTagContinuationIndentation"/>
-        <module name="SummaryJavadoc">
-            <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-        </module>
-        <module name="JavadocParagraph"/>
-        <module name="AtclauseOrder">
-            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
-            <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-        </module>
-        <module name="JavadocMethod">
-            <property name="scope" value="public"/>
-            <!--
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="2"/>
-            -->
-            <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
-        </module>
-        <module name="MethodName">
-            <!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>-->
-            <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
-            <message key="name.invalidPattern"
-                     value="Method name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="SingleLineJavadoc">
-            <property name="ignoreInlineTags" value="false"/>
-        </module>
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="expected"/>
-        </module>
-        <module name="CommentsIndentation"/>
-
-
-        <module name="RedundantImport"/>
-        <module name="RedundantModifier"/>
-        <module name="RequireThis">
-            <property name="checkMethods" value="false"/>
-        </module>
-    </module>
-
-    <module name="NewlineAtEndOfFile"/>
-    <module name="SuppressionFilter">
-        <property name="file" value="${suppressions}"/>
-    </module>
-
-    <property name="basedir" value="${basedir}"/>
-</module>
diff --git a/src/main/java/org/spongepowered/api/Client.java b/src/main/java/org/spongepowered/api/Client.java
index 079a8035e..297c4fb06 100644
--- a/src/main/java/org/spongepowered/api/Client.java
+++ b/src/main/java/org/spongepowered/api/Client.java
@@ -24,9 +24,9 @@
  */
 package org.spongepowered.api;
 
+import org.spongepowered.api.client.LocalServer;
 import org.spongepowered.api.entity.living.player.client.ClientPlayer;
 import org.spongepowered.api.entity.living.player.client.LocalPlayer;
-import org.spongepowered.api.client.LocalServer;
 import org.spongepowered.api.network.ClientSideConnection;
 import org.spongepowered.api.world.client.ClientWorld;
 
diff --git a/src/main/java/org/spongepowered/api/Engine.java b/src/main/java/org/spongepowered/api/Engine.java
index 895389834..60bab97a8 100644
--- a/src/main/java/org/spongepowered/api/Engine.java
+++ b/src/main/java/org/spongepowered/api/Engine.java
@@ -35,6 +35,7 @@ public interface Engine extends ScopedRegistryHolder {
 
     /**
      * Gets the {@link Game} that launched this engine;
+     *
      * @return The game
      */
     Game game();
diff --git a/src/main/java/org/spongepowered/api/Game.java b/src/main/java/org/spongepowered/api/Game.java
index dcf829536..d2de236fe 100644
--- a/src/main/java/org/spongepowered/api/Game.java
+++ b/src/main/java/org/spongepowered/api/Game.java
@@ -39,9 +39,9 @@ import org.spongepowered.api.registry.GameRegistry;
 import org.spongepowered.api.registry.RegistryHolder;
 import org.spongepowered.api.registry.ScopedRegistryHolder;
 import org.spongepowered.api.scheduler.Scheduler;
+import org.spongepowered.api.service.ServiceProvider;
 import org.spongepowered.api.sql.SqlManager;
 import org.spongepowered.api.util.metric.MetricsConfigManager;
-import org.spongepowered.api.service.ServiceProvider;
 
 import java.nio.file.Path;
 import java.util.Locale;
diff --git a/src/main/java/org/spongepowered/api/Server.java b/src/main/java/org/spongepowered/api/Server.java
index fb20a659f..3df59d261 100644
--- a/src/main/java/org/spongepowered/api/Server.java
+++ b/src/main/java/org/spongepowered/api/Server.java
@@ -33,8 +33,8 @@ import org.spongepowered.api.entity.living.Hostile;
 import org.spongepowered.api.entity.living.animal.Animal;
 import org.spongepowered.api.entity.living.player.gamemode.GameMode;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
-import org.spongepowered.api.map.MapStorage;
 import org.spongepowered.api.event.lifecycle.RegisterCommandEvent;
+import org.spongepowered.api.map.MapStorage;
 import org.spongepowered.api.network.ServerSideConnection;
 import org.spongepowered.api.profile.GameProfileManager;
 import org.spongepowered.api.resourcepack.ResourcePack;
@@ -42,9 +42,9 @@ import org.spongepowered.api.scoreboard.Scoreboard;
 import org.spongepowered.api.service.ServiceProvider;
 import org.spongepowered.api.user.UserManager;
 import org.spongepowered.api.util.locale.LocaleSource;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.difficulty.Difficulty;
 import org.spongepowered.api.world.generation.config.WorldGenerationConfig;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.api.world.server.WorldManager;
 import org.spongepowered.api.world.storage.ChunkLayout;
diff --git a/src/main/java/org/spongepowered/api/UnsupportedEngineException.java b/src/main/java/org/spongepowered/api/UnsupportedEngineException.java
index 06e2cde0f..ba313f066 100644
--- a/src/main/java/org/spongepowered/api/UnsupportedEngineException.java
+++ b/src/main/java/org/spongepowered/api/UnsupportedEngineException.java
@@ -29,9 +29,9 @@ package org.spongepowered.api;
  */
 public class UnsupportedEngineException extends UnsupportedOperationException {
 
-  private static final long serialVersionUID = 5671217624171369435L;
+    private static final long serialVersionUID = 5671217624171369435L;
 
-  public UnsupportedEngineException(final String message) {
-    super(message);
-  }
+    public UnsupportedEngineException(final String message) {
+        super(message);
+    }
 }
diff --git a/src/main/java/org/spongepowered/api/advancement/Advancement.java b/src/main/java/org/spongepowered/api/advancement/Advancement.java
index 17c6e7a12..356aff49a 100644
--- a/src/main/java/org/spongepowered/api/advancement/Advancement.java
+++ b/src/main/java/org/spongepowered/api/advancement/Advancement.java
@@ -28,9 +28,9 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.ResourceKey;
-import org.spongepowered.api.datapack.DataPackSerializable;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.advancement.criteria.AdvancementCriterion;
+import org.spongepowered.api.datapack.DataPackSerializable;
 import org.spongepowered.api.util.ResourceKeyedBuilder;
 
 import java.util.Collection;
diff --git a/src/main/java/org/spongepowered/api/advancement/AdvancementTypes.java b/src/main/java/org/spongepowered/api/advancement/AdvancementTypes.java
index 9f4c573ed..63ab385e2 100644
--- a/src/main/java/org/spongepowered/api/advancement/AdvancementTypes.java
+++ b/src/main/java/org/spongepowered/api/advancement/AdvancementTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.advancement;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all the available {@link AdvancementType}s in Minecraft.
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 02edd02b4..e57366e6f 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
@@ -27,10 +27,10 @@ package org.spongepowered.api.advancement.criteria.trigger;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all the available {@link Trigger}s in minecraft.
diff --git a/src/main/java/org/spongepowered/api/asset/Asset.java b/src/main/java/org/spongepowered/api/asset/Asset.java
index b62641783..f7bff812f 100644
--- a/src/main/java/org/spongepowered/api/asset/Asset.java
+++ b/src/main/java/org/spongepowered/api/asset/Asset.java
@@ -146,9 +146,9 @@ public interface Asset {
      * @return The file name
      */
     default String fileName() {
-        String path = this.url().getPath();
+        final String path = this.url().getPath();
         //We don't need to worry about file system specific file separators as we are dealing with a substring of URL
-        int end = path.lastIndexOf('/');
+        final int end = path.lastIndexOf('/');
         if (end < 0) {
             return path;
         }
diff --git a/src/main/java/org/spongepowered/api/block/BlockSnapshot.java b/src/main/java/org/spongepowered/api/block/BlockSnapshot.java
index a1b17d9f7..82d504803 100644
--- a/src/main/java/org/spongepowered/api/block/BlockSnapshot.java
+++ b/src/main/java/org/spongepowered/api/block/BlockSnapshot.java
@@ -33,8 +33,8 @@ import org.spongepowered.api.data.persistence.DataView;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.world.BlockChangeFlag;
 import org.spongepowered.api.world.LocatableSnapshot;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.schematic.Schematic;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.server.storage.ServerWorldProperties;
 import org.spongepowered.math.vector.Vector3i;
 
diff --git a/src/main/java/org/spongepowered/api/block/BlockType.java b/src/main/java/org/spongepowered/api/block/BlockType.java
index 4cfb3eab2..54be1b2ef 100644
--- a/src/main/java/org/spongepowered/api/block/BlockType.java
+++ b/src/main/java/org/spongepowered/api/block/BlockType.java
@@ -47,6 +47,7 @@ public interface BlockType extends DefaultedRegistryValue, ComponentLike, StateC
 
     /**
      * Return the {@link ItemType} that represents this block.
+     *
      * @return The item type or {@link Optional#empty()} otherwise
      */
     Optional<ItemType> item();
diff --git a/src/main/java/org/spongepowered/api/block/BlockTypes.java b/src/main/java/org/spongepowered/api/block/BlockTypes.java
index d4366c1fa..9181b81b5 100644
--- a/src/main/java/org/spongepowered/api/block/BlockTypes.java
+++ b/src/main/java/org/spongepowered/api/block/BlockTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.block;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all possible {@link BlockType}s in vanilla minecraft.
diff --git a/src/main/java/org/spongepowered/api/block/entity/BlockEntity.java b/src/main/java/org/spongepowered/api/block/entity/BlockEntity.java
index b1eb7b1dd..0b9874c9d 100644
--- a/src/main/java/org/spongepowered/api/block/entity/BlockEntity.java
+++ b/src/main/java/org/spongepowered/api/block/entity/BlockEntity.java
@@ -33,8 +33,8 @@ import org.spongepowered.api.util.mirror.Mirror;
 import org.spongepowered.api.util.rotation.Rotation;
 import org.spongepowered.api.world.Locatable;
 import org.spongepowered.api.world.LocatableBlock;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.schematic.Schematic;
+import org.spongepowered.api.world.server.ServerLocation;
 
 import java.util.function.Supplier;
 
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 d2118dcf7..8343095e0 100644
--- a/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java
+++ b/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.block.entity;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all {@link BlockEntityType}s in vanilla Minecraft.
diff --git a/src/main/java/org/spongepowered/api/block/entity/CommandBlock.java b/src/main/java/org/spongepowered/api/block/entity/CommandBlock.java
index 50340d330..1d3c9bbac 100644
--- a/src/main/java/org/spongepowered/api/block/entity/CommandBlock.java
+++ b/src/main/java/org/spongepowered/api/block/entity/CommandBlock.java
@@ -28,8 +28,8 @@ import net.kyori.adventure.text.Component;
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.service.permission.Subject;
-import org.spongepowered.api.util.locale.LocaleSource;
 import org.spongepowered.api.util.Nameable;
+import org.spongepowered.api.util.locale.LocaleSource;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/spongepowered/api/block/entity/Comparator.java b/src/main/java/org/spongepowered/api/block/entity/Comparator.java
index f0d7c5d65..3b8ca38c4 100644
--- a/src/main/java/org/spongepowered/api/block/entity/Comparator.java
+++ b/src/main/java/org/spongepowered/api/block/entity/Comparator.java
@@ -35,6 +35,7 @@ public interface Comparator extends BlockEntity {
 
     /**
      * {@link Keys#COMPARATOR_MODE}
+     *
      * @return The mode of the Comparator.
      */
     default Value.Mutable<ComparatorMode> mode() {
diff --git a/src/main/java/org/spongepowered/api/block/entity/Jukebox.java b/src/main/java/org/spongepowered/api/block/entity/Jukebox.java
index 7d222d15b..9ac9fdc2a 100644
--- a/src/main/java/org/spongepowered/api/block/entity/Jukebox.java
+++ b/src/main/java/org/spongepowered/api/block/entity/Jukebox.java
@@ -36,6 +36,7 @@ public interface Jukebox extends BlockEntity {
 
     /**
      * {@link Keys#ITEM_STACK_SNAPSHOT}
+     *
      * @return A snapshot of the disc in the jukebox.
      */
     default Value.Mutable<ItemStackSnapshot> item() {
diff --git a/src/main/java/org/spongepowered/api/block/entity/NameableBlockEntity.java b/src/main/java/org/spongepowered/api/block/entity/NameableBlockEntity.java
index ce1a5962d..079a4efd0 100644
--- a/src/main/java/org/spongepowered/api/block/entity/NameableBlockEntity.java
+++ b/src/main/java/org/spongepowered/api/block/entity/NameableBlockEntity.java
@@ -30,12 +30,14 @@ import org.spongepowered.api.data.value.Value;
 
 /**
  * Represents a {@link BlockEntity} which may have a display name.
+ *
  * @see Keys#DISPLAY_NAME
  */
 public interface NameableBlockEntity extends BlockEntity {
 
     /**
      * {@link Keys#DISPLAY_NAME}
+     *
      * @return The display name of this {@link BlockEntity}.
      */
     default Value.Mutable<Component> displayName() {
diff --git a/src/main/java/org/spongepowered/api/block/entity/Piston.java b/src/main/java/org/spongepowered/api/block/entity/Piston.java
index 71d979f84..6894339ed 100644
--- a/src/main/java/org/spongepowered/api/block/entity/Piston.java
+++ b/src/main/java/org/spongepowered/api/block/entity/Piston.java
@@ -39,6 +39,7 @@ public interface Piston extends BlockEntity {
 
     /**
      * {@link Keys#BLOCK_STATE}
+     *
      * @return The BlockState representing the block being pushed.
      */
     default Value.Mutable<BlockState> blockState() {
@@ -47,6 +48,7 @@ public interface Piston extends BlockEntity {
 
     /**
      * {@link Keys#IS_EXTENDED}
+     *
      * @return Whether this piston is extending or retracting.
      */
     default Value.Mutable<Boolean> extending() {
diff --git a/src/main/java/org/spongepowered/api/block/entity/StructureBlock.java b/src/main/java/org/spongepowered/api/block/entity/StructureBlock.java
index 7d39ec3fa..fbde67506 100644
--- a/src/main/java/org/spongepowered/api/block/entity/StructureBlock.java
+++ b/src/main/java/org/spongepowered/api/block/entity/StructureBlock.java
@@ -45,6 +45,7 @@ public interface StructureBlock extends BlockEntity {
 
     /**
      * {@link Keys#STRUCTURE_MODE}
+     *
      * @return The structure mode of this structure block.
      */
     default Value.Mutable<StructureMode> mode() {
@@ -53,6 +54,7 @@ public interface StructureBlock extends BlockEntity {
 
     /**
      * {@link Keys#STRUCTURE_POWERED}
+     *
      * @return Whether this structure block is powered.
      */
     default Value.Mutable<Boolean> powered() {
@@ -74,6 +76,7 @@ public interface StructureBlock extends BlockEntity {
 
     /**
      * {@link Keys#STRUCTURE_SHOW_AIR}
+     *
      * @return Whether the air within the structure should be visible.
      */
     default Value.Mutable<Boolean> showAir() {
@@ -82,6 +85,7 @@ public interface StructureBlock extends BlockEntity {
 
     /**
      * {@link Keys#STRUCTURE_IGNORE_ENTITIES}
+     *
      * @return Whether this structure block should ignore entities.
      */
     default Value.Mutable<Boolean> ignoreEntities() {
@@ -90,6 +94,7 @@ public interface StructureBlock extends BlockEntity {
 
     /**
      * {@link Keys#STRUCTURE_SIZE}
+     *
      * @return The size of the structure.
      */
     default Value.Mutable<Vector3i> size() {
@@ -98,6 +103,7 @@ public interface StructureBlock extends BlockEntity {
 
     /**
      * {@link Keys#STRUCTURE_POSITION}
+     *
      * @return The position of the structure.
      */
     default Value.Mutable<Vector3i> position() {
@@ -106,6 +112,7 @@ public interface StructureBlock extends BlockEntity {
 
     /**
      * {@link Keys#STRUCTURE_SEED}
+     *
      * @return The seed of the structure to be generated.
      */
     default Value.Mutable<Long> seed() {
@@ -114,6 +121,7 @@ public interface StructureBlock extends BlockEntity {
 
     /**
      * {@link Keys#STRUCTURE_INTEGRITY}
+     *
      * @return The integrity of the structure.
      */
     default Value.Mutable<Double> integrity() {
@@ -122,6 +130,7 @@ public interface StructureBlock extends BlockEntity {
 
     /**
      * {@link Keys#STRUCTURE_AUTHOR}
+     *
      * @return The author of the structure loaded by the structure block.
      */
     default Optional<Value.Mutable<String>> author() {
diff --git a/src/main/java/org/spongepowered/api/block/entity/carrier/BrewingStand.java b/src/main/java/org/spongepowered/api/block/entity/carrier/BrewingStand.java
index 7b166dbb3..730db87a5 100644
--- a/src/main/java/org/spongepowered/api/block/entity/carrier/BrewingStand.java
+++ b/src/main/java/org/spongepowered/api/block/entity/carrier/BrewingStand.java
@@ -47,6 +47,7 @@ public interface BrewingStand extends NameableCarrierBlockEntity {
 
     /**
      * {@link Keys#REMAINING_BREW_TIME}
+     *
      * @return The remaining brewing time in ticks.
      */
     default Value.Mutable<Ticks> remainingBrewTime() {
diff --git a/src/main/java/org/spongepowered/api/block/entity/carrier/chest/Chest.java b/src/main/java/org/spongepowered/api/block/entity/carrier/chest/Chest.java
index c5dc8608b..35357eac0 100644
--- a/src/main/java/org/spongepowered/api/block/entity/carrier/chest/Chest.java
+++ b/src/main/java/org/spongepowered/api/block/entity/carrier/chest/Chest.java
@@ -60,6 +60,7 @@ public interface Chest extends NameableCarrierBlockEntity {
 
     /**
      * {@link Keys#CHEST_ATTACHMENT_TYPE}
+     *
      * @return The attachment type of this chest.
      */
     default Value.Mutable<ChestAttachmentType> attachmentType() {
diff --git a/src/main/java/org/spongepowered/api/block/transaction/BlockTransactionReceipt.java b/src/main/java/org/spongepowered/api/block/transaction/BlockTransactionReceipt.java
index 044ca6dd4..bab6a9ce4 100644
--- a/src/main/java/org/spongepowered/api/block/transaction/BlockTransactionReceipt.java
+++ b/src/main/java/org/spongepowered/api/block/transaction/BlockTransactionReceipt.java
@@ -69,7 +69,6 @@ public final class BlockTransactionReceipt implements DataSerializable {
             .set(Queries.CONTENT_VERSION, this.contentVersion())
             .set(Queries.ORIGINAL, this.originalBlock.toContainer())
             .set(Queries.FINAL_REPLACEMENT, this.finalBlock.toContainer())
-            .set(Queries.BLOCK_OPERATION, resourceKey)
-        ;
+            .set(Queries.BLOCK_OPERATION, resourceKey);
     }
 }
diff --git a/src/main/java/org/spongepowered/api/block/transaction/Operations.java b/src/main/java/org/spongepowered/api/block/transaction/Operations.java
index e8b410672..3b29ee8c7 100644
--- a/src/main/java/org/spongepowered/api/block/transaction/Operations.java
+++ b/src/main/java/org/spongepowered/api/block/transaction/Operations.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.block.transaction;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/command/CommandResults.java b/src/main/java/org/spongepowered/api/command/CommandResults.java
index 1bf8862ac..c70d6524f 100644
--- a/src/main/java/org/spongepowered/api/command/CommandResults.java
+++ b/src/main/java/org/spongepowered/api/command/CommandResults.java
@@ -32,12 +32,12 @@ public final class CommandResults {
     /**
      * Indicates that the command executed successfully.
      */
-    public final static CommandResult SUCCESS = CommandResult.builder().result(1).build();
+    public static final CommandResult SUCCESS = CommandResult.builder().result(1).build();
 
     /**
      * Indicates that the command executed but was unable to carry out its task.
      */
-    public final static CommandResult EMPTY = CommandResult.builder().build();
+    public static final CommandResult EMPTY = CommandResult.builder().build();
 
     private CommandResults() {
         throw new AssertionError("You shouldn't be trying to instantiate this");
diff --git a/src/main/java/org/spongepowered/api/command/parameter/CommonParameters.java b/src/main/java/org/spongepowered/api/command/parameter/CommonParameters.java
index 78c7b6584..f72bf4d35 100644
--- a/src/main/java/org/spongepowered/api/command/parameter/CommonParameters.java
+++ b/src/main/java/org/spongepowered/api/command/parameter/CommonParameters.java
@@ -100,7 +100,7 @@ public final class CommonParameters {
      *
      * @see ResourceKeyedValueParameters#WORLD
      */
-    public final static Parameter.Value<ServerWorld> WORLD = Parameter.world().key("world").build();
+    public static final Parameter.Value<ServerWorld> WORLD = Parameter.world().key("world").build();
 
     /**
      * A {@link Parameter.Value} that parses a {@link Boolean} with the key name
@@ -108,7 +108,7 @@ public final class CommonParameters {
      *
      * @see ResourceKeyedValueParameters#BOOLEAN
      */
-    public final static Parameter.Value<Boolean> BOOLEAN = Parameter.bool().key("true/false").build();
+    public static final Parameter.Value<Boolean> BOOLEAN = Parameter.bool().key("true/false").build();
 
     /**
      * A {@link Parameter.Value} that parses a world and a position and stores
@@ -116,7 +116,7 @@ public final class CommonParameters {
      *
      * @see ResourceKeyedValueParameters#LOCATION
      */
-    public final static Parameter.Value<ServerLocation> LOCATION_ONLINE_ONLY = Parameter.location().key("location").build();
+    public static final Parameter.Value<ServerLocation> LOCATION_ONLINE_ONLY = Parameter.location().key("location").build();
 
     /**
      * A {@link Parameter.Value} that parses the remainder of the string under
@@ -124,7 +124,7 @@ public final class CommonParameters {
      *
      * @see ResourceKeyedValueParameters#REMAINING_JOINED_STRINGS
      */
-    public final static Parameter.Value<String> MESSAGE = Parameter.remainingJoinedStrings().key("message").build();
+    public static final Parameter.Value<String> MESSAGE = Parameter.remainingJoinedStrings().key("message").build();
 
     /**
      * A {@link Parameter.Value} that parses a player name or selector and
@@ -132,7 +132,7 @@ public final class CommonParameters {
      *
      * @see ResourceKeyedValueParameters#PLAYER
      */
-    public final static Parameter.Value<ServerPlayer> PLAYER = Parameter.player().key("player").build();
+    public static final Parameter.Value<ServerPlayer> PLAYER = Parameter.player().key("player").build();
 
     /**
      * A {@link Parameter.Value} that parses a player name or selector and
@@ -141,7 +141,7 @@ public final class CommonParameters {
      *
      * @see ResourceKeyedValueParameters#PLAYER
      */
-    public final static Parameter.Value<ServerPlayer> PLAYER_OPTIONAL = Parameter.player().optional().key("player").build();
+    public static final Parameter.Value<ServerPlayer> PLAYER_OPTIONAL = Parameter.player().optional().key("player").build();
 
     /**
      * A {@link Parameter.Value} that parses a position and stores it as a
@@ -149,7 +149,7 @@ public final class CommonParameters {
      *
      * @see ResourceKeyedValueParameters#VECTOR3D
      */
-    public final static Parameter.Value<Vector3d> POSITION = Parameter.vector3d().key("position").build();
+    public static final Parameter.Value<Vector3d> POSITION = Parameter.vector3d().key("position").build();
 
     // SORTFIELDS:OFF
 
diff --git a/src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionTypes.java b/src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionTypes.java
index 3cb66c3c7..b922b1485 100644
--- a/src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionTypes.java
+++ b/src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionTypes.java
@@ -28,10 +28,10 @@ import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.parameter.managed.ValueParser;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * Supported {@link ClientCompletionTypes}.
diff --git a/src/main/java/org/spongepowered/api/command/parameter/managed/standard/VariableValueParameters.java b/src/main/java/org/spongepowered/api/command/parameter/managed/standard/VariableValueParameters.java
index f6dfc6b97..89f4a82ac 100644
--- a/src/main/java/org/spongepowered/api/command/parameter/managed/standard/VariableValueParameters.java
+++ b/src/main/java/org/spongepowered/api/command/parameter/managed/standard/VariableValueParameters.java
@@ -36,11 +36,11 @@ import org.spongepowered.api.command.parameter.Parameter;
 import org.spongepowered.api.command.parameter.managed.ValueParameter;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
 import org.spongepowered.api.registry.DefaultedRegistryType;
-import org.spongepowered.api.registry.RegistryType;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.Registry;
 import org.spongepowered.api.registry.RegistryHolder;
 import org.spongepowered.api.registry.RegistryKey;
+import org.spongepowered.api.registry.RegistryType;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.Builder;
 
 import java.util.Collection;
@@ -149,6 +149,7 @@ public final class VariableValueParameters {
     /**
      * Creates a builder that builds a {@link ValueParameter} that tries to
      * construct a {@link Component} from an argument.
+     *
      * @return The new builder
      */
     public static TextBuilder textBuilder() {
diff --git a/src/main/java/org/spongepowered/api/command/registrar/tree/ClientCompletionKeys.java b/src/main/java/org/spongepowered/api/command/registrar/tree/ClientCompletionKeys.java
index 358135ba3..3d952e853 100644
--- a/src/main/java/org/spongepowered/api/command/registrar/tree/ClientCompletionKeys.java
+++ b/src/main/java/org/spongepowered/api/command/registrar/tree/ClientCompletionKeys.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.command.registrar.tree;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/command/selector/SelectorSortAlgorithms.java b/src/main/java/org/spongepowered/api/command/selector/SelectorSortAlgorithms.java
index e7235e0c4..ed3c9ba87 100644
--- a/src/main/java/org/spongepowered/api/command/selector/SelectorSortAlgorithms.java
+++ b/src/main/java/org/spongepowered/api/command/selector/SelectorSortAlgorithms.java
@@ -28,10 +28,10 @@ import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * Sort algorithms for selectors
diff --git a/src/main/java/org/spongepowered/api/command/selector/SelectorTypes.java b/src/main/java/org/spongepowered/api/command/selector/SelectorTypes.java
index 7c73b8b61..3cf9dc1de 100644
--- a/src/main/java/org/spongepowered/api/command/selector/SelectorTypes.java
+++ b/src/main/java/org/spongepowered/api/command/selector/SelectorTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.command.selector;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * All {@link SelectorType}s available in Minecraft.
diff --git a/src/main/java/org/spongepowered/api/data/DataRegistrationNotFoundException.java b/src/main/java/org/spongepowered/api/data/DataRegistrationNotFoundException.java
index c294b0dc5..abbfa5f1c 100644
--- a/src/main/java/org/spongepowered/api/data/DataRegistrationNotFoundException.java
+++ b/src/main/java/org/spongepowered/api/data/DataRegistrationNotFoundException.java
@@ -24,10 +24,10 @@
  */
 package org.spongepowered.api.data;
 
-import java.util.Optional;
-
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import java.util.Optional;
+
 public class DataRegistrationNotFoundException extends DataException {
 
     private static final long serialVersionUID = -1671720083547789746L;
diff --git a/src/main/java/org/spongepowered/api/data/DataTransactionResult.java b/src/main/java/org/spongepowered/api/data/DataTransactionResult.java
index 047d2d560..d2679911f 100644
--- a/src/main/java/org/spongepowered/api/data/DataTransactionResult.java
+++ b/src/main/java/org/spongepowered/api/data/DataTransactionResult.java
@@ -65,7 +65,10 @@ public final class DataTransactionResult {
 
         @Override
         public BinaryOperator<Builder> combiner() {
-            return (left, right) -> { left.absorbResult(right.build()); return left; };
+            return (left, right) -> {
+                left.absorbResult(right.build());
+                return left;
+            };
         }
 
         @Override
diff --git a/src/main/java/org/spongepowered/api/data/ImmutableDataProviderBuilder.java b/src/main/java/org/spongepowered/api/data/ImmutableDataProviderBuilder.java
index a39a897ad..07dddaa7f 100644
--- a/src/main/java/org/spongepowered/api/data/ImmutableDataProviderBuilder.java
+++ b/src/main/java/org/spongepowered/api/data/ImmutableDataProviderBuilder.java
@@ -35,10 +35,13 @@ public interface ImmutableDataProviderBuilder<H extends DataHolder, V extends Va
         Builder<DataProvider<? extends Value<E>, E>, ImmutableDataProviderBuilder<H, V, E>> {
 
     <NV extends Value<NE>, NE> ImmutableDataProviderBuilder<H, NV, NE> key(Key<NV> key);
+
     <NH extends H> ImmutableDataProviderBuilder<NH, V, E> dataHolder(TypeToken<NH> holder);
+
     <NH extends H> ImmutableDataProviderBuilder<NH, V, E> dataHolder(Class<NH> holder);
 
     ImmutableDataProviderBuilder<H, V, E> get(Function<H, E> get);
+
     ImmutableDataProviderBuilder<H, V, E> set(BiFunction<H, E, H> set);
 
     ImmutableDataProviderBuilder<H, V, E> supports(final Function<H, Boolean> supports);
diff --git a/src/main/java/org/spongepowered/api/data/Keys.java b/src/main/java/org/spongepowered/api/data/Keys.java
index 01f151aae..902da2e42 100644
--- a/src/main/java/org/spongepowered/api/data/Keys.java
+++ b/src/main/java/org/spongepowered/api/data/Keys.java
@@ -63,6 +63,7 @@ import org.spongepowered.api.data.type.HandPreference;
 import org.spongepowered.api.data.type.HorseColor;
 import org.spongepowered.api.data.type.HorseStyle;
 import org.spongepowered.api.data.type.InstrumentType;
+import org.spongepowered.api.data.type.ItemTier;
 import org.spongepowered.api.data.type.LlamaType;
 import org.spongepowered.api.data.type.MatterType;
 import org.spongepowered.api.data.type.MooshroomType;
@@ -83,7 +84,6 @@ import org.spongepowered.api.data.type.SpellType;
 import org.spongepowered.api.data.type.SpellTypes;
 import org.spongepowered.api.data.type.StairShape;
 import org.spongepowered.api.data.type.StructureMode;
-import org.spongepowered.api.data.type.ItemTier;
 import org.spongepowered.api.data.type.TropicalFishShape;
 import org.spongepowered.api.data.type.VillagerType;
 import org.spongepowered.api.data.type.WireAttachmentType;
@@ -224,8 +224,8 @@ import org.spongepowered.api.util.Ticks;
 import org.spongepowered.api.util.TypeTokens;
 import org.spongepowered.api.util.orientation.Orientation;
 import org.spongepowered.api.util.weighted.WeightedSerializableObject;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.explosion.Explosion;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.api.world.weather.WeatherType;
 import org.spongepowered.api.world.weather.WeatherTypes;
diff --git a/src/main/java/org/spongepowered/api/data/MutableDataProviderBuilder.java b/src/main/java/org/spongepowered/api/data/MutableDataProviderBuilder.java
index 9ec7372af..324993478 100644
--- a/src/main/java/org/spongepowered/api/data/MutableDataProviderBuilder.java
+++ b/src/main/java/org/spongepowered/api/data/MutableDataProviderBuilder.java
@@ -38,17 +38,27 @@ public interface MutableDataProviderBuilder<H extends DataHolder.Mutable, V exte
         Builder<DataProvider<V, E>, MutableDataProviderBuilder<H, V, E>> {
 
     <NV extends Value<NE>, NE> MutableDataProviderBuilder<H, NV, NE> key(Key<NV> key);
+
     <NH extends H> MutableDataProviderBuilder<NH, V, E> dataHolder(TypeToken<NH> holder);
+
     <NH extends H> MutableDataProviderBuilder<NH, V, E> dataHolder(Class<NH> holder);
 
     MutableDataProviderBuilder<H, V, E> get(Function<H, E> get);
+
     MutableDataProviderBuilder<H, V, E> set(BiConsumer<H, E> set);
+
     MutableDataProviderBuilder<H, V, E> setAnd(BiFunction<H, E, Boolean> setAnd);
+
     MutableDataProviderBuilder<H, V, E> delete(Consumer<H> delete);
+
     MutableDataProviderBuilder<H, V, E> deleteAnd(Function<H, Boolean> delete);
+
     MutableDataProviderBuilder<H, V, E> deleteAndGet(Function<H, DataTransactionResult> delete);
+
     MutableDataProviderBuilder<H, V, E> resetOnDelete(Supplier<E> resetOnDeleteTo);
+
     MutableDataProviderBuilder<H, V, E> resetOnDelete(Function<H, E> resetOnDeleteTo);
+
     MutableDataProviderBuilder<H, V, E> setAndGet(BiFunction<H, E, DataTransactionResult> setAndGet);
 
     MutableDataProviderBuilder<H, V, E> supports(final Function<H, Boolean> supports);
diff --git a/src/main/java/org/spongepowered/api/data/persistence/AbstractDataBuilder.java b/src/main/java/org/spongepowered/api/data/persistence/AbstractDataBuilder.java
index 0ee66825f..476d0bc99 100644
--- a/src/main/java/org/spongepowered/api/data/persistence/AbstractDataBuilder.java
+++ b/src/main/java/org/spongepowered/api/data/persistence/AbstractDataBuilder.java
@@ -68,7 +68,7 @@ public abstract class AbstractDataBuilder<T extends DataSerializable> implements
         if (container.contains(Queries.CONTENT_VERSION)) {
             final int contentVersion = container.getInt(Queries.CONTENT_VERSION).get();
             if (contentVersion < this.supportedVersion) {
-                Optional<DataContentUpdater> updater = Sponge.dataManager().wrappedContentUpdater(this.requiredClass, contentVersion,
+                final Optional<DataContentUpdater> updater = Sponge.dataManager().wrappedContentUpdater(this.requiredClass, contentVersion,
                         this.supportedVersion);
                 if (!updater.isPresent()) {
                     throw new InvalidDataException("Could not get an updater for " + this.requiredClass.getName()
diff --git a/src/main/java/org/spongepowered/api/data/persistence/DataFormats.java b/src/main/java/org/spongepowered/api/data/persistence/DataFormats.java
index 7dd4b882a..b025d5618 100644
--- a/src/main/java/org/spongepowered/api/data/persistence/DataFormats.java
+++ b/src/main/java/org/spongepowered/api/data/persistence/DataFormats.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.persistence;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * A pseudo-enum of supported {@link DataFormat}s.
diff --git a/src/main/java/org/spongepowered/api/data/persistence/DataStore.java b/src/main/java/org/spongepowered/api/data/persistence/DataStore.java
index 7f55bbb20..dbd6c6412 100644
--- a/src/main/java/org/spongepowered/api/data/persistence/DataStore.java
+++ b/src/main/java/org/spongepowered/api/data/persistence/DataStore.java
@@ -232,7 +232,7 @@ public interface DataStore {
             SerializersStep holder(Class<? extends DataHolder>... types);
         }
 
-        interface SerializersStep extends HolderStep, ResettableBuilder<DataStore, Builder>{
+        interface SerializersStep extends HolderStep, ResettableBuilder<DataStore, Builder> {
 
             /**
              * Adds one or more keys using the default implemented serializers for the given key.
diff --git a/src/main/java/org/spongepowered/api/data/persistence/DataView.java b/src/main/java/org/spongepowered/api/data/persistence/DataView.java
index 8c1089279..298e2641f 100644
--- a/src/main/java/org/spongepowered/api/data/persistence/DataView.java
+++ b/src/main/java/org/spongepowered/api/data/persistence/DataView.java
@@ -345,11 +345,11 @@ public interface DataView {
         if (!strings.isPresent()) {
             return Optional.empty();
         }
-        List<ResourceKey> keys = new ArrayList<>();
+        final List<ResourceKey> keys = new ArrayList<>();
         for (final String s : strings.get()) {
             try {
                 keys.add(ResourceKey.resolve(s));
-            } catch (final Exception ignore) {
+            } catch (final Exception ignored) {
             }
         }
 
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 8e0cd407d..c05281dc9 100644
--- a/src/main/java/org/spongepowered/api/data/type/ArmorMaterials.java
+++ b/src/main/java/org/spongepowered/api/data/type/ArmorMaterials.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
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 eca107ffd..41b64e674 100644
--- a/src/main/java/org/spongepowered/api/data/type/ArtTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/ArtTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link ArtType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/AttachmentSurfaces.java b/src/main/java/org/spongepowered/api/data/type/AttachmentSurfaces.java
index d38cd6bd9..7cb8301d1 100644
--- a/src/main/java/org/spongepowered/api/data/type/AttachmentSurfaces.java
+++ b/src/main/java/org/spongepowered/api/data/type/AttachmentSurfaces.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link AttachmentSurface}s.
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 69e9ff77c..7e02f13cf 100644
--- a/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java
+++ b/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link BannerPatternShape}s.
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 071d0e0ab..63fd99fbe 100644
--- a/src/main/java/org/spongepowered/api/data/type/BoatTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/BoatTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link BoatType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/BodyParts.java b/src/main/java/org/spongepowered/api/data/type/BodyParts.java
index 4ebb11124..233cbfc6c 100644
--- a/src/main/java/org/spongepowered/api/data/type/BodyParts.java
+++ b/src/main/java/org/spongepowered/api/data/type/BodyParts.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link BodyPart}s.
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 451f6276b..a92b786c7 100644
--- a/src/main/java/org/spongepowered/api/data/type/CatTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/CatTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link CatType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/ChestAttachmentTypes.java b/src/main/java/org/spongepowered/api/data/type/ChestAttachmentTypes.java
index 05d7a6602..51f954898 100644
--- a/src/main/java/org/spongepowered/api/data/type/ChestAttachmentTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/ChestAttachmentTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link ChestAttachmentType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/ComparatorModes.java b/src/main/java/org/spongepowered/api/data/type/ComparatorModes.java
index 30e96483e..60c43fac0 100644
--- a/src/main/java/org/spongepowered/api/data/type/ComparatorModes.java
+++ b/src/main/java/org/spongepowered/api/data/type/ComparatorModes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link ComparatorMode}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/DoorHinges.java b/src/main/java/org/spongepowered/api/data/type/DoorHinges.java
index d9248d2f1..e2d56b831 100644
--- a/src/main/java/org/spongepowered/api/data/type/DoorHinges.java
+++ b/src/main/java/org/spongepowered/api/data/type/DoorHinges.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link DoorHinge}s.
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 15c1149d5..7b3760052 100644
--- a/src/main/java/org/spongepowered/api/data/type/DyeColors.java
+++ b/src/main/java/org/spongepowered/api/data/type/DyeColors.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link DyeColor}s.
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 fb8cfa1ae..6df145439 100644
--- a/src/main/java/org/spongepowered/api/data/type/FoxTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/FoxTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link FoxType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/HandPreferences.java b/src/main/java/org/spongepowered/api/data/type/HandPreferences.java
index 50b0cffc5..7665808f6 100644
--- a/src/main/java/org/spongepowered/api/data/type/HandPreferences.java
+++ b/src/main/java/org/spongepowered/api/data/type/HandPreferences.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link HandPreference}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/HandTypes.java b/src/main/java/org/spongepowered/api/data/type/HandTypes.java
index a766daca9..73653980f 100644
--- a/src/main/java/org/spongepowered/api/data/type/HandTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/HandTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link HandType}s.
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 79f1ac050..7bc49485b 100644
--- a/src/main/java/org/spongepowered/api/data/type/HorseColors.java
+++ b/src/main/java/org/spongepowered/api/data/type/HorseColors.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link HorseColor}s.
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 df3f37070..82b62dc2b 100644
--- a/src/main/java/org/spongepowered/api/data/type/HorseStyles.java
+++ b/src/main/java/org/spongepowered/api/data/type/HorseStyles.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link HorseStyle}s.
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 524f8c12a..f586c7efa 100644
--- a/src/main/java/org/spongepowered/api/data/type/InstrumentTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/InstrumentTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link InstrumentType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/ItemTiers.java b/src/main/java/org/spongepowered/api/data/type/ItemTiers.java
index 59814af99..9b1934413 100644
--- a/src/main/java/org/spongepowered/api/data/type/ItemTiers.java
+++ b/src/main/java/org/spongepowered/api/data/type/ItemTiers.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link ItemTier}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/LlamaTypes.java b/src/main/java/org/spongepowered/api/data/type/LlamaTypes.java
index 9082f02ab..b00ee7689 100644
--- a/src/main/java/org/spongepowered/api/data/type/LlamaTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/LlamaTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link LlamaType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/MooshroomTypes.java b/src/main/java/org/spongepowered/api/data/type/MooshroomTypes.java
index d515fbfe5..1821378d7 100644
--- a/src/main/java/org/spongepowered/api/data/type/MooshroomTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/MooshroomTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link MooshroomType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/NotePitches.java b/src/main/java/org/spongepowered/api/data/type/NotePitches.java
index 829432543..fd887299a 100644
--- a/src/main/java/org/spongepowered/api/data/type/NotePitches.java
+++ b/src/main/java/org/spongepowered/api/data/type/NotePitches.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link NotePitch}es.
diff --git a/src/main/java/org/spongepowered/api/data/type/PandaGenes.java b/src/main/java/org/spongepowered/api/data/type/PandaGenes.java
index 83aeac5f9..0027349cc 100644
--- a/src/main/java/org/spongepowered/api/data/type/PandaGenes.java
+++ b/src/main/java/org/spongepowered/api/data/type/PandaGenes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link PandaGene}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/ParrotTypes.java b/src/main/java/org/spongepowered/api/data/type/ParrotTypes.java
index 1e84ba358..e70084928 100644
--- a/src/main/java/org/spongepowered/api/data/type/ParrotTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/ParrotTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link ParrotType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/PhantomPhases.java b/src/main/java/org/spongepowered/api/data/type/PhantomPhases.java
index fc33de92e..37955b354 100644
--- a/src/main/java/org/spongepowered/api/data/type/PhantomPhases.java
+++ b/src/main/java/org/spongepowered/api/data/type/PhantomPhases.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/data/type/PickupRules.java b/src/main/java/org/spongepowered/api/data/type/PickupRules.java
index de308f58f..bfef5cf05 100644
--- a/src/main/java/org/spongepowered/api/data/type/PickupRules.java
+++ b/src/main/java/org/spongepowered/api/data/type/PickupRules.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link PickupRule}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/PistonTypes.java b/src/main/java/org/spongepowered/api/data/type/PistonTypes.java
index 643cc4424..d290d7bc5 100644
--- a/src/main/java/org/spongepowered/api/data/type/PistonTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/PistonTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla known {@link PistonType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/PortionTypes.java b/src/main/java/org/spongepowered/api/data/type/PortionTypes.java
index 2c7e417a3..0dfe7d28f 100644
--- a/src/main/java/org/spongepowered/api/data/type/PortionTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/PortionTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
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 6e2fc456e..560d44248 100644
--- a/src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link ProfessionType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/RabbitTypes.java b/src/main/java/org/spongepowered/api/data/type/RabbitTypes.java
index f0fe2c8b9..183c4bd9f 100644
--- a/src/main/java/org/spongepowered/api/data/type/RabbitTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/RabbitTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link RabbitType}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/RaidStatuses.java b/src/main/java/org/spongepowered/api/data/type/RaidStatuses.java
index 49c6ccc49..ae79f118b 100644
--- a/src/main/java/org/spongepowered/api/data/type/RaidStatuses.java
+++ b/src/main/java/org/spongepowered/api/data/type/RaidStatuses.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/data/type/RailDirections.java b/src/main/java/org/spongepowered/api/data/type/RailDirections.java
index b41e668ad..48f661d21 100644
--- a/src/main/java/org/spongepowered/api/data/type/RailDirections.java
+++ b/src/main/java/org/spongepowered/api/data/type/RailDirections.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link RailDirection}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/SkinParts.java b/src/main/java/org/spongepowered/api/data/type/SkinParts.java
index 66241c10f..004e75ab8 100644
--- a/src/main/java/org/spongepowered/api/data/type/SkinParts.java
+++ b/src/main/java/org/spongepowered/api/data/type/SkinParts.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link SkinPart}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/SlabPortions.java b/src/main/java/org/spongepowered/api/data/type/SlabPortions.java
index 36bd220ea..4363260e9 100644
--- a/src/main/java/org/spongepowered/api/data/type/SlabPortions.java
+++ b/src/main/java/org/spongepowered/api/data/type/SlabPortions.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link SlabPortion}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/SpellTypes.java b/src/main/java/org/spongepowered/api/data/type/SpellTypes.java
index 77d03e957..ab3b027e2 100644
--- a/src/main/java/org/spongepowered/api/data/type/SpellTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/SpellTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/data/type/StairShapes.java b/src/main/java/org/spongepowered/api/data/type/StairShapes.java
index 4832b3b99..07efa0dfb 100644
--- a/src/main/java/org/spongepowered/api/data/type/StairShapes.java
+++ b/src/main/java/org/spongepowered/api/data/type/StairShapes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link StairShape}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/StructureModes.java b/src/main/java/org/spongepowered/api/data/type/StructureModes.java
index 6a7475d78..6bf6f0db1 100644
--- a/src/main/java/org/spongepowered/api/data/type/StructureModes.java
+++ b/src/main/java/org/spongepowered/api/data/type/StructureModes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link StructureMode}s.
diff --git a/src/main/java/org/spongepowered/api/data/type/TropicalFishShape.java b/src/main/java/org/spongepowered/api/data/type/TropicalFishShape.java
index 7aa11a9f5..010860e2a 100644
--- a/src/main/java/org/spongepowered/api/data/type/TropicalFishShape.java
+++ b/src/main/java/org/spongepowered/api/data/type/TropicalFishShape.java
@@ -38,6 +38,7 @@ public interface TropicalFishShape extends DefaultedRegistryValue {
 
     /**
      * Whether this shape represents a large {@link TropicalFish}.
+     *
      * @return True if this shape represents a large tropical fish.
      */
     boolean isLarge();
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 b57d4fed4..3df0cfaa0 100644
--- a/src/main/java/org/spongepowered/api/data/type/TropicalFishShapes.java
+++ b/src/main/java/org/spongepowered/api/data/type/TropicalFishShapes.java
@@ -28,10 +28,10 @@ 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.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla shapes for {@link TropicalFish}.
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 9170d997b..3deca866b 100644
--- a/src/main/java/org/spongepowered/api/data/type/VillagerTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/VillagerTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/data/type/WireAttachmentTypes.java b/src/main/java/org/spongepowered/api/data/type/WireAttachmentTypes.java
index 07a408f36..bf610ff4b 100644
--- a/src/main/java/org/spongepowered/api/data/type/WireAttachmentTypes.java
+++ b/src/main/java/org/spongepowered/api/data/type/WireAttachmentTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.data.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link WireAttachmentType}s.
diff --git a/src/main/java/org/spongepowered/api/effect/particle/ParticleOptions.java b/src/main/java/org/spongepowered/api/effect/particle/ParticleOptions.java
index 200ece365..4e3c962b3 100644
--- a/src/main/java/org/spongepowered/api/effect/particle/ParticleOptions.java
+++ b/src/main/java/org/spongepowered/api/effect/particle/ParticleOptions.java
@@ -30,10 +30,10 @@ import org.spongepowered.api.block.BlockState;
 import org.spongepowered.api.effect.potion.PotionEffectType;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.Color;
 import org.spongepowered.api.util.Direction;
 import org.spongepowered.math.vector.Vector3d;
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 723c14cfe..af34981ee 100644
--- a/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java
+++ b/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.effect.particle;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all possible {@link ParticleType}s in vanilla minecraft.
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 87af6d382..67366ee13 100644
--- a/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java
+++ b/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.effect.potion;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all possible {@link PotionEffectType}s in vanilla Minecraft.
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 86161acc0..262af54bf 100644
--- a/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java
+++ b/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.effect.sound;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link SoundType}s.
diff --git a/src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java b/src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java
index e1c422098..e79bed617 100644
--- a/src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java
+++ b/src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.effect.sound.music;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/entity/AreaEffectCloud.java b/src/main/java/org/spongepowered/api/entity/AreaEffectCloud.java
index d5554d9b0..b5409fb74 100644
--- a/src/main/java/org/spongepowered/api/entity/AreaEffectCloud.java
+++ b/src/main/java/org/spongepowered/api/entity/AreaEffectCloud.java
@@ -40,6 +40,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#COLOR}
+     *
      * @return The color of this cloud
      */
     default Value.Mutable<Color> color() {
@@ -48,6 +49,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#RADIUS}
+     *
      * @return The initial radius of this cloud
      */
     default Value.Mutable<Double> radius() {
@@ -56,6 +58,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#PARTICLE_EFFECT}
+     *
      * @return The particle type
      * @see org.spongepowered.api.effect.particle.ParticleTypes
      */
@@ -65,6 +68,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#DURATION}
+     *
      * @return The duration of which this cloud will linger
      */
     default Value.Mutable<Ticks> duration() {
@@ -73,6 +77,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#WAIT_TIME}
+     *
      * @return The wait time before applying to an entity
      */
     default Value.Mutable<Ticks> waitTime() {
@@ -81,6 +86,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#RADIUS_ON_USE}
+     *
      * @return The radius decrease per use
      */
     default Value.Mutable<Double> radiusOnUse() {
@@ -89,6 +95,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#RADIUS_PER_TICK}
+     *
      * @return The radius decrease per tick
      */
     default Value.Mutable<Double> radiusPerTick() {
@@ -97,6 +104,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#DURATION_ON_USE}
+     *
      * @return The duration of the potion effects when an entity gets a potion applied
      */
     default Value.Mutable<Ticks> durationOnUse() {
@@ -105,6 +113,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#REAPPLICATION_DELAY}
+     *
      * @return The delay for an entity to have a potion effect applied while standing in this cloud
      */
     default Value.Mutable<Ticks> applicationDelay() {
@@ -113,6 +122,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#POTION_EFFECTS}
+     *
      * @return The list of potion effects being applied
      */
     default ListValue.Mutable<PotionEffect> effects() {
@@ -121,6 +131,7 @@ public interface AreaEffectCloud extends Entity {
 
     /**
      * {@link Keys#AGE}
+     *
      * @return The age of this cloud
      */
     default Value.Mutable<Integer> age() {
diff --git a/src/main/java/org/spongepowered/api/entity/Entity.java b/src/main/java/org/spongepowered/api/entity/Entity.java
index ec7ddb7a3..0972598db 100644
--- a/src/main/java/org/spongepowered/api/entity/Entity.java
+++ b/src/main/java/org/spongepowered/api/entity/Entity.java
@@ -41,9 +41,9 @@ import org.spongepowered.api.util.Ticks;
 import org.spongepowered.api.util.Transform;
 import org.spongepowered.api.util.annotation.DoNotStore;
 import org.spongepowered.api.world.Locatable;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.schematic.Schematic;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.math.imaginary.Quaterniond;
 import org.spongepowered.math.vector.Vector3d;
@@ -329,6 +329,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#DISPLAY_NAME}
+     *
      * @return The display name of this entity
      */
     default Value.Mutable<Component> displayName() {
@@ -337,6 +338,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#FALL_DISTANCE}
+     *
      * @return The fall distance
      */
     default Value.Mutable<Double> fallDistance() {
@@ -345,6 +347,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#PASSENGERS}
+     *
      * @return The list of passengers that may be riding this entity
      */
     default ListValue.Mutable<Entity> passengers() {
@@ -353,6 +356,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#VEHICLE}
+     *
      * @return The vehicle this entity may be riding
      */
     default Optional<Value.Mutable<Entity>> vehicle() {
@@ -361,6 +365,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#BASE_VEHICLE}
+     *
      * @return The "base vehicle" of the entity vehicle riding chain
      */
     default Optional<Value.Mutable<Entity>> baseVehicle() {
@@ -369,6 +374,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#ON_GROUND}
+     *
      * @return Whether this entity is on the ground
      */
     default Value.Mutable<Boolean> onGround() {
@@ -377,6 +383,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#VELOCITY}
+     *
      * @return The velocity of this entity
      */
     default Value.Mutable<Vector3d> velocity() {
@@ -385,6 +392,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#IS_GRAVITY_AFFECTED}
+     *
      * @return Whether this entity is affected by gravity
      */
     default Value.Mutable<Boolean> gravityAffected() {
@@ -393,6 +401,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#IS_SILENT}
+     *
      * @return Whether this entity is silent
      */
     default Value.Mutable<Boolean> silent() {
@@ -401,6 +410,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#CREATOR}
+     *
      * @return The unique id of the creator of this entity
      */
     default Optional<Value.Mutable<UUID>> creator() {
@@ -409,6 +419,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#NOTIFIER}
+     *
      * @return The unique id of the notifier of this entity
      */
     default Optional<Value.Mutable<UUID>> notifier() {
@@ -417,6 +428,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#FIRE_TICKS}
+     *
      * @return The amount of time in ticks an Entity is will continue burn for.
      */
     default Optional<Value.Mutable<Ticks>> fireTicks() {
@@ -425,6 +437,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#FIRE_DAMAGE_DELAY}
+     *
      * @return The amount of time to delay in ticks before an Entity will be burned by fire.
      */
     default Optional<Value.Mutable<Ticks>> fireImmuneTicks() {
@@ -433,6 +446,7 @@ public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEn
 
     /**
      * {@link Keys#TRANSIENT}
+     *
      * @return The transient state
      */
     default Optional<Value.Mutable<Boolean>> isTransient() {
diff --git a/src/main/java/org/spongepowered/api/entity/EntityArchetype.java b/src/main/java/org/spongepowered/api/entity/EntityArchetype.java
index de96d071e..b2ebc2439 100644
--- a/src/main/java/org/spongepowered/api/entity/EntityArchetype.java
+++ b/src/main/java/org/spongepowered/api/entity/EntityArchetype.java
@@ -48,6 +48,7 @@ public interface EntityArchetype extends Archetype<EntitySnapshot, Entity> {
 
     /**
      * Creates a new {@link EntityArchetype} with the specified {@link EntityType}.
+     *
      * @param type Type of the entity
      * @return An archetype of the given entity type
      */
@@ -57,6 +58,7 @@ public interface EntityArchetype extends Archetype<EntitySnapshot, Entity> {
 
     /**
      * Creates a new {@link EntityArchetype} with the specified {@link EntityType}.
+     *
      * @param type Type of the entity
      * @return An archetype of the given entity type
      */
diff --git a/src/main/java/org/spongepowered/api/entity/EntityPredicates.java b/src/main/java/org/spongepowered/api/entity/EntityPredicates.java
index a72bcb2f6..7f0e9fa53 100644
--- a/src/main/java/org/spongepowered/api/entity/EntityPredicates.java
+++ b/src/main/java/org/spongepowered/api/entity/EntityPredicates.java
@@ -51,7 +51,7 @@ public final class EntityPredicates {
             final double xDist = pos.getX() - x;
             final double yDist = pos.getY() - y;
             final double zDist = pos.getZ() - z;
-            return xDist*xDist + yDist * yDist + zDist * zDist <= distSqrd;
+            return xDist * xDist + yDist * yDist + zDist * zDist <= distSqrd;
         };
     }
 
diff --git a/src/main/java/org/spongepowered/api/entity/EntitySnapshot.java b/src/main/java/org/spongepowered/api/entity/EntitySnapshot.java
index 964e6b60a..ea6afe69c 100644
--- a/src/main/java/org/spongepowered/api/entity/EntitySnapshot.java
+++ b/src/main/java/org/spongepowered/api/entity/EntitySnapshot.java
@@ -30,9 +30,9 @@ import org.spongepowered.api.data.DataHolderBuilder;
 import org.spongepowered.api.data.persistence.DataBuilder;
 import org.spongepowered.api.util.Transform;
 import org.spongepowered.api.world.LocatableSnapshot;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.schematic.Schematic;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.server.storage.ServerWorldProperties;
 import org.spongepowered.api.world.storage.WorldProperties;
 import org.spongepowered.math.vector.Vector3d;
diff --git a/src/main/java/org/spongepowered/api/entity/EntityType.java b/src/main/java/org/spongepowered/api/entity/EntityType.java
index 3218b8ae1..f5e74335f 100644
--- a/src/main/java/org/spongepowered/api/entity/EntityType.java
+++ b/src/main/java/org/spongepowered/api/entity/EntityType.java
@@ -37,24 +37,28 @@ public interface EntityType<A extends Entity> extends DefaultedRegistryValue, Co
 
     /**
      * If true {@link Entity entities} of this type will not be saved to disk.
+     *
      * @return If the type is transient
      */
     boolean isTransient();
 
     /**
      * If true {@link Entity entities} of this type may be summoned naturally or via command.
+     *
      * @return If the type is summonable
      */
     boolean isSummonable();
 
     /**
      * If true {@link Entity entities} of this type may be caught on fire.
+     *
      * @return If the type is flammable
      */
     boolean isFlammable();
 
     /**
      * If true {@link Entity entities} of this type may spawn out of range from {@link ServerPlayer players}.
+     *
      * @return If the type can spawn far away from a player
      */
     boolean canSpawnAwayFromPlayer();
diff --git a/src/main/java/org/spongepowered/api/entity/EntityTypes.java b/src/main/java/org/spongepowered/api/entity/EntityTypes.java
index 0389258c8..64fcb9a30 100644
--- a/src/main/java/org/spongepowered/api/entity/EntityTypes.java
+++ b/src/main/java/org/spongepowered/api/entity/EntityTypes.java
@@ -132,10 +132,10 @@ import org.spongepowered.api.entity.vehicle.minecart.carrier.ChestMinecart;
 import org.spongepowered.api.entity.vehicle.minecart.carrier.HopperMinecart;
 import org.spongepowered.api.entity.weather.LightningBolt;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all possible {@link EntityType}s available in vanilla minecraft.
diff --git a/src/main/java/org/spongepowered/api/entity/ExperienceOrb.java b/src/main/java/org/spongepowered/api/entity/ExperienceOrb.java
index ed40822e0..230f2a837 100644
--- a/src/main/java/org/spongepowered/api/entity/ExperienceOrb.java
+++ b/src/main/java/org/spongepowered/api/entity/ExperienceOrb.java
@@ -34,6 +34,7 @@ public interface ExperienceOrb extends Entity {
 
     /**
      * {@link Keys#EXPERIENCE}
+     *
      * @return The amount of experience contained in this entity
      */
     default Value.Mutable<Integer> experience() {
diff --git a/src/main/java/org/spongepowered/api/entity/FallingBlock.java b/src/main/java/org/spongepowered/api/entity/FallingBlock.java
index 6d3b10b4a..f4a863444 100644
--- a/src/main/java/org/spongepowered/api/entity/FallingBlock.java
+++ b/src/main/java/org/spongepowered/api/entity/FallingBlock.java
@@ -37,6 +37,7 @@ public interface FallingBlock extends Entity {
 
     /**
      * {@link Keys#BLOCK_STATE}
+     *
      * @return The blockstate
      */
     default Value.Mutable<BlockState> blockState() {
@@ -45,6 +46,7 @@ public interface FallingBlock extends Entity {
 
     /**
      * {@link Keys#DAMAGE_PER_BLOCK}
+     *
      * @return The rate of damage increase per block fallen
      */
     default Value.Mutable<Double> damagePerBlock() {
@@ -53,6 +55,7 @@ public interface FallingBlock extends Entity {
 
     /**
      * {@link Keys#MAX_FALL_DAMAGE}
+     *
      * @return The maximum fall damage
      */
     default Value.Mutable<Double> maxFallDamage() {
@@ -61,6 +64,7 @@ public interface FallingBlock extends Entity {
 
     /**
      * {@link Keys#CAN_PLACE_AS_BLOCK}
+     *
      * @return Whether this can place a block on landing or not
      */
     default Value.Mutable<Boolean> placeAsBlock() {
@@ -69,6 +73,7 @@ public interface FallingBlock extends Entity {
 
     /**
      * {@link Keys#CAN_DROP_AS_ITEM}
+     *
      * @return Whether this will drop as an item or not
      */
     default Value.Mutable<Boolean> dropAsItem() {
@@ -77,6 +82,7 @@ public interface FallingBlock extends Entity {
 
     /**
      * {@link Keys#FALL_TIME}
+     *
      * @return The fall time
      */
     default Value.Mutable<Ticks> fallTime() {
@@ -85,6 +91,7 @@ public interface FallingBlock extends Entity {
 
     /**
      * {@link Keys#CAN_HURT_ENTITIES}
+     *
      * @return Whether this block will hurt entities on it's way down
      */
     default Value.Mutable<Boolean> hurtEntities() {
diff --git a/src/main/java/org/spongepowered/api/entity/Item.java b/src/main/java/org/spongepowered/api/entity/Item.java
index 6b620cfcd..eecbd65c8 100644
--- a/src/main/java/org/spongepowered/api/entity/Item.java
+++ b/src/main/java/org/spongepowered/api/entity/Item.java
@@ -37,6 +37,7 @@ public interface Item extends Entity {
 
     /**
      * {@link Keys#ITEM_STACK_SNAPSHOT}
+     *
      * @return The item being represented by this entity
      */
     default Value.Mutable<ItemStackSnapshot> item() {
diff --git a/src/main/java/org/spongepowered/api/entity/ai/goal/GoalBuilder.java b/src/main/java/org/spongepowered/api/entity/ai/goal/GoalBuilder.java
index af6d45c33..64d65169e 100644
--- a/src/main/java/org/spongepowered/api/entity/ai/goal/GoalBuilder.java
+++ b/src/main/java/org/spongepowered/api/entity/ai/goal/GoalBuilder.java
@@ -35,8 +35,7 @@ import org.spongepowered.api.util.ResettableBuilder;
  * @param <G> The type of goal
  * @param <B> The type of builder, self-referencing
  */
-public interface GoalBuilder<O extends Agent, G extends Goal<O>, B extends GoalBuilder<O, G, B>> extends CopyableBuilder<G, B>, ResettableBuilder<G
-        , B> {
+public interface GoalBuilder<O extends Agent, G extends Goal<O>, B extends GoalBuilder<O, G, B>> extends CopyableBuilder<G, B>, ResettableBuilder<G, B> {
 
     /**
      * Builds the {@link Goal}.
diff --git a/src/main/java/org/spongepowered/api/entity/ai/goal/GoalExecutorTypes.java b/src/main/java/org/spongepowered/api/entity/ai/goal/GoalExecutorTypes.java
index b09061082..9209aa6e0 100644
--- a/src/main/java/org/spongepowered/api/entity/ai/goal/GoalExecutorTypes.java
+++ b/src/main/java/org/spongepowered/api/entity/ai/goal/GoalExecutorTypes.java
@@ -28,10 +28,10 @@ import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.living.Agent;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/entity/ai/goal/GoalTypes.java b/src/main/java/org/spongepowered/api/entity/ai/goal/GoalTypes.java
index abef4fc9c..67ae460e1 100644
--- a/src/main/java/org/spongepowered/api/entity/ai/goal/GoalTypes.java
+++ b/src/main/java/org/spongepowered/api/entity/ai/goal/GoalTypes.java
@@ -32,10 +32,10 @@ import org.spongepowered.api.entity.living.Humanoid;
 import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.api.entity.living.animal.horse.Horse;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 import java.util.function.Predicate;
 
diff --git a/src/main/java/org/spongepowered/api/entity/attribute/AttributeHolder.java b/src/main/java/org/spongepowered/api/entity/attribute/AttributeHolder.java
index 01b594148..7bfeeef46 100644
--- a/src/main/java/org/spongepowered/api/entity/attribute/AttributeHolder.java
+++ b/src/main/java/org/spongepowered/api/entity/attribute/AttributeHolder.java
@@ -37,6 +37,7 @@ public interface AttributeHolder {
 
     /**
      * Gets an {@link Attribute} from this entity
+     *
      * @param type The attribute type.
      * @return An attribute, if present.
      */
@@ -46,6 +47,7 @@ public interface AttributeHolder {
 
     /**
      * Gets an {@link Attribute} from this entity
+     *
      * @param type The attribute type.
      * @return An attribute, if present.
      */
diff --git a/src/main/java/org/spongepowered/api/entity/attribute/AttributeOperations.java b/src/main/java/org/spongepowered/api/entity/attribute/AttributeOperations.java
index 58c2e5622..03f9e81d4 100644
--- a/src/main/java/org/spongepowered/api/entity/attribute/AttributeOperations.java
+++ b/src/main/java/org/spongepowered/api/entity/attribute/AttributeOperations.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.entity.attribute;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of {@link AttributeOperation}s.
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 e8d71d46c..ed434a09f 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
@@ -27,10 +27,10 @@ package org.spongepowered.api.entity.attribute.type;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of {@link AttributeTypes}s.
diff --git a/src/main/java/org/spongepowered/api/entity/explosive/EndCrystal.java b/src/main/java/org/spongepowered/api/entity/explosive/EndCrystal.java
index 1b6f5cb47..7d7be51ff 100644
--- a/src/main/java/org/spongepowered/api/entity/explosive/EndCrystal.java
+++ b/src/main/java/org/spongepowered/api/entity/explosive/EndCrystal.java
@@ -37,6 +37,7 @@ public interface EndCrystal extends Explosive {
 
     /**
      * {@link Keys#TARGET_POSITION}
+     *
      * @return The target position of the beam
      */
     default Optional<Value.Mutable<Vector3i>> beamTarget() {
@@ -45,6 +46,7 @@ public interface EndCrystal extends Explosive {
 
     /**
      * {@link Keys#SHOW_BOTTOM}
+     *
      * @return The value whether this crystal is showing a bottom "pedestal"
      */
     default Value.Mutable<Boolean> showBottom() {
diff --git a/src/main/java/org/spongepowered/api/entity/explosive/Explosive.java b/src/main/java/org/spongepowered/api/entity/explosive/Explosive.java
index 4fe14487d..ab0cff20a 100644
--- a/src/main/java/org/spongepowered/api/entity/explosive/Explosive.java
+++ b/src/main/java/org/spongepowered/api/entity/explosive/Explosive.java
@@ -37,6 +37,7 @@ public interface Explosive extends Entity {
 
     /**
      * {@link Keys#EXPLOSION_RADIUS}
+     *
      * @return The explosion radius
      */
     default Optional<Value.Mutable<Integer>> explosionRadius() {
diff --git a/src/main/java/org/spongepowered/api/entity/explosive/fused/FusedExplosive.java b/src/main/java/org/spongepowered/api/entity/explosive/fused/FusedExplosive.java
index 44db64835..a1c54f5b6 100644
--- a/src/main/java/org/spongepowered/api/entity/explosive/fused/FusedExplosive.java
+++ b/src/main/java/org/spongepowered/api/entity/explosive/fused/FusedExplosive.java
@@ -37,6 +37,7 @@ public interface FusedExplosive extends Explosive {
 
     /**
      * {@link Keys#IS_PRIMED}
+     *
      * @return True if this explosive is primed
      */
     default Value.Mutable<Boolean> primed() {
@@ -45,6 +46,7 @@ public interface FusedExplosive extends Explosive {
 
     /**
      * {@link Keys#FUSE_DURATION}
+     *
      * @return The fuse duration, if this explosive is primed
      */
     default Value.Mutable<Ticks> fuseDuration() {
diff --git a/src/main/java/org/spongepowered/api/entity/hanging/ItemFrame.java b/src/main/java/org/spongepowered/api/entity/hanging/ItemFrame.java
index 3df525443..725b9c1d3 100644
--- a/src/main/java/org/spongepowered/api/entity/hanging/ItemFrame.java
+++ b/src/main/java/org/spongepowered/api/entity/hanging/ItemFrame.java
@@ -36,6 +36,7 @@ public interface ItemFrame extends Hanging {
 
     /**
      * {@link Keys#ITEM_STACK_SNAPSHOT}
+     *
      * @return The item being hung on this item frame
      */
     default Value.Mutable<ItemStackSnapshot> item() {
@@ -44,6 +45,7 @@ public interface ItemFrame extends Hanging {
 
     /**
      * {@link Keys#ORIENTATION}
+     *
      * @return The rotation of the item in this item frame.
      */
     default Value.Mutable<Orientation> itemOrientation() {
diff --git a/src/main/java/org/spongepowered/api/entity/hanging/Painting.java b/src/main/java/org/spongepowered/api/entity/hanging/Painting.java
index ea721984d..c3ba00436 100644
--- a/src/main/java/org/spongepowered/api/entity/hanging/Painting.java
+++ b/src/main/java/org/spongepowered/api/entity/hanging/Painting.java
@@ -36,6 +36,7 @@ public interface Painting extends Hanging {
 
     /**
      * {@link Keys#ART_TYPE}
+     *
      * @return The paiting's art type
      * @see ArtTypes
      */
diff --git a/src/main/java/org/spongepowered/api/entity/living/Ageable.java b/src/main/java/org/spongepowered/api/entity/living/Ageable.java
index e0ee88bd5..27a58024b 100644
--- a/src/main/java/org/spongepowered/api/entity/living/Ageable.java
+++ b/src/main/java/org/spongepowered/api/entity/living/Ageable.java
@@ -35,6 +35,7 @@ public interface Ageable extends Agent {
 
     /**
      * {@link Keys#IS_ADULT}
+     *
      * @return Whether this entity is an adult or not
      */
     default Value.Mutable<Boolean> adult() {
@@ -43,6 +44,7 @@ public interface Ageable extends Agent {
 
     /**
      * {@link Keys#BABY_TICKS}
+     *
      * @return The ticks until this entity turns into an adult
      */
     default Value.Mutable<Ticks> babyTicks() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/ArmorStand.java b/src/main/java/org/spongepowered/api/entity/living/ArmorStand.java
index 9ab09919f..12b74c661 100644
--- a/src/main/java/org/spongepowered/api/entity/living/ArmorStand.java
+++ b/src/main/java/org/spongepowered/api/entity/living/ArmorStand.java
@@ -38,6 +38,7 @@ public interface ArmorStand extends Living, ArmorEquipable {
 
     /**
      * {@link Keys#HAS_MARKER}
+     *
      * @return Whether this is a marker (non-visible) armor stand
      */
     default Value.Mutable<Boolean> marker() {
@@ -46,6 +47,7 @@ public interface ArmorStand extends Living, ArmorEquipable {
 
     /**
      * {@link Keys#IS_SMALL}
+     *
      * @return Whether this is a small or large armor stand
      */
     default Value.Mutable<Boolean> small() {
@@ -54,6 +56,7 @@ public interface ArmorStand extends Living, ArmorEquipable {
 
     /**
      * {@link Keys#HAS_BASE_PLATE}
+     *
      * @return Whether this armorstand has a base plate or not
      */
     default Value.Mutable<Boolean> basePlate() {
@@ -62,6 +65,7 @@ public interface ArmorStand extends Living, ArmorEquipable {
 
     /**
      * {@link Keys#HAS_ARMS}
+     *
      * @return Whether arms are visible or not
      */
     default Value.Mutable<Boolean> arms() {
@@ -70,6 +74,7 @@ public interface ArmorStand extends Living, ArmorEquipable {
 
     /**
      * {@link Keys#IS_PLACING_DISABLED}
+     *
      * @return The equipment types where placing armor is disabled
      */
     default MapValue.Mutable<EquipmentType, Boolean> placingDisabled() {
@@ -78,6 +83,7 @@ public interface ArmorStand extends Living, ArmorEquipable {
 
     /**
      * {@link Keys#IS_TAKING_DISABLED}
+     *
      * @return The set of equipment types that are preventing "taking"
      */
     default MapValue.Mutable<EquipmentType, Boolean> takingDisabled() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/Humanoid.java b/src/main/java/org/spongepowered/api/entity/living/Humanoid.java
index dfff353a0..4ee538400 100644
--- a/src/main/java/org/spongepowered/api/entity/living/Humanoid.java
+++ b/src/main/java/org/spongepowered/api/entity/living/Humanoid.java
@@ -37,6 +37,7 @@ import org.spongepowered.api.item.inventory.ArmorEquipable;
 public interface Humanoid extends Living, ArmorEquipable, Tamer {
     /**
      * {@link Keys#FOOD_LEVEL}
+     *
      * @return The human's food level
      */
     default Value.Mutable<Integer> foodLevel() {
@@ -45,6 +46,7 @@ public interface Humanoid extends Living, ArmorEquipable, Tamer {
 
     /**
      * {@link Keys#EXHAUSTION}
+     *
      * @return The human's exhaustion
      */
     default Value.Mutable<Double> exhaustion() {
@@ -53,6 +55,7 @@ public interface Humanoid extends Living, ArmorEquipable, Tamer {
 
     /**
      * {@link Keys#SATURATION}
+     *
      * @return The human's saturation
      */
     default Value.Mutable<Double> saturation() {
@@ -61,6 +64,7 @@ public interface Humanoid extends Living, ArmorEquipable, Tamer {
 
     /**
      * {@link Keys#GAME_MODE}
+     *
      * @return The gamemode
      */
     default Value.Mutable<GameMode> gameMode() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/Living.java b/src/main/java/org/spongepowered/api/entity/living/Living.java
index fc15dd595..2fc3fb354 100644
--- a/src/main/java/org/spongepowered/api/entity/living/Living.java
+++ b/src/main/java/org/spongepowered/api/entity/living/Living.java
@@ -49,6 +49,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#ABSORPTION}
+     *
      * @return The amount of {@link org.spongepowered.api.effect.potion.PotionEffectTypes#ABSORPTION}
      */
     default Value.Mutable<Double> absorption() {
@@ -57,6 +58,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#ACTIVE_ITEM}
+     *
      * @return The active item, such as food being eaten
      */
     default Value.Mutable<ItemStackSnapshot> activeItem() {
@@ -65,6 +67,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#HEALTH}
+     *
      * @return The health value
      */
     default Value.Mutable<Double> health() {
@@ -73,6 +76,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#MAX_HEALTH}
+     *
      * @return The maximum health value
      */
     default Value.Mutable<Double> maxHealth() {
@@ -81,6 +85,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#LAST_ATTACKER}
+     *
      * @return The last attacker who attacked this entity
      */
     default Value.Mutable<Entity> lastAttacker() {
@@ -89,6 +94,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#HEAD_ROTATION}
+     *
      * @return The rotation of the head
      */
     default Value.Mutable<Vector3d> headRotation() {
@@ -97,6 +103,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#EYE_HEIGHT}
+     *
      * @return The height of the eyes
      */
     default Value<Double> eyeHeight() {
@@ -105,6 +112,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#EYE_POSITION}
+     *
      * @return The position of the eyes
      */
     default Value<Vector3d> eyePosition() {
@@ -113,6 +121,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#LAST_DAMAGE_RECEIVED}
+     *
      * @return The last damage received
      */
     default Optional<Value<Double>> lastDamageReceived() {
@@ -121,6 +130,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#MAX_AIR}
+     *
      * @return The max air supply
      */
     default Value.Mutable<Integer> maxAir() {
@@ -129,6 +139,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#REMAINING_AIR}
+     *
      * @return The remaining air supply
      */
     default Value.Mutable<Integer> remainingAir() {
@@ -137,6 +148,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#STUCK_ARROWS}
+     *
      * @return The amount of stuck arrows
      */
     default Value.Mutable<Integer> stuckArrows() {
@@ -145,6 +157,7 @@ public interface Living extends AttributeHolder, Entity, TeamMember {
 
     /**
      * {@link Keys#WALKING_SPEED}
+     *
      * @return The base walking speed
      */
     default Value.Mutable<Double> walkingSpeed() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Animal.java b/src/main/java/org/spongepowered/api/entity/living/animal/Animal.java
index b45b5bd16..69234d59f 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/Animal.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/Animal.java
@@ -42,6 +42,7 @@ public interface Animal extends Ageable {
 
     /**
      * {@link Keys#BREEDER}
+     *
      * @return The breeder's unique id
      */
     default Optional<Value.Mutable<UUID>> breeder() {
@@ -50,6 +51,7 @@ public interface Animal extends Ageable {
 
     /**
      * {@link Keys#BREEDING_COOLDOWN}
+     *
      * @return The current breeding cooldown
      */
     default Value.Mutable<Ticks> breedingCooldown() {
@@ -58,6 +60,7 @@ public interface Animal extends Ageable {
 
     /**
      * {@link Keys#CAN_BREED}
+     *
      * @return If animal can breed
      */
     default Value.Mutable<Boolean> canBreed() {
@@ -83,6 +86,7 @@ public interface Animal extends Ageable {
 
     /**
      * Instructs this animal to breed with the provided animal.
+     *
      * @param animal The animal to breed with
      */
     void breedWith(Animal animal);
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Cat.java b/src/main/java/org/spongepowered/api/entity/living/animal/Cat.java
index 0d216f7b3..27768cd8c 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/Cat.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/Cat.java
@@ -39,6 +39,7 @@ public interface Cat extends TameableAnimal, Sittable {
 
     /**
      * {@link Keys#CAT_TYPE}
+     *
      * @return The type of cat
      * @see org.spongepowered.api.data.type.CatTypes
      */
@@ -71,6 +72,7 @@ public interface Cat extends TameableAnimal, Sittable {
 
     /**
      * {@link Keys#DYE_COLOR}
+     *
      * @return The collar color
      */
     default Value.Mutable<DyeColor> collarColor() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Chicken.java b/src/main/java/org/spongepowered/api/entity/living/animal/Chicken.java
index a2c0fe8e4..10ec2e9b0 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/Chicken.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/Chicken.java
@@ -35,6 +35,7 @@ public interface Chicken extends Animal {
 
     /**
      * {@link Keys#EGG_TIME}
+     *
      * @return The time remaining for the next egg drop
      */
     default Value.Mutable<Ticks> eggTime() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Fox.java b/src/main/java/org/spongepowered/api/entity/living/animal/Fox.java
index 77d503587..d92074c0a 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/Fox.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/Fox.java
@@ -38,6 +38,7 @@ public interface Fox extends Animal {
 
     /**
      * {@link Keys#FOX_TYPE}
+     *
      * @return The type of fox
      * @see org.spongepowered.api.data.type.FoxTypes
      */
@@ -47,6 +48,7 @@ public interface Fox extends Animal {
 
     /**
      * {@link Keys#FIRST_TRUSTED}
+     *
      * @return The first trusted unique id
      */
     default Optional<Value.Mutable<UUID>> firstTrusted() {
@@ -55,6 +57,7 @@ public interface Fox extends Animal {
 
     /**
      * {@link Keys#SECOND_TRUSTED}
+     *
      * @return The second trusted uuid
      */
     default Optional<Value.Mutable<UUID>> secondTrusted() {
@@ -63,6 +66,7 @@ public interface Fox extends Animal {
 
     /**
      * {@link Keys#IS_SITTING}
+     *
      * @return Whether this fox is sitting
      */
     default Value.Mutable<Boolean> sitting() {
@@ -71,6 +75,7 @@ public interface Fox extends Animal {
 
     /**
      * {@link Keys#IS_FACEPLANTED}
+     *
      * @return Whether this fox has faceplanted
      */
     default Value.Mutable<Boolean> faceplanted() {
@@ -79,6 +84,7 @@ public interface Fox extends Animal {
 
     /**
      * {@link Keys#IS_DEFENDING}
+     *
      * @return Whether this fox is defending
      */
     default Value.Mutable<Boolean> defending() {
@@ -87,6 +93,7 @@ public interface Fox extends Animal {
 
     /**
      * {@link Keys#IS_SLEEPING}
+     *
      * @return Whether this fox is sleeping
      */
     default Value.Mutable<Boolean> sleeping() {
@@ -95,6 +102,7 @@ public interface Fox extends Animal {
 
     /**
      * {@link Keys#IS_POUNCING}
+     *
      * @return Whether this fox is pouncing
      */
     default Value.Mutable<Boolean> pouncing() {
@@ -103,6 +111,7 @@ public interface Fox extends Animal {
 
     /**
      * {@link Keys#IS_CROUCHING}
+     *
      * @return Whether this fox is crouching
      */
     default Value.Mutable<Boolean> crouching() {
@@ -111,6 +120,7 @@ public interface Fox extends Animal {
 
     /**
      * {@link Keys#IS_INTERESTED}
+     *
      * @return Whether this fox is interested in something
      */
     default Value.Mutable<Boolean> interested() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Ocelot.java b/src/main/java/org/spongepowered/api/entity/living/animal/Ocelot.java
index 4b26a6b9d..7a9ac51a4 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/Ocelot.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/Ocelot.java
@@ -36,6 +36,7 @@ public interface Ocelot extends Animal {
 
     /**
      * {@link Keys#IS_TRUSTING}
+     *
      * @return Whether this ocelot is trusting people
      */
     default Value.Mutable<Boolean> trusting() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Panda.java b/src/main/java/org/spongepowered/api/entity/living/animal/Panda.java
index 81548dde7..1f873f1aa 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/Panda.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/Panda.java
@@ -36,6 +36,7 @@ public interface Panda extends Animal, Sittable {
 
     /**
      * {@link Keys#KNOWN_GENE}
+     *
      * @return Whether this panda has a known gene
      */
     default Value.Mutable<PandaGene> knownGene() {
@@ -44,6 +45,7 @@ public interface Panda extends Animal, Sittable {
 
     /**
      * {@link Keys#HIDDEN_GENE}
+     *
      * @return Whether this panda has a hidden gene
      */
     default Value.Mutable<PandaGene> hiddenGene() {
@@ -52,6 +54,7 @@ public interface Panda extends Animal, Sittable {
 
     /**
      * {@link Keys#IS_LYING_ON_BACK}
+     *
      * @return The time remaining to lie on it's back
      */
     default Value.Mutable<Boolean> lyingOnBack() {
@@ -60,6 +63,7 @@ public interface Panda extends Animal, Sittable {
 
     /**
      * {@link Keys#IS_ROLLING_AROUND}
+     *
      * @return The time remaining to roll around
      */
     default Value.Mutable<Boolean> rollingAround() {
@@ -68,6 +72,7 @@ public interface Panda extends Animal, Sittable {
 
     /**
      * {@link Keys#UNHAPPY_TIME}
+     *
      * @return The time remaining to be unhappy
      */
     default Value.Mutable<Ticks> unhappyTime() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Parrot.java b/src/main/java/org/spongepowered/api/entity/living/animal/Parrot.java
index 47b4ada38..c505e4f1b 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/Parrot.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/Parrot.java
@@ -35,6 +35,7 @@ public interface Parrot extends TameableAnimal, Sittable {
 
     /**
      * {@link Keys#PARROT_TYPE}
+     *
      * @return The type of parrot
      * @see org.spongepowered.api.data.type.ParrotTypes
      */
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Sheep.java b/src/main/java/org/spongepowered/api/entity/living/animal/Sheep.java
index 86925e975..e8022b35c 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/Sheep.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/Sheep.java
@@ -35,6 +35,7 @@ public interface Sheep extends Animal {
 
     /**
      * {@link Keys#DYE_COLOR}
+     *
      * @return The color of this sheep
      * @see org.spongepowered.api.data.type.DyeColors
      */
@@ -44,6 +45,7 @@ public interface Sheep extends Animal {
 
     /**
      * {@link Keys#IS_SHEARED}
+     *
      * @return Whether this sheep is sheared.
      */
     default Value.Mutable<Boolean> sheared() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Sittable.java b/src/main/java/org/spongepowered/api/entity/living/animal/Sittable.java
index 319cc5ff8..6349f87c9 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/Sittable.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/Sittable.java
@@ -35,6 +35,7 @@ public interface Sittable extends Entity {
 
     /**
      * {@link Keys#IS_SITTING}
+     *
      * @return Whether this entity is sitting
      */
     default Value.Mutable<Boolean> sitting() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/TameableAnimal.java b/src/main/java/org/spongepowered/api/entity/living/animal/TameableAnimal.java
index b1d076e01..858813e16 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/TameableAnimal.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/TameableAnimal.java
@@ -34,6 +34,7 @@ public interface TameableAnimal extends Animal {
 
     /**
      * {@link Keys#TAMER}
+     *
      * @return The unique id of the tamer
      */
     default Optional<Value.Mutable<UUID>> tamer() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Turtle.java b/src/main/java/org/spongepowered/api/entity/living/animal/Turtle.java
index 715d4e28c..82db083e6 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/Turtle.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/Turtle.java
@@ -35,6 +35,7 @@ public interface Turtle extends Animal {
 
     /**
      * {@link Keys#HOME_POSITION}
+     *
      * @return The position that is considered "home"
      */
     default Value.Mutable<Vector3i> homePosition() {
@@ -43,6 +44,7 @@ public interface Turtle extends Animal {
 
     /**
      * {@link Keys#HAS_EGG}
+     *
      * @return Whether this turtle has an egg laid
      */
     default Value.Mutable<Boolean> hasEgg() {
@@ -51,6 +53,7 @@ public interface Turtle extends Animal {
 
     /**
      * {@link Keys#IS_LAYING_EGG}
+     *
      * @return Whether this turtle is laying an egg
      */
     default Value.Mutable<Boolean> layingEgg() {
@@ -59,6 +62,7 @@ public interface Turtle extends Animal {
 
     /**
      * {@link Keys#TARGET_POSITION}
+     *
      * @return The position that this turtle is traveling to
      */
     default Value.Mutable<Vector3i> travelingPosition() {
@@ -67,6 +71,7 @@ public interface Turtle extends Animal {
 
     /**
      * {@link Keys#IS_GOING_HOME}
+     *
      * @return Whether this turtle is heading home
      */
     default Value.Mutable<Boolean> goingHome() {
@@ -75,6 +80,7 @@ public interface Turtle extends Animal {
 
     /**
      * {@link Keys#IS_TRAVELING}
+     *
      * @return Whether this turtle is traveling
      */
     default Value.Mutable<Boolean> traveling() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/cow/Mooshroom.java b/src/main/java/org/spongepowered/api/entity/living/animal/cow/Mooshroom.java
index a61245789..3e9c7e450 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/cow/Mooshroom.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/cow/Mooshroom.java
@@ -35,6 +35,7 @@ public interface Mooshroom extends Cow {
 
     /**
      * {@link Keys#MOOSHROOM_TYPE}
+     *
      * @return The mooshroom type
      * @see org.spongepowered.api.data.type.MooshroomTypes
      */
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/horse/PackHorse.java b/src/main/java/org/spongepowered/api/entity/living/animal/horse/PackHorse.java
index 30eb428c9..92feba0fa 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/horse/PackHorse.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/horse/PackHorse.java
@@ -31,6 +31,7 @@ public interface PackHorse extends HorseLike {
 
     /**
      * {@link Keys#HAS_CHEST}
+     *
      * @return Whether the horse is has a chest or not
      */
     default Value.Mutable<Boolean> hasChest() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/horse/llama/TraderLlama.java b/src/main/java/org/spongepowered/api/entity/living/animal/horse/llama/TraderLlama.java
index 5ac831cee..4643f7651 100644
--- a/src/main/java/org/spongepowered/api/entity/living/animal/horse/llama/TraderLlama.java
+++ b/src/main/java/org/spongepowered/api/entity/living/animal/horse/llama/TraderLlama.java
@@ -32,6 +32,7 @@ public interface TraderLlama extends LlamaLike {
 
     /**
      * {@link Keys#DESPAWN_DELAY}
+     *
      * @return The delay before this llama will despawn
      */
     default Value.Mutable<Ticks> despawnDelay() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/aquatic/Dolphin.java b/src/main/java/org/spongepowered/api/entity/living/aquatic/Dolphin.java
index f0754ff89..c0f739956 100644
--- a/src/main/java/org/spongepowered/api/entity/living/aquatic/Dolphin.java
+++ b/src/main/java/org/spongepowered/api/entity/living/aquatic/Dolphin.java
@@ -34,6 +34,7 @@ public interface Dolphin extends Aquatic {
 
     /**
      * {@link Keys#SKIN_MOISTURE}
+     *
      * @return The skin moisture value, before they are parched
      */
     default Value.Mutable<Integer> skinMoisture() {
@@ -42,6 +43,7 @@ public interface Dolphin extends Aquatic {
 
     /**
      * {@link Keys#HAS_FISH}
+     *
      * @return Whether this dolphin has a fish, but not a towel
      */
     default Value.Mutable<Boolean> gotFish() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/aquatic/fish/school/TropicalFish.java b/src/main/java/org/spongepowered/api/entity/living/aquatic/fish/school/TropicalFish.java
index 9faf6fdb3..02e66006a 100644
--- a/src/main/java/org/spongepowered/api/entity/living/aquatic/fish/school/TropicalFish.java
+++ b/src/main/java/org/spongepowered/api/entity/living/aquatic/fish/school/TropicalFish.java
@@ -33,6 +33,7 @@ public interface TropicalFish extends SchoolingFish {
 
     /**
      * {@link Keys#DYE_COLOR}
+     *
      * @return The base color of this tropical fish.
      */
     default Value.Mutable<DyeColor> baseColor() {
@@ -41,6 +42,7 @@ public interface TropicalFish extends SchoolingFish {
 
     /**
      * {@link Keys#PATTERN_COLOR}
+     *
      * @return The pattern color of this tropical fish.
      */
     default Value.Mutable<DyeColor> patternColor() {
@@ -49,6 +51,7 @@ public interface TropicalFish extends SchoolingFish {
 
     /**
      * {@link Keys#TROPICAL_FISH_SHAPE}
+     *
      * @return The shape of this tropical fish.
      */
     default Value.Mutable<TropicalFishShape> shape() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/golem/IronGolem.java b/src/main/java/org/spongepowered/api/entity/living/golem/IronGolem.java
index 294603b4e..9910875db 100644
--- a/src/main/java/org/spongepowered/api/entity/living/golem/IronGolem.java
+++ b/src/main/java/org/spongepowered/api/entity/living/golem/IronGolem.java
@@ -35,6 +35,7 @@ public interface IronGolem extends Golem {
 
     /**
      * {@link Keys#IS_PLAYER_CREATED}
+     *
      * @return Whether this golem is player created or not
      */
     default Value.Mutable<Boolean> playerCreated() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/golem/Shulker.java b/src/main/java/org/spongepowered/api/entity/living/golem/Shulker.java
index d6b2d51a6..f08b8dba6 100644
--- a/src/main/java/org/spongepowered/api/entity/living/golem/Shulker.java
+++ b/src/main/java/org/spongepowered/api/entity/living/golem/Shulker.java
@@ -35,6 +35,7 @@ public interface Shulker extends Golem, Monster, Ranger {
 
     /**
      * {@link Keys#DYE_COLOR}
+     *
      * @return The dye color of this shulker
      */
     default Value.Mutable<DyeColor> color() {
@@ -43,6 +44,7 @@ public interface Shulker extends Golem, Monster, Ranger {
 
     /**
      * {@link Keys#DIRECTION}
+     *
      * @return The direction this shulker is "hanging" or "sitting" on
      */
     default Value.Mutable<Direction> hangingDirection() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/Blaze.java b/src/main/java/org/spongepowered/api/entity/living/monster/Blaze.java
index b71e65a97..483eb9cd5 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/Blaze.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/Blaze.java
@@ -37,6 +37,7 @@ public interface Blaze extends Monster, Aerial, Ranger {
 
     /**
      * {@link Keys#IS_AFLAME}
+     *
      * @return Whether this blaze is "ablaze"
      */
     default Value.Mutable<Boolean> aflame() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/Creeper.java b/src/main/java/org/spongepowered/api/entity/living/monster/Creeper.java
index bcfdb0785..fa7673870 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/Creeper.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/Creeper.java
@@ -39,6 +39,7 @@ public interface Creeper extends Monster, FusedExplosive {
      *
      * <p>Note that "charged" creepers will likely
      * cause larger than normal explosions.</p>
+     *
      * @return Whether this creeper is charged or not
      */
     default Value.Mutable<Boolean> charged() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/Enderman.java b/src/main/java/org/spongepowered/api/entity/living/monster/Enderman.java
index f66a56800..63b4a0bd4 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/Enderman.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/Enderman.java
@@ -36,6 +36,7 @@ public interface Enderman extends Monster {
 
     /**
      * {@link Keys#IS_SCREAMING}.
+     *
      * @return Whether the enderman is screaming
      */
     default Value.Mutable<Boolean> screaming() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/Endermite.java b/src/main/java/org/spongepowered/api/entity/living/monster/Endermite.java
index 8b8c0a9a2..b4892997c 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/Endermite.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/Endermite.java
@@ -38,6 +38,7 @@ public interface Endermite extends Monster {
 
     /**
      * {@link Keys#DESPAWN_DELAY}
+     *
      * @return The despawn delay
      */
     default Value.Mutable<Ticks> expirationDelay() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/Patroller.java b/src/main/java/org/spongepowered/api/entity/living/monster/Patroller.java
index 271beb706..be3e90187 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/Patroller.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/Patroller.java
@@ -35,6 +35,7 @@ public interface Patroller extends Monster {
 
     /**
      * {@link Keys#TARGET_POSITION}
+     *
      * @return The target position for a patrol
      */
     default Optional<Value.Mutable<Vector3i>> targetPosition() {
@@ -43,6 +44,7 @@ public interface Patroller extends Monster {
 
     /**
      * {@link Keys#IS_LEADER}
+     *
      * @return Whether this is the leader of a patrol
      */
     default Value.Mutable<Boolean> leader() {
@@ -51,6 +53,7 @@ public interface Patroller extends Monster {
 
     /**
      * {@link Keys#IS_PATROLLING}
+     *
      * @return Whether this patroller is patrolling
      */
     default Value.Mutable<Boolean> patrolling() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/Phantom.java b/src/main/java/org/spongepowered/api/entity/living/monster/Phantom.java
index 4557011a9..05fcda045 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/Phantom.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/Phantom.java
@@ -34,6 +34,7 @@ public interface Phantom extends Aerial, Creature {
 
     /**
      * {@link Keys#PHANTOM_PHASE}
+     *
      * @return The phantom phase
      */
     default Value.Mutable<PhantomPhase> phase() {
@@ -42,6 +43,7 @@ public interface Phantom extends Aerial, Creature {
 
     /**
      * {@link Keys#SIZE}
+     *
      * @return The size of this phantom
      */
     default Value.Mutable<Integer> size() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/Vex.java b/src/main/java/org/spongepowered/api/entity/living/monster/Vex.java
index 292ceea07..e20173b09 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/Vex.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/Vex.java
@@ -33,6 +33,7 @@ public interface Vex extends Monster {
 
     /**
      * {@link Keys#LIFE_TICKS}
+     *
      * @return The amount of ticks till this Vex starts dying.
      */
     default Value.Mutable<Ticks> lifeTicks() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/boss/Boss.java b/src/main/java/org/spongepowered/api/entity/living/monster/boss/Boss.java
index bada57087..5c22d93d7 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/boss/Boss.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/boss/Boss.java
@@ -37,6 +37,7 @@ public interface Boss extends Hostile {
 
     /**
      * {@link Keys#BOSS_BAR}
+     *
      * @return The boss bar
      */
     default Value.Mutable<BossBar> bossBar() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/boss/Wither.java b/src/main/java/org/spongepowered/api/entity/living/monster/boss/Wither.java
index ce3c16bef..87664a05c 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/boss/Wither.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/boss/Wither.java
@@ -29,8 +29,8 @@ import org.spongepowered.api.data.value.ListValue;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.explosive.fused.FusedExplosive;
 import org.spongepowered.api.entity.living.Aerial;
-import org.spongepowered.api.entity.living.Ranger;
 import org.spongepowered.api.entity.living.Monster;
+import org.spongepowered.api.entity.living.Ranger;
 
 /**
  * Represents the Wither.
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/EnderDragon.java b/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/EnderDragon.java
index f8c2b3fbe..18e86c5e3 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/EnderDragon.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/EnderDragon.java
@@ -44,6 +44,7 @@ public interface EnderDragon extends ComplexLiving<EnderDragonPart>, Boss, Monst
 
     /**
      * {@link Keys#HEALING_CRYSTAL}
+     *
      * @return The current crystal healing this dragon
      */
     default Optional<Value.Mutable<EndCrystal>> healingCrystal() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/phase/DragonPhaseTypes.java b/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/phase/DragonPhaseTypes.java
index 5f55676e4..f53aa2343 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/phase/DragonPhaseTypes.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/boss/dragon/phase/DragonPhaseTypes.java
@@ -30,10 +30,10 @@ import org.spongepowered.api.entity.living.monster.boss.dragon.EnderDragon;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.entity.projectile.explosive.fireball.DragonFireball;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of {@link DragonPhaseType}s.
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/guardian/Guardian.java b/src/main/java/org/spongepowered/api/entity/living/monster/guardian/Guardian.java
index d61900c19..8c0204f43 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/guardian/Guardian.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/guardian/Guardian.java
@@ -26,10 +26,9 @@ package org.spongepowered.api.entity.living.monster.guardian;
 
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
-import org.spongepowered.api.entity.Entity;
-import org.spongepowered.api.entity.living.aquatic.Aquatic;
 import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.api.entity.living.Monster;
+import org.spongepowered.api.entity.living.aquatic.Aquatic;
 
 import java.util.Optional;
 
@@ -40,6 +39,7 @@ public interface Guardian extends Aquatic, Monster {
 
     /**
      * {@link Keys#BEAM_TARGET_ENTITY}
+     *
      * @return The targeted entity, if available
      */
     default Optional<Value.Mutable<Living>> beamTarget() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/raider/Ravager.java b/src/main/java/org/spongepowered/api/entity/living/monster/raider/Ravager.java
index c21ea60df..783143545 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/raider/Ravager.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/raider/Ravager.java
@@ -35,6 +35,7 @@ public interface Ravager extends Raider {
 
     /**
      * {@link Keys#ATTACK_TIME}
+     *
      * @return The time this ravager is attacking
      */
     default Value.Mutable<Ticks> attackTime() {
@@ -43,6 +44,7 @@ public interface Ravager extends Raider {
 
     /**
      * {@link Keys#ROARING_TIME}
+     *
      * @return The time this ravager is roaring
      */
     default Value.Mutable<Ticks> roaringTime() {
@@ -51,6 +53,7 @@ public interface Ravager extends Raider {
 
     /**
      * {@link Keys#STUNNED_TIME}
+     *
      * @return The time this ravager is being stunned for
      */
     default Value.Mutable<Ticks> stunnedTime() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/raider/illager/Vindicator.java b/src/main/java/org/spongepowered/api/entity/living/monster/raider/illager/Vindicator.java
index d3b9ed457..9f3c864b9 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/raider/illager/Vindicator.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/raider/illager/Vindicator.java
@@ -34,6 +34,7 @@ public interface Vindicator extends Illager {
 
     /**
      * {@link Keys#IS_JOHNNY}
+     *
      * @return whether this is a johnny vindicator
      */
     default Value.Mutable<Boolean> johnny() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/raider/illager/spellcaster/Evoker.java b/src/main/java/org/spongepowered/api/entity/living/monster/raider/illager/spellcaster/Evoker.java
index 6200a06a6..e994d2278 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/raider/illager/spellcaster/Evoker.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/raider/illager/spellcaster/Evoker.java
@@ -37,6 +37,7 @@ public interface Evoker extends Spellcaster {
 
     /**
      * {@link Keys#WOLOLO_TARGET}
+     *
      * @return The targeted sheep being herded
      */
     default Optional<Value.Mutable<Sheep>> wololoTarget() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/skeleton/SkeletonLike.java b/src/main/java/org/spongepowered/api/entity/living/monster/skeleton/SkeletonLike.java
index 9c42eaeb7..347c7c469 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/skeleton/SkeletonLike.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/skeleton/SkeletonLike.java
@@ -24,8 +24,8 @@
  */
 package org.spongepowered.api.entity.living.monster.skeleton;
 
-import org.spongepowered.api.entity.living.Ranger;
 import org.spongepowered.api.entity.living.Monster;
+import org.spongepowered.api.entity.living.Ranger;
 
 /**
  * An abstract representation of a Skeleton.
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/slime/Slime.java b/src/main/java/org/spongepowered/api/entity/living/monster/slime/Slime.java
index 122d62595..919d75aaa 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/slime/Slime.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/slime/Slime.java
@@ -35,6 +35,7 @@ public interface Slime extends Monster {
 
     /**
      * {@link Keys#SIZE}
+     *
      * @return The size of slime
      */
     default Value.Mutable<Integer> size() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/spider/Spider.java b/src/main/java/org/spongepowered/api/entity/living/monster/spider/Spider.java
index a8077021b..2f2f84466 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/spider/Spider.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/spider/Spider.java
@@ -24,11 +24,10 @@
  */
 package org.spongepowered.api.entity.living.monster.spider;
 
+import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.entity.living.Monster;
 
-import org.spongepowered.api.data.Keys;
-
 /**
  * Represents a Spider.
  */
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/zombie/ZombieVillager.java b/src/main/java/org/spongepowered/api/entity/living/monster/zombie/ZombieVillager.java
index 4af0cd403..1bcdf9d68 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/zombie/ZombieVillager.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/zombie/ZombieVillager.java
@@ -34,6 +34,7 @@ public interface ZombieVillager extends ZombieLike {
 
     /**
      * {@link Keys#VILLAGER_TYPE}
+     *
      * @return The villager type
      * @see org.spongepowered.api.data.type.VillagerTypes
      */
@@ -43,6 +44,7 @@ public interface ZombieVillager extends ZombieLike {
 
     /**
      * {@link Keys#PROFESSION_TYPE}
+     *
      * @return The profession of this zombie villager
      * @see ProfessionTypes
      */
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/zombie/ZombifiedPiglin.java b/src/main/java/org/spongepowered/api/entity/living/monster/zombie/ZombifiedPiglin.java
index 8bdb11abc..de5d8e083 100644
--- a/src/main/java/org/spongepowered/api/entity/living/monster/zombie/ZombifiedPiglin.java
+++ b/src/main/java/org/spongepowered/api/entity/living/monster/zombie/ZombifiedPiglin.java
@@ -34,6 +34,7 @@ public interface ZombifiedPiglin extends ZombieLike {
 
     /**
      * {@link Keys#ANGER_LEVEL}
+     *
      * @return The anger level, decays over time
      */
     default Value.Mutable<Integer> angerLevel() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/player/PlayerChatRouter.java b/src/main/java/org/spongepowered/api/entity/living/player/PlayerChatRouter.java
index c9b1b546d..38d24137a 100644
--- a/src/main/java/org/spongepowered/api/entity/living/player/PlayerChatRouter.java
+++ b/src/main/java/org/spongepowered/api/entity/living/player/PlayerChatRouter.java
@@ -34,7 +34,7 @@ import net.kyori.adventure.text.Component;
 public interface PlayerChatRouter {
     static PlayerChatRouter toAudience(final Audience audience) {
         return (player, message) -> audience.sendMessage(player, message, MessageType.CHAT);
-    };
+    }
 
     void chat(final Player player, final Component message);
 }
diff --git a/src/main/java/org/spongepowered/api/entity/living/player/chat/ChatVisibilities.java b/src/main/java/org/spongepowered/api/entity/living/player/chat/ChatVisibilities.java
index 49be6fabd..b9f0658b9 100644
--- a/src/main/java/org/spongepowered/api/entity/living/player/chat/ChatVisibilities.java
+++ b/src/main/java/org/spongepowered/api/entity/living/player/chat/ChatVisibilities.java
@@ -28,10 +28,10 @@ import net.kyori.adventure.audience.MessageType;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of the vanilla chat visibility modes for a client.
diff --git a/src/main/java/org/spongepowered/api/entity/living/player/gamemode/GameModes.java b/src/main/java/org/spongepowered/api/entity/living/player/gamemode/GameModes.java
index fdb529dc5..1fbaf769c 100644
--- a/src/main/java/org/spongepowered/api/entity/living/player/gamemode/GameModes.java
+++ b/src/main/java/org/spongepowered/api/entity/living/player/gamemode/GameModes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.entity.living.player.gamemode;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * A list of the game modes that Minecraft provides in vanilla.
diff --git a/src/main/java/org/spongepowered/api/entity/living/player/server/ServerPlayer.java b/src/main/java/org/spongepowered/api/entity/living/player/server/ServerPlayer.java
index d084edd79..1a924e1e2 100644
--- a/src/main/java/org/spongepowered/api/entity/living/player/server/ServerPlayer.java
+++ b/src/main/java/org/spongepowered/api/entity/living/player/server/ServerPlayer.java
@@ -40,6 +40,7 @@ import org.spongepowered.api.entity.living.player.CooldownTracker;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.entity.living.player.PlayerChatRouter;
 import org.spongepowered.api.entity.living.player.User;
+import org.spongepowered.api.entity.living.player.chat.ChatVisibility;
 import org.spongepowered.api.entity.living.player.tab.TabList;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.event.message.PlayerChatEvent;
@@ -49,7 +50,6 @@ import org.spongepowered.api.network.ServerPlayerConnection;
 import org.spongepowered.api.resourcepack.ResourcePack;
 import org.spongepowered.api.scoreboard.Scoreboard;
 import org.spongepowered.api.service.permission.Subject;
-import org.spongepowered.api.entity.living.player.chat.ChatVisibility;
 import org.spongepowered.api.world.WorldBorder;
 import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.plugin.PluginContainer;
@@ -127,6 +127,7 @@ public interface ServerPlayer extends Player, Subject {
 
     /**
      * {@link Keys#VIEW_DISTANCE}
+     *
      * @return The player's view distance
      */
     default Value.Mutable<Integer> viewDistance() {
@@ -135,6 +136,7 @@ public interface ServerPlayer extends Player, Subject {
 
     /**
      * {@link Keys#CHAT_VISIBILITY}
+     *
      * @return Chat visibility setting
      */
     default Value.Mutable<ChatVisibility> chatVisibility() {
@@ -143,6 +145,7 @@ public interface ServerPlayer extends Player, Subject {
 
     /**
      * {@link Keys#CHAT_COLORS_ENABLED}
+     *
      * @return Whether colors are enabled in chat
      */
     default Value.Mutable<Boolean> chatColorsEnabled() {
@@ -278,6 +281,7 @@ public interface ServerPlayer extends Player, Subject {
 
     /**
      * {@link Keys#FIRST_DATE_JOINED}
+     *
      * @return The timestamp value when this player first joined
      */
     default Value.Mutable<Instant> firstJoined() {
@@ -286,6 +290,7 @@ public interface ServerPlayer extends Player, Subject {
 
     /**
      * {@link Keys#LAST_DATE_JOINED}
+     *
      * @return The last timestamp value when this player has joined
      */
     default Value.Mutable<Instant> lastJoined() {
@@ -294,6 +299,7 @@ public interface ServerPlayer extends Player, Subject {
 
     /**
      * {@link Keys#LAST_DATE_PLAYED}
+     *
      * @return The last timestamp value when this player has played
      */
     default Value.Mutable<Instant> lastPlayed() {
@@ -302,6 +308,7 @@ public interface ServerPlayer extends Player, Subject {
 
     /**
      * {@link Keys#HAS_VIEWED_CREDITS}
+     *
      * @return True if this player has viewed the credits
      */
     default Value.Mutable<Boolean> hasViewedCredits() {
@@ -320,6 +327,7 @@ public interface ServerPlayer extends Player, Subject {
 
     /**
      * {@link Keys#IS_SLEEPING_IGNORED}
+     *
      * @return Whether this player is going to be ignored for sleeping to "reset" the day
      */
     default Value.Mutable<Boolean> sleepingIgnored() {
@@ -328,6 +336,7 @@ public interface ServerPlayer extends Player, Subject {
 
     /**
      * {@link Keys#SPECTATOR_TARGET}
+     *
      * @return The entity this player is "spectating"
      */
     default Optional<Value.Mutable<Entity>> spectatorTarget() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/trader/Trader.java b/src/main/java/org/spongepowered/api/entity/living/trader/Trader.java
index 7f2d43a30..795db56da 100644
--- a/src/main/java/org/spongepowered/api/entity/living/trader/Trader.java
+++ b/src/main/java/org/spongepowered/api/entity/living/trader/Trader.java
@@ -34,6 +34,7 @@ public interface Trader extends Creature, Merchant {
 
     /**
      * {@link Keys#IS_TRADING}
+     *
      * @return Whether this trader is currently trading with a player
      */
     default Value.Immutable<Boolean> trading() {
diff --git a/src/main/java/org/spongepowered/api/entity/living/trader/Villager.java b/src/main/java/org/spongepowered/api/entity/living/trader/Villager.java
index 73085dc5e..897ea87aa 100644
--- a/src/main/java/org/spongepowered/api/entity/living/trader/Villager.java
+++ b/src/main/java/org/spongepowered/api/entity/living/trader/Villager.java
@@ -38,6 +38,7 @@ public interface Villager extends Trader, Ageable {
 
     /**
      * {@link Keys#VILLAGER_TYPE}
+     *
      * @return The villager type
      * @see org.spongepowered.api.data.type.VillagerTypes
      */
@@ -56,6 +57,7 @@ public interface Villager extends Trader, Ageable {
 
     /**
      * {@link Keys#PROFESSION_LEVEL}
+     *
      * @return The profession level of this villager
      */
     default Value.Mutable<Integer> professionLevel() {
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/DamagingProjectile.java b/src/main/java/org/spongepowered/api/entity/projectile/DamagingProjectile.java
index 674ac425e..809e17c2b 100644
--- a/src/main/java/org/spongepowered/api/entity/projectile/DamagingProjectile.java
+++ b/src/main/java/org/spongepowered/api/entity/projectile/DamagingProjectile.java
@@ -36,6 +36,7 @@ public interface DamagingProjectile extends Projectile {
 
     /**
      * {@link Keys#ATTACK_DAMAGE}
+     *
      * @return The attack damage
      */
     default Value.Mutable<Double> attackDamage() {
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/EntityTargetingProjectile.java b/src/main/java/org/spongepowered/api/entity/projectile/EntityTargetingProjectile.java
index 7a5d02ac5..99511010a 100644
--- a/src/main/java/org/spongepowered/api/entity/projectile/EntityTargetingProjectile.java
+++ b/src/main/java/org/spongepowered/api/entity/projectile/EntityTargetingProjectile.java
@@ -37,6 +37,7 @@ public interface EntityTargetingProjectile extends Projectile {
 
     /**
      * {@link Keys#TARGET_ENTITY}
+     *
      * @return The targeted entity, if available
      */
     default Optional<Value.Mutable<Entity>> targetEntity() {
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/EyeOfEnder.java b/src/main/java/org/spongepowered/api/entity/projectile/EyeOfEnder.java
index 8545a3ba2..232765bc5 100644
--- a/src/main/java/org/spongepowered/api/entity/projectile/EyeOfEnder.java
+++ b/src/main/java/org/spongepowered/api/entity/projectile/EyeOfEnder.java
@@ -35,6 +35,7 @@ public interface EyeOfEnder extends Projectile {
 
     /**
      * {@link Keys#TARGET_LOCATION}
+     *
      * @return The targeted location, if available
      */
     default Value.Mutable<Vector3d> targetLocation() {
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/FishingBobber.java b/src/main/java/org/spongepowered/api/entity/projectile/FishingBobber.java
index c621dc121..25fcb688c 100644
--- a/src/main/java/org/spongepowered/api/entity/projectile/FishingBobber.java
+++ b/src/main/java/org/spongepowered/api/entity/projectile/FishingBobber.java
@@ -37,6 +37,7 @@ public interface FishingBobber extends Projectile {
 
     /**
      * {@link Keys#TARGET_ENTITY}
+     *
      * @see Keys#TARGET_ENTITY
      * @return The targeted entity, if available
      */
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/Projectile.java b/src/main/java/org/spongepowered/api/entity/projectile/Projectile.java
index 648663235..cf45ae811 100644
--- a/src/main/java/org/spongepowered/api/entity/projectile/Projectile.java
+++ b/src/main/java/org/spongepowered/api/entity/projectile/Projectile.java
@@ -39,6 +39,7 @@ public interface Projectile extends Entity {
 
     /**
      * {@link Keys#SHOOTER}
+     *
      * @return The shooter
      */
     default Optional<Value.Mutable<ProjectileSource>> shooter() {
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/ShulkerBullet.java b/src/main/java/org/spongepowered/api/entity/projectile/ShulkerBullet.java
index ab2315493..2854b4c64 100644
--- a/src/main/java/org/spongepowered/api/entity/projectile/ShulkerBullet.java
+++ b/src/main/java/org/spongepowered/api/entity/projectile/ShulkerBullet.java
@@ -36,6 +36,7 @@ public interface ShulkerBullet extends EntityTargetingProjectile, DamagingProjec
 
     /**
      * {@link Keys#DIRECTION}
+     *
      * @return The direction of this bullet
      */
     default Value.Mutable<Direction> hangingDirection() {
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/arrow/ArrowEntity.java b/src/main/java/org/spongepowered/api/entity/projectile/arrow/ArrowEntity.java
index ea87918bd..6ff4c92e7 100644
--- a/src/main/java/org/spongepowered/api/entity/projectile/arrow/ArrowEntity.java
+++ b/src/main/java/org/spongepowered/api/entity/projectile/arrow/ArrowEntity.java
@@ -36,6 +36,7 @@ public interface ArrowEntity extends DamagingProjectile {
 
     /**
      * {@link Keys#PICKUP_RULE}
+     *
      * @return The pickup rule
      * @see org.spongepowered.api.data.type.PickupRules
      */
@@ -45,6 +46,7 @@ public interface ArrowEntity extends DamagingProjectile {
 
     /**
      * {@link Keys#KNOCKBACK_STRENGTH}
+     *
      * @return The knockback strength
      */
     default Value.Mutable<Double> knockbackStrength() {
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/explosive/FireworkRocket.java b/src/main/java/org/spongepowered/api/entity/projectile/explosive/FireworkRocket.java
index 059fcdc92..8ef111ef0 100644
--- a/src/main/java/org/spongepowered/api/entity/projectile/explosive/FireworkRocket.java
+++ b/src/main/java/org/spongepowered/api/entity/projectile/explosive/FireworkRocket.java
@@ -38,6 +38,7 @@ public interface FireworkRocket extends Projectile, FusedExplosive {
 
     /**
      * {@link Keys#FIREWORK_EFFECTS}
+     *
      * @return The firework effects
      */
     default ListValue.Mutable<FireworkEffect> effects() {
diff --git a/src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/FireballEntity.java b/src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/FireballEntity.java
index 2f1902572..e67ba2bdb 100644
--- a/src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/FireballEntity.java
+++ b/src/main/java/org/spongepowered/api/entity/projectile/explosive/fireball/FireballEntity.java
@@ -36,6 +36,7 @@ public interface FireballEntity extends DamagingProjectile {
 
     /**
      * {@link Keys#ACCELERATION}
+     *
      * @return The fireball's acceleration
      */
     default Value.Mutable<Vector3d> acceleration() {
diff --git a/src/main/java/org/spongepowered/api/entity/vehicle/Boat.java b/src/main/java/org/spongepowered/api/entity/vehicle/Boat.java
index 4c85a6813..7e97906a3 100644
--- a/src/main/java/org/spongepowered/api/entity/vehicle/Boat.java
+++ b/src/main/java/org/spongepowered/api/entity/vehicle/Boat.java
@@ -35,6 +35,7 @@ public interface Boat extends Vehicle {
 
     /**
      * {@link Keys#BOAT_TYPE}
+     *
      * @return The type of the boat
      */
     default Value.Mutable<BoatType> boatType() {
@@ -43,6 +44,7 @@ public interface Boat extends Vehicle {
 
     /**
      * {@link Keys#IS_IN_WATER}
+     *
      * @return Whether this boat is in water
      */
     default Value.Mutable<Boolean> inWater() {
@@ -51,6 +53,7 @@ public interface Boat extends Vehicle {
 
     /**
      * {@link Keys#CAN_MOVE_ON_LAND}
+     *
      * @return Whether this boat can travel over land
      */
     default Value.Mutable<Boolean> moveOnLand() {
@@ -59,6 +62,7 @@ public interface Boat extends Vehicle {
 
     /**
      * {@link Keys#MAX_SPEED}
+     *
      * @return The maximum speed a boat can go
      */
     default Value.Mutable<Double> maxSpeed() {
@@ -67,6 +71,7 @@ public interface Boat extends Vehicle {
 
     /**
      * {@link Keys#UNOCCUPIED_DECELERATION}
+     *
      * @return The deceleration value when unoccupied
      */
     default Value.Mutable<Double> unoccupiedDeceleration() {
@@ -75,6 +80,7 @@ public interface Boat extends Vehicle {
 
     /**
      * {@link Keys#OCCUPIED_DECELERATION}
+     *
      * @return The deceleration value when occupied
      */
     default Value.Mutable<Double> occupiedDeceleration() {
diff --git a/src/main/java/org/spongepowered/api/entity/vehicle/minecart/BlockOccupiedMinecart.java b/src/main/java/org/spongepowered/api/entity/vehicle/minecart/BlockOccupiedMinecart.java
index c5fb614ae..1ee14d9ad 100644
--- a/src/main/java/org/spongepowered/api/entity/vehicle/minecart/BlockOccupiedMinecart.java
+++ b/src/main/java/org/spongepowered/api/entity/vehicle/minecart/BlockOccupiedMinecart.java
@@ -32,6 +32,7 @@ public interface BlockOccupiedMinecart extends MinecartLike {
 
     /**
      * {@link Keys#BLOCK_STATE}
+     *
      * @return The block state in this minecart
      */
     default Value.Immutable<BlockState> block() {
diff --git a/src/main/java/org/spongepowered/api/entity/vehicle/minecart/FurnaceMinecart.java b/src/main/java/org/spongepowered/api/entity/vehicle/minecart/FurnaceMinecart.java
index 246b5e1fc..ce3266ba4 100644
--- a/src/main/java/org/spongepowered/api/entity/vehicle/minecart/FurnaceMinecart.java
+++ b/src/main/java/org/spongepowered/api/entity/vehicle/minecart/FurnaceMinecart.java
@@ -37,6 +37,7 @@ public interface FurnaceMinecart extends BlockOccupiedMinecart {
 
     /**
      * {@link Keys#FUEL}
+     *
      * @return The duration of fuel remaining in ticks
      */
     default Value.Mutable<Integer> fuelDuration() {
diff --git a/src/main/java/org/spongepowered/api/entity/vehicle/minecart/MinecartLike.java b/src/main/java/org/spongepowered/api/entity/vehicle/minecart/MinecartLike.java
index e62be3452..dfe46e6e4 100644
--- a/src/main/java/org/spongepowered/api/entity/vehicle/minecart/MinecartLike.java
+++ b/src/main/java/org/spongepowered/api/entity/vehicle/minecart/MinecartLike.java
@@ -36,6 +36,7 @@ public interface MinecartLike extends Entity {
 
     /**
      * {@link Keys#IS_ON_RAIL}
+     *
      * @return Whether this minecart is on a rail or not
      */
     default Value.Mutable<Boolean> onRail() {
@@ -44,6 +45,7 @@ public interface MinecartLike extends Entity {
 
     /**
      * {@link Keys#SWIFTNESS}
+     *
      * @return The current swiftness of the minecart
      */
     default Value.Mutable<Double> swiftness() {
@@ -64,6 +66,7 @@ public interface MinecartLike extends Entity {
 
     /**
      * {@link Keys#SLOWS_UNOCCUPIED}
+     *
      * @return Whether this minecart will slow when unoccupied
      */
     default Value.Mutable<Boolean> slowsUnoccupied() {
@@ -72,6 +75,7 @@ public interface MinecartLike extends Entity {
 
     /**
      * {@link Keys#AIRBORNE_VELOCITY_MODIFIER}
+     *
      * @return The airborne velocity modifier
      */
     default Value.Mutable<Vector3d> airborneVelocityModifier() {
@@ -80,6 +84,7 @@ public interface MinecartLike extends Entity {
 
     /**
      * {@link Keys#DERAILED_VELOCITY_MODIFIER}
+     *
      * @return The derailed velocity modifier
      */
     default Value.Mutable<Vector3d> derailedVelocityModifier() {
diff --git a/src/main/java/org/spongepowered/api/entity/weather/WeatherEffect.java b/src/main/java/org/spongepowered/api/entity/weather/WeatherEffect.java
index 3c15239fe..8460c8a75 100644
--- a/src/main/java/org/spongepowered/api/entity/weather/WeatherEffect.java
+++ b/src/main/java/org/spongepowered/api/entity/weather/WeatherEffect.java
@@ -38,6 +38,7 @@ public interface WeatherEffect extends Entity {
 
     /**
      * {@link Keys#IS_EFFECT_ONLY}
+     *
      * @return Whether this effect is harmful
      */
     default Value.Mutable<Boolean> isEffectOnly() {
@@ -46,6 +47,7 @@ public interface WeatherEffect extends Entity {
 
     /**
      * {@link Keys#DESPAWN_DELAY}
+     *
      * @return The delay before this effect is removed
      */
     default Value.Mutable<Ticks> expirationDelay() {
diff --git a/src/main/java/org/spongepowered/api/event/Cause.java b/src/main/java/org/spongepowered/api/event/Cause.java
index ac1f13c1d..12f47cd34 100644
--- a/src/main/java/org/spongepowered/api/event/Cause.java
+++ b/src/main/java/org/spongepowered/api/event/Cause.java
@@ -145,7 +145,7 @@ public final class Cause implements Iterable<Object> {
         java.util.Objects.requireNonNull(ctx, "Context");
         final Object[] objects = new Object[causes.size()];
         int index = 0;
-        for (final Object cause: causes) {
+        for (final Object cause : causes) {
             objects[index++] = java.util.Objects.requireNonNull(cause, "Null cause element!");
         }
         this.cause = objects;
@@ -248,8 +248,7 @@ public final class Cause implements Iterable<Object> {
     }
 
     /**
-     * Returns whether the target class matches any object of this {@link Cause}
-     * .
+     * Returns whether the target class matches any object of this {@link Cause}.
      * 
      * @param target The class of the target type
      * @return True if found, false otherwise
diff --git a/src/main/java/org/spongepowered/api/event/EventContext.java b/src/main/java/org/spongepowered/api/event/EventContext.java
index 28dd40c23..2bb5838f5 100644
--- a/src/main/java/org/spongepowered/api/event/EventContext.java
+++ b/src/main/java/org/spongepowered/api/event/EventContext.java
@@ -196,9 +196,9 @@ public final class EventContext {
         if (!(object instanceof EventContext)) {
             return false;
         }
-        EventContext ctx = (EventContext) object;
+        final EventContext ctx = (EventContext) object;
         for (Map.Entry<EventContextKey<?>, Object> entry : this.entries.entrySet()) {
-            Object other = ctx.entries.get(entry.getKey());
+            final Object other = ctx.entries.get(entry.getKey());
             if (other == null) {
                 return false;
             }
@@ -216,7 +216,7 @@ public final class EventContext {
 
     @Override
     public String toString() {
-        StringJoiner joiner = new StringJoiner(", ");
+        final StringJoiner joiner = new StringJoiner(", ");
         for (Map.Entry<EventContextKey<?>, Object> entry : this.entries.entrySet()) {
             joiner.add("\"" + entry.getKey().toString() + "\"=" + entry.getValue().toString());
         }
diff --git a/src/main/java/org/spongepowered/api/event/EventContextKeys.java b/src/main/java/org/spongepowered/api/event/EventContextKeys.java
index e0026bfc7..af7832193 100644
--- a/src/main/java/org/spongepowered/api/event/EventContextKeys.java
+++ b/src/main/java/org/spongepowered/api/event/EventContextKeys.java
@@ -48,9 +48,9 @@ import org.spongepowered.api.service.permission.Subject;
 import org.spongepowered.api.util.TypeTokens;
 import org.spongepowered.api.world.LocatableBlock;
 import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.explosion.Explosion;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.math.vector.Vector3d;
 import org.spongepowered.plugin.PluginContainer;
diff --git a/src/main/java/org/spongepowered/api/event/action/CreateMapEvent.java b/src/main/java/org/spongepowered/api/event/action/CreateMapEvent.java
index 836e121f7..1100da122 100644
--- a/src/main/java/org/spongepowered/api/event/action/CreateMapEvent.java
+++ b/src/main/java/org/spongepowered/api/event/action/CreateMapEvent.java
@@ -33,9 +33,10 @@ import org.spongepowered.api.map.MapInfo;
  * Can be caused by players or a plugin.
  */
 public interface CreateMapEvent extends Event, Cancellable {
-	/**
-	 * Gets the {@link org.spongepowered.api.map.MapInfo} for this map
-	 * @return MapInfoData Map data
-	 */
-	MapInfo mapInfo();
+    /**
+     * Gets the {@link org.spongepowered.api.map.MapInfo} for this map
+     *
+     * @return MapInfoData Map data
+     */
+    MapInfo mapInfo();
 }
diff --git a/src/main/java/org/spongepowered/api/event/advancement/CriterionEvent.java b/src/main/java/org/spongepowered/api/event/advancement/CriterionEvent.java
index 82d468de1..bc0bf1982 100644
--- a/src/main/java/org/spongepowered/api/event/advancement/CriterionEvent.java
+++ b/src/main/java/org/spongepowered/api/event/advancement/CriterionEvent.java
@@ -29,8 +29,8 @@ import org.spongepowered.api.advancement.criteria.ScoreAdvancementCriterion;
 import org.spongepowered.api.advancement.criteria.trigger.FilteredTrigger;
 import org.spongepowered.api.advancement.criteria.trigger.FilteredTriggerConfiguration;
 import org.spongepowered.api.event.Cancellable;
-import org.spongepowered.api.event.GenericEvent;
 import org.spongepowered.api.event.Cause;
+import org.spongepowered.api.event.GenericEvent;
 import org.spongepowered.api.scoreboard.criteria.Criterion;
 
 import java.time.Instant;
diff --git a/src/main/java/org/spongepowered/api/event/block/NotifyNeighborBlockEvent.java b/src/main/java/org/spongepowered/api/event/block/NotifyNeighborBlockEvent.java
index 803ff54b5..e19dd50b5 100644
--- a/src/main/java/org/spongepowered/api/event/block/NotifyNeighborBlockEvent.java
+++ b/src/main/java/org/spongepowered/api/event/block/NotifyNeighborBlockEvent.java
@@ -48,7 +48,7 @@ public interface NotifyNeighborBlockEvent extends Event, Cancellable {
     }
 
     default void filterTickets(final Predicate<NotificationTicket> predicate) {
-        this.tickets().forEach(ticket ->{
+        this.tickets().forEach(ticket -> {
             if (predicate.test(ticket)) {
                 ticket.setValid(false);
             }
diff --git a/src/main/java/org/spongepowered/api/event/block/entity/BrewingEvent.java b/src/main/java/org/spongepowered/api/event/block/entity/BrewingEvent.java
index 278ff03d8..505a28e58 100644
--- a/src/main/java/org/spongepowered/api/event/block/entity/BrewingEvent.java
+++ b/src/main/java/org/spongepowered/api/event/block/entity/BrewingEvent.java
@@ -61,6 +61,7 @@ public interface BrewingEvent extends Event {
         /**
          * Gets an immutable {@link List} of {@link ItemStackSnapshot}s that are the result
          * of the brew.
+         *
          * @return The brewed items
          */
         List<ItemStackSnapshot> brewedItemStacks();
@@ -71,6 +72,7 @@ public interface BrewingEvent extends Event {
         /**
          * Gets an immutable {@link List} of {@link ItemStackSnapshot}s that are the result
          * of the brew.
+         *
          * @return The brewed items
          */
         List<ItemStackSnapshot> brewedItemStacks();
diff --git a/src/main/java/org/spongepowered/api/event/block/entity/ChangeSignEvent.java b/src/main/java/org/spongepowered/api/event/block/entity/ChangeSignEvent.java
index eb0baa736..b70ec2bc9 100644
--- a/src/main/java/org/spongepowered/api/event/block/entity/ChangeSignEvent.java
+++ b/src/main/java/org/spongepowered/api/event/block/entity/ChangeSignEvent.java
@@ -41,12 +41,14 @@ public interface ChangeSignEvent extends Event, Cancellable {
 
     /**
      * Gets the original {@link ListValue} before event changes.
+     *
      * @return The immutable SignData
      */
     ListValue.Immutable<Component> originalText();
 
     /**
      * Gets the {@link ListValue} to be applied to the {@link Sign} after event resolution.
+     *
      * @return The SignData
      */
     ListValue.Mutable<Component> text();
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/DismountTypes.java b/src/main/java/org/spongepowered/api/event/cause/entity/DismountTypes.java
index 3c2d55cc8..93703c760 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/DismountTypes.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/DismountTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.event.cause.entity;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/MovementTypes.java b/src/main/java/org/spongepowered/api/event/cause/entity/MovementTypes.java
index 4adb52c7f..b794f3351 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/MovementTypes.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/MovementTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.event.cause.entity;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/SpawnTypes.java b/src/main/java/org/spongepowered/api/event/cause/entity/SpawnTypes.java
index f548e85c0..1516a3f5a 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/SpawnTypes.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/SpawnTypes.java
@@ -36,10 +36,10 @@ import org.spongepowered.api.entity.living.animal.Animal;
 import org.spongepowered.api.entity.living.trader.Trader;
 import org.spongepowered.api.entity.vehicle.minecart.SpawnerMinecart;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.chunk.Chunk;
 import org.spongepowered.api.world.weather.WeatherType;
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageFunction.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageFunction.java
index 3fd82d7f2..6efb3adc7 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageFunction.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageFunction.java
@@ -95,7 +95,7 @@ public class DamageFunction implements ModifierFunction<DamageModifier> {
     @Override
     public String toString() {
         return new StringJoiner(",", DamageFunction.class.getSimpleName() + "[", "]")
-                .add("modifier=" +this.modifier())
+                .add("modifier=" + this.modifier())
                 .add("function=" + this.function())
                 .toString();
     }
diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifierTypes.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifierTypes.java
index 1f1c9d59b..d46b085d5 100644
--- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifierTypes.java
+++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageModifierTypes.java
@@ -37,10 +37,10 @@ import org.spongepowered.api.item.enchantment.EnchantmentType;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.difficulty.Difficulty;
 
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 69dad41b5..1a218e4d3 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
@@ -27,10 +27,10 @@ package org.spongepowered.api.event.cause.entity.damage;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/event/command/ExecuteCommandEvent.java b/src/main/java/org/spongepowered/api/event/command/ExecuteCommandEvent.java
index e72d66075..1a9f9487c 100644
--- a/src/main/java/org/spongepowered/api/event/command/ExecuteCommandEvent.java
+++ b/src/main/java/org/spongepowered/api/event/command/ExecuteCommandEvent.java
@@ -28,8 +28,8 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.command.CommandCause;
 import org.spongepowered.api.command.CommandResult;
 import org.spongepowered.api.event.Cancellable;
-import org.spongepowered.api.event.Event;
 import org.spongepowered.api.event.Cause;
+import org.spongepowered.api.event.Event;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/spongepowered/api/event/entity/AffectEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/AffectEntityEvent.java
index 4df03b636..70c46b794 100644
--- a/src/main/java/org/spongepowered/api/event/entity/AffectEntityEvent.java
+++ b/src/main/java/org/spongepowered/api/event/entity/AffectEntityEvent.java
@@ -32,8 +32,8 @@ import org.spongepowered.api.event.Order;
 import org.spongepowered.api.event.impl.entity.AbstractAffectEntityEvent;
 import org.spongepowered.api.util.annotation.eventgen.ImplementedBy;
 import org.spongepowered.api.util.annotation.eventgen.PropertySettings;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.explosion.Explosion;
+import org.spongepowered.api.world.server.ServerLocation;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -86,11 +86,11 @@ public interface AffectEntityEvent extends Event, Cancellable {
      * @return The entities removed from {@link #entities()}
      */
     default List<Entity> filterEntityLocations(Predicate<ServerLocation> predicate) {
-        List<Entity> removedEntities = new ArrayList<>();
+        final List<Entity> removedEntities = new ArrayList<>();
 
-        Iterator<Entity> i = this.entities().iterator();
+        final Iterator<Entity> i = this.entities().iterator();
         while (i.hasNext()) {
-            Entity entity = i.next();
+            final Entity entity = i.next();
             if (!entity.location().onServer().map(predicate::test).orElse(false)) {
                 i.remove();
                 removedEntities.add(entity);
@@ -110,11 +110,11 @@ public interface AffectEntityEvent extends Event, Cancellable {
      * @return The entities removed from {@link #entities()}
      */
     default List<? extends Entity> filterEntities(Predicate<Entity> predicate) {
-        List<Entity> removedEntities = new ArrayList<>();
+        final List<Entity> removedEntities = new ArrayList<>();
 
-        Iterator<Entity> i = this.entities().iterator();
+        final Iterator<Entity> i = this.entities().iterator();
         while (i.hasNext()) {
-            Entity entity = i.next();
+            final Entity entity = i.next();
             if (!predicate.test(entity)) {
                 i.remove();
                 removedEntities.add(entity);
diff --git a/src/main/java/org/spongepowered/api/event/entity/DamageEntityEvent.java b/src/main/java/org/spongepowered/api/event/entity/DamageEntityEvent.java
index 65f4097af..3f64113da 100644
--- a/src/main/java/org/spongepowered/api/event/entity/DamageEntityEvent.java
+++ b/src/main/java/org/spongepowered/api/event/entity/DamageEntityEvent.java
@@ -31,8 +31,8 @@ import org.spongepowered.api.entity.living.monster.skeleton.Skeleton;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.entity.projectile.arrow.ArrowEntity;
 import org.spongepowered.api.event.Cancellable;
-import org.spongepowered.api.event.Event;
 import org.spongepowered.api.event.Cause;
+import org.spongepowered.api.event.Event;
 import org.spongepowered.api.event.cause.entity.damage.DamageFunction;
 import org.spongepowered.api.event.cause.entity.damage.DamageModifier;
 import org.spongepowered.api.event.cause.entity.damage.DamageModifier.Builder;
diff --git a/src/main/java/org/spongepowered/api/event/entity/ai/goal/GoalEvent.java b/src/main/java/org/spongepowered/api/event/entity/ai/goal/GoalEvent.java
index bc796e096..0d14efda4 100644
--- a/src/main/java/org/spongepowered/api/event/entity/ai/goal/GoalEvent.java
+++ b/src/main/java/org/spongepowered/api/event/entity/ai/goal/GoalEvent.java
@@ -24,8 +24,8 @@
  */
 package org.spongepowered.api.event.entity.ai.goal;
 
-import org.spongepowered.api.entity.ai.goal.GoalExecutor;
 import org.spongepowered.api.entity.ai.goal.Goal;
+import org.spongepowered.api.entity.ai.goal.GoalExecutor;
 import org.spongepowered.api.entity.living.Agent;
 import org.spongepowered.api.event.Cancellable;
 import org.spongepowered.api.event.Event;
diff --git a/src/main/java/org/spongepowered/api/event/entity/living/player/PlayerChangeClientSettingsEvent.java b/src/main/java/org/spongepowered/api/event/entity/living/player/PlayerChangeClientSettingsEvent.java
index 5418e87c2..befcac69a 100644
--- a/src/main/java/org/spongepowered/api/event/entity/living/player/PlayerChangeClientSettingsEvent.java
+++ b/src/main/java/org/spongepowered/api/event/entity/living/player/PlayerChangeClientSettingsEvent.java
@@ -25,9 +25,9 @@
 package org.spongepowered.api.event.entity.living.player;
 
 import org.spongepowered.api.data.type.SkinPart;
+import org.spongepowered.api.entity.living.player.chat.ChatVisibility;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
 import org.spongepowered.api.event.Event;
-import org.spongepowered.api.entity.living.player.chat.ChatVisibility;
 
 import java.util.Locale;
 import java.util.Set;
diff --git a/src/main/java/org/spongepowered/api/event/impl/entity/AbstractAffectEntityEvent.java b/src/main/java/org/spongepowered/api/event/impl/entity/AbstractAffectEntityEvent.java
index 1aee4c289..8333e11ff 100644
--- a/src/main/java/org/spongepowered/api/event/impl/entity/AbstractAffectEntityEvent.java
+++ b/src/main/java/org/spongepowered/api/event/impl/entity/AbstractAffectEntityEvent.java
@@ -45,8 +45,8 @@ public abstract class AbstractAffectEntityEvent extends AbstractEvent implements
     public List<EntitySnapshot> entitySnapshots() {
         if (this.entitySnapshots == null) {
             if (this.currentOrder == Order.PRE) {
-                ImmutableList.Builder<EntitySnapshot> builder = ImmutableList.builder();
-                for (Entity entity: this.entities) {
+                final ImmutableList.Builder<EntitySnapshot> builder = ImmutableList.builder();
+                for (Entity entity : this.entities) {
                     builder.add(entity.createSnapshot());
                 }
                 this.entitySnapshots = builder.build();
diff --git a/src/main/java/org/spongepowered/api/event/impl/entity/AbstractDamageEntityEvent.java b/src/main/java/org/spongepowered/api/event/impl/entity/AbstractDamageEntityEvent.java
index ef376b275..dfe448dec 100644
--- a/src/main/java/org/spongepowered/api/event/impl/entity/AbstractDamageEntityEvent.java
+++ b/src/main/java/org/spongepowered/api/event/impl/entity/AbstractDamageEntityEvent.java
@@ -101,7 +101,7 @@ public abstract class AbstractDamageEntityEvent extends AbstractModifierEvent<Da
         int indexToAddTo = 0;
         boolean addAtEnd = true;
         for (Iterator<DamageFunction> iterator = this.modifierFunctions.iterator(); iterator.hasNext(); ) {
-            ModifierFunction<DamageModifier> tuple = iterator.next();
+            final ModifierFunction<DamageModifier> tuple = iterator.next();
             if (tuple.modifier().equals(damageModifier)) {
                 iterator.remove();
                 addAtEnd = false;
@@ -172,7 +172,7 @@ public abstract class AbstractDamageEntityEvent extends AbstractModifierEvent<Da
 
     @Override
     public List<DamageFunction> modifiers() {
-        ImmutableList.Builder<DamageFunction> builder = ImmutableList.builder();
+        final ImmutableList.Builder<DamageFunction> builder = ImmutableList.builder();
         for (ModifierFunction<DamageModifier> entry : this.modifierFunctions) {
             if (entry instanceof DamageFunction) {
                 builder.add((DamageFunction) entry);
@@ -196,7 +196,7 @@ public abstract class AbstractDamageEntityEvent extends AbstractModifierEvent<Da
 
     @Override
     public boolean willCauseDeath() {
-        Optional<Double> health = this.entity().get(Keys.HEALTH);
+        final Optional<Double> health = this.entity().get(Keys.HEALTH);
         return health.isPresent() && health.get() - this.finalDamage() <= 0;
     }
 
diff --git a/src/main/java/org/spongepowered/api/event/impl/entity/AbstractModifierEvent.java b/src/main/java/org/spongepowered/api/event/impl/entity/AbstractModifierEvent.java
index 38ecfbe18..c9a85c2be 100644
--- a/src/main/java/org/spongepowered/api/event/impl/entity/AbstractModifierEvent.java
+++ b/src/main/java/org/spongepowered/api/event/impl/entity/AbstractModifierEvent.java
@@ -59,7 +59,7 @@ public abstract class AbstractModifierEvent<T extends ModifierFunction<M>, M> ex
         double finalDamage = originalValue;
         for (T tuple : originalFunctions) {
             this.modifierFunctions.add(this.convertTuple(tuple.modifier(), tuple.function()));
-            double tempDamage = Objects.requireNonNull(tuple.function().applyAsDouble(finalDamage));
+            final double tempDamage = Objects.requireNonNull(tuple.function().applyAsDouble(finalDamage));
             finalDamage += tempDamage;
             modifierMapBuilder.add(new Tuple<>(tuple.modifier(), tempDamage));
             mapBuilder.put(tuple.modifier(), tempDamage);
@@ -78,10 +78,10 @@ public abstract class AbstractModifierEvent<T extends ModifierFunction<M>, M> ex
         double tempAmount = baseAmount;
         this.modifiers.clear();
         for (T entry : this.modifierFunctions) {
-            double modifierAmount = Objects.requireNonNull(entry.function().applyAsDouble(tempAmount));
+            final double modifierAmount = Objects.requireNonNull(entry.function().applyAsDouble(tempAmount));
             if (this.modifiers.containsKey(entry.modifier())) {
-                double oldAmount = this.modifiers.get(entry.modifier());
-                double difference = oldAmount - modifierAmount;
+                final double oldAmount = this.modifiers.get(entry.modifier());
+                final double difference = oldAmount - modifierAmount;
                 if (oldAmount > 0) {
                     this.modifiers.put(entry.modifier(), Math.max(0, oldAmount - difference));
                 } else {
@@ -108,7 +108,7 @@ public abstract class AbstractModifierEvent<T extends ModifierFunction<M>, M> ex
      * @return The list of modifiers
      */
     public List<T> modifiers() {
-        ImmutableList.Builder<T> builder = ImmutableList.builder();
+        final ImmutableList.Builder<T> builder = ImmutableList.builder();
         for (T entry : this.modifierFunctions) {
             builder.add(entry);
         }
diff --git a/src/main/java/org/spongepowered/api/event/item/inventory/AffectItemStackEvent.java b/src/main/java/org/spongepowered/api/event/item/inventory/AffectItemStackEvent.java
index 4f2aa8f21..6a9e7e635 100644
--- a/src/main/java/org/spongepowered/api/event/item/inventory/AffectItemStackEvent.java
+++ b/src/main/java/org/spongepowered/api/event/item/inventory/AffectItemStackEvent.java
@@ -66,7 +66,7 @@ public interface AffectItemStackEvent extends Event, Cancellable {
      *     <code>false</code>
      */
     default List<? extends  Transaction<ItemStackSnapshot>> filter(Predicate<ItemStack> predicate) {
-        List<Transaction<ItemStackSnapshot>> invalidatedTransactions = Lists.newArrayList();
+        final List<Transaction<ItemStackSnapshot>> invalidatedTransactions = Lists.newArrayList();
         this.transactions().stream().filter(transaction -> !predicate.test(transaction.finalReplacement().createStack())).forEach(transaction -> {
             transaction.setValid(false);
             invalidatedTransactions.add(transaction);
diff --git a/src/main/java/org/spongepowered/api/event/item/inventory/AffectSlotEvent.java b/src/main/java/org/spongepowered/api/event/item/inventory/AffectSlotEvent.java
index 3d28cab03..5d5b8ac69 100644
--- a/src/main/java/org/spongepowered/api/event/item/inventory/AffectSlotEvent.java
+++ b/src/main/java/org/spongepowered/api/event/item/inventory/AffectSlotEvent.java
@@ -39,7 +39,7 @@ public interface AffectSlotEvent extends AffectItemStackEvent {
 
     @Override
     default List<SlotTransaction> filter(Predicate<ItemStack> predicate) {
-        List<SlotTransaction> invalidatedTransactions = Lists.newArrayList();
+        final List<SlotTransaction> invalidatedTransactions = Lists.newArrayList();
         this.transactions().stream().filter(transaction -> !predicate.test(transaction.finalReplacement().createStack())).forEach(transaction -> {
             transaction.setValid(false);
             invalidatedTransactions.add(transaction);
diff --git a/src/main/java/org/spongepowered/api/event/message/PlayerChatEvent.java b/src/main/java/org/spongepowered/api/event/message/PlayerChatEvent.java
index 01d8ce9d7..379b3caad 100644
--- a/src/main/java/org/spongepowered/api/event/message/PlayerChatEvent.java
+++ b/src/main/java/org/spongepowered/api/event/message/PlayerChatEvent.java
@@ -24,13 +24,14 @@
  */
 package org.spongepowered.api.event.message;
 
-import java.util.Optional;
 import net.kyori.adventure.text.Component;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.entity.living.player.PlayerChatRouter;
 import org.spongepowered.api.event.Cancellable;
 import org.spongepowered.api.event.Event;
 
+import java.util.Optional;
+
 /**
  * Fired when the {@link Component} being sent to a {@link PlayerChatRouter} was
  * due to chatting.
diff --git a/src/main/java/org/spongepowered/api/event/user/BanUserEvent.java b/src/main/java/org/spongepowered/api/event/user/BanUserEvent.java
index d6b47481d..6fadd6153 100644
--- a/src/main/java/org/spongepowered/api/event/user/BanUserEvent.java
+++ b/src/main/java/org/spongepowered/api/event/user/BanUserEvent.java
@@ -26,8 +26,8 @@ package org.spongepowered.api.event.user;
 
 import org.spongepowered.api.entity.living.player.User;
 import org.spongepowered.api.event.Event;
-import org.spongepowered.api.util.annotation.eventgen.GenerateFactoryMethod;
 import org.spongepowered.api.service.ban.Ban;
+import org.spongepowered.api.util.annotation.eventgen.GenerateFactoryMethod;
 
 /**
  * Occurs when a user is banned.
diff --git a/src/main/java/org/spongepowered/api/event/user/PardonUserEvent.java b/src/main/java/org/spongepowered/api/event/user/PardonUserEvent.java
index 30b7525cb..39473f802 100644
--- a/src/main/java/org/spongepowered/api/event/user/PardonUserEvent.java
+++ b/src/main/java/org/spongepowered/api/event/user/PardonUserEvent.java
@@ -26,8 +26,8 @@ package org.spongepowered.api.event.user;
 
 import org.spongepowered.api.entity.living.player.User;
 import org.spongepowered.api.event.Event;
-import org.spongepowered.api.util.annotation.eventgen.GenerateFactoryMethod;
 import org.spongepowered.api.service.ban.Ban;
+import org.spongepowered.api.util.annotation.eventgen.GenerateFactoryMethod;
 
 /**
  * Occurs when a user is pardoned.
diff --git a/src/main/java/org/spongepowered/api/event/world/ExplosionEvent.java b/src/main/java/org/spongepowered/api/event/world/ExplosionEvent.java
index b57e0e484..efcbe7de3 100644
--- a/src/main/java/org/spongepowered/api/event/world/ExplosionEvent.java
+++ b/src/main/java/org/spongepowered/api/event/world/ExplosionEvent.java
@@ -28,9 +28,9 @@ import org.spongepowered.api.event.Cancellable;
 import org.spongepowered.api.event.Event;
 import org.spongepowered.api.event.block.ChangeBlockEvent;
 import org.spongepowered.api.event.entity.AffectEntityEvent;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.explosion.Explosion;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.server.ServerWorld;
 
 import java.util.ArrayList;
diff --git a/src/main/java/org/spongepowered/api/fluid/FluidState.java b/src/main/java/org/spongepowered/api/fluid/FluidState.java
index 0d2e9eca9..51957e9da 100644
--- a/src/main/java/org/spongepowered/api/fluid/FluidState.java
+++ b/src/main/java/org/spongepowered/api/fluid/FluidState.java
@@ -29,9 +29,9 @@ import org.spongepowered.api.block.BlockState;
 import org.spongepowered.api.block.BlockType;
 import org.spongepowered.api.data.DataManipulator;
 import org.spongepowered.api.state.State;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.schematic.Schematic;
+import org.spongepowered.api.world.server.ServerLocation;
 
 import java.util.Objects;
 import java.util.function.Supplier;
diff --git a/src/main/java/org/spongepowered/api/fluid/FluidTypes.java b/src/main/java/org/spongepowered/api/fluid/FluidTypes.java
index ca38e7316..fd7f7ebee 100644
--- a/src/main/java/org/spongepowered/api/fluid/FluidTypes.java
+++ b/src/main/java/org/spongepowered/api/fluid/FluidTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.fluid;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/item/FireworkShapes.java b/src/main/java/org/spongepowered/api/item/FireworkShapes.java
index a07cdbf34..0076a1d4c 100644
--- a/src/main/java/org/spongepowered/api/item/FireworkShapes.java
+++ b/src/main/java/org/spongepowered/api/item/FireworkShapes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.item;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * A class containing known {@link FireworkShape}s.
diff --git a/src/main/java/org/spongepowered/api/item/ItemTypes.java b/src/main/java/org/spongepowered/api/item/ItemTypes.java
index dad041092..171f3456d 100644
--- a/src/main/java/org/spongepowered/api/item/ItemTypes.java
+++ b/src/main/java/org/spongepowered/api/item/ItemTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.item;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all possible {@link ItemType}s in vanilla minecraft.
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 08bab360d..827101829 100644
--- a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java
+++ b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.item.enchantment;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of known {@link EnchantmentType}s.
diff --git a/src/main/java/org/spongepowered/api/item/inventory/ContainerTypes.java b/src/main/java/org/spongepowered/api/item/inventory/ContainerTypes.java
index 80621e06f..da81f7281 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/ContainerTypes.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/ContainerTypes.java
@@ -28,10 +28,10 @@ import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.living.trader.Villager;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all possible {@link ContainerType}s in vanilla minecraft.
diff --git a/src/main/java/org/spongepowered/api/item/inventory/ItemStack.java b/src/main/java/org/spongepowered/api/item/inventory/ItemStack.java
index 46f634f26..4f7d1c43f 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/ItemStack.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/ItemStack.java
@@ -239,6 +239,7 @@ public interface ItemStack extends SerializableDataHolder.Mutable {
 
     /**
      * Adds an {@link AttributeModifier} to this item stack.
+     *
      * @param attributeType The attribute type.
      * @param modifier The attribute modifier.
      * @param equipmentType The equipment type this modifier will apply under.
@@ -249,6 +250,7 @@ public interface ItemStack extends SerializableDataHolder.Mutable {
 
     /**
      * Adds an {@link AttributeModifier} to this item stack.
+     *
      * @param attributeType The attribute type.
      * @param modifier The attribute modifier.
      * @param equipmentType The equipment type this modifier will apply under.
@@ -259,6 +261,7 @@ public interface ItemStack extends SerializableDataHolder.Mutable {
 
     /**
      * Adds an {@link AttributeModifier} to this item stack.
+     *
      * @param attributeType The attribute type.
      * @param modifier The attribute modifier.
      * @param equipmentType The equipment type this modifier will apply under.
@@ -269,6 +272,7 @@ public interface ItemStack extends SerializableDataHolder.Mutable {
 
     /**
      * Adds an {@link AttributeModifier} to this item stack.
+     *
      * @param attributeType The attribute type.
      * @param modifier The attribute modifier.
      * @param equipmentType The equipment type this modifier will apply under.
diff --git a/src/main/java/org/spongepowered/api/item/inventory/ItemStackBuilderPopulators.java b/src/main/java/org/spongepowered/api/item/inventory/ItemStackBuilderPopulators.java
index df4cb4263..626e9a0f7 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/ItemStackBuilderPopulators.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/ItemStackBuilderPopulators.java
@@ -223,7 +223,7 @@ public final class ItemStackBuilderPopulators {
     public static <E> BiConsumer<ItemStack.Builder, Random> keyValues(Key<? extends Value<E>> key, Iterable<E> values) {
         Objects.requireNonNull(values, "Iterable cannot be null!");
         Objects.requireNonNull(key, "Key cannot be null!");
-        WeightedTable<E> tableEntries = new WeightedTable<>(1);
+        final WeightedTable<E> tableEntries = new WeightedTable<>(1);
         for (E e : values) {
             tableEntries.add(Objects.requireNonNull(e, "Value cannot be null!"), 1);
         }
@@ -258,7 +258,7 @@ public final class ItemStackBuilderPopulators {
         if (elementPool.isEmpty()) {
             throw new IllegalArgumentException("Element pool cannot be empty!");
         }
-        WeightedTable<E> elementTable = new WeightedTable<>(amount);
+        final WeightedTable<E> elementTable = new WeightedTable<>(amount);
         for (E element : elementPool) {
             elementTable.add(Objects.requireNonNull(element, "Element cannot be null!"), 1);
         }
@@ -402,7 +402,7 @@ public final class ItemStackBuilderPopulators {
         if (elementPool.isEmpty()) {
             throw new IllegalArgumentException("Element pool cannot be empty!");
         }
-        WeightedTable<E> elementTable = new WeightedTable<>(amount);
+        final WeightedTable<E> elementTable = new WeightedTable<>(amount);
         for (E element : elementPool) {
             elementTable.add(element, 1);
         }
@@ -469,7 +469,7 @@ public final class ItemStackBuilderPopulators {
      * @return The new biconsumer to apply to an itemstack builder
      */
     public static <E, V extends Value<E>> BiConsumer<ItemStack.Builder, Random> values(Iterable<V> values) {
-        WeightedTable<V> tableEntries = new WeightedTable<>(1);
+        final WeightedTable<V> tableEntries = new WeightedTable<>(1);
         for (V value : values) {
             tableEntries.add(Objects.requireNonNull(value, "Value cannot be null!"), 1);
         }
@@ -586,7 +586,7 @@ public final class ItemStackBuilderPopulators {
             Collection<EnchantmentType> itemEnchantmentTypes) {
         Objects.requireNonNull(amount, "Variable amount cannot be null!");
         Objects.requireNonNull(itemEnchantmentTypes, "EnchantmentType collection cannot be null!");
-        List<Tuple<EnchantmentType, VariableAmount>> list = itemEnchantmentTypes.stream()
+        final List<Tuple<EnchantmentType, VariableAmount>> list = itemEnchantmentTypes.stream()
                 .map(enchantment -> {
                     Objects.requireNonNull(enchantment, "EnchantmentType cannot be null!");
                     final int minimum = enchantment.minimumLevel();
diff --git a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroups.java b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroups.java
index cceee97df..cb71c92bb 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroups.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroups.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.item.inventory.equipment;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentInventory.java b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentInventory.java
index fe7deb1ad..685f49f18 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentInventory.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentInventory.java
@@ -53,11 +53,11 @@ public interface EquipmentInventory extends Inventory {
      * @param equipmentType Type of equipment slot to query for
      * @return removed ItemStack, per the semantics of {@link Inventory#poll()}
      */
-     InventoryTransactionResult.Poll poll(EquipmentType equipmentType);
+    InventoryTransactionResult.Poll poll(EquipmentType equipmentType);
 
-     default InventoryTransactionResult.Poll poll(final Supplier<? extends EquipmentType> equipmentType) {
-         return this.poll(equipmentType.get());
-     }
+    default InventoryTransactionResult.Poll poll(final Supplier<? extends EquipmentType> equipmentType) {
+        return this.poll(equipmentType.get());
+    }
 
     /**
      * Gets and remove the items from the stack for the specified equipment type
diff --git a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentTypes.java b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentTypes.java
index 8965f1676..5aefa3742 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentTypes.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.item.inventory.equipment;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * All built-in equipment types.
diff --git a/src/main/java/org/spongepowered/api/item/inventory/menu/ClickTypes.java b/src/main/java/org/spongepowered/api/item/inventory/menu/ClickTypes.java
index 921ed4e33..a02c91ba9 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/menu/ClickTypes.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/menu/ClickTypes.java
@@ -31,10 +31,10 @@ import org.spongepowered.api.item.inventory.menu.handler.ClickHandler;
 import org.spongepowered.api.item.inventory.menu.handler.KeySwapHandler;
 import org.spongepowered.api.item.inventory.menu.handler.SlotClickHandler;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of the click types in {@link Container}s.
diff --git a/src/main/java/org/spongepowered/api/item/inventory/menu/handler/SlotClickHandler.java b/src/main/java/org/spongepowered/api/item/inventory/menu/handler/SlotClickHandler.java
index c1a6aa887..3a6e2bfdc 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/menu/handler/SlotClickHandler.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/menu/handler/SlotClickHandler.java
@@ -31,7 +31,7 @@ import org.spongepowered.api.item.inventory.menu.ClickType;
 import org.spongepowered.api.item.inventory.menu.ClickTypes;
 
 @FunctionalInterface
-public interface SlotClickHandler extends InventoryCallbackHandler{
+public interface SlotClickHandler extends InventoryCallbackHandler {
 
     /**
      * Handler for inventory click callbacks except {@link ClickTypes#KEY_SWAP} see {@link KeySwapHandler}
diff --git a/src/main/java/org/spongepowered/api/item/inventory/query/QueryTypes.java b/src/main/java/org/spongepowered/api/item/inventory/query/QueryTypes.java
index a2c6a64fd..f404d5cf7 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/query/QueryTypes.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/query/QueryTypes.java
@@ -37,10 +37,10 @@ import org.spongepowered.api.item.inventory.query.QueryType.NoParam;
 import org.spongepowered.api.item.inventory.query.QueryType.OneParam;
 import org.spongepowered.api.item.inventory.query.QueryType.TwoParam;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.math.vector.Vector2i;
 
 import java.util.function.Predicate;
diff --git a/src/main/java/org/spongepowered/api/item/inventory/type/ViewableInventory.java b/src/main/java/org/spongepowered/api/item/inventory/type/ViewableInventory.java
index dcbbdffbd..bedec22af 100644
--- a/src/main/java/org/spongepowered/api/item/inventory/type/ViewableInventory.java
+++ b/src/main/java/org/spongepowered/api/item/inventory/type/ViewableInventory.java
@@ -207,7 +207,7 @@ public interface ViewableInventory extends Inventory {
              *
              * @return the building step
              */
-            BuildingStep slotsAtIndizes(List<Slot>source, List<Integer> at);
+            BuildingStep slotsAtIndizes(List<Slot> source, List<Integer> at);
 
             /**
              * Adds given slots to the inventory at given positions
@@ -217,7 +217,7 @@ public interface ViewableInventory extends Inventory {
              *
              * @return the building step
              */
-            BuildingStep slotsAtPositions(List<Slot>source, List<Vector2i> at);
+            BuildingStep slotsAtPositions(List<Slot> source, List<Vector2i> at);
 
             /**
              * Adds all undefined slots as dummy slots.
diff --git a/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java b/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java
index 91c34b9c4..32b78c0c0 100644
--- a/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java
+++ b/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java
@@ -25,8 +25,8 @@
 package org.spongepowered.api.item.merchant;
 
 import org.spongepowered.api.Sponge;
-import org.spongepowered.api.data.persistence.DataSerializable;
 import org.spongepowered.api.data.persistence.DataBuilder;
+import org.spongepowered.api.data.persistence.DataSerializable;
 import org.spongepowered.api.entity.living.Humanoid;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
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 f6675e10f..bbac6039a 100644
--- a/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java
+++ b/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.item.potion;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all possible {@link PotionType}s in vanilla Minecraft.
diff --git a/src/main/java/org/spongepowered/api/item/recipe/Recipe.java b/src/main/java/org/spongepowered/api/item/recipe/Recipe.java
index 2546732f5..ba0fd6c65 100644
--- a/src/main/java/org/spongepowered/api/item/recipe/Recipe.java
+++ b/src/main/java/org/spongepowered/api/item/recipe/Recipe.java
@@ -34,6 +34,7 @@ import org.spongepowered.api.item.ItemTypes;
 import org.spongepowered.api.item.inventory.Inventory;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.item.inventory.crafting.CraftingInventory;
+import org.spongepowered.api.item.recipe.cooking.CookingRecipe;
 import org.spongepowered.api.item.recipe.crafting.CraftingRecipe;
 import org.spongepowered.api.item.recipe.crafting.Ingredient;
 import org.spongepowered.api.item.recipe.crafting.RecipeResult;
@@ -41,7 +42,6 @@ import org.spongepowered.api.item.recipe.crafting.ShapedCraftingRecipe;
 import org.spongepowered.api.item.recipe.crafting.ShapelessCraftingRecipe;
 import org.spongepowered.api.item.recipe.crafting.SpecialCraftingRecipe;
 import org.spongepowered.api.item.recipe.single.StoneCutterRecipe;
-import org.spongepowered.api.item.recipe.cooking.CookingRecipe;
 import org.spongepowered.api.item.recipe.smithing.SmithingRecipe;
 import org.spongepowered.api.world.server.ServerWorld;
 
diff --git a/src/main/java/org/spongepowered/api/item/recipe/RecipeRegistration.java b/src/main/java/org/spongepowered/api/item/recipe/RecipeRegistration.java
index 9260a1277..7a3b81f12 100644
--- a/src/main/java/org/spongepowered/api/item/recipe/RecipeRegistration.java
+++ b/src/main/java/org/spongepowered/api/item/recipe/RecipeRegistration.java
@@ -24,8 +24,8 @@
  */
 package org.spongepowered.api.item.recipe;
 
-import org.spongepowered.api.datapack.DataPackSerializable;
 import org.spongepowered.api.data.persistence.DataSerializable;
+import org.spongepowered.api.datapack.DataPackSerializable;
 
 /**
  * A registration of a {@link Recipe} by an API consumer.
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 ce792e4af..f48b8fde8 100644
--- a/src/main/java/org/spongepowered/api/item/recipe/RecipeTypes.java
+++ b/src/main/java/org/spongepowered/api/item/recipe/RecipeTypes.java
@@ -31,10 +31,10 @@ import org.spongepowered.api.item.recipe.crafting.CraftingRecipe;
 import org.spongepowered.api.item.recipe.single.StoneCutterRecipe;
 import org.spongepowered.api.item.recipe.smithing.SmithingRecipe;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all {@link RecipeType}s in vanilla minecraft.
diff --git a/src/main/java/org/spongepowered/api/item/recipe/crafting/RecipeResult.java b/src/main/java/org/spongepowered/api/item/recipe/crafting/RecipeResult.java
index 50f5f0651..22ddd8fe6 100644
--- a/src/main/java/org/spongepowered/api/item/recipe/crafting/RecipeResult.java
+++ b/src/main/java/org/spongepowered/api/item/recipe/crafting/RecipeResult.java
@@ -103,7 +103,7 @@ public final class RecipeResult {
             return false;
         }
 
-        RecipeResult that = (RecipeResult) o;
+        final RecipeResult that = (RecipeResult) o;
 
         return this.result.equals(that.result) && this.remainingItems.equals(that.remainingItems);
     }
diff --git a/src/main/java/org/spongepowered/api/map/MapStorage.java b/src/main/java/org/spongepowered/api/map/MapStorage.java
index 6d16bcf63..60d21bcf0 100644
--- a/src/main/java/org/spongepowered/api/map/MapStorage.java
+++ b/src/main/java/org/spongepowered/api/map/MapStorage.java
@@ -37,30 +37,32 @@ import java.util.UUID;
  */
 public interface MapStorage {
 
-	/**
-	 * Get all {@link MapInfo}s that exist
-	 * on this server.
-	 * @return Set of MapInfos
-	 */
-	Collection<MapInfo> allMapInfos();
+    /**
+     * Get all {@link MapInfo}s that exist
+     * on this server.
+     *
+     * @return Set of MapInfos
+     */
+    Collection<MapInfo> allMapInfos();
 
-	/**
-	 * Gets a MapInfo by its UUID.
-	 * @param uuid UUID of map to get
-	 * @return The map with given uuid, or empty if it doesn't exist.
-	 */
-	Optional<MapInfo> mapInfo(final UUID uuid);
+    /**
+     * Gets a MapInfo by its UUID.
+     *
+     * @param uuid UUID of map to get
+     * @return The map with given uuid, or empty if it doesn't exist.
+     */
+    Optional<MapInfo> mapInfo(final UUID uuid);
 
-	/**
-	 * Creates a new {@link MapInfo}.
-	 *
-	 * <p>The MapInfo will not be successfully created if
-	 * the fired {@link org.spongepowered.api.event.action.CreateMapEvent} is cancelled.
-	 * This can happen due to either a plugin cancelling it, or
-	 * running out of room for maps.
-	 * (Max amount of maps is {@value java.lang.Integer#MAX_VALUE})</p>
-	 *
-	 * @return {@link MapInfo} the new MapInfo if available
-	 */
-	Optional<MapInfo> createNewMapInfo();
+    /**
+     * Creates a new {@link MapInfo}.
+     *
+     * <p>The MapInfo will not be successfully created if
+     * the fired {@link org.spongepowered.api.event.action.CreateMapEvent} is cancelled.
+     * This can happen due to either a plugin cancelling it, or
+     * running out of room for maps.
+     * (Max amount of maps is {@value java.lang.Integer#MAX_VALUE})</p>
+     *
+     * @return {@link MapInfo} the new MapInfo if available
+     */
+    Optional<MapInfo> createNewMapInfo();
 }
diff --git a/src/main/java/org/spongepowered/api/map/color/MapShades.java b/src/main/java/org/spongepowered/api/map/color/MapShades.java
index 6fe877057..48f7ac730 100644
--- a/src/main/java/org/spongepowered/api/map/color/MapShades.java
+++ b/src/main/java/org/spongepowered/api/map/color/MapShades.java
@@ -41,23 +41,23 @@ import java.util.function.Supplier;
 @RegistryScopes(scopes = RegistryScope.GAME)
 public final class MapShades {
 
-	// SORTFIELDS:ON
+    // SORTFIELDS:ON
 
-	public static final DefaultedRegistryReference<MapShade> DARKER = MapShades.key(ResourceKey.sponge("darker"));
+    public static final DefaultedRegistryReference<MapShade> DARKER = MapShades.key(ResourceKey.sponge("darker"));
 
-	public static final DefaultedRegistryReference<MapShade> DARK = MapShades.key(ResourceKey.sponge("dark"));
+    public static final DefaultedRegistryReference<MapShade> DARK = MapShades.key(ResourceKey.sponge("dark"));
 
-	public static final DefaultedRegistryReference<MapShade> BASE = MapShades.key(ResourceKey.sponge("base"));
+    public static final DefaultedRegistryReference<MapShade> BASE = MapShades.key(ResourceKey.sponge("base"));
 
-	public static final DefaultedRegistryReference<MapShade> DARKEST = MapShades.key(ResourceKey.sponge("darkest"));
+    public static final DefaultedRegistryReference<MapShade> DARKEST = MapShades.key(ResourceKey.sponge("darkest"));
 
-	// SORTFIELDS:OFF
+    // SORTFIELDS:OFF
 
-	private MapShades() {
-		throw new AssertionError("You should not be attempting to instantiate this class.");
-	}
+    private MapShades() {
+        throw new AssertionError("You should not be attempting to instantiate this class.");
+    }
 
-	private static DefaultedRegistryReference<MapShade> key(final ResourceKey location) {
-		return RegistryKey.of(RegistryTypes.MAP_SHADE, location).asDefaultedReference(() -> Sponge.game().registries());
-	}
+    private static DefaultedRegistryReference<MapShade> key(final ResourceKey location) {
+        return RegistryKey.of(RegistryTypes.MAP_SHADE, location).asDefaultedReference(() -> Sponge.game().registries());
+    }
 }
diff --git a/src/main/java/org/spongepowered/api/map/decoration/MapDecoration.java b/src/main/java/org/spongepowered/api/map/decoration/MapDecoration.java
index 97e374210..df3ef7156 100644
--- a/src/main/java/org/spongepowered/api/map/decoration/MapDecoration.java
+++ b/src/main/java/org/spongepowered/api/map/decoration/MapDecoration.java
@@ -102,12 +102,14 @@ public interface MapDecoration extends DataSerializable {
      * or where it would be if applied to a {@link MapInfo}
      * 0,0 is the center of the map
      * Ranges from {@value Byte#MIN_VALUE}-{@value Byte#MAX_VALUE}. AKA any valid byte value
+     *
      * @param position Vector2i world x and y cords
      */
     void setPosition(Vector2i position);
 
     /**
      * Sets rotation with a {@link MapDecorationOrientation}
+     *
      * @param rot MapDecorationOrientation
      */
     void setRotation(MapDecorationOrientation rot);
@@ -118,6 +120,7 @@ public interface MapDecoration extends DataSerializable {
 
     /**
      * Gets the {@link MapDecorationOrientation} the Map Decoration is pointing in
+     *
      * @return MapDecorationOrientation
      */
     MapDecorationOrientation rotation();
diff --git a/src/main/java/org/spongepowered/api/map/decoration/MapDecorationBannerType.java b/src/main/java/org/spongepowered/api/map/decoration/MapDecorationBannerType.java
index a7e7882e2..0e133336a 100644
--- a/src/main/java/org/spongepowered/api/map/decoration/MapDecorationBannerType.java
+++ b/src/main/java/org/spongepowered/api/map/decoration/MapDecorationBannerType.java
@@ -34,9 +34,10 @@ import org.spongepowered.api.data.type.DyeColor;
  * Not all {@link MapDecorationType MapDecorationTypes} are {@link MapDecorationBannerType}.
  */
 public interface MapDecorationBannerType extends MapDecorationType {
-	/**
-	 * Gets the corresponding {@link DyeColor} that this banner decoration type is.
-	 * @return The {@link DyeColor} that this banner decoration type is.
-	 */
-	DyeColor bannerColor();
+    /**
+     * Gets the corresponding {@link DyeColor} that this banner decoration type is.
+     *
+     * @return The {@link DyeColor} that this banner decoration type is.
+     */
+    DyeColor bannerColor();
 }
diff --git a/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientations.java b/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientations.java
index 3bb851f86..88106e2c1 100644
--- a/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientations.java
+++ b/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientations.java
@@ -39,45 +39,47 @@ import org.spongepowered.api.registry.RegistryTypes;
 @RegistryScopes(scopes = RegistryScope.GAME)
 public class MapDecorationOrientations {
 
-	// SORTFIELDS:ON
+    // SORTFIELDS:ON
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> NORTH = MapDecorationOrientations.key(ResourceKey.sponge("north"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> NORTH = MapDecorationOrientations.key(ResourceKey.sponge("north"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> NORTH_NORTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("north_northeast"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> NORTH_NORTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("north_northeast"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> NORTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("northeast"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> NORTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("northeast"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> EAST_NORTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("east_northeast"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> EAST_NORTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("east_northeast"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> EAST = MapDecorationOrientations.key(ResourceKey.sponge("east"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> EAST = MapDecorationOrientations.key(ResourceKey.sponge("east"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> EAST_SOUTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("east_southeast"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> EAST_SOUTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("east_southeast"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> SOUTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("southeast"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> SOUTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("southeast"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> SOUTH_SOUTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("south_southeast"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> SOUTH_SOUTHEAST = MapDecorationOrientations.key(ResourceKey.sponge("south_southeast"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> SOUTH = MapDecorationOrientations.key(ResourceKey.sponge("south"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> SOUTH = MapDecorationOrientations.key(ResourceKey.sponge("south"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> SOUTH_SOUTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("south_southwest"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> SOUTH_SOUTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("south_southwest"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> SOUTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("southwest"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> SOUTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("southwest"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> WEST_SOUTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("west_southwest"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> WEST_SOUTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("west_southwest"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> WEST = MapDecorationOrientations.key(ResourceKey.sponge("west"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> WEST = MapDecorationOrientations.key(ResourceKey.sponge("west"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> WEST_NORTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("west_northwest"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> WEST_NORTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("west_northwest"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> NORTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("northwest"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> NORTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("northwest"));
 
-	public static final DefaultedRegistryReference<MapDecorationOrientation> NORTH_NORTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("north_northwest"));
+    public static final DefaultedRegistryReference<MapDecorationOrientation> NORTH_NORTHWEST = MapDecorationOrientations.key(ResourceKey.sponge("north_northwest"));
 
-	// SORTFIELDS:OFF
+    // SORTFIELDS:OFF
 
-	private MapDecorationOrientations() { throw new AssertionError("You should not be attempting to instantiate this class."); }
+    private MapDecorationOrientations() {
+        throw new AssertionError("You should not be attempting to instantiate this class.");
+    }
 
-	private static DefaultedRegistryReference<MapDecorationOrientation> key(final ResourceKey location) {
-		return RegistryKey.of(RegistryTypes.MAP_DECORATION_ORIENTATION, location).asDefaultedReference(() -> Sponge.game().registries());
-	}
+    private static DefaultedRegistryReference<MapDecorationOrientation> key(final ResourceKey location) {
+        return RegistryKey.of(RegistryTypes.MAP_DECORATION_ORIENTATION, location).asDefaultedReference(() -> Sponge.game().registries());
+    }
 }
diff --git a/src/main/java/org/spongepowered/api/network/channel/packet/RequestPacketHandler.java b/src/main/java/org/spongepowered/api/network/channel/packet/RequestPacketHandler.java
index 2d6588307..be72a6275 100644
--- a/src/main/java/org/spongepowered/api/network/channel/packet/RequestPacketHandler.java
+++ b/src/main/java/org/spongepowered/api/network/channel/packet/RequestPacketHandler.java
@@ -25,8 +25,8 @@
 package org.spongepowered.api.network.channel.packet;
 
 import org.spongepowered.api.network.EngineConnection;
-import org.spongepowered.api.network.channel.ChannelException;
 import org.spongepowered.api.network.RemoteConnection;
+import org.spongepowered.api.network.channel.ChannelException;
 
 /**
  * Represents a packet handler for {@link RequestPacket}s.
diff --git a/src/main/java/org/spongepowered/api/network/channel/packet/ResponsePacketHandler.java b/src/main/java/org/spongepowered/api/network/channel/packet/ResponsePacketHandler.java
index f55c13a18..4365aa775 100644
--- a/src/main/java/org/spongepowered/api/network/channel/packet/ResponsePacketHandler.java
+++ b/src/main/java/org/spongepowered/api/network/channel/packet/ResponsePacketHandler.java
@@ -24,8 +24,8 @@
  */
 package org.spongepowered.api.network.channel.packet;
 
-import org.spongepowered.api.network.channel.ChannelException;
 import org.spongepowered.api.network.EngineConnection;
+import org.spongepowered.api.network.channel.ChannelException;
 import org.spongepowered.api.network.channel.NoResponseException;
 
 /**
diff --git a/src/main/java/org/spongepowered/api/network/channel/raw/RawDataChannel.java b/src/main/java/org/spongepowered/api/network/channel/raw/RawDataChannel.java
index 55b7077bd..67fced60f 100644
--- a/src/main/java/org/spongepowered/api/network/channel/raw/RawDataChannel.java
+++ b/src/main/java/org/spongepowered/api/network/channel/raw/RawDataChannel.java
@@ -24,8 +24,8 @@
  */
 package org.spongepowered.api.network.channel.raw;
 
-import org.spongepowered.api.network.channel.Channel;
 import org.spongepowered.api.network.EngineConnection;
+import org.spongepowered.api.network.channel.Channel;
 import org.spongepowered.api.network.channel.raw.handshake.RawHandshakeDataChannel;
 import org.spongepowered.api.network.channel.raw.play.RawPlayDataChannel;
 
diff --git a/src/main/java/org/spongepowered/api/network/channel/raw/handshake/RawHandshakeDataRequestHandler.java b/src/main/java/org/spongepowered/api/network/channel/raw/handshake/RawHandshakeDataRequestHandler.java
index 22589fb75..898ecb7a6 100644
--- a/src/main/java/org/spongepowered/api/network/channel/raw/handshake/RawHandshakeDataRequestHandler.java
+++ b/src/main/java/org/spongepowered/api/network/channel/raw/handshake/RawHandshakeDataRequestHandler.java
@@ -24,10 +24,9 @@
  */
 package org.spongepowered.api.network.channel.raw.handshake;
 
-import org.spongepowered.api.network.channel.ChannelBuf;
 import org.spongepowered.api.network.EngineConnection;
+import org.spongepowered.api.network.channel.ChannelBuf;
 import org.spongepowered.api.network.channel.NoResponseException;
-import org.spongepowered.api.network.channel.packet.RequestPacketResponse;
 
 /**
  * Handles a raw handshake data request.
diff --git a/src/main/java/org/spongepowered/api/network/channel/raw/play/RawPlayDataHandler.java b/src/main/java/org/spongepowered/api/network/channel/raw/play/RawPlayDataHandler.java
index 811dbb089..f2cc50f38 100644
--- a/src/main/java/org/spongepowered/api/network/channel/raw/play/RawPlayDataHandler.java
+++ b/src/main/java/org/spongepowered/api/network/channel/raw/play/RawPlayDataHandler.java
@@ -24,8 +24,8 @@
  */
 package org.spongepowered.api.network.channel.raw.play;
 
-import org.spongepowered.api.network.channel.ChannelBuf;
 import org.spongepowered.api.network.EngineConnection;
+import org.spongepowered.api.network.channel.ChannelBuf;
 
 /**
  * Represents a listener for data being sent to a raw channel.
diff --git a/src/main/java/org/spongepowered/api/placeholder/PlaceholderParsers.java b/src/main/java/org/spongepowered/api/placeholder/PlaceholderParsers.java
index 9df65c512..ca1cf960c 100644
--- a/src/main/java/org/spongepowered/api/placeholder/PlaceholderParsers.java
+++ b/src/main/java/org/spongepowered/api/placeholder/PlaceholderParsers.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.placeholder;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * Contains Sponge provided {@link PlaceholderParser}s.
diff --git a/src/main/java/org/spongepowered/api/raid/Raid.java b/src/main/java/org/spongepowered/api/raid/Raid.java
index 30bf2a5d0..fbb32314b 100644
--- a/src/main/java/org/spongepowered/api/raid/Raid.java
+++ b/src/main/java/org/spongepowered/api/raid/Raid.java
@@ -28,8 +28,8 @@ import net.kyori.adventure.bossbar.BossBar;
 import org.spongepowered.api.data.type.RaidStatus;
 import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.api.entity.living.monster.raider.Raider;
-import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.api.world.difficulty.Difficulties;
+import org.spongepowered.api.world.server.ServerWorld;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/org/spongepowered/api/registry/Registry.java b/src/main/java/org/spongepowered/api/registry/Registry.java
index caac9970a..e457cfab8 100644
--- a/src/main/java/org/spongepowered/api/registry/Registry.java
+++ b/src/main/java/org/spongepowered/api/registry/Registry.java
@@ -132,12 +132,14 @@ public interface Registry<T> extends Iterable<RegistryEntry<T>> {
 
     /**
      * Gets a {@link Stream} of all {@link RegistryEntry entries} within.
+     *
      * @return The stream
      */
     Stream<RegistryEntry<T>> streamEntries();
 
     /**
      * Gets a {@link Stream} of all registry values within.
+     *
      * @return The stream
      */
     Stream<T> stream();
diff --git a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
index 760dfad0f..a04724019 100644
--- a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
+++ b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
@@ -134,12 +134,12 @@ import org.spongepowered.api.util.rotation.Rotation;
 import org.spongepowered.api.world.ChunkRegenerateFlag;
 import org.spongepowered.api.world.HeightType;
 import org.spongepowered.api.world.LightType;
-import org.spongepowered.api.world.generation.structure.Structure;
+import org.spongepowered.api.world.WorldType;
 import org.spongepowered.api.world.biome.Biome;
 import org.spongepowered.api.world.chunk.ChunkState;
 import org.spongepowered.api.world.difficulty.Difficulty;
-import org.spongepowered.api.world.WorldType;
 import org.spongepowered.api.world.gamerule.GameRule;
+import org.spongepowered.api.world.generation.structure.Structure;
 import org.spongepowered.api.world.portal.PortalType;
 import org.spongepowered.api.world.schematic.PaletteType;
 import org.spongepowered.api.world.teleport.TeleportHelperFilter;
diff --git a/src/main/java/org/spongepowered/api/scheduler/TaskPriorities.java b/src/main/java/org/spongepowered/api/scheduler/TaskPriorities.java
index 897c626d3..0ef0abde7 100644
--- a/src/main/java/org/spongepowered/api/scheduler/TaskPriorities.java
+++ b/src/main/java/org/spongepowered/api/scheduler/TaskPriorities.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.scheduler;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/scoreboard/CollisionRules.java b/src/main/java/org/spongepowered/api/scoreboard/CollisionRules.java
index 83ff28879..b13423dc7 100644
--- a/src/main/java/org/spongepowered/api/scoreboard/CollisionRules.java
+++ b/src/main/java/org/spongepowered/api/scoreboard/CollisionRules.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.scoreboard;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of vanilla {@link CollisionRule}s.
diff --git a/src/main/java/org/spongepowered/api/scoreboard/Visibilities.java b/src/main/java/org/spongepowered/api/scoreboard/Visibilities.java
index 75dc6a838..86972d513 100644
--- a/src/main/java/org/spongepowered/api/scoreboard/Visibilities.java
+++ b/src/main/java/org/spongepowered/api/scoreboard/Visibilities.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.scoreboard;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * Visibility names which cause nametags or death messages to be displayed
diff --git a/src/main/java/org/spongepowered/api/scoreboard/criteria/Criteria.java b/src/main/java/org/spongepowered/api/scoreboard/criteria/Criteria.java
index 344c5b08f..ac4141576 100644
--- a/src/main/java/org/spongepowered/api/scoreboard/criteria/Criteria.java
+++ b/src/main/java/org/spongepowered/api/scoreboard/criteria/Criteria.java
@@ -28,10 +28,10 @@ import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.effect.potion.PotionEffectTypes;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.scoreboard.objective.Objective;
 
 /**
diff --git a/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlots.java b/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlots.java
index 9f91ffbec..f45a3f1c0 100644
--- a/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlots.java
+++ b/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlots.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.scoreboard.displayslot;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * Display slot names which display an objective in a particular place in-game.
diff --git a/src/main/java/org/spongepowered/api/scoreboard/objective/displaymode/ObjectiveDisplayModes.java b/src/main/java/org/spongepowered/api/scoreboard/objective/displaymode/ObjectiveDisplayModes.java
index b33617992..ebecb811f 100644
--- a/src/main/java/org/spongepowered/api/scoreboard/objective/displaymode/ObjectiveDisplayModes.java
+++ b/src/main/java/org/spongepowered/api/scoreboard/objective/displaymode/ObjectiveDisplayModes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.scoreboard.objective.displaymode;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.scoreboard.displayslot.DisplaySlots;
 import org.spongepowered.api.scoreboard.objective.Objective;
 
diff --git a/src/main/java/org/spongepowered/api/service/ban/BanTypes.java b/src/main/java/org/spongepowered/api/service/ban/BanTypes.java
index 67d76e990..3fe26893b 100644
--- a/src/main/java/org/spongepowered/api/service/ban/BanTypes.java
+++ b/src/main/java/org/spongepowered/api/service/ban/BanTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.service.ban;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/service/context/ContextCalculator.java b/src/main/java/org/spongepowered/api/service/context/ContextCalculator.java
index 3051f2b85..f605bd850 100644
--- a/src/main/java/org/spongepowered/api/service/context/ContextCalculator.java
+++ b/src/main/java/org/spongepowered/api/service/context/ContextCalculator.java
@@ -83,7 +83,7 @@ public interface ContextCalculator<T extends Contextual> {
         return new ContextCalculator<T>() {
             @Override
             public void accumulateContexts(T target, Set<Context> accumulator) {
-                String value = valueFunction.apply(target);
+                final String value = valueFunction.apply(target);
                 if (value != null) {
                     accumulator.add(new Context(key, value));
                 }
@@ -135,7 +135,7 @@ public interface ContextCalculator<T extends Contextual> {
      *         false.
      */
     default boolean matches(Context context, T target) {
-        Set<Context> set = new HashSet<>();
+        final Set<Context> set = new HashSet<>();
         this.accumulateContexts(target, set);
         return set.contains(context);
     }
diff --git a/src/main/java/org/spongepowered/api/service/economy/account/AccountDeletionResultTypes.java b/src/main/java/org/spongepowered/api/service/economy/account/AccountDeletionResultTypes.java
index 4246c4bd0..769e20743 100644
--- a/src/main/java/org/spongepowered/api/service/economy/account/AccountDeletionResultTypes.java
+++ b/src/main/java/org/spongepowered/api/service/economy/account/AccountDeletionResultTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.service.economy.account;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * Common {@link AccountDeletionResultType}s.
diff --git a/src/main/java/org/spongepowered/api/service/economy/transaction/TransactionTypes.java b/src/main/java/org/spongepowered/api/service/economy/transaction/TransactionTypes.java
index 28aa018a6..2ebce326c 100644
--- a/src/main/java/org/spongepowered/api/service/economy/transaction/TransactionTypes.java
+++ b/src/main/java/org/spongepowered/api/service/economy/transaction/TransactionTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.service.economy.transaction;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.service.economy.Currency;
 import org.spongepowered.api.service.economy.account.Account;
 
diff --git a/src/main/java/org/spongepowered/api/service/permission/MemorySubjectData.java b/src/main/java/org/spongepowered/api/service/permission/MemorySubjectData.java
index 6283be9ff..0a3dc223e 100644
--- a/src/main/java/org/spongepowered/api/service/permission/MemorySubjectData.java
+++ b/src/main/java/org/spongepowered/api/service/permission/MemorySubjectData.java
@@ -88,7 +88,7 @@ public class MemorySubjectData implements SubjectData {
 
     @Override
     public Map<Set<Context>, Map<String, Boolean>> allPermissions() {
-        ImmutableMap.Builder<Set<Context>, Map<String, Boolean>> ret = ImmutableMap.builder();
+        final ImmutableMap.Builder<Set<Context>, Map<String, Boolean>> ret = ImmutableMap.builder();
         for (Map.Entry<Set<Context>, NodeTree> ent : this.permissions.entrySet()) {
             ret.put(ent.getKey(), ent.getValue().asMap());
         }
@@ -104,13 +104,13 @@ public class MemorySubjectData implements SubjectData {
      * @return The node tree
      */
     public NodeTree nodeTree(Set<Context> contexts) {
-        NodeTree perms = this.permissions.get(Objects.requireNonNull(contexts, "contexts"));
+        final NodeTree perms = this.permissions.get(Objects.requireNonNull(contexts, "contexts"));
         return perms == null ? NodeTree.of(ImmutableMap.of()) : perms;
     }
 
     @Override
     public Map<String, Boolean> permissions(Set<Context> contexts) {
-        NodeTree perms = this.permissions.get(Objects.requireNonNull(contexts, "contexts"));
+        final NodeTree perms = this.permissions.get(Objects.requireNonNull(contexts, "contexts"));
         return perms == null ? ImmutableMap.of() : perms.asMap();
     }
 
@@ -121,7 +121,7 @@ public class MemorySubjectData implements SubjectData {
         Objects.requireNonNull(value, "value");
         contexts = ImmutableSet.copyOf(contexts);
         while (true) {
-            NodeTree oldTree = this.permissions.get(contexts);
+            final NodeTree oldTree = this.permissions.get(contexts);
             if (oldTree != null && oldTree.get(permission) == value) {
                 return CompletableFuture.completedFuture(false);
             }
@@ -142,7 +142,7 @@ public class MemorySubjectData implements SubjectData {
 
     @Override
     public CompletableFuture<Boolean> clearPermissions() {
-        boolean wasEmpty = this.permissions.isEmpty();
+        final boolean wasEmpty = this.permissions.isEmpty();
         this.permissions.clear();
         if (!wasEmpty) {
             this.onUpdate();
@@ -152,7 +152,7 @@ public class MemorySubjectData implements SubjectData {
 
     @Override
     public CompletableFuture<Boolean> clearPermissions(Set<Context> context) {
-        boolean ret = this.permissions.remove(Objects.requireNonNull(context, "context")) != null;
+        final boolean ret = this.permissions.remove(Objects.requireNonNull(context, "context")) != null;
         if (ret) {
             this.onUpdate();
         }
@@ -175,12 +175,12 @@ public class MemorySubjectData implements SubjectData {
         Objects.requireNonNull(parent, "parent");
         contexts = ImmutableSet.copyOf(contexts);
         while (true) {
-            List<SubjectReference> oldParents = this.parents.get(contexts);
+            final List<SubjectReference> oldParents = this.parents.get(contexts);
             if (oldParents != null && oldParents.contains(parent)) {
                 return CompletableFuture.completedFuture(false);
             }
 
-            List<SubjectReference> newParents = ImmutableList.<SubjectReference>builder()
+            final List<SubjectReference> newParents = ImmutableList.<SubjectReference>builder()
                     .addAll(oldParents == null ? ImmutableList.of() : oldParents)
                     .add(parent)
                     .build();
@@ -206,12 +206,12 @@ public class MemorySubjectData implements SubjectData {
         Objects.requireNonNull(parent, "parent");
         contexts = ImmutableSet.copyOf(contexts);
         while (true) {
-            List<SubjectReference> oldParents = this.parents.get(contexts);
+            final List<SubjectReference> oldParents = this.parents.get(contexts);
             if (oldParents == null || !oldParents.contains(parent)) {
                 return CompletableFuture.completedFuture(false);
             }
 
-            List<SubjectReference> newParents = new ArrayList<>(oldParents);
+            final List<SubjectReference> newParents = new ArrayList<>(oldParents);
             newParents.remove(parent);
 
             if (this.updateCollection(this.parents, contexts, oldParents, ImmutableList.copyOf(newParents))) {
@@ -223,7 +223,7 @@ public class MemorySubjectData implements SubjectData {
 
     @Override
     public CompletableFuture<Boolean> clearParents() {
-        boolean wasEmpty = this.parents.isEmpty();
+        final boolean wasEmpty = this.parents.isEmpty();
         this.parents.clear();
         if (!wasEmpty) {
             this.onUpdate();
@@ -233,7 +233,7 @@ public class MemorySubjectData implements SubjectData {
 
     @Override
     public CompletableFuture<Boolean> clearParents(Set<Context> contexts) {
-        boolean ret = this.parents.remove(Objects.requireNonNull(contexts, "contexts")) != null;
+        final boolean ret = this.parents.remove(Objects.requireNonNull(contexts, "contexts")) != null;
         if (ret) {
             this.onUpdate();
         }
@@ -286,7 +286,7 @@ public class MemorySubjectData implements SubjectData {
 
     @Override
     public CompletableFuture<Boolean> clearOptions() {
-        boolean wasEmpty = this.options.isEmpty();
+        final boolean wasEmpty = this.options.isEmpty();
         this.options.clear();
         if (!wasEmpty) {
             this.onUpdate();
@@ -296,7 +296,7 @@ public class MemorySubjectData implements SubjectData {
 
     @Override
     public CompletableFuture<Boolean> clearOptions(Set<Context> contexts) {
-        boolean ret = this.options.remove(Objects.requireNonNull(contexts, "contexts")) != null;
+        final boolean ret = this.options.remove(Objects.requireNonNull(contexts, "contexts")) != null;
         if (ret) {
             this.onUpdate();
         }
diff --git a/src/main/java/org/spongepowered/api/service/permission/NodeTree.java b/src/main/java/org/spongepowered/api/service/permission/NodeTree.java
index 9794a1278..23b62cb0b 100644
--- a/src/main/java/org/spongepowered/api/service/permission/NodeTree.java
+++ b/src/main/java/org/spongepowered/api/service/permission/NodeTree.java
@@ -79,15 +79,15 @@ public class NodeTree {
      * @return The newly created node tree
      */
     public static NodeTree of(Map<String, Boolean> values, Tristate defaultValue) {
-        NodeTree newTree = new NodeTree(defaultValue);
+        final NodeTree newTree = new NodeTree(defaultValue);
         for (Map.Entry<String, Boolean> value : values.entrySet()) {
-            Iterable<String> parts = NodeTree.NODE_SPLITTER.split(value.getKey().toLowerCase());
+            final Iterable<String> parts = NodeTree.NODE_SPLITTER.split(value.getKey().toLowerCase());
             Node currentNode = newTree.rootNode;
             for (String part : parts) {
                 if (currentNode.children.containsKey(part)) {
                     currentNode = currentNode.children.get(part);
                 } else {
-                    Node newNode = new Node(new HashMap<>());
+                    final Node newNode = new Node(new HashMap<>());
                     currentNode.children.put(part, newNode);
                     currentNode = newNode;
                 }
@@ -105,7 +105,7 @@ public class NodeTree {
      * @return The tristate value for the given node
      */
     public Tristate get(String node) {
-        Iterable<String> parts = NodeTree.NODE_SPLITTER.split(node.toLowerCase());
+        final Iterable<String> parts = NodeTree.NODE_SPLITTER.split(node.toLowerCase());
         Node currentNode = this.rootNode;
         Tristate lastUndefinedVal = Tristate.UNDEFINED;
         for (String str : parts) {
@@ -127,7 +127,7 @@ public class NodeTree {
      * @return An immutable map representation of the nodes defined in this tree
      */
     public Map<String, Boolean> asMap() {
-        ImmutableMap.Builder<String, Boolean> ret = ImmutableMap.builder();
+        final ImmutableMap.Builder<String, Boolean> ret = ImmutableMap.builder();
         for (Map.Entry<String, Node> ent : this.rootNode.children.entrySet()) {
             this.populateMap(ret, ent.getKey(), ent.getValue());
         }
@@ -151,15 +151,15 @@ public class NodeTree {
      * @return The new, modified node tree
      */
     public NodeTree withValue(String node, Tristate value) {
-        Iterable<String> parts = NodeTree.NODE_SPLITTER.split(node.toLowerCase());
-        Node newRoot = new Node(new HashMap<>(this.rootNode.children));
+        final Iterable<String> parts = NodeTree.NODE_SPLITTER.split(node.toLowerCase());
+        final Node newRoot = new Node(new HashMap<>(this.rootNode.children));
         Node newPtr = newRoot;
         Node currentPtr = this.rootNode;
 
         newPtr.value = currentPtr == null ? Tristate.UNDEFINED : currentPtr.value;
         for (String part : parts) {
-            Node oldChild = currentPtr == null ? null : currentPtr.children.get(part);
-            Node newChild = new Node(oldChild != null ? new HashMap<>(oldChild.children) : new HashMap<>());
+            final Node oldChild = currentPtr == null ? null : currentPtr.children.get(part);
+            final Node newChild = new Node(oldChild != null ? new HashMap<>(oldChild.children) : new HashMap<>());
             newPtr.children.put(part, newChild);
             currentPtr = oldChild;
             newPtr = newChild;
diff --git a/src/main/java/org/spongepowered/api/service/permission/SubjectCollection.java b/src/main/java/org/spongepowered/api/service/permission/SubjectCollection.java
index f3e021a05..94074553f 100644
--- a/src/main/java/org/spongepowered/api/service/permission/SubjectCollection.java
+++ b/src/main/java/org/spongepowered/api/service/permission/SubjectCollection.java
@@ -198,7 +198,7 @@ public interface SubjectCollection {
     default CompletableFuture<Void> applyToAll(Consumer<Subject> action) {
         Objects.requireNonNull(action, "action");
         return CompletableFuture.runAsync(() -> {
-            Set<String> identifiers = this.allIdentifiers().join();
+            final Set<String> identifiers = this.allIdentifiers().join();
             this.applyToAll(action, identifiers).join();
         });
     }
@@ -226,7 +226,7 @@ public interface SubjectCollection {
         Objects.requireNonNull(identifiers, "identifiers");
         return CompletableFuture.runAsync(() -> {
             for (String id : identifiers) {
-                Subject subject = this.loadSubject(id).join();
+                final Subject subject = this.loadSubject(id).join();
                 action.accept(subject);
                 this.suggestUnload(subject.identifier());
             }
diff --git a/src/main/java/org/spongepowered/api/sql/SqlManager.java b/src/main/java/org/spongepowered/api/sql/SqlManager.java
index d0a1321d5..853a167ab 100644
--- a/src/main/java/org/spongepowered/api/sql/SqlManager.java
+++ b/src/main/java/org/spongepowered/api/sql/SqlManager.java
@@ -28,7 +28,6 @@ import org.spongepowered.plugin.PluginContainer;
 
 import java.sql.SQLException;
 import java.util.Optional;
-
 import javax.sql.DataSource;
 
 /**
diff --git a/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java b/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java
index 433689961..1acea8164 100644
--- a/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java
+++ b/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.state;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * Represents all possible {@link BooleanStateProperty}s that are known to exist in
diff --git a/src/main/java/org/spongepowered/api/state/EnumStateProperties.java b/src/main/java/org/spongepowered/api/state/EnumStateProperties.java
index e285c758d..91b98f7cd 100644
--- a/src/main/java/org/spongepowered/api/state/EnumStateProperties.java
+++ b/src/main/java/org/spongepowered/api/state/EnumStateProperties.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.state;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * Represents all possible {@link EnumStateProperty}s that are known to exist in
diff --git a/src/main/java/org/spongepowered/api/state/IntegerStateProperties.java b/src/main/java/org/spongepowered/api/state/IntegerStateProperties.java
index 0f2d5472d..ca9abc5ef 100644
--- a/src/main/java/org/spongepowered/api/state/IntegerStateProperties.java
+++ b/src/main/java/org/spongepowered/api/state/IntegerStateProperties.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.state;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * Represents all possible {@link IntegerStateProperty}s that are known to exist in
diff --git a/src/main/java/org/spongepowered/api/statistic/Statistics.java b/src/main/java/org/spongepowered/api/statistic/Statistics.java
index c05fb4a18..7cb8ff6fa 100644
--- a/src/main/java/org/spongepowered/api/statistic/Statistics.java
+++ b/src/main/java/org/spongepowered/api/statistic/Statistics.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.statistic;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all available {@link Statistic}s from the vanilla game.
diff --git a/src/main/java/org/spongepowered/api/util/Axis.java b/src/main/java/org/spongepowered/api/util/Axis.java
index 06c153652..8ccee9937 100644
--- a/src/main/java/org/spongepowered/api/util/Axis.java
+++ b/src/main/java/org/spongepowered/api/util/Axis.java
@@ -52,9 +52,9 @@ public enum Axis implements Cycleable<Axis> {
      * @return The closest axis.
      */
     public static Axis closest(final Vector3d vector) {
-        double x = Math.abs(vector.getX());
-        double y = Math.abs(vector.getY());
-        double z = Math.abs(vector.getZ());
+        final double x = Math.abs(vector.getX());
+        final double y = Math.abs(vector.getY());
+        final double z = Math.abs(vector.getZ());
         if (x < y) {
             if (z < y) {
                 return Axis.Y;
diff --git a/src/main/java/org/spongepowered/api/util/BlockReaderAwareMatcher.java b/src/main/java/org/spongepowered/api/util/BlockReaderAwareMatcher.java
index b44362f21..e41faf25f 100644
--- a/src/main/java/org/spongepowered/api/util/BlockReaderAwareMatcher.java
+++ b/src/main/java/org/spongepowered/api/util/BlockReaderAwareMatcher.java
@@ -34,7 +34,9 @@ import java.util.Objects;
 
 public interface BlockReaderAwareMatcher<T> {
 
-    static BlockReaderAwareMatcher<BlockState> allBlocks() { return (state, volume, position) -> true; }
+    static BlockReaderAwareMatcher<BlockState> allBlocks() {
+        return (state, volume, position) -> true;
+    }
 
     static BlockReaderAwareMatcher<BlockState> forBlock(BlockState filter) {
         return (state, volume, position) -> state == filter;
diff --git a/src/main/java/org/spongepowered/api/util/Coerce.java b/src/main/java/org/spongepowered/api/util/Coerce.java
index 9aaccc688..4c0280b77 100644
--- a/src/main/java/org/spongepowered/api/util/Coerce.java
+++ b/src/main/java/org/spongepowered/api/util/Coerce.java
@@ -116,16 +116,16 @@ public final class Coerce {
         }
 
         if (obj instanceof List) {
-            return (List<?>)obj;
+            return (List<?>) obj;
         }
 
-        Class<?> clazz = obj.getClass();
+        final Class<?> clazz = obj.getClass();
         if (clazz.isArray()) {
             if (clazz.getComponentType().isPrimitive()) {
                 return Coerce.primitiveArrayToList(obj);
             }
 
-            return Arrays.asList((Object[])obj);
+            return Arrays.asList((Object[]) obj);
         }
 
         return Coerce.parseStringToList(obj.toString());
@@ -146,13 +146,13 @@ public final class Coerce {
             return Optional.<List<?>>of((List<?>) obj);
         }
 
-        Class<?> clazz = obj.getClass();
+        final Class<?> clazz = obj.getClass();
         if (clazz.isArray()) {
             if (clazz.getComponentType().isPrimitive()) {
                 return Optional.<List<?>>of(Coerce.primitiveArrayToList(obj));
             }
 
-            return Optional.<List<?>>of(Arrays.asList((Object[])obj));
+            return Optional.<List<?>>of(Arrays.asList((Object[]) obj));
         }
 
         return Optional.<List<?>>of(Coerce.parseStringToList(obj.toString()));
@@ -171,21 +171,21 @@ public final class Coerce {
     @SuppressWarnings("unchecked")
     public static <T> List<T> toListOf(@Nullable Object obj, Class<T> ofClass) {
         Objects.requireNonNull(ofClass, "ofClass");
-        List<T> filteredList = Lists.newArrayList();
+        final List<T> filteredList = Lists.newArrayList();
 
         for (Object o : Coerce.toList(obj)) {
             if (ofClass.isAssignableFrom(o.getClass())) {
-                filteredList.add((T)o);
+                filteredList.add((T) o);
             } else if (ofClass.equals(String.class)) {
-                filteredList.add((T)Coerce.toString(o));
+                filteredList.add((T) Coerce.toString(o));
             } else if (ofClass.equals(Integer.TYPE) || ofClass.equals(Integer.class)) {
-                filteredList.add((T)(Integer)Coerce.toInteger(o));
+                filteredList.add((T) (Integer) Coerce.toInteger(o));
             } else if (ofClass.equals(Float.TYPE) || ofClass.equals(Float.class)) {
-                filteredList.add((T)new Float(Coerce.toDouble(o)));
+                filteredList.add((T) Float.valueOf((float) Coerce.toDouble(o)));
             } else if (ofClass.equals(Double.TYPE) || ofClass.equals(Double.class)) {
-                filteredList.add((T)(Double)Coerce.toDouble(o));
+                filteredList.add((T) (Double) Coerce.toDouble(o));
             } else if (ofClass.equals(Boolean.TYPE) || ofClass.equals(Boolean.class)) {
-                filteredList.add((T)(Boolean)Coerce.toBoolean(o));
+                filteredList.add((T) (Boolean) Coerce.toBoolean(o));
             }
         }
 
@@ -235,16 +235,16 @@ public final class Coerce {
         }
 
         if (obj instanceof Number) {
-            return ((Number)obj).intValue();
+            return ((Number) obj).intValue();
         }
 
-        String strObj = Coerce.sanitiseNumber(obj);
-        Integer iParsed = Ints.tryParse(strObj);
+        final String strObj = Coerce.sanitiseNumber(obj);
+        final Integer iParsed = Ints.tryParse(strObj);
         if (iParsed != null) {
             return iParsed;
         }
 
-        Double dParsed = Doubles.tryParse(strObj);
+        final Double dParsed = Doubles.tryParse(strObj);
         return dParsed != null ? dParsed.intValue() : 0;
     }
 
@@ -271,10 +271,10 @@ public final class Coerce {
             // do nothing
         }
 
-        String strObj = Coerce.sanitiseNumber(obj);
-        Integer iParsed = Ints.tryParse(strObj);
+        final String strObj = Coerce.sanitiseNumber(obj);
+        final Integer iParsed = Ints.tryParse(strObj);
         if (iParsed == null) {
-            Double dParsed = Doubles.tryParse(strObj);
+            final Double dParsed = Doubles.tryParse(strObj);
             // try parsing as double now
             return dParsed == null ? Optional.<Integer>empty() : Optional.of(dParsed.intValue());
         }
@@ -295,10 +295,10 @@ public final class Coerce {
         }
 
         if (obj instanceof Number) {
-            return ((Number)obj).doubleValue();
+            return ((Number) obj).doubleValue();
         }
 
-        Double parsed = Doubles.tryParse(Coerce.sanitiseNumber(obj));
+        final Double parsed = Doubles.tryParse(Coerce.sanitiseNumber(obj));
         return parsed != null ? parsed : 0.0;
     }
 
@@ -325,8 +325,8 @@ public final class Coerce {
             // do nothing
         }
 
-        String strObj = Coerce.sanitiseNumber(obj);
-        Double dParsed = Doubles.tryParse(strObj);
+        final String strObj = Coerce.sanitiseNumber(obj);
+        final Double dParsed = Doubles.tryParse(strObj);
         // try parsing as double now
         return dParsed == null ? Optional.<Double>empty() : Optional.of(dParsed);
     }
@@ -347,7 +347,7 @@ public final class Coerce {
             return ((Number) obj).floatValue();
         }
 
-        Float parsed = Floats.tryParse(Coerce.sanitiseNumber(obj));
+        final Float parsed = Floats.tryParse(Coerce.sanitiseNumber(obj));
         return parsed != null ? parsed : 0.0f;
     }
 
@@ -374,8 +374,8 @@ public final class Coerce {
             // do nothing
         }
 
-        String strObj = Coerce.sanitiseNumber(obj);
-        Double dParsed = Doubles.tryParse(strObj);
+        final String strObj = Coerce.sanitiseNumber(obj);
+        final Double dParsed = Doubles.tryParse(strObj);
         return dParsed == null ? Optional.<Float>empty() : Optional.of(dParsed.floatValue());
     }
 
@@ -595,11 +595,11 @@ public final class Coerce {
 
         if (enumClass.isAssignableFrom(obj.getClass())) {
             @SuppressWarnings("unchecked")
-            E enumObj = (E)obj;
+            final E enumObj = (E) obj;
             return enumObj;
         }
 
-        String strObj = obj.toString().trim();
+        final String strObj = obj.toString().trim();
 
         try {
             // Efficient but case-sensitive lookup in the constant map
@@ -639,18 +639,18 @@ public final class Coerce {
 
         if (pseudoEnumClass.isAssignableFrom(obj.getClass())) {
             @SuppressWarnings("unchecked")
-            T enumObj = (T)obj;
+            final T enumObj = (T) obj;
             return enumObj;
         }
 
-        String strObj = obj.toString().trim();
+        final String strObj = obj.toString().trim();
 
         try {
             for (Field field : dictionaryClass.getFields()) {
                 if ((field.getModifiers() & Modifier.STATIC) != 0 && pseudoEnumClass.isAssignableFrom(field.getType())) {
-                    String fieldName = field.getName();
+                    final String fieldName = field.getName();
                     @SuppressWarnings("unchecked")
-                    T entry = (T)field.get(null);
+                    final T entry = (T) field.get(null);
                     if (strObj.equalsIgnoreCase(fieldName)) {
                         return entry;
                     }
@@ -675,29 +675,29 @@ public final class Coerce {
         }
 
         if (obj instanceof Vectorl) {
-            obj = ((Vectorl)obj).toInt();
+            obj = ((Vectorl) obj).toInt();
         } else if (obj instanceof Vectorf) {
-            obj = ((Vectorf)obj).toInt();
+            obj = ((Vectorf) obj).toInt();
         } else if (obj instanceof Vectord) {
-            obj = ((Vectord)obj).toInt();
+            obj = ((Vectord) obj).toInt();
         }
 
         if (obj instanceof Vector2i) {
-            return (Vector2i)obj;
+            return (Vector2i) obj;
         } else if (obj instanceof Vector3i) {
-            return new Vector2i((Vector3i)obj);
+            return new Vector2i((Vector3i) obj);
         } else if (obj instanceof Vector4i) {
-            return new Vector2i((Vector4i)obj);
+            return new Vector2i((Vector4i) obj);
         } else if (obj instanceof VectorNi) {
-            return new Vector2i((VectorNi)obj);
+            return new Vector2i((VectorNi) obj);
         }
 
-        Matcher vecMatch = Coerce.vector2Pattern.matcher(obj.toString());
+        final Matcher vecMatch = Coerce.vector2Pattern.matcher(obj.toString());
         if (Coerce.listBracketsMatch(vecMatch)) {
             return new Vector2i(Integer.parseInt(vecMatch.group(1)), Integer.parseInt(vecMatch.group(2)));
         }
 
-        List<?> list = Coerce.toList(obj);
+        final List<?> list = Coerce.toList(obj);
         if (list.size() == 2) {
             return new Vector2i(Coerce.toInteger(list.get(0)), Coerce.toInteger(list.get(1)));
         }
@@ -720,13 +720,13 @@ public final class Coerce {
             return "0";
         }
 
-        Matcher candidate = Coerce.listPattern.matcher(string);
+        final Matcher candidate = Coerce.listPattern.matcher(string);
         if (Coerce.listBracketsMatch(candidate)) {
             string = candidate.group(2).trim();
         }
 
-        int decimal = string.indexOf('.');
-        int comma = string.indexOf(',', decimal);
+        final int decimal = string.indexOf('.');
+        final int comma = string.indexOf(',', decimal);
         if (decimal > -1 && comma > -1) {
             return Coerce.sanitiseNumber(string.substring(0, comma));
         }
@@ -744,33 +744,33 @@ public final class Coerce {
 
     private static List<?> primitiveArrayToList(Object obj) {
         if (obj instanceof boolean[]) {
-            return Booleans.asList((boolean[])obj);
+            return Booleans.asList((boolean[]) obj);
         } else if (obj instanceof char[]) {
-            return Chars.asList((char[])obj);
+            return Chars.asList((char[]) obj);
         } else if (obj instanceof byte[]) {
-            return Bytes.asList((byte[])obj);
+            return Bytes.asList((byte[]) obj);
         } else if (obj instanceof short[]) {
-            return Shorts.asList((short[])obj);
+            return Shorts.asList((short[]) obj);
         } else if (obj instanceof int[]) {
-            return Ints.asList((int[])obj);
+            return Ints.asList((int[]) obj);
         } else if (obj instanceof long[]) {
-            return Longs.asList((long[])obj);
+            return Longs.asList((long[]) obj);
         } else if (obj instanceof float[]) {
-            return Floats.asList((float[])obj);
+            return Floats.asList((float[]) obj);
         } else if (obj instanceof double[]) {
-            return Doubles.asList((double[])obj);
+            return Doubles.asList((double[]) obj);
         }
 
         return Collections.<Object>emptyList();
     }
 
     private static List<?> parseStringToList(String string) {
-        Matcher candidate = Coerce.listPattern.matcher(string);
+        final Matcher candidate = Coerce.listPattern.matcher(string);
         if (!Coerce.listBracketsMatch(candidate)) {
             return Collections.<Object>emptyList();
         }
 
-        List<String> list = Lists.newArrayList();
+        final List<String> list = Lists.newArrayList();
         for (String part : candidate.group(2).split(",")) {
             if (part != null) {
                 list.add(part);
diff --git a/src/main/java/org/spongepowered/api/util/Functional.java b/src/main/java/org/spongepowered/api/util/Functional.java
index b682ec98c..01e4c4f6d 100644
--- a/src/main/java/org/spongepowered/api/util/Functional.java
+++ b/src/main/java/org/spongepowered/api/util/Functional.java
@@ -153,7 +153,7 @@ public class Functional {
      * @return The future holding the result
      */
     public static <T> CompletableFuture<T> failableFuture(Callable<T> call) {
-        CompletableFuture<T> ret = new CompletableFuture<>();
+        final CompletableFuture<T> ret = new CompletableFuture<>();
         try {
             ret.complete(call.call());
         } catch (Throwable e) {
@@ -172,7 +172,7 @@ public class Functional {
      * @return The future holding the result
      */
     public static <T> CompletableFuture<T> asyncFailableFuture(Callable<T> call, Executor exec) {
-        CompletableFuture<T> ret = new CompletableFuture<>();
+        final CompletableFuture<T> ret = new CompletableFuture<>();
         exec.execute(() -> {
             try {
                 ret.complete(call.call());
diff --git a/src/main/java/org/spongepowered/api/util/InformativeMain.java b/src/main/java/org/spongepowered/api/util/InformativeMain.java
index 162c38665..09057111b 100644
--- a/src/main/java/org/spongepowered/api/util/InformativeMain.java
+++ b/src/main/java/org/spongepowered/api/util/InformativeMain.java
@@ -24,8 +24,8 @@
  */
 package org.spongepowered.api.util;
 
-import javax.swing.*;
-import java.awt.*;
+import java.awt.GraphicsEnvironment;
+import javax.swing.JOptionPane;
 
 /**
  * A class containing a main method which throws an Exception to cleanly
diff --git a/src/main/java/org/spongepowered/api/util/TypeTokens.java b/src/main/java/org/spongepowered/api/util/TypeTokens.java
index 4e6598bfc..58d5112aa 100644
--- a/src/main/java/org/spongepowered/api/util/TypeTokens.java
+++ b/src/main/java/org/spongepowered/api/util/TypeTokens.java
@@ -52,6 +52,7 @@ import org.spongepowered.api.data.type.HandType;
 import org.spongepowered.api.data.type.HorseColor;
 import org.spongepowered.api.data.type.HorseStyle;
 import org.spongepowered.api.data.type.InstrumentType;
+import org.spongepowered.api.data.type.ItemTier;
 import org.spongepowered.api.data.type.LlamaType;
 import org.spongepowered.api.data.type.MatterType;
 import org.spongepowered.api.data.type.MooshroomType;
@@ -70,7 +71,6 @@ import org.spongepowered.api.data.type.SlabPortion;
 import org.spongepowered.api.data.type.SpellType;
 import org.spongepowered.api.data.type.StairShape;
 import org.spongepowered.api.data.type.StructureMode;
-import org.spongepowered.api.data.type.ItemTier;
 import org.spongepowered.api.data.type.TropicalFishShape;
 import org.spongepowered.api.data.type.VillagerType;
 import org.spongepowered.api.data.type.WireAttachmentType;
@@ -437,7 +437,7 @@ public final class TypeTokens {
 
     public static final TypeToken<WeightedCollectionValue<PotionEffect>> WEIGHTED_POTION_EFFECT_COLLECTION_VALUE_TOKEN = new TypeToken<WeightedCollectionValue<PotionEffect>>() {};
 
-    public static final TypeToken<WeightedCollectionValue<EntityArchetype>> WEIGHTED_ENTITY_ARCHETYPE_COLLECTION_VALUE_TOKEN = new TypeToken<WeightedCollectionValue<EntityArchetype>> () {};
+    public static final TypeToken<WeightedCollectionValue<EntityArchetype>> WEIGHTED_ENTITY_ARCHETYPE_COLLECTION_VALUE_TOKEN = new TypeToken<WeightedCollectionValue<EntityArchetype>>() {};
 
     public static final TypeToken<WeightedTable<EntityArchetype>> WEIGHTED_ENTITY_ARCHETYPE_TABLE_TOKEN = new TypeToken<WeightedTable<EntityArchetype>>() {};
 
diff --git a/src/main/java/org/spongepowered/api/util/mirror/Mirrors.java b/src/main/java/org/spongepowered/api/util/mirror/Mirrors.java
index d08e97272..f42713d03 100644
--- a/src/main/java/org/spongepowered/api/util/mirror/Mirrors.java
+++ b/src/main/java/org/spongepowered/api/util/mirror/Mirrors.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.util.mirror;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/util/orientation/Orientations.java b/src/main/java/org/spongepowered/api/util/orientation/Orientations.java
index a4e3f7b07..01e9df512 100644
--- a/src/main/java/org/spongepowered/api/util/orientation/Orientations.java
+++ b/src/main/java/org/spongepowered/api/util/orientation/Orientations.java
@@ -29,10 +29,10 @@ import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.hanging.ItemFrame;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of possible rotations for something that can rotate,
diff --git a/src/main/java/org/spongepowered/api/util/rotation/Rotations.java b/src/main/java/org/spongepowered/api/util/rotation/Rotations.java
index 1a2fd1bd9..c1d4e0f91 100644
--- a/src/main/java/org/spongepowered/api/util/rotation/Rotations.java
+++ b/src/main/java/org/spongepowered/api/util/rotation/Rotations.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.util.rotation;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/util/weighted/ChanceTable.java b/src/main/java/org/spongepowered/api/util/weighted/ChanceTable.java
index dc112809f..3aebe929f 100644
--- a/src/main/java/org/spongepowered/api/util/weighted/ChanceTable.java
+++ b/src/main/java/org/spongepowered/api/util/weighted/ChanceTable.java
@@ -57,14 +57,14 @@ public class ChanceTable<T> extends RandomObjectTable<T> {
 
     @Override
     public List<T> get(Random rand) {
-        List<T> results = Lists.newArrayList();
+        final List<T> results = Lists.newArrayList();
         if (this.entries.isEmpty()) {
             return results;
         }
-        int rolls = this.rolls().flooredAmount(rand);
+        final int rolls = this.rolls().flooredAmount(rand);
         for (int i = 0; i < rolls; i++) {
             for (Iterator<TableEntry<T>> it = this.entries.iterator(); it.hasNext();) {
-                TableEntry<T> next = it.next();
+                final TableEntry<T> next = it.next();
                 if (rand.nextDouble() < next.weight()) {
                     if (next instanceof NestedTableEntry) {
                         results.addAll(((NestedTableEntry<T>) next).get(rand));
@@ -85,7 +85,7 @@ public class ChanceTable<T> extends RandomObjectTable<T> {
         if (!(o instanceof ChanceTable)) {
             return false;
         }
-        ChanceTable<?> c = (ChanceTable<?>) o;
+        final ChanceTable<?> c = (ChanceTable<?>) o;
         if (this.rolls() != c.rolls()) {
             return false;
         }
@@ -112,7 +112,7 @@ public class ChanceTable<T> extends RandomObjectTable<T> {
 
     @Override
     public String toString() {
-        StringBuilder r = new StringBuilder();
+        final StringBuilder r = new StringBuilder();
         r.append("ChanceTable (rolls=").append(this.rolls());
         r.append(",entries=").append(this.entries.size()).append(") {\n");
         for (TableEntry<T> entry : this.entries) {
diff --git a/src/main/java/org/spongepowered/api/util/weighted/EmptyObject.java b/src/main/java/org/spongepowered/api/util/weighted/EmptyObject.java
index 08eacc667..7a391f0a2 100644
--- a/src/main/java/org/spongepowered/api/util/weighted/EmptyObject.java
+++ b/src/main/java/org/spongepowered/api/util/weighted/EmptyObject.java
@@ -67,14 +67,14 @@ public class EmptyObject<T> extends TableEntry<T> implements DataSerializable {
         if (!(o instanceof EmptyObject)) {
             return false;
         }
-        EmptyObject<?> c = (EmptyObject<?>) o;
+        final EmptyObject<?> c = (EmptyObject<?>) o;
         return this.weight() == c.weight();
     }
 
     @Override
     public int hashCode() {
         int r = 1;
-        long w = Double.doubleToLongBits(this.weight());
+        final long w = Double.doubleToLongBits(this.weight());
         r = r * 37 + (int) (w ^ (w >>> 32));
         return r;
     }
diff --git a/src/main/java/org/spongepowered/api/util/weighted/RandomObjectTable.java b/src/main/java/org/spongepowered/api/util/weighted/RandomObjectTable.java
index 70f5c9774..4af7de68f 100644
--- a/src/main/java/org/spongepowered/api/util/weighted/RandomObjectTable.java
+++ b/src/main/java/org/spongepowered/api/util/weighted/RandomObjectTable.java
@@ -147,7 +147,7 @@ public abstract class RandomObjectTable<T> implements Collection<TableEntry<T>>
      * @return If the object is contained within the table
      */
     public boolean containsObject(Object obj) {
-        boolean entry = this.entries.contains(obj);
+        final boolean entry = this.entries.contains(obj);
         if (entry) {
             return true;
         }
@@ -199,12 +199,12 @@ public abstract class RandomObjectTable<T> implements Collection<TableEntry<T>>
      * @return If the table was changed as a result
      */
     public boolean removeObject(Object object) {
-        boolean flag = this.entries.remove(object);
+        final boolean flag = this.entries.remove(object);
         if (flag) {
             return true;
         }
         for (Iterator<TableEntry<T>> it = this.entries.iterator(); it.hasNext();) {
-            TableEntry<T> e = it.next();
+            final TableEntry<T> e = it.next();
             if (e instanceof WeightedObject && ((WeightedObject<T>) e).get().equals(object)) {
                 it.remove();
                 return true;
diff --git a/src/main/java/org/spongepowered/api/util/weighted/SeededVariableAmount.java b/src/main/java/org/spongepowered/api/util/weighted/SeededVariableAmount.java
index 88a65a0de..36efeed68 100644
--- a/src/main/java/org/spongepowered/api/util/weighted/SeededVariableAmount.java
+++ b/src/main/java/org/spongepowered/api/util/weighted/SeededVariableAmount.java
@@ -118,7 +118,7 @@ public interface SeededVariableAmount<T> {
             if (!(obj instanceof WrappedVariableAmount)) {
                 return false;
             }
-            WrappedVariableAmount<?> var = (WrappedVariableAmount<?>) obj;
+            final WrappedVariableAmount<?> var = (WrappedVariableAmount<?>) obj;
             return this.inner.equals(var.inner);
         }
 
diff --git a/src/main/java/org/spongepowered/api/util/weighted/WeightedTable.java b/src/main/java/org/spongepowered/api/util/weighted/WeightedTable.java
index 197c95bdb..aec6e6cc8 100644
--- a/src/main/java/org/spongepowered/api/util/weighted/WeightedTable.java
+++ b/src/main/java/org/spongepowered/api/util/weighted/WeightedTable.java
@@ -72,7 +72,7 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
 
     @Override
     public boolean add(TableEntry<T> entry) {
-        boolean added = super.add(entry);
+        final boolean added = super.add(entry);
         if (added) {
             this.recalculateWeight();
         }
@@ -81,7 +81,7 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
 
     @Override
     public boolean add(T object, double weight) {
-        boolean added = super.add(object, weight);
+        final boolean added = super.add(object, weight);
         if (added) {
             this.recalculateWeight();
         }
@@ -90,7 +90,7 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
 
     @Override
     public boolean addAll(Collection<? extends TableEntry<T>> c) {
-        boolean added = super.addAll(c);
+        final boolean added = super.addAll(c);
         if (added) {
             this.recalculateWeight();
         }
@@ -99,7 +99,7 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
 
     @Override
     public boolean remove(Object entry) {
-        boolean removed = super.remove(entry);
+        final boolean removed = super.remove(entry);
         if (removed) {
             this.recalculateWeight();
         }
@@ -108,7 +108,7 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
 
     @Override
     public boolean removeObject(Object entry) {
-        boolean removed = super.removeObject(entry);
+        final boolean removed = super.removeObject(entry);
         if (removed) {
             this.recalculateWeight();
         }
@@ -117,7 +117,7 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
 
     @Override
     public boolean removeAll(Collection<?> c) {
-        boolean removed = super.removeAll(c);
+        final boolean removed = super.removeAll(c);
         if (removed) {
             this.recalculateWeight();
         }
@@ -126,7 +126,7 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
 
     @Override
     public boolean retainAll(Collection<?> c) {
-        boolean removed = super.retainAll(c);
+        final boolean removed = super.retainAll(c);
         if (removed) {
             this.recalculateWeight();
         }
@@ -145,7 +145,7 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
     protected void recalculateWeight() {
         this.totalWeight = 0;
         for (Iterator<TableEntry<T>> it = this.entries.iterator(); it.hasNext();) {
-            TableEntry<T> entry = it.next();
+            final TableEntry<T> entry = it.next();
             if (entry.weight() < 0) {
                 // Negative weights on entries will really break this, so we
                 // remove them if found, this is fine as a negatively weighted
@@ -159,15 +159,15 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
 
     @Override
     public List<T> get(Random rand) {
-        List<T> results = Lists.newArrayList();
+        final List<T> results = Lists.newArrayList();
         if (this.entries.isEmpty()) {
             return results;
         }
-        int rolls = this.rolls().flooredAmount(rand);
+        final int rolls = this.rolls().flooredAmount(rand);
         for (int i = 0; i < rolls; i++) {
             double roll = rand.nextDouble() * this.totalWeight;
             for (Iterator<TableEntry<T>> it = this.entries.iterator(); it.hasNext();) {
-                TableEntry<T> next = it.next();
+                final TableEntry<T> next = it.next();
                 roll -= next.weight();
                 if (roll <= 0) {
                     if (next instanceof NestedTableEntry) {
@@ -195,7 +195,7 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
         if (!(o instanceof WeightedTable)) {
             return false;
         }
-        WeightedTable<?> c = (WeightedTable<?>) o;
+        final WeightedTable<?> c = (WeightedTable<?>) o;
         if (this.rolls() != c.rolls()) {
             return false;
         }
@@ -222,7 +222,7 @@ public class WeightedTable<T> extends RandomObjectTable<T> {
 
     @Override
     public String toString() {
-        StringBuilder r = new StringBuilder();
+        final StringBuilder r = new StringBuilder();
         r.append("WeightedTable (rolls=").append(this.rolls());
         r.append(",entries=").append(this.entries.size()).append(") {\n");
         for (TableEntry<T> entry : this.entries) {
diff --git a/src/main/java/org/spongepowered/api/world/BlockChangeFlag.java b/src/main/java/org/spongepowered/api/world/BlockChangeFlag.java
index 0a31e918e..a2273a701 100644
--- a/src/main/java/org/spongepowered/api/world/BlockChangeFlag.java
+++ b/src/main/java/org/spongepowered/api/world/BlockChangeFlag.java
@@ -198,6 +198,7 @@ public interface BlockChangeFlag {
          *   <li>{@link BlockChangeFlag#performBlockPhysics()} is {@code false}</li>
          *   <li>{@link BlockChangeFlag#notifyPathfinding()} is {@code false}</li>
          * </ul>
+         *
          * @return The all false change flag
          */
         BlockChangeFlag none();
diff --git a/src/main/java/org/spongepowered/api/world/ChunkRegenerateFlags.java b/src/main/java/org/spongepowered/api/world/ChunkRegenerateFlags.java
index 3378f1921..bf595e7fd 100644
--- a/src/main/java/org/spongepowered/api/world/ChunkRegenerateFlags.java
+++ b/src/main/java/org/spongepowered/api/world/ChunkRegenerateFlags.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.world;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of the possible {@link ChunkRegenerateFlag}s.
diff --git a/src/main/java/org/spongepowered/api/world/HeightTypes.java b/src/main/java/org/spongepowered/api/world/HeightTypes.java
index d6befcc1d..6207c9658 100644
--- a/src/main/java/org/spongepowered/api/world/HeightTypes.java
+++ b/src/main/java/org/spongepowered/api/world/HeightTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.world;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/world/LightTypes.java b/src/main/java/org/spongepowered/api/world/LightTypes.java
index 3eae9859e..fb66c5c8c 100644
--- a/src/main/java/org/spongepowered/api/world/LightTypes.java
+++ b/src/main/java/org/spongepowered/api/world/LightTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.world;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/world/ProtoWorld.java b/src/main/java/org/spongepowered/api/world/ProtoWorld.java
index bebb40a51..81c26a305 100644
--- a/src/main/java/org/spongepowered/api/world/ProtoWorld.java
+++ b/src/main/java/org/spongepowered/api/world/ProtoWorld.java
@@ -53,8 +53,7 @@ public interface ProtoWorld<P extends ProtoWorld<P>> extends
     UpdatableVolume,
     RandomProvider,
     PhysicsAwareMutableBlockVolume<P>,
-    MutableGameVolume
-{
+    MutableGameVolume {
 
     /**
      * Gets the {@link Engine} that simulates this world.
diff --git a/src/main/java/org/spongepowered/api/world/WorldType.java b/src/main/java/org/spongepowered/api/world/WorldType.java
index 55bd177c0..3d8760baa 100644
--- a/src/main/java/org/spongepowered/api/world/WorldType.java
+++ b/src/main/java/org/spongepowered/api/world/WorldType.java
@@ -60,6 +60,7 @@ public interface WorldType extends DefaultedRegistryValue, ContextSource {
 
     /**
      * Gets the {@link BiomeSampler}.
+     *
      * @return The biome sampler
      */
     BiomeSampler biomeSampler();
@@ -88,6 +89,7 @@ public interface WorldType extends DefaultedRegistryValue, ContextSource {
      *
      * Best seen when transferring that player from one world to another (as the player's
      * coordinates will adjust to the scale of the destination world's).
+     *
      * @return The scale
      */
     double coordinateMultiplier();
@@ -158,6 +160,7 @@ public interface WorldType extends DefaultedRegistryValue, ContextSource {
     /**
      * Gets if {@link ServerPlayer players} who have the {@link PotionEffectTypes#BAD_OMEN} effect
      * could cause a {@link Raid} while existing in a {@link ServerWorld world} of this type.
+     *
      * @return True if bad omens could case a raid, false if not
      */
     boolean hasRaids();
@@ -175,6 +178,7 @@ public interface WorldType extends DefaultedRegistryValue, ContextSource {
     /**
      * Gets if {@link ServerWorld worlds} of this type will spawn the {@link EnderDragon dragon}
      * fight mechanics.
+     *
      * @return True if dragon fight spawns, false if not
      */
     boolean createDragonFight();
diff --git a/src/main/java/org/spongepowered/api/world/biome/BiomeAttributes.java b/src/main/java/org/spongepowered/api/world/biome/BiomeAttributes.java
index da6fa49c4..4216beca3 100644
--- a/src/main/java/org/spongepowered/api/world/biome/BiomeAttributes.java
+++ b/src/main/java/org/spongepowered/api/world/biome/BiomeAttributes.java
@@ -36,6 +36,7 @@ public interface BiomeAttributes {
      * Gets the temperature.
      *
      * <p>In Vanilla Minecraft, this is capped between {@code -2} to {@code 2}.</p>
+     *
      * @return temperature
      */
     float temperature();
@@ -44,6 +45,7 @@ public interface BiomeAttributes {
      * Get the humidity.
      *
      * <p>In Vanilla Minecraft, this is capped between {@code -2} to {@code 2}.</p>
+     *
      * @return humidity
      */
     float humidity();
@@ -52,6 +54,7 @@ public interface BiomeAttributes {
      * Gets the altitude.
      *
      * <p>In Vanilla Minecraft, this is capped between {@code -2} to {@code 2}.</p>
+     *
      * @return altitude
      */
     float altitude();
@@ -60,6 +63,7 @@ public interface BiomeAttributes {
      * Gets the weirdness.
      *
      * <p>In Vanilla Minecraft, this is capped between {@code -2} to {@code 2}.</p>
+     *
      * @return weirdness
      */
     float weirdness();
@@ -68,6 +72,7 @@ public interface BiomeAttributes {
      * Gets the offset.
      *
      * <p>In Vanilla Minecraft, this is capped between {@code 0} to {@code 1}.</p>
+     *
      * @return offset
      */
     float offset();
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 7551f9c66..e472dda1c 100644
--- a/src/main/java/org/spongepowered/api/world/biome/Biomes.java
+++ b/src/main/java/org/spongepowered/api/world/biome/Biomes.java
@@ -25,11 +25,11 @@
 package org.spongepowered.api.world.biome;
 
 import org.spongepowered.api.ResourceKey;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryReference;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.WORLD)
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 2c0ec2c77..ba471197b 100644
--- a/src/main/java/org/spongepowered/api/world/chunk/ChunkStates.java
+++ b/src/main/java/org/spongepowered/api/world/chunk/ChunkStates.java
@@ -29,10 +29,10 @@ import org.spongepowered.api.Sponge;
 import org.spongepowered.api.block.entity.BlockEntity;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.world.ProtoWorld;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.biome.Biome;
diff --git a/src/main/java/org/spongepowered/api/world/difficulty/Difficulties.java b/src/main/java/org/spongepowered/api/world/difficulty/Difficulties.java
index 48dda5247..0d3c7afb0 100644
--- a/src/main/java/org/spongepowered/api/world/difficulty/Difficulties.java
+++ b/src/main/java/org/spongepowered/api/world/difficulty/Difficulties.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.world.difficulty;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * A list of difficulties that Minecraft provides in vanilla.
diff --git a/src/main/java/org/spongepowered/api/world/explosion/Explosion.java b/src/main/java/org/spongepowered/api/world/explosion/Explosion.java
index ad4f700f4..b6aaf403e 100644
--- a/src/main/java/org/spongepowered/api/world/explosion/Explosion.java
+++ b/src/main/java/org/spongepowered/api/world/explosion/Explosion.java
@@ -29,8 +29,8 @@ import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.explosive.Explosive;
 import org.spongepowered.api.util.CopyableBuilder;
 import org.spongepowered.api.world.Locatable;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.World;
+import org.spongepowered.api.world.server.ServerLocation;
 
 import java.util.Optional;
 
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 d8d11ba2d..a2c322054 100644
--- a/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java
+++ b/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java
@@ -52,10 +52,10 @@ import org.spongepowered.api.entity.vehicle.Boat;
 import org.spongepowered.api.entity.vehicle.minecart.MinecartLike;
 import org.spongepowered.api.raid.Raid;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 /**
  * An enumeration of all the possible game rules in vanilla minecraft.
diff --git a/src/main/java/org/spongepowered/api/world/generation/GenerationRegion.java b/src/main/java/org/spongepowered/api/world/generation/GenerationRegion.java
index a8724f2de..ce3f4f318 100644
--- a/src/main/java/org/spongepowered/api/world/generation/GenerationRegion.java
+++ b/src/main/java/org/spongepowered/api/world/generation/GenerationRegion.java
@@ -30,10 +30,10 @@ import org.spongepowered.api.block.entity.BlockEntity;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.world.ProtoWorld;
-import org.spongepowered.api.world.difficulty.Difficulty;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.chunk.Chunk;
+import org.spongepowered.api.world.difficulty.Difficulty;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.math.vector.Vector3i;
 
diff --git a/src/main/java/org/spongepowered/api/world/portal/PortalTypes.java b/src/main/java/org/spongepowered/api/world/portal/PortalTypes.java
index 0a2e32135..5db7d4701 100644
--- a/src/main/java/org/spongepowered/api/world/portal/PortalTypes.java
+++ b/src/main/java/org/spongepowered/api/world/portal/PortalTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.world.portal;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/world/schematic/Palette.java b/src/main/java/org/spongepowered/api/world/schematic/Palette.java
index 33e14f4e1..f15d9cc63 100644
--- a/src/main/java/org/spongepowered/api/world/schematic/Palette.java
+++ b/src/main/java/org/spongepowered/api/world/schematic/Palette.java
@@ -66,7 +66,7 @@ public interface Palette<T, R> {
     Optional<PaletteReference<T, R>> get(int id);
 
     default Optional<T> get(final int id, final RegistryHolder holder) {
-        return this.get(id).flatMap(ref -> Objects.requireNonNull(holder,"RegistryHolder cannot be null")
+        return this.get(id).flatMap(ref -> Objects.requireNonNull(holder, "RegistryHolder cannot be null")
             .findRegistry(ref.registry())
             .flatMap(reg -> this.type().resolver().apply(ref.value(), reg)));
     }
diff --git a/src/main/java/org/spongepowered/api/world/server/ServerLocation.java b/src/main/java/org/spongepowered/api/world/server/ServerLocation.java
index 75bfd36d0..3d330f275 100644
--- a/src/main/java/org/spongepowered/api/world/server/ServerLocation.java
+++ b/src/main/java/org/spongepowered/api/world/server/ServerLocation.java
@@ -145,7 +145,7 @@ public interface ServerLocation extends DataHolder.Mutable, DirectionRelativeDat
      * @param <T> The return type of the mapper
      * @return The results of the mapping
      */
-     <T> T mapBiome(BiFunction<ServerWorld, Vector3i, T> mapper);
+    <T> T mapBiome(BiFunction<ServerWorld, Vector3i, T> mapper);
 
     /**
      * Replace the block at this position with a copy of the given snapshot.
diff --git a/src/main/java/org/spongepowered/api/world/server/ServerWorld.java b/src/main/java/org/spongepowered/api/world/server/ServerWorld.java
index eb0e732d8..a63253af5 100644
--- a/src/main/java/org/spongepowered/api/world/server/ServerWorld.java
+++ b/src/main/java/org/spongepowered/api/world/server/ServerWorld.java
@@ -37,9 +37,9 @@ import org.spongepowered.api.world.ChunkRegenerateFlag;
 import org.spongepowered.api.world.ChunkRegenerateFlags;
 import org.spongepowered.api.world.SerializationBehavior;
 import org.spongepowered.api.world.World;
-import org.spongepowered.api.world.chunk.Chunk;
 import org.spongepowered.api.world.WorldType;
 import org.spongepowered.api.world.WorldTypes;
+import org.spongepowered.api.world.chunk.Chunk;
 import org.spongepowered.api.world.explosion.Explosion;
 import org.spongepowered.api.world.generation.ChunkGenerator;
 import org.spongepowered.api.world.server.storage.ServerWorldProperties;
diff --git a/src/main/java/org/spongepowered/api/world/server/WorldManager.java b/src/main/java/org/spongepowered/api/world/server/WorldManager.java
index 15157ab7f..38d333aed 100644
--- a/src/main/java/org/spongepowered/api/world/server/WorldManager.java
+++ b/src/main/java/org/spongepowered/api/world/server/WorldManager.java
@@ -97,6 +97,7 @@ public interface WorldManager {
 
     /**
      * Gets if a {@link ResourceKey key} exists as an actual world, offline or online.
+     *
      * @param key The key
      * @return True if existed, false if not
      */
@@ -156,6 +157,7 @@ public interface WorldManager {
 
     /**
      * Gets if a {@link ResourceKey key} exists as a {@link WorldTemplate template}.
+     *
      * @param key The key
      * @return True if it exists, false if not
      */
@@ -163,6 +165,7 @@ public interface WorldManager {
 
     /**
      * Gets a {@link WorldTemplate template} by a {@link ResourceKey key}.
+     *
      * @param key The key
      * @return The template or {@link Optional#empty()} if not found
      */
diff --git a/src/main/java/org/spongepowered/api/world/teleport/TeleportHelperFilters.java b/src/main/java/org/spongepowered/api/world/teleport/TeleportHelperFilters.java
index bc353b60f..4c0778964 100644
--- a/src/main/java/org/spongepowered/api/world/teleport/TeleportHelperFilters.java
+++ b/src/main/java/org/spongepowered/api/world/teleport/TeleportHelperFilters.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.world.teleport;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)
diff --git a/src/main/java/org/spongepowered/api/world/volume/block/BlockVolume.java b/src/main/java/org/spongepowered/api/world/volume/block/BlockVolume.java
index 74a3337d4..c93e3d044 100644
--- a/src/main/java/org/spongepowered/api/world/volume/block/BlockVolume.java
+++ b/src/main/java/org/spongepowered/api/world/volume/block/BlockVolume.java
@@ -33,9 +33,9 @@ import org.spongepowered.api.fluid.FluidState;
 import org.spongepowered.api.registry.RegistryReference;
 import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.util.PositionOutOfBoundsException;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.schematic.Palette;
 import org.spongepowered.api.world.schematic.PaletteTypes;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.volume.ImmutableVolume;
 import org.spongepowered.api.world.volume.MutableVolume;
 import org.spongepowered.api.world.volume.UnmodifiableVolume;
diff --git a/src/main/java/org/spongepowered/api/world/volume/game/ChunkVolume.java b/src/main/java/org/spongepowered/api/world/volume/game/ChunkVolume.java
index 0723e4c77..dbf9dbbdc 100644
--- a/src/main/java/org/spongepowered/api/world/volume/game/ChunkVolume.java
+++ b/src/main/java/org/spongepowered/api/world/volume/game/ChunkVolume.java
@@ -27,8 +27,8 @@ package org.spongepowered.api.world.volume.game;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.api.world.Locatable;
 import org.spongepowered.api.world.ProtoWorld;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.chunk.ProtoChunk;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.volume.block.BlockVolume;
 import org.spongepowered.math.vector.Vector3i;
 
diff --git a/src/main/java/org/spongepowered/api/world/volume/stream/StreamOptions.java b/src/main/java/org/spongepowered/api/world/volume/stream/StreamOptions.java
index 89879f9e2..acea58110 100644
--- a/src/main/java/org/spongepowered/api/world/volume/stream/StreamOptions.java
+++ b/src/main/java/org/spongepowered/api/world/volume/stream/StreamOptions.java
@@ -151,6 +151,7 @@ public interface StreamOptions {
          * @return Whether sections that are previously empty, should be generated
          */
         public abstract boolean generateArea();
+
         public abstract boolean immediateLoading();
     }
 
diff --git a/src/main/java/org/spongepowered/api/world/volume/stream/VolumeApplicators.java b/src/main/java/org/spongepowered/api/world/volume/stream/VolumeApplicators.java
index 3fb898a30..cf64ae7c7 100644
--- a/src/main/java/org/spongepowered/api/world/volume/stream/VolumeApplicators.java
+++ b/src/main/java/org/spongepowered/api/world/volume/stream/VolumeApplicators.java
@@ -31,8 +31,8 @@ import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.EntityArchetype;
 import org.spongepowered.api.world.BlockChangeFlag;
 import org.spongepowered.api.world.LocationCreator;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.biome.Biome;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.volume.archetype.block.entity.BlockEntityArchetypeVolume;
 import org.spongepowered.api.world.volume.archetype.entity.EntityArchetypeVolume;
 import org.spongepowered.api.world.volume.biome.BiomeVolume;
diff --git a/src/main/java/org/spongepowered/api/world/volume/stream/VolumeCollectors.java b/src/main/java/org/spongepowered/api/world/volume/stream/VolumeCollectors.java
index 9d0f9e7db..335e92bb2 100644
--- a/src/main/java/org/spongepowered/api/world/volume/stream/VolumeCollectors.java
+++ b/src/main/java/org/spongepowered/api/world/volume/stream/VolumeCollectors.java
@@ -31,8 +31,8 @@ import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.EntityArchetype;
 import org.spongepowered.api.world.BlockChangeFlag;
 import org.spongepowered.api.world.BlockChangeFlags;
-import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.World;
+import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.volume.MutableVolume;
 
 import java.lang.ref.WeakReference;
diff --git a/src/main/java/org/spongepowered/api/world/volume/stream/VolumeElement.java b/src/main/java/org/spongepowered/api/world/volume/stream/VolumeElement.java
index a56adce1b..74ca2bf31 100644
--- a/src/main/java/org/spongepowered/api/world/volume/stream/VolumeElement.java
+++ b/src/main/java/org/spongepowered/api/world/volume/stream/VolumeElement.java
@@ -68,9 +68,9 @@ public interface VolumeElement<V extends Volume, T> {
                     return false;
                 }
                 final VolumeElement<@NonNull ?, ?> that = (VolumeElement<@NonNull ?, ?>) o;
-                return volume.get().equals(that.volume()) &&
-                    type.get().equals(that.type()) &&
-                    position.equals(that.position());
+                return volume.get().equals(that.volume())
+                    && type.get().equals(that.type())
+                    && position.equals(that.position());
             }
 
             @Override
diff --git a/src/main/java/org/spongepowered/api/world/volume/stream/VolumeStream.java b/src/main/java/org/spongepowered/api/world/volume/stream/VolumeStream.java
index 3d1dc2795..18d6f36e4 100644
--- a/src/main/java/org/spongepowered/api/world/volume/stream/VolumeStream.java
+++ b/src/main/java/org/spongepowered/api/world/volume/stream/VolumeStream.java
@@ -79,7 +79,7 @@ public interface VolumeStream<V extends Volume, T> {
     VolumeStream<V, Optional<? extends T>> flatMap(VolumeFlatMapper<V, T> mapper);
 
     default VolumeStream<V, Optional<? extends T>> flatMap(final Function<VolumeElement<V, T>, Optional<? extends T>> mapper) {
-        return this.flatMap((volume, value, x, y, z) -> mapper.apply(VolumeElement.of(volume, value, new Vector3i(x, y,z))));
+        return this.flatMap((volume, value, x, y, z) -> mapper.apply(VolumeElement.of(volume, value, new Vector3i(x, y, z))));
     }
 
     long count();
diff --git a/src/main/java/org/spongepowered/api/world/weather/Weather.java b/src/main/java/org/spongepowered/api/world/weather/Weather.java
index 424e42be6..df77c71cb 100644
--- a/src/main/java/org/spongepowered/api/world/weather/Weather.java
+++ b/src/main/java/org/spongepowered/api/world/weather/Weather.java
@@ -31,6 +31,7 @@ public interface Weather extends DataSerializable {
 
     /**
      * Gets the {@link WeatherType type}.
+     *
      * @return The type
      */
     WeatherType type();
diff --git a/src/main/java/org/spongepowered/api/world/weather/WeatherTypes.java b/src/main/java/org/spongepowered/api/world/weather/WeatherTypes.java
index 56de0f526..d0c8aaffc 100644
--- a/src/main/java/org/spongepowered/api/world/weather/WeatherTypes.java
+++ b/src/main/java/org/spongepowered/api/world/weather/WeatherTypes.java
@@ -27,10 +27,10 @@ package org.spongepowered.api.world.weather;
 import org.spongepowered.api.ResourceKey;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.registry.DefaultedRegistryReference;
-import org.spongepowered.api.registry.RegistryTypes;
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryScope;
 import org.spongepowered.api.registry.RegistryScopes;
+import org.spongepowered.api.registry.RegistryTypes;
 
 @SuppressWarnings("unused")
 @RegistryScopes(scopes = RegistryScope.GAME)