Fix remaining checkstyle warnings.

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>

Author: gabizou

src/main/java/org/spongepowered/api/event/SpongeEventFactory.java

@@ -575,17 +575,14 @@ public static EntityCollisionWithEntityEvent createEntityCollisionWithEntity(Gam
      * @param cause The cause of the event, can be null
      * @param entity The entity involved in this event
      * @param location The location of death
-     * @param droppedItems The items to drop
      * @param exp The experience to give, or take for negative values
      * @return A new instance of the event
      */
-    public static EntityDeathEvent createEntityDeath(Game game, Cause cause, Entity entity, Location location, Collection<ItemStack> droppedItems,
-            int exp) {
+    public static EntityDeathEvent createEntityDeath(Game game, Cause cause, Entity entity, Location location, int exp) {
         Map<String, Object> values = Maps.newHashMap();
         values.put("game", game);
         values.put("cause", Optional.fromNullable(cause));
         values.put("entity", entity);
-        values.put("droppedItems", droppedItems);
         values.put("location", location);
         values.put("exp", exp);
         return createEvent(EntityDeathEvent.class, values);
@@ -632,13 +629,15 @@ public static EntityDisplaceEvent createEntityDisplace(Game game, Entity entity,
      * Creates a new {@link EntityDropItemEvent}.
      *
      * @param game The game instance for this {@link GameEvent}
+     * @param cause The cause of this event
      * @param entity The entity involved in this event
      * @param droppedItems The items to drop
      * @return A new instance of the event
      */
-    public static EntityDropItemEvent createEntityDropItem(Game game, Entity entity, Collection<ItemStack> droppedItems) {
+    public static EntityDropItemEvent createEntityDropItem(Game game, Cause cause, Entity entity, Collection<ItemStack> droppedItems) {
         Map<String, Object> values = Maps.newHashMap();
         values.put("game", game);
+        values.put("cause", Optional.fromNullable(cause));
         values.put("entity", entity);
         values.put("droppedItems", droppedItems);
         return createEvent(EntityDropItemEvent.class, values);
@@ -1131,7 +1130,6 @@ public static PlayerChatEvent createPlayerChat(Game game, Player player, Command
      * @param player The player involved in this event
      * @param location The location of death
      * @param deathMessage The message to show to the player because they died
-     * @param droppedItems The items to drop
      * @param exp The experience to give, or take for negative values
      * @param newExperience The new experience the player will have towards the next level
      * @param newLevel The new level the player will have after death
@@ -1140,7 +1138,7 @@ public static PlayerChatEvent createPlayerChat(Game game, Player player, Command
      * @return A new instance of the event
      */
     public static PlayerDeathEvent createPlayerDeath(Game game, Cause cause, Player player, Location location, Text deathMessage,
-            Collection<ItemStack> droppedItems, int exp, int newExperience, int newLevel, boolean keepsLevel, boolean keepsInventory) {
+            int exp, int newExperience, int newLevel, boolean keepsLevel, boolean keepsInventory) {
 
         Map<String, Object> values = Maps.newHashMap();
         values.put("game", game);
@@ -1152,7 +1150,6 @@ public static PlayerDeathEvent createPlayerDeath(Game game, Cause cause, Player
         values.put("location", location);
         values.put("human", player);
         values.put("living", player);
-        values.put("droppedItems", droppedItems);
         values.put("exp", exp);
         values.put("newExperience", newExperience);
         values.put("newLevel", newLevel);
@@ -1166,12 +1163,14 @@ public static PlayerDeathEvent createPlayerDeath(Game game, Cause cause, Player
      *
      * @param game The game instance for this {@link GameEvent}
      * @param player The player involved in this event
+     * @param cause The cause of the event
      * @param droppedItems The items to drop
      * @return A new instance of the event
      */
-    public static PlayerDropItemEvent createPlayerDropItem(Game game, Player player, Collection<ItemStack> droppedItems) {
+    public static PlayerDropItemEvent createPlayerDropItem(Game game, Player player, Cause cause, Collection<ItemStack> droppedItems) {
         Map<String, Object> values = Maps.newHashMap();
         values.put("game", game);
+        values.put("cause", Optional.fromNullable(cause));
         values.put("entity", player);
         values.put("droppedItems", droppedItems);
         values.put("player", player);

src/main/java/org/spongepowered/api/scoreboard/Scoreboard.java

@@ -74,6 +74,16 @@ public interface Scoreboard {
      */
     void addObjective(Objective objective, @Nullable DisplaySlot displaySlot) throws IllegalStateException;
 
+    /**
+     * Adds the specified {@link Objective} to this scoreboard.
+     *
+     * @param objective The {@link Objective} add
+     * @throws IllegalArgumentException if an {@link Objective} with the same
+     *             {@link Objective#getName() name} already exists, or if the
+     *             specified {@link Objective} has already been added.
+     */
+    void addObjective(Objective objective) throws IllegalArgumentException;
+
     /**
      * Gets all {@link Objective}s of a Criteria on this scoreboard.
      *
@@ -89,16 +99,6 @@ public interface Scoreboard {
      */
     Set<Objective> getObjectives();
 
-    /**
-     * Adds the specified {@link Objective} to this scoreboard.
-     *
-     * @param objective The {@link Objective} add
-     * @throws IllegalArgumentException if an {@link Objective} with the same
-     *             {@link Objective#getName() name} already exists, or if the
-     *             specified {@link Objective} has already been added.
-     */
-    void addObjective(Objective objective) throws IllegalArgumentException;
-
     /**
      * Removes the specified {@link Objective} from this scoreboard.
      *

src/main/java/org/spongepowered/api/text/TextFactory.java

@@ -81,6 +81,7 @@ public interface TextFactory {
      * Returns a JSON representation of the {@link Text} as used in commands in the specified language.
      *
      * @param text The text to convert
+     * @param locale The language to get the json in
      * @return The text converted to JSON
      */
     String toJson(Text text, Locale locale);
@@ -137,6 +138,7 @@ public interface TextFactory {
      *
      * @param text The text to convert
      * @param code The legacy char to use for the message
+     * @param locale The language to translate into
      * @return The text converted to the old color codes
      */
     String toLegacy(Text text, char code, Locale locale);

src/main/java/org/spongepowered/api/text/translation/ResourceBundleTranslation.java

@@ -33,10 +33,10 @@
 
 /**
  * A translation class designed to be used for ResourceBundles. For convenience, most users will want to wrap this in a class that keeps track of
- * resource bundles. A simple implementaion would look like:
+ * resource bundles. A simple implementation would look like:
  * <pre>
  *     public class TranslationHelper {
- *         private static final Function<Locale, ResourceBundle> LOOKUP_FUNC = new Function<Locale, ResourceBundle>() {
+ *         private static final Function&lt;Locale, ResourceBundle&gt; LOOKUP_FUNC = new Function&lt;Locale, ResourceBundle&gt;() {
  *             &at;Nullable
  *             &at;Override
  *             public ResourceBundle apply(Locale input) {

src/main/java/org/spongepowered/api/util/SpongeApiTranslationHelper.java

@@ -35,9 +35,11 @@
 import javax.annotation.Nullable;
 
 /**
- * This class provides translations for strings within SpongeAPI. Plugins should consult an implementaion of Translation for help.
+ * This class provides translations for strings within SpongeAPI. Plugins
+ * should consult an implementaion of Translation for help.
  *
- * THIS IS AN API-INTERNAL CLASS -- DO NOT USE OUTSIDE OF API OR YOU WILL LIVE A SAD AND LONELY LIFE
+ * <p>THIS IS AN API-INTERNAL CLASS -- DO NOT USE OUTSIDE OF API OR YOU WILL
+ * LIVE A SAD AND LONELY LIFE</p>
  */
 public class SpongeApiTranslationHelper {
 

src/main/java/org/spongepowered/api/util/command/args/ChildCommandElementExecutor.java

@@ -24,8 +24,8 @@
  */
 package org.spongepowered.api.util.command.args;
 
-import static org.spongepowered.api.util.command.CommandMessageFormatting.error;
 import static org.spongepowered.api.util.SpongeApiTranslationHelper.t;
+import static org.spongepowered.api.util.command.CommandMessageFormatting.error;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;