Add Configuration Option to enable or disable the GUI for the other u…

…ser commands
AlessioGr · Sep 20, 2021 · b49a3a6 · b49a3a6
1 parent ca365c7
commit b49a3a6
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 4 deletions.
diff --git a/.gradle/7.1.1/executionHistory/executionHistory.bin b/.gradle/7.1.1/executionHistory/executionHistory.bin
diff --git a/.gradle/7.1.1/executionHistory/executionHistory.lock b/.gradle/7.1.1/executionHistory/executionHistory.lock
diff --git a/.gradle/7.1.1/fileHashes/fileHashes.bin b/.gradle/7.1.1/fileHashes/fileHashes.bin
diff --git a/.gradle/7.1.1/fileHashes/fileHashes.lock b/.gradle/7.1.1/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/build/resources/main/general.yml b/build/resources/main/general.yml
@@ -11,3 +11,5 @@ gui:
   questpreview:
     # If set to false, clickable text will be used for Quest Previews instead
     enabled: true
+  usercommands:
+    enabled: true
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/java/notquests/notquests/Commands/CommandNotQuests.java b/src/main/java/notquests/notquests/Commands/CommandNotQuests.java
@@ -65,11 +65,11 @@ public CommandNotQuests(NotQuests main) {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         if (sender instanceof Player player) {
-            boolean guiEnabled = true;
-            if (label.equalsIgnoreCase("qg")) {
-                guiEnabled = false;
+            boolean guiEnabled = main.getDataManager().getConfiguration().isUserCommandsUseGUI();
+            //if (label.equalsIgnoreCase("qg")) {
+                //guiEnabled = false;
                 //player.sendMessage("§aOpening NotQuests GUI §1[BETA]");
-            }
+            //}
             if (sender.hasPermission("notnot.quests.use")) {
                 QuestPlayer questPlayer = main.getQuestPlayerManager().getQuestPlayer((player.getUniqueId()));
                 sender.sendMessage("");

diff --git a/src/main/java/notquests/notquests/Managers/Configuration.java b/src/main/java/notquests/notquests/Managers/Configuration.java
@@ -17,6 +17,7 @@ public class Configuration {
     private int port;
 
     private boolean questPreviewUseGUI = true;
+    private boolean userCommandsUseGUI = true;
     private boolean mySQLEnabled = false;
 
     public Configuration(){
@@ -78,4 +79,13 @@ public final boolean isMySQLEnabled(){
     public void setMySQLEnabled(final boolean mySQLEnabled){
         this.mySQLEnabled = mySQLEnabled;
     }
+
+
+    public final boolean isUserCommandsUseGUI() {
+        return userCommandsUseGUI;
+    }
+
+    public void setUserCommandsUseGUI(final boolean userCommandsUseGUI) {
+        this.userCommandsUseGUI = userCommandsUseGUI;
+    }
 }
diff --git a/src/main/java/notquests/notquests/Managers/DataManager.java b/src/main/java/notquests/notquests/Managers/DataManager.java
@@ -277,6 +277,11 @@ public final void loadGeneralConfig() {
         }
         configuration.setQuestPreviewUseGUI(getGeneralConfig().getBoolean("gui.questpreview.enabled"));
 
+        if(!getGeneralConfig().isBoolean("gui.usercommands.enabled")){
+            getGeneralConfig().set("gui.usercommands.enabled", true);
+        }
+        configuration.setUserCommandsUseGUI(getGeneralConfig().getBoolean("gui.usercommands.enabled"));
+
 
 
         saveGeneralConfig();

diff --git a/src/main/resources/general.yml b/src/main/resources/general.yml
@@ -11,3 +11,5 @@ gui:
   questpreview:
     # If set to false, clickable text will be used for Quest Previews instead
     enabled: true
+  usercommands:
+    enabled: true