From b2459eb8d03f067d22f4103b6639358c6182bf2d Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Tue, 5 Feb 2019 02:20:19 -0700
Subject: [PATCH] Add extra GUI settings to config.yml, push to v6.4

---
 changelog.txt                                 |  4 +++
 pom.xml                                       |  2 +-
 .../esophose/playerparticles/DataUpdater.java |  2 +-
 .../playerparticles/PlayerParticles.java      |  8 +++--
 .../command/GUICommandModule.java             |  8 +++--
 .../playerparticles/gui/GuiHandler.java       | 13 +++++---
 .../gui/GuiInventoryDefault.java              |  2 +-
 .../gui/GuiInventoryLoadPresetGroups.java     | 30 ++++++++++++++-----
 .../gui/GuiInventoryManageGroups.java         |  5 +++-
 .../manager/SettingManager.java               |  3 ++
 src/config.yml                                | 11 ++++++-
 src/lang/vi_VN.lang                           |  4 +--
 src/plugin.yml                                |  2 +-
 13 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index ba3cf7c..623d3cf 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,9 @@
 == UPDATING WILL DELETE YOUR CONFIG.YML ==
 * Create a backup of your config.yml if you wish to import all your old settings!
+=== v6.4 (In progress) ===
++ Added setting 'gui-close-after-group-selected' to the config.yml
++ Added setting 'gui-presets-only' to the config.yml
++ Added Vietnamese translation file (vi_VN.lang)
 === v6.3 ===
 + Added the ability to remove particles by id/effect/style using '/pp remove <id>|<effect>|<style>'
 + Added new styles 'popper', 'pulse', 'twins', 'whirl', and 'whirlwind'
diff --git a/pom.xml b/pom.xml
index 6ebe1d3..55ed5f7 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.3</version>
+  <version>6.4</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/DataUpdater.java b/src/com/esophose/playerparticles/DataUpdater.java
index 12638bc..59126eb 100644
--- a/src/com/esophose/playerparticles/DataUpdater.java
+++ b/src/com/esophose/playerparticles/DataUpdater.java
@@ -39,7 +39,7 @@ public class DataUpdater {
             updateFrom_legacy_to_current();
         } else if (configVersion == 5.3) {
             updateFrom_5_3_to_current();
-        } else if (configVersion == 6.0) {
+        } else {
             PlayerParticles.getPlugin().getLogger().warning("Found nothing to update.");
         }
         
diff --git a/src/com/esophose/playerparticles/PlayerParticles.java b/src/com/esophose/playerparticles/PlayerParticles.java
index e7573c4..b722790 100644
--- a/src/com/esophose/playerparticles/PlayerParticles.java
+++ b/src/com/esophose/playerparticles/PlayerParticles.java
@@ -1,10 +1,14 @@
 /*
- * TODO: v6.4+
- * + Add new style(s) 'wings_<type>', multiple new wing types: fairy, demon
+ * TODO: v6.4
  * + 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
+ * * Clean up duplicated command parsing
+ */
+
+/*
+ * TODO: v6.5
  * + Add effect/style name customization through config files
  * + Add effect/style settings folder that lets you disable effects/style and edit style properties
  */
diff --git a/src/com/esophose/playerparticles/command/GUICommandModule.java b/src/com/esophose/playerparticles/command/GUICommandModule.java
index b77a8c5..6560a28 100644
--- a/src/com/esophose/playerparticles/command/GUICommandModule.java
+++ b/src/com/esophose/playerparticles/command/GUICommandModule.java
@@ -6,6 +6,8 @@ import java.util.List;
 import com.esophose.playerparticles.gui.GuiHandler;
 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.PSetting;
 import com.esophose.playerparticles.manager.PermissionManager;
 import com.esophose.playerparticles.particles.PPlayer;
 
@@ -25,8 +27,10 @@ public class GUICommandModule implements CommandModule {
             }
             return;
         }
