diff --git a/CommandGUI V2/pom.xml b/CommandGUI V2/pom.xml
index 76ca8b5..05edcbd 100644
--- a/CommandGUI V2/pom.xml
+++ b/CommandGUI V2/pom.xml
@@ -6,7 +6,11 @@
net.t2code
CommandGUI_V2
+<<<<<<< Updated upstream
2.7.7
+=======
+ 2.8.1
+>>>>>>> Stashed changes
jar
CommandGUI
@@ -85,7 +89,11 @@
net.t2code
T2CodeLib
+<<<<<<< Updated upstream
11.9
+=======
+ 12.1
+>>>>>>> Stashed changes
net.t2code
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java
index 12b6bba..26574f4 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java
@@ -65,7 +65,6 @@ public final class Main extends JavaPlugin {
}
Load.onLoad(Util.getPrefix(), autor, version, Util.getSpigot(), Util.getSpigotID(), Util.getDiscord(), Util.getBstatsID());
enable = true;
-
}
public static void addonLoad() {
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java
index 2168e02..3c09744 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java
@@ -58,12 +58,12 @@ public class Commands {
send.console(Util.getPrefix() + "§8-------------------------------");
send.console(Util.getPrefix() + " §6Plugin reload...");
send.console(Util.getPrefix() + "§8-------------------------------");
-
- CmdExecuter_GUI.arg1.clear();
- CmdExecuter_GUI.arg1.put("admin", "commandgui.admin;commandgui.giveitem.other;commandgui.command.info");
-
SelectConfig.onSelect();
Main.plugin.reloadConfig();
+
+ CmdExecuter_GUI.arg1.clear();
+ CmdExecuter_GUI.arg1.put(SelectConfig.adminSubCommand, "commandgui.admin;commandgui.giveitem.other;commandgui.command.info");
+
if (!Objects.equals(SelectDatabase.getStorage().toString(), SelectConfig.storage)) {
if (sender instanceof Player) send.sender(sender, "You have changed the storage medium! To apply this change, you must restart the server!");
send.warning(Main.plugin, "You have changed the storage medium! To apply this change, you must restart the server!");
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java
index e681131..bacbd3d 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java
@@ -129,6 +129,10 @@ public class SelectConfig {
Debug = yamlConfiguration.getBoolean("Plugin.Debug");
HelpAlias = yamlConfiguration.getBoolean("Plugin.HelpAlias");
+<<<<<<< Updated upstream
+=======
+ adminSubCommand = yamlConfiguration.getString("Plugin.AdminSubCommand").toLowerCase();
+>>>>>>> Stashed changes
language = yamlConfiguration.getString("Plugin.language");
Currency = yamlConfiguration.getString("Plugin.Currency");
DefaultGUI = yamlConfiguration.getString("Plugin.DefaultGUI");
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java
index d8428a9..6c42dcb 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java
@@ -153,6 +153,32 @@ public class Obj_Select {
Boolean pluginReloadEnable = yamlConfiguration.getBoolean("Slots.Function.SetConfig.PluginReload.Enable");
String pluginReloadCommand = yamlConfiguration.getString("Slots.Function.SetConfig.PluginReload.Command");
+<<<<<<< Updated upstream
+=======
+ Boolean functionVotePoints = yamlConfiguration.getBoolean("Slots.Function.FunctionVotePoints.Enable");
+ FunctionVoteEnum functionVotePointsMode = null;
+ if (yamlConfiguration.get("Slots.Function.FunctionVotePoints.Mode") != null) {
+ try {
+ functionVotePointsMode = FunctionVoteEnum.valueOf(yamlConfiguration.getString("Slots.Function.FunctionVotePoints.Mode").toUpperCase());
+ } catch (Exception ex) {
+ send.error(Main.plugin, "The VotePoints Mode " + yamlConfiguration.getString("Slots.Function.FunctionVotePoints.Mode").toUpperCase() + " in the function file "
+ + config.getName() + " does not exist. Please use one of the supported modules. (ADD, REMOVE)");
+ }
+ }
+
+ Integer functionVotePointsAmount = yamlConfiguration.getInt("Slots.Function.FunctionVotePoints.Amount");
+ Boolean functionItem = yamlConfiguration.getBoolean("Slots.Function.FunctionItem.Enable");
+ FunctionItemEnum functionItemMode = null;
+ if (yamlConfiguration.get("Slots.Function.FunctionItem.Mode") != null) {
+ try {
+ functionItemMode = FunctionItemEnum.valueOf(yamlConfiguration.getString("Slots.Function.FunctionItem.Mode").toUpperCase());
+ } catch (Exception ex) {
+ send.error(Main.plugin, "The Item Mode " + yamlConfiguration.getString("Slots.Function.FunctionItem.Mode").toUpperCase() + " in the function file "
+ + config.getName() + " does not exist. Please use one of the supported modules. (ADD, REMOVE)");
+ }
+ }
+ String functionItemItem = yamlConfiguration.getString("Slots.Function.FunctionItem.Item");
+>>>>>>> Stashed changes
Function function = new Function(key, empty, itemAmount, playerHead_Enable, base64_Enable, base64Value, playerWhoHasOpenedTheGUI, playerName, item, name, lore,
customSound_Enable, customSound_NoSound, customSound_Sound, cost_Enable, price, command_Enable, command_BungeeCommand, commandAsConsole, command,
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Load.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Load.java
index 3822a16..6cbe1d3 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Load.java
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Load.java
@@ -96,11 +96,7 @@ public class Load {
} catch (Exception e) {
e.printStackTrace();
}
- try {
- CmdExecuter_GUI.arg1.put("admin", "commandgui.admin;commandgui.giveitem.other;commandgui.command.info");
- } catch (Exception e) {
- e.printStackTrace();
- }
+
try {
SelectMessages.onSelect(prefix);
} catch (Exception e) {
@@ -111,6 +107,11 @@ public class Load {
} catch (Exception e) {
e.printStackTrace();
}
+ try {
+ CmdExecuter_GUI.arg1.put(SelectConfig.adminSubCommand, "commandgui.admin;commandgui.giveitem.other;commandgui.command.info");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
send.console(prefix + " §8-------------------------------");
loadStorage(prefix);
diff --git a/CommandGUI V2/src/main/resources/plugin.yml b/CommandGUI V2/src/main/resources/plugin.yml
index 0d29390..114044c 100644
--- a/CommandGUI V2/src/main/resources/plugin.yml
+++ b/CommandGUI V2/src/main/resources/plugin.yml
@@ -4,13 +4,8 @@ main: de.jatitv.commandguiv2.Spigot.Main
api-version: 1.13
prefix: CommandGUI
authors: [ JaTiTV ]
-
-softdepend:
+depend:
- T2CodeLib
- - Vault
- - PlaceholderAPI
- - PlotSquaredGUI
- - PlugManGUI
commands:
commandgui: