Add editable names for effects/styles. Remove cos/sin caching

src/main/java/dev/esophose/playerparticles/PlayerParticles.java

@@ -7,10 +7,11 @@
  * + Add setting to disable particles while in combat
  * + Add a command aliases section to the config
  * * /ppo now uses your permissions instead of the player you are targetting
- *
  */
 
  /*
+ * * Fixed the 'swords' style so you have to be holding a sword/trident
+ * * Fixed several styles ignoring the disabled worlds setting
  * + Added a setting 'dust-size' to change the size of dust particles in 1.13+
  * * Cleaned up duplicated command parsing
  * + Added command '/pp fixed teleport <id>' that requires the permission playerparticles.fixed.teleport
@@ -43,6 +44,7 @@ import dev.esophose.playerparticles.hook.PlaceholderAPIHook;
 import dev.esophose.playerparticles.manager.CommandManager;
 import dev.esophose.playerparticles.manager.ConfigurationManager;
 import dev.esophose.playerparticles.manager.ConfigurationManager.Setting;
+import dev.esophose.playerparticles.manager.DataManager;
 import dev.esophose.playerparticles.manager.DataMigrationManager;
 import dev.esophose.playerparticles.manager.LocaleManager;
 import dev.esophose.playerparticles.manager.Manager;
@@ -54,7 +56,7 @@ import dev.esophose.playerparticles.manager.PluginUpdateManager;
 import dev.esophose.playerparticles.particles.PPlayerMovementListener;
 import dev.esophose.playerparticles.util.Metrics;
 import java.io.File;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginManager;
@@ -75,15 +77,16 @@ public class PlayerParticles extends JavaPlugin {
      */
     private Map<Class<?>, Manager> managers;
 