-
-        if (PermissionManager.getEffectNamesUserHasPermissionFor(pplayer.getPlayer()).isEmpty()) {
+        
+        if (PSetting.GUI_PRESETS_ONLY.getBoolean() && ParticleGroupPresetManager.getPresetGroupsForPlayer(pplayer.getPlayer()).isEmpty()) {
+            return;
+        } else if (PermissionManager.getEffectNamesUserHasPermissionFor(pplayer.getPlayer()).isEmpty()) {
             if (byDefault) {
                 LangManager.sendMessage(pplayer, Lang.COMMAND_ERROR_UNKNOWN);
             } else {
diff --git a/src/com/esophose/playerparticles/gui/GuiHandler.java b/src/com/esophose/playerparticles/gui/GuiHandler.java
index 856779b..d489883 100644
--- a/src/com/esophose/playerparticles/gui/GuiHandler.java
+++ b/src/com/esophose/playerparticles/gui/GuiHandler.java
@@ -112,10 +112,15 @@ public class GuiHandler extends BukkitRunnable implements Listener {
     public static void openDefault(PPlayer pplayer) {
         removeGuiInventory(pplayer);
         
-        GuiInventoryDefault defaultInventory = new GuiInventoryDefault(pplayer);
-        guiInventories.add(defaultInventory);
-
-        pplayer.getPlayer().openInventory(defaultInventory.getInventory());
+        GuiInventory inventoryToOpen;
+        if (!PSetting.GUI_PRESETS_ONLY.getBoolean()) {
+            inventoryToOpen = new GuiInventoryDefault(pplayer);
+        } else {
+            inventoryToOpen = new GuiInventoryLoadPresetGroups(pplayer, true);
+        }
+        
+        guiInventories.add(inventoryToOpen);
+        pplayer.getPlayer().openInventory(inventoryToOpen.getInventory());
     }
     
     /**
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java b/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
index d730534..046b207 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryDefault.java
@@ -101,7 +101,7 @@ public class GuiInventoryDefault extends GuiInventory {
                                                                    LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP), 
                                                                    new String[] { LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP_DESCRIPTION) }, 
                                                                    (button, isShiftClick) -> {
-                                                                       GuiHandler.transition(new GuiInventoryLoadPresetGroups(pplayer));
+                                                                       GuiHandler.transition(new GuiInventoryLoadPresetGroups(pplayer, false));
                                                                    });
             this.actionButtons.add(loadPresetGroups);
         }
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java b/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
index a8c38e8..22eb52e 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryLoadPresetGroups.java
@@ -10,6 +10,7 @@ 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.manager.SettingManager.PSetting;
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.particles.ParticleGroupPreset;
@@ -18,7 +19,7 @@ import com.esophose.playerparticles.util.ParticleUtils;
 
 public class GuiInventoryLoadPresetGroups extends GuiInventory {
 
-    public GuiInventoryLoadPresetGroups(PPlayer pplayer) {
+    public GuiInventoryLoadPresetGroups(PPlayer pplayer, boolean isEndPoint) {
         super(pplayer, Bukkit.createInventory(pplayer.getPlayer(), INVENTORY_SIZE, LangManager.getText(Lang.GUI_LOAD_A_PRESET_GROUP)));
         
         this.fillBorder(BorderColor.GREEN);
@@ -47,7 +48,9 @@ public class GuiInventoryLoadPresetGroups extends GuiInventory {
                     activeGroup.getParticles().add(particle.clone());
                 DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
                 
-                pplayer.getPlayer().closeInventory();
+                if (PSetting.GUI_CLOSE_AFTER_GROUP_SELECTED.getBoolean()) {
+                    pplayer.getPlayer().closeInventory();
+                }
             });
             this.actionButtons.add(groupButton);
             
@@ -59,11 +62,24 @@ public class GuiInventoryLoadPresetGroups extends GuiInventory {
             if (index > maxIndex) break; // Overflowed the available space
         }
         
-        // Back Button
-        GuiActionButton backButton = new GuiActionButton(INVENTORY_SIZE - 1, GuiIcon.BACK.get(), LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON), new String[] {}, (button, isShiftClick) -> {
-            GuiHandler.transition(new GuiInventoryDefault(pplayer));
-        });
-        this.actionButtons.add(backButton);
+        if (!isEndPoint) {
+            // Back Button
+            GuiActionButton backButton = new GuiActionButton(INVENTORY_SIZE - 1, GuiIcon.BACK.get(), LangManager.getText(Lang.GUI_COLOR_INFO) + LangManager.getText(Lang.GUI_BACK_BUTTON), new String[] {}, (button, isShiftClick) -> {
+                GuiHandler.transition(new GuiInventoryDefault(pplayer));
+            });
+            this.actionButtons.add(backButton);
+        } else {
+            // Reset Particles Button
+            GuiActionButton resetParticles = new GuiActionButton(49,
+                                                                 GuiIcon.RESET.get(),
+                                                                 LangManager.getText(Lang.GUI_COLOR_ICON_NAME) + LangManager.getText(Lang.GUI_RESET_PARTICLES),
+                                                                 new String[] { LangManager.getText(Lang.GUI_COLOR_UNAVAILABLE) + LangManager.getText(Lang.GUI_RESET_PARTICLES_DESCRIPTION) },
+                                                                 (button, isShiftClick) -> {
+                                                                     // Reset particles
+                                                                     DataManager.saveParticleGroup(pplayer.getUniqueId(), ParticleGroup.getDefaultGroup());
+                                                                 });
+            this.actionButtons.add(resetParticles);
+        }
         
         this.populate();
     }
diff --git a/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java b/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
index 9d47704..aaf3a41 100644
--- a/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
+++ b/src/com/esophose/playerparticles/gui/GuiInventoryManageGroups.java
@@ -13,6 +13,7 @@ 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.manager.SettingManager.PSetting;
 import com.esophose.playerparticles.particles.PPlayer;
 import com.esophose.playerparticles.particles.ParticleGroup;
 import com.esophose.playerparticles.particles.ParticlePair;
@@ -60,7 +61,9 @@ public class GuiInventoryManageGroups extends GuiInventory {
                         activeGroup.getParticles().add(particle.clone());
                     DataManager.saveParticleGroup(pplayer.getUniqueId(), activeGroup);
                     
-                    pplayer.getPlayer().closeInventory();
+                    if (PSetting.GUI_CLOSE_AFTER_GROUP_SELECTED.getBoolean()) {
+                        pplayer.getPlayer().closeInventory();
+                    }
                 }
             });
             this.actionButtons.add(groupButton);
diff --git a/src/com/esophose/playerparticles/manager/SettingManager.java b/src/com/esophose/playerparticles/manager/SettingManager.java
index 064e1f1..db2c0e2 100644
--- a/src/com/esophose/playerparticles/manager/SettingManager.java
+++ b/src/com/esophose/playerparticles/manager/SettingManager.java
@@ -32,7 +32,10 @@ public class SettingManager {
         TICKS_PER_PARTICLE(PSettingType.LONG),
         CHECK_UPDATES(PSettingType.BOOLEAN),
         SEND_METRICS(PSettingType.BOOLEAN),
+        
         GUI_ENABLED(PSettingType.BOOLEAN),
+        GUI_PRESETS_ONLY(PSettingType.BOOLEAN),
+        GUI_CLOSE_AFTER_GROUP_SELECTED(PSettingType.BOOLEAN),
         GUI_BUTTON_SOUND(PSettingType.BOOLEAN),
         
         TOGGLE_ON_MOVE(PSettingType.BOOLEAN),
diff --git a/src/config.yml b/src/config.yml
index af37980..387d526 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.3
+version: 6.4
 
 # Check for new versions of the plugin
 # Default: true
@@ -46,6 +46,15 @@ message-prefix: '&7[&3PlayerParticles&7]'
 # Default: true
 gui-enabled: true
 
+# If true, only the preset groups will be available in the GUI
+# Permissions to open the GUI will change to only open if the user has any preset groups available
+# Default: false
+gui-presets-only: false
+
+# If true, the GUI will close after selecting a group (either saved or preset)
+# Default: true
+gui-close-after-group-selected: true
+
 # If clicking a GUI button should make a noise
 # Default: true
 gui-button-sound: true
diff --git a/src/lang/vi_VN.lang b/src/lang/vi_VN.lang
index f89856e..cb3dbe9 100644
--- a/src/lang/vi_VN.lang
+++ b/src/lang/vi_VN.lang
@@ -95,8 +95,8 @@ group-list-output: "&eBạn đã lưu các Group sau: &b{0}"
 group-list-presets: "&eCác preset group có sẵn: &b{0}"
 
 # Reload Command
-reload-success: "&aCác plugin đã được tải lại!"
-reload-no-permission: "&cBạn không có quyền tải lại các cài đặt plugin!"
+reload-success: "&aĐã tải lại plugins!"
+reload-no-permission: "&cBạn không có quyền để tải lại plugins!"
 
 # Remove Command
 remove-no-args: "&cBạn không chỉ định IDs để xóa! &b/pp remove <ID>"
diff --git a/src/plugin.yml b/src/plugin.yml
index 8bade0c..77a2be2 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: PlayerParticles
 main: com.esophose.playerparticles.PlayerParticles
-version: 6.3
+version: 6.4
 api-version: 1.13
 description: Display particles around your player using customized styles and data!
 author: Esophose