From 31a4f2d2adcc738bd62a4868474774df9c8bf7fc Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Sat, 16 Apr 2022 14:38:36 +0200 Subject: [PATCH] fix --- CommandGUI V2/pom.xml | 2 +- .../Spigot/Listener/GUI_Listener.java | 358 +----------------- 2 files changed, 2 insertions(+), 358 deletions(-) diff --git a/CommandGUI V2/pom.xml b/CommandGUI V2/pom.xml index 54d8402..42a4635 100644 --- a/CommandGUI V2/pom.xml +++ b/CommandGUI V2/pom.xml @@ -86,7 +86,7 @@ net.t2code T2CodeLib - 10.3 + 11.4 net.t2code 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/GUI_Listener.java index 91d81d6..1bc4f84 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/GUI_Listener.java @@ -24,6 +24,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitRunnable; import java.io.File; @@ -38,111 +39,6 @@ public class GUI_Listener implements Listener { @EventHandler public void onInventoryClick(InventoryClickEvent e) { Player player = (Player) e.getWhoClicked(); -<<<<<<< Updated upstream - if (e.getInventory() != null && e.getCurrentItem() != null) { - for (Object 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)))) { - e.setCancelled(true); - for (Slot slot : gui.GUI_Slots) { - /* if (!slot.ItemsRemovable) { - e.setCancelled(true); - } - */ - - if (e.getSlot() == slot.Slot) { - if (!slot.Perm - || player.hasPermission("commandgui.gui." + gui.Command_Command + ".slot." + (slot.Slot + 1)) - || player.hasPermission("commandgui.gui." + gui.Command_Command + ".slot." + (slot.Slot + 1) + ".use") - || player.hasPermission("commandgui.admin")) { - if (slot.Enable) { - if (e.getCurrentItem().getItemMeta().getDisplayName().equals(Replace.replace(prefix, slot.Name))) { - if (e.getCurrentItem().getType() == ItemVersion.getHead() || e.getCurrentItem().getType() == Material.valueOf(slot.Item.toUpperCase().replace(".", "_"))) { - if (slot.Cost_Enable) { - if (slot.Command_Enable || slot.Message_Enable || slot.OpenGUI_Enable || slot.ServerChange) { - if (Vault.buy(prefix, player, slot.Price)) { - player.sendMessage(SelectMessages.Buy_msg.replace("[itemname]", Replace.replace(prefix, slot.Name)) - .replace("[price]", slot.Price + " " + SelectConfig.Currency)); - if (slot.Command_Enable) { - - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - } - }.runTaskLater(plugin, 1L); - - new BukkitRunnable() { - @Override - public void run() { - if (slot.Command_BungeeCommand && SelectConfig.Bungee) { - for (String cmd : slot.Command) { - Bungee_Sender_Reciver.sendToBungee(player, cmd.replace("[player]", player.getName()), slot.CommandAsConsole); - } - } else { - if (slot.CommandAsConsole) { - for (String cmd : slot.Command) { - Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), cmd.replace("[player]", player.getName())); - } - } else { - for (String cmd : slot.Command) { - player.chat("/" + cmd.replace("[player]", player.getName())); - } - } - } - } - }.runTaskLater(plugin, 2L); - } - if (slot.OpenGUI_Enable) { - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - - } - }.runTaskLater(plugin, 1L); - new BukkitRunnable() { - @Override - public void run() { - OpenGUI.openGUI(player, Main.guiHashMap.get(slot.OpenGUI), slot.OpenGUI); - } - }.runTaskLater(plugin, 2L); - } - if (slot.Message_Enable) { - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - } - }.runTaskLater(plugin, 1L); - - for (String msg : slot.Message) { - if (Main.PaPi) { - player.sendMessage(Replace.replacePrice(prefix, player, msg, slot.Price + " " + SelectConfig.Currency)); - } else - player.sendMessage(Replace.replacePrice(prefix, msg, slot.Price + " " + SelectConfig.Currency)); - } - } - if (slot.ServerChange) { - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - } - }.runTaskLater(plugin, 1L); - - send.player(player, SelectMessages.onServerChange.replace("[server]", slot.ServerChangeServer)); - new BukkitRunnable() { - @Override - public void run() { - ServerChange.send(player, slot.ServerChangeServer); - } - }.runTaskLater(Main.plugin, 20L); - } - if (slot.SetConfigEnable) { - File config = new File(slot.ConfigFilePath); - YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); -======= JavaPlugin plugin = Main.plugin; if (e.getInventory() == null) return; if (e.getCurrentItem() == null) return; @@ -281,258 +177,7 @@ public class GUI_Listener implements Listener { private static void setConfig(Slot slot, Player player, InventoryClickEvent e) { File config = new File(slot.configFilePath); YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); ->>>>>>> Stashed changes - /*if (slot.ConfigChatInput){ - ConfigChat.EditChat.put(player, slot.ConfigOptionPath); - player.sendMessage(DefaultValue.SettingsGUIchatSet.replace("[setting]", "Shop Name Chest small")); - player.sendMessage(DefaultValue.SettingsGUIchatCancel); - } else - { - */ -<<<<<<< Updated upstream - if (e.getClick() == ClickType.LEFT) { - if (slot.ConfigOptionPremat.equals("String")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigStringValueLeft); - } else if (slot.ConfigOptionPremat.equals("Boolean")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigBooleanValueLeft); - } else if (slot.ConfigOptionPremat.equals("Integer")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigIntegerValueLeft); - } else if (slot.ConfigOptionPremat.equals("Double")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigDoubleValueLeft); - } else if (slot.ConfigOptionPremat.equals("List")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigListValueLeft); - } else { - player.sendMessage("§cCheck the Option §6SetConfig/Option/Premat"); //todo - } - } - if (e.getClick() == ClickType.RIGHT) { - if (slot.ConfigOptionPremat.equals("String")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigStringValueRight); - } else if (slot.ConfigOptionPremat.equals("Boolean")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigBooleanValueRight); - } else if (slot.ConfigOptionPremat.equals("Integer")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigIntegerValueRight); - } else if (slot.ConfigOptionPremat.equals("Double")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigDoubleValueRight); - } else if (slot.ConfigOptionPremat.equals("List")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigListValueRight); - } else { - player.sendMessage("§cCheck the Option §6SetConfig/Option/Premat"); //todo - } - } - try { - yamlConfiguration.save(config); - } catch (IOException tac) { - tac.printStackTrace(); - } - if (slot.PluginReloadEnable) { - Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), slot.PluginReloadCommand); - } - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - } - }.runTaskLater(plugin, 1L); - } - if (SelectConfig.Sound_Enable && SelectConfig.Sound_Click_Enable) { - if (slot.CustomSound_Enable) { - if (!slot.CustomSound_NoSound) { - try { - player.playSound(player.getLocation(), Sound.valueOf(slot.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" + slot.CustomSound_Sound)); - player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1); - } - } - } else - player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1); - } - - } else { - - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - } - }.runTaskLater(plugin, 1L); - - player.sendMessage(SelectMessages.No_money); - if (SelectConfig.Sound_NoMoney_Enable && SelectConfig.Sound_Enable) { - player.playSound(player.getLocation(), SelectConfig.Sound_NoMoney, 3, 1); - } - } - } - } else { - if (slot.Command_Enable) { - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - } - }.runTaskLater(plugin, 1L); - - new BukkitRunnable() { - @Override - public void run() { - if (slot.Command_BungeeCommand) { - if (SelectConfig.Bungee) { - for (String cmd : slot.Command) { - Bungee_Sender_Reciver.sendToBungee(player, cmd.replace("[player]", player.getName()), slot.CommandAsConsole); - } - } else { - send.console(prefix + " §4To use bungee commands, enable the Bungee option in the config."); - send.player(player, prefix + " §4To use bungee commands, enable the Bungee option in the config."); - } - - } else { - if (slot.CommandAsConsole) { - for (String cmd : slot.Command) { - Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), cmd.replace("[player]", player.getName())); - } - } else { - for (String cmd : slot.Command) { - player.chat("/" + cmd); - } - } - } - } - }.runTaskLater(plugin, 2L); - } - if (slot.OpenGUI_Enable) { - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - } - }.runTaskLater(plugin, 1L); - new BukkitRunnable() { - @Override - public void run() { - - OpenGUI.openGUI(player, Main.guiHashMap.get(slot.OpenGUI), slot.OpenGUI); - } - }.runTaskLater(plugin, 2L); - } - if (slot.Message_Enable) { - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - } - }.runTaskLater(plugin, 1L); - - - for (String msg : slot.Message) { - if (Main.PaPi) { - player.sendMessage(Replace.replace(prefix, player, msg.replace("[prefix]", prefix))); - } else - player.sendMessage(Replace.replace(prefix, msg.replace("[prefix]", prefix))); - } - } - if (slot.ServerChange) { - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - } - }.runTaskLater(plugin, 1L); - - send.player(player, SelectMessages.onServerChange.replace("[server]", slot.ServerChangeServer)); - - - new BukkitRunnable() { - @Override - public void run() { - ServerChange.send(player, slot.ServerChangeServer); - } - }.runTaskLater(Main.plugin, 20L); - } - if (slot.SetConfigEnable) { - File config = new File(slot.ConfigFilePath); - YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); - /*if (slot.ConfigChatInput){ - ConfigChat.EditChat.put(player, slot.ConfigOptionPath); - player.sendMessage(DefaultValue.SettingsGUIchatSet.replace("[setting]", "Shop Name Chest small")); - player.sendMessage(DefaultValue.SettingsGUIchatCancel); - } else - { - */ - if (e.isLeftClick()) { - if (slot.ConfigOptionPremat.equals("String")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigStringValueLeft); - } else if (slot.ConfigOptionPremat.equals("Boolean")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigBooleanValueLeft); - } else if (slot.ConfigOptionPremat.equals("Integer")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigIntegerValueLeft); - } else if (slot.ConfigOptionPremat.equals("Double")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigDoubleValueLeft); - } else if (slot.ConfigOptionPremat.equals("List")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigListValueLeft); - } else { - player.sendMessage("§cCheck the Option §6SetConfig/Option/Premat"); //todo - } - } - if (e.isRightClick()) { - if (slot.ConfigOptionPremat.equals("String")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigStringValueRight); - } else if (slot.ConfigOptionPremat.equals("Boolean")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigBooleanValueRight); - } else if (slot.ConfigOptionPremat.equals("Integer")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigIntegerValueRight); - } else if (slot.ConfigOptionPremat.equals("Double")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigDoubleValueRight); - } else if (slot.ConfigOptionPremat.equals("List")) { - yamlConfiguration.set(slot.ConfigOptionPath.replace("/", "."), slot.ConfigListValueRight); - } else { - player.sendMessage("§cCheck the Option §6SetConfig/Option/Premat"); //todo - } - } - try { - yamlConfiguration.save(config); - } catch (IOException tac) { - tac.printStackTrace(); - } - if (slot.PluginReloadEnable) { - Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), slot.PluginReloadCommand); - } - new BukkitRunnable() { - @Override - public void run() { - player.closeInventory(); - } - }.runTaskLater(plugin, 1L); - } - if (SelectConfig.Sound_Enable && SelectConfig.Sound_Click_Enable) { - if (slot.CustomSound_Enable) { - if (!slot.CustomSound_NoSound) { - try { - player.playSound(player.getLocation(), Sound.valueOf(slot.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" + slot.CustomSound_Sound)); - player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1); - } - } - } else - player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1); - } - } - } - } - } - } else { - player.sendMessage(SelectMessages.NoPermissionForItem.replace("[item]", Replace.replace(prefix, slot.Name)) - .replace("[perm]", "commandgui.gui." + gui.Command_Command + ".slot." + (slot.Slot + 1))); - } - } - } -======= if (e.getClick() == ClickType.LEFT) { if (slot.configOptionPremat.equals("String")) { yamlConfiguration.set(slot.configOptionPath.replace("/", "."), slot.configStringValueLeft); @@ -589,7 +234,6 @@ public class GUI_Listener implements Listener { 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" + slot.customSound_Sound)); player.playSound(player.getLocation(), SelectConfig.Sound_Click, 3, 1); ->>>>>>> Stashed changes } } }