From cfd07b01f2a7f2d001be75ab4074b7583dec29f3 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Thu, 21 Apr 2022 01:58:54 +0200 Subject: [PATCH] 2.7.0_Snapshot-6 | Fix Fixes: - If there was a function in the GUI that did not exist, then an error occurred in the console and the GUI could not be opened, this was fixed. - If you changed the slot of the UseItem, the Protection (RemoveItemWhenItIsDisabled) was ignored and you got the item. --- CommandGUI V2/pom.xml | 2 +- .../{GUI_Listener.java => GUIListener.java} | 16 ++- .../Spigot/Listener/ItemChange.java | 55 +-------- .../Spigot/Listener/PluginEvent.java | 4 +- .../Listener/UseItem_Listener/Events.java | 51 ++++----- ...vents_from1_10.java => EventsFrom110.java} | 2 +- .../Spigot/cmdManagement/Commands.java | 83 +++++--------- .../Spigot/cmdManagement/Help.java | 6 +- .../cmdManagement/register/AliasRegister.java | 2 +- .../register/RegisterCommand.java | 7 +- .../Spigot/config/config/SelectConfig.java | 8 +- .../commandguiv2/Spigot/gui/GuiBuilder.java | 6 +- .../commandguiv2/Spigot/gui/OpenGUI.java | 28 +++-- .../Spigot/objects/Obj_Select.java | 44 ++++---- .../Spigot/objects/functions/Function.java | 6 +- .../commandguiv2/Spigot/objects/guis/Gui.java | 36 +++--- .../commandguiv2/Spigot/system/Load.java | 104 ++++++++++-------- .../commandguiv2/Spigot/system/Metrics.java | 9 ++ .../Spigot/system/RegisterPermissions.java | 7 +- .../{Give_UseItem.java => UseItem.java} | 64 +++++++++-- .../Spigot/system/database/MySQL.java | 4 +- .../Spigot/system/database/SQLITE.java | 2 +- ...lect_Database.java => SelectDatabase.java} | 24 ++-- .../de/jatitv/commandguiv2/api/CGuiAPI.java | 8 +- 24 files changed, 294 insertions(+), 284 deletions(-) rename CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/{GUI_Listener.java => GUIListener.java} (95%) rename CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/{Events_from1_10.java => EventsFrom110.java} (97%) rename CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/{Give_UseItem.java => UseItem.java} (58%) rename CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/{Select_Database.java => SelectDatabase.java} (92%) diff --git a/CommandGUI V2/pom.xml b/CommandGUI V2/pom.xml index 79fda5a..4f53991 100644 --- a/CommandGUI V2/pom.xml +++ b/CommandGUI V2/pom.xml @@ -6,7 +6,7 @@ net.t2code CommandGUI_V2 - 2.7.0_Snapshot-5 + 2.7.0_Snapshot-6 jar CommandGUI diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUI_Listener.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUIListener.java similarity index 95% rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUI_Listener.java rename to CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUIListener.java index 5b8d602..67fb9ae 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUI_Listener.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUIListener.java @@ -30,9 +30,8 @@ import org.bukkit.scheduler.BukkitRunnable; import java.io.File; import java.io.IOException; -import java.util.Objects; -public class GUI_Listener implements Listener { +public class GUIListener implements Listener { private static String prefix = Util.getPrefix(); public static String GUICode; @@ -45,8 +44,8 @@ public class GUI_Listener implements Listener { if (e.getInventory() == null) return; if (e.getCurrentItem() == null) return; for (Gui gui : Main.guiHashMap.values()) { - if (player.getOpenInventory().getTitle().equals(Replace.replace(prefix, GUICode + gui.GUI_Name)) - || (Main.PaPi && player.getOpenInventory().getTitle().equals(Replace.replace(prefix, player, GUICode + gui.GUI_Name)))) { + if (player.getOpenInventory().getTitle().equals(Replace.replace(prefix, GUICode + gui.guiName)) + || (Main.PaPi && player.getOpenInventory().getTitle().equals(Replace.replace(prefix, player, GUICode + gui.guiName)))) { e.setCancelled(true); for (Slot slot : gui.slots) { Function function = Main.functionHashMap.get(slot.function); @@ -60,7 +59,6 @@ public class GUI_Listener implements Listener { continue; } if (!slot.enable) continue; - send.debugmsg(Main.plugin, function.name); if (function.cost_Enable) { if (function.command_Enable || function.message_Enable || function.openGUI_Enable || function.serverChange) { @@ -233,7 +231,7 @@ public class GUI_Listener implements Listener { player.playSound(player.getLocation(), Sound.valueOf(function.customSound_Sound.toUpperCase().replace(".", "_")), 3, 1); } catch (Exception e1) { send.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", prefix) - .replace("[sound]", "§6GUI: §e" + Replace.replace(prefix, gui.GUI_Name) + "§r §6Slot: §e" + slot.slot + " §6CustomSound: §9" + function.customSound_Sound)); + .replace("[sound]", "§6GUI: §e" + Replace.replace(prefix, gui.guiName) + "§r §6Slot: §e" + slot.slot + " §6CustomSound: §9" + function.customSound_Sound)); player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1); } } @@ -247,7 +245,7 @@ public class GUI_Listener implements Listener { @Override public void run() { player.closeInventory(); - OpenGUI.openGUI(player, gui.Command_Command, false); + OpenGUI.openGUI(player, gui.key, false); } }.runTaskLater(plugin, 4L); } else @@ -256,7 +254,7 @@ public class GUI_Listener implements Listener { @Override public void run() { player.closeInventory(); - OpenGUI.openGUI(player, gui.Command_Command, false); + OpenGUI.openGUI(player, gui.key, false); } }.runTaskLater(plugin, 4L); } @@ -271,7 +269,7 @@ public class GUI_Listener implements Listener { @Override public void run() { player.closeInventory(); - OpenGUI.openGUI(player, gui.Command_Command, false); + OpenGUI.openGUI(player, gui.key, false); } }.runTaskLater(plugin, 2L); } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java index 9f7f751..1b9e68f 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/ItemChange.java @@ -2,14 +2,10 @@ package de.jatitv.commandguiv2.Spigot.Listener; import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events; import de.jatitv.commandguiv2.Spigot.Main; -import de.jatitv.commandguiv2.Spigot.system.Give_UseItem; +import de.jatitv.commandguiv2.Spigot.system.UseItem; import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig; -import de.jatitv.commandguiv2.Spigot.system.database.Select_Database; -import net.t2code.lib.Spigot.Lib.items.ItemVersion; import net.t2code.lib.Spigot.Lib.messages.send; -import org.bukkit.Material; import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitRunnable; public class ItemChange { @@ -28,37 +24,15 @@ public class ItemChange { if (!SelectConfig.UseItem_Enable) { return; } - if (SelectConfig.UseItemGameModeProtection) { - if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemGameModeList.contains(player.getGameMode().toString())) { - if (SelectConfig.UseItemGameModeRemoveItemWhenItIsDisabled) removeItem(player); - send.debug(Main.plugin,"GameMode disabled: " +player.getName() +" " +player.getGameMode().toString()); - return; - } - if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemGameModeList.contains(player.getGameMode().toString())) { - if (SelectConfig.UseItemGameModeRemoveItemWhenItIsDisabled) removeItem(player); - send.debug(Main.plugin,"GameMode disabled: " +player.getName() +" " +player.getGameMode().toString()); - return; - } - } - if (SelectConfig.UseItemWorldProtection) { - if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemWorldList.contains(player.getWorld().getName())) { - if (SelectConfig.UseItemWorldRemoveItemWhenItIsDisabled)removeItem(player); - send.debug(Main.plugin,"World disabled: " +player.getName() +" " +player.getWorld().toString()); - return; - } - if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemWorldList.contains(player.getWorld().getName())) { - if (SelectConfig.UseItemWorldRemoveItemWhenItIsDisabled)removeItem(player); - send.debug(Main.plugin,"World disabled: " +player.getName() +" " +player.getWorld().toString()); - return; - } - } + UseItem.removeItem(player); + if (UseItem.protection(player, false)) return; if (SelectConfig.UseItem_GiveOnlyOnFirstJoin) { if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player)) { if (!player.hasPlayedBefore()) { new BukkitRunnable() { @Override public void run() { - Give_UseItem.onGive(player); + UseItem.giveUseItem(player); if (setCursor) { setCursor(player, slot); } @@ -79,11 +53,10 @@ public class ItemChange { new BukkitRunnable() { @Override public void run() { - removeItem(player); if (!SelectConfig.UseItem_AllowToggle || Events.useItemHashMap.get(player)) { if (SelectConfig.UseItem_InventorySlotEnforce || player.getInventory().getItem(slot - 1) == null) { send.debug(Main.plugin,"Give: " +player.getName()); - Give_UseItem.onGive(player); + UseItem.giveUseItem(player); if (setCursor) { setCursor(player, slot); } @@ -96,7 +69,7 @@ public class ItemChange { } } if (empty) { - Give_UseItem.onGiveADD(player); + UseItem.addUseItem(player); } } } @@ -140,20 +113,4 @@ public class ItemChange { Main.bungeejoinplayers.remove(player.getName()); } } - - private static void removeItem(Player player) { - for (int iam = 0; iam < player.getInventory().getSize() - 5; iam++) { - ItemStack itm = player.getInventory().getItem(iam); - if (itm != null) { - if (itm.getType() == Material.valueOf(SelectConfig.UseItem_Material) || itm.getType() == ItemVersion.getHead()) { - if (itm.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) { - player.getInventory().remove(itm); - player.updateInventory(); - break; - } - } - } - } - - } } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/PluginEvent.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/PluginEvent.java index ee662f0..9e3dae0 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/PluginEvent.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/PluginEvent.java @@ -4,7 +4,7 @@ package de.jatitv.commandguiv2.Spigot.Listener; import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig; -import de.jatitv.commandguiv2.Spigot.system.database.Select_Database; +import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase; import de.jatitv.commandguiv2.Util; import net.t2code.lib.Spigot.Lib.update.UpdateAPI; import org.bukkit.Bukkit; @@ -22,7 +22,7 @@ public class PluginEvent implements Listener { @EventHandler public void onJoinEvent(PlayerLoginEvent event) { Player player = event.getPlayer(); - Select_Database.nameCheck(player); + SelectDatabase.nameCheck(player); UpdateAPI.join(Main.plugin,prefix, "commandgui.updatemsg", event.getPlayer(), Util.getSpigot(), Util.getDiscord()); } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events.java index 8a9cb3f..a76c60b 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events.java @@ -6,7 +6,8 @@ import de.jatitv.commandguiv2.Spigot.cmdManagement.Commands; import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig; import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages; import de.jatitv.commandguiv2.Spigot.gui.OpenGUI; -import de.jatitv.commandguiv2.Spigot.system.database.Select_Database; +import de.jatitv.commandguiv2.Spigot.system.UseItem; +import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase; import de.jatitv.commandguiv2.api.CGuiAPI; import net.t2code.lib.Spigot.Lib.items.ItemVersion; import net.t2code.lib.Spigot.Lib.messages.send; @@ -37,11 +38,11 @@ public class Events implements Listener { public static HashMap useItemSlotHashMap = new HashMap<>(); @EventHandler public void onJoin(PlayerJoinEvent e) { - if (Select_Database.selectItemStatus(e.getPlayer())){ + if (SelectDatabase.selectItemStatus(e.getPlayer())){ useItemHashMap.put(e.getPlayer(), true); } else useItemHashMap.put(e.getPlayer(), false); - useItemSlotHashMap.put(e.getPlayer(),Select_Database.selectSlot(e.getPlayer())); + useItemSlotHashMap.put(e.getPlayer(), SelectDatabase.selectSlot(e.getPlayer())); if (CGuiAPI.JoinDisable) { send.debug(Main.plugin,"JoinDisable"); @@ -66,18 +67,7 @@ public class Events implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void onDeathDrop(PlayerDeathEvent e) { Player player = e.getEntity().getPlayer(); - for (int iam = 0; iam < player.getInventory().getSize() - 5; iam++) { - ItemStack itm = player.getInventory().getItem(iam); - if (itm != null) { - if (itm.getType() == Material.valueOf(SelectConfig.UseItem_Material) || itm.getType() == ItemVersion.getHead()) { - if (itm.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) { - player.getInventory().remove(itm); - player.updateInventory(); - break; - } - } - } - } + UseItem.removeItem(player); if (!e.getDrops().isEmpty()) { Iterator var3 = (new ArrayList(e.getDrops())).iterator(); while (var3.hasNext()) { @@ -166,44 +156,45 @@ public class Events implements Listener { } } - private static void openGUI(PlayerInteractEvent e, Player p) { + private static void openGUI(PlayerInteractEvent e, Player player) { e.setCancelled(true); - if (p.isSneaking()) { - Commands.info(p); + if (player.isSneaking()) { + Commands.info(player); return; } if (!legacy()) { - if (!topInventoryIsEmpty(p)) return; + if (!topInventoryIsEmpty(player)) return; } + if (UseItem.protection(player, true)) return; if (SelectConfig.UseItemGameModeProtection) { - if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemGameModeList.contains(p.getGameMode().toString())) { + if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemGameModeList.contains(player.getGameMode().toString())) { e.setCancelled(true); - send.player(p, SelectMessages.UseItemDisabledInGameMode); + send.player(player, SelectMessages.UseItemDisabledInGameMode); return; } - if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemGameModeList.contains(p.getGameMode().toString())) { + if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemGameModeList.contains(player.getGameMode().toString())) { e.setCancelled(true); - send.player(p, SelectMessages.UseItemDisabledInGameMode); + send.player(player, SelectMessages.UseItemDisabledInGameMode); return; } } if (SelectConfig.UseItemWorldProtection) { - if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemWorldList.contains(p.getWorld().getName())) { + if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemWorldList.contains(player.getWorld().getName())) { e.setCancelled(true); - send.player(p, SelectMessages.UseItemDisabledInWorld); + send.player(player, SelectMessages.UseItemDisabledInWorld); return; } - if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemWorldList.contains(p.getWorld().getName())) { + if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemWorldList.contains(player.getWorld().getName())) { e.setCancelled(true); - send.player(p, SelectMessages.UseItemDisabledInWorld); + send.player(player, SelectMessages.UseItemDisabledInWorld); return; } } - if (!SelectConfig.UseItem_Permission || p.hasPermission("commandgui.useitem")) { - OpenGUI.openGUI(p, SelectConfig.UseItem_OpenGUI, true); + if (!SelectConfig.UseItem_Permission || player.hasPermission("commandgui.useitem")) { + OpenGUI.openGUI(player, SelectConfig.UseItem_OpenGUI, true); } else { - p.sendMessage(SelectMessages.NoPermissionForUseItem.replace("[perm]", "commandgui.useitem") + player.sendMessage(SelectMessages.NoPermissionForUseItem.replace("[perm]", "commandgui.useitem") .replace("[gui]", SelectConfig.UseItem_OpenGUI)); } } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events_from1_10.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/EventsFrom110.java similarity index 97% rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events_from1_10.java rename to CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/EventsFrom110.java index 313609d..f853b76 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events_from1_10.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/EventsFrom110.java @@ -8,7 +8,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.*; -public class Events_from1_10 implements Listener { +public class EventsFrom110 implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void onHandSwap(PlayerSwapHandItemsEvent e) { 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 3ff09a8..ce24e27 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 @@ -6,13 +6,13 @@ import de.jatitv.commandguiv2.Spigot.objects.Obj_Select; import de.jatitv.commandguiv2.Spigot.objects.guis.Gui; import de.jatitv.commandguiv2.Spigot.cmdManagement.register.AliasRegister; import de.jatitv.commandguiv2.Spigot.gui.OpenGUI; -import de.jatitv.commandguiv2.Spigot.system.Give_UseItem; +import de.jatitv.commandguiv2.Spigot.system.UseItem; 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.database.Select_Database; +import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase; import de.jatitv.commandguiv2.Util; import net.t2code.lib.Spigot.Lib.items.ItemVersion; import net.t2code.lib.Spigot.Lib.messages.send; @@ -23,6 +23,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import java.util.Objects; + public class Commands { public static void info(CommandSender sender) { if (sender instanceof Player) { @@ -65,8 +67,12 @@ public class Commands { CmdExecuter_GUITab.arg1.put("admin", "commandgui.admin;commandgui.giveitem.other;commandgui.command.info"); ConfigCreate.configCreate(); SelectConfig.onSelect(); - Main.plugin.reloadConfig(); + Main.plugin.reloadConfig(); + 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.console("You have changed the storage medium! To apply this change, you must restart the server!"); + } LanguagesCreate.langCreate(); Obj_Select.onSelect(); @@ -97,7 +103,7 @@ public class Commands { public static void give(CommandSender sender, Player target) { if (Bukkit.getPlayer(target.getName()) != null) { - Give_UseItem.onGive(target); + UseItem.giveUseItem(target); send.sender(sender, SelectMessages.Give_Sender.replace("[player]", target.getName()).replace("[item]", SelectConfig.UseItem_Name)); send.player(target, SelectMessages.Give_Receiver.replace("[sender]", sender.getName()).replace("[item]", SelectConfig.UseItem_Name)); if (SelectConfig.Sound_Give_Enable && SelectConfig.Sound_Enable) { @@ -113,18 +119,7 @@ public class Commands { } public static void itemOn(Player player) { - for (int iam = 0; iam < player.getInventory().getSize() - 5; iam++) { - ItemStack itm = player.getInventory().getItem(iam); - if (itm != null) { - if (itm.getType() == Material.valueOf(SelectConfig.UseItem_Material) || itm.getType() == ItemVersion.getHead()) { - if (itm.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) { - player.getInventory().remove(itm); - player.updateInventory(); - break; - } - } - } - } + UseItem.removeItem(player); Integer slot = null; if (SelectConfig.UseItem_InventorySlotEnforce) { slot = SelectConfig.UseItem_InventorySlot; @@ -137,8 +132,8 @@ public class Commands { } send.debug(Main.plugin, String.valueOf(slot)); if (player.getInventory().getItem(slot - 1) == null) { - Select_Database.setItemStatusTrue(player); - Give_UseItem.onGive(player); + SelectDatabase.setItemStatusTrue(player); + UseItem.giveUseItem(player); } else { boolean empty = false; for (int i = 0; i < 9; i++) { @@ -148,8 +143,8 @@ public class Commands { } } if (empty) { - Select_Database.setItemStatusTrue(player); - Give_UseItem.onGiveADD(player); + SelectDatabase.setItemStatusTrue(player); + UseItem.addUseItem(player); send.player(player, SelectMessages.ItemON); } else { player.sendMessage(SelectMessages.NoInventorySpace); @@ -161,19 +156,8 @@ public class Commands { } public static void itemOff(Player player) { - Select_Database.setItemStatusFalse(player); - for (int iam = 0; iam < player.getInventory().getSize() - 5; iam++) { - ItemStack itm = player.getInventory().getItem(iam); - if (itm != null) { - if (itm.getType() == Material.valueOf(SelectConfig.UseItem_Material) || itm.getType() == ItemVersion.getHead()) { - if (itm.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) { - player.getInventory().remove(itm); - player.updateInventory(); - send.player(player, SelectMessages.ItemOFF); - } - } - } - } + SelectDatabase.setItemStatusFalse(player); + UseItem.removeItem(player); } public static void onSetSlot(Player player, Integer setSlot) { @@ -199,22 +183,11 @@ public class Commands { send.player(player, SelectMessages.ItemSlotNotEmpty.replace("[slot]", setSlot.toString())); return; } - for (int iam = 0; iam < player.getInventory().getSize() - 5; iam++) { - ItemStack itm = player.getInventory().getItem(iam); - if (itm != null) { - if (itm.getType() == Material.valueOf(SelectConfig.UseItem_Material) || itm.getType() == ItemVersion.getHead()) { - if (itm.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) { - player.getInventory().remove(itm); - player.updateInventory(); - break; - } - } - } - } - Select_Database.setSlot(player, setSlot); - Events.useItemSlotHashMap.replace(player,setSlot); + UseItem.removeItem(player); + SelectDatabase.setSlot(player, setSlot); + Events.useItemSlotHashMap.replace(player, setSlot); if (Events.useItemHashMap.get(player)) { - Give_UseItem.onGive(player); + UseItem.giveUseItem(player); } send.player(player, SelectMessages.ItemSlot.replace("[slot]", setSlot.toString())); } else player.sendMessage(Util.getPrefix() + " §4Function disabled"); @@ -223,24 +196,24 @@ public class Commands { public static void gui(Player player) { if (Main.guiHashMap.containsKey(SelectConfig.DefaultGUI)) { Gui gui = Main.guiHashMap.get(SelectConfig.DefaultGUI); - if (gui.GUI_Enable || player.hasPermission("commandgui.bypass")) { - if (!gui.Command_Permission_Enable || player.hasPermission("commandgui.command") || player.hasPermission("commandgui.bypass")) { + if (gui.guiEnable || player.hasPermission("commandgui.bypass")) { + if (!gui.commandPermissionEnable || player.hasPermission("commandgui.command") || player.hasPermission("commandgui.bypass")) { OpenGUI.openGUI(player, SelectConfig.DefaultGUI, true); } else player.sendMessage(SelectMessages.NoPermissionForCommand.replace("[cmd]", "/commandgui") .replace("[perm]", "commandgui.command")); - } else player.sendMessage(SelectMessages.GUIIsDisabled.replace("[gui]", gui.GUI_Name)); + } else player.sendMessage(SelectMessages.GUIIsDisabled.replace("[gui]", gui.guiName)); } } public static void gui(Player player, String arg) { if (Main.guiHashMap.containsKey(arg)) { Gui gui = Main.guiHashMap.get(arg); - if (gui.GUI_Enable || player.hasPermission("commandgui.bypass")) { - if (!gui.Command_Permission_Enable || player.hasPermission("commandgui.command." + gui.Command_Command) || player.hasPermission("commandgui.bypass")) { + if (gui.guiEnable || player.hasPermission("commandgui.bypass")) { + if (!gui.commandPermissionEnable || player.hasPermission("commandgui.command." + gui.key) || player.hasPermission("commandgui.bypass")) { OpenGUI.openGUI(player, arg, true); - } else player.sendMessage(SelectMessages.NoPermissionForCommand.replace("[cmd]", "/commandgui " + gui.Command_Command) + } else player.sendMessage(SelectMessages.NoPermissionForCommand.replace("[cmd]", "/commandgui " + gui.key) .replace("[perm]", "commandgui.command." + arg.toLowerCase())); - } else player.sendMessage(SelectMessages.GUIIsDisabled.replace("[gui]", gui.Command_Command)); + } else player.sendMessage(SelectMessages.GUIIsDisabled.replace("[gui]", gui.key)); } else player.sendMessage(SelectMessages.GUInotFound); } } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Help.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Help.java index e89c908..e461801 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Help.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Help.java @@ -15,10 +15,10 @@ public class Help { send.sender(sender, Prefix + " §8----- §4Command§9GUI §chelp §8-----"); if (sender.hasPermission("commandgui.command")) { Gui gui = Main.guiHashMap.get(SelectConfig.DefaultGUI); - send.sender(sender, Prefix + " " + SelectMessages.HelpCgui.replace("[gui]", Replace.replace(prefix,gui.GUI_Name))); + send.sender(sender, Prefix + " " + SelectMessages.HelpCgui.replace("[gui]", Replace.replace(prefix,gui.guiName))); for (String alias : Main.allAliases) { - if (Main.guiHashMap.get(alias).GUI_Enable || sender.hasPermission("commandgui.bypass")) { - send.sender(sender, Prefix + " " + SelectMessages.HelpOpen.replace("[gui]", alias).replace("[guiname]", Replace.replace(prefix,Main.guiHashMap.get(alias).GUI_Name))); + if (Main.guiHashMap.get(alias).guiEnable || sender.hasPermission("commandgui.bypass")) { + send.sender(sender, Prefix + " " + SelectMessages.HelpOpen.replace("[gui]", alias).replace("[guiname]", Replace.replace(prefix,Main.guiHashMap.get(alias).guiName))); } } send.sender(sender, Prefix + " " + SelectMessages.HelpHelp); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java index 03058fd..3c90792 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java @@ -23,7 +23,7 @@ public class AliasRegister { } for (String alias : Main.allAliases) { if (Main.guiHashMap.get(alias) != null) { - if (Main.guiHashMap.get(alias).Command_Alias_Enable) { + if (Main.guiHashMap.get(alias).commandAliasEnable) { try { final Field bukkitCommandMap = Bukkit.getServer().getClass().getDeclaredField("commandMap"); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/RegisterCommand.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/RegisterCommand.java index e9f36de..28d6bb5 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/RegisterCommand.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/RegisterCommand.java @@ -4,7 +4,6 @@ package de.jatitv.commandguiv2.Spigot.cmdManagement.register; import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Spigot.objects.guis.Gui; import de.jatitv.commandguiv2.Spigot.gui.OpenGUI; -import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig; import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -24,12 +23,12 @@ public class RegisterCommand extends Command { if (sender instanceof Player) { Player player = (Player) sender; Gui gui = Main.guiHashMap.get(alias); - if (gui.GUI_Enable || player.hasPermission("commandgui.bypass")) { - if (!gui.Command_Permission_Enable || player.hasPermission("commandgui.command." + alias) || player.hasPermission("commandgui.bypass")) { + if (gui.guiEnable || player.hasPermission("commandgui.bypass")) { + if (!gui.commandPermissionEnable || player.hasPermission("commandgui.command." + alias) || player.hasPermission("commandgui.bypass")) { OpenGUI.openGUI(player, alias, true); } else player.sendMessage(SelectMessages.NoPermissionForCommand.replace("[cmd]", "/commandgui " + alias) .replace("[perm]", "commandgui.command." + alias)); - } else player.sendMessage(SelectMessages.GUIIsDisabled.replace("[gui]", gui.GUI_Name)); + } else player.sendMessage(SelectMessages.GUIIsDisabled.replace("[gui]", gui.guiName)); } else sender.sendMessage("§8[§6Command§9GUI§8] §cThis command is only for players!"); return true; } 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 e724c8e..5fe88fc 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 @@ -4,6 +4,7 @@ import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Spigot.config.configConverter.ConfigConverterUnderV5; import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages; 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 net.t2code.lib.Spigot.Lib.messages.send; @@ -30,7 +31,8 @@ public class SelectConfig { public static String Currency; public static List mainCommands; - public static StorageType Storage; + public static String storage; + public static Boolean Bungee; public static String thisServer; @@ -129,7 +131,6 @@ public class SelectConfig { } } - if (yamlConfiguration.get("Plugin.DisableUpdateChecker") == null) { DisableUpdateChecker = false; } else DisableUpdateChecker = yamlConfiguration.getBoolean("Plugin.DisableUpdateChecker"); @@ -139,8 +140,7 @@ public class SelectConfig { language = yamlConfiguration.getString("Plugin.language"); Currency = yamlConfiguration.getString("Plugin.Currency"); DefaultGUI = yamlConfiguration.getString("Plugin.DefaultGUI"); - - Storage = StorageType.valueOf(yamlConfiguration.getString("Storage.Type").toUpperCase()); + storage = yamlConfiguration.getString("Storage.Type").toUpperCase(); MySQL.ip = yamlConfiguration.getString("Storage.MySQL.IP"); MySQL.port = yamlConfiguration.getInt("Storage.MySQL.Port"); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java index 4886a33..419cc36 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java @@ -109,13 +109,13 @@ public class GuiBuilder { public static void fillItem(Inventory inventory, Gui gui) { ItemStack glass; 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.GUI_FillItem_Item)); - } else glass = new ItemStack(Material.valueOf(gui.GUI_FillItem_Item.toUpperCase().replace(".", "_"))); + glass = new ItemStack(Material.valueOf("STAINED_GLASS_PANE"), 1, Short.valueOf(gui.guiFillItemItem)); + } else glass = new ItemStack(Material.valueOf(gui.guiFillItemItem.toUpperCase().replace(".", "_"))); ItemMeta itemMetaglass = glass.getItemMeta(); itemMetaglass.setDisplayName(" "); glass.setItemMeta(itemMetaglass); glass.setAmount(1); - for (int i = 0; i < 9 * gui.GUI_Lines; i++) { + for (int i = 0; i < 9 * gui.guiLines; i++) { inventory.setItem(i, glass); } } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java index 96f3979..771338b 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java @@ -1,6 +1,6 @@ package de.jatitv.commandguiv2.Spigot.gui; -import de.jatitv.commandguiv2.Spigot.Listener.GUI_Listener; +import de.jatitv.commandguiv2.Spigot.Listener.GUIListener; import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events; import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Spigot.objects.functions.Function; @@ -63,21 +63,25 @@ public class OpenGUI { } if (MCVersion.minecraft1_13) { - GUI_Listener.GUICode = ""; - } else GUI_Listener.GUICode = "§6§8§9§r"; - if (gui.GUI_Enable || player.hasPermission("commandgui.bypass")) { + GUIListener.GUICode = ""; + } else GUIListener.GUICode = "§6§8§9§r"; + if (gui.guiEnable || player.hasPermission("commandgui.bypass")) { Inventory inventory; if (Main.PaPi) { - inventory = Bukkit.createInventory((InventoryHolder) null, 9 * gui.GUI_Lines, (Replace.replace(prefix, player, GUI_Listener.GUICode + gui.GUI_Name))); - } else inventory = Bukkit.createInventory((InventoryHolder) null, 9 * gui.GUI_Lines, (Replace.replace(prefix, GUI_Listener.GUICode + gui.GUI_Name))); + inventory = Bukkit.createInventory((InventoryHolder) null, 9 * gui.guiLines, (Replace.replace(prefix, player, GUIListener.GUICode + gui.guiName))); + } else inventory = Bukkit.createInventory((InventoryHolder) null, 9 * gui.guiLines, (Replace.replace(prefix, GUIListener.GUICode + gui.guiName))); - if (gui.GUI_FillItem_Enable) { + if (gui.guiFillItemEnable) { GuiBuilder.fillItem(inventory, gui); } for (Slot slot : gui.slots) { Function function = Main.functionHashMap.get(slot.function); + if (function == null) { + send.error(Main.plugin, "The Function " + slot.function + " in the GUI " + gui.key + " does not exist!"); + continue; + } if (slot.permission && !player.hasPermission(slot.permissionToSee)) continue; - if (slot.slot < 0 || slot.slot > gui.GUI_Lines * 9) continue; + if (slot.slot < 0 || slot.slot > gui.guiLines * 9) continue; if (slot.enable) { if (function.empty) { @@ -100,9 +104,9 @@ public class OpenGUI { 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.GUI_Name).toString() + " §bSlot: §6" + (slot.slot + 1) + " §7- " + Replace.replace(prefix, function.name)); + 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.GUI_Name).toString() + " §bSlot: §6" + + 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) { @@ -129,8 +133,8 @@ public class OpenGUI { } } player.openInventory(inventory); - send.debug(plugin, "§6" + player.getName() + " §5Open §6" + Replace.replace(prefix, gui.GUI_Name) + " §5" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); - } else player.sendMessage(SelectMessages.GUIIsDisabled.replace("[gui]", Replace.replace(prefix, gui.GUI_Name))); + send.debug(plugin, "§6" + player.getName() + " §5Open §6" + Replace.replace(prefix, gui.guiName) + " §5" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); + } else player.sendMessage(SelectMessages.GUIIsDisabled.replace("[gui]", Replace.replace(prefix, gui.guiName))); } private static void toggleOn(Function function, Integer slot, Player player, Inventory inventory) { 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 6a5b70f..2c302b4 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 @@ -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.guis.Gui; import de.jatitv.commandguiv2.Spigot.objects.slots.Slot; +import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion; import org.bukkit.configuration.file.YamlConfiguration; @@ -16,8 +17,8 @@ import java.util.Objects; public class Obj_Select { public static void onSelect() { - onSelectGui(); onSelectFunction(); + onSelectGui(); } public static void onSelectGui() { @@ -29,9 +30,9 @@ public class Obj_Select { for (File config_gui : fileArray) { String sub = config_gui.getName().substring(config_gui.getName().length() - 4); if (sub.equals(".yml")) { - Main.allAliases.add(config_gui.getName().replace(".yml", "")); + String key = config_gui.getName().replace(".yml", ""); + Main.allAliases.add(key); YamlConfiguration yamlConfiguration_gui = YamlConfiguration.loadConfiguration(config_gui); - String guiFileName = config_gui.getName().replace(".yml", ""); Boolean guiEnable = yamlConfiguration_gui.getBoolean("GUI.Enable"); Integer guiLines = yamlConfiguration_gui.getInt("GUI.Lines"); @@ -53,27 +54,31 @@ public class Obj_Select { Boolean commandPermission = yamlConfiguration_gui.getBoolean("Command.Permission.Required"); ArrayList slots = new ArrayList<>(); - for (String key : yamlConfiguration_gui.getConfigurationSection("Slots").getKeys(false)) { - Integer slotNumber = yamlConfiguration_gui.getInt("Slots." + key + ".Slot") - 1; - Boolean enable = yamlConfiguration_gui.getBoolean("Slots." + key + ".Enable"); - String function = yamlConfiguration_gui.getString("Slots." + key + ".Function"); - Boolean permRequired = yamlConfiguration_gui.getBoolean("Slots." + key + ".Permission.Required"); - String permSee = yamlConfiguration_gui.getString("Slots." + key + ".Permission.See"); - String permUse = yamlConfiguration_gui.getString("Slots." + key + ".Permission.Use"); + for (String slotKey : yamlConfiguration_gui.getConfigurationSection("Slots").getKeys(false)) { + Integer slotNumber = yamlConfiguration_gui.getInt("Slots." + slotKey + ".Slot") - 1; + Boolean enable = yamlConfiguration_gui.getBoolean("Slots." + slotKey + ".Enable"); + String function = yamlConfiguration_gui.getString("Slots." + slotKey + ".Function"); + Function functionCheck = Main.functionHashMap.get(function); + if (functionCheck == null) { + send.error(Main.plugin, "The Function " + function + " in the GUI " + key + " does not exist!"); + } + Boolean permRequired = yamlConfiguration_gui.getBoolean("Slots." + slotKey + ".Permission.Required"); + String permSee = yamlConfiguration_gui.getString("Slots." + slotKey + ".Permission.See"); + String permUse = yamlConfiguration_gui.getString("Slots." + slotKey + ".Permission.Use"); Slot slot = new Slot(slotNumber, enable, function, permRequired, - Objects.requireNonNull(permSee).replace("[function]", guiFileName).replace("[slot]", String.valueOf(slotNumber + 1)) - .replace("[slotname]", key.toLowerCase()), - Objects.requireNonNull(permUse).replace("[function]", guiFileName).replace("[slot]", String.valueOf(slotNumber + 1)) - .replace("[slotname]", key.toLowerCase())); + Objects.requireNonNull(permSee).replace("[function]", key).replace("[slot]", String.valueOf(slotNumber + 1)) + .replace("[slotname]", slotKey.toLowerCase()), + Objects.requireNonNull(permUse).replace("[function]", key).replace("[slot]", String.valueOf(slotNumber + 1)) + .replace("[slotname]", slotKey.toLowerCase())); slots.add(slot); } Gui gui = new Gui(guiEnable, guiLines, guiName, guiFillItemEnable, guiFillItemItem, - config_gui.getName().replace(".yml", ""), commandAliasEnable, commandPermission, slots); + key, commandAliasEnable, commandPermission, slots); - Main.guiHashMap.put(guiFileName, gui); + Main.guiHashMap.put(key, gui); CmdExecuter_GUITab.arg1.put(config_gui.getName() - .replace(".yml", ""), "commandgui.gui." + config_gui.getName().replace(".yml", "")); + .replace(".yml", ""), "commandgui.gui." + key); try { yamlConfiguration_gui.save(config_gui); @@ -94,6 +99,7 @@ public class Obj_Select { if (sub.equals(".yml")) { YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); + String key = config.getName().replace(".yml", ""); Boolean empty = yamlConfiguration.getBoolean("Slots.Function.Item.Empty"); Integer itemAmount = yamlConfiguration.getInt("Slots.Function.Item.Amount"); Boolean playerHead_Enable = yamlConfiguration.getBoolean("Slots.Function.Item.PlayerHead.Enable"); @@ -145,13 +151,13 @@ public class Obj_Select { String pluginReloadCommand = yamlConfiguration.getString("Slots.Function.SetConfig.PluginReload.Command"); - Function function = new Function(empty, itemAmount, playerHead_Enable, base64_Enable, base64Value, playerWhoHasOpenedTheGUI, playerName, item, name, lore, + 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, serverChange, serverChangeServer, openGUI_Enable, openGUI, togglePermission, togglePermissionPerm, toggleUseItem, message_Enable, message, setConfigEnable, configFilePath, configOptionPath, configOptionPremat, configStringValueLeft, configBooleanValueLeft, configIntegerValueLeft, configDoubleValueLeft, configListValueLeft, configStringValueRight, configBooleanValueRight, configIntegerValueRight, configDoubleValueRight, configListValueRight, pluginReloadEnable, pluginReloadCommand); - Main.functionHashMap.put(config.getName().replace(".yml", ""), function); + Main.functionHashMap.put(key, function); try { yamlConfiguration.save(config); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/functions/Function.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/functions/Function.java index 5801910..54b8ec9 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/functions/Function.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/functions/Function.java @@ -4,6 +4,7 @@ import java.util.List; public class Function { + public String key; public Boolean empty; public Integer itemAmount; public Boolean playerHead_Enable; @@ -54,7 +55,8 @@ public class Function { public Boolean pluginReloadEnable; public String pluginReloadCommand; - public Function(Boolean empty, + public Function(String key, + Boolean empty, Integer itemAmount, Boolean playerHead_Enable, Boolean base64Value_Enable, @@ -101,6 +103,7 @@ public class Function { Boolean pluginReloadEnable, String pluginReloadCommand) { + this.key = key; this.empty = empty; this.itemAmount = itemAmount; this.playerHead_Enable = playerHead_Enable; @@ -152,6 +155,5 @@ public class Function { this.pluginReloadCommand = pluginReloadCommand; - } } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/guis/Gui.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/guis/Gui.java index b2369fc..a3ddaaa 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/guis/Gui.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/guis/Gui.java @@ -5,28 +5,28 @@ import de.jatitv.commandguiv2.Spigot.objects.slots.Slot; import java.util.ArrayList; public class Gui { - public Boolean GUI_Enable; - public Integer GUI_Lines; - public String GUI_Name; - public Boolean GUI_FillItem_Enable; - public String GUI_FillItem_Item; + public Boolean guiEnable; + public Integer guiLines; + public String guiName; + public Boolean guiFillItemEnable; + public String guiFillItemItem; - public String Command_Command; - public Boolean Command_Alias_Enable; - public Boolean Command_Permission_Enable; + public String key; + public Boolean commandAliasEnable; + public Boolean commandPermissionEnable; public ArrayList slots; - public Gui(Boolean GUI_Enable, Integer GUI_Lines, String GUI_Name, Boolean GUI_FillItem_Enable, String GUI_FillItem_Item, - String Command_Command, Boolean Command_Alias_Enable, Boolean Command_Permission_Enable, ArrayList slots){ - this.GUI_Enable = GUI_Enable; - this.GUI_Lines = GUI_Lines; - this.GUI_Name = GUI_Name; - this.GUI_FillItem_Enable = GUI_FillItem_Enable; - this.GUI_FillItem_Item = GUI_FillItem_Item; - this.Command_Command = Command_Command; - this.Command_Alias_Enable = Command_Alias_Enable; - this.Command_Permission_Enable = Command_Permission_Enable; + public Gui(Boolean guiEnable, Integer guiLines, String guiName, Boolean guiFillitemEnable, String guiFillitemItem, + String commandCommand, Boolean commandAliasEnable, Boolean commandPermissionEnable, ArrayList slots){ + this.guiEnable = guiEnable; + this.guiLines = guiLines; + this.guiName = guiName; + this.guiFillItemEnable = guiFillitemEnable; + this.guiFillItemItem = guiFillitemItem; + this.key = commandCommand; + this.commandAliasEnable = commandAliasEnable; + this.commandPermissionEnable = commandPermissionEnable; this.slots = slots; } } 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 39a5873..1d0837a 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 @@ -1,7 +1,7 @@ package de.jatitv.commandguiv2.Spigot.system; -import de.jatitv.commandguiv2.Spigot.Listener.GUI_Listener; -import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events_from1_10; +import de.jatitv.commandguiv2.Spigot.Listener.GUIListener; +import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.EventsFrom110; import de.jatitv.commandguiv2.Spigot.cmdManagement.CmdExecuter_GUITab; import de.jatitv.commandguiv2.Spigot.cmdManagement.CmdExecuter_GUIItem; import de.jatitv.commandguiv2.Spigot.cmdManagement.CmdExecuter_Help; @@ -18,8 +18,8 @@ import de.jatitv.commandguiv2.Spigot.objects.Obj_Select; import de.jatitv.commandguiv2.Spigot.config.config.ConfigCreate; import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig; import de.jatitv.commandguiv2.Spigot.system.database.SQLITE; +import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase; import de.jatitv.commandguiv2.Spigot.system.database.StorageType; -import de.jatitv.commandguiv2.Spigot.system.database.YML; import net.t2code.lib.Spigot.Lib.messages.T2CodeTemplate; import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion; @@ -112,46 +112,9 @@ public class Load { } send.console(prefix + " §8-------------------------------"); - switch (SelectConfig.Storage) { - case MYSQL: - MySQL.main(); - send.console(prefix + " §2Storage medium §6MySQL §2is used."); - try { - MySQL.query("CREATE TABLE IF NOT EXISTS `gui-item` (" + - " `UUID` VARCHAR(191) NOT NULL COLLATE 'utf8mb4_general_ci'," + - " `Name` TINYTEXT NOT NULL COLLATE 'utf8mb4_general_ci'," + - " `Status` INT(1) NOT NULL DEFAULT '1'," + - " `Slot` INT(1) NULL DEFAULT NULL," + - " UNIQUE INDEX `UUID` (`UUID`)" + - ")" + - "COLLATE='utf8mb4_general_ci'" + - "ENGINE=InnoDB" + - ";"); - MySQL.query("ALTER TABLE `gui-item` ADD COLUMN IF NOT EXISTS `Slot` INT(1) NULL DEFAULT NULL AFTER `Status`;"); - } catch (Exception e) { - e.printStackTrace(); - } - break; - case YML: - send.console(prefix + " §2Storage medium §6YML §2is used."); - break; - default: - case SQLITE: - try { - SQLITE.main(); - send.console(prefix + " §2Storage medium §6SQLITE §2is used."); - SQLITE.query("CREATE TABLE IF NOT EXISTS `gui-item` (" + - "UUID TEXT NOT NULL," + - "Name TEXT NOT NULL," + - "Status INTEGER NOT NULL DEFAULT 1," + - "Slot INTEGER," + - "PRIMARY KEY(UUID)" + - ");"); - } catch (SQLException e) { - e.printStackTrace(); - } - break; - } + loadStorage(prefix); + send.console(prefix + " §8-------------------------------"); + if (Main.PaPi) { send.console(prefix + " §2PlaceholderAPI successfully connected!"); } else { @@ -179,13 +142,13 @@ public class Load { e.printStackTrace(); } - Bukkit.getServer().getPluginManager().registerEvents(new GUI_Listener(), plugin); + Bukkit.getServer().getPluginManager().registerEvents(new GUIListener(), plugin); Bukkit.getServer().getPluginManager().registerEvents(new PluginEvent(), plugin); Bukkit.getServer().getPluginManager().registerEvents(new Events(), Main.plugin); if (!MCVersion.minecraft1_8 && !MCVersion.minecraft1_9) { - Bukkit.getServer().getPluginManager().registerEvents(new Events_from1_10(), plugin); + Bukkit.getServer().getPluginManager().registerEvents(new EventsFrom110(), plugin); } UpdateAPI.onUpdateCheck(plugin, prefix, spigot, spigotID, discord); @@ -193,4 +156,55 @@ public class Load { Main.addonLoad(); T2CodeTemplate.onLoadFooter(prefix, long_); } + + private static void loadStorage(String prefix) { + try { + SelectDatabase.setStorage(StorageType.valueOf(SelectConfig.storage)); + } catch (Exception ignored) { + send.error(Main.plugin, "The storage medium " + SelectConfig.storage + " is not supported!"); + send.error(Main.plugin, "Storage medium " + StorageType.SQLITE + " is used."); + SelectDatabase.setStorage(StorageType.SQLITE); + } + + switch (SelectDatabase.getStorage()) { + case MYSQL: + send.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used."); + MySQL.main(); + try { + MySQL.query("CREATE TABLE IF NOT EXISTS `gui-item` (" + + " `UUID` VARCHAR(191) NOT NULL COLLATE 'utf8mb4_general_ci'," + + " `Name` TINYTEXT NOT NULL COLLATE 'utf8mb4_general_ci'," + + " `Status` INT(1) NOT NULL DEFAULT '1'," + + " `Slot` INT(1) NULL DEFAULT NULL," + + " UNIQUE INDEX `UUID` (`UUID`)" + + ")" + + "COLLATE='utf8mb4_general_ci'" + + "ENGINE=InnoDB" + + ";"); + MySQL.query("ALTER TABLE `gui-item` ADD COLUMN IF NOT EXISTS `Slot` INT(1) NULL DEFAULT NULL AFTER `Status`;"); + } catch (Exception e) { + e.printStackTrace(); + } + break; + case YML: + send.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used."); + break; + default: + case SQLITE: + send.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used."); + try { + SQLITE.main(); + SQLITE.query("CREATE TABLE IF NOT EXISTS `gui-item` (" + + "UUID TEXT NOT NULL," + + "Name TEXT NOT NULL," + + "Status INTEGER NOT NULL DEFAULT 1," + + "Slot INTEGER," + + "PRIMARY KEY(UUID)" + + ");"); + } catch (SQLException e) { + e.printStackTrace(); + } + break; + } + } } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java index b66b828..7929618 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java @@ -5,6 +5,8 @@ package de.jatitv.commandguiv2.Spigot.system; import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig; +import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase; +import de.jatitv.commandguiv2.Spigot.system.database.StorageType; import de.jatitv.commandguiv2.Util; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; @@ -35,6 +37,13 @@ public class Metrics { int pluginId = Util.getBstatsID(); // <-- Replace with the id of your plugin! Metrics metrics = new Metrics(Main.plugin, pluginId); metrics.addCustomChart(new Metrics.SimplePie("updatecheckonjoin", () -> String.valueOf(SelectConfig.UpdateCheckOnJoin))); + metrics.addCustomChart(new DrilldownPie("storage_type_mysql", () -> { + Map> map = new HashMap<>(); + String storage = SelectDatabase.getStorage().toString(); + Map entry = new HashMap<>(); + entry.put(storage, 1); map.put(storage, entry); + return map; + })); } private final Plugin plugin; 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/RegisterPermissions.java index 57e4fd1..a67fd41 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/RegisterPermissions.java @@ -2,11 +2,8 @@ package de.jatitv.commandguiv2.Spigot.system; import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Spigot.objects.guis.Gui; -import de.jatitv.commandguiv2.Spigot.objects.functions.Function; import de.jatitv.commandguiv2.Spigot.objects.slots.Slot; import net.t2code.lib.Spigot.Lib.register.Register; -import org.bukkit.Bukkit; -import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.Plugin; @@ -67,8 +64,8 @@ public class RegisterPermissions { for (Gui gui : Main.guiHashMap.values()) { - Register.permission("commandgui.command." + gui.Command_Command, op, plugin); - Register.permission(admin, op, "commandgui.command." + gui.Command_Command, true, plugin); + Register.permission("commandgui.command." + gui.key, op, plugin); + Register.permission(admin, op, "commandgui.command." + gui.key, true, plugin); for (Slot slot : gui.slots) { Register.permission(slot.permissionToUse, op, plugin); Register.permission(admin, op, slot.permissionToUse, true, plugin); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/UseItem.java similarity index 58% rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java rename to CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/UseItem.java index 5b389ff..57692fe 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/UseItem.java @@ -5,7 +5,7 @@ import com.mojang.authlib.properties.Property; 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.system.database.Select_Database; +import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages; import de.jatitv.commandguiv2.Util; import net.t2code.lib.Spigot.Lib.items.ItemVersion; import net.t2code.lib.Spigot.Lib.messages.send; @@ -20,15 +20,16 @@ import org.bukkit.inventory.meta.SkullMeta; import java.lang.reflect.Field; import java.util.UUID; -public class Give_UseItem { +public class UseItem { - public static void onGive(Player player) { + public static void giveUseItem(Player player) { Integer slot; - if (SelectConfig.UseItem_InventorySlotEnforce){ + if (protection(player, false)) return; + if (SelectConfig.UseItem_InventorySlotEnforce) { slot = SelectConfig.UseItem_InventorySlot; } else { - if (Events.useItemSlotHashMap.get(player)== null) { + if (Events.useItemSlotHashMap.get(player) == null) { slot = SelectConfig.UseItem_InventorySlot; } else { slot = Events.useItemSlotHashMap.get(player); @@ -37,12 +38,13 @@ public class Give_UseItem { if (SelectConfig.UseItem_InventorySlot_FreeSlot) { player.getInventory().addItem(itemStack(player)); } else { - send.debug(Main.plugin,"setUseItem: " + player.getName() + " Slot: "+ Integer.parseInt(String.valueOf(slot-1))); + send.debug(Main.plugin, "setUseItem: " + player.getName() + " Slot: " + Integer.parseInt(String.valueOf(slot - 1))); player.getInventory().setItem(slot - 1, itemStack(player)); } } - public static void onGiveADD(Player player) { + public static void addUseItem(Player player) { + if (protection(player, false)) return; if (SelectConfig.UseItem_InventorySlot_FreeSlot) { player.getInventory().addItem(itemStack(player)); } else player.getInventory().addItem(itemStack(player)); @@ -96,4 +98,52 @@ public class Give_UseItem { } return item; } + + public static boolean protection(Player player, Boolean interact) { + if (SelectConfig.UseItemGameModeProtection) { + if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemGameModeList.contains(player.getGameMode().toString())) { + if (interact) { + send.player(player, SelectMessages.UseItemDisabledInGameMode); + } else if (!SelectConfig.UseItemWorldRemoveItemWhenItIsDisabled) removeItem(player); + return true; + } + if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemGameModeList.contains(player.getGameMode().toString())) { + if (interact) { + send.player(player, SelectMessages.UseItemDisabledInGameMode); + } else if (!SelectConfig.UseItemWorldRemoveItemWhenItIsDisabled) removeItem(player); + return true; + } + } + if (SelectConfig.UseItemWorldProtection) { + if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemWorldList.contains(player.getWorld().getName())) { + if (interact) { + send.player(player, SelectMessages.UseItemDisabledInWorld); + } else if (!SelectConfig.UseItemWorldRemoveItemWhenItIsDisabled) removeItem(player); + return true; + } + if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemWorldList.contains(player.getWorld().getName())) { + if (interact) { + send.player(player, SelectMessages.UseItemDisabledInWorld); + } else if (!SelectConfig.UseItemWorldRemoveItemWhenItIsDisabled) removeItem(player); + return true; + } + } + return false; + } + + public static void removeItem(Player player) { + send.debug(Main.plugin, "World disabled: " + player.getName() + " " + player.getWorld().toString()); + for (int iam = 0; iam < player.getInventory().getSize() - 5; iam++) { + ItemStack itm = player.getInventory().getItem(iam); + if (itm != null) { + if (itm.getType() == Material.valueOf(SelectConfig.UseItem_Material) || itm.getType() == ItemVersion.getHead()) { + if (itm.getItemMeta().getDisplayName().equals(SelectConfig.UseItem_Name)) { + player.getInventory().remove(itm); + player.updateInventory(); + break; + } + } + } + } + } } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/MySQL.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/MySQL.java index 49ddaf3..27dd43b 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/MySQL.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/MySQL.java @@ -35,9 +35,9 @@ public class MySQL { config.addDataSourceProperty("prepStmtCacheSize", "250"); config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); ds = new HikariDataSource(config); - send.console(Main.prefix + " §2MySQL successfully connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + send.console(Main.prefix + " §2MYSQL successfully connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); } catch (Exception ex) { - 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"); } //Bukkit.getConsoleSender().sendMessage((System.currentTimeMillis() - long_) + "ms"); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SQLITE.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SQLITE.java index 1564893..401ad9b 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SQLITE.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SQLITE.java @@ -22,7 +22,7 @@ public class SQLITE { } url = "jdbc:sqlite:" + Main.plugin.getDataFolder() + "/Storage/data.db"; con = DriverManager.getConnection(url); - Bukkit.getConsoleSender().sendMessage(Util.getPrefix() + " §2Datenbank erfolgreich verbunden." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); + Bukkit.getConsoleSender().sendMessage(Util.getPrefix() + " §2SQLITE successfully connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms"); DatabaseMetaData dbmd = con.getMetaData(); } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/Select_Database.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SelectDatabase.java similarity index 92% rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/Select_Database.java rename to CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SelectDatabase.java index aee094a..3da6206 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/Select_Database.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/database/SelectDatabase.java @@ -4,10 +4,20 @@ import de.jatitv.commandguiv2.Spigot.Listener.UseItem_Listener.Events; import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig; import org.bukkit.entity.Player; -public class Select_Database { +public class SelectDatabase { + + private static StorageType Storage; + + public static StorageType getStorage() { + return Storage; + } + + public static void setStorage(StorageType storage) { + Storage = storage; + } public static void nameCheck(Player player) { - switch (SelectConfig.Storage){ + switch (Storage){ case MYSQL: MySQL.query("UPDATE `gui-item` SET Name='" + player.getName() + "' WHERE UUID='" + player.getUniqueId() + "';"); break; @@ -24,7 +34,7 @@ public class Select_Database { } public static void setSlot(Player player, Integer slot) { - switch (SelectConfig.Storage) { + switch (Storage) { case MYSQL: MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`, `Slot`) VALUES ('" + player.getUniqueId() + "', '" + player.getName() + "','" + slot + "') ON DUPLICATE KEY UPDATE `Name` = '" + player.getName() + "', `Slot` = '" + slot + "';"); @@ -42,7 +52,7 @@ public class Select_Database { public static void setItemStatusTrue(Player player) { Events.useItemHashMap.replace(player, true); - switch (SelectConfig.Storage) { + switch (Storage) { case MYSQL: MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`) VALUES ('" + player.getUniqueId() + "', '" + player.getName() + "') ON DUPLICATE KEY UPDATE `Name` = '" + player.getName() + "', `Status` = '1';"); @@ -60,7 +70,7 @@ public class Select_Database { public static void setItemStatusFalse(Player player) { Events.useItemHashMap.replace(player, false); - switch (SelectConfig.Storage) { + switch (Storage) { case MYSQL: MySQL.query("INSERT INTO `gui-item` (`UUID`, `Name`, `Status`) VALUES ('" + player.getUniqueId() + "', '" + player.getName() + "', '0') ON DUPLICATE KEY UPDATE `Name` = '" + player.getName() + "', `Status` = '0';"); @@ -77,7 +87,7 @@ public class Select_Database { } public static Boolean selectItemStatus(Player player) { - switch (SelectConfig.Storage) { + switch (Storage) { case MYSQL: String result = MySQL.select("SELECT `Status` FROM `gui-item` WHERE `UUID`='" + player.getUniqueId() + "';"); if(result == null || result.equals("")){ @@ -97,7 +107,7 @@ public class Select_Database { } public static Integer selectSlot(Player player) { - switch (SelectConfig.Storage) { + 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")){ 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 12e4e5f..38afa67 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,7 +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.database.Select_Database; +import de.jatitv.commandguiv2.Spigot.system.database.SelectDatabase; import net.t2code.lib.Spigot.Lib.messages.send; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -52,12 +52,12 @@ public class CGuiAPI { public static void setPlayerItemEnable(Player player, Boolean value) { if (value) { - Select_Database.setItemStatusTrue(player); - } else Select_Database.setItemStatusFalse(player); + SelectDatabase.setItemStatusTrue(player); + } else SelectDatabase.setItemStatusFalse(player); } public static void setPlayerItemSlot(Player player, Integer value) { - Select_Database.setSlot(player, value); + SelectDatabase.setSlot(player, value); } public static void openDefaultGUI(Player player) {