+    public PlayerParticles() {
+        INSTANCE = this;
+        this.managers = new LinkedHashMap<>();
+    }
+
     /**
      * Executes essential tasks for starting up the plugin
      */
     @Override
     public void onEnable() {
-        INSTANCE = this;
-
-        this.managers = new HashMap<>();
-
         this.reload();
 
         PluginManager pm = Bukkit.getPluginManager();
@@ -95,6 +98,8 @@ public class PlayerParticles extends JavaPlugin {
 
         if (PlaceholderAPIHook.enabled())
             new ParticlePlaceholderExpansion(this).register();
+
+        PlayerChatHook.setup();
     }
 
     @Override
@@ -141,21 +146,19 @@ public class PlayerParticles extends JavaPlugin {
      */
     public void reload() {
         this.managers.values().forEach(Manager::disable);
-        this.managers.clear();
+        this.managers.values().forEach(Manager::reload);
 
         this.getManager(CommandManager.class);
         this.getManager(ParticleStyleManager.class);
         this.getManager(ParticleGroupPresetManager.class);
         this.getManager(ConfigurationManager.class);
+        this.getManager(DataManager.class);
         this.getManager(DataMigrationManager.class);
-        this.getManager(PluginUpdateManager.class);
         this.getManager(ParticleManager.class);
         this.getManager(LocaleManager.class);
         this.getManager(ConfigurationManager.class);
         this.getManager(PermissionManager.class);
         this.getManager(PluginUpdateManager.class);
-
-        PlayerChatHook.setup();
     }
 
     /**

src/main/java/dev/esophose/playerparticles/gui/GuiInventoryEditEffect.java

@@ -36,7 +36,7 @@ public class GuiInventoryEditEffect extends GuiInventory {
             ParticleEffect effect = effectsUserHasPermissionFor.get(i);
             GuiActionButton selectButton = new GuiActionButton(
                     slot,
-                    GuiIcon.EFFECT.get(effect.getName()),
+                    GuiIcon.EFFECT.get(effect.getInternalName()),
                     localeManager.getLocaleMessage("gui-color-icon-name") + ParticleUtils.formatName(effect.getName()),
                     new String[]{localeManager.getLocaleMessage("gui-color-info") + localeManager.getLocaleMessage("gui-select-effect-description", StringPlaceholders.single("effect", ParticleUtils.formatName(effect.getName())))},
                     (button, isShiftClick) -> {

src/main/java/dev/esophose/playerparticles/gui/GuiInventoryEditStyle.java

@@ -36,7 +36,7 @@ public class GuiInventoryEditStyle extends GuiInventory {
             ParticleStyle style = stylesUserHasPermissionFor.get(i);
             GuiActionButton selectButton = new GuiActionButton(
                     slot,
-                    GuiIcon.STYLE.get(style.getName()),
+                    GuiIcon.STYLE.get(style.getInternalName()),
                     localeManager.getLocaleMessage("gui-color-icon-name") + ParticleUtils.formatName(style.getName()),
                     new String[]{localeManager.getLocaleMessage("gui-color-info") + localeManager.getLocaleMessage("gui-select-style-description", StringPlaceholders.single("style", ParticleUtils.formatName(style.getName())))},
                     (button, isShiftClick) -> {

src/main/java/dev/esophose/playerparticles/manager/DataManager.java

@@ -146,8 +146,8 @@ public class DataManager extends Manager {
 
                         // Particle properties
                         int id = result.getInt("id");
-                        ParticleEffect effect = ParticleEffect.fromName(result.getString("effect"));
+                        ParticleEffect effect = ParticleEffect.fromInternalName(result.getString("effect"));
-                        ParticleStyle style = ParticleStyle.fromName(result.getString("style"));
+                        ParticleStyle style = ParticleStyle.fromInternalName(result.getString("style"));
                         Material itemMaterial = ParticleUtils.closestMatchWithFallback(true, result.getString("item_material"));
                         Material blockMaterial = ParticleUtils.closestMatchWithFallback(true, result.getString("block_material"));
                         NoteColor noteColor = new NoteColor(result.getInt("note"));
@@ -211,8 +211,8 @@ public class DataManager extends Manager {
 
                         // Particle properties
                         int particleId = result.getInt("p_id");
-                        ParticleEffect effect = ParticleEffect.fromName(result.getString("effect"));
+                        ParticleEffect effect = ParticleEffect.fromInternalName(result.getString("effect"));
-                        ParticleStyle style = ParticleStyle.fromName(result.getString("style"));
+                        ParticleStyle style = ParticleStyle.fromInternalName(result.getString("style"));
                         Material itemMaterial = ParticleUtils.closestMatchWithFallback(true, result.getString("item_material"));
                         Material blockMaterial = ParticleUtils.closestMatchWithFallback(true, result.getString("block_material"));
                         NoteColor noteColor = new NoteColor(result.getInt("note"));
@@ -341,8 +341,8 @@ public class DataManager extends Manager {
                     particlesStatement.setString(1, UUID.randomUUID().toString());
                     particlesStatement.setString(2, groupUUID);
                     particlesStatement.setInt(3, particle.getId());
-                    particlesStatement.setString(4, particle.getEffect().getName());
+                    particlesStatement.setString(4, particle.getEffect().getInternalName());
-                    particlesStatement.setString(5, particle.getStyle().getName());
+                    particlesStatement.setString(5, particle.getStyle().getInternalName());
                     particlesStatement.setString(6, particle.getItemMaterial().name());
                     particlesStatement.setString(7, particle.getBlockMaterial().name());
                     particlesStatement.setInt(8, particle.getNoteColor().getNote());
@@ -412,8 +412,8 @@ public class DataManager extends Manager {
                 ParticlePair particle = fixedEffect.getParticlePair();
                 statement.setString(1, particleUUID);
                 statement.setInt(2, fixedEffect.getId());
-                statement.setString(3, particle.getEffect().getName());
+                statement.setString(3, particle.getEffect().getInternalName());
-                statement.setString(4, particle.getStyle().getName());
+                statement.setString(4, particle.getStyle().getInternalName());
                 statement.setString(5, particle.getItemMaterial().name());
                 statement.setString(6, particle.getBlockMaterial().name());
                 statement.setInt(7, particle.getNoteColor().getNote());
@@ -461,8 +461,8 @@ public class DataManager extends Manager {
                                          "WHERE uuid = (SELECT particle_uuid FROM " + this.getTablePrefix() + "fixed WHERE owner_uuid = ? AND id = ?)";
             try (PreparedStatement statement = connection.prepareStatement(particleUpdateQuery)) {
                 ParticlePair particle = fixedEffect.getParticlePair();
-                statement.setString(1, particle.getEffect().getName());
+                statement.setString(1, particle.getEffect().getInternalName());
-                statement.setString(2, particle.getStyle().getName());
+                statement.setString(2, particle.getStyle().getInternalName());
                 statement.setString(3, particle.getItemMaterial().name());
                 statement.setString(4, particle.getBlockMaterial().name());
                 statement.setInt(5, particle.getNoteColor().getNote());

src/main/java/dev/esophose/playerparticles/manager/ParticleGroupPresetManager.java

@@ -155,7 +155,7 @@ public class ParticleGroupPresetManager extends Manager {
 
                 this.presetGroups.add(new ParticleGroupPreset(displayName, guiIcon, permission, allowPermissionOverride, new ParticleGroup(groupName, particles)));
             } catch (Exception ex) {
-                PlayerParticles.getInstance().getLogger().severe("An error occurred while parsing the groups.yml file!");
+                PlayerParticles.getInstance().getLogger().severe("An error occurred while parsing the " + FILE_NAME + " file!");
             }
         }
     }

src/main/java/dev/esophose/playerparticles/manager/ParticleManager.java

@@ -172,11 +172,16 @@ public class ParticleManager extends Manager implements Listener, Runnable {
 
     /**
      * An alternative method used for event styles
-     * 
+     *
+     * @param player The player the particles are spawning from
      * @param particle The ParticlePair to use for getting particle settings
      * @param particles The particles to display
      */
-    public void displayParticles(ParticlePair particle, List<PParticle> particles) {
+    public void displayParticles(Player player, ParticlePair particle, List<PParticle> particles) {
+        PermissionManager permissionManager = this.playerParticles.getManager(PermissionManager.class);
+        if (player.getGameMode() == GameMode.SPECTATOR || !permissionManager.isWorldEnabled(player.getWorld().getName()))
+            return;
+
         for (PParticle pparticle : particles)
             ParticleEffect.display(particle, pparticle, false, Bukkit.getPlayer(particle.getOwnerUniqueId()));
     }

src/main/java/dev/esophose/playerparticles/manager/ParticleStyleManager.java

@@ -44,17 +44,17 @@ public class ParticleStyleManager extends Manager {
             return;
         }
         
-        if (style.getName() == null || style.getName().trim().equals("")) {
+        if (style.getInternalName() == null || style.getInternalName().trim().equals("")) {
-            PlayerParticles.getInstance().getLogger().severe("Tried to register a style with a null or empty name: '" + style.getName() + "'");
+            PlayerParticles.getInstance().getLogger().severe("Tried to register a style with a null or empty name: '" + style.getInternalName() + "'");
             return;
         }
         
         for (ParticleStyle testAgainst : this.styles) {
             if (testAgainst.equals(style)) {
-                PlayerParticles.getInstance().getLogger().severe("Tried to register the same style twice: '" + style.getName() + "'");
+                PlayerParticles.getInstance().getLogger().severe("Tried to register the same style twice: '" + style.getInternalName() + "'");
                 return;
-            } else if (testAgainst.getName().equalsIgnoreCase(style.getName())) {
+            } else if (testAgainst.getInternalName().equalsIgnoreCase(style.getInternalName())) {
-                PlayerParticles.getInstance().getLogger().severe("Tried to register two styles with the same name spelling: '" + style.getName() + "'");
+                PlayerParticles.getInstance().getLogger().severe("Tried to register two styles with the same internal name spelling: '" + style.getInternalName() + "'");
                 return;
             }
         }

src/main/java/dev/esophose/playerparticles/manager/PermissionManager.java

@@ -177,7 +177,7 @@ public class PermissionManager extends Manager {
      * @return True if the player has permission to use the effect
      */
     public boolean hasEffectPermission(Player player, ParticleEffect effect) {
-        return PPermission.EFFECT.check(player, effect.getName());
+        return PPermission.EFFECT.check(player, effect.getInternalName());
     }
 
     /**
@@ -189,7 +189,7 @@ public class PermissionManager extends Manager {
      * @return If the player has permission to use the style
      */
     public boolean hasStylePermission(Player player, ParticleStyle style) {
-        return PPermission.STYLE.check(player, style.getName());
+        return PPermission.STYLE.check(player, style.getInternalName());
     }
 
     /**

src/main/java/dev/esophose/playerparticles/particles/ParticleEffect.java

@@ -95,6 +95,8 @@ public enum ParticleEffect {
 
     private CommentedFileConfiguration config;
     private boolean enabledByDefault;
+
+    private String effectName;
     private boolean enabled;
 
     /**
@@ -135,9 +137,10 @@ public enum ParticleEffect {
         File directory = new File(PlayerParticles.getInstance().getDataFolder(), "effects");
         directory.mkdirs();
 
-        File file = new File(directory, this.getName() + ".yml");
+        File file = new File(directory, this.getInternalName() + ".yml");
         this.config = CommentedFileConfiguration.loadConfiguration(PlayerParticles.getInstance(), file);
 
+        this.setIfNotExists("effect-name", this.getInternalName(), "The name the effect will display as");
         this.setIfNotExists("enabled", this.enabledByDefault, "If the effect is enabled or not");
 
         this.config.save();
@@ -153,6 +156,7 @@ public enum ParticleEffect {
         if (reloadConfig)
             this.config.reloadConfig();
 
+        this.effectName = this.config.getString("effect-name");
         this.enabled = this.config.getBoolean("enabled");
     }
 
@@ -185,12 +189,17 @@ public enum ParticleEffect {
     }
 
     /**
-     * Returns the name of this particle effect
+     * @return the internal name of this particle effect that will never change
-     * 
+     */
-     * @return The name
+    public String getInternalName() {
+        return this.name().toLowerCase();
+    }
+
+    /**
+     * @return the name that the style will display to the users as
      */
     public String getName() {
-        return this.name().toLowerCase();
+        return this.effectName;
     }
 
     /**
@@ -239,7 +248,17 @@ public enum ParticleEffect {
      * @return The particle effect
      */
     public static ParticleEffect fromName(String name) {
-        return Stream.of(values()).filter(x -> x.name().equalsIgnoreCase(name) && x.isSupported() && x.isEnabled()).findFirst().orElse(null);
+        return Stream.of(values()).filter(x -> x.isSupported() && x.isEnabled() && x.getName().equalsIgnoreCase(name)).findFirst().orElse(null);
+    }
+
+    /**
+     * Returns the particle effect with the given name
+     *
+     * @param internalName Internal name of the particle effect
+     * @return The particle effect
+     */
+    public static ParticleEffect fromInternalName(String internalName) {
+        return Stream.of(values()).filter(x -> x.isSupported() && x.isEnabled() && x.getInternalName().equalsIgnoreCase(internalName)).findFirst().orElse(null);
     }
     
     /**

src/main/java/dev/esophose/playerparticles/styles/DefaultParticleStyle.java

@@ -10,18 +10,19 @@ public abstract class DefaultParticleStyle implements ParticleStyle {
 
     protected PlayerParticles playerParticles;
     private CommentedFileConfiguration config;
-    private String styleName;
+    private String internalStyleName;
     private boolean canBeFixedByDefault;
     private boolean canToggleWithMovementByDefault;
     private double fixedEffectOffsetByDefault;
 
+    private String styleName;
     private boolean enabled;
     private boolean canBeFixed;
     private boolean canToggleWithMovement;
     private double fixedEffectOffset;
 
-    public DefaultParticleStyle(String styleName, boolean canBeFixedByDefault, boolean canToggleWithMovementByDefault, double fixedEffectOffsetByDefault) {
+    public DefaultParticleStyle(String internalStyleName, boolean canBeFixedByDefault, boolean canToggleWithMovementByDefault, double fixedEffectOffsetByDefault) {
-        this.styleName = styleName;
+        this.internalStyleName = internalStyleName;
         this.canBeFixedByDefault = canBeFixedByDefault;
         this.canToggleWithMovementByDefault = canToggleWithMovementByDefault;
         this.fixedEffectOffsetByDefault = fixedEffectOffsetByDefault;
@@ -38,9 +39,10 @@ public abstract class DefaultParticleStyle implements ParticleStyle {
         File directory = new File(this.playerParticles.getDataFolder(), "styles");
         directory.mkdirs();
 
-        File file = new File(directory, this.getName() + ".yml");
+        File file = new File(directory, this.internalStyleName + ".yml");
         this.config = CommentedFileConfiguration.loadConfiguration(PlayerParticles.getInstance(), file);
 
+        this.setIfNotExists("style-name", this.internalStyleName, "The name the style will display as");
         this.setIfNotExists("enabled", true, "If the style is enabled or not");
         this.setIfNotExists("can-be-fixed", this.canBeFixedByDefault, "If the style can be used in /pp fixed");
         this.setIfNotExists("can-toggle-with-movement", this.canToggleWithMovementByDefault, "If the style will only be shown at the player's feet while moving");
@@ -57,6 +59,7 @@ public abstract class DefaultParticleStyle implements ParticleStyle {
         if (reloadConfig)
             this.config.reloadConfig();
 
+        this.styleName = this.config.getString("style-name");
         this.enabled = this.config.getBoolean("enabled");
         this.canBeFixed = this.config.getBoolean("can-be-fixed");
         this.canToggleWithMovement = this.config.getBoolean("can-toggle-with-movement");
@@ -95,6 +98,11 @@ public abstract class DefaultParticleStyle implements ParticleStyle {
         return this.styleName;
     }
 
+    @Override
+    public final String getInternalName() {
+        return this.internalStyleName;
+    }
+
     @Override
     public final boolean canBeFixed() {
         return this.canBeFixed;

src/main/java/dev/esophose/playerparticles/styles/ParticleStyle.java

@@ -29,9 +29,12 @@ public interface ParticleStyle {
     boolean isEnabled();
 
     /**
-     * The name of the style
+     * @return The style's internal name that will always remain constant
-     * 
+     */
-     * @return The style's name
+    String getInternalName();
+
+    /**
+     * @return The name that the style will display to the users as
      */
     String getName();
 
@@ -69,4 +72,17 @@ public interface ParticleStyle {
         return null;
     }
 
+    /**
+     * Gets the ParticleStyle with the internal name given, returns null if not found
+     *
+     * @param styleName The internal name of the style to search for
+     * @return The ParticleStyle with a matching name
+     */
+    static ParticleStyle fromInternalName(String styleName) {
+        for (ParticleStyle style : PlayerParticles.getInstance().getManager(ParticleStyleManager.class).getStyles())
+            if (style.getInternalName().equalsIgnoreCase(styleName))
+                return style;
+        return null;
+    }
+
 }

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleBatman.java

@@ -21,7 +21,8 @@ public class ParticleStyleBatman extends DefaultParticleStyle {
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
         
-        if (step != 0) return particles;
+        if (this.step != 0)
+            return particles;
         
         // Segment 1
         for (double x = -7; x <= -3; x += 0.05) {
@@ -114,7 +115,7 @@ public class ParticleStyleBatman extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        step = (step + 1) % 20; // Only spawn once per second
+        this.step = (this.step + 1) % 20; // Only spawn once per second
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleBeam.java

@@ -9,22 +9,8 @@ import org.bukkit.Location;
 
 public class ParticleStyleBeam extends DefaultParticleStyle {
 
-    private static double[] cos, sin;
-    private static final int points = 16;
     private int step = 0;
     private boolean reversed = false;
-    
-    static {
-        cos = new double[points];
-        sin = new double[points];
-        
-        int i = 0;
-        for (double n = 0; n < Math.PI * 2; n += Math.PI * 2 / points) {
-            cos[i] = Math.cos(n);
-            sin[i] = Math.sin(n);
-            i++;
-        }
-    }
 
     public ParticleStyleBeam() {
         super("beam", true, true, 0.5);
@@ -32,12 +18,16 @@ public class ParticleStyleBeam extends DefaultParticleStyle {
 
     @Override
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
+        int points = 16;
         double radius = 1;
+        double slice = 2 * Math.PI / points;
+
         List<PParticle> particles = new ArrayList<>();
         for (int i = 0; i < points; i++) {
-            double newX = location.getX() + radius * cos[i];
+            double angle = slice * i;
-            double newY = location.getY() + (step / 10D) - 1;
+            double newX = location.getX() + radius * Math.cos(angle);
-            double newZ = location.getZ() + radius * sin[i];
+            double newY = location.getY() + (this.step / 10D) - 1;
+            double newZ = location.getZ() + radius * Math.sin(angle);
             particles.add(new PParticle(new Location(location.getWorld(), newX, newY, newZ)));
         }
         return particles;
@@ -45,13 +35,12 @@ public class ParticleStyleBeam extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        if (!reversed) step++;
+        this.step += this.reversed ? -1 : 1;
-        else step--;
 
-        if (step >= 30) {
+        if (this.step >= 30) {
-            reversed = true;
+            this.reversed = true;
-        } else if (step <= 0) {
+        } else if (this.step <= 0) {
-            reversed = false;
+            this.reversed = false;
         }
     }
 

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleBlockBreak.java

@@ -58,7 +58,7 @@ public class ParticleStyleBlockBreak extends DefaultParticleStyle implements Lis
         if (pplayer != null) {
             for (ParticlePair particle : pplayer.getActiveParticlesForStyle(DefaultStyles.BLOCKBREAK)) {
                 Location loc = event.getBlock().getLocation().clone();
-                particleManager.displayParticles(particle, DefaultStyles.BLOCKBREAK.getParticles(particle, loc));
+                particleManager.displayParticles(player, particle, DefaultStyles.BLOCKBREAK.getParticles(particle, loc));
             }
         }
     }

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleBlockPlace.java

@@ -58,7 +58,7 @@ public class ParticleStyleBlockPlace extends DefaultParticleStyle implements Lis
         if (pplayer != null) {
             for (ParticlePair particle : pplayer.getActiveParticlesForStyle(DefaultStyles.BLOCKPLACE)) {
                 Location loc = event.getBlock().getLocation().clone();
-                particleManager.displayParticles(particle, DefaultStyles.BLOCKPLACE.getParticles(particle, loc));
+                particleManager.displayParticles(player, particle, DefaultStyles.BLOCKPLACE.getParticles(particle, loc));
             }
         }
     }

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleCelebration.java

@@ -77,6 +77,7 @@ public class ParticleStyleCelebration extends DefaultParticleStyle {
         double dz = Math.cos(angle) * distanceFrom;
         final Location loc = location.clone().add(dx, 1, dz);
         final int fuse = 3 + random.nextInt(3);
+        Player player = pplayer.getPlayer();
         ParticleManager particleManager = PlayerParticles.getInstance().getManager(ParticleManager.class);
 
         new BukkitRunnable() {
@@ -90,7 +91,7 @@ public class ParticleStyleCelebration extends DefaultParticleStyle {
                     trail.setEffect(ParticleEffect.FIREWORK);
                     trail.setStyle(DefaultStyles.CELEBRATION);
 
-                    particleManager.displayParticles(trail, Collections.singletonList(new PParticle(this.location)));
+                    particleManager.displayParticles(player, trail, Collections.singletonList(new PParticle(this.location)));
                     
                     this.location.add(0, 0.25, 0);
                 } else {
@@ -107,7 +108,7 @@ public class ParticleStyleCelebration extends DefaultParticleStyle {
                         
                         particles.add(new PParticle(this.location.clone().add(dx, dy, dz)));
                     }
-                    particleManager.displayParticles(particle, particles);
+                    particleManager.displayParticles(player, particle, particles);
                     
                     this.cancel();
                 }

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleCompanion.java

@@ -50,15 +50,15 @@ public class ParticleStyleCompanion extends DefaultParticleStyle {
 
         Vector vector = new Vector();
         
-        double t = (Math.PI / numParticles) * step;
+        double t = (Math.PI / this.numParticles) * this.step;
-        double r = Math.sin(t) * size;
+        double r = Math.sin(t) * this.size;
         double s = 2 * Math.PI * t;
 
-        vector.setX(xFactor * r * Math.cos(s) + xOffset);
+        vector.setX(this.xFactor * r * Math.cos(s) + this.xOffset);
-        vector.setZ(zFactor * r * Math.sin(s) + zOffset);
+        vector.setZ(this.zFactor * r * Math.sin(s) + this.zOffset);
-        vector.setY(yFactor * size * Math.cos(t) + yOffset);
+        vector.setY(this.yFactor * this.size * Math.cos(t) + this.yOffset);
 
-        for (int i = 0; i < particlesPerIteration; i++) {
+        for (int i = 0; i < this.particlesPerIteration; i++) {
             particles.add(new PParticle(location.clone().subtract(vector)));
         }
 
@@ -67,7 +67,7 @@ public class ParticleStyleCompanion extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        step++;
+        this.step++;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleCube.java

@@ -55,21 +55,20 @@ public class ParticleStyleCube extends DefaultParticleStyle {
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> pparticles = new ArrayList<>();
 
-        if (!skipNextStep) {
+        if (!this.skipNextStep) {
-            double xRotation = 0, yRotation = 0, zRotation = 0;
+            double xRotation = this.step * this.angularVelocityX;
-            xRotation = step * angularVelocityX;
+            double yRotation = this.step * this.angularVelocityY;
-            yRotation = step * angularVelocityY;
+            double zRotation = this.step * this.angularVelocityZ;
-            zRotation = step * angularVelocityZ;
+            double a = this.edgeLength / 2;
-            double a = edgeLength / 2;
             double angleX, angleY;
             Vector v = new Vector();
             for (int i = 0; i < 4; i++) {
                 angleY = i * Math.PI / 2;
                 for (int j = 0; j < 2; j++) {
                     angleX = j * Math.PI;
-                    for (int p = 0; p <= particles; p++) {
+                    for (int p = 0; p <= this.particles; p++) {
                         v.setX(a).setY(a);
-                        v.setZ(edgeLength * p / particles - a);
+                        v.setZ(this.edgeLength * p / this.particles - a);
                         VectorUtils.rotateAroundAxisX(v, angleX);
                         VectorUtils.rotateAroundAxisY(v, angleY);
                         VectorUtils.rotateVector(v, xRotation, yRotation, zRotation);
@@ -91,8 +90,8 @@ public class ParticleStyleCube extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        skipNextStep = !skipNextStep;
+        this.skipNextStep = !this.skipNextStep;
-        step++;
+        this.step++;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleHalo.java

@@ -9,21 +9,7 @@ import org.bukkit.Location;
 
 public class ParticleStyleHalo extends DefaultParticleStyle {
 
-    private static double[] cos, sin;
-    private static final int points = 16;
     private int step = 0;
-    
-    static {
-        cos = new double[points];
-        sin = new double[points];
-        
-        int i = 0;
-        for (double n = 0; n < Math.PI * 2; n += Math.PI * 2 / points) {
-            cos[i] = Math.cos(n);
-            sin[i] = Math.sin(n);
-            i++;
-        }
-    }
 
     public ParticleStyleHalo() {
         super("halo", true, false, -0.5);
@@ -31,15 +17,19 @@ public class ParticleStyleHalo extends DefaultParticleStyle {
 
     @Override
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
-        if (step % 2 == 0) return new ArrayList<>();
+        List<PParticle> particles = new ArrayList<>();
+        if (this.step % 2 == 0)
+            return particles;
 
         int points = 16;
         double radius = .65;
-        List<PParticle> particles = new ArrayList<>();
+        double slice = 2 * Math.PI / points;
+
         for (int i = 0; i < points; i++) {
-            double dx = radius * cos[i];
+            double angle = slice * i;
+            double dx = radius * Math.cos(angle);
             double dy = 1.5;
-            double dz = radius * sin[i];
+            double dz = radius * Math.sin(angle);
             particles.add(new PParticle(location.clone().add(dx, dy, dz)));
         }
         return particles;
@@ -47,10 +37,9 @@ public class ParticleStyleHalo extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        step++;
+        this.step++;
-        if (step > 30) {
+        if (this.step > 30)
-            step = 0;
+            this.step = 0;
-        }
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleHurt.java

@@ -50,7 +50,7 @@ public class ParticleStyleHurt extends DefaultParticleStyle implements Listener
             if (pplayer != null) {
                 for (ParticlePair particle : pplayer.getActiveParticlesForStyle(DefaultStyles.HURT)) {
                     Location loc = player.getLocation().clone().add(0, 1, 0);
-                    particleManager.displayParticles(particle, DefaultStyles.HURT.getParticles(particle, loc));
+                    particleManager.displayParticles(player, particle, DefaultStyles.HURT.getParticles(particle, loc));
                 }
             }
         }

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleInvocation.java

@@ -9,7 +9,7 @@ import java.util.List;
 import org.bukkit.Location;
 
 public class ParticleStyleInvocation extends DefaultParticleStyle {
-    
+
     private int points = 6;
     private double radius = 3.5;
     private double step = 0;
@@ -22,75 +22,75 @@ public class ParticleStyleInvocation extends DefaultParticleStyle {
 
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
-        double speed = getSpeedByEffect(particle.getEffect());
+        double speed = this.getSpeedByEffect(particle.getEffect());
-        
+
         // Circle around everything, spawn less often
-        if (circleStep % 5 == 0) {
+        if (this.circleStep % 5 == 0) {
-            for (int i = 0; i < numSteps; i++) {
+            for (int i = 0; i < this.numSteps; i++) {
-                double dx = Math.cos(Math.PI * 2 * ((double)i / numSteps)) * radius;
+                double dx = Math.cos(Math.PI * 2 * ((double) i / this.numSteps)) * this.radius;
                 double dy = -0.9;
-                double dz = Math.sin(Math.PI * 2 * ((double)i / numSteps)) * radius;
+                double dz = Math.sin(Math.PI * 2 * ((double) i / this.numSteps)) * this.radius;
                 particles.add(new PParticle(location.clone().add(dx, dy, dz)));
             }
         }
-        
+
         // Orbit going clockwise
-        for (int i = 0; i < points; i++) {
+        for (int i = 0; i < this.points; i++) {
-            double dx = Math.cos(step + (Math.PI * 2 * ((double)i / points))) * radius;
+            double dx = Math.cos(this.step + (Math.PI * 2 * ((double) i / this.points))) * this.radius;
             double dy = -0.9;
-            double dz = Math.sin(step + (Math.PI * 2 * ((double)i / points))) * radius;
+            double dz = Math.sin(this.step + (Math.PI * 2 * ((double) i / this.points))) * this.radius;
             double angle = Math.atan2(dz, dx);
             double xAng = -Math.cos(angle);
             double zAng = -Math.sin(angle);
             particles.add(new PParticle(location.clone().add(dx, dy, dz), xAng, 0, zAng, speed, true));
         }
-        
+
         // Orbit going counter-clockwise
-        for (int i = 0; i > -points; i--) {
+        for (int i = 0; i > -this.points; i--) {
-            double dx = Math.cos(-step + (Math.PI * 2 * ((double)i / points))) * radius;
+            double dx = Math.cos(-this.step + (Math.PI * 2 * ((double) i / this.points))) * this.radius;
             double dy = -0.9;
-            double dz = Math.sin(-step + (Math.PI * 2 * ((double)i / points))) * radius;
+            double dz = Math.sin(-this.step + (Math.PI * 2 * ((double) i / this.points))) * this.radius;
             double angle = Math.atan2(dz, dx);
             double xAng = -Math.cos(angle);
             double zAng = -Math.sin(angle);
             particles.add(new PParticle(location.clone().add(dx, dy, dz), xAng, 0, zAng, speed, true));
         }
-        
+
         return particles;
     }
-    
+
     private double getSpeedByEffect(ParticleEffect effect) {
         switch (effect) {
-        case CRIT:
+            case CRIT:
-        case DAMAGE_INDICATOR:
+            case DAMAGE_INDICATOR:
-        case ENCHANTED_HIT:
+            case ENCHANTED_HIT:
-            return 2;
+                return 2;
-        case DRAGON_BREATH:
+            case DRAGON_BREATH:
-            return 0.01;
+                return 0.01;
-        case ENCHANT:
+            case ENCHANT:
-        case NAUTILUS:
+            case NAUTILUS:
-        case PORTAL:
+            case PORTAL:
-            return radius * 2;
+                return radius * 2;
-        case END_ROD:
+            case END_ROD:
-        case SMOKE:
+            case SMOKE:
-        case SQUID_INK:
+            case SQUID_INK:
-            return 0.3;
+                return 0.3;
-        case FIREWORK:
+            case FIREWORK:
-        case SPIT:
+            case SPIT:
-        case SPLASH:
+            case SPLASH:
-            return 0.5;
+                return 0.5;
-        case POOF:
+            case POOF:
-            return 0.4;
+                return 0.4;
-        case TOTEM_OF_UNDYING:
+            case TOTEM_OF_UNDYING:
-            return 1.25;
+                return 1.25;
-        default:
+            default:
-            return 0.2; // Flame
+                return 0.2; // Flame
         }
     }
 
     public void updateTimers() {
-        step = (step + Math.PI * 2 / numSteps) % numSteps;
+        this.step = (this.step + Math.PI * 2 / this.numSteps) % this.numSteps;
-        circleStep = (circleStep + 1) % numSteps;
+        this.circleStep = (this.circleStep + 1) % this.numSteps;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleMove.java

@@ -41,15 +41,15 @@ public class ParticleStyleMove extends DefaultParticleStyle implements Listener
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerMove(PlayerMoveEvent e) {
+    public void onPlayerMove(PlayerMoveEvent event) {
         ParticleManager particleManager = PlayerParticles.getInstance().getManager(ParticleManager.class);
 
-        PPlayer pplayer = PlayerParticles.getInstance().getManager(DataManager.class).getPPlayer(e.getPlayer().getUniqueId());
+        PPlayer pplayer = PlayerParticles.getInstance().getManager(DataManager.class).getPPlayer(event.getPlayer().getUniqueId());
         if (pplayer != null) {
             for (ParticlePair particle : pplayer.getActiveParticlesForStyle(DefaultStyles.MOVE)) {
-                Location loc = e.getPlayer().getLocation().clone();
+                Location loc = event.getPlayer().getLocation().clone();
                 loc.setY(loc.getY() + 0.05);
-                particleManager.displayParticles(particle, DefaultStyles.MOVE.getParticles(particle, loc));
+                particleManager.displayParticles(event.getPlayer(), particle, DefaultStyles.MOVE.getParticles(particle, loc));
             }
         }
     }

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleOrbit.java

@@ -9,22 +9,9 @@ import org.bukkit.Location;
 
 public class ParticleStyleOrbit extends DefaultParticleStyle {
 
-    private static double[] cos, sin;
     private static final int orbs = 3;
     private static final int numSteps = 120;
     private int step = 0;
-    
-    static {
-        cos = new double[120];
-        sin = new double[120];
-        
-        int i = 0;
-        for (double n = 0; n < numSteps; n++) {
-            cos[i] = -Math.cos(n / numSteps * Math.PI * 2);
-            sin[i] = -Math.sin(n / numSteps * Math.PI * 2);
-            i++;
-        }
-    }
 
     public ParticleStyleOrbit() {
         super("orbit", true, true, 0);
@@ -34,8 +21,8 @@ public class ParticleStyleOrbit extends DefaultParticleStyle {
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
         for (int i = 0; i < orbs; i++) {
-            double dx = cos[(step + (numSteps / orbs * i)) % numSteps];
+            double dx = -(Math.cos((this.step / (double) numSteps) * (Math.PI * 2) + (((Math.PI * 2) / orbs) * i)));
-            double dz = sin[(step + (numSteps / orbs * i)) % numSteps];
+            double dz = -(Math.sin((this.step / (double) numSteps) * (Math.PI * 2) + (((Math.PI * 2) / orbs) * i)));
             particles.add(new PParticle(location.clone().add(dx, 0, dz)));
         }
         return particles;
@@ -43,10 +30,7 @@ public class ParticleStyleOrbit extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        step++;
+        this.step = (this.step + 1) % numSteps;
-        if (step > numSteps) {
-            step = 0;
-        }
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStylePopper.java

@@ -24,26 +24,26 @@ public class ParticleStylePopper extends DefaultParticleStyle {
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
 
-        double radius = (1 - (double)step / maxStep);
+        double radius = (1 - (double) this.step / this.maxStep);
-        for (int i = 0; i < helices; i++) {
+        for (int i = 0; i < this.helices; i++) {
-            double angle = step * radials + (2 * Math.PI * i / helices);
+            double angle = this.step * this.radials + (2 * Math.PI * i / this.helices);
-            Vector v = new Vector(Math.cos(angle) * radius, step * grow - 1, Math.sin(angle) * radius);
+            Vector v = new Vector(Math.cos(angle) * radius, this.step * this.grow - 1, Math.sin(angle) * radius);
 
             particles.add(new PParticle(location.clone().add(v)));
         }
-        
+
-        if (step == maxStep - 1) {
+        if (this.step == this.maxStep - 1) {
             for (int i = 0; i < 10; i++) {
                 particles.add(new PParticle(location.clone().add(0, 1.5, 0), 0.5, 0.5, 0.5, 0.03));
             }
         }
-        
+
         return particles;
     }
 
     @Override
     public void updateTimers() {
-        step = (step + 1) % maxStep;
+        this.step = (this.step + 1) % this.maxStep;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStylePulse.java

@@ -22,13 +22,13 @@ public class ParticleStylePulse extends DefaultParticleStyle {
     @Override
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
-        double speed = getSpeedByEffect(particle.getEffect());
+        double speed = this.getSpeedByEffect(particle.getEffect());
 
-        if (step == 0) {
+        if (this.step == 0) {
-            for (int i = 0; i < points; i++) {
+            for (int i = 0; i < this.points; i++) {
-                double dx = Math.cos(Math.PI * 2 * ((double) i / points)) * radius;
+                double dx = Math.cos(Math.PI * 2 * ((double) i / this.points)) * this.radius;
                 double dy = -0.9;
-                double dz = Math.sin(Math.PI * 2 * ((double) i / points)) * radius;
+                double dz = Math.sin(Math.PI * 2 * ((double) i / this.points)) * this.radius;
                 double angle = Math.atan2(dz, dx);
                 double xAng = Math.cos(angle);
                 double zAng = Math.sin(angle);
@@ -50,7 +50,7 @@ public class ParticleStylePulse extends DefaultParticleStyle {
             case ENCHANT:
             case NAUTILUS:
             case PORTAL:
-                return radius;
+                return 0.5;
             case END_ROD:
             case SMOKE:
             case SQUID_INK:
@@ -70,7 +70,7 @@ public class ParticleStylePulse extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        step = (step + 1) % numSteps;
+        this.step = (this.step + 1) % this.numSteps;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleQuadhelix.java

@@ -9,25 +9,12 @@ import org.bukkit.Location;
 
 public class ParticleStyleQuadhelix extends DefaultParticleStyle {
 
-    private static double[] cos, sin;
     private static final int orbs = 4;
     private static int maxStepX = 80;
     private static int maxStepY = 60;
     private int stepX = 0;
     private int stepY = 0;
     private boolean reverse = false;
-    
-    static {
-        cos = new double[maxStepX];
-        sin = new double[maxStepX];
-        
-        int i = 0;
-        for (double n = 0; n < maxStepX; n++) {
-            cos[i] = -Math.cos(n / maxStepX * Math.PI * 2);
-            sin[i] = -Math.sin(n / maxStepX * Math.PI * 2);
-            i++;
-        }
-    }
 
     public ParticleStyleQuadhelix() {
         super("quadhelix", true, true, 0);
@@ -37,10 +24,9 @@ public class ParticleStyleQuadhelix extends DefaultParticleStyle {
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
         for (int i = 0; i < orbs; i++) {
-            int step = (stepX + (maxStepX / orbs) * i) % maxStepX;
+            double dx = -(Math.cos((this.stepX / (double) maxStepX) * (Math.PI * 2) + (((Math.PI * 2) / orbs) * i))) * ((maxStepY - Math.abs(this.stepY)) / (double) maxStepY);
-            double dx = cos[step] * ((60 - Math.abs(stepY)) / (double)maxStepY);
+            double dy = (this.stepY / (double) maxStepY) * 1.5;
-            double dy = (stepY / (double)maxStepY) * 1.5;
+            double dz = -(Math.sin((this.stepX / (double) maxStepX) * (Math.PI * 2) + (((Math.PI * 2) / orbs) * i))) * ((maxStepY - Math.abs(this.stepY)) / (double) maxStepY);
-            double dz = sin[step] * ((60 - Math.abs(stepY)) / (double)maxStepY);
             particles.add(new PParticle(location.clone().add(dx, dy, dz)));
         }
         return particles;
@@ -48,16 +34,18 @@ public class ParticleStyleQuadhelix extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        stepX++;
+        this.stepX++;
-        if (stepX > maxStepX) {
+        if (this.stepX > maxStepX) {
-            stepX = 0;
+            this.stepX = 0;
         }
-        if (reverse) {
+        if (this.reverse) {
-            stepY++;
+            this.stepY++;
-            if (stepY > maxStepY) reverse = false;
+            if (this.stepY > maxStepY)
+                this.reverse = false;
         } else {
-            stepY--;
+            this.stepY--;
-            if (stepY < -maxStepY) reverse = true;
+            if (this.stepY < -maxStepY)
+                this.reverse = true;
         }
     }
 

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleRings.java

@@ -8,21 +8,9 @@ import java.util.List;
 import org.bukkit.Location;
 
 public class ParticleStyleRings extends DefaultParticleStyle {
-    
+
-    private static double[] cos, sin;
+    private int step = 0;
-    private int index = 0;
+    private final static int maxStep = 32;
-    
-    static {
-        cos = new double[32];
-        sin = new double[32];
-        
-        int i = 0;
-        for (double n = 0; n < Math.PI * 2; n += Math.PI / 16) {
-            cos[i] = Math.sin(n);
-            sin[i] = Math.cos(n);
-            i++;
-        }
-    }
 
     public ParticleStyleRings() {
         super("rings", true, true, 0);
@@ -31,28 +19,21 @@ public class ParticleStyleRings extends DefaultParticleStyle {
     @Override
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
-        
+
-        particles.add(new PParticle(location.clone().add(cos[index], sin[index], sin[index])));
+        double ring1 = Math.PI / (maxStep / 2D) * this.step;
-        particles.add(new PParticle(location.clone().add(cos[wrap(index + 16)], sin[wrap(index + 16)], sin[wrap(index + 16)])));
+        double ring2 = Math.PI / (maxStep / 2D) * (((this.step + maxStep / 2D) % maxStep));
-        particles.add(new PParticle(location.clone().add(cos[wrap(index + 16)], sin[index], sin[wrap(index + 16)])));
+
-        particles.add(new PParticle(location.clone().add(cos[index], sin[wrap(index + 16)], sin[index])));
+        particles.add(new PParticle(location.clone().add(Math.cos(ring1), Math.sin(ring1), Math.sin(ring1))));
-        
+        particles.add(new PParticle(location.clone().add(Math.cos(ring1 + Math.PI), Math.sin(ring1), Math.sin(ring1 + Math.PI))));
+        particles.add(new PParticle(location.clone().add(Math.cos(ring2), Math.sin(ring2), Math.sin(ring2))));
+        particles.add(new PParticle(location.clone().add(Math.cos(ring2 + Math.PI), Math.sin(ring2), Math.sin(ring2 + Math.PI))));
+
         return particles;
     }
-    
-    /**
-     * Wraps an index around the cos/sin array length
-     * 
-     * @param index The index to wrap
-     * @return The wrapped index
-     */
-    private int wrap(int index) {
-        return index % cos.length;
-    }
 
     @Override
     public void updateTimers() {
-        index = (index + 1) % cos.length;
+        this.step = (this.step + 1) % maxStep;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleSpin.java

@@ -32,15 +32,15 @@ public class ParticleStyleSpin extends DefaultParticleStyle {
     @Override
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         double radius = .5;
-        double newX = location.getX() + radius * cos[step];
+        double newX = location.getX() + radius * cos[this.step];
         double newY = location.getY() + 1.5;
-        double newZ = location.getZ() + radius * sin[step];
+        double newZ = location.getZ() + radius * sin[this.step];
         return Collections.singletonList(new PParticle(new Location(location.getWorld(), newX, newY, newZ)));
     }
 
     @Override
     public void updateTimers() {
-        step = (step + 1) % maxSteps;
+        this.step = (this.step + 1) % maxSteps;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleSpiral.java

@@ -19,9 +19,9 @@ public class ParticleStyleSpiral extends DefaultParticleStyle {
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
         for (int stepY = -60; stepY < 60; stepY += 10) {
-            double dx = -(Math.cos(((stepX + stepY) / 90D) * Math.PI * 2)) * 0.8;
+            double dx = -(Math.cos(((this.stepX + stepY) / 90D) * Math.PI * 2)) * 0.8;
             double dy = stepY / 45D;
-            double dz = -(Math.sin(((stepX + stepY) / 90D) * Math.PI * 2)) * 0.8;
+            double dz = -(Math.sin(((this.stepX + stepY) / 90D) * Math.PI * 2)) * 0.8;
             particles.add(new PParticle(location.clone().add(dx, dy, dz)));
         }
         return particles;
@@ -29,7 +29,7 @@ public class ParticleStyleSpiral extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        stepX++;
+        this.stepX++;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleSwords.java

@@ -67,10 +67,10 @@ public class ParticleStyleSwords extends DefaultParticleStyle implements Listene
             Player player = (Player) event.getDamager();
             LivingEntity entity = (LivingEntity) event.getEntity();
             PPlayer pplayer = PlayerParticles.getInstance().getManager(DataManager.class).getPPlayer(player.getUniqueId());
-            if (pplayer != null) {
+            if (pplayer != null && SWORD_NAMES.contains(player.getInventory().getItemInMainHand().getType().name())) {
                 for (ParticlePair particle : pplayer.getActiveParticlesForStyle(DefaultStyles.SWORDS)) {
                     Location loc = entity.getLocation().clone().add(0, 1, 0);
-                    particleManager.displayParticles(particle, DefaultStyles.SWORDS.getParticles(particle, loc));
+                    particleManager.displayParticles(player, particle, DefaultStyles.SWORDS.getParticles(particle, loc));
                 }
             }
         }

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleTwins.java

@@ -16,11 +16,11 @@ public class ParticleStyleTwins extends DefaultParticleStyle {
     private int stepY = 0;
     private int maxStepY = 30;
     private boolean reverse = false;
-    
+
     static {
         cos = new double[120];
         sin = new double[120];
-        
+
         int i = 0;
         for (double n = 0; n < numSteps; n++) {
             cos[i] = -Math.cos(n / numSteps * Math.PI * 2);
@@ -37,9 +37,9 @@ public class ParticleStyleTwins extends DefaultParticleStyle {
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
         for (int i = 0; i < orbs; i++) {
-            double dx = cos[(stepX + (numSteps / orbs * i)) % numSteps];
+            double dx = cos[(this.stepX + (numSteps / orbs * i)) % numSteps];
-            double dy = (stepY / (double)maxStepY);
+            double dy = (this.stepY / (double) this.maxStepY);
-            double dz = sin[(stepX + (numSteps / orbs * i)) % numSteps];
+            double dz = sin[(this.stepX + (numSteps / orbs * i)) % numSteps];
             particles.add(new PParticle(location.clone().add(dx, dy, dz)));
         }
         return particles;
@@ -47,17 +47,19 @@ public class ParticleStyleTwins extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        stepX++;
+        this.stepX++;
-        if (stepX > numSteps) {
+        if (this.stepX > numSteps) {
-            stepX = 0;
+            this.stepX = 0;
         }
-        
+
-        if (reverse) {
+        if (this.reverse) {
-            stepY++;
+            this.stepY++;
-            if (stepY > maxStepY) reverse = false;
+            if (this.stepY > this.maxStepY)
+                this.reverse = false;
         } else {
-            stepY--;
+            this.stepY--;
-            if (stepY < -maxStepY) reverse = true;
+            if (this.stepY < -this.maxStepY)
+                this.reverse = true;
         }
     }
 

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleVortex.java

@@ -1,18 +1,18 @@
 /**
  * The MIT License (MIT)
- *
+ * <p>
  * Copyright (c) 2014 Slikey
- *
+ * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ * <p>
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- *
+ * <p>
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -32,7 +32,7 @@ import org.bukkit.Location;
 import org.bukkit.util.Vector;
 
 public class ParticleStyleVortex extends DefaultParticleStyle {
-    
+
     private double grow = .05f;
     private double radials = Math.PI / 16;
     private int helices = 4;
@@ -47,20 +47,20 @@ public class ParticleStyleVortex extends DefaultParticleStyle {
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
 
-        double radius = 2 * (1 - (double)step / maxStep);
+        double radius = 2 * (1 - (double) this.step / this.maxStep);
-        for (int i = 0; i < helices; i++) {
+        for (int i = 0; i < this.helices; i++) {
-            double angle = step * radials + (2 * Math.PI * i / helices);
+            double angle = this.step * this.radials + (2 * Math.PI * i / this.helices);
-            Vector v = new Vector(Math.cos(angle) * radius, step * grow - 1, Math.sin(angle) * radius);
+            Vector v = new Vector(Math.cos(angle) * radius, this.step * this.grow - 1, Math.sin(angle) * radius);
 
             particles.add(new PParticle(location.clone().add(v)));
         }
-        
+
         return particles;
     }
 
     @Override
     public void updateTimers() {
-        step = (step + 1) % maxStep;
+        this.step = (this.step + 1) % this.maxStep;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleWhirl.java

@@ -9,7 +9,7 @@ import java.util.List;
 import org.bukkit.Location;
 
 public class ParticleStyleWhirl extends DefaultParticleStyle {
-    
+
     private int points = 2;
     private double step = 0;
     private int numSteps = 40;
@@ -21,53 +21,53 @@ public class ParticleStyleWhirl extends DefaultParticleStyle {
     @Override
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
-        double speed = getSpeedByEffect(particle.getEffect());
+        double speed = this.getSpeedByEffect(particle.getEffect());
-        
+
-        for (int i = 0; i < points; i++) {
+        for (int i = 0; i < this.points; i++) {
-            double dx = Math.cos(step + (Math.PI * 2 * ((double)i / points)));
+            double dx = Math.cos(this.step + (Math.PI * 2 * ((double) i / this.points)));
             double dy = -0.9;
-            double dz = Math.sin(step + (Math.PI * 2 * ((double)i / points)));
+            double dz = Math.sin(this.step + (Math.PI * 2 * ((double) i / this.points)));
             double angle = Math.atan2(dz, dx);
             double xAng = Math.cos(angle);
             double zAng = Math.sin(angle);
             particles.add(new PParticle(location.clone().add(0, dy, 0), xAng, 0, zAng, speed, true));
         }
-        
+
         return particles;
     }
-    
+
     private double getSpeedByEffect(ParticleEffect effect) {
         switch (effect) {
-        case CRIT:
+            case CRIT:
-        case DAMAGE_INDICATOR:
+            case DAMAGE_INDICATOR:
-        case ENCHANTED_HIT:
+            case ENCHANTED_HIT:
-            return 1;
+                return 1;
-        case DRAGON_BREATH:
+            case DRAGON_BREATH:
-            return 0.01;
+                return 0.01;
-        case ENCHANT:
+            case ENCHANT:
-        case NAUTILUS:
+            case NAUTILUS:
-        case PORTAL:
+            case PORTAL:
-            return 1;
+                return 1;
-        case END_ROD:
+            case END_ROD:
-        case SMOKE:
+            case SMOKE:
-        case SQUID_INK:
+            case SQUID_INK:
-            return 0.15;
+                return 0.15;
-        case FIREWORK:
+            case FIREWORK:
-        case SPIT:
+            case SPIT:
-        case SPLASH:
+            case SPLASH:
-            return 0.25;
+                return 0.25;
-        case POOF:
+            case POOF:
-            return 0.2;
+                return 0.2;
-        case TOTEM_OF_UNDYING:
+            case TOTEM_OF_UNDYING:
-            return 0.75;
+                return 0.75;
-        default:
+            default:
-            return 0.1; // Flame
+                return 0.1; // Flame
         }
     }
 
     @Override
     public void updateTimers() {
-        step = (step + Math.PI * 2 / numSteps) % numSteps;
+        this.step = (this.step + Math.PI * 2 / this.numSteps) % this.numSteps;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleWhirlwind.java

@@ -9,7 +9,7 @@ import java.util.List;
 import org.bukkit.Location;
 
 public class ParticleStyleWhirlwind extends DefaultParticleStyle {
-    
+
     private int points = 3;
     private double step = 0;
     private int numSteps = 40;
@@ -21,54 +21,54 @@ public class ParticleStyleWhirlwind extends DefaultParticleStyle {
     @Override
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
-        double speed = getSpeedByEffect(particle.getEffect()) * 2.5;
+        double speed = this.getSpeedByEffect(particle.getEffect()) * 2.5;
-        
+
         // Orbit going clockwise
-        for (int i = 0; i < points; i++) {
+        for (int i = 0; i < this.points; i++) {
-            double dx = Math.cos(step + (Math.PI * 2 * ((double)i / points)));
+            double dx = Math.cos(this.step + (Math.PI * 2 * ((double) i / this.points)));
             double dy = -0.9;
-            double dz = Math.sin(step + (Math.PI * 2 * ((double)i / points)));
+            double dz = Math.sin(this.step + (Math.PI * 2 * ((double) i / this.points)));
             double angle = Math.atan2(dz, dx);
             double xAng = Math.cos(angle);
             double zAng = Math.sin(angle);
             particles.add(new PParticle(location.clone().add(0, dy, 0), xAng, 0, zAng, speed, true));
         }
-        
+
         return particles;
     }
-    
+
     private double getSpeedByEffect(ParticleEffect effect) {
         switch (effect) {
-        case CRIT:
+            case CRIT:
-        case DAMAGE_INDICATOR:
+            case DAMAGE_INDICATOR:
-        case ENCHANTED_HIT:
+            case ENCHANTED_HIT:
-            return 1;
+                return 1;
-        case DRAGON_BREATH:
+            case DRAGON_BREATH:
-            return 0.01;
+                return 0.01;
-        case ENCHANT:
+            case ENCHANT:
-        case NAUTILUS:
+            case NAUTILUS:
-        case PORTAL:
+            case PORTAL:
-            return 1;
+                return 1;
-        case END_ROD:
+            case END_ROD:
-        case SMOKE:
+            case SMOKE:
-        case SQUID_INK:
+            case SQUID_INK:
-            return 0.15;
+                return 0.15;
-        case FIREWORK:
+            case FIREWORK:
-        case SPIT:
+            case SPIT:
-        case SPLASH:
+            case SPLASH:
-            return 0.25;
+                return 0.25;
-        case POOF:
+            case POOF:
-            return 0.2;
+                return 0.2;
-        case TOTEM_OF_UNDYING:
+            case TOTEM_OF_UNDYING:
-            return 0.75;
+                return 0.75;
-        default:
+            default:
-            return 0.1; // Flame
+                return 0.1; // Flame
         }
     }
 
     @Override
     public void updateTimers() {
-        step = (step + Math.PI * 2 / numSteps) % numSteps;
+        this.step = (this.step + Math.PI * 2 / this.numSteps) % this.numSteps;
     }
 
     @Override

src/main/java/dev/esophose/playerparticles/styles/ParticleStyleWings.java

@@ -20,7 +20,7 @@ public class ParticleStyleWings extends DefaultParticleStyle {
     @Override
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
         List<PParticle> particles = new ArrayList<>();
-        if (spawnTimer == 0) {
+        if (this.spawnTimer == 0) {
             for (double t = 0; t < Math.PI * 2; t += Math.PI / 48) {
                 double offset = (Math.pow(Math.E, Math.cos(t)) - 2 * Math.cos(t * 4) - Math.pow(Math.sin(t / 12), 5)) / 2;
                 double x = Math.sin(t) * offset;
@@ -34,8 +34,8 @@ public class ParticleStyleWings extends DefaultParticleStyle {
 
     @Override
     public void updateTimers() {
-        spawnTimer++;
+        this.spawnTimer++;
-        spawnTimer %= 3;
+        this.spawnTimer %= 3;
     }
 
     @Override