Fix some OCD issues

ref #23

src/main/java/org/spongepowered/common/command/SpongeCommand.java

@@ -392,7 +392,7 @@ private static CommandSpec getBlockInfoCommand() {
                     final RayTraceResult rayTraceResult = EntityUtil.rayTraceFromEntity(entityPlayerMP, 5, 1.0F);
                     if (rayTraceResult.typeOfHit != RayTraceResult.Type.BLOCK) {
                         src.sendMessage(Text.of(TextColors.RED, TextStyles.ITALIC,
-                                "Failed to find an entity! Please execute the command when looking at an entity!"));
+                                "Failed to find a block! Please execute the command when looking at a block!"));
                         return CommandResult.empty();
                     }
                     final WorldServer worldServer = (WorldServer) entityPlayerMP.world;

src/main/java/org/spongepowered/common/config/category/CollisionModCategory.java

@@ -35,7 +35,7 @@ public class CollisionModCategory extends ConfigCategory {
 
     @Setting(value = "enabled", comment = "Set to false if you want mod to ignore entity collision rules.")
     private boolean isEnabled = true;
-    @Setting(value = "defaults", comment = "Default max collisions used for all entities/blocks unless overidden.")
+    @Setting(value = "defaults", comment = "Default max collisions used for all entities/blocks unless overridden.")
     private Map<String, Integer> defaultMaxCollisions = new HashMap<>();
     @Setting(value = "blocks")
     private Map<String, Integer> blockList = new HashMap<>();

src/main/java/org/spongepowered/common/config/category/DebugCategory.java

@@ -39,7 +39,7 @@ public class DebugCategory extends ConfigCategory {
     @Setting(value = "dump-threads-on-warn", comment = "Dump the server thread on deadlock warning")
     private boolean dumpThreadsOnWarn = false;
 
-    @Setting(value = "concurrent-entity-checks", comment = "Detect and prevent certain attempts to use entities concurrently.\nWARNING: May drastically decrase server performance. Only enable this to debug a pre-existing issue")
+    @Setting(value = "concurrent-entity-checks", comment = "Detect and prevent certain attempts to use entities concurrently.\nWARNING: May drastically decrease server performance. Only enable this to debug a pre-existing issue")
     private boolean concurrentChecks = false;
 
     public boolean doConcurrentChecks() {

src/main/java/org/spongepowered/common/config/category/EntityActivationRangeCategory.java

@@ -35,7 +35,7 @@ public class EntityActivationRangeCategory extends ConfigCategory {
 
     @Setting(value = "auto-populate", comment = "If enabled, newly discovered entities will be added to this config with a default value.")
     private boolean autoPopulate = false;
-    @Setting(value = "defaults", comment = "Default activation ranges used for all entities unless overidden.")
+    @Setting(value = "defaults", comment = "Default activation ranges used for all entities unless overridden.")
     private Map<String, Integer> defaultRanges = new HashMap<>();
     @Setting(value = "mods", comment = "Per-mod overrides. Refer to the minecraft default mod for example.")
     private Map<String, EntityActivationModCategory> modList = new HashMap<>();

src/main/java/org/spongepowered/common/config/category/EntityCollisionCategory.java

@@ -37,7 +37,7 @@ public class EntityCollisionCategory extends ConfigCategory {
     private boolean autoPopulate = false;
     @Setting(value = "max-entities-within-aabb", comment = "Max amount of entities any given entity or block can collide with. This improves performance when there are more than 8 entities on top of eachother such as a 1x1 spawn pen. Set to 0 to disable.")
     private int maxEntitiesWithinAABB = 8;
-    @Setting(value = "defaults", comment = "Default max collisions used for all entities/blocks unless overidden.")
+    @Setting(value = "defaults", comment = "Default max collisions used for all entities/blocks unless overridden.")
     private Map<String, Integer> defaultMaxCollisions = new HashMap<>();
     @Setting(value = "mods", comment = "Per-mod overrides. Refer to the minecraft default mod for example.")
     private Map<String, CollisionModCategory> modList = new HashMap<>();

src/main/java/org/spongepowered/common/mixin/entitycollisions/MixinEntity_Collisions.java

@@ -136,7 +136,7 @@ public void initializeCollisionState(World worldObj) {
 
             Integer entityMaxCollision = null;
             if (this.mcEntity instanceof EntityItem) {
-                // check if all items are overidden
+                // check if all items are overridden
                 entityMaxCollision = collisionMod.getEntityList().get(this.spongeEntityType.getName());
             }
 

src/main/java/org/spongepowered/common/registry/SpongeGameRegistry.java

@@ -48,6 +48,7 @@
 import org.spongepowered.api.registry.ExtraClassCatalogRegistryModule;
 import org.spongepowered.api.registry.RegistrationPhase;
 import org.spongepowered.api.registry.RegistryModule;
+import org.spongepowered.api.registry.RegistryModuleAlreadyRegisteredException;
 import org.spongepowered.api.registry.util.PluginProvidedRegistryModule;
 import org.spongepowered.api.registry.util.RegistrationDependency;
 import org.spongepowered.api.resourcepack.ResourcePack;
@@ -102,6 +103,8 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
+import javax.annotation.Nullable;
+
 @SuppressWarnings("deprecation")
 @Singleton
 public class SpongeGameRegistry implements GameRegistry {
@@ -148,7 +151,11 @@ public void preRegistryInit() {
 
     @Override
     public <T extends CatalogType> SpongeGameRegistry registerModule(Class<T> catalogClass, CatalogRegistryModule<T> registryModule) {
-        checkArgument(!this.catalogRegistryMap.containsKey(catalogClass), "Already registered a registry module!");
+        @Nullable final CatalogRegistryModule<T> existingModule = (CatalogRegistryModule<T>) this.catalogRegistryMap.get(catalogClass);
+        if (existingModule != null) {
+            throw new RegistryModuleAlreadyRegisteredException("Already registered a registry module!", existingModule);
+        }
+
         this.catalogRegistryMap.put(catalogClass, registryModule);
         if (this.phase != RegistrationPhase.PRE_REGISTRY) {
             if (catalogClass.getName().contains("org.spongepowered.api") && catalogClass.getAnnotation(PluginProvidedRegistryModule.class) == null) {