From fc3b974d5fd7bbb39002be76d0b6309ca254760d Mon Sep 17 00:00:00 2001 From: Kiran Hart Date: Sat, 25 Aug 2018 17:50:57 -0400 Subject: [PATCH] Final Push, ready for sale --- dependency-reduced-pom.xml | 2 +- pom.xml | 2 +- .../auctionhouse/cmds/subcmds/HelpCommand.java | 2 +- .../auctionhouse/cmds/subcmds/SellCommand.java | 7 +------ .../inventories/AllTransactionsGUI.java | 2 ++ src/main/resources/config.yml | 16 ++++++++-------- src/main/resources/en_US.lang | 3 ++- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index e90d63e..71e4112 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -4,7 +4,7 @@ com.shadebyte auctionhouse AuctionHouse - 1.0-SNAPSHOT + Production-Test A premium auction house plugin https://www.shadebyte.com diff --git a/pom.xml b/pom.xml index 5dbedad..34eae50 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.shadebyte auctionhouse - 1.0-SNAPSHOT + 1.0 jar AuctionHouse diff --git a/src/main/java/com/shadebyte/auctionhouse/cmds/subcmds/HelpCommand.java b/src/main/java/com/shadebyte/auctionhouse/cmds/subcmds/HelpCommand.java index b25befd..1b6cbd7 100644 --- a/src/main/java/com/shadebyte/auctionhouse/cmds/subcmds/HelpCommand.java +++ b/src/main/java/com/shadebyte/auctionhouse/cmds/subcmds/HelpCommand.java @@ -22,7 +22,7 @@ public class HelpCommand extends SubCommand { return; } - for (int i = 0; i <= 7; i++) { + for (int i = 0; i <= 8; i++) { sender.sendMessage(Core.getInstance().getLocale().getMessage("cmd.help." + i)); } } diff --git a/src/main/java/com/shadebyte/auctionhouse/cmds/subcmds/SellCommand.java b/src/main/java/com/shadebyte/auctionhouse/cmds/subcmds/SellCommand.java index 264da33..c990582 100644 --- a/src/main/java/com/shadebyte/auctionhouse/cmds/subcmds/SellCommand.java +++ b/src/main/java/com/shadebyte/auctionhouse/cmds/subcmds/SellCommand.java @@ -16,7 +16,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import java.util.Arrays; -import java.util.concurrent.ThreadLocalRandom; /** * The current file has been created by Kiran Hart @@ -133,11 +132,7 @@ public class SellCommand extends SubCommand { discordHook.send(dm); } - if (AuctionAPI.getItemInHand(p).getAmount() >= 2) { - AuctionAPI.getItemInHand(p).setAmount(AuctionAPI.getItemInHand(p).getAmount() - 1); - } else { - AuctionAPI.setItemInHand(p, null); - } + AuctionAPI.setItemInHand(p, null); } } else { p.sendMessage(Core.getInstance().getSettings().getPrefix() + Core.getInstance().getLocale().getMessage(Lang.NOT_A_NUMBER.getNode())); diff --git a/src/main/java/com/shadebyte/auctionhouse/inventory/inventories/AllTransactionsGUI.java b/src/main/java/com/shadebyte/auctionhouse/inventory/inventories/AllTransactionsGUI.java index 5c12ff4..0da0b0f 100644 --- a/src/main/java/com/shadebyte/auctionhouse/inventory/inventories/AllTransactionsGUI.java +++ b/src/main/java/com/shadebyte/auctionhouse/inventory/inventories/AllTransactionsGUI.java @@ -45,6 +45,8 @@ public class AllTransactionsGUI implements AGUI { } catch (Exception e1) { } + if (slot == 49) p.openInventory(new TransactionSelectGUI().getInventory()); + if (slot >= 0 & slot <= 44) { if (clicked == null || clicked.getType() == Material.AIR) { return; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index f4dfeed..8504f48 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -20,21 +20,21 @@ settings: #MySql stuff for databases if you want database: - enabled: true - host: 162.241.217.18 + enabled: false + host: "" port: 3306 - database: "kiranhar_auctionhouse" - username: "kiranhar_admin" - password: "TweetyHart1." + database: "" + username: "" + password: "" discord: - enabled: true - webhook: "https://discordapp.com/api/webhooks/470085392901734410/_ls7Ps5GzlKqBJlHLaZt6GZgVTKkuwuIuWK1JU5j_pt-DwWhSYAITlI17ePiIuNTmdua" + enabled: false + webhook: "" title: "Auction House" description: "A new item has been listed!" description-complete: "A transaction has been completed!" username: "Auction House" - profilepicture: "https://vignette.wikia.nocookie.net/minecraftuniverse/images/2/2c/Gold_Chest_%28M2%29.png/revision/latest?cb=20130121082341" + profilepicture: "" receipt: give-on-transaction: true diff --git a/src/main/resources/en_US.lang b/src/main/resources/en_US.lang index 445b585..e51fbc2 100644 --- a/src/main/resources/en_US.lang +++ b/src/main/resources/en_US.lang @@ -9,7 +9,8 @@ cmd.help.3 = "&f/&eah help" cmd.help.4 = "&f/&eah sell" cmd.help.5 = "&f/&eah listed" cmd.help.6 = "&f/&eah expired" -cmd.help.7 = "" +cmd.help.7 = "&f/&eah transactions" +cmd.help.8 = "" nopermission = "&cYou do not have permission to do that!" playersonly = "&cOnly player's may use the command!"