diff --git a/CommandGUI V2/pom.xml b/CommandGUI V2/pom.xml
index 4f53991..0742b61 100644
--- a/CommandGUI V2/pom.xml
+++ b/CommandGUI V2/pom.xml
@@ -69,7 +69,6 @@
placeholderapi
http://repo.extendedclip.com/content/repositories/placeholderapi/
-
@@ -113,12 +112,6 @@
HikariCP
4.0.3
-
- me.clip
- placeholderapi
- 2.11.1
- provided
-
org.slf4j
slf4j-jdk14
@@ -129,5 +122,11 @@
slf4j-api
1.7.22
+
+ me.clip
+ placeholderapi
+ 2.11.1
+ provided
+
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 ce24e27..2f9525c 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
@@ -11,7 +11,7 @@ import de.jatitv.commandguiv2.Spigot.config.config.ConfigCreate;
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
import de.jatitv.commandguiv2.Spigot.config.languages.LanguagesCreate;
import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import de.jatitv.commandguiv2.Spigot.system.RegisterPermissions;
+import de.jatitv.commandguiv2.Spigot.system.Permissions;
import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase;
import de.jatitv.commandguiv2.Util;
import net.t2code.lib.Spigot.Lib.items.ItemVersion;
@@ -85,7 +85,7 @@ public class Commands {
e.printStackTrace();
}
try {
- RegisterPermissions.onPermRegister();
+ Permissions.onPermRegister();
} catch (Exception e) {
e.printStackTrace();
}
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 5fe88fc..15858dd 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
@@ -29,11 +29,9 @@ public class SelectConfig {
public static Boolean HelpAlias;
public static String language;
public static String Currency;
- public static List mainCommands;
public static String storage;
-
public static Boolean Bungee;
public static String thisServer;
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 1d0837a..2d6ad1f 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
@@ -46,7 +46,6 @@ public class Load {
send.console(prefix + " ยง8-------------------------------");
-
if (!new File(Main.getPath(), "config.yml").exists()) {
try {
CreateGUI.configCreate();
@@ -122,7 +121,7 @@ public class Load {
}
try {
- RegisterPermissions.onPermRegister();
+ Permissions.onPermRegister();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/RegisterPermissions.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Permissions.java
similarity index 99%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/RegisterPermissions.java
rename to CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Permissions.java
index a67fd41..0f853c7 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/RegisterPermissions.java
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Permissions.java
@@ -7,7 +7,7 @@ import net.t2code.lib.Spigot.Lib.register.Register;
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.Plugin;
-public class RegisterPermissions {
+public class Permissions {
private static final Plugin plugin = Main.plugin;
public static final String key = "commandgui.";
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SelectDatabase.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SelectDatabase.java
index 3da6206..b2b9d5f 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SelectDatabase.java
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SelectDatabase.java
@@ -17,7 +17,7 @@ public class SelectDatabase {
}
public static void nameCheck(Player player) {
- switch (Storage){
+ switch (Storage) {
case MYSQL:
MySQL.query("UPDATE `gui-item` SET Name='" + player.getName() + "' WHERE UUID='" + player.getUniqueId() + "';");
break;
@@ -26,13 +26,11 @@ public class SelectDatabase {
break;
case SQLITE:
default:
- SQLITE.query("UPDATE `gui-item` SET Name='" + player.getName() + "' WHERE UUID='" + player.getUniqueId() + "';");
- break;
+ SQLITE.query("UPDATE `gui-item` SET Name='" + player.getName() + "' WHERE UUID='" + player.getUniqueId() + "';");
+ break;
+ }
}
-
-}
-
public static void setSlot(Player player, Integer slot) {
switch (Storage) {
case MYSQL:
@@ -90,7 +88,7 @@ public class SelectDatabase {
switch (Storage) {
case MYSQL:
String result = MySQL.select("SELECT `Status` FROM `gui-item` WHERE `UUID`='" + player.getUniqueId() + "';");
- if(result == null || result.equals("")){
+ if (result == null || result.equals("")) {
return true;
}
return result.equals("1");
@@ -99,7 +97,7 @@ public class SelectDatabase {
case SQLITE:
default:
String result2 = SQLITE.select("SELECT `Status` FROM `gui-item` WHERE `UUID`='" + player.getUniqueId() + "';");
- if(result2 == null || result2.equals("")){
+ if (result2 == null || result2.equals("")) {
return true;
}
return result2.equals("1");
@@ -110,7 +108,7 @@ public class SelectDatabase {
switch (Storage) {
case MYSQL:
String result = MySQL.select("SELECT `Slot` FROM `gui-item` WHERE `UUID`='" + player.getUniqueId() + "';");
- if(result == null || result.equals("")|| result.equals("null")){
+ if (result == null || result.equals("") || result.equals("null")) {
return null;
}
return Integer.parseInt(result);
@@ -119,7 +117,7 @@ public class SelectDatabase {
case SQLITE:
default:
String result2 = SQLITE.select("SELECT `Slot` FROM `gui-item` WHERE `UUID`='" + player.getUniqueId() + "';");
- if(result2 == null || result2.equals("") || result2.equals("null")){
+ if (result2 == null || result2.equals("") || result2.equals("null")) {
return null;
}
return Integer.parseInt(result2);
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/api/CGuiAPI.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/api/CGuiAPI.java
index 38afa67..2d8a4e7 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/api/CGuiAPI.java
+++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/api/CGuiAPI.java
@@ -8,6 +8,7 @@ import de.jatitv.commandguiv2.Spigot.cmdManagement.Help;
import de.jatitv.commandguiv2.Spigot.config.gui.CreateGUI;
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
+import de.jatitv.commandguiv2.Spigot.system.Permissions;
import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase;
import net.t2code.lib.Spigot.Lib.messages.send;
import org.bukkit.command.CommandSender;
@@ -73,26 +74,24 @@ public class CGuiAPI {
}
public static void sendPluginInfo(CommandSender sender) {
- if (sender.hasPermission("commandgui.command.info")) {
+ if (sender.hasPermission(Permissions.info)) {
Commands.info(sender);
} else sender.sendMessage(SelectMessages.NoPermissionForCommand
- .replace("[cmd]", "/commandgui admin").replace("[perm]", "commandgui.command.info"));
+ .replace("[cmd]", "/commandgui admin").replace("[perm]", Permissions.info));
}
public static void createDefaultGUI(CommandSender sender) {
- if (sender.hasPermission("commandgui.admin")) {
+ if (sender.hasPermission(Permissions.admin)) {
CreateGUI.configCreate();
sender.sendMessage(SelectMessages.DefaultGUIcreate.replace("[directory]", Main.getPath() + "\\GUIs\\default.yml"));
} else sender.sendMessage(SelectMessages.NoPermissionForCommand
- .replace("[cmd]", "/commandgui admin").replace("[perm]", "commandgui.admin"));
+ .replace("[cmd]", "/commandgui admin").replace("[perm]", Permissions.admin));
}
public static void reload(CommandSender sender) {
- if (sender.hasPermission("commandgui.admin")) {
+ if (sender.hasPermission(Permissions.admin)) {
Commands.reload(sender);
} else sender.sendMessage(SelectMessages.NoPermissionForCommand
- .replace("[cmd]", "/commandgui admin").replace("[perm]", "commandgui.admin"));
+ .replace("[cmd]", "/commandgui admin").replace("[perm]", Permissions.admin));
}
-
-
}