diff --git a/CommandGUI V2/pom.xml b/CommandGUI V2/pom.xml
index 1a4638e..99239da 100644
--- a/CommandGUI V2/pom.xml
+++ b/CommandGUI V2/pom.xml
@@ -6,7 +6,7 @@
net.t2code
CommandGUI_V2
- 2.5.21
+ 2.5.22_DEV
jar
CommandGUI
@@ -173,5 +173,10 @@
spigot
1.8r1
+
+ com.zaxxer
+ HikariCP
+ 3.4.5
+
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 1dc94fe..040854a 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
@@ -1,8 +1,10 @@
package de.jatitv.commandguiv2.Spigot;
//s queryList) {
+ try (Connection con = ds.getConnection()) {
+ Statement stmt = con.createStatement();
+ for (String query : queryList) {
+ send.debug(Main.plugin, query);
+ stmt.addBatch(query);
+ }
+ stmt.executeBatch();
+ stmt.close();
+ } catch (SQLException e) {
+ System.err.println(e.getMessage());
}
}
- public static ArrayList selectAll(String query) {
- ArrayList Result = new ArrayList<>();
- try (Connection con = DriverManager.getConnection(url, user, password)) {
+ public static HashMap> selectAll(String query) {
+ send.debug(Main.plugin, query);
+ HashMap> Result = new HashMap<>();
+ try (Connection con = ds.getConnection()) {
Statement stmt = con.createStatement();
ResultSet rs = stmt.executeQuery(query);
int columns = rs.getMetaData().getColumnCount();
while (rs.next()) {
- Result.add(rs.getString(1));
+ ArrayList columnList = new ArrayList<>();
+ for (int i = 1; i <= columns; i++) {
+ columnList.add(rs.getString(i));
+ }
+ Result.put(rs.getString(1), columnList);
}
rs.close();
stmt.close();
@@ -69,11 +98,11 @@ public class MySQL {
}
public static String select(String query) {
+ send.debug(Main.plugin, query);
String Ausgabe = "";
- try (Connection con = DriverManager.getConnection(url, user, password)) {
+ try (Connection con = ds.getConnection()) {
Statement stmt = con.createStatement();
ResultSet rs = stmt.executeQuery(query);
- int columns = rs.getMetaData().getColumnCount();
while (rs.next()) {
Ausgabe = String.valueOf(rs.getString(1));
}
@@ -86,11 +115,11 @@ public class MySQL {
}
public static int count(String query) {
- Integer count = 0;
- try (Connection con = DriverManager.getConnection(url, user, password)) {
+ send.debug(Main.plugin, query);
+ int count = 0;
+ try (Connection con = ds.getConnection()) {
Statement stmt = con.createStatement();
ResultSet rs = stmt.executeQuery(query);
- int columns = rs.getMetaData().getColumnCount();
while (rs.next()) {
count++;
}
@@ -101,4 +130,28 @@ public class MySQL {
}
return count;
}
+
+ public static ArrayList selectRow(String query) {
+ send.debug(Main.plugin, query);
+ ArrayList Result = new ArrayList<>();
+ try (Connection con = ds.getConnection()) {
+ Statement stmt = con.createStatement();
+ ResultSet rs = stmt.executeQuery(query);
+ int columns = rs.getMetaData().getColumnCount();
+ while (rs.next()) {
+ for (int i = 1; i <= columns; i++) {
+ Result.add(rs.getString(i));
+ }
+ }
+ rs.close();
+ stmt.close();
+ } catch (SQLException ex) {
+ System.err.println(ex.getMessage());
+ }
+ return Result;
+ }
+
+ public static void close() {
+ ds.close();
+ }
}
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 73bd2fc..30dd7ea 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
@@ -5,11 +5,13 @@ import de.jatitv.commandguiv2.Spigot.Main;
import de.jatitv.commandguiv2.Spigot.cmdManagement.Commands;
import de.jatitv.commandguiv2.Spigot.cmdManagement.Help;
import de.jatitv.commandguiv2.Spigot.config.DefaultGUICreate;
+import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
import de.jatitv.commandguiv2.Spigot.system.database.Select_Database;
import net.t2code.lib.Spigot.Lib.messages.send;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
public class CGuiAPI {
public static Boolean JoinDisable = false;
@@ -17,12 +19,25 @@ public class CGuiAPI {
public static void onItemChange(Player player) {
ItemChange.itemChange(player, false);
}
+
+ public static boolean hasUseItemInMainHand(Player player) {
+ ItemStack item = player.getInventory().getItemInMainHand();
+ return item.hasItemMeta() && item.getItemMeta().hasDisplayName()
+ && item.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name);
+ }
+
+ public static boolean hasUseItemInOffHand(Player player) {
+ ItemStack item = player.getInventory().getItemInOffHand();
+ return item.hasItemMeta() && item.getItemMeta().hasDisplayName()
+ && item.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name);
+ }
+
public static void onItemChange(Player player, Boolean setCursor) {
ItemChange.itemChange(player, setCursor);
}
public static void disableItemGiveOnJoin(Boolean disableItemGiveOnJoin) {
- send.debug(Main.plugin,"CGuiAPI: " +disableItemGiveOnJoin);
+ send.debug(Main.plugin, "CGuiAPI: " + disableItemGiveOnJoin);
JoinDisable = disableItemGiveOnJoin;
}
diff --git a/CommandGUI V2/src/main/resources/META-INF/MANIFEST.MF b/CommandGUI V2/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7f041a7
--- /dev/null
+++ b/CommandGUI V2/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Main-Class:
+Class-Path: PlugmanGUI-3.0.jar spigot-1.8r3.jar spigot-1.9r1.jar spigot-
+ 1.15r1.jar T2CodeLib-10.3.jar spigot-1.18r1.jar bungee-1615.jar spigot-
+ 1.9r2.jar spigot-1.16r3.jar spigot-1.14r1.jar slf4j-api-1.7.25.jar Luck
+ yBox-API-4.2.2.jar spigot-1.10r1.jar spigot-1.16r1.jar spigot-1.13r2.ja
+ r HikariCP-3.4.5.jar spigot-1.11r1.jar spigot-1.13r1.jar spigot-1.8r2.j
+ ar spigot-1.17r1.jar spigot-1.12r1.jar spigot-1.16r2.jar spigot-1.8r1.j
+ ar
+