From f306062bfa6b6466c63dece5688237c706571333 Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Sat, 26 Jan 2019 00:34:50 -0700
Subject: [PATCH 01/11] Add some quality of life changes

---
 changelog.txt                                 |  12 ++
 pom.xml                                       |   2 +-
 .../playerparticles/PlayerParticles.java      |  25 +++-
 .../command/GroupCommandModule.java           |   2 +-
 .../command/RemoveCommandModule.java          | 121 ++++++++++++------
 .../database/SqliteDatabaseConnector.java     |  23 +++-
 .../playerparticles/gui/GuiInventory.java     |  11 +-
 .../gui/GuiInventoryEditEffect.java           |   5 +-
 .../gui/GuiInventoryEditStyle.java            |   5 +-
 .../gui/GuiInventoryLoadPresetGroups.java     |   3 +-
 .../gui/GuiInventoryManageGroups.java         |  69 +++++++++-
 .../gui/GuiInventoryManageParticles.java      |   3 +-
 .../gui/hook/PlayerChatHook.java              |  95 ++++++++++++++
 .../gui/hook/PlayerChatHookData.java          |  68 ++++++++++
 .../playerparticles/manager/LangManager.java  |  20 +--
 .../manager/SettingManager.java               |   1 +
 .../styles/ParticleStyleBlockBreak.java       |   2 +-
 .../styles/ParticleStyleBlockPlace.java       |   2 +-
 .../styles/ParticleStyleSwords.java           |   4 +-
 .../styles/api/ParticleStyle.java             |   7 +-
 .../playerparticles/util/ParticleUtils.java   |  18 +++
 src/config.yml                                |   6 +-
 src/groups.yml                                |   2 +-
 src/lang/default.lang                         |  22 ++--
 src/plugin.yml                                |   2 +-
 25 files changed, 442 insertions(+), 88 deletions(-)
 create mode 100644 src/com/esophose/playerparticles/gui/hook/PlayerChatHook.java
 create mode 100644 src/com/esophose/playerparticles/gui/hook/PlayerChatHookData.java

diff --git a/changelog.txt b/changelog.txt
index 7ebb34ce..d9323eb7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,17 @@
 == UPDATING WILL DELETE YOUR CONFIG.YML ==
 * Create a backup of your config.yml if you wish to import all your old settings!
+=== v6.3 (Implemented so far) ===
++ Added the ability to remove particles by id/effect/style using '/pp remove <id>|<effect>|<style>'
++ The "Save New Group" button in the GUI now actually saves a new group and prompts for a name in chat (15 second timeout)
++ Added a click sound to the GUI for button clicks (Can be disabled in the config.yml)
+* Reduced the number of particles that spawn for the styles 'blockbreak', 'blockplace', and 'swords'
+* Fix GUI borders showing up as glass panes instead of stained glass panes on servers running 1.12.2 or earlier
+* Fix a console error that occurs when trying to remove a group that doesn't exist
+* Fix "[PlayerParticles] An error occurred retrieving an SQLite database connection: [SQLITE_BUSY]  The database file is locked (database is locked)"
+=== v6.2 ===
++ Added command '/ppo' which allows executing a /pp command as another player.
+* Fix not being able to change the lore of the player skull in the GUI
+* Fix the 'saved groups' count on the player skull in the GUI being one higher than it was supposed to be
 === v6.1 ===
 * Fix a bug where sometimes the GUI was unable to be opened due to an error
 * You can now use \n on the GUI lore lines in the *.lang file to break them into multiple lines
diff --git a/pom.xml b/pom.xml
index fe91aa8f..06f7b70c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.esophose.playerparticles</groupId>
   <artifactId>PlayerParticles</artifactId>
-  <version>6.2</version>
+  <version>6.3</version>
   <name>PlayerParticles</name>
   <url>https://github.com/Esophose/PlayerParticles</url>
   <description>Display particles around your player using customized styles and data!</description>
diff --git a/src/com/esophose/playerparticles/PlayerParticles.java b/src/com/esophose/playerparticles/PlayerParticles.java
index 49a1b9be..5be6f7a7 100644
--- a/src/com/esophose/playerparticles/PlayerParticles.java
+++ b/src/com/esophose/playerparticles/PlayerParticles.java
@@ -1,8 +1,14 @@
 /*
- * TODO: v6.3
- * + Add new style 'tornado'
- * + Add new style 'doubleorbit'
+ * TODO: v6.4+
  * + Add new style(s) 'wings_<type>', multiple new wing types: fairy, demon
+ * + Add ability to create/manage fixed effects from the GUI (may get implemented later)
+ */
+
+/*
+ * TODO: v6.3
+ * + Add named colors to the color data
+ * * Display effects/styles in the GUI formatted to be more readable
+ * + Possibly add a couple new styles (tornado, doubleorbit)
  */
 
 package com.esophose.playerparticles;
@@ -12,6 +18,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
@@ -21,6 +28,7 @@
 import com.esophose.playerparticles.database.MySqlDatabaseConnector;
 import com.esophose.playerparticles.database.SqliteDatabaseConnector;
 import com.esophose.playerparticles.gui.GuiHandler;
+import com.esophose.playerparticles.gui.hook.PlayerChatHook;
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.ParticleManager;
 import com.esophose.playerparticles.manager.SettingManager;
@@ -59,10 +67,12 @@ public void onEnable() {
         
         this.registerCommands();
         
-        Bukkit.getPluginManager().registerEvents(new ParticleManager(), this);
-        Bukkit.getPluginManager().registerEvents(new PluginUpdateListener(), this);
-        Bukkit.getPluginManager().registerEvents(new GuiHandler(), this);
-        Bukkit.getPluginManager().registerEvents(new PPlayerMovementListener(), this);
+        PluginManager pm = Bukkit.getPluginManager();
+        pm.registerEvents(new ParticleManager(), this);
+        pm.registerEvents(new PluginUpdateListener(), this);
+        pm.registerEvents(new GuiHandler(), this);
+        pm.registerEvents(new PPlayerMovementListener(), this);
+        pm.registerEvents(new PlayerChatHook(), this);
 
         saveDefaultConfig();
         double configVersion = PSetting.VERSION.getDouble();
@@ -153,6 +163,7 @@ public void reload(boolean updatePluginSettings) {
         ParticleGroup.reload();
         
         GuiHandler.setup();
+        PlayerChatHook.setup();
         
         ParticleManager.refreshData();
         startParticleTask();
diff --git a/src/com/esophose/playerparticles/command/GroupCommandModule.java b/src/com/esophose/playerparticles/command/GroupCommandModule.java
index 07b421d9..273208b1 100644
--- a/src/com/esophose/playerparticles/command/GroupCommandModule.java
+++ b/src/com/esophose/playerparticles/command/GroupCommandModule.java
@@ -176,8 +176,8 @@ private void onRemove(PPlayer pplayer, String groupName) {
             group = ParticleGroup.getPresetGroup(groupName);
             if (group != null) {
                 LangManager.sendMessage(pplayer, Lang.GROUP_REMOVE_PRESET);
-                return;
             }
+            return;
         }
         
         // Delete the group and notify player
diff --git a/src/com/esophose/playerparticles/command/RemoveCommandModule.java b/src/com/esophose/playerparticles/command/RemoveCommandModule.java
index 4615ad61..a5dc44a6 100644
--- a/src/com/esophose/playerparticles/command/RemoveCommandModule.java
+++ b/src/com/esophose/playerparticles/command/RemoveCommandModule.java
@@ -1,16 +1,21 @@
 package com.esophose.playerparticles.command;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.util.StringUtil;
 
 import com.esophose.playerparticles.manager.DataManager;
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
 import com.esophose.playerparticles.particles.PPlayer;
+import com.esophose.playerparticles.particles.ParticleEffect;
 import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.styles.api.ParticleStyle;
 
 public class RemoveCommandModule implements CommandModule {
 
@@ -20,48 +25,92 @@ public void onCommandExecute(PPlayer pplayer, String[] args) {
             return;
         }
         
-        int id = -1;
-        try {
-            id = Integer.parseInt(args[0]);
-        } catch (Exception ex) {
-            LangManager.sendMessage(pplayer, Lang.ID_INVALID);
-            return;
-        }
-        
-        if (id <= 0) {
-            LangManager.sendMessage(pplayer, Lang.ID_INVALID);
-            return;
-        }
-        
-        boolean removed = false;
-        ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
-        for (ParticlePair particle : activeGroup.getParticles()) {
-            if (particle.getId() == id) {
-                activeGroup.getParticles().remove(particle);
-                removed = true;
-                break;
+        if (StringUtils.isNumeric(args[0])) { // Removing by ID
+            int id = -1;
+            try {
+                id = Integer.parseInt(args[0]);
+            } catch (Exception ex) {
+                LangManager.sendMessage(pplayer, Lang.ID_INVALID);
+                return;
+            }
+
+            if (id <= 0) {
+                LangManager.sendMessage(pplayer, Lang.ID_INVALID);
+                return;
+            }
+
+            boolean removed = false;
+            ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
+            for (ParticlePair particle : activeGroup.getParticles()) {
+                if (particle.getId() == id) {
+                    activeGroup.getParticles().remove(particle);
+                    removed = true;
+                    break;
+                }
+            }
+
+            if (!removed) {
+                LangManager.sendMessage(pplayer, Lang.ID_UNKNOWN, id);
+                return;
+            }
+
+            DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
+            LangManager.sendMessage(pplayer, Lang.REMOVE_ID_SUCCESS, id);
+        } else { // Removing by effect/style name
+            ParticleEffect effect = ParticleEffect.fromName(args[0]);
+            ParticleStyle style = ParticleStyle.fromName(args[0]);
+            
+            if (effect != null) {
+                int removedCount = 0;
+                ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
+                for (int i = activeGroup.getParticles().size() - 1; i >= 0; i--) {
+                    if (activeGroup.getParticles().get(i).getEffect() == effect) {
+                        activeGroup.getParticles().remove(i);
+                        removedCount++;
+                    }
+                }
+                
+                if (removedCount > 0) {
+                    DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
+                    LangManager.sendMessage(pplayer, Lang.REMOVE_EFFECT_SUCCESS, removedCount, effect.getName());
+                } else {
+                    LangManager.sendMessage(pplayer, Lang.REMOVE_EFFECT_NONE, effect.getName());
+                }
+            } else if (style != null) {
+                int removedCount = 0;
+                ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
+                for (int i = activeGroup.getParticles().size() - 1; i >= 0; i--) {
+                    if (activeGroup.getParticles().get(i).getStyle() == style) {
+                        activeGroup.getParticles().remove(i);
+                        removedCount++;
+                    }
+                }
+                
+                if (removedCount > 0) {
+                    DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
+                    LangManager.sendMessage(pplayer, Lang.REMOVE_STYLE_SUCCESS, removedCount, style.getName());
+                } else {
+                    LangManager.sendMessage(pplayer, Lang.REMOVE_STYLE_NONE, style.getName());
+                }
+            } else {
+                LangManager.sendMessage(pplayer, Lang.REMOVE_UNKNOWN, args[0]);
             }
         }
-        
-        if (!removed) {
-            LangManager.sendMessage(pplayer, Lang.ID_UNKNOWN, id);
-            return;
-        }
-        
-        DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
-        LangManager.sendMessage(pplayer, Lang.REMOVE_SUCCESS, id);
     }
 
     public List<String> onTabComplete(PPlayer pplayer, String[] args) {
         List<String> matches = new ArrayList<String>();
-        List<String> ids = new ArrayList<String>();
-        
-        for (ParticlePair particles : pplayer.getActiveParticles())
-            ids.add(String.valueOf(particles.getId()));
-        
-        if (args.length == 0) return ids;
-        
-        StringUtil.copyPartialMatches(args[0], ids, matches);
+        Set<String> removeBy = new HashSet<String>();
+
+        for (ParticlePair particle : pplayer.getActiveParticles()) {
+            removeBy.add(String.valueOf(particle.getId()));
+            removeBy.add(particle.getEffect().getName());
+            removeBy.add(particle.getStyle().getName());
+        }
+
+        if (args.length == 0) return new ArrayList<String>(removeBy);
+
+        StringUtil.copyPartialMatches(args[0], removeBy, matches);
         return matches;
     }
 
diff --git a/src/com/esophose/playerparticles/database/SqliteDatabaseConnector.java b/src/com/esophose/playerparticles/database/SqliteDatabaseConnector.java
index 17f18d3d..742c0495 100644
--- a/src/com/esophose/playerparticles/database/SqliteDatabaseConnector.java
+++ b/src/com/esophose/playerparticles/database/SqliteDatabaseConnector.java
@@ -10,6 +10,7 @@
 public class SqliteDatabaseConnector implements DatabaseConnector {
 
     private final String connectionString;
+    private Connection connection;
 
     public SqliteDatabaseConnector(String directory) {
         this.connectionString = "jdbc:sqlite:" + directory + File.separator + "playerparticles.db";
@@ -20,14 +21,28 @@ public boolean isInitialized() {
     }
 
     public void closeConnection() {
-        // Nothing to do
+        try {
+            if (this.connection != null) {
+                this.connection.close();
+            }
+        } catch (SQLException ex) {
+            PlayerParticles.getPlugin().getLogger().severe("An error occurred closing the SQLite database connection: " + ex.getMessage());
+        }
     }
 
     public void connect(ConnectionCallback callback) {
-        try (Connection connection = DriverManager.getConnection(this.connectionString)) {
-            callback.execute(connection);
+        if (this.connection == null) {
+            try {
+                this.connection = DriverManager.getConnection(this.connectionString);
+            } catch (SQLException ex) {
+                PlayerParticles.getPlugin().getLogger().severe("An error occurred retrieving the SQLite database connection: " + ex.getMessage());
+            }
+        }
+        
+        try {
+            callback.execute(this.connection);
         } catch (SQLException ex) {
-            PlayerParticles.getPlugin().getLogger().severe("An error occurred retrieving an SQLite database connection: " + ex.getMessage());
+            PlayerParticles.getPlugin().getLogger().severe("An error occurred retrieving the SQLite database connection: " + ex.getMessage());
         }
     }
 
diff --git a/src/com/esophose/playerparticles/gui/GuiInventory.java b/src/com/esophose/playerparticles/gui/GuiInventory.java
index d7b7626a..52c48026 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventory.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventory.java
@@ -4,12 +4,15 @@
 import java.util.List;
 
 import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
+import com.esophose.playerparticles.manager.SettingManager.PSetting;
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.util.ParticleUtils;
 
@@ -36,7 +39,7 @@ protected ItemStack getIcon() {
             if (this.material != null) { // Use 1.13 materials
                 borderIcon = new ItemStack(this.material, 1);
             } else { // Use < 1.13 data values
-                borderIcon = new ItemStack(ParticleUtils.closestMatch("THIN_GLASS"), 1, this.data);
+                borderIcon = new ItemStack(ParticleUtils.closestMatch("STAINED_GLASS_PANE"), 1, this.data);
             }
             
             ItemMeta meta = borderIcon.getItemMeta();
@@ -137,6 +140,12 @@ public void onClick(InventoryClickEvent event) {
         for (GuiActionButton button : this.actionButtons) {
             if (button.getSlot() == slot) {
                 button.handleClick(button, isShiftClick);
+                if (PSetting.GUI_BUTTON_SOUND.getBoolean()) {
+                    if (event.getWhoClicked() instanceof Player) {
+                        Player player = (Player) event.getWhoClicked();
+                        player.playSound(player.getLocation(), Sound.UI_BUTTON_CLICK, 0.5f, 1);
+                    }
+                }
                 break;
             }
         }
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryEditEffect.java b/src/com/esophose/playerparticles/gui/GuiInventoryEditEffect.java
index 3487d12b..a693f5ea 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryEditEffect.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryEditEffect.java
@@ -11,6 +11,7 @@
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleEffect;
 import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.util.ParticleUtils;
 
 public class GuiInventoryEditEffect extends GuiInventory {
 
@@ -23,8 +24,8 @@ public GuiInventoryEditEffect(PPlayer pplayer, ParticlePair editingParticle, Lis
             ParticleEffect effect = effectsUserHasPermissionFor.get(i);
             GuiActionButton selectButton = new GuiActionButton(i, 
                                                                GuiIcon.EFFECT.get(effect.getName()), 
-                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + effect.getName(),
-                                                               new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_EFFECT_DESCRIPTION, effect.getName()) },
+                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + ParticleUtils.formatName(effect.getName()),
+                                                               new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_EFFECT_DESCRIPTION, ParticleUtils.formatName(effect.getName())) },
                                                                (button, isShiftClick) -> {
                                                                    editingParticle.setEffect(effect);
                                                                    callbackList.get(callbackListPosition + 1).execute();
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryEditStyle.java b/src/com/esophose/playerparticles/gui/GuiInventoryEditStyle.java
index ec253273..828eaf52 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryEditStyle.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryEditStyle.java
@@ -11,6 +11,7 @@
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticlePair;
 import com.esophose.playerparticles.styles.api.ParticleStyle;
+import com.esophose.playerparticles.util.ParticleUtils;
 
 public class GuiInventoryEditStyle extends GuiInventory {
 
@@ -23,8 +24,8 @@ public GuiInventoryEditStyle(PPlayer pplayer, ParticlePair editingParticle, List
             ParticleStyle style = stylesUserHasPermissionFor.get(i);
             GuiActionButton selectButton = new GuiActionButton(i, 
                                                                GuiIcon.STYLE.get(style.getName()), 
-                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + style.getName(),
-                                                               new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_EFFECT_DESCRIPTION, style.getName()) },
+                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + ParticleUtils.formatName(style.getName()),
+                                                               new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SELECT_EFFECT_DESCRIPTION, ParticleUtils.formatName(style.getName())) },
                                                                (button, isShiftClick) -> {
                                                                    editingParticle.setStyle(style);
                                                                    callbackList.get(callbackListPosition + 1).execute();
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java b/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
index fcf0b9b0..91b9049c 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
@@ -14,6 +14,7 @@
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.util.ParticleUtils;
 
 public class GuiInventoryLoadPresetGroups extends GuiInventory {
 
@@ -36,7 +37,7 @@ public GuiInventoryLoadPresetGroups(PPlayer pplayer) {
             lore[0] = LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_CLICK_TO_LOAD, particles.size());
             int i = 1;
             for (ParticlePair particle : particles) {
-                lore[i] = LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_PARTICLE_INFO, particle.getId(), particle.getEffect().getName(), particle.getStyle().getName(), particle.getDataString());
+                lore[i] = LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_PARTICLE_INFO, particle.getId(), ParticleUtils.formatName(particle.getEffect().getName()), ParticleUtils.formatName(particle.getStyle().getName()), particle.getDataString());
                 i++;
             } 
             
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java b/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
index 36c18ca1..757ecfa8 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
@@ -1,17 +1,22 @@
 package com.esophose.playerparticles.gui;
 
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
 import org.bukkit.Bukkit;
 
+import com.esophose.playerparticles.gui.hook.PlayerChatHook;
+import com.esophose.playerparticles.gui.hook.PlayerChatHookData;
 import com.esophose.playerparticles.manager.DataManager;
 import com.esophose.playerparticles.manager.LangManager;
+import com.esophose.playerparticles.manager.PermissionManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
 import com.esophose.playerparticles.manager.SettingManager.GuiIcon;
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.util.ParticleUtils;
 
 public class GuiInventoryManageGroups extends GuiInventory {
 
@@ -36,7 +41,7 @@ public GuiInventoryManageGroups(PPlayer pplayer) {
             lore[0] = LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_CLICK_TO_LOAD, particles.size());
             int i = 1;
             for (ParticlePair particle : particles) {
-                lore[i] = LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_PARTICLE_INFO, particle.getId(), particle.getEffect().getName(), particle.getStyle().getName(), particle.getDataString());
+                lore[i] = LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_PARTICLE_INFO, particle.getId(), ParticleUtils.formatName(particle.getEffect().getName()), ParticleUtils.formatName(particle.getStyle().getName()), particle.getDataString());
                 i++;
             }
             lore[i] = LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SHIFT_CLICK_TO_DELETE);
@@ -68,15 +73,67 @@ public GuiInventoryManageGroups(PPlayer pplayer) {
             if (index > maxIndex) break; // Overflowed the available space
         }
         
+        boolean canSaveGroup = !PermissionManager.hasPlayerReachedMaxGroups(pplayer);
+        String[] lore;
+        if (canSaveGroup) {
+            lore = new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION) };
+        } else {
+            lore = new String[] { 
+                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION), 
+                LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SAVE_GROUP_FULL)
+            };
+        }
+        
         // Save Group Button
         GuiActionButton saveGroupButton = new GuiActionButton(40, 
                                                               GuiIcon.CREATE.get(), 
                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_SAVE_GROUP),
-                                                              new String[] { 
-                                                                  LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION),
-                                                                  LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION_2),
-                                                              },
-                                                              (button, isShiftClick) -> {}); // Does nothing on click
+                                                              lore,
+                                                              (button, isShiftClick) -> {
+                                                                  if (!canSaveGroup) return;
+                                                                  
+                                                                  PlayerChatHook.addHook(new PlayerChatHookData(pplayer.getUniqueId(), 15, (textEntered) -> {
+                                                                      if (textEntered == null || textEntered.equalsIgnoreCase("cancel")) {
+                                                                          GuiHandler.transition(new GuiInventoryManageGroups(pplayer));
+                                                                      } else {
+                                                                          String groupName = textEntered.split(" ")[0];
+                                                                          
+                                                                          // Check that the groupName isn't the reserved name
+                                                                          if (groupName.equalsIgnoreCase(ParticleGroup.DEFAULT_NAME)) {
+                                                                              LangManager.sendMessage(pplayer, Lang.GROUP_RESERVED);
+                                                                              return;
+                                                                          }
+                                                                          
+                                                                          // The database column can only hold up to 100 characters, cut it off there
+                                                                          if (groupName.length() >= 100) {
+                                                                              groupName = groupName.substring(0, 100);
+                                                                          }
+                                                                          
+                                                                          // Use the existing group if available, otherwise create a new one
+                                                                          ParticleGroup group = pplayer.getParticleGroupByName(groupName);
+                                                                          boolean groupUpdated = false;
+                                                                          if (group == null) {
+                                                                              List<ParticlePair> particles = new ArrayList<ParticlePair>();
+                                                                              for (ParticlePair particle : pplayer.getActiveParticles())
+                                                                                  particles.add(particle.clone()); // Make sure the ParticlePairs aren't the same references in both the active and saved group
+                                                                              group = new ParticleGroup(groupName, particles);
+                                                                          } else {
+                                                                              groupUpdated = true;
+                                                                          }
+                                                                          
+                                                                          // Apply changes and notify player
+                                                                          DataManager.saveParticleGroup(pplayer.getUniqueId(), group);
+                                                                          if (groupUpdated) {
+                                                                              LangManager.sendMessage(pplayer, Lang.GROUP_SAVE_SUCCESS_OVERWRITE, groupName);
+                                                                          } else {
+                                                                              LangManager.sendMessage(pplayer, Lang.GROUP_SAVE_SUCCESS, groupName);
+                                                                          }
+                                                                          
+                                                                          GuiHandler.transition(new GuiInventoryManageGroups(pplayer));
+                                                                      }
+                                                                  }));
+                                                                  pplayer.getPlayer().closeInventory();
+                                                              });
         this.actionButtons.add(saveGroupButton);
         
         // Back Button
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryManageParticles.java b/src/com/esophose/playerparticles/gui/GuiInventoryManageParticles.java
index c8ad3d33..c06a4f05 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryManageParticles.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryManageParticles.java
@@ -15,6 +15,7 @@
 import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.particles.ParticlePair;
 import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty;
