From 20bef6e26d948698398bd16aeab8c9e6b89110e4 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 20:01:40 -0400 Subject: Format/import cleanup --- .../jewelrycraft/api/ModifierEffects.java | 149 ++++++++------------- 1 file changed, 59 insertions(+), 90 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java') diff --git a/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java b/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java index 389bafc..7b89b8c 100755 --- a/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java +++ b/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java @@ -11,13 +11,13 @@ import net.minecraft.util.DamageSource; import net.minecraftforge.event.entity.player.PlayerEvent; public class ModifierEffects { - protected ItemStack modifier; - protected Random rand = new Random(); - protected static ArrayList effects = new ArrayList<>(); + protected ItemStack modifier; + protected Random rand = new Random(); + protected static ArrayList effects = new ArrayList<>(); /** * @param modifier - * The item to use as modifier + * The item to use as modifier */ public ModifierEffects(ItemStack modifier) { this.modifier = modifier; @@ -42,116 +42,97 @@ public class ModifierEffects { * This runs every tick * * @param item - * The ItemStack representing the jewelry that runs - * the effect + * The ItemStack representing the jewelry that runs the effect * @param player - * The player wearing the jewelry wearing a jewelry - * with this modifier on it + * The player wearing the jewelry wearing a jewelry with this + * modifier on it * @param jewelry - * The actual jewelry item (used by me to determine - * the type of jewelry so I don't have to call - * item.getItem() blah blah blah) + * The actual jewelry item (used by me to determine the type of + * jewelry so I don't have to call item.getItem() blah blah blah) */ - public void action(ItemStack item, EntityPlayer player, - Item jewelry) { + public void action(ItemStack item, EntityPlayer player, Item jewelry) { // Do nothing }; /** - * This runs when an entity is attacked. This event can be - * canceled. + * This runs when an entity is attacked. This event can be canceled. * * @param item - * The ItemStack representing the jewelry that runs - * the effect + * The ItemStack representing the jewelry that runs the effect * @param player - * The player wearing the jewelry wearing a jewelry - * with this modifier on it + * The player wearing the jewelry wearing a jewelry with this + * modifier on it * @param target - * The attacked entity + * The attacked entity * @param jewelry - * The actual jewelry item (aka item.getItem(), - * almost) + * The actual jewelry item (aka item.getItem(), almost) * @param amount - * The amount of damage the entity took + * The amount of damage the entity took * @return The state of the event (true to cancel it, false to not) */ - public boolean onEntityAttackedCancellable(ItemStack item, - EntityPlayer player, Entity target, Item jewelry, + public boolean onEntityAttackedCancellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) { return false; } /** - * This runs when a player gets damaged. This event can be - * canceled. + * This runs when a player gets damaged. This event can be canceled. * * @param item - * The ItemStack representing the jewelry that runs - * the effect + * The ItemStack representing the jewelry that runs the effect * @param player - * The attacked player wearing a jewelry with this - * modifier on it + * The attacked player wearing a jewelry with this modifier on it * @param source - * The source of the damage + * The source of the damage * @param jewelry - * The actual jewelry item (aka item.getItem(), - * almost) + * The actual jewelry item (aka item.getItem(), almost) * @param amount - * The amount of damage the player took + * The amount of damage the player took * @return The state of the event (true to cancel it, false to not) */ - public boolean onPlayerAttackedCancellable(ItemStack item, - EntityPlayer player, DamageSource source, - Item jewelry, float amount) { + public boolean onPlayerAttackedCancellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, + float amount) { return false; } /** - * This is the same as onEntityAttackedCacellable, but this can not - * be canceled. I recommend using this over - * onEntityAttackedCacellable, as it is more reliable. + * This is the same as onEntityAttackedCacellable, but this can not be canceled. + * I recommend using this over onEntityAttackedCacellable, as it is more + * reliable. * * @param item - * The ItemStack representing the jewelry that runs - * the effect + * The ItemStack representing the jewelry that runs the effect * @param player - * The player wearing the jewelry wearing a jewelry - * with this modifier on it + * The player wearing the jewelry wearing a jewelry with this + * modifier on it * @param target - * The attacked entity + * The attacked entity * @param jewelry - * The actual jewelry item (aka item.getItem(), - * almost) + * The actual jewelry item (aka item.getItem(), almost) * @param amount - * The amount of damage the entity took + * The amount of damage the entity took */ - public void onEntityAttacked(ItemStack item, EntityPlayer player, - Entity target, Item jewelry, float amount) { + public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) { // Do nothing } /** - * This is just like onPlayerAttackedCacellable, only that this can - * not be canceled. I recommend using this over - * onPlayerAttackedCacellable, as it is more reliable. + * This is just like onPlayerAttackedCacellable, only that this can not be + * canceled. I recommend using this over onPlayerAttackedCacellable, as it is + * more reliable. * * @param item - * The ItemStack representing the jewelry that runs - * the effect + * The ItemStack representing the jewelry that runs the effect * @param player - * The attacked player wearing a jewelry with this - * modifier on it + * The attacked player wearing a jewelry with this modifier on it * @param source - * The source of the damage + * The source of the damage * @param jewelry - * The actual jewelry item (aka item.getItem(), - * almost) + * The actual jewelry item (aka item.getItem(), almost) * @param amount - * The amount of damage the player took + * The amount of damage the player took */ - public void onPlayerAttacked(ItemStack item, EntityPlayer player, - DamageSource source, Item jewelry, float amount) { + public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount) { // Do nothing } @@ -159,19 +140,15 @@ public class ModifierEffects { * This runs when the player dies * * @param item - * The ItemStack representing the jewelry that runs - * the effect + * The ItemStack representing the jewelry that runs the effect * @param player - * The player that died wearing a jewelry with this - * modifier on it + * The player that died wearing a jewelry with this modifier on it * @param source - * The source of the killing blow + * The source of the killing blow * @param jewelry - * The actual jewelry item (aka item.getItem(), - * almost) + * The actual jewelry item (aka item.getItem(), almost) */ - public void onPlayerDead(ItemStack item, EntityPlayer player, - DamageSource source, Item jewelry) { + public void onPlayerDead(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry) { // Do nothing } @@ -179,18 +156,14 @@ public class ModifierEffects { * This runs when the player respawns * * @param item - * The ItemStack representing the jewelry that runs - * the effect + * The ItemStack representing the jewelry that runs the effect * @param event - * The PlayerEvent that runs when the player - * respawns (this is also called when a player moves - * between dimensions) + * The PlayerEvent that runs when the player respawns (this is also + * called when a player moves between dimensions) * @param jewelry - * The actual jewelry item (aka item.getItem(), - * almost) + * The actual jewelry item (aka item.getItem(), almost) */ - public void onPlayerRespawn(ItemStack item, - PlayerEvent.Clone event, Item jewelry) { + public void onPlayerRespawn(ItemStack item, PlayerEvent.Clone event, Item jewelry) { // Do nothing } @@ -198,11 +171,9 @@ public class ModifierEffects { * This runs when the item containing this modifier is equipped * * @param item - * The ItemStack representing the jewelry that runs - * the effect + * The ItemStack representing the jewelry that runs the effect * @param jewelry - * The actual jewelry item (aka item.getItem(), - * almost) + * The actual jewelry item (aka item.getItem(), almost) */ public void onJewelryEquipped(ItemStack item, Item jewelry) { // Do nothing @@ -212,11 +183,9 @@ public class ModifierEffects { * This runs when the item containing this modifier is unquipped * * @param item - * The ItemStack representing the jewelry that runs - * the effect + * The ItemStack representing the jewelry that runs the effect * @param jewelry - * The actual jewelry item (aka item.getItem(), - * almost) + * The actual jewelry item (aka item.getItem(), almost) */ public void onJewelryUnequipped(ItemStack item, Item jewelry) { // Do nothing -- cgit v1.2.3