From 78f509fdbd056f2eef9247eb567cd6d0132478fe Mon Sep 17 00:00:00 2001 From: 5vl Date: Wed, 24 Feb 2021 19:35:20 +0100 Subject: [PATCH] . --- src/main/java/sbr/sbr/commands/banker.java | 2 +- src/main/java/sbr/sbr/events/InvClick.java | 9 +++++---- .../sbr/sbr/guis/banker/bankerDeposit.java | 4 ++++ .../sbr/sbr/guis/{ => banker}/bankerMain.java | 18 +++++++++++++++--- .../sbr/guis/{ => banker}/bankerWithdraw.java | 2 +- .../java/sbr/sbr/guis/sbmenu/sbmenuMain.java | 4 ++++ src/main/java/sbr/sbr/main.java | 10 ++++++---- 7 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 src/main/java/sbr/sbr/guis/banker/bankerDeposit.java rename src/main/java/sbr/sbr/guis/{ => banker}/bankerMain.java (83%) rename src/main/java/sbr/sbr/guis/{ => banker}/bankerWithdraw.java (99%) create mode 100644 src/main/java/sbr/sbr/guis/sbmenu/sbmenuMain.java diff --git a/src/main/java/sbr/sbr/commands/banker.java b/src/main/java/sbr/sbr/commands/banker.java index 96befd5..b901304 100644 --- a/src/main/java/sbr/sbr/commands/banker.java +++ b/src/main/java/sbr/sbr/commands/banker.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import sbr.sbr.events.InvClick; -import sbr.sbr.guis.bankerMain; +import sbr.sbr.guis.banker.bankerMain; import sbr.sbr.utils.chatcolors; public class banker extends chatcolors implements CommandExecutor { diff --git a/src/main/java/sbr/sbr/events/InvClick.java b/src/main/java/sbr/sbr/events/InvClick.java index 3637785..7e57f41 100644 --- a/src/main/java/sbr/sbr/events/InvClick.java +++ b/src/main/java/sbr/sbr/events/InvClick.java @@ -6,7 +6,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; import sbr.sbr.commands.banker; -import sbr.sbr.guis.bankerWithdraw; +import sbr.sbr.guis.banker.bankerWithdraw; import sbr.sbr.main; import sbr.sbr.utils.chatcolors; @@ -21,15 +21,15 @@ public class InvClick extends chatcolors implements Listener { public void InventoryClick(InventoryClickEvent e) { Player p = (Player) e.getWhoClicked(); if (currentGui.get(p.getUniqueId()).equalsIgnoreCase("bankerMain")) { - if (e.getSlot() == 13) { + if (e.getRawSlot() == 13) { + p.closeInventory(); p.openInventory(bankerWithdraw.getGui()); - currentGui.remove(p.getUniqueId()); currentGui.put(p.getUniqueId(), "bankerWithdraw"); } e.setCancelled(true); } if (currentGui.get(p.getUniqueId()).equalsIgnoreCase("bankerWithdraw")) { - if (e.getSlot() == 13) { + if (e.getRawSlot() == 13) { int bankBal; int purseBal; try { @@ -43,6 +43,7 @@ public class InvClick extends chatcolors implements Listener { int newPurse = purseBal + bankHalf; main.prepareStatement("UPDATE bank SET Balance = '" + bankHalf + "' WHERE UUID = '" + p.getUniqueId().toString() + "';").executeUpdate(); main.prepareStatement("UPDATE purse SET Balance = '" + newPurse + "' WHERE UUID = '" + p.getUniqueId().toString() + "';").executeUpdate(); + p.closeInventory(); } catch (SQLException x) { x.printStackTrace(); } diff --git a/src/main/java/sbr/sbr/guis/banker/bankerDeposit.java b/src/main/java/sbr/sbr/guis/banker/bankerDeposit.java new file mode 100644 index 0000000..5501e08 --- /dev/null +++ b/src/main/java/sbr/sbr/guis/banker/bankerDeposit.java @@ -0,0 +1,4 @@ +package sbr.sbr.guis.banker; + +public class bankerDeposit { +} diff --git a/src/main/java/sbr/sbr/guis/bankerMain.java b/src/main/java/sbr/sbr/guis/banker/bankerMain.java similarity index 83% rename from src/main/java/sbr/sbr/guis/bankerMain.java rename to src/main/java/sbr/sbr/guis/banker/bankerMain.java index 77f3d40..dcaec02 100644 --- a/src/main/java/sbr/sbr/guis/bankerMain.java +++ b/src/main/java/sbr/sbr/guis/banker/bankerMain.java @@ -1,4 +1,4 @@ -package sbr.sbr.guis; +package sbr.sbr.guis.banker; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -31,17 +31,29 @@ public class bankerMain extends chatcolors { ItemMeta withdrawMeta; List withdrawLore = new ArrayList<>(); + ItemStack deposit; + ItemMeta depositMeta; + List depositLore = new ArrayList<>(); + ItemStack glass; ItemMeta glassMeta; // Withdraw button withdraw = new ItemStack(Material.DISPENSER); withdrawMeta = withdraw.getItemMeta(); - withdrawMeta.setDisplayName(color("&bWithdraw.")); + withdrawMeta.setDisplayName(color("&cWithdraw")); withdrawLore.add(color("&7Total money: &6" + totalBal)); withdrawMeta.setLore(withdrawLore); withdraw.setItemMeta(withdrawMeta); + // Deposit button + deposit = new ItemStack(Material.CHEST); + depositMeta = deposit.getItemMeta(); + depositMeta.setDisplayName(color("&aDeposit")); + depositLore.add(color("&7Total money: &6" + totalBal)); + withdrawMeta.setLore(depositLore); + withdraw.setItemMeta(depositMeta); + // Glass panes glass = new ItemStack(Material.GRAY_STAINED_GLASS_PANE); glassMeta = glass.getItemMeta(); @@ -60,7 +72,7 @@ public class bankerMain extends chatcolors { gui.setItem(8, glass); gui.setItem(9, glass); gui.setItem(10, glass); - gui.setItem(11, glass); + gui.setItem(11, deposit); gui.setItem(12, glass); gui.setItem(13, withdraw); gui.setItem(14, glass); diff --git a/src/main/java/sbr/sbr/guis/bankerWithdraw.java b/src/main/java/sbr/sbr/guis/banker/bankerWithdraw.java similarity index 99% rename from src/main/java/sbr/sbr/guis/bankerWithdraw.java rename to src/main/java/sbr/sbr/guis/banker/bankerWithdraw.java index 8e4b178..b8d4605 100644 --- a/src/main/java/sbr/sbr/guis/bankerWithdraw.java +++ b/src/main/java/sbr/sbr/guis/banker/bankerWithdraw.java @@ -1,4 +1,4 @@ -package sbr.sbr.guis; +package sbr.sbr.guis.banker; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/src/main/java/sbr/sbr/guis/sbmenu/sbmenuMain.java b/src/main/java/sbr/sbr/guis/sbmenu/sbmenuMain.java new file mode 100644 index 0000000..7463023 --- /dev/null +++ b/src/main/java/sbr/sbr/guis/sbmenu/sbmenuMain.java @@ -0,0 +1,4 @@ +package sbr.sbr.guis.sbmenu; + +public class sbmenuMain { +} diff --git a/src/main/java/sbr/sbr/main.java b/src/main/java/sbr/sbr/main.java index b0e6efc..5421744 100644 --- a/src/main/java/sbr/sbr/main.java +++ b/src/main/java/sbr/sbr/main.java @@ -6,6 +6,7 @@ import org.bukkit.plugin.java.JavaPlugin; import sbr.sbr.commands.balance; import sbr.sbr.commands.banker; import sbr.sbr.commands.npc; +import sbr.sbr.events.InvClick; import sbr.sbr.events.onPlayerJoin; import java.sql.Connection; import java.sql.DriverManager; @@ -21,11 +22,11 @@ public final class main extends JavaPlugin { @Override public void onEnable() { PluginManager plm = Bukkit.getPluginManager(); - host = "localhost"; + host = "sql11.freemysqlhosting.net"; port = 3306; - database = "sbr"; - username = "root"; - password = ""; + database = "sql11395031"; + username = "sql11395031"; + password = "6VF5N7cZiG"; try { openConnection(); System.out.println("MySQL Database Connected."); @@ -33,6 +34,7 @@ public final class main extends JavaPlugin { x.printStackTrace(); } plm.registerEvents(new onPlayerJoin(), this); + plm.registerEvents(new InvClick(), this); Objects.requireNonNull(getCommand("balance")).setExecutor(new balance()); Objects.requireNonNull(getCommand("npc")).setExecutor(new npc()); Objects.requireNonNull(getCommand("banker")).setExecutor(new banker());