Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
19822f7024 | |||
ed810f31d7 | |||
b0286e597f | |||
ddfea4eba6 | |||
|
ed86e7b143 | ||
32c1219bb2 | |||
326dfae0e9 |
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>net.t2code</groupId>
|
<groupId>net.t2code</groupId>
|
||||||
<artifactId>CommandGUI_V2</artifactId>
|
<artifactId>CommandGUI_V2</artifactId>
|
||||||
<version>2.7.1</version>
|
<version>2.7.4</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>CommandGUI</name>
|
<name>CommandGUI</name>
|
||||||
@@ -85,7 +85,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.t2code</groupId>
|
<groupId>net.t2code</groupId>
|
||||||
<artifactId>T2CodeLib</artifactId>
|
<artifactId>T2CodeLib</artifactId>
|
||||||
<version>11.6</version>
|
<version>11.8</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.t2code</groupId>
|
<groupId>net.t2code</groupId>
|
||||||
|
@@ -1,5 +1,7 @@
|
|||||||
package de.jatitv.commandguiv2.Bungee;
|
package de.jatitv.commandguiv2.Bungee;
|
||||||
|
|
||||||
|
import de.jatitv.commandguiv2.Spigot.objects.Obj_Select;
|
||||||
|
import de.jatitv.commandguiv2.Util;
|
||||||
import net.md_5.bungee.BungeeCord;
|
import net.md_5.bungee.BungeeCord;
|
||||||
import net.md_5.bungee.api.ProxyServer;
|
import net.md_5.bungee.api.ProxyServer;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
@@ -33,6 +35,7 @@ public class BListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
|
Util.sendTryCatch(Obj_Select.class, e.getStackTrace()[0]);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -27,6 +27,9 @@ import java.util.logging.Level;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.zip.GZIPOutputStream;
|
import java.util.zip.GZIPOutputStream;
|
||||||
import javax.net.ssl.HttpsURLConnection;
|
import javax.net.ssl.HttpsURLConnection;
|
||||||
|
|
||||||
|
import de.jatitv.commandguiv2.Spigot.objects.Obj_Select;
|
||||||
|
import de.jatitv.commandguiv2.Util;
|
||||||
import net.md_5.bungee.api.plugin.Plugin;
|
import net.md_5.bungee.api.plugin.Plugin;
|
||||||
import net.md_5.bungee.config.Configuration;
|
import net.md_5.bungee.config.Configuration;
|
||||||
import net.md_5.bungee.config.ConfigurationProvider;
|
import net.md_5.bungee.config.ConfigurationProvider;
|
||||||
@@ -291,6 +294,7 @@ public class BMetrics {
|
|||||||
// Send the data
|
// Send the data
|
||||||
sendData(data);
|
sendData(data);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
Util.sendTryCatch(Obj_Select.class, e.getStackTrace()[0]);
|
||||||
// Something went wrong! :(
|
// Something went wrong! :(
|
||||||
if (logErrors) {
|
if (logErrors) {
|
||||||
errorLogger.accept("Could not submit bStats metrics data", e);
|
errorLogger.accept("Could not submit bStats metrics data", e);
|
||||||
|
@@ -10,6 +10,8 @@ import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
|
|||||||
import de.jatitv.commandguiv2.Spigot.gui.OpenGUI;
|
import de.jatitv.commandguiv2.Spigot.gui.OpenGUI;
|
||||||
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
||||||
import de.jatitv.commandguiv2.Spigot.Main;
|
import de.jatitv.commandguiv2.Spigot.Main;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.system.Papi;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.system.Placeholder;
|
||||||
import de.jatitv.commandguiv2.Util;
|
import de.jatitv.commandguiv2.Util;
|
||||||
import net.t2code.lib.Spigot.Lib.items.ItemVersion;
|
import net.t2code.lib.Spigot.Lib.items.ItemVersion;
|
||||||
import net.t2code.lib.Spigot.Lib.messages.send;
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
@@ -48,18 +50,25 @@ public class GUIListener implements Listener {
|
|||||||
|| (Main.PaPi && player.getOpenInventory().getTitle().equals(Replace.replace(prefix, player, GUICode + gui.guiName)))) {
|
|| (Main.PaPi && player.getOpenInventory().getTitle().equals(Replace.replace(prefix, player, GUICode + gui.guiName)))) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
for (Slot slot : gui.slots) {
|
for (Slot slot : gui.slots) {
|
||||||
|
execute(e,slot,player, gui);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void execute(InventoryClickEvent e, Slot slot, Player player, Gui gui){
|
||||||
Function function = Main.functionHashMap.get(slot.function);
|
Function function = Main.functionHashMap.get(slot.function);
|
||||||
if (e.getSlot() != slot.slot) continue;
|
if (e.getSlot() != slot.slot) return;
|
||||||
if (slot.permission && !player.hasPermission(slot.permissionToSee)) continue;
|
if (slot.permission && !player.hasPermission(slot.permissionToSee)) return;
|
||||||
if (slot.permission && !player.hasPermission(slot.permissionToUse)) {
|
if (slot.permission && !player.hasPermission(slot.permissionToUse)) {
|
||||||
player.sendMessage(SelectMessages.NoPermissionForItem.replace("[item]", Replace.replace(prefix, function.name))
|
player.sendMessage(SelectMessages.NoPermissionForItem.replace("[item]", Replace.replace(prefix, function.name))
|
||||||
.replace("[perm]", slot.permissionToUse));
|
.replace("[perm]", slot.permissionToUse));
|
||||||
continue;
|
return;
|
||||||
}
|
}
|
||||||
if (e.getCurrentItem().getType() == ItemVersion.getHead() || e.getCurrentItem().getType() == ItemVersion.getGreenWool().getType() ||
|
if (e.getCurrentItem().getType() == ItemVersion.getHead() || e.getCurrentItem().getType() == ItemVersion.getGreenWool().getType() ||
|
||||||
e.getCurrentItem().getType() == ItemVersion.getRedWool().getType() ||
|
e.getCurrentItem().getType() == ItemVersion.getRedWool().getType() ||
|
||||||
e.getCurrentItem().getType() == Material.valueOf(function.item.toUpperCase().replace(".", "_"))) {
|
e.getCurrentItem().getType() == Material.valueOf(function.item.toUpperCase().replace(".", "_"))) {
|
||||||
if (!slot.enable) continue;
|
if (!slot.enable) return;
|
||||||
if (function.cost_Enable) {
|
if (function.cost_Enable) {
|
||||||
if (function.command_Enable || function.message_Enable || function.openGUI_Enable || function.serverChange) {
|
if (function.command_Enable || function.message_Enable || function.openGUI_Enable || function.serverChange) {
|
||||||
|
|
||||||
@@ -84,9 +93,6 @@ public class GUIListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void execute(Function function, Slot slot, Player player, InventoryClickEvent e, Gui gui) {
|
private static void execute(Function function, Slot slot, Player player, InventoryClickEvent e, Gui gui) {
|
||||||
if (function.togglePermission) togglePerm(function, gui, player);
|
if (function.togglePermission) togglePerm(function, gui, player);
|
||||||
@@ -149,12 +155,12 @@ public class GUIListener implements Listener {
|
|||||||
for (String msg : slot.message) {
|
for (String msg : slot.message) {
|
||||||
if (Main.PaPi) {
|
if (Main.PaPi) {
|
||||||
if (slot.cost_Enable) {
|
if (slot.cost_Enable) {
|
||||||
player.sendMessage(Replace.replacePrice(prefix, player, msg, slot.price + " " + SelectConfig.Currency));
|
player.sendMessage(Replace.replacePrice(prefix, player, Placeholder.replace(msg, player), slot.price + " " + SelectConfig.Currency));
|
||||||
} else player.sendMessage(Replace.replace(prefix, player, msg.replace("[prefix]", prefix)));
|
} else player.sendMessage(Replace.replace(prefix, player, Placeholder.replace(msg, player)));
|
||||||
} else {
|
} else {
|
||||||
if (slot.cost_Enable) {
|
if (slot.cost_Enable) {
|
||||||
player.sendMessage(Replace.replacePrice(prefix, msg, slot.price + " " + SelectConfig.Currency));
|
player.sendMessage(Replace.replacePrice(prefix, Placeholder.replace(msg, player), slot.price + " " + SelectConfig.Currency));
|
||||||
} else player.sendMessage(Replace.replace(prefix, msg.replace("[prefix]", prefix)));
|
} else player.sendMessage(Replace.replace(prefix, Placeholder.replace(msg, player)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -261,7 +267,7 @@ public class GUIListener implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void toggleUseItem(Player player, Gui gui) {
|
private static void toggleUseItem(Player player, Gui gui) {
|
||||||
if (Events.useItemHashMap.get(player)) {
|
if (Events.useItemHashMap.get(player.getName())) {
|
||||||
Commands.itemOff(player);
|
Commands.itemOff(player);
|
||||||
} else {
|
} else {
|
||||||
Commands.itemOn(player);
|
Commands.itemOn(player);
|
||||||
|
@@ -4,6 +4,7 @@ import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events;
|
|||||||
import de.jatitv.commandguiv2.Spigot.Main;
|
import de.jatitv.commandguiv2.Spigot.Main;
|
||||||
import de.jatitv.commandguiv2.Spigot.system.UseItem;
|
import de.jatitv.commandguiv2.Spigot.system.UseItem;
|
||||||
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase;
|
||||||
import net.t2code.lib.Spigot.Lib.messages.send;
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.scheduler.BukkitRunnable;
|
import org.bukkit.scheduler.BukkitRunnable;
|
||||||
@@ -14,11 +15,7 @@ public class ItemChange {
|
|||||||
if (SelectConfig.UseItem_InventorySlotEnforce) {
|
if (SelectConfig.UseItem_InventorySlotEnforce) {
|
||||||
slot = SelectConfig.UseItem_InventorySlot;
|
slot = SelectConfig.UseItem_InventorySlot;
|
||||||
} else {
|
} else {
|
||||||
if (Events.useItemSlotHashMap.get(player) == null) {
|
slot = Events.useItemSlotHashMap.get(player.getName());
|
||||||
slot = SelectConfig.UseItem_InventorySlot;
|
|
||||||
} else {
|
|
||||||
slot = Events.useItemSlotHashMap.get(player);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!SelectConfig.UseItem_Enable) {
|
if (!SelectConfig.UseItem_Enable) {
|
||||||
@@ -27,7 +24,7 @@ public class ItemChange {
|
|||||||
UseItem.removeItem(player);
|
UseItem.removeItem(player);
|
||||||
if (UseItem.protection(player, false)) return;
|
if (UseItem.protection(player, false)) return;
|
||||||
if (SelectConfig.UseItem_GiveOnlyOnFirstJoin) {
|
if (SelectConfig.UseItem_GiveOnlyOnFirstJoin) {
|
||||||
if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player)) {
|
if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player.getName())) {
|
||||||
if (!player.hasPlayedBefore()) {
|
if (!player.hasPlayedBefore()) {
|
||||||
new BukkitRunnable() {
|
new BukkitRunnable() {
|
||||||
@Override
|
@Override
|
||||||
@@ -53,8 +50,7 @@ public class ItemChange {
|
|||||||
new BukkitRunnable() {
|
new BukkitRunnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
if (player == null) return;
|
if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player.getName())) {
|
||||||
if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player)) {
|
|
||||||
if (SelectConfig.UseItem_InventorySlotEnforce || player.getInventory().getItem(slot - 1) == null) {
|
if (SelectConfig.UseItem_InventorySlotEnforce || player.getInventory().getItem(slot - 1) == null) {
|
||||||
send.debug(Main.plugin, "Give: " + player.getName());
|
send.debug(Main.plugin, "Give: " + player.getName());
|
||||||
UseItem.giveUseItem(player);
|
UseItem.giveUseItem(player);
|
||||||
|
@@ -34,16 +34,16 @@ import java.util.Iterator;
|
|||||||
|
|
||||||
public class Events implements Listener {
|
public class Events implements Listener {
|
||||||
|
|
||||||
public static HashMap<Player, Boolean> useItemHashMap = new HashMap<>();
|
public static HashMap<String, Boolean> useItemHashMap = new HashMap<>();
|
||||||
public static HashMap<Player, Integer> useItemSlotHashMap = new HashMap<>();
|
public static HashMap<String, Integer> useItemSlotHashMap = new HashMap<>();
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onJoin(PlayerJoinEvent e) {
|
public void onJoin(PlayerJoinEvent e) {
|
||||||
if (SelectDatabase.selectItemStatus(e.getPlayer())) {
|
useItemHashMap.put(e.getPlayer().getName(), SelectDatabase.selectItemStatus(e.getPlayer()));
|
||||||
useItemHashMap.put(e.getPlayer(), true);
|
Integer i = SelectDatabase.selectSlot(e.getPlayer());
|
||||||
} else useItemHashMap.put(e.getPlayer(), false);
|
if (i == null) {
|
||||||
|
useItemSlotHashMap.put(e.getPlayer().getName(), SelectConfig.UseItem_InventorySlot);
|
||||||
useItemSlotHashMap.put(e.getPlayer(), SelectDatabase.selectSlot(e.getPlayer()));
|
} else useItemSlotHashMap.put(e.getPlayer().getName(), i);
|
||||||
|
|
||||||
if (CGuiAPI.JoinDisable) {
|
if (CGuiAPI.JoinDisable) {
|
||||||
send.debug(Main.plugin, "JoinDisable");
|
send.debug(Main.plugin, "JoinDisable");
|
||||||
@@ -62,7 +62,7 @@ public class Events implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onJoin(PlayerQuitEvent e) {
|
public void onJoin(PlayerQuitEvent e) {
|
||||||
useItemHashMap.remove(e.getPlayer());
|
useItemHashMap.remove(e.getPlayer().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGHEST)
|
@EventHandler(priority = EventPriority.HIGHEST)
|
||||||
@@ -136,10 +136,17 @@ public class Events implements Listener {
|
|||||||
}.runTaskLater(Main.plugin, SelectConfig.UseItemWorldChangeDelayInTicks * 1L);
|
}.runTaskLater(Main.plugin, SelectConfig.UseItemWorldChangeDelayInTicks * 1L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGHEST)
|
@EventHandler(priority = EventPriority.HIGHEST)
|
||||||
public void onInteract(PlayerInteractEvent e) {
|
public void onInteract(PlayerInteractEvent e) {
|
||||||
Player p = e.getPlayer();
|
Player p = e.getPlayer();
|
||||||
|
if (!p.isSneaking()) {
|
||||||
|
for (String material : SelectConfig.UseItemItemBlockBlacklist) {
|
||||||
|
if (e.getClickedBlock() != null) {
|
||||||
|
if (e.getClickedBlock().getType() == Material.valueOf(material)) return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (SelectConfig.UseItem_Enable) {
|
if (SelectConfig.UseItem_Enable) {
|
||||||
if (SelectConfig.UseItem_PlayerHead_Enable) {
|
if (SelectConfig.UseItem_PlayerHead_Enable) {
|
||||||
if (e.getItem() != null && p.getItemInHand().getType() == ItemVersion.getHead()) {
|
if (e.getItem() != null && p.getItemInHand().getType() == ItemVersion.getHead()) {
|
||||||
@@ -165,7 +172,7 @@ public class Events implements Listener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!legacy()) {
|
if (!Main.legacy) {
|
||||||
if (!topInventoryIsEmpty(player)) return;
|
if (!topInventoryIsEmpty(player)) return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -288,12 +295,6 @@ public class Events implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean legacy() {
|
|
||||||
if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12 || MCVersion.minecraft1_13 || MCVersion.minecraft1_14 || MCVersion.minecraft1_15 || NMSVersion.v1_16_R1) {
|
|
||||||
return true;
|
|
||||||
} else return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean topInventoryIsEmpty(Player p) {
|
private static boolean topInventoryIsEmpty(Player p) {
|
||||||
return p.getOpenInventory().getTopInventory().isEmpty();
|
return p.getOpenInventory().getTopInventory().isEmpty();
|
||||||
}
|
}
|
||||||
|
@@ -8,6 +8,8 @@ import de.jatitv.commandguiv2.Spigot.system.database.MySQL;
|
|||||||
import de.jatitv.commandguiv2.Util;
|
import de.jatitv.commandguiv2.Util;
|
||||||
import net.t2code.lib.Spigot.Lib.messages.T2CodeTemplate;
|
import net.t2code.lib.Spigot.Lib.messages.T2CodeTemplate;
|
||||||
import net.t2code.lib.Spigot.Lib.messages.send;
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
|
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
||||||
|
import net.t2code.lib.Spigot.Lib.minecraftVersion.NMSVersion;
|
||||||
import net.t2code.lib.Spigot.Lib.plugins.PluginCheck;
|
import net.t2code.lib.Spigot.Lib.plugins.PluginCheck;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
@@ -27,6 +29,7 @@ public final class Main extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static Boolean enable = false;
|
private static Boolean enable = false;
|
||||||
|
public static Boolean legacy = false;
|
||||||
|
|
||||||
public static String prefix = "§8[§4C§9GUI§8]";
|
public static String prefix = "§8[§4C§9GUI§8]";
|
||||||
|
|
||||||
@@ -57,6 +60,9 @@ public final class Main extends JavaPlugin {
|
|||||||
plugin = this;
|
plugin = this;
|
||||||
autor = plugin.getDescription().getAuthors();
|
autor = plugin.getDescription().getAuthors();
|
||||||
version = plugin.getDescription().getVersion();
|
version = plugin.getDescription().getVersion();
|
||||||
|
if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12 || MCVersion.minecraft1_13 || MCVersion.minecraft1_14 || MCVersion.minecraft1_15 || NMSVersion.v1_16_R1) {
|
||||||
|
legacy = true;
|
||||||
|
}
|
||||||
if (pluginNotFound("T2CodeLib", 96388, Util.getRequiredT2CodeLibVersion())) return;
|
if (pluginNotFound("T2CodeLib", 96388, Util.getRequiredT2CodeLibVersion())) return;
|
||||||
getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
|
getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
|
||||||
if (PluginCheck.papi()) {
|
if (PluginCheck.papi()) {
|
||||||
|
@@ -61,24 +61,6 @@ public class CmdExecuter_GUITab implements CommandExecutor, TabCompleter {
|
|||||||
} else sender.sendMessage(SelectMessages.NoPermissionForCommand
|
} else sender.sendMessage(SelectMessages.NoPermissionForCommand
|
||||||
.replace("[cmd]", "/commandgui admin").replace("[perm]", "commandgui.admin"));
|
.replace("[cmd]", "/commandgui admin").replace("[perm]", "commandgui.admin"));
|
||||||
break;
|
break;
|
||||||
case "debug":
|
|
||||||
if (sender.hasPermission("commandgui.admin")) {
|
|
||||||
Debug.onDebugFile(sender);
|
|
||||||
/*if (args.length == 2) {
|
|
||||||
if (args[1].equals("config")) {
|
|
||||||
Debug.debugmsg();
|
|
||||||
}
|
|
||||||
if (args[1].equals("2")) {
|
|
||||||
send.debug("2");
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
} else Debug.debugmsg();
|
|
||||||
|
|
||||||
*/
|
|
||||||
} else sender.sendMessage(SelectMessages.NoPermissionForCommand.replace("[cmd]", "/commandgui admin").replace("[perm]", "commandgui.admin"));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "give":
|
case "give":
|
||||||
if (args.length == 3) {
|
if (args.length == 3) {
|
||||||
if (sender.hasPermission("commandgui.giveitem.other")) {
|
if (sender.hasPermission("commandgui.giveitem.other")) {
|
||||||
|
@@ -70,7 +70,7 @@ public class Commands {
|
|||||||
Main.plugin.reloadConfig();
|
Main.plugin.reloadConfig();
|
||||||
if (!Objects.equals(SelectDatabase.getStorage().toString(), SelectConfig.storage)) {
|
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!");
|
if (sender instanceof Player) send.sender(sender, "You have changed the storage medium! To apply this change, you must restart the server!");
|
||||||
send.console("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!");
|
||||||
}
|
}
|
||||||
|
|
||||||
LanguagesCreate.langCreate();
|
LanguagesCreate.langCreate();
|
||||||
@@ -124,11 +124,7 @@ public class Commands {
|
|||||||
if (SelectConfig.UseItem_InventorySlotEnforce) {
|
if (SelectConfig.UseItem_InventorySlotEnforce) {
|
||||||
slot = SelectConfig.UseItem_InventorySlot;
|
slot = SelectConfig.UseItem_InventorySlot;
|
||||||
} else {
|
} else {
|
||||||
if (Events.useItemSlotHashMap.get(player) == null) {
|
slot = Events.useItemSlotHashMap.get(player.getName());
|
||||||
slot = SelectConfig.UseItem_InventorySlot;
|
|
||||||
} else {
|
|
||||||
slot = Events.useItemSlotHashMap.get(player);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
send.debug(Main.plugin, String.valueOf(slot));
|
send.debug(Main.plugin, String.valueOf(slot));
|
||||||
if (player.getInventory().getItem(slot - 1) == null) {
|
if (player.getInventory().getItem(slot - 1) == null) {
|
||||||
@@ -175,8 +171,8 @@ public class Commands {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Events.useItemHashMap.get(player)) {
|
if (Events.useItemHashMap.get(player.getName())) {
|
||||||
if (Objects.equals(Events.useItemSlotHashMap.get(player), setSlot)) {
|
if (Objects.equals(Events.useItemSlotHashMap.get(player.getName()), setSlot)) {
|
||||||
player.sendMessage(SelectMessages.ItemSlotAlreadySet.replace("[slot]", setSlot.toString()));
|
player.sendMessage(SelectMessages.ItemSlotAlreadySet.replace("[slot]", setSlot.toString()));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -189,9 +185,9 @@ public class Commands {
|
|||||||
|
|
||||||
UseItem.removeItem(player);
|
UseItem.removeItem(player);
|
||||||
SelectDatabase.setSlot(player, setSlot);
|
SelectDatabase.setSlot(player, setSlot);
|
||||||
Events.useItemSlotHashMap.replace(player, setSlot);
|
Events.useItemSlotHashMap.replace(player.getName(), setSlot);
|
||||||
|
|
||||||
if (Events.useItemHashMap.get(player)) {
|
if (Events.useItemHashMap.get(player.getName())) {
|
||||||
UseItem.giveUseItem(player);
|
UseItem.giveUseItem(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -6,15 +6,19 @@ import net.t2code.lib.Spigot.Lib.items.ItemVersion;
|
|||||||
import net.t2code.lib.Spigot.Lib.messages.send;
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
||||||
import net.t2code.lib.Spigot.Lib.yamlConfiguration.Config;
|
import net.t2code.lib.Spigot.Lib.yamlConfiguration.Config;
|
||||||
|
import org.bukkit.Material;
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
public class ConfigCreate {
|
public class ConfigCreate {
|
||||||
|
|
||||||
|
|
||||||
public static void configCreate() {
|
public static void configCreate() {
|
||||||
long long_ = System.currentTimeMillis();
|
long long_ = System.currentTimeMillis();
|
||||||
if (new File(Main.getPath(), "config.yml").exists()) {
|
if (new File(Main.getPath(), "config.yml").exists()) {
|
||||||
@@ -32,7 +36,9 @@ public class ConfigCreate {
|
|||||||
Config.set("Plugin.Currency", "$", yamlConfiguration);
|
Config.set("Plugin.Currency", "$", yamlConfiguration);
|
||||||
Config.set("Plugin.DefaultGUI", "default", yamlConfiguration);
|
Config.set("Plugin.DefaultGUI", "default", yamlConfiguration);
|
||||||
|
|
||||||
Config.set("Storage.Type", "SQLITE", yamlConfiguration);
|
if (Main.legacy){
|
||||||
|
Config.set("Storage.Type", "YML", yamlConfiguration);
|
||||||
|
} else Config.set("Storage.Type", "SQLITE", yamlConfiguration);
|
||||||
Config.set("Storage.MySQL.IP", "localhost", yamlConfiguration);
|
Config.set("Storage.MySQL.IP", "localhost", yamlConfiguration);
|
||||||
Config.set("Storage.MySQL.Port", 3306, yamlConfiguration);
|
Config.set("Storage.MySQL.Port", 3306, yamlConfiguration);
|
||||||
Config.set("Storage.MySQL.Database", "database", yamlConfiguration);
|
Config.set("Storage.MySQL.Database", "database", yamlConfiguration);
|
||||||
@@ -99,14 +105,45 @@ public class ConfigCreate {
|
|||||||
Config.set("Advanced.UseItem.World.Protection.RemoveItemWhenItIsDisabled", false, yamlConfiguration);
|
Config.set("Advanced.UseItem.World.Protection.RemoveItemWhenItIsDisabled", false, yamlConfiguration);
|
||||||
Config.set("Advanced.UseItem.World.Protection.Mode", "blacklist", yamlConfiguration);
|
Config.set("Advanced.UseItem.World.Protection.Mode", "blacklist", yamlConfiguration);
|
||||||
Config.set("Advanced.UseItem.World.Protection.List", Arrays.asList("World1", "World2"), yamlConfiguration);
|
Config.set("Advanced.UseItem.World.Protection.List", Arrays.asList("World1", "World2"), yamlConfiguration);
|
||||||
|
/*
|
||||||
|
Config.set("Advanced.UseItem.ItemBlockBlacklist", Arrays.asList("CHEST", "TRAPPED_CHEST", "FURNACE", "NOTE_BLOCK",
|
||||||
|
"CRAFTING_TABLE", "ENDER_CHEST", "ANVIL", "LOOM", "COMPOSTER", "BARREL", "SMOKER",
|
||||||
|
"BLAST_FURNACE", "CARTOGRAPHY_TABLE", "FLETCHING_TABLE", "GRINDSTONE", "SMITHING_TABLE", "STONECUTTER",
|
||||||
|
"HOPPER", "DISPENSER", "DROPPER", "REPEATER", "COMPARATOR", "LEVER", "DAYLIGHT_DETECTOR",
|
||||||
|
"STONE_BUTTON", "OAK_BUTTON", "SPRUCE_BUTTON", "BIRCH_BUTTON", "JUNGLE_BUTTON", "ACACIA_BUTTON", "DARK_OAK_BUTTON", "CRIMSON_BUTTON",
|
||||||
|
"IRON_DOOR", "OAK_DOOR", "SPRUCE_DOOR", "BIRCH_DOOR", "JUNGLE_DOOR", "ACACIA_DOOR", "DARK_OAK_DOOR", "CRIMSON_DOOR", "WARPED_DOOR",
|
||||||
|
"OAK_FENCE", "SPRUCE_FENCE", "BIRCH_FENCE", "JUNGLE_FENCE", "ACACIA_FENCE", "DARK_OAK_FENCE", "CRIMSON_FENCE", "WARPED_FENCE", "NETHER_BRICK_FENCE"), yamlConfiguration);
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
if (!yamlConfiguration.contains("Advanced.UseItem.ItemBlockBlacklist")) {
|
||||||
|
List<String> materialList = Arrays.asList("BUTTON", "DOOR", "FENCE", "CHEST", "FURNACE", "NOTE_BLOCK", "CRAFTING_TABLE", "WORKBENCH",
|
||||||
|
"ANVIL", "LOOM", "COMPOSTER", "BARREL", "SMOKER", "BLAST_FURNACE", "CARTOGRAPHY_TABLE", "FLETCHING_TABLE", "GRINDSTONE",
|
||||||
|
"SMITHING_TABLE", "STONECUTTER", "HOPPER", "DISPENSER", "DROPPER", "REPEATER", "COMPARATOR", "LEVER", "DAYLIGHT_DETECTOR", "BREWING_STAND", "TRAPDOOR", "BEACON"
|
||||||
|
);
|
||||||
|
|
||||||
|
List<String> materialBlacklist = new ArrayList<>();
|
||||||
|
|
||||||
|
for (Material material : Material.values()) {
|
||||||
|
for (String target : materialList) {
|
||||||
|
if (material.toString().contains(target)) materialBlacklist.add(material.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Config.set("Advanced.UseItem.ItemBlockBlacklist", materialBlacklist, yamlConfiguration);
|
||||||
|
}
|
||||||
|
|
||||||
Config.set("Toggle.Items.OnOrYes.Item.Base64.Enable", false, yamlConfiguration);
|
Config.set("Toggle.Items.OnOrYes.Item.Base64.Enable", false, yamlConfiguration);
|
||||||
Config.set("Toggle.Items.OnOrYes.Item.Base64.Base64Value", "", yamlConfiguration);
|
Config.set("Toggle.Items.OnOrYes.Item.Base64.Base64Value", "", yamlConfiguration);
|
||||||
Config.set("Toggle.Items.OnOrYes.Item.Material", ItemVersion.getGreenWool().getType().toString(), yamlConfiguration);
|
if (Main.legacy) {
|
||||||
|
Config.set("Toggle.Items.OnOrYes.Item.Material", "WOOL,5", yamlConfiguration);
|
||||||
|
} else Config.set("Toggle.Items.OnOrYes.Item.Material", ItemVersion.getGreenWool().getType().toString(), yamlConfiguration);
|
||||||
|
|
||||||
Config.set("Toggle.Items.OffOrNo.Item.Base64.Enable", false, yamlConfiguration);
|
Config.set("Toggle.Items.OffOrNo.Item.Base64.Enable", false, yamlConfiguration);
|
||||||
Config.set("Toggle.Items.OffOrNo.Item.Base64.Base64Value", "", yamlConfiguration);
|
Config.set("Toggle.Items.OffOrNo.Item.Base64.Base64Value", "", yamlConfiguration);
|
||||||
Config.set("Toggle.Items.OffOrNo.Item.Material", ItemVersion.getRedWool().getType().toString(), yamlConfiguration);
|
if (Main.legacy) {
|
||||||
|
Config.set("Toggle.Items.OffOrNo.Item.Material", "WOOL,14", yamlConfiguration);
|
||||||
|
} else Config.set("Toggle.Items.OffOrNo.Item.Material", ItemVersion.getRedWool().getType().toString(), yamlConfiguration);
|
||||||
|
|
||||||
Config.set("Toggle.Permission.Commands.True", "luckperms user [player] permission set [perm] true", yamlConfiguration);
|
Config.set("Toggle.Permission.Commands.True", "luckperms user [player] permission set [perm] true", yamlConfiguration);
|
||||||
Config.set("Toggle.Permission.Commands.False", "luckperms user [player] permission set [perm] false", yamlConfiguration);
|
Config.set("Toggle.Permission.Commands.False", "luckperms user [player] permission set [perm] false", yamlConfiguration);
|
||||||
|
@@ -4,8 +4,6 @@ import de.jatitv.commandguiv2.Spigot.Main;
|
|||||||
import de.jatitv.commandguiv2.Spigot.config.configConverter.ConfigConverterUnderV5;
|
import de.jatitv.commandguiv2.Spigot.config.configConverter.ConfigConverterUnderV5;
|
||||||
import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
|
import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
|
||||||
import de.jatitv.commandguiv2.Spigot.system.database.MySQL;
|
import de.jatitv.commandguiv2.Spigot.system.database.MySQL;
|
||||||
import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase;
|
|
||||||
import de.jatitv.commandguiv2.Spigot.system.database.StorageType;
|
|
||||||
import de.jatitv.commandguiv2.Util;
|
import de.jatitv.commandguiv2.Util;
|
||||||
import net.t2code.lib.Spigot.Lib.messages.send;
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
||||||
@@ -57,6 +55,7 @@ public class SelectConfig {
|
|||||||
public static Boolean UseItemWorldRemoveItemWhenItIsDisabled;
|
public static Boolean UseItemWorldRemoveItemWhenItIsDisabled;
|
||||||
public static String UseItemWorldMode;
|
public static String UseItemWorldMode;
|
||||||
public static List<String> UseItemWorldList;
|
public static List<String> UseItemWorldList;
|
||||||
|
public static List<String> UseItemItemBlockBlacklist;
|
||||||
|
|
||||||
public static Boolean disableInfoBySneak = false;
|
public static Boolean disableInfoBySneak = false;
|
||||||
|
|
||||||
@@ -189,10 +188,13 @@ public class SelectConfig {
|
|||||||
UseItemWorldMode = yamlConfiguration.getString("Advanced.UseItem.World.Protection.Mode");
|
UseItemWorldMode = yamlConfiguration.getString("Advanced.UseItem.World.Protection.Mode");
|
||||||
UseItemWorldList = yamlConfiguration.getStringList("Advanced.UseItem.World.Protection.List");
|
UseItemWorldList = yamlConfiguration.getStringList("Advanced.UseItem.World.Protection.List");
|
||||||
|
|
||||||
|
|
||||||
if (yamlConfiguration.get("Advanced.UseItem.DisableInfoBySneak") != null) {
|
if (yamlConfiguration.get("Advanced.UseItem.DisableInfoBySneak") != null) {
|
||||||
disableInfoBySneak = yamlConfiguration.getBoolean("Advanced.UseItem.DisableInfoBySneak");
|
disableInfoBySneak = yamlConfiguration.getBoolean("Advanced.UseItem.DisableInfoBySneak");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UseItemItemBlockBlacklist = yamlConfiguration.getStringList("Advanced.UseItem.ItemBlockBlacklist");
|
||||||
|
|
||||||
toggleItemOnOrYesBase64 = yamlConfiguration.getBoolean("Toggle.Items.OnOrYes.Item.Base64.Enable");
|
toggleItemOnOrYesBase64 = yamlConfiguration.getBoolean("Toggle.Items.OnOrYes.Item.Base64.Enable");
|
||||||
toggleItemOnOrYesBase64Value = yamlConfiguration.getString("Toggle.Items.OnOrYes.Item.Base64.Base64Value");
|
toggleItemOnOrYesBase64Value = yamlConfiguration.getString("Toggle.Items.OnOrYes.Item.Base64.Base64Value");
|
||||||
toggleItemOnOrYesMaterial = yamlConfiguration.getString("Toggle.Items.OnOrYes.Item.Material");
|
toggleItemOnOrYesMaterial = yamlConfiguration.getString("Toggle.Items.OnOrYes.Item.Material");
|
||||||
|
@@ -21,7 +21,7 @@ public class CreateFunctions {
|
|||||||
0, 0.0, Arrays.asList(), false, "");
|
0, 0.0, Arrays.asList(), false, "");
|
||||||
|
|
||||||
createFunction("SupportDiscord", false, 1, true, true, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg3M2MxMmJmZmI1MjUxYTBiODhkNWFlNzVjNzI0N2NiMzlhNzVmZjFhODFjYmU0YzhhMzliMzExZGRlZGEifX19",
|
createFunction("SupportDiscord", false, 1, true, true, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg3M2MxMmJmZmI1MjUxYTBiODhkNWFlNzVjNzI0N2NiMzlhNzVmZjFhODFjYmU0YzhhMzliMzExZGRlZGEifX19",
|
||||||
false, "", (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) ? "TNT" : "",
|
false, "", "",
|
||||||
"&3Support Discord", Arrays.asList("&8-----------------", "&bIf you need help setting up the plugin,", "&bfeel free to contact me on the Suport Discord.",
|
"&3Support Discord", Arrays.asList("&8-----------------", "&bIf you need help setting up the plugin,", "&bfeel free to contact me on the Suport Discord.",
|
||||||
"&8-----------------", "&eIf you find any errors or bugs,", "&eplease contact me so I can fix them.", "&8-----------------", "&5Discord: §7http://dc.t2code.net"),
|
"&8-----------------", "&eIf you find any errors or bugs,", "&eplease contact me so I can fix them.", "&8-----------------", "&5Discord: §7http://dc.t2code.net"),
|
||||||
false, false, "", false, 0.0, false, false,
|
false, false, "", false, 0.0, false, false,
|
||||||
|
@@ -6,6 +6,8 @@ import de.jatitv.commandguiv2.Spigot.Main;
|
|||||||
import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
|
import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
|
||||||
import de.jatitv.commandguiv2.Spigot.objects.functions.Function;
|
import de.jatitv.commandguiv2.Spigot.objects.functions.Function;
|
||||||
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.system.Papi;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.system.Placeholder;
|
||||||
import de.jatitv.commandguiv2.Util;
|
import de.jatitv.commandguiv2.Util;
|
||||||
import net.t2code.lib.Spigot.Lib.items.ItemVersion;
|
import net.t2code.lib.Spigot.Lib.items.ItemVersion;
|
||||||
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
||||||
@@ -25,7 +27,11 @@ public class GuiBuilder {
|
|||||||
private static String prefix = Util.getPrefix();
|
private static String prefix = Util.getPrefix();
|
||||||
|
|
||||||
protected static void item(Function function, Integer slot, Player player, Inventory inventory) {
|
protected static void item(Function function, Integer slot, Player player, Inventory inventory) {
|
||||||
ItemStack item = new ItemStack(Material.valueOf(function.item.toUpperCase().replace(".", "_")));
|
ItemStack item;
|
||||||
|
if (Main.legacy && function.item.toUpperCase().contains(",")) {
|
||||||
|
String[] split = function.item.toUpperCase().split(",");
|
||||||
|
item = new ItemStack(Material.valueOf(split[0]), 1, Short.parseShort(split[1]));
|
||||||
|
} else item = new ItemStack(Material.valueOf(function.item.toUpperCase().replace(".", "_")));
|
||||||
ItemMeta itemMeta = item.getItemMeta();
|
ItemMeta itemMeta = item.getItemMeta();
|
||||||
setDisplayNameAndLore(itemMeta, player, function);
|
setDisplayNameAndLore(itemMeta, player, function);
|
||||||
item.setItemMeta(itemMeta);
|
item.setItemMeta(itemMeta);
|
||||||
@@ -37,8 +43,12 @@ public class GuiBuilder {
|
|||||||
inventory.setItem(slot, item);
|
inventory.setItem(slot, item);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static void item(String material, Function function,Integer slot, Player player, Inventory inventory) {
|
protected static void item(String material, Function function, Integer slot, Player player, Inventory inventory) {
|
||||||
ItemStack item = new ItemStack(Material.valueOf(material));
|
ItemStack item;
|
||||||
|
if (Main.legacy && material.contains(",")) {
|
||||||
|
String[] split = material.split(",");
|
||||||
|
item = new ItemStack(Material.valueOf(split[0]), 1, Short.parseShort(split[1]));
|
||||||
|
} else item = new ItemStack(Material.valueOf(material));
|
||||||
ItemMeta itemMeta = item.getItemMeta();
|
ItemMeta itemMeta = item.getItemMeta();
|
||||||
setDisplayNameAndLore(itemMeta, player, function);
|
setDisplayNameAndLore(itemMeta, player, function);
|
||||||
item.setItemMeta(itemMeta);
|
item.setItemMeta(itemMeta);
|
||||||
@@ -53,11 +63,11 @@ public class GuiBuilder {
|
|||||||
|
|
||||||
private static void setDisplayNameAndLore(ItemMeta itemMeta, Player player, Function slot) {
|
private static void setDisplayNameAndLore(ItemMeta itemMeta, Player player, Function slot) {
|
||||||
if (Main.PaPi) {
|
if (Main.PaPi) {
|
||||||
itemMeta.setDisplayName(Replace.replace(prefix, player, slot.name.replace("[player]", player.getName())));
|
itemMeta.setDisplayName(Replace.replace(prefix, player, Placeholder.replace(slot.name, player)));
|
||||||
itemMeta.setLore(Replace.replacePrice(prefix, player, slot.lore, slot.price + " " + SelectConfig.Currency));
|
itemMeta.setLore(Replace.replacePrice(prefix, player, Placeholder.replace(slot.lore, player), slot.price + " " + SelectConfig.Currency));
|
||||||
} else {
|
} else {
|
||||||
itemMeta.setDisplayName(Replace.replace(prefix, slot.name.replace("[player]", player.getName())));
|
itemMeta.setDisplayName(Replace.replace(prefix, Placeholder.replace(slot.name,player)));
|
||||||
itemMeta.setLore(Replace.replacePrice(prefix, slot.lore, slot.price + " " + SelectConfig.Currency));
|
itemMeta.setLore(Replace.replacePrice(prefix, Placeholder.replace(slot.lore,player), slot.price + " " + SelectConfig.Currency));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,11 +98,11 @@ public class GuiBuilder {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static void base64(Function function,Integer slot, Player player, Inventory inventory) {
|
protected static void base64(Function function, Integer slot, Player player, Inventory inventory) {
|
||||||
base64(function.base64Value, function,slot, player, inventory);
|
base64(function.base64Value, function, slot, player, inventory);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static void playerHead(Function function, Integer slot,Player player, Inventory inventory, String skullName) {
|
protected static void playerHead(Function function, Integer slot, Player player, Inventory inventory, String skullName) {
|
||||||
ItemStack item = ItemVersion.getHeadIS();
|
ItemStack item = ItemVersion.getHeadIS();
|
||||||
SkullMeta itemMeta = (SkullMeta) item.getItemMeta();
|
SkullMeta itemMeta = (SkullMeta) item.getItemMeta();
|
||||||
setDisplayNameAndLore(itemMeta, player, function);
|
setDisplayNameAndLore(itemMeta, player, function);
|
||||||
@@ -109,7 +119,7 @@ public class GuiBuilder {
|
|||||||
public static void fillItem(Inventory inventory, Gui gui) {
|
public static void fillItem(Inventory inventory, Gui gui) {
|
||||||
ItemStack glass;
|
ItemStack glass;
|
||||||
if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
|
if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
|
||||||
glass = new ItemStack(Material.valueOf("STAINED_GLASS_PANE"), 1, Short.valueOf(gui.guiFillItemItem));
|
glass = new ItemStack(Material.valueOf("STAINED_GLASS_PANE"), 1, Short.parseShort(gui.guiFillItemItem));
|
||||||
} else glass = new ItemStack(Material.valueOf(gui.guiFillItemItem.toUpperCase().replace(".", "_")));
|
} else glass = new ItemStack(Material.valueOf(gui.guiFillItemItem.toUpperCase().replace(".", "_")));
|
||||||
ItemMeta itemMetaglass = glass.getItemMeta();
|
ItemMeta itemMetaglass = glass.getItemMeta();
|
||||||
itemMetaglass.setDisplayName(" ");
|
itemMetaglass.setDisplayName(" ");
|
||||||
|
@@ -95,20 +95,13 @@ public class OpenGUI {
|
|||||||
toggleOff(function, slot.slot, player, inventory);
|
toggleOff(function, slot.slot, player, inventory);
|
||||||
}
|
}
|
||||||
} else if (function.toggleUseItem) {
|
} else if (function.toggleUseItem) {
|
||||||
if (Events.useItemHashMap.get(player)) {
|
if (Events.useItemHashMap.get(player.getName())) {
|
||||||
toggleOn(function, slot.slot, player, inventory);
|
toggleOn(function, slot.slot, player, inventory);
|
||||||
} else {
|
} else {
|
||||||
toggleOff(function, slot.slot, player, inventory);
|
toggleOff(function, slot.slot, player, inventory);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (function.playerHead_Enable) {
|
if (function.playerHead_Enable) {
|
||||||
if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
|
|
||||||
send.player(player, prefix + "§c Playerheads are only available from version §61.13§c! §7- §bGUI: §6" +
|
|
||||||
Replace.replace(prefix, gui.guiName).toString() + " §bSlot: §6" + (slot.slot + 1) + " §7- " + Replace.replace(prefix, function.name));
|
|
||||||
send.error(plugin, "Playerheads are only available from version 1.13!");
|
|
||||||
send.console(prefix + " §bGUI: §6" + Replace.replace(prefix, gui.guiName).toString() + " §bSlot: §6" +
|
|
||||||
(slot.slot + 1) + " §7- " + Replace.replace(prefix, function.name));
|
|
||||||
} else {
|
|
||||||
if (function.base64_Enable) {
|
if (function.base64_Enable) {
|
||||||
GuiBuilder.base64(function, slot.slot, player, inventory);
|
GuiBuilder.base64(function, slot.slot, player, inventory);
|
||||||
} else {
|
} else {
|
||||||
@@ -118,7 +111,6 @@ public class OpenGUI {
|
|||||||
GuiBuilder.playerHead(function, slot.slot, player, inventory, function.playerName);
|
GuiBuilder.playerHead(function, slot.slot, player, inventory, function.playerName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
GuiBuilder.item(function, slot.slot, player, inventory);
|
GuiBuilder.item(function, slot.slot, player, inventory);
|
||||||
}
|
}
|
||||||
|
@@ -5,6 +5,7 @@ import de.jatitv.commandguiv2.Spigot.cmdManagement.CmdExecuter_GUITab;
|
|||||||
import de.jatitv.commandguiv2.Spigot.objects.functions.Function;
|
import de.jatitv.commandguiv2.Spigot.objects.functions.Function;
|
||||||
import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
|
import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
|
||||||
import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
|
import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
|
||||||
|
import de.jatitv.commandguiv2.Util;
|
||||||
import net.t2code.lib.Spigot.Lib.messages.send;
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
@@ -28,6 +29,8 @@ public class Obj_Select {
|
|||||||
File[] fileArray = f.listFiles();
|
File[] fileArray = f.listFiles();
|
||||||
|
|
||||||
for (File config_gui : fileArray) {
|
for (File config_gui : fileArray) {
|
||||||
|
|
||||||
|
try {
|
||||||
String sub = config_gui.getName().substring(config_gui.getName().length() - 4);
|
String sub = config_gui.getName().substring(config_gui.getName().length() - 4);
|
||||||
if (sub.equals(".yml")) {
|
if (sub.equals(".yml")) {
|
||||||
String key = config_gui.getName().replace(".yml", "");
|
String key = config_gui.getName().replace(".yml", "");
|
||||||
@@ -67,9 +70,9 @@ public class Obj_Select {
|
|||||||
String permUse = yamlConfiguration_gui.getString("Slots." + slotKey + ".Permission.Use");
|
String permUse = yamlConfiguration_gui.getString("Slots." + slotKey + ".Permission.Use");
|
||||||
|
|
||||||
Slot slot = new Slot(slotNumber, enable, function, permRequired,
|
Slot slot = new Slot(slotNumber, enable, function, permRequired,
|
||||||
Objects.requireNonNull(permSee).replace("[function]", key).replace("[slot]", String.valueOf(slotNumber + 1))
|
permSee.replace("[function]", key).replace("[slot]", String.valueOf(slotNumber + 1))
|
||||||
.replace("[slotname]", slotKey.toLowerCase()),
|
.replace("[slotname]", slotKey.toLowerCase()),
|
||||||
Objects.requireNonNull(permUse).replace("[function]", key).replace("[slot]", String.valueOf(slotNumber + 1))
|
permUse.replace("[function]", key).replace("[slot]", String.valueOf(slotNumber + 1))
|
||||||
.replace("[slotname]", slotKey.toLowerCase()));
|
.replace("[slotname]", slotKey.toLowerCase()));
|
||||||
slots.add(slot);
|
slots.add(slot);
|
||||||
}
|
}
|
||||||
@@ -80,11 +83,12 @@ public class Obj_Select {
|
|||||||
CmdExecuter_GUITab.arg1.put(config_gui.getName()
|
CmdExecuter_GUITab.arg1.put(config_gui.getName()
|
||||||
.replace(".yml", ""), "commandgui.gui." + key);
|
.replace(".yml", ""), "commandgui.gui." + key);
|
||||||
|
|
||||||
try {
|
|
||||||
yamlConfiguration_gui.save(config_gui);
|
yamlConfiguration_gui.save(config_gui);
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
Util.sendTryCatch(Obj_Select.class, e.getStackTrace()[0]);
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -15,10 +15,8 @@ import java.util.List;
|
|||||||
|
|
||||||
public class Debug {
|
public class Debug {
|
||||||
|
|
||||||
private static Plugin plugin = Main.plugin;
|
private static final Plugin plugin = Main.plugin;
|
||||||
public static void debugmsg() {
|
public static void debugmsg() {
|
||||||
|
|
||||||
|
|
||||||
send.debug(plugin,"§5!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
|
send.debug(plugin,"§5!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
|
||||||
send.debug(plugin,"§3Bukkit Version: §e" + Bukkit.getBukkitVersion());
|
send.debug(plugin,"§3Bukkit Version: §e" + Bukkit.getBukkitVersion());
|
||||||
send.debug(plugin,"§3NMS Version: §e" + Bukkit.getServer().getClass().getPackage().getName().replace("org.bukkit.craftbukkit.", ""));
|
send.debug(plugin,"§3NMS Version: §e" + Bukkit.getServer().getClass().getPackage().getName().replace("org.bukkit.craftbukkit.", ""));
|
||||||
@@ -45,52 +43,5 @@ public class Debug {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
send.debug(plugin,"§5!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
|
send.debug(plugin,"§5!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void onDebugFile(CommandSender sender){
|
|
||||||
String timeStamp = new SimpleDateFormat("dd_MM_yyyy_HH_mm_ss").format(Calendar.getInstance().getTime());
|
|
||||||
String timeStampcfg = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(Calendar.getInstance().getTime());
|
|
||||||
send.sender(sender, Main.prefix + " §5Debug file was createt: §e" + Main.getPath() + "\\debug\\commandgui_debug_"+ timeStamp +".yml");
|
|
||||||
File debug = new File(Main.getPath(), "debug/commandgui_debug_"+ timeStamp +".yml");
|
|
||||||
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(debug);
|
|
||||||
|
|
||||||
set("Time", timeStampcfg, yamlConfiguration);
|
|
||||||
set("CommandGUI.Version", String.valueOf(plugin.getDescription().getVersion()), yamlConfiguration);
|
|
||||||
|
|
||||||
set("Server.Bukkit_Version", String.valueOf(Bukkit.getBukkitVersion()), yamlConfiguration);
|
|
||||||
set("Server.NMS_Version", String.valueOf(Bukkit.getServer().getClass().getPackage().getName().replace("org.bukkit.craftbukkit.", "")), yamlConfiguration);
|
|
||||||
set("Server.Version", String.valueOf(Bukkit.getVersion()), yamlConfiguration);
|
|
||||||
set("Server.Java", String.valueOf(System.getProperty("java.version")), yamlConfiguration);
|
|
||||||
set("Server.Worlds", String.valueOf(Bukkit.getServer().getWorlds()), yamlConfiguration);
|
|
||||||
set("Server.Plugins", String.valueOf(Main.plugins) , yamlConfiguration);
|
|
||||||
|
|
||||||
try {
|
|
||||||
yamlConfiguration.save(debug);
|
|
||||||
} catch (IOException e) {
|
|
||||||
send.warning(plugin,e.getMessage());
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void set(String path, String value, YamlConfiguration config){
|
|
||||||
if (!config.contains(path)) {
|
|
||||||
config.set(path, value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
private static void set(String path, Integer value, YamlConfiguration config){
|
|
||||||
if (!config.contains(path)) {
|
|
||||||
config.set(path, value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
private static void set(String path, Boolean value, YamlConfiguration config){
|
|
||||||
if (!config.contains(path)) {
|
|
||||||
config.set(path, value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
private static void set(String path, List value, YamlConfiguration config){
|
|
||||||
if (!config.contains(path)) {
|
|
||||||
config.set(path, value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -20,6 +20,7 @@ import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
|||||||
import de.jatitv.commandguiv2.Spigot.system.database.SQLITE;
|
import de.jatitv.commandguiv2.Spigot.system.database.SQLITE;
|
||||||
import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase;
|
import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase;
|
||||||
import de.jatitv.commandguiv2.Spigot.system.database.StorageType;
|
import de.jatitv.commandguiv2.Spigot.system.database.StorageType;
|
||||||
|
import de.jatitv.commandguiv2.Util;
|
||||||
import net.t2code.lib.Spigot.Lib.messages.T2CodeTemplate;
|
import net.t2code.lib.Spigot.Lib.messages.T2CodeTemplate;
|
||||||
import net.t2code.lib.Spigot.Lib.messages.send;
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
|
||||||
@@ -83,7 +84,7 @@ public class Load {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (PluginCheck.papi()) {
|
if (PluginCheck.papi()) {
|
||||||
new Placeholder().register();
|
new Papi().register();
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -182,10 +183,14 @@ public class Load {
|
|||||||
"COLLATE='utf8mb4_general_ci'" +
|
"COLLATE='utf8mb4_general_ci'" +
|
||||||
"ENGINE=InnoDB" +
|
"ENGINE=InnoDB" +
|
||||||
";");
|
";");
|
||||||
MySQL.query("ALTER TABLE `gui-item` ADD COLUMN IF NOT EXISTS `Slot` INT(1) NULL DEFAULT NULL AFTER `Status`;");
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
Util.sendTryCatch(Load.class, e.getStackTrace()[0]);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
MySQL.query("ALTER TABLE `gui-item` ADD COLUMN `Slot` INT(1) NULL DEFAULT NULL AFTER `Status`;");
|
||||||
|
} catch (SQLException e) {
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case YML:
|
case YML:
|
||||||
send.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used.");
|
send.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used.");
|
||||||
|
@@ -0,0 +1,56 @@
|
|||||||
|
// This claas was created by JaTiTV
|
||||||
|
|
||||||
|
package de.jatitv.commandguiv2.Spigot.system;
|
||||||
|
|
||||||
|
import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.Main;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
||||||
|
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class Papi extends PlaceholderExpansion {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getIdentifier() {
|
||||||
|
return "commandgui";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getAuthor() {
|
||||||
|
return Main.plugin.getDescription().getAuthors().toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getVersion() {
|
||||||
|
return Main.plugin.getDescription().getVersion();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canRegister() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean persist() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String onPlaceholderRequest(Player p, String params) {
|
||||||
|
if (params.contains("useitem_boolean")) {
|
||||||
|
Placeholder.useitem_boolean(p);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (params.contains("useitem")) {
|
||||||
|
Placeholder.useitem(p);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (params.contains("slot")) {
|
||||||
|
Placeholder.slot(p);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
@@ -1,56 +1,38 @@
|
|||||||
// This claas was created by JaTiTV
|
|
||||||
|
|
||||||
package de.jatitv.commandguiv2.Spigot.system;
|
package de.jatitv.commandguiv2.Spigot.system;
|
||||||
|
|
||||||
import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events;
|
import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events;
|
||||||
import de.jatitv.commandguiv2.Spigot.Main;
|
|
||||||
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
||||||
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
public class Placeholder extends PlaceholderExpansion {
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Override
|
public class Placeholder {
|
||||||
public String getIdentifier() {
|
public static String useitem(Player p) {
|
||||||
return "commandgui";
|
if (Events.useItemHashMap.get(p.getName())) {
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getAuthor() {
|
|
||||||
return Main.plugin.getDescription().getAuthors().toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getVersion() {
|
|
||||||
return Main.plugin.getDescription().getVersion();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean canRegister() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean persist() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String onPlaceholderRequest(Player p, String params) {
|
|
||||||
if (params.contains("useitem_boolean")) {
|
|
||||||
return Events.useItemHashMap.get(p).toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (params.contains("useitem")) {
|
|
||||||
if (Events.useItemHashMap.get(p)) {
|
|
||||||
return SelectConfig.placeholderTrue;
|
return SelectConfig.placeholderTrue;
|
||||||
} else return SelectConfig.placeholderFalse;
|
} else return SelectConfig.placeholderFalse;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (params.contains("slot")){
|
public static String useitem_boolean(Player p) {
|
||||||
return Events.useItemSlotHashMap.get(p).toString();
|
return Events.useItemHashMap.get(p.getName()).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
public static String slot(Player p) {
|
||||||
|
return Events.useItemSlotHashMap.get(p.getName()).toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String replace(String input, Player player) {
|
||||||
|
return input.replace("[player]", player.getName()).replace("%commandgui_useitem%", useitem(player))
|
||||||
|
.replace("%commandgui_useitem_boolean%", useitem_boolean(player)).replace("%commandgui_useitem_slot%", slot(player));
|
||||||
|
}
|
||||||
|
public static List<String> replace(List<String> input, Player player) {
|
||||||
|
ArrayList<String> rp = new ArrayList<String>();
|
||||||
|
|
||||||
|
for (String s : input) {
|
||||||
|
rp.add(s.replace("[player]", player.getName()).replace("%commandgui_useitem%", useitem(player))
|
||||||
|
.replace("%commandgui_useitem_boolean%", useitem_boolean(player)).replace("%commandgui_useitem_slot%", slot(player)));
|
||||||
|
}
|
||||||
|
return rp;
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -29,11 +29,7 @@ public class UseItem {
|
|||||||
if (SelectConfig.UseItem_InventorySlotEnforce) {
|
if (SelectConfig.UseItem_InventorySlotEnforce) {
|
||||||
slot = SelectConfig.UseItem_InventorySlot;
|
slot = SelectConfig.UseItem_InventorySlot;
|
||||||
} else {
|
} else {
|
||||||
if (Events.useItemSlotHashMap.get(player) == null) {
|
slot = Events.useItemSlotHashMap.get(player.getName());
|
||||||
slot = SelectConfig.UseItem_InventorySlot;
|
|
||||||
} else {
|
|
||||||
slot = Events.useItemSlotHashMap.get(player);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (SelectConfig.UseItem_InventorySlot_FreeSlot) {
|
if (SelectConfig.UseItem_InventorySlot_FreeSlot) {
|
||||||
player.getInventory().addItem(itemStack(player));
|
player.getInventory().addItem(itemStack(player));
|
||||||
|
@@ -3,7 +3,9 @@ package de.jatitv.commandguiv2.Spigot.system.database;
|
|||||||
import com.zaxxer.hikari.HikariConfig;
|
import com.zaxxer.hikari.HikariConfig;
|
||||||
import com.zaxxer.hikari.HikariDataSource;
|
import com.zaxxer.hikari.HikariDataSource;
|
||||||
import de.jatitv.commandguiv2.Spigot.Main;
|
import de.jatitv.commandguiv2.Spigot.Main;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
||||||
import net.t2code.lib.Spigot.Lib.messages.send;
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
|
||||||
import java.sql.*;
|
import java.sql.*;
|
||||||
import java.time.ZoneId;
|
import java.time.ZoneId;
|
||||||
@@ -40,27 +42,40 @@ public class MySQL {
|
|||||||
send.console(Main.prefix + " §4MYSQL not connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
|
send.console(Main.prefix + " §4MYSQL not connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
|
||||||
send.error(Main.plugin, ex.getMessage() + " --- " + (System.currentTimeMillis() - long_) + "ms");
|
send.error(Main.plugin, ex.getMessage() + " --- " + (System.currentTimeMillis() - long_) + "ms");
|
||||||
}
|
}
|
||||||
|
if (SelectConfig.Debug || Main.version.contains("DEV")){
|
||||||
|
try {
|
||||||
|
send.warning(Main.plugin, "MySQL DEBUG:");
|
||||||
|
Connection con = ds.getConnection();
|
||||||
|
DatabaseMetaData dbmd = con.getMetaData();
|
||||||
|
Bukkit.getConsoleSender().sendMessage("Metadata of the database:");
|
||||||
|
Bukkit.getConsoleSender().sendMessage("DB :" + dbmd.getDatabaseProductName());
|
||||||
|
Bukkit.getConsoleSender().sendMessage("Version :" + dbmd.getDatabaseProductVersion());
|
||||||
|
Bukkit.getConsoleSender().sendMessage("Driver :" + dbmd.getDriverName());
|
||||||
|
Bukkit.getConsoleSender().sendMessage(" :" + dbmd.getDriverMajorVersion() + "." + dbmd.getDriverMinorVersion());
|
||||||
|
Bukkit.getConsoleSender().sendMessage(" :" + dbmd.getDriverVersion());
|
||||||
|
} catch (SQLException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//Bukkit.getConsoleSender().sendMessage((System.currentTimeMillis() - long_) + "ms");
|
//Bukkit.getConsoleSender().sendMessage((System.currentTimeMillis() - long_) + "ms");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void query(String query) {
|
public static void query(String query) throws SQLException {
|
||||||
|
if (ds == null) {
|
||||||
if (ds == null){
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
send.debug(Main.plugin, query);
|
send.debug(Main.plugin, query);
|
||||||
try (Connection con = ds.getConnection()) {
|
Connection con = ds.getConnection();
|
||||||
Statement stmt = con.createStatement();
|
Statement stmt = con.createStatement();
|
||||||
stmt.execute(query);
|
stmt.execute(query);
|
||||||
stmt.close();
|
stmt.close();
|
||||||
} catch (SQLException e) {
|
|
||||||
System.err.println(e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void query(ArrayList<String> queryList) {
|
public static void query(ArrayList<String> queryList) throws SQLException {
|
||||||
try (Connection con = ds.getConnection()) {
|
Connection con = ds.getConnection();
|
||||||
Statement stmt = con.createStatement();
|
Statement stmt = con.createStatement();
|
||||||
for (String query : queryList) {
|
for (String query : queryList) {
|
||||||
send.debug(Main.plugin, query);
|
send.debug(Main.plugin, query);
|
||||||
@@ -68,9 +83,6 @@ public class MySQL {
|
|||||||
}
|
}
|
||||||
stmt.executeBatch();
|
stmt.executeBatch();
|
||||||
stmt.close();
|
stmt.close();
|
||||||
} catch (SQLException e) {
|
|
||||||
System.err.println(e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1,9 +1,15 @@
|
|||||||
package de.jatitv.commandguiv2.Spigot.system.database;
|
package de.jatitv.commandguiv2.Spigot.system.database;
|
||||||
|
|
||||||
import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events;
|
import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.Main;
|
||||||
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.system.Load;
|
||||||
|
import de.jatitv.commandguiv2.Util;
|
||||||
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import java.sql.SQLException;
|
||||||
|
|
||||||
public class SelectDatabase {
|
public class SelectDatabase {
|
||||||
|
|
||||||
private static StorageType Storage;
|
private static StorageType Storage;
|
||||||
@@ -19,7 +25,12 @@ public class SelectDatabase {
|
|||||||
public static void nameCheck(Player player) {
|
public static void nameCheck(Player player) {
|
||||||
switch (Storage) {
|
switch (Storage) {
|
||||||
case MYSQL:
|
case MYSQL:
|
||||||
|
try {
|
||||||
MySQL.query("UPDATE `gui-item` SET Name='" + player.getName() + "' WHERE UUID='" + player.getUniqueId() + "';");
|
MySQL.query("UPDATE `gui-item` SET Name='" + player.getName() + "' WHERE UUID='" + player.getUniqueId() + "';");
|
||||||
|
} catch (SQLException e) {
|
||||||
|
Util.sendTryCatch(SelectDatabase.class, e.getStackTrace()[0]);
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case YML:
|
case YML:
|
||||||
|
|
||||||
@@ -34,8 +45,13 @@ public class SelectDatabase {
|
|||||||
public static void setSlot(Player player, Integer slot) {
|
public static void setSlot(Player player, Integer slot) {
|
||||||
switch (Storage) {
|
switch (Storage) {
|
||||||
case MYSQL:
|
case MYSQL:
|
||||||
|
try {
|
||||||
MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`, `Slot`) VALUES ('" + player.getUniqueId() + "', '" + player.getName()
|
MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`, `Slot`) VALUES ('" + player.getUniqueId() + "', '" + player.getName()
|
||||||
+ "','" + slot + "') ON DUPLICATE KEY UPDATE `Name` = '" + player.getName() + "', `Slot` = '" + slot + "';");
|
+ "','" + slot + "') ON DUPLICATE KEY UPDATE `Name` = '" + player.getName() + "', `Slot` = '" + slot + "';");
|
||||||
|
} catch (SQLException e) {
|
||||||
|
Util.sendTryCatch(SelectDatabase.class, e.getStackTrace()[0]);
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case YML:
|
case YML:
|
||||||
YML.setGuiitemSlot(player, slot);
|
YML.setGuiitemSlot(player, slot);
|
||||||
@@ -49,11 +65,16 @@ public class SelectDatabase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void setItemStatusTrue(Player player) {
|
public static void setItemStatusTrue(Player player) {
|
||||||
Events.useItemHashMap.replace(player, true);
|
Events.useItemHashMap.replace(player.getName(), true);
|
||||||
switch (Storage) {
|
switch (Storage) {
|
||||||
case MYSQL:
|
case MYSQL:
|
||||||
|
try {
|
||||||
MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`) VALUES ('" + player.getUniqueId() + "', '" + player.getName()
|
MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`) VALUES ('" + player.getUniqueId() + "', '" + player.getName()
|
||||||
+ "') ON DUPLICATE KEY UPDATE `Name` = '" + player.getName() + "', `Status` = '1';");
|
+ "') ON DUPLICATE KEY UPDATE `Name` = '" + player.getName() + "', `Status` = '1';");
|
||||||
|
} catch (SQLException e) {
|
||||||
|
Util.sendTryCatch(SelectDatabase.class, e.getStackTrace()[0]);
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case YML:
|
case YML:
|
||||||
YML.setGuiitemOn(player);
|
YML.setGuiitemOn(player);
|
||||||
@@ -67,11 +88,16 @@ public class SelectDatabase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void setItemStatusFalse(Player player) {
|
public static void setItemStatusFalse(Player player) {
|
||||||
Events.useItemHashMap.replace(player, false);
|
Events.useItemHashMap.replace(player.getName(), false);
|
||||||
switch (Storage) {
|
switch (Storage) {
|
||||||
case MYSQL:
|
case MYSQL:
|
||||||
|
try {
|
||||||
MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`, `Status`) VALUES ('" + player.getUniqueId() + "', '" + player.getName()
|
MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`, `Status`) VALUES ('" + player.getUniqueId() + "', '" + player.getName()
|
||||||
+ "', '0') ON DUPLICATE KEY UPDATE `Name` = '" + player.getName() + "', `Status` = '0';");
|
+ "', '0') ON DUPLICATE KEY UPDATE `Name` = '" + player.getName() + "', `Status` = '0';");
|
||||||
|
} catch (SQLException e) {
|
||||||
|
Util.sendTryCatch(SelectDatabase.class, e.getStackTrace()[0]);
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case YML:
|
case YML:
|
||||||
YML.setGuiitemOff(player);
|
YML.setGuiitemOff(player);
|
||||||
|
@@ -1,6 +1,8 @@
|
|||||||
package de.jatitv.commandguiv2.Spigot.system.database;
|
package de.jatitv.commandguiv2.Spigot.system.database;
|
||||||
|
|
||||||
import de.jatitv.commandguiv2.Spigot.Main;
|
import de.jatitv.commandguiv2.Spigot.Main;
|
||||||
|
import de.jatitv.commandguiv2.Spigot.objects.Obj_Select;
|
||||||
|
import de.jatitv.commandguiv2.Util;
|
||||||
import net.t2code.lib.Spigot.Lib.messages.send;
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
import org.bukkit.configuration.file.YamlConfiguration;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@@ -45,6 +47,7 @@ public class YML {
|
|||||||
try {
|
try {
|
||||||
yamlConfigurationStorage.save(storage);
|
yamlConfigurationStorage.save(storage);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
|
Util.sendTryCatch(Obj_Select.class, e.getStackTrace()[0]);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,8 +1,11 @@
|
|||||||
package de.jatitv.commandguiv2;
|
package de.jatitv.commandguiv2;
|
||||||
|
|
||||||
|
import de.jatitv.commandguiv2.Spigot.Main;
|
||||||
|
import net.t2code.lib.Spigot.Lib.messages.send;
|
||||||
|
|
||||||
public class Util {
|
public class Util {
|
||||||
private static Integer configVersion = 5;
|
private static Integer configVersion = 5;
|
||||||
private static double requiredT2CodeLibVersion = 10.3;
|
private static double requiredT2CodeLibVersion = 11.8;
|
||||||
private static String Prefix = "§8[§4C§9GUI§8]";
|
private static String Prefix = "§8[§4C§9GUI§8]";
|
||||||
private static Integer SpigotID = 90671;
|
private static Integer SpigotID = 90671;
|
||||||
private static Integer BstatsID = 10840;
|
private static Integer BstatsID = 10840;
|
||||||
@@ -36,4 +39,8 @@ public class Util {
|
|||||||
public static Integer getConfigVersion() {
|
public static Integer getConfigVersion() {
|
||||||
return configVersion;
|
return configVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void sendTryCatch(Class c, StackTraceElement line){
|
||||||
|
send.error(Main.plugin, c.getName() + " Line: " + line.getLineNumber());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -44,11 +44,11 @@ public class CGuiAPI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Boolean selectPlayerItemEnable(Player player) {
|
public static Boolean selectPlayerItemEnable(Player player) {
|
||||||
return Events.useItemHashMap.get(player);
|
return Events.useItemHashMap.get(player.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Integer selectPlayerItemSlot(Player player) {
|
public static Integer selectPlayerItemSlot(Player player) {
|
||||||
return Events.useItemSlotHashMap.get(player);
|
return Events.useItemSlotHashMap.get(player.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setPlayerItemEnable(Player player, Boolean value) {
|
public static void setPlayerItemEnable(Player player, Boolean value) {
|
||||||
|
@@ -21,52 +21,3 @@ commands:
|
|||||||
aliases: [cguihelp, guihelp]
|
aliases: [cguihelp, guihelp]
|
||||||
commandgui-item:
|
commandgui-item:
|
||||||
aliases: [gui-item]
|
aliases: [gui-item]
|
||||||
|
|
||||||
|
|
||||||
#permissions:
|
|
||||||
# commandgui.admin:
|
|
||||||
# description: All permissions from CommandGUI
|
|
||||||
# default: op
|
|
||||||
# children:
|
|
||||||
# commandgui.command: true
|
|
||||||
# commandgui.get.guiitem.at.login: true
|
|
||||||
# commandgui.useitem: true
|
|
||||||
# commandgui.useitem.toggle: true
|
|
||||||
# commandgui.updatemsg: true
|
|
||||||
# commandgui.bypass: true
|
|
||||||
# commandgui.command.info: true
|
|
||||||
# commandgui.command.give: true
|
|
||||||
#
|
|
||||||
# commandgui.player:
|
|
||||||
# description: All permissions from CommandGUI
|
|
||||||
# default: op
|
|
||||||
# children:
|
|
||||||
# commandgui.command: true
|
|
||||||
# commandgui.get.guiitem.at.login: true
|
|
||||||
# commandgui.useitem: true
|
|
||||||
# commandgui.useitem.toggle: true
|
|
||||||
#
|
|
||||||
# commandgui.updatemsg:
|
|
||||||
# description: Players with this permission get the update message when joining if an update is available
|
|
||||||
# default: op
|
|
||||||
# commandgui.command:
|
|
||||||
# description: Required permission to open GUIs via command
|
|
||||||
# default: op
|
|
||||||
# commandgui.get.guiitem.at.login:
|
|
||||||
# description: Only players with this permission will receive the GUI item
|
|
||||||
# default: op
|
|
||||||
# commandgui.useitem:
|
|
||||||
# description: Required permission to use the GUI Item
|
|
||||||
# default: op
|
|
||||||
# commandgui.useitem.toggle:
|
|
||||||
# description: Required permission to enable/disable the GUI Item for itself (if the function UseItem/AllowToggle is set to true)
|
|
||||||
# default: op
|
|
||||||
# commandgui.bypass:
|
|
||||||
# description: Bypass to open disabled GUIs
|
|
||||||
# default: op
|
|
||||||
# commandgui.command.info:
|
|
||||||
# description: Permission to view CommandGUI info
|
|
||||||
# default: not op
|
|
||||||
# commandgui.command.give:
|
|
||||||
# description: Kommend in V2.1.0
|
|
||||||
# default: op
|
|
Reference in New Issue
Block a user