+import com.esophose.playerparticles.util.ParticleUtils;
 
 public class GuiInventoryManageParticles extends GuiInventory {
 
@@ -36,7 +37,7 @@ public GuiInventoryManageParticles(PPlayer pplayer) {
                                                                LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_PARTICLE_NAME, particle.getId()),
                                                                new String[] {
                                                                    LangManager.getText(Lang.GUI_COLOR_SUBTEXT) + LangManager.getText(Lang.GUI_CLICK_TO_EDIT_PARTICLE, particles.size()),
-                                                                   LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_PARTICLE_INFO, particle.getId(), particle.getEffect().getName(), particle.getStyle().getName(), particle.getDataString()),
+                                                                   LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_PARTICLE_INFO, particle.getId(), ParticleUtils.formatName(particle.getEffect().getName()), ParticleUtils.formatName(particle.getStyle().getName()), particle.getDataString()),
                                                                    LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SHIFT_CLICK_TO_DELETE)
                                                                },
                                                                (button, isShiftClick) -> {
diff --git a/src/com/esophose/playerparticles/gui/hook/PlayerChatHook.java b/src/com/esophose/playerparticles/gui/hook/PlayerChatHook.java
new file mode 100644
index 00000000..b75d3282
--- /dev/null
+++ b/src/com/esophose/playerparticles/gui/hook/PlayerChatHook.java
@@ -0,0 +1,95 @@
+package com.esophose.playerparticles.gui.hook;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
+
+import com.esophose.playerparticles.PlayerParticles;
+import com.esophose.playerparticles.manager.LangManager;
+import com.esophose.playerparticles.manager.LangManager.Lang;
+
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
+
+public class PlayerChatHook extends BukkitRunnable implements Listener {
+
+    private static Set<PlayerChatHookData> hooks;
+    private static BukkitTask hookTask = null;
+
+    /**
+     * Initializes all the static values for this class
+     */
+    public static void setup() {
+        hooks = new HashSet<PlayerChatHookData>();
+        if (hookTask != null)
+            hookTask.cancel();
+        hookTask = new PlayerChatHook().runTaskTimer(PlayerParticles.getPlugin(), 0, 20);
+    }
+    
+    
+    /**
+     * Called when a player sends a message in chat
+     * 
+     * @param event The AsyncPlayerChatEvent
+     */
+    @EventHandler
+    public void onPlayerChat(AsyncPlayerChatEvent event) {
+        for (PlayerChatHookData hook : hooks) {
+            if (hook.getPlayerUUID().equals(event.getPlayer().getUniqueId())) {
+                event.setCancelled(true);
+                hook.triggerCallback(event.getMessage());
+                hooks.remove(hook);
+                return;
+            }
+        }
+    }
+    
+    /**
+     * Ticked every second to decrease the seconds remaining on each hook
+     */
+    public void run() {
+        Set<PlayerChatHookData> hooksToRemove = new HashSet<PlayerChatHookData>();
+        
+        for (PlayerChatHookData hook : hooks) {
+            hook.decrementHookLength();
+            if (hook.timedOut()) {
+                hook.triggerCallback(null);
+                hooksToRemove.add(hook);
+                continue;
+            }
+            
+            Player player = Bukkit.getPlayer(hook.getPlayerUUID());
+            if (player == null) {
+                hooksToRemove.remove(hook);
+            } else {
+                player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(LangManager.getText(Lang.GUI_SAVE_GROUP_HOTBAR_MESSAGE, hook.getTimeRemaining())));
+            }
+        }
+        
+        for (PlayerChatHookData hookToRemove : hooksToRemove) 
+            hooks.remove(hookToRemove);
+    }
+    
+    /**
+     * Adds a player chat hook
+     * 
+     * @param newHook The new hook to add
+     */
+    public static void addHook(PlayerChatHookData newHook) {
+        for (PlayerChatHookData hook : hooks) {
+            if (hook.getPlayerUUID().equals(hook.getPlayerUUID())) {
+                hooks.remove(hook);
+                break;
+            }
+        }
+        hooks.add(newHook);
+    }
+
+}
diff --git a/src/com/esophose/playerparticles/gui/hook/PlayerChatHookData.java b/src/com/esophose/playerparticles/gui/hook/PlayerChatHookData.java
new file mode 100644
index 00000000..b1a73365
--- /dev/null
+++ b/src/com/esophose/playerparticles/gui/hook/PlayerChatHookData.java
@@ -0,0 +1,68 @@
+package com.esophose.playerparticles.gui.hook;
+
+import java.util.UUID;
+
+public class PlayerChatHookData {
+    
+    private UUID playerUUID;
+    private int hookLength;
+    private PlayerChatHookCallback hookCallback;
+    
+    public PlayerChatHookData(UUID playerUUID, int hookLength, PlayerChatHookCallback hookCallback) {
+        this.playerUUID = playerUUID;
+        this.hookLength = hookLength;
+        this.hookCallback = hookCallback;
+    }
+    
+    /**
+     * Gets the owning player of this hook
+     * 
+     * @return The player's UUID
+     */
+    public UUID getPlayerUUID() {
+        return this.playerUUID;
+    }
+    
+    /**
+     * Decrements the time remaining on this hook by 1 second
+     */
+    public void decrementHookLength() {
+        this.hookLength--;
+    }
+    
+    /**
+     * Checks if this hook has timed out
+     * 
+     * @return If this hook has timed out
+     */
+    public boolean timedOut() {
+        return this.hookLength <= 0;
+    }
+    
+    /**
+     * Gets how much time is remaining on the hook
+     * 
+     * @return The amount of time remaining on the hook
+     */
+    public int getTimeRemaining() {
+        return this.hookLength;
+    }
+    
+    /**
+     * Executes the callback function
+     * 
+     * @param textEntered The text that was entered by the player
+     */
+    public void triggerCallback(String textEntered) {
+        this.hookCallback.onPlayerChat(textEntered);
+    }
+
+    /**
+     * Allows simple hooking into the player chat for a specific time interval
+     */
+    @FunctionalInterface
+    public static interface PlayerChatHookCallback {
+        public void onPlayerChat(String textEntered);
+    }
+
+}
diff --git a/src/com/esophose/playerparticles/manager/LangManager.java b/src/com/esophose/playerparticles/manager/LangManager.java
index 48dab4c6..79638334 100644
--- a/src/com/esophose/playerparticles/manager/LangManager.java
+++ b/src/com/esophose/playerparticles/manager/LangManager.java
@@ -112,7 +112,12 @@ public static enum Lang { // @formatter:off
         
         // Remove Command
         REMOVE_NO_ARGS,
-        REMOVE_SUCCESS,
+        REMOVE_ID_SUCCESS,
+        REMOVE_EFFECT_SUCCESS,
+        REMOVE_EFFECT_NONE,
+        REMOVE_STYLE_SUCCESS,
+        REMOVE_STYLE_NONE,
+        REMOVE_UNKNOWN,
         
         // List Command
         LIST_NONE,
@@ -213,6 +218,9 @@ public static enum Lang { // @formatter:off
         FIXED_MAX_REACHED,
         FIXED_INVALID_COMMAND,
         
+        // Update Available
+        UPDATE_AVAILABLE,
+        
         // GUI
         GUI_DISABLED,
         GUI_COLOR_ICON_NAME,
@@ -245,7 +253,8 @@ public static enum Lang { // @formatter:off
         GUI_LOAD_A_PRESET_GROUP_DESCRIPTION,
         GUI_SAVE_GROUP,
         GUI_SAVE_GROUP_DESCRIPTION,
-        GUI_SAVE_GROUP_DESCRIPTION_2,
+        GUI_SAVE_GROUP_FULL,
+        GUI_SAVE_GROUP_HOTBAR_MESSAGE,
         GUI_RESET_PARTICLES,
         GUI_RESET_PARTICLES_DESCRIPTION,
         GUI_PARTICLE_NAME,
@@ -288,12 +297,7 @@ public static enum Lang { // @formatter:off
         GUI_EDIT_DATA_COLOR_BLACK,
         GUI_EDIT_DATA_COLOR_GRAY,
         GUI_EDIT_DATA_COLOR_LIGHT_GRAY,
-        GUI_EDIT_DATA_COLOR_WHITE,
-        
-        // Update Available
-        UPDATE_AVAILABLE;
-        
-        // @formatter:on
+        GUI_EDIT_DATA_COLOR_WHITE; // @formatter:on
 
         private String message;
 
diff --git a/src/com/esophose/playerparticles/manager/SettingManager.java b/src/com/esophose/playerparticles/manager/SettingManager.java
index e3e7243b..47fe57df 100644
--- a/src/com/esophose/playerparticles/manager/SettingManager.java
+++ b/src/com/esophose/playerparticles/manager/SettingManager.java
@@ -32,6 +32,7 @@ public enum PSetting {
         TICKS_PER_PARTICLE(PSettingType.LONG),
         CHECK_UPDATES(PSettingType.BOOLEAN),
         GUI_ENABLED(PSettingType.BOOLEAN),
+        GUI_BUTTON_SOUND(PSettingType.BOOLEAN),
         TOGGLE_ON_MOVE(PSettingType.BOOLEAN),
         
         PARTICLE_RENDER_RANGE_PLAYER(PSettingType.INTEGER),
diff --git a/src/com/esophose/playerparticles/styles/ParticleStyleBlockBreak.java b/src/com/esophose/playerparticles/styles/ParticleStyleBlockBreak.java
index 02bc3202..8e7237f8 100644
--- a/src/com/esophose/playerparticles/styles/ParticleStyleBlockBreak.java
+++ b/src/com/esophose/playerparticles/styles/ParticleStyleBlockBreak.java
@@ -24,7 +24,7 @@ public List<PParticle> getParticles(ParticlePair particle, Location location) {
         
         location.add(0.5, 0.5, 0.5); // Center around the block
 
-        for (int i = 0; i < 15; i++)
+        for (int i = 0; i < 10; i++)
             particles.add(new PParticle(location, 0.5F, 0.5F, 0.5F, 0.05F));
 
         return particles;
diff --git a/src/com/esophose/playerparticles/styles/ParticleStyleBlockPlace.java b/src/com/esophose/playerparticles/styles/ParticleStyleBlockPlace.java
index 4f1e05d8..576fee39 100644
--- a/src/com/esophose/playerparticles/styles/ParticleStyleBlockPlace.java
+++ b/src/com/esophose/playerparticles/styles/ParticleStyleBlockPlace.java
@@ -24,7 +24,7 @@ public List<PParticle> getParticles(ParticlePair particle, Location location) {
         
         location.add(0.5, 0.5, 0.5); // Center around the block
 
-        for (int i = 0; i < 15; i++)
+        for (int i = 0; i < 10; i++)
             particles.add(new PParticle(location, 0.75F, 0.75F, 0.75F, 0.05F));
 
         return particles;
diff --git a/src/com/esophose/playerparticles/styles/ParticleStyleSwords.java b/src/com/esophose/playerparticles/styles/ParticleStyleSwords.java
index c7da41e1..d9c15522 100644
--- a/src/com/esophose/playerparticles/styles/ParticleStyleSwords.java
+++ b/src/com/esophose/playerparticles/styles/ParticleStyleSwords.java
@@ -29,9 +29,9 @@ public class ParticleStyleSwords implements ParticleStyle, Listener {
     }
 
     public List<PParticle> getParticles(ParticlePair particle, Location location) {
-        List<PParticle> baseParticles = DefaultStyles.THICK.getParticles(particle, location);
+        List<PParticle> baseParticles = DefaultStyles.NORMAL.getParticles(particle, location);
 
-        int multiplyingFactor = 3; // Uses the same logic as ParticleStyleThick except multiplies the resulting particles by 3x
+        int multiplyingFactor = 15; // Uses the same logic as ParticleStyleNormal except multiplies the resulting particles by 3x
         List<PParticle> particles = new ArrayList<PParticle>();
         for (int i = 0; i < baseParticles.size() * multiplyingFactor; i++) {
             particles.add(baseParticles.get(i % baseParticles.size()));
diff --git a/src/com/esophose/playerparticles/styles/api/ParticleStyle.java b/src/com/esophose/playerparticles/styles/api/ParticleStyle.java
index 8bbbef29..1b50a06b 100644
--- a/src/com/esophose/playerparticles/styles/api/ParticleStyle.java
+++ b/src/com/esophose/playerparticles/styles/api/ParticleStyle.java
@@ -53,12 +53,13 @@ public interface ParticleStyle {
     /**
      * Gets the ParticleStyle with the name given, returns null if not found
      * 
-     * @param styleName The string of the style to search for
-     * @return The ParticleStyle with the name requested
+     * @param styleName The name of the style to search for
+     * @return The ParticleStyle with a matching name
      */
     public static ParticleStyle fromName(String styleName) {
         for (ParticleStyle style : ParticleStyleManager.getStyles())
-            if (style.getName().equals(styleName)) return style;
+            if (style.getName().equalsIgnoreCase(styleName)) 
+                return style;
         return null;
     }
 
diff --git a/src/com/esophose/playerparticles/util/ParticleUtils.java b/src/com/esophose/playerparticles/util/ParticleUtils.java
index b065127c..ff421e48 100644
--- a/src/com/esophose/playerparticles/util/ParticleUtils.java
+++ b/src/com/esophose/playerparticles/util/ParticleUtils.java
@@ -21,6 +21,10 @@ public class ParticleUtils {
             }
         }
     }
+    
+    private ParticleUtils() { 
+                
+    }
 
     /**
      * Finds a block/item as a material from a string
@@ -76,6 +80,20 @@ public static List<String> getAllBlockMaterials() {
     public static List<String> getAllItemMaterials() {
         return itemMaterials;
     }
+    
+    /**
+     * Formats a string from the format "word_word" to "Word Word"
+     * 
+     * @param string The input string
+     * @return The input string but formatted with each word capitalized
+     */
+    public static String formatName(String string) {
+        String[] words = string.split("_");
+        String result = "";
+        for (String word : words) 
+            result += Character.toUpperCase(word.charAt(0)) + word.substring(1).toLowerCase() + " ";
+        return result;
+    }
 
     /**
      * Gets the smallest positive integer from an array
diff --git a/src/config.yml b/src/config.yml
index 7364aa0d..520e8195 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -13,7 +13,7 @@
 # This value is the version of the plugin that last modified the config file
 # Changing this value manually will likely result in data loss and errors!
 # Do not change this manually unless specifically told to by the plugin author
-version: 6.2
+version: 6.3
 
 # Check for new versions of the plugin
 # Default: true
@@ -41,6 +41,10 @@ message-prefix: '&7[&3PlayerParticles&7]'
 # Default: true
 gui-enabled: true
 
+# If clicking a GUI button should make a noise
+# Default: true
+gui-button-sound: true
+
 # If true, styles will not display while the player is moving
 # They will instead have the effect displayed at their feet
 # Note: Not all styles abide by this rule, but most will
diff --git a/src/groups.yml b/src/groups.yml
index 859b3294..39402596 100644
--- a/src/groups.yml
+++ b/src/groups.yml
@@ -44,4 +44,4 @@ angel:
     2:
         effect: 'dust'
         style: 'halo'
-        data: '255 255 0'
\ No newline at end of file
+        data: '255 255 0'
diff --git a/src/lang/default.lang b/src/lang/default.lang
index 30b957f2..2ae09105 100644
--- a/src/lang/default.lang
+++ b/src/lang/default.lang
@@ -99,7 +99,12 @@ reload-no-permission: '&cYou do not have permission to reload the plugin setting
 
 # Remove Command
 remove-no-args: '&cYou did not specify an ID to remove! &b/pp remove <ID>'
-remove-success: '&aYour particle with the ID &b{0} &ahas been removed!'
+remove-id-success: '&aYour particle with the ID &b{0} &ahas been removed!'
+remove-effect-success: '&aRemoved &b{0} &aof your particles with the effect of &b{1}&a!'
+remove-effect-none: '&cYou do not have any particles applied with the effect &b{0}&c!'
+remove-style-success: '&aRemoved &b{0} &aof your particles with the style of &b{1}&a!'
+remove-style-none: '&cYou do not have any particles applied with the style &b{0}&c!'
+remove-unknown: '&cAn effect or style with the name of &b{0} &cdoes not exist!'
 
 # List Command
 list-none: '&eYou do not have any active particles!'
@@ -111,10 +116,10 @@ toggle-on: '&eParticles have been toggled &aON&e!'
 toggle-off: '&eParticles have been toggled &cOFF&e!'
 
 # Rainbow
-rainbow: '&cr&6a&ei&an&bb&9o&dw'
+rainbow: '&cR&6a&ei&an&bb&9o&dw'
 
 # Random
-random: 'random'
+random: 'Random'
 
 # Effects
 effect-no-permission: '&cYou do not have permission to use the effect &b{0} &c!'
@@ -200,6 +205,9 @@ fixed-no-permission: '&cYou do not have permission to use fixed effects!'
 fixed-max-reached: '&cYou have reached the maximum allowed fixed effects!'
 fixed-invalid-command: '&cInvalid sub-command for &b/pp fixed&c!'
 
+# Update Available
+update-available: '&eAn update (&b{0}&e) is available! You are running &bv{1}&e. https://www.spigotmc.org/resources/playerparticles.40261/'
+
 # GUI
 gui-disabled: '&cThe server administrator has disabled the GUI!'
 gui-color-icon-name: '&a'
@@ -231,8 +239,9 @@ gui-manage-your-groups-description: 'Create, delete, and load your particle grou
 gui-load-a-preset-group: 'Load A Preset Group'
 gui-load-a-preset-group-description: 'Load a premade particle group'
 gui-save-group: 'Save New Group'
-gui-save-group-description: 'You can save a new group using the following command:'
-gui-save-group-description-2: '/pp group save <groupName>'
+gui-save-group-description: 'Click to save a new group. You will be prompted\nto enter the new group name in chat.'
+gui-save-group-full: 'You have reached the max number of groups'
+gui-save-group-hotbar-message: '&eType &b1 &eword in chat for the new group name. Type "&ccancel&e" to cancel. (&b{0}&es left)'
 gui-reset-particles: 'Reset Your Particles'
 gui-reset-particles-description: 'Deletes all your active particles'
 gui-particle-name: 'Particle #{0}'
@@ -276,6 +285,3 @@ gui-edit-data-color-black: '&8black'
 gui-edit-data-color-gray: '&8gray'
 gui-edit-data-color-light-gray: '&7light gray'
 gui-edit-data-color-white: '&fwhite'
-
-# Update Available
-update-available: '&eAn update (&b{0}&e) is available! You are running &bv{1}&e. https://www.spigotmc.org/resources/playerparticles.40261/'
\ No newline at end of file
diff --git a/src/plugin.yml b/src/plugin.yml
index a0b2a64d..8bade0c7 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: PlayerParticles
 main: com.esophose.playerparticles.PlayerParticles
-version: 6.2
+version: 6.3
 api-version: 1.13
 description: Display particles around your player using customized styles and data!
 author: Esophose

From 00127ca017cec8644db0059dd2984b878c2f7ac8 Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Sat, 26 Jan 2019 00:43:36 -0700
Subject: [PATCH 02/11] Refactor some public static variables

---
 .../esophose/playerparticles/DataUpdater.java |  6 ++---
 .../playerparticles/PlayerParticles.java      | 27 ++++++++++++++-----
 .../playerparticles/manager/DataManager.java  | 16 +++++------
 .../updater/PluginUpdateListener.java         |  4 +--
 4 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/com/esophose/playerparticles/DataUpdater.java b/src/com/esophose/playerparticles/DataUpdater.java
index d57d4a87..12638bc7 100644
--- a/src/com/esophose/playerparticles/DataUpdater.java
+++ b/src/com/esophose/playerparticles/DataUpdater.java
@@ -13,7 +13,7 @@ public class DataUpdater {
      * If they don't, create them
      */
     protected static void tryCreateTables() {
-        PlayerParticles.getDBConnector().connect((connection) -> {
+        PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
             try (Statement createStatement = connection.createStatement()) {
                 createStatement.addBatch("CREATE TABLE IF NOT EXISTS pp_settings (player_uuid VARCHAR(36), particles_hidden TINYINT)");
                 createStatement.addBatch("CREATE TABLE IF NOT EXISTS pp_particle (uuid VARCHAR(36), group_uuid VARCHAR(36), id SMALLINT, effect VARCHAR(100), style VARCHAR(100), item_material VARCHAR(100), block_material VARCHAR(100), note SMALLINT, r SMALLINT, g SMALLINT, b SMALLINT, PRIMARY KEY(uuid))");
@@ -50,7 +50,7 @@ protected static void updateData(double configVersion, double currentVersion) {
      * Updates the data from versions older than v5.2
      */
     private static void updateFrom_legacy_to_current() {
-        PlayerParticles.getDBConnector().connect((connection) -> {
+        PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
             try (Statement statement = connection.createStatement()) {
                 statement.addBatch("DROP TABLE IF EXISTS pp_users");
                 statement.addBatch("DROP TABLE IF EXISTS pp_fixed");
@@ -68,7 +68,7 @@ private static void updateFrom_legacy_to_current() {
      * Note: v5.3 was never officially released
      */
     private static void updateFrom_5_3_to_current() {
-        PlayerParticles.getDBConnector().connect((connection) -> {
+        PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
             // Create player settings table
             try (Statement statement = connection.createStatement()) {
                 String updateQuery = "CREATE TABLE IF NOT EXISTS pp_settings (player_uuid VARCHAR(36), particles_hidden TINYINT)";
diff --git a/src/com/esophose/playerparticles/PlayerParticles.java b/src/com/esophose/playerparticles/PlayerParticles.java
index 5be6f7a7..b1708f98 100644
--- a/src/com/esophose/playerparticles/PlayerParticles.java
+++ b/src/com/esophose/playerparticles/PlayerParticles.java
@@ -41,29 +41,32 @@
 
 public class PlayerParticles extends JavaPlugin {
 
-    private static Plugin pluginInstance;
+    /**
+     * The running instance of PlayerParticles on the server
+     */
+    private static PlayerParticles pluginInstance;
 
     /**
      * The version a new update has, will be null if the config has it disabled
      * or if there is no new version
      */
-    public static String updateVersion = null;
+    public String updateVersion = null;
 
     /**
      * The database connection manager
      */
-    private static DatabaseConnector databaseConnector = null;
+    private DatabaseConnector databaseConnector = null;
     
     /**
      * The task that spawns the particles
      */
-    private static BukkitTask particleTask = null;
+    private BukkitTask particleTask = null;
 
     /**
      * Executes essential tasks for starting up the plugin
      */
     public void onEnable() {
-        pluginInstance = Bukkit.getServer().getPluginManager().getPlugin("PlayerParticles");
+        pluginInstance = (PlayerParticles)Bukkit.getServer().getPluginManager().getPlugin("PlayerParticles");
         
         this.registerCommands();
         
@@ -174,7 +177,7 @@ public void reload(boolean updatePluginSettings) {
      * 
      * @return The PlayerParticles plugin instance
      */
-    public static Plugin getPlugin() {
+    public static PlayerParticles getPlugin() {
         return pluginInstance;
     }
     
@@ -183,9 +186,19 @@ public static Plugin getPlugin() {
      * 
      * @return The DatabaseConnector
      */
-    public static DatabaseConnector getDBConnector() {
+    public DatabaseConnector getDBConnector() {
         return databaseConnector;
     }
+    
+    /**
+     * Gets the latest available version of the plugin
+     * Will be null if no update is available
+     * 
+     * @return The latest version available for the plugin
+     */
+    public String getUpdateVersion() {
+        return this.updateVersion;
+    }
 
     /**
      * Determines if we should use MySQL or SQLite based on the useMySql parameter and if we were able to connect successfully
diff --git a/src/com/esophose/playerparticles/manager/DataManager.java b/src/com/esophose/playerparticles/manager/DataManager.java
index bff3eb77..a2a1c78c 100644
--- a/src/com/esophose/playerparticles/manager/DataManager.java
+++ b/src/com/esophose/playerparticles/manager/DataManager.java
@@ -62,7 +62,7 @@ public static void getPPlayer(UUID playerUUID, ConfigurationCallback<PPlayer> ca
             List<ParticleGroup> groups = new ArrayList<ParticleGroup>();
             List<FixedParticleEffect> fixedParticles = new ArrayList<FixedParticleEffect>();
 
-            PlayerParticles.getDBConnector().connect((connection) -> {
+            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
                 // Load settings
                 boolean particlesHidden = false;
                 String settingsQuery = "SELECT particles_hidden FROM pp_settings WHERE player_uuid = ?";
@@ -191,7 +191,7 @@ public static void getPPlayer(UUID playerUUID, ConfigurationCallback<PPlayer> ca
      */
     public static void loadFixedEffects() {
         async(() -> {
-            PlayerParticles.getDBConnector().connect((connection) -> {
+            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
                 String query = "SELECT DISTINCT owner_uuid FROM pp_fixed";
                 try (PreparedStatement statement = connection.prepareStatement(query)) {
                     ResultSet result = statement.executeQuery();
@@ -214,7 +214,7 @@ public static void loadFixedEffects() {
      */
     public static void updateSettingParticlesHidden(UUID playerUUID, boolean particlesHidden) {
         async(() -> {
-           PlayerParticles.getDBConnector().connect((connection) -> {
+           PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
                String updateQuery = "UPDATE pp_settings SET particles_hidden = ? WHERE player_uuid = ?";
                try (PreparedStatement updateStatement = connection.prepareStatement(updateQuery)) {
                    updateStatement.setBoolean(1, particlesHidden);
@@ -238,7 +238,7 @@ public static void updateSettingParticlesHidden(UUID playerUUID, boolean particl
      */
     public static void saveParticleGroup(UUID playerUUID, ParticleGroup group) {
         async(() -> {
-            PlayerParticles.getDBConnector().connect((connection) -> {
+            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
                 String groupUUID = null;
                 
                 String groupUUIDQuery = "SELECT uuid FROM pp_group WHERE owner_uuid = ? AND name = ?";
@@ -310,7 +310,7 @@ public static void saveParticleGroup(UUID playerUUID, ParticleGroup group) {
      */
     public static void removeParticleGroup(UUID playerUUID, ParticleGroup group) {
         async(() -> {
-            PlayerParticles.getDBConnector().connect((connection) -> {
+            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
                 String groupQuery = "SELECT * FROM pp_group WHERE owner_uuid = ? AND name = ?";
                 String particleDeleteQuery = "DELETE FROM pp_particle WHERE group_uuid = ?";
                 String groupDeleteQuery = "DELETE FROM pp_group WHERE uuid = ?";
@@ -356,7 +356,7 @@ public static void removeParticleGroup(UUID playerUUID, ParticleGroup group) {
      */
     public static void saveFixedEffect(FixedParticleEffect fixedEffect) {
         async(() -> {
-            PlayerParticles.getDBConnector().connect((connection) -> {
+            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
                 String particleUUID = UUID.randomUUID().toString();
 
                 String particleQuery = "INSERT INTO pp_particle (uuid, group_uuid, id, effect, style, item_material, block_material, note, r, g, b) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
@@ -402,7 +402,7 @@ public static void saveFixedEffect(FixedParticleEffect fixedEffect) {
      */
     public static void updateFixedEffect(FixedParticleEffect fixedEffect) {
         async(() -> {
-            PlayerParticles.getDBConnector().connect((connection) -> {
+            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
                 // Update fixed effect
                 String fixedEffectQuery = "UPDATE pp_fixed SET xPos = ?, yPos = ?, zPos = ? WHERE owner_uuid = ? AND id = ?";
                 try (PreparedStatement statement = connection.prepareStatement(fixedEffectQuery)) {
@@ -450,7 +450,7 @@ public static void updateFixedEffect(FixedParticleEffect fixedEffect) {
      */
     public static void removeFixedEffect(UUID playerUUID, int id) {
         async(() -> {
-            PlayerParticles.getDBConnector().connect((connection) -> {
+            PlayerParticles.getPlugin().getDBConnector().connect((connection) -> {
                 String particleUUID = null;
 
                 String particleUUIDQuery = "SELECT particle_uuid FROM pp_fixed WHERE owner_uuid = ? AND id = ?";
diff --git a/src/com/esophose/playerparticles/updater/PluginUpdateListener.java b/src/com/esophose/playerparticles/updater/PluginUpdateListener.java
index ad087df5..828e78ed 100644
--- a/src/com/esophose/playerparticles/updater/PluginUpdateListener.java
+++ b/src/com/esophose/playerparticles/updater/PluginUpdateListener.java
@@ -17,8 +17,8 @@ public class PluginUpdateListener implements Listener {
      */
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent e) {
-        if (e.getPlayer().isOp() && PlayerParticles.updateVersion != null) {
-            LangManager.sendCommandSenderMessage(e.getPlayer(), Lang.UPDATE_AVAILABLE, PlayerParticles.updateVersion, PlayerParticles.getPlugin().getDescription().getVersion());
+        if (e.getPlayer().isOp() && PlayerParticles.getPlugin().getUpdateVersion() != null) {
+            LangManager.sendCommandSenderMessage(e.getPlayer(), Lang.UPDATE_AVAILABLE, PlayerParticles.getPlugin().getUpdateVersion(), PlayerParticles.getPlugin().getDescription().getVersion());
         }
     }
 

From 230106ecf7459f7eed53bab30bde38bcfb1f1c9f Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Sat, 26 Jan 2019 01:46:05 -0700
Subject: [PATCH 03/11] Add style 'pulse'

---
 .../playerparticles/PlayerParticles.java      |  7 +-
 .../playerparticles/styles/DefaultStyles.java |  2 +
 .../styles/ParticleStylePulse.java            | 88 +++++++++++++++++++
 src/config.yml                                |  3 +
 4 files changed, 95 insertions(+), 5 deletions(-)
 create mode 100644 src/com/esophose/playerparticles/styles/ParticleStylePulse.java

diff --git a/src/com/esophose/playerparticles/PlayerParticles.java b/src/com/esophose/playerparticles/PlayerParticles.java
index b1708f98..07341200 100644
--- a/src/com/esophose/playerparticles/PlayerParticles.java
+++ b/src/com/esophose/playerparticles/PlayerParticles.java
@@ -2,12 +2,9 @@
  * TODO: v6.4+
  * + Add new style(s) 'wings_<type>', multiple new wing types: fairy, demon
  * + Add ability to create/manage fixed effects from the GUI (may get implemented later)
- */
-
-/*
- * TODO: v6.3
  * + Add named colors to the color data
- * * Display effects/styles in the GUI formatted to be more readable
+ * + Add effect/style name customization through config files
+ * + Add effect/style settings folder that lets you disable effects/style and edit style properties
  * + Possibly add a couple new styles (tornado, doubleorbit)
  */
 
diff --git a/src/com/esophose/playerparticles/styles/DefaultStyles.java b/src/com/esophose/playerparticles/styles/DefaultStyles.java
index 96613616..d8f35d02 100644
--- a/src/com/esophose/playerparticles/styles/DefaultStyles.java
+++ b/src/com/esophose/playerparticles/styles/DefaultStyles.java
@@ -32,6 +32,7 @@ public class DefaultStyles {
     public static final ParticleStyle ORBIT = new ParticleStyleOrbit();
     public static final ParticleStyle OVERHEAD = new ParticleStyleOverhead();
     public static final ParticleStyle POINT = new ParticleStylePoint();
+    public static final ParticleStyle PULSE = new ParticleStylePulse();
     public static final ParticleStyle QUADHELIX = new ParticleStyleQuadhelix();
     public static final ParticleStyle RINGS = new ParticleStyleRings();
     public static final ParticleStyle SPHERE = new ParticleStyleSphere();
@@ -65,6 +66,7 @@ public static void registerStyles() {
         ParticleStyleManager.registerStyle(ORBIT);
         ParticleStyleManager.registerStyle(OVERHEAD);
         ParticleStyleManager.registerStyle(POINT);
+        ParticleStyleManager.registerStyle(PULSE);
         ParticleStyleManager.registerStyle(QUADHELIX);
         ParticleStyleManager.registerStyle(RINGS);
         ParticleStyleManager.registerStyle(SPHERE);
diff --git a/src/com/esophose/playerparticles/styles/ParticleStylePulse.java b/src/com/esophose/playerparticles/styles/ParticleStylePulse.java
new file mode 100644
index 00000000..1b8b0dc1
--- /dev/null
+++ b/src/com/esophose/playerparticles/styles/ParticleStylePulse.java
@@ -0,0 +1,88 @@
+package com.esophose.playerparticles.styles;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Location;
+
+import com.esophose.playerparticles.particles.ParticleEffect;
+import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.styles.api.PParticle;
+import com.esophose.playerparticles.styles.api.ParticleStyle;
+
+public class ParticleStylePulse implements ParticleStyle {
+
+    private int points = 50;
+    private double radius = 0.75;
+    private double step = 0;
+    private int numSteps = 15;
+
+    public List<PParticle> getParticles(ParticlePair particle, Location location) {
+        List<PParticle> particles = new ArrayList<PParticle>();
+        double speed = getSpeedByEffect(particle.getEffect());
+        
+        if (step == 0) {
+            for (int i = 0; i < points; i++) {
+                double dx = Math.cos(Math.PI * 2 * ((double)i / points)) * radius;
+                double dy = -0.9;
+                double dz = Math.sin(Math.PI * 2 * ((double)i / points)) * 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 DAMAGE_INDICATOR:
+        case ENCHANTED_HIT:
+            return 1;
+        case DRAGON_BREATH:
+            return 0.01;
+        case ENCHANT:
+        case NAUTILUS:
+        case PORTAL:
+            return radius;
+        case END_ROD:
+        case SMOKE:
+        case SQUID_INK:
+            return 0.15;
+        case FIREWORK:
+        case SPIT:
+        case SPLASH:
+            return 0.25;
+        case POOF:
+            return 0.2;
+        case TOTEM_OF_UNDYING:
+            return 0.75;
+        default:
+            return 0.1; // Flame
+        }
+    }
+
+    public void updateTimers() {
+        step = (step + 1) % numSteps;
+    }
+
+    public String getName() {
+        return "pulse";
+    }
+
+    public boolean canBeFixed() {
+        return true;
+    }
+    
+    public boolean canToggleWithMovement() {
+        return true;
+    }
+    
+    public double getFixedEffectOffset() {
+        return 0.5;
+    }
+
+}
diff --git a/src/config.yml b/src/config.yml
index 520e8195..55bb0248 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -338,6 +338,9 @@ gui-icon:
       - GLOWSTONE
     point:
       - STONE_BUTTON
+    pulse:
+      - REDSTONE_TORCH
+      - REDSTONE_TORCH_ON
     quadhelix:
       - NAUTILUS_SHELL
       - ACTIVATOR_RAIL

From 429bee472a0a8cc57be5406de47fc6ae7b2a94eb Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Sat, 26 Jan 2019 02:00:51 -0700
Subject: [PATCH 04/11] Update default.lang with new /pp remove syntax

---
 src/lang/default.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lang/default.lang b/src/lang/default.lang
index 2ae09105..861b787f 100644
--- a/src/lang/default.lang
+++ b/src/lang/default.lang
@@ -31,7 +31,7 @@ command-description-help: 'Displays the help menu... You have arrived'
 command-description-info: 'Gets the description of one of your active particles'
 command-description-list: 'Lists the IDs of your active particles'
 command-description-reload: 'Reloads the config.yml and lang file'
-command-description-remove: 'Removes one of your active particles'
+command-description-remove: 'Removes some of your active particles'
 command-description-reset: 'Removes all your active particles'
 command-description-styles: 'Display a list of styles you can use'
 command-description-toggle: 'Toggles particle visibility on/off'
@@ -41,7 +41,7 @@ command-description-worlds: 'Find out what worlds particles are disabled in'
 # Sub-Command Usage
 command-description-fixed-create: '&e/pp fixed create <<x> <y> <z>|<looking>> <effect> <style> [data] - Creates a new fixed effect'
 command-description-fixed-edit: '&e/pp fixed edit <id> <effect|style|data> <args> - Edit part of a fixed effect by its ID'
-command-description-fixed-remove: '&e/pp fixed remove <ID> - Removes a fixed effect by its ID'
+command-description-fixed-remove: '&e/pp fixed remove <ID|effect|style> - Removes a fixed effect by its ID'
 command-description-fixed-list: '&e/pp fixed list - Lists all IDs of your fixed effects'
 command-description-fixed-info: '&e/pp fixed info <ID> - Gets info on one of your fixed effects'
 command-description-fixed-clear: '&e/pp fixed clear <radius> - Clears all fixed effects of all players within the given radius'

From a0826ae06cef241a1b9187fe27ee52c836909f52 Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Sun, 27 Jan 2019 00:45:24 -0700
Subject: [PATCH 05/11] Add whirl/whirlwind styles

---
 changelog.txt                                 |  3 +-
 .../playerparticles/styles/DefaultStyles.java |  4 +
 .../styles/ParticleStyleWhirl.java            | 85 ++++++++++++++++++
 .../styles/ParticleStyleWhirlwind.java        | 86 +++++++++++++++++++
 src/config.yml                                |  6 +-
 5 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 src/com/esophose/playerparticles/styles/ParticleStyleWhirl.java
 create mode 100644 src/com/esophose/playerparticles/styles/ParticleStyleWhirlwind.java

diff --git a/changelog.txt b/changelog.txt
index d9323eb7..415fbb14 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,8 @@
 == UPDATING WILL DELETE YOUR CONFIG.YML ==
 * Create a backup of your config.yml if you wish to import all your old settings!
-=== v6.3 (Implemented so far) ===
+=== v6.3 ===
 + Added the ability to remove particles by id/effect/style using '/pp remove <id>|<effect>|<style>'
++ Added new styles 'pulse', 'whirl', and 'whirlwind'
 + The "Save New Group" button in the GUI now actually saves a new group and prompts for a name in chat (15 second timeout)
 + Added a click sound to the GUI for button clicks (Can be disabled in the config.yml)
 * Reduced the number of particles that spawn for the styles 'blockbreak', 'blockplace', and 'swords'
diff --git a/src/com/esophose/playerparticles/styles/DefaultStyles.java b/src/com/esophose/playerparticles/styles/DefaultStyles.java
index d8f35d02..38626803 100644
--- a/src/com/esophose/playerparticles/styles/DefaultStyles.java
+++ b/src/com/esophose/playerparticles/styles/DefaultStyles.java
@@ -41,6 +41,8 @@ public class DefaultStyles {
     public static final ParticleStyle SWORDS = new ParticleStyleSwords();
     public static final ParticleStyle THICK = new ParticleStyleThick();
     public static final ParticleStyle VORTEX = new ParticleStyleVortex();
+    public static final ParticleStyle WHIRL = new ParticleStyleWhirl();
+    public static final ParticleStyle WHIRLWIND = new ParticleStyleWhirlwind();
     public static final ParticleStyle WINGS = new ParticleStyleWings();
 
     /**
@@ -75,6 +77,8 @@ public static void registerStyles() {
         ParticleStyleManager.registerCustomHandledStyle(SWORDS);
         ParticleStyleManager.registerStyle(THICK);
         ParticleStyleManager.registerStyle(VORTEX);
+        ParticleStyleManager.registerStyle(WHIRL);
+        ParticleStyleManager.registerStyle(WHIRLWIND);
         ParticleStyleManager.registerStyle(WINGS);
 
         // Register their events
diff --git a/src/com/esophose/playerparticles/styles/ParticleStyleWhirl.java b/src/com/esophose/playerparticles/styles/ParticleStyleWhirl.java
new file mode 100644
index 00000000..49918992
--- /dev/null
+++ b/src/com/esophose/playerparticles/styles/ParticleStyleWhirl.java
@@ -0,0 +1,85 @@
+package com.esophose.playerparticles.styles;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Location;
+
+import com.esophose.playerparticles.particles.ParticleEffect;
+import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.styles.api.PParticle;
+import com.esophose.playerparticles.styles.api.ParticleStyle;
+
+public class ParticleStyleWhirl implements ParticleStyle {
+    
+    private int points = 2;
+    private double step = 0;
+    private int numSteps = 40;
+
+    public List<PParticle> getParticles(ParticlePair particle, Location location) {
+        List<PParticle> particles = new ArrayList<PParticle>();
+        double speed = getSpeedByEffect(particle.getEffect());
+        
+        for (int i = 0; i < points; i++) {
+            double dx = Math.cos(step + (Math.PI * 2 * ((double)i / points)));
+            double dy = -0.9;
+            double dz = Math.sin(step + (Math.PI * 2 * ((double)i / 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 DAMAGE_INDICATOR:
+        case ENCHANTED_HIT:
+            return 1;
+        case DRAGON_BREATH:
+            return 0.01;
+        case ENCHANT:
+        case NAUTILUS:
+        case PORTAL:
+            return 1;
+        case END_ROD:
+        case SMOKE:
+        case SQUID_INK:
+            return 0.15;
+        case FIREWORK:
+        case SPIT:
+        case SPLASH:
+            return 0.25;
+        case POOF:
+            return 0.2;
+        case TOTEM_OF_UNDYING:
+            return 0.75;
+        default:
+            return 0.1; // Flame
+        }
+    }
+
+    public void updateTimers() {
+        step = (step + Math.PI * 2 / numSteps) % numSteps;
+    }
+
+    public String getName() {
+        return "whirl";
+    }
+
+    public boolean canBeFixed() {
+        return true;
+    }
+    
+    public boolean canToggleWithMovement() {
+        return true;
+    }
+    
+    public double getFixedEffectOffset() {
+        return 0.5;
+    }
+
+}
diff --git a/src/com/esophose/playerparticles/styles/ParticleStyleWhirlwind.java b/src/com/esophose/playerparticles/styles/ParticleStyleWhirlwind.java
new file mode 100644
index 00000000..fa1a9028
--- /dev/null
+++ b/src/com/esophose/playerparticles/styles/ParticleStyleWhirlwind.java
@@ -0,0 +1,86 @@
+package com.esophose.playerparticles.styles;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Location;
+
+import com.esophose.playerparticles.particles.ParticleEffect;
+import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.styles.api.PParticle;
+import com.esophose.playerparticles.styles.api.ParticleStyle;
+
+public class ParticleStyleWhirlwind implements ParticleStyle {
+    
+    private int points = 3;
+    private double step = 0;
+    private int numSteps = 40;
+
+    public List<PParticle> getParticles(ParticlePair particle, Location location) {
+        List<PParticle> particles = new ArrayList<PParticle>();
+        double speed = getSpeedByEffect(particle.getEffect()) * 2.5;
+        
+        // Orbit going clockwise
+        for (int i = 0; i < points; i++) {
+            double dx = Math.cos(step + (Math.PI * 2 * ((double)i / points)));
+            double dy = -0.9;
+            double dz = Math.sin(step + (Math.PI * 2 * ((double)i / 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 DAMAGE_INDICATOR:
+        case ENCHANTED_HIT:
+            return 1;
+        case DRAGON_BREATH:
+            return 0.01;
+        case ENCHANT:
+        case NAUTILUS:
+        case PORTAL:
+            return 1;
+        case END_ROD:
+        case SMOKE:
+        case SQUID_INK:
+            return 0.15;
+        case FIREWORK:
+        case SPIT:
+        case SPLASH:
+            return 0.25;
+        case POOF:
+            return 0.2;
+        case TOTEM_OF_UNDYING:
+            return 0.75;
+        default:
+            return 0.1; // Flame
+        }
+    }
+
+    public void updateTimers() {
+        step = (step + Math.PI * 2 / numSteps) % numSteps;
+    }
+
+    public String getName() {
+        return "whirlwind";
+    }
+
+    public boolean canBeFixed() {
+        return true;
+    }
+    
+    public boolean canToggleWithMovement() {
+        return true;
+    }
+    
+    public double getFixedEffectOffset() {
+        return 0.5;
+    }
+
+}
diff --git a/src/config.yml b/src/config.yml
index 55bb0248..e89991e9 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -345,7 +345,7 @@ gui-icon:
       - NAUTILUS_SHELL
       - ACTIVATOR_RAIL
     rings:
-      - STRING
+      - LEAD
     sphere:
       - HEART_OF_THE_SEA
       - SNOWBALL
@@ -360,6 +360,10 @@ gui-icon:
       - WEB
     vortex:
       - GLOWSTONE_DUST
+    whirl:
+      - FEATHER
+    whirlwind: 
+      - STRING
     wings:
       - ELYTRA
 

From c14f76e611a804ea67c4929e59dd8ad45f3ad7cb Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Sun, 27 Jan 2019 21:15:03 -0700
Subject: [PATCH 06/11] Add setting 'toggle-on-move-delay'

---
 .../esophose/playerparticles/manager/SettingManager.java    | 2 ++
 src/com/esophose/playerparticles/particles/PPlayer.java     | 5 +++++
 .../playerparticles/particles/PPlayerMovementListener.java  | 5 ++---
 src/config.yml                                              | 6 ++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/com/esophose/playerparticles/manager/SettingManager.java b/src/com/esophose/playerparticles/manager/SettingManager.java
index 47fe57df..47d61dad 100644
--- a/src/com/esophose/playerparticles/manager/SettingManager.java
+++ b/src/com/esophose/playerparticles/manager/SettingManager.java
@@ -33,7 +33,9 @@ public enum PSetting {
         CHECK_UPDATES(PSettingType.BOOLEAN),
         GUI_ENABLED(PSettingType.BOOLEAN),
         GUI_BUTTON_SOUND(PSettingType.BOOLEAN),
+        
         TOGGLE_ON_MOVE(PSettingType.BOOLEAN),
+        TOGGLE_ON_MOVE_DELAY(PSettingType.INTEGER),
         
         PARTICLE_RENDER_RANGE_PLAYER(PSettingType.INTEGER),
         PARTICLE_RENDER_RANGE_FIXED_EFFECT(PSettingType.INTEGER),
diff --git a/src/com/esophose/playerparticles/particles/PPlayer.java b/src/com/esophose/playerparticles/particles/PPlayer.java
index fb646fd8..2da3a164 100644
--- a/src/com/esophose/playerparticles/particles/PPlayer.java
+++ b/src/com/esophose/playerparticles/particles/PPlayer.java
@@ -118,6 +118,11 @@ public void setMoving(boolean isMoving) {
         this.isMoving = isMoving;
     }
     
+    /**
+     * Gets if a player is moving
+     * 
+     * @return True if the player is moving
+     */
     public boolean isMoving() {
         return this.isMoving;
     }
diff --git a/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java b/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java
index 21cfa312..f0865966 100644
--- a/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java
+++ b/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java
@@ -19,7 +19,6 @@
 public class PPlayerMovementListener implements Listener {
     
     private static Map<UUID, Integer> timeSinceLastMovement = new HashMap<UUID, Integer>();
-    private static final int STANDING_TIME = 9;
     private static final int CHECK_INTERVAL = 3;
     
     public PPlayerMovementListener() {
@@ -35,8 +34,8 @@ public void run() {
                         toRemove.add(uuid);
                     } else {
                         int standingTime = timeSinceLastMovement.get(uuid);
-                        pplayer.setMoving(standingTime < STANDING_TIME);
-                        if (standingTime < STANDING_TIME)
+                        pplayer.setMoving(standingTime < PSetting.TOGGLE_ON_MOVE_DELAY.getInt());
+                        if (standingTime < PSetting.TOGGLE_ON_MOVE_DELAY.getInt())
                             timeSinceLastMovement.replace(uuid, standingTime + CHECK_INTERVAL);
                     }
                 }
diff --git a/src/config.yml b/src/config.yml
index e89991e9..c134fa81 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -51,6 +51,12 @@ gui-button-sound: true
 # Default: false
 toggle-on-move: false
 
+# The time (in ticks) a player has to be standing still before they are considered to be stopped
+# This setting has no effect if toggle-on-move is set to false
+# The value must be a positive whole number
+# Default: 9
+toggle-on-move-delay: 9
+
 # The worlds which this plugin is disabled in
 # Remove the [] before you enter world names
 # Default: []

From 5392cd2511ab83f232f80d8fb3b57855138f3827 Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Tue, 29 Jan 2019 10:59:17 -0700
Subject: [PATCH 07/11] Add styles 'twins', 'popper', fix bug with style
 'celebration'

---
 changelog.txt                                 |  1 +
 .../playerparticles/PlayerParticles.java      |  1 -
 .../playerparticles/manager/DataManager.java  | 10 ++-
 .../playerparticles/styles/DefaultStyles.java |  4 +
 .../styles/ParticleStyleCelebration.java      | 12 +--
 .../styles/ParticleStylePopper.java           | 61 +++++++++++++++
 .../styles/ParticleStylePulse.java            |  2 +-
 .../styles/ParticleStyleTwins.java            | 76 +++++++++++++++++++
 src/config.yml                                |  6 ++
 9 files changed, 163 insertions(+), 10 deletions(-)
 create mode 100644 src/com/esophose/playerparticles/styles/ParticleStylePopper.java
 create mode 100644 src/com/esophose/playerparticles/styles/ParticleStyleTwins.java

diff --git a/changelog.txt b/changelog.txt
index 415fbb14..50fb88aa 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -5,6 +5,7 @@
 + Added new styles 'pulse', 'whirl', and 'whirlwind'
 + The "Save New Group" button in the GUI now actually saves a new group and prompts for a name in chat (15 second timeout)
 + Added a click sound to the GUI for button clicks (Can be disabled in the config.yml)
++ Added setting 'toggle-on-move-delay' to the config.yml
 * Reduced the number of particles that spawn for the styles 'blockbreak', 'blockplace', and 'swords'
 * Fix GUI borders showing up as glass panes instead of stained glass panes on servers running 1.12.2 or earlier
 * Fix a console error that occurs when trying to remove a group that doesn't exist
diff --git a/src/com/esophose/playerparticles/PlayerParticles.java b/src/com/esophose/playerparticles/PlayerParticles.java
index 07341200..1b821130 100644
--- a/src/com/esophose/playerparticles/PlayerParticles.java
+++ b/src/com/esophose/playerparticles/PlayerParticles.java
@@ -5,7 +5,6 @@
  * + Add named colors to the color data
  * + Add effect/style name customization through config files
  * + Add effect/style settings folder that lets you disable effects/style and edit style properties
- * + Possibly add a couple new styles (tornado, doubleorbit)
  */
 
 package com.esophose.playerparticles;
diff --git a/src/com/esophose/playerparticles/manager/DataManager.java b/src/com/esophose/playerparticles/manager/DataManager.java
index a2a1c78c..c8832348 100644
--- a/src/com/esophose/playerparticles/manager/DataManager.java
+++ b/src/com/esophose/playerparticles/manager/DataManager.java
@@ -39,9 +39,13 @@ private DataManager() {
      * @return The PPlayer from cache
      */
     public static PPlayer getPPlayer(UUID playerUUID) {
-        for (PPlayer pp : ParticleManager.getPPlayers())
-            if (pp.getUniqueId().equals(playerUUID)) return pp;
-        return null;
+        List<PPlayer> pplayers = ParticleManager.getPPlayers();
+        synchronized (pplayers) { // Under rare circumstances, the PPlayers list can be changed while it's looping
+            for (PPlayer pp : pplayers)
+                if (pp.getUniqueId().equals(playerUUID)) 
+                    return pp;
+            return null;
+        }
     }
 
     /**
diff --git a/src/com/esophose/playerparticles/styles/DefaultStyles.java b/src/com/esophose/playerparticles/styles/DefaultStyles.java
index 38626803..e2e5bc1b 100644
--- a/src/com/esophose/playerparticles/styles/DefaultStyles.java
+++ b/src/com/esophose/playerparticles/styles/DefaultStyles.java
@@ -32,6 +32,7 @@ public class DefaultStyles {
     public static final ParticleStyle ORBIT = new ParticleStyleOrbit();
     public static final ParticleStyle OVERHEAD = new ParticleStyleOverhead();
     public static final ParticleStyle POINT = new ParticleStylePoint();
+    public static final ParticleStyle POPPER = new ParticleStylePopper();
     public static final ParticleStyle PULSE = new ParticleStylePulse();
     public static final ParticleStyle QUADHELIX = new ParticleStyleQuadhelix();
     public static final ParticleStyle RINGS = new ParticleStyleRings();
@@ -40,6 +41,7 @@ public class DefaultStyles {
     public static final ParticleStyle SPIRAL = new ParticleStyleSpiral();
     public static final ParticleStyle SWORDS = new ParticleStyleSwords();
     public static final ParticleStyle THICK = new ParticleStyleThick();
+    public static final ParticleStyle TWINS = new ParticleStyleTwins();
     public static final ParticleStyle VORTEX = new ParticleStyleVortex();
     public static final ParticleStyle WHIRL = new ParticleStyleWhirl();
     public static final ParticleStyle WHIRLWIND = new ParticleStyleWhirlwind();
@@ -68,6 +70,7 @@ public static void registerStyles() {
         ParticleStyleManager.registerStyle(ORBIT);
         ParticleStyleManager.registerStyle(OVERHEAD);
         ParticleStyleManager.registerStyle(POINT);
+        ParticleStyleManager.registerStyle(POPPER);
         ParticleStyleManager.registerStyle(PULSE);
         ParticleStyleManager.registerStyle(QUADHELIX);
         ParticleStyleManager.registerStyle(RINGS);
@@ -76,6 +79,7 @@ public static void registerStyles() {
         ParticleStyleManager.registerStyle(SPIRAL);
         ParticleStyleManager.registerCustomHandledStyle(SWORDS);
         ParticleStyleManager.registerStyle(THICK);
+        ParticleStyleManager.registerStyle(TWINS);
         ParticleStyleManager.registerStyle(VORTEX);
         ParticleStyleManager.registerStyle(WHIRL);
         ParticleStyleManager.registerStyle(WHIRLWIND);
diff --git a/src/com/esophose/playerparticles/styles/ParticleStyleCelebration.java b/src/com/esophose/playerparticles/styles/ParticleStyleCelebration.java
index 7395c0af..2b74706c 100644
--- a/src/com/esophose/playerparticles/styles/ParticleStyleCelebration.java
+++ b/src/com/esophose/playerparticles/styles/ParticleStyleCelebration.java
@@ -5,12 +5,14 @@
 import java.util.List;
 import java.util.Random;
 
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import com.esophose.playerparticles.PlayerParticles;
 import com.esophose.playerparticles.manager.ParticleManager;
+import com.esophose.playerparticles.manager.PermissionManager;
 import com.esophose.playerparticles.particles.FixedParticleEffect;
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleEffect;
@@ -39,13 +41,13 @@ public void updateTimers() {
             Random random = new Random();
             for (PPlayer pplayer : ParticleManager.getPPlayers()) {
                 Player player = pplayer.getPlayer();
-                
-                for (ParticlePair particle : pplayer.getActiveParticles())
-                    if (particle.getStyle() == this) 
-                        spawnFirework(player.getLocation(), pplayer, particle, random);
+                if (player != null && player.getGameMode() != GameMode.SPECTATOR && !PermissionManager.isWorldDisabled(player.getWorld().getName()))
+                    for (ParticlePair particle : pplayer.getActiveParticles())
+                        if (particle.getStyle() == this) 
+                            spawnFirework(player.getLocation(), pplayer, particle, random);
                 
                 for (FixedParticleEffect fixedEffect : pplayer.getFixedParticles())
-                    if (fixedEffect.getParticlePair().getStyle() == this)
+                    if (fixedEffect.getParticlePair().getStyle() == this && !PermissionManager.isWorldDisabled(fixedEffect.getLocation().getWorld().getName()))
                         spawnFirework(fixedEffect.getLocation(), pplayer, fixedEffect.getParticlePair(), random);
             }
         }
diff --git a/src/com/esophose/playerparticles/styles/ParticleStylePopper.java b/src/com/esophose/playerparticles/styles/ParticleStylePopper.java
new file mode 100644
index 00000000..ba3e8f6e
--- /dev/null
+++ b/src/com/esophose/playerparticles/styles/ParticleStylePopper.java
@@ -0,0 +1,61 @@
+package com.esophose.playerparticles.styles;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Location;
+import org.bukkit.util.Vector;
+
+import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.styles.api.PParticle;
+import com.esophose.playerparticles.styles.api.ParticleStyle;
+
+public class ParticleStylePopper implements ParticleStyle {
+
+    private double grow = 0.08f;
+    private double radials = Math.PI / 16;
+    private int helices = 2;
+    private int step = 0;
+    private int maxStep = 35;
+
+    public List<PParticle> getParticles(ParticlePair particle, Location location) {
+        List<PParticle> particles = new ArrayList<PParticle>();
+
+        double radius = (1 - (double)step / maxStep);
+        for (int i = 0; i < helices; i++) {
+            double angle = step * radials + (2 * Math.PI * i / helices);
+            Vector v = new Vector(Math.cos(angle) * radius, step * grow - 1, Math.sin(angle) * radius);
+
+            particles.add(new PParticle(location.clone().add(v)));
+        }
+        
+        if (step == 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;
+    }
+
+    public void updateTimers() {
+        step = (step + 1) % maxStep;
+    }
+
+    public String getName() {
+        return "popper";
+    }
+
+    public boolean canBeFixed() {
+        return true;
+    }
+    
+    public boolean canToggleWithMovement() {
+        return true;
+    }
+    
+    public double getFixedEffectOffset() {
+        return 0.5;
+    }
+
+}
diff --git a/src/com/esophose/playerparticles/styles/ParticleStylePulse.java b/src/com/esophose/playerparticles/styles/ParticleStylePulse.java
index 1b8b0dc1..73c3e17d 100644
--- a/src/com/esophose/playerparticles/styles/ParticleStylePulse.java
+++ b/src/com/esophose/playerparticles/styles/ParticleStylePulse.java
@@ -13,7 +13,7 @@
 public class ParticleStylePulse implements ParticleStyle {
 
     private int points = 50;
-    private double radius = 0.75;
+    private double radius = 0.5;
     private double step = 0;
     private int numSteps = 15;
 
diff --git a/src/com/esophose/playerparticles/styles/ParticleStyleTwins.java b/src/com/esophose/playerparticles/styles/ParticleStyleTwins.java
new file mode 100644
index 00000000..9b58fa6c
--- /dev/null
+++ b/src/com/esophose/playerparticles/styles/ParticleStyleTwins.java
@@ -0,0 +1,76 @@
+package com.esophose.playerparticles.styles;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Location;
+
+import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.styles.api.PParticle;
+import com.esophose.playerparticles.styles.api.ParticleStyle;
+
+public class ParticleStyleTwins implements ParticleStyle {
+
+    private static double[] cos, sin;
+    private static final int orbs = 2;
+    private static final int numSteps = 60;
+    private int stepX = 0;
+    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);
+            sin[i] = -Math.sin(n / numSteps * Math.PI * 2);
+            i++;
+        }
+    }
+
+    public List<PParticle> getParticles(ParticlePair particle, Location location) {
+        List<PParticle> particles = new ArrayList<PParticle>();
+        for (int i = 0; i < orbs; i++) {
+            double dx = cos[(stepX + (numSteps / orbs * i)) % numSteps];
+            double dy = (stepY / (double)maxStepY);
+            double dz = sin[(stepX + (numSteps / orbs * i)) % numSteps];
+            particles.add(new PParticle(location.clone().add(dx, dy, dz)));
+        }
+        return particles;
+    }
+
+    public void updateTimers() {
+        stepX++;
+        if (stepX > numSteps) {
+            stepX = 0;
+        }
+        
+        if (reverse) {
+            stepY++;
+            if (stepY > maxStepY) reverse = false;
+        } else {
+            stepY--;
+            if (stepY < -maxStepY) reverse = true;
+        }
+    }
+
+    public String getName() {
+        return "twins";
+    }
+
+    public boolean canBeFixed() {
+        return true;
+    }
+    
+    public boolean canToggleWithMovement() {
+        return true;
+    }
+    
+    public double getFixedEffectOffset() {
+        return 0;
+    }
+
+}
diff --git a/src/config.yml b/src/config.yml
index c134fa81..5c14e4a8 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -344,6 +344,9 @@ gui-icon:
       - GLOWSTONE
     point:
       - STONE_BUTTON
+    popper:
+      - POPPED_CHORUS_FRUIT
+      - CHORUS_FRUIT_POPPED
     pulse:
       - REDSTONE_TORCH
       - REDSTONE_TORCH_ON
@@ -364,6 +367,9 @@ gui-icon:
     thick:
       - COBWEB
       - WEB
+    twins:
+      - OAK_FENCE
+      - FENCE
     vortex:
       - GLOWSTONE_DUST
     whirl:

From 077ca13b35ddc6867f0ed0553e59c80320f29168 Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Tue, 29 Jan 2019 11:00:29 -0700
Subject: [PATCH 08/11] Update changelog.txt

---
 changelog.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 50fb88aa..cf7958a9 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -8,8 +8,9 @@
 + Added setting 'toggle-on-move-delay' to the config.yml
 * Reduced the number of particles that spawn for the styles 'blockbreak', 'blockplace', and 'swords'
 * Fix GUI borders showing up as glass panes instead of stained glass panes on servers running 1.12.2 or earlier
-* Fix a console error that occurs when trying to remove a group that doesn't exist
-* Fix "[PlayerParticles] An error occurred retrieving an SQLite database connection: [SQLITE_BUSY]  The database file is locked (database is locked)"
+* Fix a console error that occured when trying to remove a group that doesn't exist
+* Fix a console error that occured when a player logs off with the 'celebration' style applied and they have at least 1 fixed effect created
+* Fix a console error "[PlayerParticles] An error occurred retrieving an SQLite database connection: [SQLITE_BUSY]  The database file is locked (database is locked)"
 === v6.2 ===
 + Added command '/ppo' which allows executing a /pp command as another player.
 * Fix not being able to change the lore of the player skull in the GUI

From 2c97126a78f2202963d9085423665c7ac1a055e3 Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Thu, 31 Jan 2019 23:27:09 -0700
Subject: [PATCH 09/11] Lots of changes, see description

Renamed default.lang to en_US.lang
Added fr_FR.lang (French, still missing some messages)
Renamed groups.yml to preset_groups.yml
Added some new functionality to preset groups to make it easier for server owners
Fix missing message when removing a group that didn't exist
Update changelog.txt
---
 changelog.txt                                 |   5 +-
 .../playerparticles/PlayerParticles.java      |   4 +-
 .../command/GroupCommandModule.java           |  32 +-
 .../playerparticles/gui/GuiInventory.java     |   3 +-
 .../gui/GuiInventoryDefault.java              |   3 +-
 .../gui/GuiInventoryLoadPresetGroups.java     |  14 +-
 .../gui/GuiInventoryManageGroups.java         |  16 +-
 .../playerparticles/manager/LangManager.java  |  82 +++--
 .../manager/ParticleGroupPresetManager.java   | 217 ++++++++++++++
 .../particles/ParticleGroup.java              | 221 --------------
 .../particles/ParticleGroupPreset.java        |  83 ++++++
 src/config.yml                                |   4 +-
 src/groups.yml                                |  47 ---
 src/lang/{default.lang => en_US.lang}         |   3 +-
 src/lang/fr_FR.lang                           | 281 ++++++++++++++++++
 src/preset_groups.yml                         |  82 +++++
 16 files changed, 770 insertions(+), 327 deletions(-)
 create mode 100644 src/com/esophose/playerparticles/manager/ParticleGroupPresetManager.java
 create mode 100644 src/com/esophose/playerparticles/particles/ParticleGroupPreset.java
 delete mode 100644 src/groups.yml
 rename src/lang/{default.lang => en_US.lang} (99%)
 create mode 100644 src/lang/fr_FR.lang
 create mode 100644 src/preset_groups.yml

diff --git a/changelog.txt b/changelog.txt
index cf7958a9..4a6d3eb6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,12 +2,15 @@
 * Create a backup of your config.yml if you wish to import all your old settings!
 === v6.3 ===
 + Added the ability to remove particles by id/effect/style using '/pp remove <id>|<effect>|<style>'
-+ Added new styles 'pulse', 'whirl', and 'whirlwind'
++ Added new styles 'popper', 'pulse', 'twins', 'whirl', and 'whirlwind'
 + The "Save New Group" button in the GUI now actually saves a new group and prompts for a name in chat (15 second timeout)
 + Added a click sound to the GUI for button clicks (Can be disabled in the config.yml)
 + Added setting 'toggle-on-move-delay' to the config.yml
++ Added new lang file fr_FR.lang (French)
+* Renamed default.lang to en_US.lang
 * Reduced the number of particles that spawn for the styles 'blockbreak', 'blockplace', and 'swords'
 * Fix GUI borders showing up as glass panes instead of stained glass panes on servers running 1.12.2 or earlier
+* Fix a missing message when trying to remove a group that doesn't exist
 * Fix a console error that occured when trying to remove a group that doesn't exist
 * Fix a console error that occured when a player logs off with the 'celebration' style applied and they have at least 1 fixed effect created
 * Fix a console error "[PlayerParticles] An error occurred retrieving an SQLite database connection: [SQLITE_BUSY]  The database file is locked (database is locked)"
diff --git a/src/com/esophose/playerparticles/PlayerParticles.java b/src/com/esophose/playerparticles/PlayerParticles.java
index 1b821130..8c92c9ae 100644
--- a/src/com/esophose/playerparticles/PlayerParticles.java
+++ b/src/com/esophose/playerparticles/PlayerParticles.java
@@ -26,11 +26,11 @@
 import com.esophose.playerparticles.gui.GuiHandler;
 import com.esophose.playerparticles.gui.hook.PlayerChatHook;
 import com.esophose.playerparticles.manager.LangManager;
+import com.esophose.playerparticles.manager.ParticleGroupPresetManager;
 import com.esophose.playerparticles.manager.ParticleManager;
 import com.esophose.playerparticles.manager.SettingManager;
 import com.esophose.playerparticles.manager.SettingManager.PSetting;
 import com.esophose.playerparticles.particles.PPlayerMovementListener;
-import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.styles.DefaultStyles;
 import com.esophose.playerparticles.updater.PluginUpdateListener;
 import com.esophose.playerparticles.updater.Updater;
@@ -159,7 +159,7 @@ public void reload(boolean updatePluginSettings) {
         
         SettingManager.reload();
         LangManager.reload(updatePluginSettings);
-        ParticleGroup.reload();
+        ParticleGroupPresetManager.reload();
         
         GuiHandler.setup();
         PlayerChatHook.setup();
diff --git a/src/com/esophose/playerparticles/command/GroupCommandModule.java b/src/com/esophose/playerparticles/command/GroupCommandModule.java
index 273208b1..1c6251e7 100644
--- a/src/com/esophose/playerparticles/command/GroupCommandModule.java
+++ b/src/com/esophose/playerparticles/command/GroupCommandModule.java
@@ -9,10 +9,12 @@
 
 import com.esophose.playerparticles.manager.DataManager;
 import com.esophose.playerparticles.manager.LangManager;
+import com.esophose.playerparticles.manager.ParticleGroupPresetManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
 import com.esophose.playerparticles.manager.PermissionManager;
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleGroup;
+import com.esophose.playerparticles.particles.ParticleGroupPreset;
 import com.esophose.playerparticles.particles.ParticlePair;
 
 public class GroupCommandModule implements CommandModule {
@@ -128,17 +130,18 @@ private void onLoad(PPlayer pplayer, String groupName) {
         ParticleGroup group = pplayer.getParticleGroupByName(groupName);
         if (group == null) {
             // Didn't find a saved group, look at the presets
-            group = ParticleGroup.getPresetGroup(groupName);
-            if (group == null) {
+            ParticleGroupPreset presetGroup = ParticleGroupPresetManager.getPresetGroup(groupName);
+            if (presetGroup == null) {
                 LangManager.sendMessage(pplayer, Lang.GROUP_INVALID, groupName);
                 return;
             }
             
-            if (!group.canPlayerUse(pplayer.getPlayer())) {
+            if (!presetGroup.canPlayerUse(pplayer.getPlayer())) {
                 LangManager.sendMessage(pplayer, Lang.GROUP_PRESET_NO_PERMISSION, groupName);
                 return;
             }
             
+            group = presetGroup.getGroup();
             isPreset = true;
         }
         
@@ -173,8 +176,11 @@ private void onRemove(PPlayer pplayer, String groupName) {
         ParticleGroup group = pplayer.getParticleGroupByName(groupName);
         if (group == null) {
             // Didn't find a saved group, look at the presets
-            group = ParticleGroup.getPresetGroup(groupName);
-            if (group != null) {
+            ParticleGroupPreset presetGroup = ParticleGroupPresetManager.getPresetGroup(groupName);
+            
+            if (presetGroup == null) {
+                LangManager.sendMessage(pplayer, Lang.GROUP_INVALID, groupName);
+            } else {
                 LangManager.sendMessage(pplayer, Lang.GROUP_REMOVE_PRESET);
             }
             return;
@@ -201,16 +207,18 @@ private void onInfo(PPlayer pplayer, String groupName) {
         ParticleGroup group = pplayer.getParticleGroupByName(groupName);
         if (group == null) {
             // Didn't find a saved group, look at the presets
-            group = ParticleGroup.getPresetGroup(groupName);
-            if (group == null) {
+            ParticleGroupPreset presetGroup = ParticleGroupPresetManager.getPresetGroup(groupName);
+            if (presetGroup == null) {
                 LangManager.sendMessage(pplayer, Lang.GROUP_INVALID, groupName);
                 return;
             }
             
-            if (!group.canPlayerUse(pplayer.getPlayer())) {
+            if (!presetGroup.canPlayerUse(pplayer.getPlayer())) {
                 LangManager.sendMessage(pplayer, Lang.GROUP_PRESET_NO_PERMISSION, groupName);
                 return;
             }
+            
+            group = presetGroup.getGroup();
         }
         
         List<ParticlePair> particles = group.getParticles();
@@ -239,8 +247,8 @@ private void onList(PPlayer pplayer) {
             groupsList = groupsList.substring(0, groupsList.length() - 2);
         
         String presetsList = "";
-        for (ParticleGroup group : ParticleGroup.getPresetGroupsForPlayer(pplayer.getPlayer()))
-            presetsList += group.getName() + ", ";
+        for (ParticleGroupPreset group : ParticleGroupPresetManager.getPresetGroupsForPlayer(pplayer.getPlayer()))
+            presetsList += group.getGroup().getName() + ", ";
         
         if (presetsList.endsWith(", "))
             presetsList = presetsList.substring(0, presetsList.length() - 2);
@@ -275,8 +283,8 @@ public List<String> onTabComplete(PPlayer pplayer, String[] args) {
                     if (!group.getName().equals(ParticleGroup.DEFAULT_NAME))
                         groupNames.add(group.getName());
                 if (!args[0].equals("remove"))
-                    for (ParticleGroup group : ParticleGroup.getPresetGroupsForPlayer(pplayer.getPlayer()))
-                        groupNames.add(group.getName());
+                    for (ParticleGroupPreset group : ParticleGroupPresetManager.getPresetGroupsForPlayer(pplayer.getPlayer()))
+                        groupNames.add(group.getGroup().getName());
                 StringUtil.copyPartialMatches(args[1], groupNames, matches);
             }
         }
diff --git a/src/com/esophose/playerparticles/gui/GuiInventory.java b/src/com/esophose/playerparticles/gui/GuiInventory.java
index 52c48026..e1a05184 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventory.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventory.java
@@ -8,6 +8,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -16,7 +17,7 @@
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.util.ParticleUtils;
 
-public abstract class GuiInventory {
+public abstract class GuiInventory implements InventoryHolder {
     
     protected enum BorderColor {
         WHITE(0, "WHITE_STAINED_GLASS_PANE"),
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java b/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
index 4a8591a9..d7305343 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
@@ -12,6 +12,7 @@
 import com.esophose.playerparticles.manager.DataManager;
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
+import com.esophose.playerparticles.manager.ParticleGroupPresetManager;
 import com.esophose.playerparticles.manager.PermissionManager;
 import com.esophose.playerparticles.manager.SettingManager.GuiIcon;
 import com.esophose.playerparticles.particles.PPlayer;
@@ -54,7 +55,7 @@ public GuiInventoryDefault(PPlayer pplayer) {
         
         // Define what slots to put the icons at based on what other slots are visible
         boolean manageGroupsVisible = PermissionManager.canPlayerSaveGroups(pplayer);
-        boolean loadPresetGroupVisible = !ParticleGroup.getPresetGroupsForPlayer(pplayer.getPlayer()).isEmpty();
+        boolean loadPresetGroupVisible = !ParticleGroupPresetManager.getPresetGroupsForPlayer(pplayer.getPlayer()).isEmpty();
         int manageParticlesSlot = -1, manageGroupsSlot = -1, loadPresetGroupSlot = -1;
         
         if (!manageGroupsVisible && !loadPresetGroupVisible) {
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java b/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
index 91b9049c..a8c38e84 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
@@ -2,17 +2,17 @@
 
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map.Entry;
 
 import org.bukkit.Bukkit;
-import org.bukkit.Material;
 
 import com.esophose.playerparticles.manager.DataManager;
 import com.esophose.playerparticles.manager.LangManager;
 import com.esophose.playerparticles.manager.LangManager.Lang;
+import com.esophose.playerparticles.manager.ParticleGroupPresetManager;
 import com.esophose.playerparticles.manager.SettingManager.GuiIcon;
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleGroup;
+import com.esophose.playerparticles.particles.ParticleGroupPreset;
 import com.esophose.playerparticles.particles.ParticlePair;
 import com.esophose.playerparticles.util.ParticleUtils;
 
@@ -26,11 +26,9 @@ public GuiInventoryLoadPresetGroups(PPlayer pplayer) {
         int index = 10;
         int nextWrap = 17;
         int maxIndex = 43;
-        List<Entry<ParticleGroup, Material>> groups = ParticleGroup.getPresetGroupsForGUIForPlayer(pplayer.getPlayer());
-        for (Entry<ParticleGroup, Material> groupEntry : groups) {
-            ParticleGroup group = groupEntry.getKey();
-            Material iconMaterial = groupEntry.getValue();
-            List<ParticlePair> particles = group.getParticles();
+        List<ParticleGroupPreset> groups = ParticleGroupPresetManager.getPresetGroupsForPlayer(pplayer.getPlayer());
+        for (ParticleGroupPreset group : groups) {
+            List<ParticlePair> particles = group.getGroup().getParticles();
             particles.sort(Comparator.comparingInt(ParticlePair::getId));
             
             String[] lore = new String[particles.size() + 1];
@@ -42,7 +40,7 @@ public GuiInventoryLoadPresetGroups(PPlayer pplayer) {
             } 
             
             // Load Group Buttons
-            GuiActionButton groupButton = new GuiActionButton(index, iconMaterial, LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + group.getName(), lore, (button, isShiftClick) -> {
+            GuiActionButton groupButton = new GuiActionButton(index, group.getGuiIcon(), LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + group.getDisplayName(), lore, (button, isShiftClick) -> {
                 ParticleGroup activeGroup = pplayer.getActiveParticleGroup();
                 activeGroup.getParticles().clear();
                 for (ParticlePair particle : particles)
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java b/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
index 757ecfa8..9d477044 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
@@ -73,15 +73,21 @@ public GuiInventoryManageGroups(PPlayer pplayer) {
             if (index > maxIndex) break; // Overflowed the available space
         }
         
-        boolean canSaveGroup = !PermissionManager.hasPlayerReachedMaxGroups(pplayer);
+        boolean hasReachedMax = PermissionManager.hasPlayerReachedMaxGroups(pplayer);
+        boolean hasParticles = !pplayer.getActiveParticles().isEmpty();
         String[] lore;
-        if (canSaveGroup) {
-            lore = new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION) };
-        } else {
+        if (hasReachedMax) {
             lore = new String[] { 
                 LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION), 
                 LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SAVE_GROUP_FULL)
             };
+        } else if (!hasParticles) {
+            lore = new String[] { 
+                LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION), 
+                LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_SAVE_GROUP_NO_PARTICLES)
+            };
+        } else {
+            lore = new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_SAVE_GROUP_DESCRIPTION) };
         }
         
         // Save Group Button
@@ -90,7 +96,7 @@ public GuiInventoryManageGroups(PPlayer pplayer) {
                                                               LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_SAVE_GROUP),
                                                               lore,
                                                               (button, isShiftClick) -> {
-                                                                  if (!canSaveGroup) return;
+                                                                  if (hasReachedMax || !hasParticles) return;
                                                                   
                                                                   PlayerChatHook.addHook(new PlayerChatHookData(pplayer.getUniqueId(), 15, (textEntered) -> {
                                                                       if (textEntered == null || textEntered.equalsIgnoreCase("cancel")) {
diff --git a/src/com/esophose/playerparticles/manager/LangManager.java b/src/com/esophose/playerparticles/manager/LangManager.java
index 79638334..84ad00ba 100644
--- a/src/com/esophose/playerparticles/manager/LangManager.java
+++ b/src/com/esophose/playerparticles/manager/LangManager.java
@@ -6,6 +6,8 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.text.MessageFormat;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -254,6 +256,7 @@ public static enum Lang { // @formatter:off
         GUI_SAVE_GROUP,
         GUI_SAVE_GROUP_DESCRIPTION,
         GUI_SAVE_GROUP_FULL,
+        GUI_SAVE_GROUP_NO_PARTICLES,
         GUI_SAVE_GROUP_HOTBAR_MESSAGE,
         GUI_RESET_PARTICLES,
         GUI_RESET_PARTICLES_DESCRIPTION,
@@ -350,7 +353,7 @@ private LangManager() {
      * This should only get called once by the PlayerParticles class, however
      * calling it multiple times wont affect anything negatively
      * 
-     * @param resetLangFile If the default.lang file should be updated to the latest version
+     * @param resetLangFile If the default lang files should be updated to the latest version
      */
     public static void reload(boolean resetLangFile) {
         YamlConfiguration lang = configureLangFile(resetLangFile);
@@ -360,43 +363,70 @@ public static void reload(boolean resetLangFile) {
 
     /**
      * Loads the target .lang file as defined in the config and grabs its YamlConfiguration
-     * If it doesn't exist, default to default.lang
-     * If default.lang doesn't exist, copy the file from this .jar to the target directory
+     * If it doesn't exist, default to en_US.lang
+     * If the default lang files don't exist, copy the files from this .jar to the target directory
      * 
-     * @param resetLangFile If the default.lang file should be updated to the latest version
+     * @param resetLangFiles If the default lang files should be updated to the latest version
      * @return The YamlConfiguration of the target .lang file
      */
-    private static YamlConfiguration configureLangFile(boolean resetLangFile) {
+    private static YamlConfiguration configureLangFile(boolean resetLangFiles) {
         File pluginDataFolder = PlayerParticles.getPlugin().getDataFolder();
         langFileName = PSetting.LANG_FILE.getString();
         File targetLangFile = new File(pluginDataFolder.getAbsolutePath() + "/lang/" + langFileName);
         
-        if (resetLangFile) {
-            File defaultLangFile = new File(pluginDataFolder.getAbsolutePath() + "/lang/default.lang");
-            if (defaultLangFile.exists()) {
-                defaultLangFile.delete();
-                PlayerParticles.getPlugin().getLogger().warning("default.lang has been reset!");
+        Set<String> defaultLangFileNames = new HashSet<String>();
+        defaultLangFileNames.add("en_US.lang");
+        defaultLangFileNames.add("fr_FR.lang");
+        
+        targetLangFile.getParentFile().mkdir(); // Make sure the directory always exists
+        
+        if (resetLangFiles) {
+            for (String fileName : defaultLangFileNames) {
+                File file = new File(pluginDataFolder.getAbsolutePath() + "/lang/" + fileName);
+                
+                // Delete the file if it already exists
+                if (file.exists()) {
+                    file.delete(); 
+                }
+                
+                // Generate the new file
+                try (InputStream stream = PlayerParticles.getPlugin().getResource("lang/" + fileName)) {
+                    Files.copy(stream, Paths.get(file.getAbsolutePath()));
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                    PlayerParticles.getPlugin().getLogger().severe("Unable to write " + fileName + " to disk! This wasn't supposed to happen!");
+                }
             }
+            
+            PlayerParticles.getPlugin().getLogger().warning("The default lang files have been reset!");
+        } else {
+            // Make sure the default lang files still exist, if not, create them
+            boolean foundMissingFile = false;
+            for (String fileName : defaultLangFileNames) {
+                File file = new File(pluginDataFolder.getAbsolutePath() + "/lang/" + fileName);
+                
+                // Generate the new file if it doesn't exist
+                if (!file.exists()) {
+                    foundMissingFile = true;
+                    try (InputStream stream = PlayerParticles.getPlugin().getResource("lang/" + fileName)) {
+                        Files.copy(stream, Paths.get(file.getAbsolutePath()));
+                    } catch (IOException ex) {
+                        ex.printStackTrace();
+                        PlayerParticles.getPlugin().getLogger().severe("Unable to write " + fileName + " to disk! This wasn't supposed to happen!");
+                    }
+                }
+            }
+            
+            if (foundMissingFile) 
+                PlayerParticles.getPlugin().getLogger().warning("One or more default lang files were missing, recreated them!");
         }
 
-        if (!targetLangFile.exists()) { // Target .lang file didn't exist, default to default.lang
-            if (!langFileName.equals("default.lang")) {
-                PlayerParticles.getPlugin().getLogger().warning("Couldn't find lang file '" + langFileName + "', defaulting to default.lang");
+        if (!targetLangFile.exists()) { // Target .lang file didn't exist, default to en_US.lang
+            if (!langFileName.equals("en_US.lang")) {
+                PlayerParticles.getPlugin().getLogger().warning("Couldn't find lang file '" + langFileName + "', defaulting to en_US.lang");
             }
-            langFileName = "default.lang";
-
+            langFileName = "en_US.lang";
             targetLangFile = new File(pluginDataFolder.getAbsolutePath() + "/lang/" + langFileName);
-            if (!targetLangFile.exists()) { // default.lang didn't exist, create it
-                try (InputStream stream = PlayerParticles.getPlugin().getResource("lang/default.lang")) {
-                    targetLangFile.getParentFile().mkdir(); // Make sure the directory always exists
-                    Files.copy(stream, Paths.get(targetLangFile.getAbsolutePath()));
-                    return YamlConfiguration.loadConfiguration(targetLangFile);
-                } catch (IOException ex) {
-                    ex.printStackTrace();
-                    PlayerParticles.getPlugin().getLogger().severe("Unable to write default.lang to disk! You and your players will be seeing lots of error messages!");
-                    return null;
-                }
-            }
         }
 
         return YamlConfiguration.loadConfiguration(targetLangFile);
diff --git a/src/com/esophose/playerparticles/manager/ParticleGroupPresetManager.java b/src/com/esophose/playerparticles/manager/ParticleGroupPresetManager.java
new file mode 100644
index 00000000..9651f5c2
--- /dev/null
+++ b/src/com/esophose/playerparticles/manager/ParticleGroupPresetManager.java
@@ -0,0 +1,217 @@
+package com.esophose.playerparticles.manager;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+
+import com.esophose.playerparticles.PlayerParticles;
+import com.esophose.playerparticles.particles.ParticleEffect;
+import com.esophose.playerparticles.particles.ParticleGroup;
+import com.esophose.playerparticles.particles.ParticleGroupPreset;
+import com.esophose.playerparticles.particles.ParticlePair;
+import com.esophose.playerparticles.particles.ParticleEffect.NoteColor;
+import com.esophose.playerparticles.particles.ParticleEffect.OrdinaryColor;
+import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty;
+import com.esophose.playerparticles.styles.api.ParticleStyle;
+import com.esophose.playerparticles.util.ParticleUtils;
+
+public class ParticleGroupPresetManager {
+    
+    private static final String FILE_NAME = "preset_groups.yml";
+    
+    private static List<ParticleGroupPreset> presetGroups;
+    
+    /** Not instantiable */
+    private ParticleGroupPresetManager() {
+        
+    }
+
+    /**
+     * Loads the preset groups from the preset_groups.yml file
+     */
+    public static void reload() {
+        presetGroups = new ArrayList<ParticleGroupPreset>();
+        
+        File pluginDataFolder = PlayerParticles.getPlugin().getDataFolder();
+        File groupsFile = new File(pluginDataFolder.getAbsolutePath() + File.separator + FILE_NAME);
+        
+        // Create the file if it doesn't exist
+        if (!groupsFile.exists()) {
+            try (InputStream inStream = PlayerParticles.getPlugin().getResource(FILE_NAME)) {
+                Files.copy(inStream, Paths.get(groupsFile.getAbsolutePath()));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        
+        // Parse groups.yml file
+        YamlConfiguration groupsYaml = YamlConfiguration.loadConfiguration(groupsFile);
+        Set<String> groupNames = groupsYaml.getKeys(false);
+        for (String groupName : groupNames) {
+            try {
+                List<ParticlePair> particles = new ArrayList<ParticlePair>();
+                String displayName = "";
+                Material guiIcon = Material.ENDER_CHEST;
+                String permission = "";
+                boolean allowPermissionOverride = false;
+                ConfigurationSection groupSection = groupsYaml.getConfigurationSection(groupName);
+                
+                Set<String> particleKeys = groupSection.getKeys(false);
+                for (String stringId : particleKeys) {
+                    if (stringId.equalsIgnoreCase("display-name")) {
+                        displayName = groupSection.getString(stringId);
+                        continue;
+                    }
+
+                    if (stringId.equalsIgnoreCase("gui-icon")) {
+                        guiIcon = Material.valueOf(groupSection.getString(stringId));
+                        continue;
+                    }
+                    
+                    if (stringId.equalsIgnoreCase("permission")) {
+                        permission = groupSection.getString(stringId);
+                        continue;
+                    }
+                    
+                    if (stringId.equalsIgnoreCase("allow-permission-override")) {
+                        allowPermissionOverride = groupSection.getBoolean(stringId);
+                        continue;
+                    }
+                    
+                    ConfigurationSection particleSection = groupSection.getConfigurationSection(stringId);
+                    
+                    int id = Integer.parseInt(stringId);
+                    ParticleEffect effect = ParticleEffect.fromName(particleSection.getString("effect"));
+                    ParticleStyle style = ParticleStyle.fromName(particleSection.getString("style"));
+                    
+                    if (effect == null) {
+                        PlayerParticles.getPlugin().getLogger().severe("Invalid effect name: '" + particleSection.getString("effect") + "'!");
+                        throw new Exception();
+                    }
+                    
+                    if (style == null) {
+                        PlayerParticles.getPlugin().getLogger().severe("Invalid style name: '" + particleSection.getString("style") + "'!");
+                        throw new Exception();
+                    }
+                    
+                    Material itemData = null;
+                    Material blockData = null;
+                    OrdinaryColor colorData = null;
+                    NoteColor noteColorData = null;
+                    
+                    String dataString = particleSection.getString("data");
+                    if (!dataString.isEmpty()) {
+                        String[] args = dataString.split(" ");
+                        
+                        if (effect.hasProperty(ParticleProperty.COLORABLE)) {
+                            if (effect == ParticleEffect.NOTE) {
+                                if (args[0].equalsIgnoreCase("rainbow")) {
+                                    noteColorData = new NoteColor(99);
+                                } else {
+                                    int note = -1;
+                                    try {
+                                        note = Integer.parseInt(args[0]);
+                                    } catch (Exception e) {
+                                        PlayerParticles.getPlugin().getLogger().severe("Invalid note: '" + args[0] + "'!");
+                                        throw new Exception();
+                                    }
+
+                                    if (note < 0 || note > 23) {
+                                        PlayerParticles.getPlugin().getLogger().severe("Invalid note: '" + args[0] + "'!");
+                                        throw new Exception();
+                                    }
+
+                                    noteColorData = new NoteColor(note);
+                                }
+                            } else {
+                                if (args[0].equalsIgnoreCase("rainbow")) {
+                                    colorData = new OrdinaryColor(999, 999, 999);
+                                } else {
+                                    int r = -1;
+                                    int g = -1;
+                                    int b = -1;
+
+                                    try {
+                                        r = Integer.parseInt(args[0]);
+                                        g = Integer.parseInt(args[1]);
+                                        b = Integer.parseInt(args[2]);
+                                    } catch (Exception e) {
+                                        PlayerParticles.getPlugin().getLogger().severe("Invalid color: '" + args[0] + " " + args[1] + " " + args[2] + "'!");
+                                        throw new Exception();
+                                    }
+
+                                    if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
+                                        PlayerParticles.getPlugin().getLogger().severe("Invalid color: '" + args[0] + " " + args[1] + " " + args[2] + "'!");
+                                        throw new Exception();
+                                    }
+
+                                    colorData = new OrdinaryColor(r, g, b);
+                                }
+                            }
+                        } else if (effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
+                            if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) {
+                                try {
+                                    blockData = ParticleUtils.closestMatch(args[0]);
+                                    if (blockData == null || !blockData.isBlock()) throw new Exception();
+                                } catch (Exception e) {
+                                    PlayerParticles.getPlugin().getLogger().severe("Invalid block: '" + args[0] + "'!");
+                                    throw new Exception();
+                                }
+                            } else if (effect == ParticleEffect.ITEM) {
+                                try {
+                                    itemData = ParticleUtils.closestMatch(args[0]);
+                                    if (itemData == null || itemData.isBlock()) throw new Exception();
+                                } catch (Exception e) {
+                                    PlayerParticles.getPlugin().getLogger().severe("Invalid item: '" + args[0] + "'!");
+                                    throw new Exception();
+                                }
+                            }
+                        }
+                    }
+                    
+                    particles.add(new ParticlePair(null, id, effect, style, blockData, blockData, colorData, noteColorData));
+                }
+                
+                presetGroups.add(new ParticleGroupPreset(displayName, guiIcon, permission, allowPermissionOverride, new ParticleGroup(groupName, particles)));
+            } catch (Exception ex) {
+                PlayerParticles.getPlugin().getLogger().severe("An error occurred while parsing the groups.yml file!");
+            }
+        }
+    }
+    
+    /**
+     * Gets all the preset ParticleGroups that a player can use
+     * 
+     * @param player The player
+     * @return a List of preset ParticleGroups the player can use
+     */
+    public static List<ParticleGroupPreset> getPresetGroupsForPlayer(Player player) {
+        return presetGroups.stream().filter(x -> x.canPlayerUse(player)).sorted(Comparator.comparing(ParticleGroupPreset::getDisplayName)).collect(Collectors.toList());
+    }
+    
+    /**
+     * Gets a preset ParticleGroup by its name
+     * 
+     * @param groupName The ParticleGroup name
+     * @return The preset ParticleGroup if it exists, otherwise null 
+     */
+    public static ParticleGroupPreset getPresetGroup(String groupName) {
+        for (ParticleGroupPreset group : presetGroups)
+            if (group.getGroup().getName().equalsIgnoreCase(groupName))
+                return group;
+        return null;
+    }
+
+}
diff --git a/src/com/esophose/playerparticles/particles/ParticleGroup.java b/src/com/esophose/playerparticles/particles/ParticleGroup.java
index ec885098..ed60fa84 100644
--- a/src/com/esophose/playerparticles/particles/ParticleGroup.java
+++ b/src/com/esophose/playerparticles/particles/ParticleGroup.java
@@ -1,36 +1,11 @@
 package com.esophose.playerparticles.particles;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.AbstractMap;
 import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-
-import com.esophose.playerparticles.PlayerParticles;
-import com.esophose.playerparticles.manager.PermissionManager;
-import com.esophose.playerparticles.particles.ParticleEffect.NoteColor;
-import com.esophose.playerparticles.particles.ParticleEffect.OrdinaryColor;
-import com.esophose.playerparticles.particles.ParticleEffect.ParticleProperty;
-import com.esophose.playerparticles.styles.api.ParticleStyle;
-import com.esophose.playerparticles.util.ParticleUtils;
 
 public class ParticleGroup {
     
     public static final String DEFAULT_NAME = "active";
-    private static HashMap<ParticleGroup, Material> presetGroups;
 
     private String name;
     private List<ParticlePair> particles;
@@ -58,21 +33,6 @@ public String getName() {
     public List<ParticlePair> getParticles() {
         return this.particles;
     }
-    
-    /**
-     * Checks if a Player can use this ParticleGroup
-     * 
-     * @param player The Player
-     * @return True if the Player can use this ParticleGroup
-     */
-    public boolean canPlayerUse(Player player) {
-        if (PermissionManager.getMaxParticlesAllowed(player) < this.particles.size()) return false;
-        for (ParticlePair particle : this.particles) {
-            if (!PermissionManager.hasEffectPermission(player, particle.getEffect())) return false;
-            if (!PermissionManager.hasStylePermission(player, particle.getStyle())) return false;
-        }
-        return true;
-    }
 
     /**
      * Gets an empty ParticleGroup
@@ -82,186 +42,5 @@ public boolean canPlayerUse(Player player) {
     public static ParticleGroup getDefaultGroup() {
         return new ParticleGroup(DEFAULT_NAME, new ArrayList<ParticlePair>());
     }
-    
-    /**
-     * Loads the preset groups from the groups.yml file
-     */
-    public static void reload() {
-        presetGroups = new HashMap<ParticleGroup, Material>();
-        
-        File pluginDataFolder = PlayerParticles.getPlugin().getDataFolder();
-        File groupsFile = new File(pluginDataFolder.getAbsolutePath() + File.separator + "groups.yml");
-        
-        // Create the file if it doesn't exist
-        if (!groupsFile.exists()) {
-            try (InputStream inStream = PlayerParticles.getPlugin().getResource("groups.yml")) {
-                Files.copy(inStream, Paths.get(groupsFile.getAbsolutePath()));
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        
-        // Parse groups.yml file
-        YamlConfiguration groupsYaml = YamlConfiguration.loadConfiguration(groupsFile);
-        Set<String> groupNames = groupsYaml.getKeys(false);
-        for (String groupName : groupNames) {
-            try {
-                List<ParticlePair> particles = new ArrayList<ParticlePair>();
-                Material iconMaterial = null;
-                ConfigurationSection groupSection = groupsYaml.getConfigurationSection(groupName);
-                
-                Set<String> particleKeys = groupSection.getKeys(false);
-                for (String stringId : particleKeys) {
-                    if (stringId.equalsIgnoreCase("icon")) {
-                        iconMaterial = Material.valueOf(groupSection.getString("icon"));
-                        continue;
-                    }
-                    
-                    ConfigurationSection particleSection = groupSection.getConfigurationSection(stringId);
-                    
-                    int id = Integer.parseInt(stringId);
-                    ParticleEffect effect = ParticleEffect.fromName(particleSection.getString("effect"));
-                    ParticleStyle style = ParticleStyle.fromName(particleSection.getString("style"));
-                    
-                    if (effect == null) {
-                        PlayerParticles.getPlugin().getLogger().severe("Invalid effect name: '" + particleSection.getString("effect") + "'!");
-                        throw new Exception();
-                    }
-                    
-                    if (style == null) {
-                        PlayerParticles.getPlugin().getLogger().severe("Invalid style name: '" + particleSection.getString("style") + "'!");
-                        throw new Exception();
-                    }
-                    
-                    Material itemData = null;
-                    Material blockData = null;
-                    OrdinaryColor colorData = null;
-                    NoteColor noteColorData = null;
-                    
-                    String dataString = particleSection.getString("data");
-                    if (!dataString.isEmpty()) {
-                        String[] args = dataString.split(" ");
-                        
-                        if (effect.hasProperty(ParticleProperty.COLORABLE)) {
-                            if (effect == ParticleEffect.NOTE) {
-                                if (args[0].equalsIgnoreCase("rainbow")) {
-                                    noteColorData = new NoteColor(99);
-                                } else {
-                                    int note = -1;
-                                    try {
-                                        note = Integer.parseInt(args[0]);
-                                    } catch (Exception e) {
-                                        PlayerParticles.getPlugin().getLogger().severe("Invalid note: '" + args[0] + "'!");
-                                        throw new Exception();
-                                    }
-
-                                    if (note < 0 || note > 23) {
-                                        PlayerParticles.getPlugin().getLogger().severe("Invalid note: '" + args[0] + "'!");
-                                        throw new Exception();
-                                    }
-
-                                    noteColorData = new NoteColor(note);
-                                }
-                            } else {
-                                if (args[0].equalsIgnoreCase("rainbow")) {
-                                    colorData = new OrdinaryColor(999, 999, 999);
-                                } else {
-                                    int r = -1;
-                                    int g = -1;
-                                    int b = -1;
-
-                                    try {
-                                        r = Integer.parseInt(args[0]);
-                                        g = Integer.parseInt(args[1]);
-                                        b = Integer.parseInt(args[2]);
-                                    } catch (Exception e) {
-                                        PlayerParticles.getPlugin().getLogger().severe("Invalid color: '" + args[0] + " " + args[1] + " " + args[2] + "'!");
-                                        throw new Exception();
-                                    }
-
-                                    if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
-                                        PlayerParticles.getPlugin().getLogger().severe("Invalid color: '" + args[0] + " " + args[1] + " " + args[2] + "'!");
-                                        throw new Exception();
-                                    }
-
-                                    colorData = new OrdinaryColor(r, g, b);
-                                }
-                            }
-                        } else if (effect.hasProperty(ParticleProperty.REQUIRES_MATERIAL_DATA)) {
-                            if (effect == ParticleEffect.BLOCK || effect == ParticleEffect.FALLING_DUST) {
-                                try {
-                                    blockData = ParticleUtils.closestMatch(args[0]);
-                                    if (blockData == null || !blockData.isBlock()) throw new Exception();
-                                } catch (Exception e) {
-                                    PlayerParticles.getPlugin().getLogger().severe("Invalid block: '" + args[0] + "'!");
-                                    throw new Exception();
-                                }
-                            } else if (effect == ParticleEffect.ITEM) {
-                                try {
-                                    itemData = ParticleUtils.closestMatch(args[0]);
-                                    if (itemData == null || itemData.isBlock()) throw new Exception();
-                                } catch (Exception e) {
-                                    PlayerParticles.getPlugin().getLogger().severe("Invalid item: '" + args[0] + "'!");
-                                    throw new Exception();
-                                }
-                            }
-                        }
-                    }
-                    
-                    particles.add(new ParticlePair(null, id, effect, style, blockData, blockData, colorData, noteColorData));
-                }
-                
-                if (iconMaterial == null) {
-                    PlayerParticles.getPlugin().getLogger().severe("Missing icon for group '" + groupName + "'! Defaulting to ENDER_CHEST");
-                    iconMaterial = Material.ENDER_CHEST;
-                }
-                
-                presetGroups.put(new ParticleGroup(groupName, particles), iconMaterial);
-            } catch (Exception ex) {
-                PlayerParticles.getPlugin().getLogger().severe("An error occurred while parsing the groups.yml file!");
-            }
-        }
-    }
-    
-    /**
-     * Gets all the preset ParticleGroups ordered for display in the GUI
-     * 
-     * @param player The player
-     * @return a List of preset ParticleGroups the player can use
-     */
-    public static List<Entry<ParticleGroup, Material>> getPresetGroupsForGUIForPlayer(Player player) {
-        List<Entry<ParticleGroup, Material>> groups = new ArrayList<Entry<ParticleGroup, Material>>();
-        List<ParticleGroup> orderedGroups = new ArrayList<ParticleGroup>();
-        orderedGroups.addAll(presetGroups.keySet());
-        orderedGroups.sort(Comparator.comparing(ParticleGroup::getName));
-        
-        for (ParticleGroup group : orderedGroups) 
-            if (group.canPlayerUse(player))
-                groups.add(new AbstractMap.SimpleEntry<ParticleGroup, Material>(group, presetGroups.get(group)));
-        return groups;
-    }
-    
-    /**
-     * Gets all the preset ParticleGroups that a player can use
-     * 
-     * @param player The player
-     * @return a List of preset ParticleGroups the player can use
-     */
-    public static List<ParticleGroup> getPresetGroupsForPlayer(Player player) {
-        return presetGroups.keySet().stream().filter(x -> x.canPlayerUse(player)).collect(Collectors.toList());
-    }
-    
-    /**
-     * Gets a preset ParticleGroup by its name
-     * 
-     * @param groupName The ParticleGroup name
-     * @return The preset ParticleGroup if it exists, otherwise null 
-     */
-    public static ParticleGroup getPresetGroup(String groupName) {
-        for (ParticleGroup group : presetGroups.keySet())
-            if (group.getName().equalsIgnoreCase(groupName))
-                return group;
-        return null;
-    }
 
 }
diff --git a/src/com/esophose/playerparticles/particles/ParticleGroupPreset.java b/src/com/esophose/playerparticles/particles/ParticleGroupPreset.java
new file mode 100644
index 00000000..73e2524a
--- /dev/null
+++ b/src/com/esophose/playerparticles/particles/ParticleGroupPreset.java
@@ -0,0 +1,83 @@
+package com.esophose.playerparticles.particles;
+
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import com.esophose.playerparticles.manager.PermissionManager;
+
+public class ParticleGroupPreset {
+
+    private String displayName;
+    private Material guiIcon;
+    private String permission;
+    private boolean allowPermissionOverride;
+    private ParticleGroup group;
+    
+    public ParticleGroupPreset(String displayName, Material guiIcon, String permission, boolean allowPermissionOverride, ParticleGroup group) {
+        this.displayName = displayName;
+        this.guiIcon = guiIcon;
+        this.permission = permission;
+        this.allowPermissionOverride = allowPermissionOverride;
+        this.group = group;
+    }
+    
+    /**
+     * Gets the display name for this preset group for the GUI
+     * 
+     * @return The display name of the preset group
+     */
+    public String getDisplayName() {
+        return this.displayName;
+    }
+    
+    /**
+     * Gets the GUI icon for this particle group
+     * 
+     * @return The GUI icon for this particle group
+     */
+    public Material getGuiIcon() {
+        return this.guiIcon;
+    }
+    
+    /**
+     * Checks if a player has permission to use this particle group
+     * 
+     * @param player The player to check
+     * @return True if the player has permission
+     */
+    public boolean canPlayerUse(Player player) {
+        // If this particle group has a permission, does the player have it?
+        if (!this.permission.isEmpty())
+            if (!player.hasPermission(this.permission))
+                return false;
+        
+        // If allowPermissionOverride is true, always let the player apply this group
+        if (this.allowPermissionOverride) 
+            return true;
+        
+        // Make sure the player has permission for the number of particles in this group
+        if (PermissionManager.getMaxParticlesAllowed(player) < this.group.getParticles().size()) 
+            return false;
+        
+        // Make sure the player has permission for all effects/styles in the group
+        for (ParticlePair particle : this.group.getParticles()) {
+            if (!PermissionManager.hasEffectPermission(player, particle.getEffect())) 
+                return false;
+            
+            if (!PermissionManager.hasStylePermission(player, particle.getStyle())) 
+                return false;
+        }
+        
+        return true;
+    }
+    
+    /**
+     * Gets the underlying ParticleGroup
+     * 
+     * @return The underlying ParticleGroup
+     */
+    public ParticleGroup getGroup() {
+        return this.group;
+    }
+
+}
diff --git a/src/config.yml b/src/config.yml
index 5c14e4a8..da99bb56 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -20,8 +20,8 @@ version: 6.3
 check-updates: true
 
 # The .lang file to use in the ./lang/ folder
-# Default: 'default.lang'
-lang-file: 'default.lang'
+# Default: 'en_US.lang'
+lang-file: 'en_US.lang'
 
 # If you're using other plugins to execute commands you may wish to turn off messages
 # Default: true
diff --git a/src/groups.yml b/src/groups.yml
deleted file mode 100644
index 39402596..00000000
--- a/src/groups.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# ==================================================== #
-#                     PRESET GROUPS                    #
-# Information:                                         #
-# * The groups listed within this file will be         #
-#   available to all players who have access to the    #
-#   effect and style!                                  #
-# * The GUI is capable of displaying up to 28 groups.  #
-# * Feel free to create your own, they will be         #
-#   available for users to select within the GUI!      #
-# * This file is not automatically updated. If you     #
-#   want to reset the file to its defaults, simply     #
-#   delete it and run the command '/pp reload'.        #
-# ==================================================== #
-
-# Icons MUST use the names found at the link below:
-# https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html
-
-raincloud:
-    icon: 'ENDER_CHEST'
-    1:
-        effect: 'cloud'
-        style: 'overhead'
-        data: ''
-    2:
-        effect: 'rain'
-        style: 'overhead'
-        data: ''
-rainbows:
-    icon: 'ENDER_CHEST'
-    1:
-        effect: 'dust'
-        style: 'orbit'
-        data: 'rainbow'
-    2: 
-        effect: 'entity_effect'
-        style: 'feet'
-        data: 'rainbow'
-angel:
-    icon: 'ENDER_CHEST'
-    1:
-        effect: 'dust'
-        style: 'wings'
-        data: '255 255 255'
-    2:
-        effect: 'dust'
-        style: 'halo'
-        data: '255 255 0'
diff --git a/src/lang/default.lang b/src/lang/en_US.lang
similarity index 99%
rename from src/lang/default.lang
rename to src/lang/en_US.lang
index 861b787f..acdb554e 100644
--- a/src/lang/default.lang
+++ b/src/lang/en_US.lang
@@ -1,5 +1,5 @@
 # ================================================================ #
-#           default.lang (English) MESSAGE CONFIGURATION           #
+#                  en_US.lang MESSAGE CONFIGURATION                #
 # Important Notes:                                                 #
 # * You can use the & symbol to color the messages                 #
 # * {#} Will be replaced with whatever that message requires       #
@@ -241,6 +241,7 @@ gui-load-a-preset-group-description: 'Load a premade particle group'
 gui-save-group: 'Save New Group'
 gui-save-group-description: 'Click to save a new group. You will be prompted\nto enter the new group name in chat.'
 gui-save-group-full: 'You have reached the max number of groups'
+gui-save-group-no-particles: 'You do not have any particles applied'
 gui-save-group-hotbar-message: '&eType &b1 &eword in chat for the new group name. Type "&ccancel&e" to cancel. (&b{0}&es left)'
 gui-reset-particles: 'Reset Your Particles'
 gui-reset-particles-description: 'Deletes all your active particles'
diff --git a/src/lang/fr_FR.lang b/src/lang/fr_FR.lang
new file mode 100644
index 00000000..d76633de
--- /dev/null
+++ b/src/lang/fr_FR.lang
@@ -0,0 +1,281 @@
+# ================================================================ #
+#                  fr_FR.lang MESSAGE CONFIGURATION                #
+# Important Notes:                                                 #
+# * You can use the & symbol to color the messages                 #
+# * {#} Will be replaced with whatever that message requires       #
+# * \n Will split the lore line in the #GUI section                #
+# * Do NOT use the apostrophe character in any message! ( ' )      #
+# * PLEASE MAKE YOUR OWN .lang FILE IF YOU WANT CUSTOM MESSAGES!   #
+# * This file will be overridden almost every plugin update!       #
+# ================================================================ #
+
+# Command Errors
+command-error-no-effects: "&cVous n avez pas la permission d utiliser cette commande."
+command-error-unknown: "&cCommande inconnue, utilisez &b/pp help &cpour afficher la liste des commandes disponibles pour ce plugin."
+
+# Command Descriptions
+command-descriptions: "&eLes commandes suivantes sont disponibles :"
+command-descriptions-usage: "&e/pp {0} {1}"
+command-descriptions-help-1: "&7> &b/pp {0} &e- {1}"
+command-descriptions-help-2: "&7> &b/pp {0} {1} &e- {2}"
+command-descriptions-help-other: "&7> &b/ppo <player> <command> &e- Exécute une commande /pp en tant qu un autre joueur."
+command-description-add: "Ajoutez une nouvelle particule"
+command-description-data: "Voir les paramètres utilisées par la particule"
+command-description-default: "Commande principale. Par défaut elle ouvre l interface."
+command-description-edit: "Modifiez une particule"
+command-description-effects: "Affichez une liste des effets utilisés"
+command-description-fixed: "Gérez vos effets fixes"
+command-description-group: "Gérez vos groupes d effets"
+command-description-gui: "Affichez l interface pour modifier facilement les effets"
+command-description-help: "Affichez le menu d aide... Vous y êtes déjà !"
+command-description-info: "Voir la description d une de vos particules actives"
+command-description-list: "Listez les IDs de vos particules actives"
+command-description-reload: "Rechargez le fichier config.yml et de langue"
+command-description-remove: "Supprimez l une de vos particules actives"
+command-description-reset: "Supprimez toutes vos particules actives"
+command-description-styles: "Affichez une liste des styles de particules que vous utilisez"
+command-description-toggle: "Activez ou déativez vos particules actives"
+command-description-version: "Affichez la version du plugin et son créateur"
+command-description-worlds: "Voir les mondes où ce plugin n est pas autorisé"
+
+# Sub-Command Usage
+command-description-fixed-create: "&e/pp fixed create <<x> <y> <z>|<looking>> <effect> <style> [data] - Créez une particule fixe"
+command-description-fixed-edit: "&e/pp fixed edit <id> <effect|style|data> <args> - Modifiez une partie d une particule fixe par son ID"
+command-description-fixed-remove: "&e/pp fixed remove <ID> - Supprimez une particule fixe par son ID"
+command-description-fixed-list: "&e/pp fixed list - Affiche l ID de tous vos effets fixes"
+command-description-fixed-info: "&e/pp fixed info <ID> - Voir des informations sur l une de vos particules fixe"
+command-description-fixed-clear: "&e/pp fixed clear <radius> - Supprimez tous les effets fixe de tous les joueurs d un rayon"
+command-description-group-save: "&e/pp group save <name> - Sauvegardez toutes les particules actives dans un nouveau groupe"
+command-description-group-load: "&e/pp group load <name> - Chargez toutes les particules sauvegardées dans un groupe"
+command-description-group-remove: "&e/pp group remove <name> - Supprimez un groupe que vous avez créé"
+command-description-group-list: "&e/pp group list <name> - Voir toutes les particules sauvegardées d un groupe que vous avez créé"
+command-description-group-info: "&e/pp group info <name> - Voir toutes les particules sauvegardées du groupe"
+
+# Command ID Lookup
+id-invalid: "&cL ID rentrée n est pas valide, il doit être un nombre entier positif"
+id-unknown: "&cVous n avez pas de particules appliquées avec : &b{0} &c!"
+
+# Other Command
+other-no-permission: "&cVous n avez pas la permission pour exécuter une commande /pp en tant qu un autre joueur."
+other-missing-args: "&cVous oubliez des arguments dans votre commande. &b/ppo <player> <command>"
+other-unknown-player: "&cLe joueur &b{0} &cn a pas été trouvé. Il doit être en ligne."
+other-unknown-command: "&cLa commande &b/pp {0} &cn existe pas."
+other-success: "&Commande /pp exécutée. &b{0}&e. Retour de la commande :"
+
+# Add Command
+add-reached-max: "Impossible d appliquer la particule, vous avez atteint la limite de particules qui est de &b{0} &c!"
+add-particle-applied: "&aUne nouvelle particule est appliquée avec l effet &b{0}&a, le style &b{1}&a, et les paramètres &b{2} &a!"
+
+# Data Command
+data-no-args: "&cVous oubliez des arguments dans l effet. Utilisation de la commande: &b/pp data <effect>"
+
+# Edit Command
+edit-invalid-property: "cLa propriété &b{0} &cest interdite. Propriétés valides : &beffect&c, &bstyle&c, &bdata"
+edit-success-effect: "&aVotre particule avec l ID de &b{0} &aa son effet changé à &b{1} &a!"
+edit-success-style: "&aVotre particule avec l ID de &b{0} &aa son style changé à &b{1} &a!"
+edit-success-data: "&aVotre particule avec l ID de &b{0} &aa ses paramètres changés à &b{1} &a!"
+
+# Group Command
+group-invalid: "&cUn groupe ou un preset de groupe sauvegardé n existe pas avec le nom &b{0} &c!"
+group-preset-no-permission: "&cVous oubliez une permission pour un style ou un effet afin d utiliser les persets du groupe &b{0} &c!"
+group-reserved: "&cLe nom de groupe &bactive &cest réservé et ne peut pas être utiliser !"
+group-no-name: "&cVous n avez pas rentré de nom de groupe ! &b/pp {0} <groupName>"
+group-save-reached-max: "&cImpossible de sauvegarder le groupe, vous avez atteint le nombre maximun de groupes !"
+group-save-no-particles: "&cImpossible de sauvegarder le groupe, vous n avez pas appliqué de particules !"
+group-save-success: "&aVos particules actuelles on été sauvegardées sous le nom de groupe &b{0} &a!"
+group-save-success-overwrite: "&aLe groupe &b{0} &aa été mis à jour avec vos particules actuelle !"
+group-load-success: "&b{0} &aparticule(s) appliqués venant du groupe sauvegardé nommé &b{1} &a!"
+group-load-preset-success: "&b{0} &aparticule(s) appliqués venant du preset sauvegardé nommé &b{1} &a!"
+group-remove-preset: "&cVous ne pouvez pas supprimer un groupe de presets !"
+group-remove-success: "&aGroupe de particules &b{0} &asupprimé !"
+group-info-header: "&eLe groupe &b{0} &eposséde les particules suivantes :"
+group-list-none: "&eVous n avez pas de groupes de particules sauvegardés !"
+group-list-output: "&eVous avez ces groupes suivants sauvegardés : &b{0}"
+group-list-presets: "&eCes presets de groupes suivants sont disponibles : &b{0}"
+
+# Reload Command
+reload-success: "&aLe plugin a été rechargé..."
+reload-no-permission: "&cVous n avez pas la permission pour recharger la configuration de ce plugin !"
+
+# Remove Command
+remove-no-args: "&cVous n avez pas rentrer d ID à supprimer ! &b/pp remove <ID>"
+remove-success: "&aVotre particule avec l ID &b{0} &aa été supprimée !"
+
+# List Command
+list-none: "&eVous n avez pas de particules actives."
+list-you-have: "&eVous avez les particules suivantes appliquées :"
+list-output: "&eID: &b{0} &eEffet: &b{1} &eStyle: &b{2} &eParamètre: &b{3}"
+
+# Toggle Command
+toggle-on: "&eLes particules sont maintenant en mode &aON &e!"
+toggle-off: "&eLes particules sont maintenant en mode &cOFF &e!"
+
+# Rainbow
+rainbow: "&cr&6a&ei&an&bb&9o&dw"
+
+# Random
+random: "aléatoire"
+
+# Effects
+effect-no-permission: "&cVous n avez pas la permission pour utiliser la particule &b{0} &c!"
+effect-invalid: "&cL effet &b{0} &cn existe pas ! Utilisez &b/pp effects &cpour afficher les effets disponibles."
+effect-list: "&eVous pouvez utiliser les effets suivants : &b{0}"
+effect-list-empty: "&cVous n avez pas la permission pour utiliser des effets !"
+
+# Styles
+style-no-permission: "&cVous n avez pas la permission pour utiliser le style &b{0} &c!"
+style-event-spawning-info: "&eNote: Le style &b{0} &efait apparaitre des particules seulement lors d évènements spécifiques."
+style-invalid: "&cLe style &b{0} &cn existe pas ! Utilisez &b/pp styles &cpour afficher les styles disponibles."
+style-list: "&eVous pouvez utiliser les styles suivants : &b{0}"
+
+# Data
+data-usage-none: "&eL effet &b{0} &en est pas paramétrable."
+data-usage-block: "&eL effet &b{0} &erequière l ID du bloc ! &bFormat: <blockName>"
+data-usage-item: "&eL effet &b{0} &erequière l ID de l item ! &bFormat: <itemName>"
+data-usage-color: "&eL effet &b{0} &erequière l ID de la couleur ! &bFormat: <<0-255> <0-255> <0-255>>|<rainbow>|<random>"
+data-usage-note: "&eL effet&b{0} &erequière l ID de la note ! &bFormat: <0-24>|<rainbow>|<random>"
+data-invalid-block: "&cL ID du bloc que vous avez rentré n est pas valide ! &bFormat: <blockName>"
+data-invalid-item: "&cL ID de l item que vous avez rentré n est pas valide ! &bFormat: <itemName>"
+data-invalid-color: "&cL ID de la couleur que vous avez rentré n est pas valide ! &bFormat: <<0-255> <0-255> <0-255>>|<rainbow>|<random>"
+data-invalid-note: "&cL ID du bloc que vous avez rentré n est pas valide ! &bFormat: <0-24>|<rainbow>|<random>"
+data-invalid-material-not-item: "&cL ID &b{0} &cne correspond pas à un item !"
+data-invalid-material-not-block: "&cL ID &b{0} &cne correspond pas à un bloc !"
+data-invalid-material-item: "&cL ID &b{0} n existe pas !"
+data-invalid-material-block: "&cL ID&b{0} n existe pas !"
+
+# Worlds
+disabled-worlds: "&eLes particules sont désactivées dans ces mondes : &b{0}"
+disabled-worlds-none: "&Les particules sont désactivées dans aucuns mondes."
+
+# Reset
+reset-success: "&b{0} &aparticule(s) actives supprimées !"
+
+# Fixed Effects
+fixed-create-missing-args: "&cImpossible de créer un effet fixe, vous oubliez des arguments : &b{0}"
+fixed-create-invalid-coords: "&cImpossible de créer un effet fixe, coordonnées invalides !"
+fixed-create-out-of-range: "&cImpossible de créer un effet fixe, Vous devez être à &b{0} &cblocs de la position rentrée !"
+fixed-create-looking-too-far: "&cImpossible de créer un effet fixe, vous êtes trop loin du bloc que vous regardez !"
+fixed-create-effect-invalid: "&cImpossible de créer un effet fixe, l effet &b{0} &cn existe pas !"
+fixed-create-effect-no-permission: "&cImpossible de créer un effet fixe, vous n avez pas la permission pour utiliser le style &b{0} &c!"
+fixed-create-style-invalid: "&cImpossible de créer un effet fixe, le style &b{0} &cn existe pas!"
+fixed-create-style-no-permission: "&cImpossible de créer un effet fixe, vous n avez pas la permission pour utiliser le style &b{0} &c!"
+fixed-create-style-non-fixable: "&cImpossible de créer un effet fixe, le style &b{0} &cne peut pas être utilisé en tant qu effet fixe !"
+fixed-create-data-error: "&cImpossible de créer un effet fixe, l ID rentrée n est pas valide ! Utilisez &b/pp data <effect> &cpour afficher les IDs valides."
+fixed-create-success: "&aL effet fixe à été créer."
+
+fixed-edit-missing-args: "&cImpossible de modifier l effet fixe, vous oubliez des arguments !"
+fixed-edit-invalid-id: "&cImpossible de modifier l effet fixe, ID incorrecte !"
+fixed-edit-invalid-property: "&cImpossible de modifier l effet fixe, argument incorrecte ! Seuls localisation, effet, style, et paramètre sont valides."
+fixed-edit-invalid-coords: "&cImpossible de modifier l effet fixe, coordonnée incorrecte !"
+fixed-edit-out-of-range: "&cImpossible de modifier l effet fixe, vous devez être à &b{0} &cblocs de l emplacement désiré !"
+fixed-edit-looking-too-far: "&cImpossible de modifier l effet fixe, vous êtes trop loin du bloc que vous regardez !"
+fixed-edit-effect-invalid: "&cImpossible de modifier l effet fixe, l effet &b{0} &cn existe pas !"
+fixed-edit-effect-no-permission: "&cImpossible de modifier l effet fixe, vous n avez pas la permission pour utiliser l effet &b{0} &c!"
+fixed-edit-style-invalid: "&cImpossible de modifier l effet fixe, le style &b{0} &cn existe pas !"
+fixed-edit-style-no-permission: "&cImpossible de modifier l effet fixe, vous n avez pas la permission pour utiliser le style &b{0} &c!"
+fixed-edit-style-non-fixable: "&cImpossible de modifier l effet fixe, the style &b{0} &cne peut pas être utilisé dans des effets fixes !"
+fixed-edit-data-error: "&cImpossible de modifier l effet fixe, paramètre incorrecte ! Utilisez &b/pp data <effect> pour afficher les paramètres valides."
+fixed-edit-data-none: "&cImpossible de modifier l effet fixe, l effet ne requière pas de paramètres !"
+fixed-edit-success: "&aMise à jour de &b{0} &ade l effet fixe avec l ID &b{1} &a!"
+
+fixed-remove-invalid: "&cImpossible de supprimer l effet fixe, vous n avez pas d effets fixes avec l ID &b{0} &c!"
+fixed-remove-no-args: "&cVous n avez pas rentrer d ID à supprimer !"
+fixed-remove-args-invalid: "&cImpossible de supprimer, l ID doit être un nombre !"
+fixed-remove-success: "&aTous vos effets fixes avec l ID &b{0} &aont été supprimés !"
+
+fixed-list-none: "&eVous n avez pas d effets fixes !"
+fixed-list-success: "&eVous avez des effets fixes avec ces IDs :&b{0}"
+
+fixed-info-invalid: "&cImpossible de obtenir l information, vous n avez pas de particules fixes avec l ID &b{0}& c!"
+fixed-info-no-args: "&cVous n avez pas rentrée d ID pour obtenir d infomations !"
+fixed-info-invalid-args: "&cImpossible d obtenir l information, vous n avez pas de particules fixes avec l ID, l ID spécifiée doit être un nombre !"
+fixed-info-success: "&eID: &b{0} &eWorld: &b{1} &eX: &b{2} &eY: &b{3} &eZ: &b{4} &eEffect: &b{5} &eStyle: &b{6} &eData: &b{7}"
+
+fixed-clear-no-permission: "&cVous n avez la permission pour supprimer les effets proches !"
+fixed-clear-no-args: "&cVous n avez pas rentré de rayon !"
+fixed-clear-invalid-args: "&cLe rayon rentré n est pas valide, il doit être un nombre rond !"
+fixed-clear-success: "&b{0} &aeffets on été supprimés dans un rayon &b{1} &cblocs !"
+
+fixed-no-permission: "&cVous n avez pas la permission d ajouter des effets fixes !"
+fixed-max-reached: "&cVous avez atteint le nombre maximum de particules fixes !"
+fixed-invalid-command: "&cArguments invalides pour la commande &b/pp fixed&c!"
+
+# Update Available
+update-available: "&eLa version (&b{0}&e) est disponible ! vous utilisez la version &bv{1}&d. https://www.spigotmc.org/resources/playerparticles.40261/"
+
+# GUI
+gui-disabled: "&cL interface du plugin à été désactivée !"
+gui-color-icon-name: "&a"
+gui-color-info: "&e"
+gui-color-subtext: "&b"
+gui-color-unavailable: "&c"
+gui-commands-info: "Affichez des informations avec &b/pp help"
+gui-back-button: "Retour en arrière"
+gui-click-to-load: "Cliquez pour charger : {0}"
+gui-shift-click-to-delete: "Touche SHIFT + clic-gauche pour effacer un effet"
+gui-particle-info: "  - ID: &b{0} &eEffet: &b{1} &eStyle: &b{2} &eParamètre: &b{3}"
+gui-playerparticles: "PlayerParticles"
+gui-active-particles: "Particules actives: &b{0}"
+gui-saved-groups: "Groupes sauvegardés: &b{0}"
+gui-fixed-effects: "Effets fixes: &b{0}"
+gui-edit-primary-effect: "Editez l effet primaire"
+gui-edit-primary-effect-description: "Editez l effet d une de vos particules primaire"
+gui-edit-primary-style: "Editez le style primaire"
+gui-edit-primary-style-missing-effect: "Vous devez d abord sélectionner un effet !"
+gui-edit-primary-style-description: "Editez le style d une particule primaire"
+gui-edit-primary-data: "Editez les paramètres d une particules primaire"
+gui-edit-primary-data-missing-effect: "Vous devez d abord sélectionner un effet"
+gui-edit-primary-data-unavailable: "Votre effet primaire n est pas paramétrable"
+gui-edit-primary-data-description: "Editer les paramères de votre effet primaire"
+gui-manage-your-particles: "Gérez vos particules"
+gui-manage-your-particles-description: "Créez, éditez, et supprimez vos particules"
+gui-manage-your-groups: "Gérez vos groupes"
+gui-manage-your-groups-description: "Créez, éditez, et supprimez vos groupes particules"
+gui-load-a-preset-group: "Chargez un groupe de presets"
+gui-load-a-preset-group-description: "Chargez un groupe de particules déjà fait"
+gui-save-group: "Sauvegardez un nouveau groupe"
+gui-save-group-description: "Sauvegarder un nouveau groupe avec:"
+gui-save-group-description-2: "/pp group save <groupName>"
+gui-reset-particles: "Réinitialisez vos particules"
+gui-reset-particles-description: "Supprimez vos particules actives"
+gui-particle-name: "Particule #{0}"
+gui-click-to-edit-particle: "Cliquez pour éditer cette particule"
+gui-editing-particle: "Edition particule #{0}"
+gui-edit-effect: "Editez l effet"
+gui-edit-effect-description: "Cliquez pour éditer l effet de cette particule"
+gui-edit-style: "Editez le style"
+gui-edit-style-description: "Cliquez pour éditer le style de cette particule"
+gui-edit-data: "Editez les paramères"
+gui-edit-data-description: "Cliquez pour éditer les paramètres de la particule"
+gui-edit-data-unavailable: "Cliquez pour éditer les paramères de cette particule"
+gui-data-none: "aucuns"
+gui-create-particle: "Créez une nouvelle particule"
+gui-create-particle-description: "Créez une nouvelle particule"
+gui-create-particle-unavailable: "Vous avez atteint le nombre maximum de particules que vous pouvez créer"
+gui-select-effect: "Sélectionnez les effets"
+gui-select-effect-description: "Mettez les effets de la particules à &b{0}"
+gui-select-style: "Sélectionnez le style"
+gui-select-style-description: "Mets le style de la particule à &b{0}"
+gui-select-data: "Sélectionnez les paramètres"
+gui-select-data-description: "Mets les paramètres de la particule à &b{0}"
+gui-select-data-note: "note #{0}"
+gui-select-data-randomize-items: "Mélangez les items"
+gui-select-data-randomize-items-description: "Mélangez les items affichés"
+gui-select-data-randomize-blocks: "Mélangez les blocs"
+gui-select-data-randomize-blocks-description: "Mélangez les blocs affichés"
+gui-edit-data-color-red: "&crouge"
+gui-edit-data-color-orange: "&6orange"
+gui-edit-data-color-yellow: "&ejaune"
+gui-edit-data-color-lime-green: "&avert citron"
+gui-edit-data-color-green: "&2vert"
+gui-edit-data-color-blue: "&1bleu"
+gui-edit-data-color-cyan: "&3cyan"
+gui-edit-data-color-light-blue: "&bbleu clair"
+gui-edit-data-color-purple: "&5mauve"
+gui-edit-data-color-magenta: "&dmagenta"
+gui-edit-data-color-pink: "&drose"
+gui-edit-data-color-brown: "&6brun"
+gui-edit-data-color-black: "&8noir"
+gui-edit-data-color-gray: "&8gris"
+gui-edit-data-color-light-gray: "&7gris clair"
+gui-edit-data-color-white: "&fblanc"
diff --git a/src/preset_groups.yml b/src/preset_groups.yml
new file mode 100644
index 00000000..345c9cd6
--- /dev/null
+++ b/src/preset_groups.yml
@@ -0,0 +1,82 @@
+# ==================================================== #
+#                     PRESET GROUPS                    #
+# Information:                                         #
+# * The groups listed within this file will be         #
+#   available to all players who have access to the    #
+#   effect and style!                                  #
+# * The GUI is capable of displaying up to 28 groups.  #
+# * Feel free to create your own, they will be         #
+#   available for users to select within the GUI!      #
+# * This file is not automatically updated. If you     #
+#   want to reset the file to its defaults, simply     #
+#   delete it and run the command '/pp reload'.        #
+# ==================================================== #
+#
+# Use the following format for adding new groups:
+# group-name:
+#     display-name: 'My Amazing Group'
+#     gui-icon: 'ENDER_CHEST'
+#     permission: 'playerparticles.group.group-name'
+#     allow-permission-override: true
+#     1:
+#         effect: 'dust'
+#         style: 'wings'
+#         data: '255 255 255'
+#     2: 
+#         effect: 'cloud'
+#         style: 'overhead'
+#         data: ''
+#
+# What everything means:
+# group-name: The name of the group, how it will be applied by using /pp group load <group-name>.
+# display-name: The display name of the group, how it will show up in the GUI, this is required.
+# gui-icon: The icon to use for the GUI, this is required.
+# permission: The permission that the player must have to see this group, may be left blank as ''. The player must still have permission for all effects/styles within the group in order to use it.
+# allow-permission-override: Allow the player to see and apply the group even if they don't have access to all the effects/styles within it. This does nothing if the permission is set to ''. 
+# 1 (or any positive whole number n): The particle ID. You may have as many of these as you want, they must contain an effect, style, and data property below them. 
+# effect: The effect that the particle will have.
+# style: The style that the particle will have.
+# data: The data that the particle will have.
+#
+# GUI Icons MUST use the names found at the link below:
+# https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html
+
+raincloud:
+    display-name: 'Raincloud'
+    gui-icon: 'ENDER_CHEST'
+    permission: ''
+    allow-permission-override: false
+    1:
+        effect: 'cloud'
+        style: 'overhead'
+        data: ''
+    2:
+        effect: 'rain'
+        style: 'overhead'
+        data: ''
+rainbows:
+    display-name: 'Rainbows'
+    gui-icon: 'ENDER_CHEST'
+    permission: ''
+    allow-permission-override: false
+    1:
+        effect: 'dust'
+        style: 'orbit'
+        data: 'rainbow'
+    2: 
+        effect: 'entity_effect'
+        style: 'feet'
+        data: 'rainbow'
+angel:
+    display-name: 'Angel'
+    gui-icon: 'ENDER_CHEST'
+    permission: ''
+    allow-permission-override: false
+    1:
+        effect: 'dust'
+        style: 'wings'
+        data: '255 255 255'
+    2:
+        effect: 'dust'
+        style: 'halo'
+        data: '255 255 0'

From c0f15ac8644d904b6ce550d33a0ce410c43db3d2 Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Fri, 1 Feb 2019 02:56:21 -0700
Subject: [PATCH 10/11] Add metrics, other minor changes

---
 changelog.txt                                 |   3 +
 pom.xml                                       |   4 +
 .../playerparticles/PlayerParticles.java      |  13 +-
 .../command/FixedCommandModule.java           |   4 +-
 .../command/ReloadCommandModule.java          |   3 +-
 .../manager/PermissionManager.java            |  16 +-
 .../manager/SettingManager.java               |   1 +
 .../particles/PPlayerMovementListener.java    |   2 +-
 .../playerparticles/util/Metrics.java         | 708 ++++++++++++++++++
 src/config.yml                                |   5 +
 10 files changed, 751 insertions(+), 8 deletions(-)
 create mode 100644 src/com/esophose/playerparticles/util/Metrics.java

diff --git a/changelog.txt b/changelog.txt
index 4a6d3eb6..ba3cf7c4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -7,6 +7,9 @@
 + Added a click sound to the GUI for button clicks (Can be disabled in the config.yml)
 + Added setting 'toggle-on-move-delay' to the config.yml
 + Added new lang file fr_FR.lang (French)
++ Added extra customization to the preset groups
++ Added bStats metrics (Can be disabled in the config.yml by setting send-metrics to false)
+* The preset groups file was renamed from groups.yml to preset_groups.yml, you'll need to update the new file
 * Renamed default.lang to en_US.lang
 * Reduced the number of particles that spawn for the styles 'blockbreak', 'blockplace', and 'swords'
 * Fix GUI borders showing up as glass panes instead of stained glass panes on servers running 1.12.2 or earlier
diff --git a/pom.xml b/pom.xml
index 06f7b70c..6ebe1d39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,10 @@
       <id>spigot-repo</id>
       <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
     </repository>
+    <repository>
+      <id>CodeMC</id>
+      <url>https://repo.codemc.org/repository/maven-public</url>
+    </repository>
   </repositories>
   <dependencies>
     <dependency>
diff --git a/src/com/esophose/playerparticles/PlayerParticles.java b/src/com/esophose/playerparticles/PlayerParticles.java
index 8c92c9ae..e7573c47 100644
--- a/src/com/esophose/playerparticles/PlayerParticles.java
+++ b/src/com/esophose/playerparticles/PlayerParticles.java
@@ -1,7 +1,9 @@
 /*
  * TODO: v6.4+
  * + Add new style(s) 'wings_<type>', multiple new wing types: fairy, demon
- * + Add ability to create/manage fixed effects from the GUI (may get implemented later)
+ * + Add ability to create/manage fixed effects from the GUI
+ * * Convert fixed effect ids into names
+ * + Add command '/pp fixed teleport <id>' that requires the permission playerparticles.fixed.teleport
  * + Add named colors to the color data
  * + Add effect/style name customization through config files
  * + Add effect/style settings folder that lets you disable effects/style and edit style properties
@@ -34,6 +36,7 @@
 import com.esophose.playerparticles.styles.DefaultStyles;
 import com.esophose.playerparticles.updater.PluginUpdateListener;
 import com.esophose.playerparticles.updater.Updater;
+import com.esophose.playerparticles.util.Metrics;
 
 public class PlayerParticles extends JavaPlugin {
 
@@ -46,7 +49,7 @@ public class PlayerParticles extends JavaPlugin {
      * The version a new update has, will be null if the config has it disabled
      * or if there is no new version
      */
-    public String updateVersion = null;
+    private String updateVersion = null;
 
     /**
      * The database connection manager
@@ -65,7 +68,7 @@ public void onEnable() {
         pluginInstance = (PlayerParticles)Bukkit.getServer().getPluginManager().getPlugin("PlayerParticles");
         
         this.registerCommands();
-        
+
         PluginManager pm = Bukkit.getPluginManager();
         pm.registerEvents(new ParticleManager(), this);
         pm.registerEvents(new PluginUpdateListener(), this);
@@ -108,6 +111,10 @@ public void run() {
             }.runTaskAsynchronously(this);
         }
         
+        if (PSetting.SEND_METRICS.getBoolean()) {
+            new Metrics(this);
+        }
+        
         this.reload(updatePluginSettings);
     }
 
diff --git a/src/com/esophose/playerparticles/command/FixedCommandModule.java b/src/com/esophose/playerparticles/command/FixedCommandModule.java
index 274f7284..c432a1b2 100644
--- a/src/com/esophose/playerparticles/command/FixedCommandModule.java
+++ b/src/com/esophose/playerparticles/command/FixedCommandModule.java
@@ -661,7 +661,7 @@ public List<String> onTabComplete(PPlayer pplayer, String[] args) {
                 if (args.length == 5) {
                     StringUtil.copyPartialMatches(args[4], PermissionManager.getEffectNamesUserHasPermissionFor(p), matches);
                 } else if (args.length == 6) {
-                    StringUtil.copyPartialMatches(args[5], PermissionManager.getStyleNamesUserHasPermissionFor(p), matches);
+                    StringUtil.copyPartialMatches(args[5], PermissionManager.getFixableStyleNamesUserHasPermissionFor(p), matches);
                 } else if (args.length >= 7) {
                     ParticleEffect effect = ParticleEffect.fromName(args[4]);
                     if (effect != null) {
@@ -721,7 +721,7 @@ public List<String> onTabComplete(PPlayer pplayer, String[] args) {
                     } else if (property.equals("effect") && args.length == 4) {
                         StringUtil.copyPartialMatches(args[3], PermissionManager.getEffectNamesUserHasPermissionFor(p), matches);
                     } else if (property.equals("style") && args.length == 4) {
-                        StringUtil.copyPartialMatches(args[3], PermissionManager.getStyleNamesUserHasPermissionFor(p), matches);
+                        StringUtil.copyPartialMatches(args[3], PermissionManager.getFixableStyleNamesUserHasPermissionFor(p), matches);
                     } else if (property.equals("data")) {
                         int id = -1;
                         try {
diff --git a/src/com/esophose/playerparticles/command/ReloadCommandModule.java b/src/com/esophose/playerparticles/command/ReloadCommandModule.java
index fad2afa7..51e70804 100644
--- a/src/com/esophose/playerparticles/command/ReloadCommandModule.java
+++ b/src/com/esophose/playerparticles/command/ReloadCommandModule.java
@@ -13,8 +13,9 @@ public class ReloadCommandModule implements CommandModule {
 
     public void onCommandExecute(PPlayer pplayer, String[] args) {
         if (PermissionManager.canReloadPlugin(pplayer.getPlayer())) {
-            ((PlayerParticles)PlayerParticles.getPlugin()).reload(false);
+            PlayerParticles.getPlugin().reload(false);
             LangManager.sendMessage(pplayer, Lang.RELOAD_SUCCESS);
+            PlayerParticles.getPlugin().getLogger().info("Reloaded configuration.");
         } else {
             LangManager.sendMessage(pplayer, Lang.RELOAD_NO_PERMISSION);
         }
diff --git a/src/com/esophose/playerparticles/manager/PermissionManager.java b/src/com/esophose/playerparticles/manager/PermissionManager.java
index aaafe8ef..746d3df6 100644
--- a/src/com/esophose/playerparticles/manager/PermissionManager.java
+++ b/src/com/esophose/playerparticles/manager/PermissionManager.java
@@ -206,7 +206,7 @@ public static List<String> getEffectNamesUserHasPermissionFor(Player p) {
                 list.add(pe.getName());
         return list;
     }
-
+    
     /**
      * Gets a String List of all style names a player has permission for
      * 
@@ -220,6 +220,20 @@ public static List<String> getStyleNamesUserHasPermissionFor(Player p) {
                 list.add(ps.getName());
         return list;
     }
+
+    /**
+     * Gets a String List of all fixable style names a player has permission for
+     * 
+     * @param p The player to get style names for
+     * @return A String List of all fixable style names the given player has permission for
+     */
+    public static List<String> getFixableStyleNamesUserHasPermissionFor(Player p) {
+        List<String> list = new ArrayList<String>();
+        for (ParticleStyle ps : ParticleStyleManager.getStyles())
+            if (ps.canBeFixed() && hasStylePermission(p, ps)) 
+                list.add(ps.getName());
+        return list;
+    }
     
     /**
      * Gets a List of all effects a player has permission for
diff --git a/src/com/esophose/playerparticles/manager/SettingManager.java b/src/com/esophose/playerparticles/manager/SettingManager.java
index 47d61dad..064e1f16 100644
--- a/src/com/esophose/playerparticles/manager/SettingManager.java
+++ b/src/com/esophose/playerparticles/manager/SettingManager.java
@@ -31,6 +31,7 @@ public enum PSetting {
         VERSION(PSettingType.DOUBLE),
         TICKS_PER_PARTICLE(PSettingType.LONG),
         CHECK_UPDATES(PSettingType.BOOLEAN),
+        SEND_METRICS(PSettingType.BOOLEAN),
         GUI_ENABLED(PSettingType.BOOLEAN),
         GUI_BUTTON_SOUND(PSettingType.BOOLEAN),
         
diff --git a/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java b/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java
index f0865966..50971eb7 100644
--- a/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java
+++ b/src/com/esophose/playerparticles/particles/PPlayerMovementListener.java
@@ -18,8 +18,8 @@
 
 public class PPlayerMovementListener implements Listener {
     
-    private static Map<UUID, Integer> timeSinceLastMovement = new HashMap<UUID, Integer>();
     private static final int CHECK_INTERVAL = 3;
+    private Map<UUID, Integer> timeSinceLastMovement = new HashMap<UUID, Integer>();
     
     public PPlayerMovementListener() {
         new BukkitRunnable() {
diff --git a/src/com/esophose/playerparticles/util/Metrics.java b/src/com/esophose/playerparticles/util/Metrics.java
new file mode 100644
index 00000000..498567ac
--- /dev/null
+++ b/src/com/esophose/playerparticles/util/Metrics.java
@@ -0,0 +1,708 @@
+package com.esophose.playerparticles.util;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.logging.Level;
+import java.util.zip.GZIPOutputStream;
+
+import javax.net.ssl.HttpsURLConnection;
+
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.ServicePriority;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+/**
+ * bStats collects some data for plugin authors.
+ * <p>
+ * Check out https://bStats.org/ to learn more about bStats!
+ */
+@SuppressWarnings("unchecked")
+public class Metrics {
+
+    static {
+        // You can use the property to disable the check in your test environment
+        if (System.getProperty("bstats.relocatecheck") == null || !System.getProperty("bstats.relocatecheck").equals("false")) {
+            // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
+            final String defaultPackage = new String(
+                    new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'k', 'k', 'i', 't'});
+            final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
+            // We want to make sure nobody just copy & pastes the example and use the wrong package names
+            if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) {
+                throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
+            }
+        }
+    }
+
+    // The version of this bStats class
+    public static final int B_STATS_VERSION = 1;
+
+    // The url to which the data is sent
+    private static final String URL = "https://bStats.org/submitData/bukkit";
+
+    // Is bStats enabled on this server?
+    private boolean enabled;
+
+    // Should failed requests be logged?
+    private static boolean logFailedRequests;
+
+    // Should the sent data be logged?
+    private static boolean logSentData;
+
+    // Should the response text be logged?
+    private static boolean logResponseStatusText;
+
+    // The uuid of the server
+    private static String serverUUID;
+
+    // The plugin
+    private final Plugin plugin;
+
+    // A list with all custom charts
+    private final List<CustomChart> charts = new ArrayList<>();
+
+    /**
+     * Class constructor.
+     *
+     * @param plugin The plugin which stats should be submitted.
+     */
+    public Metrics(Plugin plugin) {
+        if (plugin == null) {
+            throw new IllegalArgumentException("Plugin cannot be null!");
+        }
+        this.plugin = plugin;
+
+        // Get the config file
+        File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
+        File configFile = new File(bStatsFolder, "config.yml");
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+
+        // Check if the config file exists
+        if (!config.isSet("serverUuid")) {
+
+            // Add default values
+            config.addDefault("enabled", true);
+            // Every server gets it's unique random id.
+            config.addDefault("serverUuid", UUID.randomUUID().toString());
+            // Should failed request be logged?
+            config.addDefault("logFailedRequests", false);
+            // Should the sent data be logged?
+            config.addDefault("logSentData", false);
+            // Should the response text be logged?
+            config.addDefault("logResponseStatusText", false);
+
+            // Inform the server owners about bStats
+            config.options().header(
+                    "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
+                            "To honor their work, you should not disable it.\n" +
+                            "This has nearly no effect on the server performance!\n" +
+                            "Check out https://bStats.org/ to learn more :)"
+            ).copyDefaults(true);
+            try {
+                config.save(configFile);
+            } catch (IOException ignored) { }
+        }
+
+        // Load the data
+        enabled = config.getBoolean("enabled", true);
+        serverUUID = config.getString("serverUuid");
+        logFailedRequests = config.getBoolean("logFailedRequests", false);
+        logSentData = config.getBoolean("logSentData", false);
+        logResponseStatusText = config.getBoolean("logResponseStatusText", false);
+
+        if (enabled) {
+            boolean found = false;
+            // Search for all other bStats Metrics classes to see if we are the first one
+            for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
+                try {
+                    service.getField("B_STATS_VERSION"); // Our identifier :)
+                    found = true; // We aren't the first
+                    break;
+                } catch (NoSuchFieldException ignored) { }
+            }
+            // Register our service
+            Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal);
+            if (!found) {
+                // We are the first!
+                startSubmitting();
+            }
+        }
+    }
+
+    /**
+     * Checks if bStats is enabled.
+     *
+     * @return Whether bStats is enabled or not.
+     */
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Adds a custom chart.
+     *
+     * @param chart The chart to add.
+     */
+    public void addCustomChart(CustomChart chart) {
+        if (chart == null) {
+            throw new IllegalArgumentException("Chart cannot be null!");
+        }
+        charts.add(chart);
+    }
+
+    /**
+     * Starts the Scheduler which submits our data every 30 minutes.
+     */
+    private void startSubmitting() {
+        final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
+        timer.scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                if (!plugin.isEnabled()) { // Plugin was disabled
+                    timer.cancel();
+                    return;
+                }
+                // Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
+                // Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
+                Bukkit.getScheduler().runTask(plugin, () -> submitData());
+            }
+        }, 1000 * 60 * 5, 1000 * 60 * 30);
+        // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
+        // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
+        // WARNING: Just don't do it!
+    }
+
+    /**
+     * Gets the plugin specific data.
+     * This method is called using Reflection.
+     *
+     * @return The plugin specific data.
+     */
+    public JSONObject getPluginData() {
+        JSONObject data = new JSONObject();
+
+        String pluginName = plugin.getDescription().getName();
+        String pluginVersion = plugin.getDescription().getVersion();
+
+        data.put("pluginName", pluginName); // Append the name of the plugin
+        data.put("pluginVersion", pluginVersion); // Append the version of the plugin
+        JSONArray customCharts = new JSONArray();
+        for (CustomChart customChart : charts) {
+            // Add the data of the custom charts
+            JSONObject chart = customChart.getRequestJsonObject();
+            if (chart == null) { // If the chart is null, we skip it
+                continue;
+            }
+            customCharts.add(chart);
+        }
+        data.put("customCharts", customCharts);
+
+        return data;
+    }
+
+    /**
+     * Gets the server specific data.
+     *
+     * @return The server specific data.
+     */
+    private JSONObject getServerData() {
+        // Minecraft specific data
+        int playerAmount;
+        try {
+            // Around MC 1.8 the return type was changed to a collection from an array,
+            // This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
+            Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
+            playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class)
+                    ? ((Collection<?>) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
+                    : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
+        } catch (Exception e) {
+            playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
+        }
+        int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
+        String bukkitVersion = Bukkit.getVersion();
+
+        // OS/Java specific data
+        String javaVersion = System.getProperty("java.version");
+        String osName = System.getProperty("os.name");
+        String osArch = System.getProperty("os.arch");
+        String osVersion = System.getProperty("os.version");
+        int coreCount = Runtime.getRuntime().availableProcessors();
+
+        JSONObject data = new JSONObject();
+
+        data.put("serverUUID", serverUUID);
+
+        data.put("playerAmount", playerAmount);
+        data.put("onlineMode", onlineMode);
+        data.put("bukkitVersion", bukkitVersion);
+
+        data.put("javaVersion", javaVersion);
+        data.put("osName", osName);
+        data.put("osArch", osArch);
+        data.put("osVersion", osVersion);
+        data.put("coreCount", coreCount);
+
+        return data;
+    }
+
+    /**
+     * Collects the data and sends it afterwards.
+     */
+    private void submitData() {
+        final JSONObject data = getServerData();
+
+        JSONArray pluginData = new JSONArray();
+        // Search for all other bStats Metrics classes to get their plugin data
+        for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
+            try {
+                service.getField("B_STATS_VERSION"); // Our identifier :)
+
+                for (RegisteredServiceProvider<?> provider : Bukkit.getServicesManager().getRegistrations(service)) {
+                    try {
+                        pluginData.add(provider.getService().getMethod("getPluginData").invoke(provider.getProvider()));
+                    } catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
+                }
+            } catch (NoSuchFieldException ignored) { }
+        }
+
+        data.put("plugins", pluginData);
+
+        // Create a new thread for the connection to the bStats server
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    // Send the data
+                    sendData(plugin, data);
+                } catch (Exception e) {
+                    // Something went wrong! :(
+                    if (logFailedRequests) {
+                        plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
+                    }
+                }
+            }
+        }).start();
+    }
+
+    /**
+     * Sends the data to the bStats server.
+     *
+     * @param plugin Any plugin. It's just used to get a logger instance.
+     * @param data The data to send.
+     * @throws Exception If the request failed.
+     */
+    private static void sendData(Plugin plugin, JSONObject data) throws Exception {
+        if (data == null) {
+            throw new IllegalArgumentException("Data cannot be null!");
+        }
+        if (Bukkit.isPrimaryThread()) {
+            throw new IllegalAccessException("This method must not be called from the main thread!");
+        }
+        if (logSentData) {
+            plugin.getLogger().info("Sending data to bStats: " + data.toString());
+        }
+        HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
+
+        // Compress the data to save bandwidth
+        byte[] compressedData = compress(data.toString());
+
+        // Add headers
+        connection.setRequestMethod("POST");
+        connection.addRequestProperty("Accept", "application/json");
+        connection.addRequestProperty("Connection", "close");
+        connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
+        connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
+        connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
+        connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
+
+        // Send data
+        connection.setDoOutput(true);
+        DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
+        outputStream.write(compressedData);
+        outputStream.flush();
+        outputStream.close();
+
+        InputStream inputStream = connection.getInputStream();
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+
+        StringBuilder builder = new StringBuilder();
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            builder.append(line);
+        }
+        bufferedReader.close();
+        if (logResponseStatusText) {
+            plugin.getLogger().info("Sent data to bStats and received response: " + builder.toString());
+        }
+    }
+
+    /**
+     * Gzips the given String.
+     *
+     * @param str The string to gzip.
+     * @return The gzipped String.
+     * @throws IOException If the compression failed.
+     */
+    private static byte[] compress(final String str) throws IOException {
+        if (str == null) {
+            return null;
+        }
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
+        gzip.write(str.getBytes(StandardCharsets.UTF_8));
+        gzip.close();
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * Represents a custom chart.
+     */
+    public static abstract class CustomChart {
+
+        // The id of the chart
+        final String chartId;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         */
+        CustomChart(String chartId) {
+            if (chartId == null || chartId.isEmpty()) {
+                throw new IllegalArgumentException("ChartId cannot be null or empty!");
+            }
+            this.chartId = chartId;
+        }
+
+        private JSONObject getRequestJsonObject() {
+            JSONObject chart = new JSONObject();
+            chart.put("chartId", chartId);
+            try {
+                JSONObject data = getChartData();
+                if (data == null) {
+                    // If the data is null we don't send the chart.
+                    return null;
+                }
+                chart.put("data", data);
+            } catch (Throwable t) {
+                if (logFailedRequests) {
+                    Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
+                }
+                return null;
+            }
+            return chart;
+        }
+
+        protected abstract JSONObject getChartData() throws Exception;
+
+    }
+
+    /**
+     * Represents a custom simple pie.
+     */
+    public static class SimplePie extends CustomChart {
+
+        private final Callable<String> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public SimplePie(String chartId, Callable<String> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            String value = callable.call();
+            if (value == null || value.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("value", value);
+            return data;
+        }
+    }
+
+    /**
+     * Represents a custom advanced pie.
+     */
+    public static class AdvancedPie extends CustomChart {
+
+        private final Callable<Map<String, Integer>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            JSONObject values = new JSONObject();
+            Map<String, Integer> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean allSkipped = true;
+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                if (entry.getValue() == 0) {
+                    continue; // Skip this invalid
+                }
+                allSkipped = false;
+                values.put(entry.getKey(), entry.getValue());
+            }
+            if (allSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("values", values);
+            return data;
+        }
+    }
+
+    /**
+     * Represents a custom drilldown pie.
+     */
+    public static class DrilldownPie extends CustomChart {
+
+        private final Callable<Map<String, Map<String, Integer>>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        public JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            JSONObject values = new JSONObject();
+            Map<String, Map<String, Integer>> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean reallyAllSkipped = true;
+            for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
+                JSONObject value = new JSONObject();
+                boolean allSkipped = true;
+                for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
+                    value.put(valueEntry.getKey(), valueEntry.getValue());
+                    allSkipped = false;
+                }
+                if (!allSkipped) {
+                    reallyAllSkipped = false;
+                    values.put(entryValues.getKey(), value);
+                }
+            }
+            if (reallyAllSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("values", values);
+            return data;
+        }
+    }
+
+    /**
+     * Represents a custom single line chart.
+     */
+    public static class SingleLineChart extends CustomChart {
+
+        private final Callable<Integer> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public SingleLineChart(String chartId, Callable<Integer> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            int value = callable.call();
+            if (value == 0) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("value", value);
+            return data;
+        }
+
+    }
+
+    /**
+     * Represents a custom multi line chart.
+     */
+    public static class MultiLineChart extends CustomChart {
+
+        private final Callable<Map<String, Integer>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            JSONObject values = new JSONObject();
+            Map<String, Integer> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean allSkipped = true;
+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                if (entry.getValue() == 0) {
+                    continue; // Skip this invalid
+                }
+                allSkipped = false;
+                values.put(entry.getKey(), entry.getValue());
+            }
+            if (allSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("values", values);
+            return data;
+        }
+
+    }
+
+    /**
+     * Represents a custom simple bar chart.
+     */
+    public static class SimpleBarChart extends CustomChart {
+
+        private final Callable<Map<String, Integer>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            JSONObject values = new JSONObject();
+            Map<String, Integer> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                JSONArray categoryValues = new JSONArray();
+                categoryValues.add(entry.getValue());
+                values.put(entry.getKey(), categoryValues);
+            }
+            data.put("values", values);
+            return data;
+        }
+
+    }
+
+    /**
+     * Represents a custom advanced bar chart.
+     */
+    public static class AdvancedBarChart extends CustomChart {
+
+        private final Callable<Map<String, int[]>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            JSONObject values = new JSONObject();
+            Map<String, int[]> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean allSkipped = true;
+            for (Map.Entry<String, int[]> entry : map.entrySet()) {
+                if (entry.getValue().length == 0) {
+                    continue; // Skip this invalid
+                }
+                allSkipped = false;
+                JSONArray categoryValues = new JSONArray();
+                for (int categoryValue : entry.getValue()) {
+                    categoryValues.add(categoryValue);
+                }
+                values.put(entry.getKey(), categoryValues);
+            }
+            if (allSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("values", values);
+            return data;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/config.yml b/src/config.yml
index da99bb56..af379800 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -19,6 +19,11 @@ version: 6.3
 # Default: true
 check-updates: true
 
+# If metrics should be sent to bStats
+# I would appreciate it if you left this enabled, it helps me get statistics on who uses this plugin
+# Default: true
+send-metrics: true
+
 # The .lang file to use in the ./lang/ folder
 # Default: 'en_US.lang'
 lang-file: 'en_US.lang'

From 429701c5e78e289feea7eac9d261bfad972bcbb0 Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Sat, 2 Feb 2019 20:03:51 -0700
Subject: [PATCH 11/11] Update language files

---
 .../command/EditCommandModule.java            |   2 +-
 .../command/RemoveCommandModule.java          |   2 +-
 src/lang/en_US.lang                           | 454 +++++++++---------
 src/lang/fr_FR.lang                           |  17 +-
 4 files changed, 241 insertions(+), 234 deletions(-)

diff --git a/src/com/esophose/playerparticles/command/EditCommandModule.java b/src/com/esophose/playerparticles/command/EditCommandModule.java
index e3737b76..19f9cea2 100644
--- a/src/com/esophose/playerparticles/command/EditCommandModule.java
+++ b/src/com/esophose/playerparticles/command/EditCommandModule.java
@@ -311,7 +311,7 @@ public Lang getDescription() {
     }
 
     public String getArguments() {
-        return "<id> <effect>|<style>|<data> <args>";
+        return "<ID> <effect>|<style>|<data> <args>";
     }
 
     public boolean requiresEffects() {
diff --git a/src/com/esophose/playerparticles/command/RemoveCommandModule.java b/src/com/esophose/playerparticles/command/RemoveCommandModule.java
index a5dc44a6..c7aced13 100644
--- a/src/com/esophose/playerparticles/command/RemoveCommandModule.java
+++ b/src/com/esophose/playerparticles/command/RemoveCommandModule.java
@@ -123,7 +123,7 @@ public Lang getDescription() {
     }
 
     public String getArguments() {
-        return "<id>";
+        return "<ID>|<effect>|<style>";
     }
 
     public boolean requiresEffects() {
diff --git a/src/lang/en_US.lang b/src/lang/en_US.lang
index acdb554e..4f03a744 100644
--- a/src/lang/en_US.lang
+++ b/src/lang/en_US.lang
@@ -4,285 +4,285 @@
 # * You can use the & symbol to color the messages                 #
 # * {#} Will be replaced with whatever that message requires       #
 # * \n Will split the lore line in the #GUI section                #
-# * Do NOT use the apostrophe character in any message! ( ' )      #
+# * Do NOT use a quotation mark character in any message! ( " )    #
 # * PLEASE MAKE YOUR OWN .lang FILE IF YOU WANT CUSTOM MESSAGES!   #
 # * This file will be overridden almost every plugin update!       #
 # ================================================================ #
 
 # Command Errors
-command-error-no-effects: '&cYou must have access to effects to use this command!'
-command-error-unknown: '&cUnknown command, use &b/pp help &cfor a list of commands.'
+command-error-no-effects: "&cYou must have access to effects to use this command!"
+command-error-unknown: "&cUnknown command, use &b/pp help &cfor a list of commands."
 
 # Command Descriptions
-command-descriptions: '&eThe following commands are available:'
-command-descriptions-usage: '&e/pp {0} {1}'
-command-descriptions-help-1: '&7> &b/pp {0} &e- {1}'
-command-descriptions-help-2: '&7> &b/pp {0} {1} &e- {2}'
-command-descriptions-help-other: '&7> &b/ppo <player> <command> &e- Run a /pp command as a player'
-command-description-add: 'Add a new particle'
-command-description-data: 'Check what type of data an effect uses'
-command-description-default: 'The main command. By default, opens the GUI'
-command-description-edit: 'Edit a particle'
-command-description-effects: 'Display a list of effects you can use'
-command-description-fixed: 'Manage your fixed effects'
-command-description-group: 'Manage your groups'
-command-description-gui: 'Display the GUI for easy editing of particles'
-command-description-help: 'Displays the help menu... You have arrived'
-command-description-info: 'Gets the description of one of your active particles'
-command-description-list: 'Lists the IDs of your active particles'
-command-description-reload: 'Reloads the config.yml and lang file'
-command-description-remove: 'Removes some of your active particles'
-command-description-reset: 'Removes all your active particles'
-command-description-styles: 'Display a list of styles you can use'
-command-description-toggle: 'Toggles particle visibility on/off'
-command-description-version: 'Display the plugin version and author'
-command-description-worlds: 'Find out what worlds particles are disabled in'
+command-descriptions: "&eThe following commands are available:"
+command-descriptions-usage: "&e/pp {0} {1}"
+command-descriptions-help-1: "&7> &b/pp {0} &e- {1}"
+command-descriptions-help-2: "&7> &b/pp {0} {1} &e- {2}"
+command-descriptions-help-other: "&7> &b/ppo <player> <command> &e- Run a /pp command as a player"
+command-description-add: "Add a new particle"
+command-description-data: "Check what type of data an effect uses"
+command-description-default: "The main command. By default, opens the GUI"
+command-description-edit: "Edit a particle"
+command-description-effects: "Display a list of effects you can use"
+command-description-fixed: "Manage your fixed effects"
+command-description-group: "Manage your groups"
+command-description-gui: "Display the GUI for easy editing of particles"
+command-description-help: "Displays the help menu... You have arrived"
+command-description-info: "Gets the description of one of your active particles"
+command-description-list: "Lists the IDs of your active particles"
+command-description-reload: "Reloads the config.yml and lang file"
+command-description-remove: "Removes some particles"
+command-description-reset: "Removes all your active particles"
+command-description-styles: "Display a list of styles you can use"
+command-description-toggle: "Toggles particle visibility on/off"
+command-description-version: "Display the plugin version and author"
+command-description-worlds: "Find out what worlds particles are disabled in"
 
 # Sub-Command Usage
-command-description-fixed-create: '&e/pp fixed create <<x> <y> <z>|<looking>> <effect> <style> [data] - Creates a new fixed effect'
-command-description-fixed-edit: '&e/pp fixed edit <id> <effect|style|data> <args> - Edit part of a fixed effect by its ID'
-command-description-fixed-remove: '&e/pp fixed remove <ID|effect|style> - Removes a fixed effect by its ID'
-command-description-fixed-list: '&e/pp fixed list - Lists all IDs of your fixed effects'
-command-description-fixed-info: '&e/pp fixed info <ID> - Gets info on one of your fixed effects'
-command-description-fixed-clear: '&e/pp fixed clear <radius> - Clears all fixed effects of all players within the given radius'
-command-description-group-save: '&e/pp group save <name> - Saves all active particles in a new group'
-command-description-group-load: '&e/pp group load <name> - Loads all particles saved in a group'
-command-description-group-remove: '&e/pp group remove <name> - Removes a group you have saved'
-command-description-group-list: '&e/pp group list <name> - List all particle groups you have saved'
-command-description-group-info: '&e/pp group info <name> - List the particles saved in the group'
+command-description-fixed-create: "&e/pp fixed create <<x> <y> <z>|<looking>> <effect> <style> [data] - Creates a new fixed effect"
+command-description-fixed-edit: "&e/pp fixed edit <id> <effect|style|data> <args> - Edit part of a fixed effect by its ID"
+command-description-fixed-remove: "&e/pp fixed remove <ID> - Removes a fixed effect by its ID"
+command-description-fixed-list: "&e/pp fixed list - Lists all IDs of your fixed effects"
+command-description-fixed-info: "&e/pp fixed info <ID> - Gets info on one of your fixed effects"
+command-description-fixed-clear: "&e/pp fixed clear <radius> - Clears all fixed effects of all players within the given radius"
+command-description-group-save: "&e/pp group save <name> - Saves all active particles in a new group"
+command-description-group-load: "&e/pp group load <name> - Loads all particles saved in a group"
+command-description-group-remove: "&e/pp group remove <name> - Removes a group you have saved"
+command-description-group-list: "&e/pp group list <name> - List all particle groups you have saved"
+command-description-group-info: "&e/pp group info <name> - List the particles saved in the group"
 
 # Command ID Lookup
-id-invalid: '&cThe ID you entered is invalid, it must be a positive whole number!'
-id-unknown: '&cYou do not have a particle applied with the ID &b{0}&c!'
+id-invalid: "&cThe ID you entered is invalid, it must be a positive whole number!"
+id-unknown: "&cYou do not have a particle applied with the ID &b{0}&c!"
 
 # Other Command
-other-no-permission: '&cYou do not have permission to execute PlayerParticles commands for other players!'
-other-missing-args: '&cYou are missing some arguments. &b/ppo <player> <command>'
-other-unknown-player: '&cThe player &b{0} &cwas not found. They must be online.'
-other-unknown-command: '&cThe command &b/pp {0} &cdoes not exist.'
-other-success: '&eExecuted /pp command for &b{0}&e. Output:'
+other-no-permission: "&cYou do not have permission to execute PlayerParticles commands for other players!"
+other-missing-args: "&cYou are missing some arguments. &b/ppo <player> <command>"
+other-unknown-player: "&cThe player &b{0} &cwas not found. They must be online."
+other-unknown-command: "&cThe command &b/pp {0} &cdoes not exist."
+other-success: "&eExecuted /pp command for &b{0}&e. Output:"
 
 # Add Command
-add-reached-max: '&cUnable to apply particle, you have reached the maximum amount of &b{0} &callowed!'
-add-particle-applied: '&aA new particle has been applied with the effect &b{0}&a, style &b{1}&a, and data &b{2}&a!'
+add-reached-max: "&cUnable to apply particle, you have reached the maximum amount of &b{0} &callowed!"
+add-particle-applied: "&aA new particle has been applied with the effect &b{0}&a, style &b{1}&a, and data &b{2}&a!"
 
 # Data Command
-data-no-args: '&cMissing argument for effect! Command usage: &b/pp data <effect>'
+data-no-args: "&cMissing argument for effect! Command usage: &b/pp data <effect>"
 
 # Edit Command
-edit-invalid-property: '&cAn invalid property &b{0} &cwas provided. Valid properties: &beffect&c, &bstyle&c, &bdata'
-edit-success-effect: '&aYour particle with an ID of &b{0} &ahas had its effect changed to &b{1}&a!'
-edit-success-style: '&aYour particle with an ID of &b{0} &ahas had its style changed to &b{1}&a!'
-edit-success-data: '&aYour particle with an ID of &b{0} &ahas had its data changed to &b{1}&a!'
+edit-invalid-property: "&cAn invalid property &b{0} &cwas provided. Valid properties: &beffect&c, &bstyle&c, &bdata"
+edit-success-effect: "&aYour particle with an ID of &b{0} &ahas had its effect changed to &b{1}&a!"
+edit-success-style: "&aYour particle with an ID of &b{0} &ahas had its style changed to &b{1}&a!"
+edit-success-data: "&aYour particle with an ID of &b{0} &ahas had its data changed to &b{1}&a!"
 
 # Group Command
-group-invalid: '&cA saved group or preset group does not exist with the name &b{0}&c!'
-group-preset-no-permission: '&cYou are missing permission for an effect or style to use the preset group &b{0}&c!'
-group-reserved: '&cThe group name &bactive &cis reserved and cannot be used!'
-group-no-name: '&cYou did not provide a group name! &b/pp {0} <groupName>'
-group-save-reached-max: '&cUnable to save group, you have reached the max number of groups!'
-group-save-no-particles: '&cUnable to save group, you do not have any particles applied!'
-group-save-success: '&aYour current particles have been saved under the group named &b{0}&a!'
-group-save-success-overwrite: '&aThe group named &b{0} &ahas been updated with your current particles!'
-group-load-success: '&aApplied &b{0} &aparticle(s) from your saved group named &b{1}&a!'
-group-load-preset-success: '&aApplied &b{0} &aparticle(s) from the preset group named &b{1}&a!'
-group-remove-preset: '&cYou cannot remove a preset group!'
-group-remove-success: '&aRemoved the particle group named &b{0}&a!'
-group-info-header: '&eThe group &b{0} &ehas the following particles:'
-group-list-none: '&eYou do not have any particle groups saved!'
-group-list-output: '&eYou have the following groups saved: &b{0}'
-group-list-presets: '&eThe following preset groups are available: &b{0}'
+group-invalid: "&cA saved group or preset group does not exist with the name &b{0}&c!"
+group-preset-no-permission: "&cYou are missing permission for an effect or style to use the preset group &b{0}&c!"
+group-reserved: "&cThe group name &bactive &cis reserved and cannot be used!"
+group-no-name: "&cYou did not provide a group name! &b/pp {0} <groupName>"
+group-save-reached-max: "&cUnable to save group, you have reached the max number of groups!"
+group-save-no-particles: "&cUnable to save group, you do not have any particles applied!"
+group-save-success: "&aYour current particles have been saved under the group named &b{0}&a!"
+group-save-success-overwrite: "&aThe group named &b{0} &ahas been updated with your current particles!"
+group-load-success: "&aApplied &b{0} &aparticle(s) from your saved group named &b{1}&a!"
+group-load-preset-success: "&aApplied &b{0} &aparticle(s) from the preset group named &b{1}&a!"
+group-remove-preset: "&cYou cannot remove a preset group!"
+group-remove-success: "&aRemoved the particle group named &b{0}&a!"
+group-info-header: "&eThe group &b{0} &ehas the following particles:"
+group-list-none: "&eYou do not have any particle groups saved!"
+group-list-output: "&eYou have the following groups saved: &b{0}"
+group-list-presets: "&eThe following preset groups are available: &b{0}"
 
 # Reload Command
-reload-success: '&aThe plugin has been reloaded!'
-reload-no-permission: '&cYou do not have permission to reload the plugin settings!'
+reload-success: "&aThe plugin has been reloaded!"
+reload-no-permission: "&cYou do not have permission to reload the plugin settings!"
 
 # Remove Command
-remove-no-args: '&cYou did not specify an ID to remove! &b/pp remove <ID>'
-remove-id-success: '&aYour particle with the ID &b{0} &ahas been removed!'
-remove-effect-success: '&aRemoved &b{0} &aof your particles with the effect of &b{1}&a!'
-remove-effect-none: '&cYou do not have any particles applied with the effect &b{0}&c!'
-remove-style-success: '&aRemoved &b{0} &aof your particles with the style of &b{1}&a!'
-remove-style-none: '&cYou do not have any particles applied with the style &b{0}&c!'
-remove-unknown: '&cAn effect or style with the name of &b{0} &cdoes not exist!'
+remove-no-args: "&cYou did not specify an ID to remove! &b/pp remove <ID>"
+remove-id-success: "&aYour particle with the ID &b{0} &ahas been removed!"
+remove-effect-success: "&aRemoved &b{0} &aof your particles with the effect of &b{1}&a!"
+remove-effect-none: "&cYou do not have any particles applied with the effect &b{0}&c!"
+remove-style-success: "&aRemoved &b{0} &aof your particles with the style of &b{1}&a!"
+remove-style-none: "&cYou do not have any particles applied with the style &b{0}&c!"
+remove-unknown: "&cAn effect or style with the name of &b{0} &cdoes not exist!"
 
 # List Command
-list-none: '&eYou do not have any active particles!'
-list-you-have: '&eYou have the following particles applied:'
-list-output: '&eID: &b{0} &eEffect: &b{1} &eStyle: &b{2} &eData: &b{3}'
+list-none: "&eYou do not have any active particles!"
+list-you-have: "&eYou have the following particles applied:"
+list-output: "&eID: &b{0} &eEffect: &b{1} &eStyle: &b{2} &eData: &b{3}"
 
 # Toggle Command
-toggle-on: '&eParticles have been toggled &aON&e!'
-toggle-off: '&eParticles have been toggled &cOFF&e!'
+toggle-on: "&eParticles have been toggled &aON&e!"
+toggle-off: "&eParticles have been toggled &cOFF&e!"
 
 # Rainbow
-rainbow: '&cR&6a&ei&an&bb&9o&dw'
+rainbow: "&cR&6a&ei&an&bb&9o&dw"
 
 # Random
-random: 'Random'
+random: "Random"
 
 # Effects
-effect-no-permission: '&cYou do not have permission to use the effect &b{0} &c!'
-effect-invalid: '&cThe effect &b{0} &cdoes not exist! Use &b/pp effects &cfor a list of effects you can use.'
-effect-list: '&eYou can use the following effects: &b{0}'
-effect-list-empty: '&cYou do not have permission to use any effects!'
+effect-no-permission: "&cYou do not have permission to use the effect &b{0} &c!"
+effect-invalid: "&cThe effect &b{0} &cdoes not exist! Use &b/pp effects &cfor a list of effects you can use."
+effect-list: "&eYou can use the following effects: &b{0}"
+effect-list-empty: "&cYou do not have permission to use any effects!"
 
 # Styles
-style-no-permission: '&cYou do not have permission to use the style &b{0} &c!'
-style-event-spawning-info: '&eNote: The style &b{0} &espawns particles based on an event.'
-style-invalid: '&cThe style &b{0} &cdoes not exist! Use &b/pp styles &cfor a list of styles you can use.'
-style-list: '&eYou can use the following styles: &b{0}'
+style-no-permission: "&cYou do not have permission to use the style &b{0} &c!"
+style-event-spawning-info: "&eNote: The style &b{0} &espawns particles based on an event."
+style-invalid: "&cThe style &b{0} &cdoes not exist! Use &b/pp styles &cfor a list of styles you can use."
+style-list: "&eYou can use the following styles: &b{0}"
 
 # Data
-data-usage-none: '&eThe effect &b{0} &edoes not use any data!'
-data-usage-block: '&eThe effect &b{0} &erequires &bblock &edata! &bFormat: <blockName>'
-data-usage-item: '&eThe effect &b{0} &erequires &bitem &edata! &bFormat: <itemName>'
-data-usage-color: '&eThe effect &b{0} &erequires &bcolor &edata! &bFormat: <<0-255> <0-255> <0-255>>|<rainbow>|<random>'
-data-usage-note: '&eThe effect &b{0} &erequires &bnote &edata! &bFormat: <0-24>|<rainbow>|<random>'
-data-invalid-block: '&cThe &bblock &cdata you entered is invalid! &bFormat: <blockName>'
-data-invalid-item: '&cThe &bitem &cdata you entered is invalid! &bFormat: <itemName>'
-data-invalid-color: '&cThe &bcolor &cdata you entered is invalid! &bFormat: <<0-255> <0-255> <0-255>>|<rainbow>|<random>'
-data-invalid-note: '&cThe &bnote &cdata you entered is invalid! &bFormat: <0-24>|<rainbow>|<random>'
-data-invalid-material-not-item: '&cThe &bitem &cmaterial &b{0} &cyou entered is not an item!'
-data-invalid-material-not-block: '&cThe &bblock &cmaterial &b{0} &cyou entered is not a block!'
-data-invalid-material-item: '&cThe &bitem &cmaterial &b{0} you entered does not exist!'
-data-invalid-material-block: '&cThe &bblock &cmaterial &b{0} you entered does not exist!'
+data-usage-none: "&eThe effect &b{0} &edoes not use any data!"
+data-usage-block: "&eThe effect &b{0} &erequires &bblock &edata! &bFormat: <blockName>"
+data-usage-item: "&eThe effect &b{0} &erequires &bitem &edata! &bFormat: <itemName>"
+data-usage-color: "&eThe effect &b{0} &erequires &bcolor &edata! &bFormat: <<0-255> <0-255> <0-255>>|<rainbow>|<random>"
+data-usage-note: "&eThe effect &b{0} &erequires &bnote &edata! &bFormat: <0-24>|<rainbow>|<random>"
+data-invalid-block: "&cThe &bblock &cdata you entered is invalid! &bFormat: <blockName>"
+data-invalid-item: "&cThe &bitem &cdata you entered is invalid! &bFormat: <itemName>"
+data-invalid-color: "&cThe &bcolor &cdata you entered is invalid! &bFormat: <<0-255> <0-255> <0-255>>|<rainbow>|<random>"
+data-invalid-note: "&cThe &bnote &cdata you entered is invalid! &bFormat: <0-24>|<rainbow>|<random>"
+data-invalid-material-not-item: "&cThe &bitem &cmaterial &b{0} &cyou entered is not an item!"
+data-invalid-material-not-block: "&cThe &bblock &cmaterial &b{0} &cyou entered is not a block!"
+data-invalid-material-item: "&cThe &bitem &cmaterial &b{0} you entered does not exist!"
+data-invalid-material-block: "&cThe &bblock &cmaterial &b{0} you entered does not exist!"
 
 # Worlds
-disabled-worlds: '&eParticles are disabled in these worlds: &b{0}'
-disabled-worlds-none: '&eParticles are not disabled in any worlds.'
+disabled-worlds: "&eParticles are disabled in these worlds: &b{0}"
+disabled-worlds-none: "&eParticles are not disabled in any worlds."
 
 # Reset
-reset-success: '&aRemoved &b{0} &aactive particle(s)!'
+reset-success: "&aRemoved &b{0} &aactive particle(s)!"
 
 # Fixed Effects
-fixed-create-missing-args: '&cUnable to create fixed effect, you are missing &b{0} &crequired arguments!'
-fixed-create-invalid-coords: '&cUnable to create fixed effect, one or more coordinates you entered is invalid!'
-fixed-create-out-of-range: '&cUnable to create fixed effect, you must be within &b{0} &cblocks of your desired location!'
-fixed-create-looking-too-far: '&cUnable to create fixed effect, you are standing too far away from the block you are looking at!'
-fixed-create-effect-invalid: '&cUnable to create fixed effect, an effect with the name &b{0} &cdoes not exist!'
-fixed-create-effect-no-permission: '&cUnable to create fixed effect, you do not have permission to use the effect &b{0}&c!'
-fixed-create-style-invalid: '&cUnable to create fixed effect, a style with the name &b{0} &cdoes not exist!'
-fixed-create-style-no-permission: '&cUnable to create fixed effect, you do not have permission to use the style &b{0}&c!'
-fixed-create-style-non-fixable: '&cUnable to create fixed effect, the style &b{0} &ccan not be used in fixed effects!'
-fixed-create-data-error: '&cUnable to create fixed effect, the data provided is not correct! Use &b/pp data <effect> &cto find the correct data format!'
-fixed-create-success: '&aYour fixed effect has been created!'
+fixed-create-missing-args: "&cUnable to create fixed effect, you are missing &b{0} &crequired arguments!"
+fixed-create-invalid-coords: "&cUnable to create fixed effect, one or more coordinates you entered is invalid!"
+fixed-create-out-of-range: "&cUnable to create fixed effect, you must be within &b{0} &cblocks of your desired location!"
+fixed-create-looking-too-far: "&cUnable to create fixed effect, you are standing too far away from the block you are looking at!"
+fixed-create-effect-invalid: "&cUnable to create fixed effect, an effect with the name &b{0} &cdoes not exist!"
+fixed-create-effect-no-permission: "&cUnable to create fixed effect, you do not have permission to use the effect &b{0}&c!"
+fixed-create-style-invalid: "&cUnable to create fixed effect, a style with the name &b{0} &cdoes not exist!"
+fixed-create-style-no-permission: "&cUnable to create fixed effect, you do not have permission to use the style &b{0}&c!"
+fixed-create-style-non-fixable: "&cUnable to create fixed effect, the style &b{0} &ccan not be used in fixed effects!"
+fixed-create-data-error: "&cUnable to create fixed effect, the data provided is not correct! Use &b/pp data <effect> &cto find the correct data format!"
+fixed-create-success: "&aYour fixed effect has been created!"
 
-fixed-edit-missing-args: '&cUnable to edit fixed effect, you are missing some arguments!'
-fixed-edit-invalid-id: '&cUnable to edit fixed effect, the ID specified is invalid or does not exist!'
-fixed-edit-invalid-property: '&cUnable to edit fixed effect, an invalid property was specified! Only &blocation&c, &beffect&c, &bstyle&c, and &bdata &care valid.'
-fixed-edit-invalid-coords: '&cUnable to edit fixed effect, one or more coordinates you entered is invalid!'
-fixed-edit-out-of-range: '&cUnable to edit fixed effect, you must be within &b{0} &cblocks of your desired location!'
-fixed-edit-looking-too-far: '&cUnable to edit fixed effect, you are standing too far away from the block you are looking at!'
-fixed-edit-effect-invalid: '&cUnable to edit fixed effect, an effect with the name &b{0} &cdoes not exist!'
-fixed-edit-effect-no-permission: '&cUnable to edit fixed effect, you do not have permission to use the effect &b{0}&c!'
-fixed-edit-style-invalid: '&cUnable to edit fixed effect, a style with the name &b{0} &cdoes not exist!'
-fixed-edit-style-no-permission: '&cUnable to edit fixed effect, you do not have permission to use the style &b{0}&c!'
-fixed-edit-style-non-fixable: '&cUnable to edit fixed effect, the style &b{0} &ccan not be used in fixed effects!'
-fixed-edit-data-error: '&cUnable to edit fixed effect, the data provided is not correct! Use &b/pp data <effect> &cto find the correct data format!'
-fixed-edit-data-none: '&cUnable to edit fixed effect, the effect does not require any data!'
-fixed-edit-success: '&aUpdated the &b{0} &aof the fixed effect with an ID of &b{1}&a!'
+fixed-edit-missing-args: "&cUnable to edit fixed effect, you are missing some arguments!"
+fixed-edit-invalid-id: "&cUnable to edit fixed effect, the ID specified is invalid or does not exist!"
+fixed-edit-invalid-property: "&cUnable to edit fixed effect, an invalid property was specified! Only &blocation&c, &beffect&c, &bstyle&c, and &bdata &care valid."
+fixed-edit-invalid-coords: "&cUnable to edit fixed effect, one or more coordinates you entered is invalid!"
+fixed-edit-out-of-range: "&cUnable to edit fixed effect, you must be within &b{0} &cblocks of your desired location!"
+fixed-edit-looking-too-far: "&cUnable to edit fixed effect, you are standing too far away from the block you are looking at!"
+fixed-edit-effect-invalid: "&cUnable to edit fixed effect, an effect with the name &b{0} &cdoes not exist!"
+fixed-edit-effect-no-permission: "&cUnable to edit fixed effect, you do not have permission to use the effect &b{0}&c!"
+fixed-edit-style-invalid: "&cUnable to edit fixed effect, a style with the name &b{0} &cdoes not exist!"
+fixed-edit-style-no-permission: "&cUnable to edit fixed effect, you do not have permission to use the style &b{0}&c!"
+fixed-edit-style-non-fixable: "&cUnable to edit fixed effect, the style &b{0} &ccan not be used in fixed effects!"
+fixed-edit-data-error: "&cUnable to edit fixed effect, the data provided is not correct! Use &b/pp data <effect> &cto find the correct data format!"
+fixed-edit-data-none: "&cUnable to edit fixed effect, the effect does not require any data!"
+fixed-edit-success: "&aUpdated the &b{0} &aof the fixed effect with an ID of &b{1}&a!"
 
-fixed-remove-invalid: '&cUnable to remove fixed effect, you do not have a fixed effect with the ID of &b{0}&c!'
-fixed-remove-no-args: '&cYou did not specify an ID to remove!'
-fixed-remove-args-invalid: '&cUnable to remove, the ID specified must be a number!'
-fixed-remove-success: '&aYour fixed effect with the ID &b{0} &ahas been removed!'
+fixed-remove-invalid: "&cUnable to remove fixed effect, you do not have a fixed effect with the ID of &b{0}&c!"
+fixed-remove-no-args: "&cYou did not specify an ID to remove!"
+fixed-remove-args-invalid: "&cUnable to remove, the ID specified must be a number!"
+fixed-remove-success: "&aYour fixed effect with the ID &b{0} &ahas been removed!"
 
-fixed-list-none: '&eYou do not have any fixed effects!'
-fixed-list-success: '&eYou have fixed effects with these IDs: &b{0}'
+fixed-list-none: "&eYou do not have any fixed effects!"
+fixed-list-success: "&eYou have fixed effects with these IDs: &b{0}"
 
-fixed-info-invalid: '&cUnable to get info, you do not have a fixed effect with the ID of &b{0}&c!'
-fixed-info-no-args: '&cYou did not specify an ID to display info for!'
-fixed-info-invalid-args: '&cUnable to get info, the ID specified must be a number!'
-fixed-info-success: '&eID: &b{0} &eWorld: &b{1} &eX: &b{2} &eY: &b{3} &eZ: &b{4} &eEffect: &b{5} &eStyle: &b{6} &eData: &b{7}'
+fixed-info-invalid: "&cUnable to get info, you do not have a fixed effect with the ID of &b{0}&c!"
+fixed-info-no-args: "&cYou did not specify an ID to display info for!"
+fixed-info-invalid-args: "&cUnable to get info, the ID specified must be a number!"
+fixed-info-success: "&eID: &b{0} &eWorld: &b{1} &eX: &b{2} &eY: &b{3} &eZ: &b{4} &eEffect: &b{5} &eStyle: &b{6} &eData: &b{7}"
 
-fixed-clear-no-permission: '&cYou do not have permission to clear nearby fixed effects!'
-fixed-clear-no-args: '&cYou did not provide a radius to clear fixed effects for!'
-fixed-clear-invalid-args: '&cThe radius you provided is invalid, it must be a positive whole number!'
-fixed-clear-success: '&aCleared &b{0} &afixed effects within &b{1} &ablocks of your location!'
+fixed-clear-no-permission: "&cYou do not have permission to clear nearby fixed effects!"
+fixed-clear-no-args: "&cYou did not provide a radius to clear fixed effects for!"
+fixed-clear-invalid-args: "&cThe radius you provided is invalid, it must be a positive whole number!"
+fixed-clear-success: "&aCleared &b{0} &afixed effects within &b{1} &ablocks of your location!"
 
-fixed-no-permission: '&cYou do not have permission to use fixed effects!'
-fixed-max-reached: '&cYou have reached the maximum allowed fixed effects!'
-fixed-invalid-command: '&cInvalid sub-command for &b/pp fixed&c!'
+fixed-no-permission: "&cYou do not have permission to use fixed effects!"
+fixed-max-reached: "&cYou have reached the maximum allowed fixed effects!"
+fixed-invalid-command: "&cInvalid sub-command for &b/pp fixed&c!"
 
 # Update Available
-update-available: '&eAn update (&b{0}&e) is available! You are running &bv{1}&e. https://www.spigotmc.org/resources/playerparticles.40261/'
+update-available: "&eAn update (&b{0}&e) is available! You are running &bv{1}&e. https://www.spigotmc.org/resources/playerparticles.40261/"
 
 # GUI
-gui-disabled: '&cThe server administrator has disabled the GUI!'
-gui-color-icon-name: '&a'
-gui-color-info: '&e'
-gui-color-subtext: '&b'
-gui-color-unavailable: '&c'
-gui-commands-info: 'Find info about commands with &b/pp help'
-gui-back-button: 'Go Back'
-gui-click-to-load: 'Click to load the following {0} particle(s):'
-gui-shift-click-to-delete: 'Shift click to delete'
-gui-particle-info: '  - ID: &b{0} &eEffect: &b{1} &eStyle: &b{2} &eData: &b{3}'
-gui-playerparticles: 'PlayerParticles'
-gui-active-particles: 'Active Particles: &b{0}'
-gui-saved-groups: 'Saved Groups: &b{0}'
-gui-fixed-effects: 'Fixed Effects: &b{0}'
-gui-edit-primary-effect: 'Edit Primary Effect'
-gui-edit-primary-effect-description: 'Edit the effect of your primary particle'
-gui-edit-primary-style: 'Edit Primary Style'
-gui-edit-primary-style-missing-effect: 'You must select an effect first'
-gui-edit-primary-style-description: 'Edit the style of your primary particle'
-gui-edit-primary-data: 'Edit Primary Data'
-gui-edit-primary-data-missing-effect: 'You must select an effect first'
-gui-edit-primary-data-unavailable: 'Your primary effect does not use any data'
-gui-edit-primary-data-description: 'Edit the data of your primary particle'
-gui-manage-your-particles: 'Manage Your Particles'
-gui-manage-your-particles-description: 'Create, edit, and delete your particles'
-gui-manage-your-groups: 'Manage Your Groups'
-gui-manage-your-groups-description: 'Create, delete, and load your particle groups'
-gui-load-a-preset-group: 'Load A Preset Group'
-gui-load-a-preset-group-description: 'Load a premade particle group'
-gui-save-group: 'Save New Group'
-gui-save-group-description: 'Click to save a new group. You will be prompted\nto enter the new group name in chat.'
-gui-save-group-full: 'You have reached the max number of groups'
-gui-save-group-no-particles: 'You do not have any particles applied'
-gui-save-group-hotbar-message: '&eType &b1 &eword in chat for the new group name. Type "&ccancel&e" to cancel. (&b{0}&es left)'
-gui-reset-particles: 'Reset Your Particles'
-gui-reset-particles-description: 'Deletes all your active particles'
-gui-particle-name: 'Particle #{0}'
-gui-click-to-edit-particle: 'Click to edit the effect, style, or data of this particle'
-gui-editing-particle: 'Editing Particle #{0}'
-gui-edit-effect: 'Edit Effect'
-gui-edit-effect-description: 'Click to edit the effect of this particle'
-gui-edit-style: 'Edit Style'
-gui-edit-style-description: 'Click to edit the style of this particle'
-gui-edit-data: 'Edit Data'
-gui-edit-data-description: 'Click to edit the data of this particle'
-gui-edit-data-unavailable: 'The effect of this particle does not use any data'
-gui-data-none: 'none'
-gui-create-particle: 'Create A New Particle'
-gui-create-particle-description: 'Create a new particle with an effect, style, and data'
-gui-create-particle-unavailable: 'You have reached the maximum amount of particles you can create'
-gui-select-effect: 'Select Particle Effect'
-gui-select-effect-description: 'Sets the particle effect to &b{0}'
-gui-select-style: 'Select Particle Style'
-gui-select-style-description: 'Sets the particle style to &b{0}'
-gui-select-data: 'Select Particle Data'
-gui-select-data-description: 'Sets the particle data to &b{0}'
-gui-select-data-note: 'note #{0}'
-gui-select-data-randomize-items: 'Randomize Items'
-gui-select-data-randomize-items-description: 'Randomizes the items displayed'
-gui-select-data-randomize-blocks: 'Randomize Blocks'
-gui-select-data-randomize-blocks-description: 'Randomizes the blocks displayed'
-gui-edit-data-color-red: '&cred'
-gui-edit-data-color-orange: '&6orange'
-gui-edit-data-color-yellow: '&eyellow'
-gui-edit-data-color-lime-green: '&alime green'
-gui-edit-data-color-green: '&2green'
-gui-edit-data-color-blue: '&1blue'
-gui-edit-data-color-cyan: '&3cyan'
-gui-edit-data-color-light-blue: '&blight blue'
-gui-edit-data-color-purple: '&5purple'
-gui-edit-data-color-magenta: '&dmagenta'
-gui-edit-data-color-pink: '&dpink'
-gui-edit-data-color-brown: '&6brown'
-gui-edit-data-color-black: '&8black'
-gui-edit-data-color-gray: '&8gray'
-gui-edit-data-color-light-gray: '&7light gray'
-gui-edit-data-color-white: '&fwhite'
+gui-disabled: "&cThe server administrator has disabled the GUI!"
+gui-color-icon-name: "&a"
+gui-color-info: "&e"
+gui-color-subtext: "&b"
+gui-color-unavailable: "&c"
+gui-commands-info: "Find info about commands with &b/pp help"
+gui-back-button: "Go Back"
+gui-click-to-load: "Click to load the following {0} particle(s):"
+gui-shift-click-to-delete: "Shift click to delete"
+gui-particle-info: "  - ID: &b{0} &eEffect: &b{1} &eStyle: &b{2} &eData: &b{3}"
+gui-playerparticles: "PlayerParticles"
+gui-active-particles: "Active Particles: &b{0}"
+gui-saved-groups: "Saved Groups: &b{0}"
+gui-fixed-effects: "Fixed Effects: &b{0}"
+gui-edit-primary-effect: "Edit Primary Effect"
+gui-edit-primary-effect-description: "Edit the effect of your primary particle"
+gui-edit-primary-style: "Edit Primary Style"
+gui-edit-primary-style-missing-effect: "You must select an effect first"
+gui-edit-primary-style-description: "Edit the style of your primary particle"
+gui-edit-primary-data: "Edit Primary Data"
+gui-edit-primary-data-missing-effect: "You must select an effect first"
+gui-edit-primary-data-unavailable: "Your primary effect does not use any data"
+gui-edit-primary-data-description: "Edit the data of your primary particle"
+gui-manage-your-particles: "Manage Your Particles"
+gui-manage-your-particles-description: "Create, edit, and delete your particles"
+gui-manage-your-groups: "Manage Your Groups"
+gui-manage-your-groups-description: "Create, delete, and load your particle groups"
+gui-load-a-preset-group: "Load A Preset Group"
+gui-load-a-preset-group-description: "Load a premade particle group"
+gui-save-group: "Save New Group"
+gui-save-group-description: "Click to save a new group. You will be prompted\nto enter the new group name in chat."
+gui-save-group-full: "You have reached the max number of groups"
+gui-save-group-no-particles: "You do not have any particles applied"
+gui-save-group-hotbar-message: "&eType &b1 &eword in chat for the new group name. Type &ccancel&e to cancel. (&b{0}&es left)"
+gui-reset-particles: "Reset Your Particles"
+gui-reset-particles-description: "Deletes all your active particles"
+gui-particle-name: "Particle #{0}"
+gui-click-to-edit-particle: "Click to edit the effect, style, or data of this particle"
+gui-editing-particle: "Editing Particle #{0}"
+gui-edit-effect: "Edit Effect"
+gui-edit-effect-description: "Click to edit the effect of this particle"
+gui-edit-style: "Edit Style"
+gui-edit-style-description: "Click to edit the style of this particle"
+gui-edit-data: "Edit Data"
+gui-edit-data-description: "Click to edit the data of this particle"
+gui-edit-data-unavailable: "The effect of this particle does not use any data"
+gui-data-none: "none"
+gui-create-particle: "Create A New Particle"
+gui-create-particle-description: "Create a new particle with an effect, style, and data"
+gui-create-particle-unavailable: "You have reached the maximum amount of particles you can create"
+gui-select-effect: "Select Particle Effect"
+gui-select-effect-description: "Sets the particle effect to &b{0}"
+gui-select-style: "Select Particle Style"
+gui-select-style-description: "Sets the particle style to &b{0}"
+gui-select-data: "Select Particle Data"
+gui-select-data-description: "Sets the particle data to &b{0}"
+gui-select-data-note: "note #{0}"
+gui-select-data-randomize-items: "Randomize Items"
+gui-select-data-randomize-items-description: "Randomizes the items displayed"
+gui-select-data-randomize-blocks: "Randomize Blocks"
+gui-select-data-randomize-blocks-description: "Randomizes the blocks displayed"
+gui-edit-data-color-red: "&cred"
+gui-edit-data-color-orange: "&6orange"
+gui-edit-data-color-yellow: "&eyellow"
+gui-edit-data-color-lime-green: "&alime green"
+gui-edit-data-color-green: "&2green"
+gui-edit-data-color-blue: "&1blue"
+gui-edit-data-color-cyan: "&3cyan"
+gui-edit-data-color-light-blue: "&blight blue"
+gui-edit-data-color-purple: "&5purple"
+gui-edit-data-color-magenta: "&dmagenta"
+gui-edit-data-color-pink: "&dpink"
+gui-edit-data-color-brown: "&6brown"
+gui-edit-data-color-black: "&8black"
+gui-edit-data-color-gray: "&8gray"
+gui-edit-data-color-light-gray: "&7light gray"
+gui-edit-data-color-white: "&fwhite"
diff --git a/src/lang/fr_FR.lang b/src/lang/fr_FR.lang
index d76633de..5740fa59 100644
--- a/src/lang/fr_FR.lang
+++ b/src/lang/fr_FR.lang
@@ -4,7 +4,7 @@
 # * You can use the & symbol to color the messages                 #
 # * {#} Will be replaced with whatever that message requires       #
 # * \n Will split the lore line in the #GUI section                #
-# * Do NOT use the apostrophe character in any message! ( ' )      #
+# * Do NOT use a quotation mark character in any message! ( " )    #
 # * PLEASE MAKE YOUR OWN .lang FILE IF YOU WANT CUSTOM MESSAGES!   #
 # * This file will be overridden almost every plugin update!       #
 # ================================================================ #
@@ -31,7 +31,7 @@ command-description-help: "Affichez le menu d aide... Vous y 
 command-description-info: "Voir la description d une de vos particules actives"
 command-description-list: "Listez les IDs de vos particules actives"
 command-description-reload: "Rechargez le fichier config.yml et de langue"
-command-description-remove: "Supprimez l une de vos particules actives"
+command-description-remove: "Supprimez vos particules actives."
 command-description-reset: "Supprimez toutes vos particules actives"
 command-description-styles: "Affichez une liste des styles de particules que vous utilisez"
 command-description-toggle: "Activez ou déativez vos particules actives"
@@ -99,7 +99,12 @@ reload-no-permission: "&cVous n avez pas la permission pour recharger la configu
 
 # Remove Command
 remove-no-args: "&cVous n avez pas rentrer d ID à supprimer ! &b/pp remove <ID>"
-remove-success: "&aVotre particule avec l ID &b{0} &aa été supprimée !"
+remove-id-success: "&aVotre particule avec l'ID &b{0} &aa été supprimée !"
+remove-effect-success: "&aSuppression de &b{0} &ade votre particule avec l'effet &b{1} &a!"
+remove-effect-none: "&cVous n'avez pas de particules appliquées avec l'effet &b{0} &c!"
+remove-style-success: "&aSuppression &b{0} &ade votre particule avec le style &b{1} &a!"
+remove-style-none: "&cVous n'avez pas de particules appliquées avec le style &b{0} &c!"
+remove-unknown: "&cL'effect avec le nom ou le style &b{0} &cn'existe pas !"
 
 # List Command
 list-none: "&eVous n avez pas de particules actives."
@@ -234,8 +239,10 @@ gui-manage-your-groups-description: "Cr
 gui-load-a-preset-group: "Chargez un groupe de presets"
 gui-load-a-preset-group-description: "Chargez un groupe de particules déjà fait"
 gui-save-group: "Sauvegardez un nouveau groupe"
-gui-save-group-description: "Sauvegarder un nouveau groupe avec:"
-gui-save-group-description-2: "/pp group save <groupName>"
+gui-save-group-description: "Cliquez pour sauvegardez un nouveau groupe. Vous allez être invité\na écrire un nouveau nom dans le tchat."
+gui-save-group-full: "Vous avez atteint le nombre maximal de groupe !"
+gui-save-group-no-particles: "Vous avez aucunes particules appliquées"
+gui-save-group-hotbar-message: "&eTapez &b1 &enom dans le tchat pour le nouveau nom du groupe. Tapez &ccancel&e pour annuler. (&b{0}&es restants)"
 gui-reset-particles: "Réinitialisez vos particules"
 gui-reset-particles-description: "Supprimez vos particules actives"
 gui-particle-name: "Particule #{0}"