From 3903f8080aec80b8b409214a8ed37744a1797276 Mon Sep 17 00:00:00 2001 From: 5vl Date: Sun, 21 Feb 2021 22:52:02 +0100 Subject: [PATCH] mor bacup --- pom.xml | 10 ++++++++ src/main/java/sbr/sbr/commands/balance.java | 4 +-- src/main/java/sbr/sbr/commands/npc.java | 27 +++++++++++++++++++++ src/main/java/sbr/sbr/main.java | 8 +++++- src/main/resources/plugin.yml | 3 +++ 5 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 src/main/java/sbr/sbr/commands/npc.java diff --git a/pom.xml b/pom.xml index 2ef4396..a9ad5e8 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,10 @@ + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + papermc-repo https://papermc.io/repo/repository/maven-public/ @@ -71,5 +75,11 @@ 1.16.5-R0.1-SNAPSHOT provided + + org.spigotmc + spigot + 1.16.5-R0.1-SNAPSHOT + provided + diff --git a/src/main/java/sbr/sbr/commands/balance.java b/src/main/java/sbr/sbr/commands/balance.java index 5af18e7..d95dedc 100644 --- a/src/main/java/sbr/sbr/commands/balance.java +++ b/src/main/java/sbr/sbr/commands/balance.java @@ -15,7 +15,7 @@ public class balance extends chatcolors implements CommandExecutor { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { Player p = (Player) sender; try { - ResultSet rs = main.prepareStatement("SELECT * FROM sbr WHERE UUID = '" + p.getUniqueId().toString() + "';").executeQuery(); + ResultSet rs = main.prepareStatement("SELECT * FROM Balance WHERE UUID = '" + p.getUniqueId().toString() + "';").executeQuery(); rs.next(); int bal = rs.getInt("Balance"); int argint; @@ -26,7 +26,7 @@ public class balance extends chatcolors implements CommandExecutor { try { argint = Integer.parseInt(args[0]); int nbal = bal + argint; - main.prepareStatement("UPDATE Balance='" + nbal + "' WHERE UUID = '" + p.getUniqueId().toString() + "';").executeUpdate(); + main.prepareStatement("UPDATE Balance SET Balance = '" + nbal + "' WHERE UUID = '" + p.getUniqueId().toString() + "';").executeUpdate(); p.sendMessage(color("&dYou added &b" + argint + " &dto your balance.")); p.sendMessage(color("&aYou now have: &b" + nbal)); } catch (NumberFormatException x) { diff --git a/src/main/java/sbr/sbr/commands/npc.java b/src/main/java/sbr/sbr/commands/npc.java new file mode 100644 index 0000000..8a0d665 --- /dev/null +++ b/src/main/java/sbr/sbr/commands/npc.java @@ -0,0 +1,27 @@ +package sbr.sbr.commands; + +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import sbr.sbr.utils.chatcolors; + +public class npc extends chatcolors implements CommandExecutor { + + @Override + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { + if (sender instanceof Player) { + Player p = (Player) sender; + if (args.length == 0) { + p.sendMessage(color("List all NPC's: /npc list")); + p.sendMessage(color("Create an NPC that is on /npc list:")); + p.sendMessage(color("/npc create [name]")); + } + } + else { + System.out.println("This command can only be ran ingame!"); + } + return false; + } +} diff --git a/src/main/java/sbr/sbr/main.java b/src/main/java/sbr/sbr/main.java index 48890e5..e418aaa 100644 --- a/src/main/java/sbr/sbr/main.java +++ b/src/main/java/sbr/sbr/main.java @@ -4,11 +4,13 @@ import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; import sbr.sbr.commands.balance; +import sbr.sbr.commands.npc; import sbr.sbr.events.onPlayerJoin; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.Objects; public final class main extends JavaPlugin { private static Connection connection; @@ -30,7 +32,8 @@ public final class main extends JavaPlugin { x.printStackTrace(); } plm.registerEvents(new onPlayerJoin(), this); - getCommand("balance").setExecutor(new balance()); + Objects.requireNonNull(getCommand("balance")).setExecutor(new balance()); + Objects.requireNonNull(getCommand("npc")).setExecutor(new npc()); } @Override @@ -43,6 +46,9 @@ public final class main extends JavaPlugin { } public static void openConnection() throws SQLException { + if (connection != null && !connection.isClosed()) { + return; + } connection = DriverManager.getConnection("jdbc:mysql://" + host + ":" + port + "/" + database, username, password); } public static PreparedStatement prepareStatement(String query) { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 537743c..f777533 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -6,3 +6,6 @@ authors: [ 5vl ] description: Hypxel Skyblock Remake commands: balance: + description: 'none' + npc: + description: 'none' \ No newline at end of file