diff --git a/src/main/java/kamkeel/npcs/command/AuctionCommand.java b/src/main/java/kamkeel/npcs/command/AuctionCommand.java new file mode 100644 index 000000000..056116eba --- /dev/null +++ b/src/main/java/kamkeel/npcs/command/AuctionCommand.java @@ -0,0 +1,167 @@ +package kamkeel.npcs.command; + +import net.minecraft.command.CommandException; +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.config.ConfigMarket; +import noppes.npcs.constants.EnumGuiType; +import noppes.npcs.controllers.AuctionController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.AuctionListing; +import noppes.npcs.controllers.data.PlayerData; + +import java.util.List; +import java.util.UUID; + +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendMessage; +import static kamkeel.npcs.util.ColorUtil.sendResult; + +public class AuctionCommand extends CommandKamkeelBase { + + @Override + public String getCommandName() { + return "auction"; + } + + @Override + public String getDescription() { + return "Auction House operations"; + } + + @SubCommand( + desc = "List active auctions", + usage = "[page]" + ) + public void list(ICommandSender sender, String[] args) throws CommandException { + if (!ConfigMarket.AuctionEnabled) { + sendError(sender, "Auction system is disabled"); + return; + } + + AuctionController controller = AuctionController.getInstance(); + if (controller == null) { + sendError(sender, "Auction system is not available"); + return; + } + + int page = 1; + if (args.length > 0) { + try { + page = Integer.parseInt(args[0]); + } catch (NumberFormatException ex) { + sendError(sender, "Invalid page number: " + args[0]); + return; + } + } + + List listings = controller.getActiveListings(null, page - 1, 10); + int total = controller.getTotalActiveListings(null); + int totalPages = Math.max(1, (int) Math.ceil((double) total / 10)); + + if (listings.isEmpty()) { + sendMessage(sender, "\u00A77No active auctions found"); + return; + } + + sendMessage(sender, String.format("\u00A76=== Active Auctions (Page %d/%d) ===", page, totalPages)); + for (AuctionListing listing : listings) { + String itemName = listing.item != null ? listing.item.getDisplayName() : "Unknown"; + String price = listing.hasBids() ? + String.format("%,d (bid)", listing.currentBid) : + String.format("%,d (start)", listing.startingPrice); + sendMessage(sender, String.format("\u00A7e%s \u00A77by \u00A7b%s\u00A77 - \u00A76%s %s", + itemName, listing.sellerName, price, ConfigMarket.CurrencyName)); + } + } + + @SubCommand( + desc = "View player's auction activity", + usage = "" + ) + public void view(ICommandSender sender, String[] args) throws CommandException { + if (!ConfigMarket.AuctionEnabled) { + sendError(sender, "Auction system is disabled"); + return; + } + + AuctionController controller = AuctionController.getInstance(); + if (controller == null) { + sendError(sender, "Auction system is not available"); + return; + } + + String playername = args[0]; + List dataList = PlayerDataController.Instance.getPlayersData(sender, playername); + + if (dataList.isEmpty()) { + sendError(sender, "Unknown player: " + playername); + return; + } + + for (PlayerData playerdata : dataList) { + UUID playerUUID = UUID.fromString(playerdata.uuid); + List activeListings = controller.getPlayerActiveListings(playerUUID); + List activeBids = controller.getPlayerActiveBids(playerUUID); + int claimCount = controller.getPlayerClaims(playerUUID).size(); + + sendMessage(sender, String.format("\u00A76=== Auction Activity for %s ===", playerdata.playername)); + sendMessage(sender, String.format("\u00A77Active Listings: \u00A7e%d", activeListings.size())); + sendMessage(sender, String.format("\u00A77Active Bids: \u00A7e%d", activeBids.size())); + sendMessage(sender, String.format("\u00A77Pending Claims: \u00A7e%d", claimCount)); + + if (!activeListings.isEmpty()) { + sendMessage(sender, "\u00A7a--- Selling ---"); + for (AuctionListing listing : activeListings) { + String itemName = listing.item != null ? listing.item.getDisplayName() : "Unknown"; + String price = listing.hasBids() ? + String.format("%,d (bid)", listing.currentBid) : + String.format("%,d (start)", listing.startingPrice); + sendMessage(sender, String.format(" \u00A7e%s \u00A77- \u00A76%s", itemName, price)); + } + } + + if (!activeBids.isEmpty()) { + sendMessage(sender, "\u00A7e--- Bidding ---"); + for (AuctionListing bid : activeBids) { + String itemName = bid.item != null ? bid.item.getDisplayName() : "Unknown"; + sendMessage(sender, String.format(" \u00A7e%s \u00A77- \u00A76%,d %s", + itemName, bid.currentBid, ConfigMarket.CurrencyName)); + } + } + } + } + + @SubCommand( + desc = "Open the Auction House GUI", + usage = "", + permission = 0 + ) + public void open(ICommandSender sender, String[] args) throws CommandException { + if (!ConfigMarket.AuctionEnabled) { + sendError(sender, "Auction system is disabled"); + return; + } + + if (!(sender instanceof EntityPlayer)) { + sendError(sender, "This command can only be used by players"); + return; + } + + EntityPlayer player = (EntityPlayer) sender; + + // Open the auction GUI without requiring an NPC + NoppesUtilServer.sendOpenGui(player, EnumGuiType.PlayerAuction, null); + sendResult(sender, "Opening Auction House..."); + } + + @Override + public List addTabCompletionOptions(ICommandSender par1, String[] args) { + if (args.length == 1) { + return getListOfStringsMatchingLastWord(args, new String[]{"list", "view", "open"}); + } + return null; + } +} diff --git a/src/main/java/kamkeel/npcs/command/CommandKamkeel.java b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java index 356ca8a31..d0341f211 100644 --- a/src/main/java/kamkeel/npcs/command/CommandKamkeel.java +++ b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java @@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.config.ConfigMain; +import noppes.npcs.config.ConfigMarket; import noppes.npcs.scripted.CustomNPCsException; import java.lang.reflect.Method; @@ -44,6 +45,9 @@ public class CommandKamkeel extends CommandBase { registerCommand(new CommandCommand()); registerCommand(new EffectCommand()); registerCommand(new AbilityCommand()); + registerCommand(new MoneyCommand()); + if (ConfigMarket.AuctionEnabled) + registerCommand(new AuctionCommand()); if (ConfigMain.AttributesEnabled) registerCommand(new AttributeCommand()); } diff --git a/src/main/java/kamkeel/npcs/command/MoneyCommand.java b/src/main/java/kamkeel/npcs/command/MoneyCommand.java new file mode 100644 index 000000000..8b9fa72eb --- /dev/null +++ b/src/main/java/kamkeel/npcs/command/MoneyCommand.java @@ -0,0 +1,168 @@ +package kamkeel.npcs.command; + +import net.minecraft.command.CommandException; +import net.minecraft.command.ICommandSender; +import noppes.npcs.config.ConfigMarket; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerCurrencyData; +import noppes.npcs.controllers.data.PlayerData; + +import java.util.List; + +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendResult; + +public class MoneyCommand extends CommandKamkeelBase { + + @Override + public String getCommandName() { + return "money"; + } + + @Override + public String getDescription() { + return "Currency operations"; + } + + @SubCommand( + desc = "Show player's balance", + usage = "" + ) + public void balance(ICommandSender sender, String[] args) throws CommandException { + String playername = args[0]; + List dataList = PlayerDataController.Instance.getPlayersData(sender, playername); + + if (dataList.isEmpty()) { + sendError(sender, "Unknown player: " + playername); + return; + } + + for (PlayerData playerdata : dataList) { + PlayerCurrencyData currency = playerdata.currencyData; + long balance = currency.getBalance(); + sendResult(sender, String.format("Player \u00A7b%s\u00A77 has \u00A76%,d %s", + playerdata.playername, balance, ConfigMarket.CurrencyName)); + } + } + + @SubCommand( + desc = "Give currency to player", + usage = " " + ) + public void give(ICommandSender sender, String[] args) throws CommandException { + String playername = args[0]; + long amount; + try { + amount = Long.parseLong(args[1]); + } catch (NumberFormatException ex) { + sendError(sender, "Invalid amount: " + args[1]); + return; + } + + if (amount <= 0) { + sendError(sender, "Amount must be positive"); + return; + } + + List dataList = PlayerDataController.Instance.getPlayersData(sender, playername); + + if (dataList.isEmpty()) { + sendError(sender, "Unknown player: " + playername); + return; + } + + for (PlayerData playerdata : dataList) { + PlayerCurrencyData currency = playerdata.currencyData; + if (currency.deposit(amount)) { + playerdata.save(); + sendResult(sender, String.format("Gave \u00A76%,d %s\u00A77 to player \u00A7b%s\u00A77. New balance: \u00A76%,d", + amount, ConfigMarket.CurrencyName, playerdata.playername, currency.getBalance())); + } else { + sendError(sender, String.format("Failed to give currency to %s (would exceed max balance)", + playerdata.playername)); + } + } + } + + @SubCommand( + desc = "Withdraw currency from player", + usage = " " + ) + public void withdraw(ICommandSender sender, String[] args) throws CommandException { + String playername = args[0]; + long amount; + try { + amount = Long.parseLong(args[1]); + } catch (NumberFormatException ex) { + sendError(sender, "Invalid amount: " + args[1]); + return; + } + + if (amount <= 0) { + sendError(sender, "Amount must be positive"); + return; + } + + List dataList = PlayerDataController.Instance.getPlayersData(sender, playername); + + if (dataList.isEmpty()) { + sendError(sender, "Unknown player: " + playername); + return; + } + + for (PlayerData playerdata : dataList) { + PlayerCurrencyData currency = playerdata.currencyData; + if (currency.withdraw(amount)) { + playerdata.save(); + sendResult(sender, String.format("Withdrew \u00A76%,d %s\u00A77 from player \u00A7b%s\u00A77. New balance: \u00A76%,d", + amount, ConfigMarket.CurrencyName, playerdata.playername, currency.getBalance())); + } else { + sendError(sender, String.format("Failed to withdraw from %s (insufficient funds)", + playerdata.playername)); + } + } + } + + @SubCommand( + desc = "Set player's balance", + usage = " " + ) + public void set(ICommandSender sender, String[] args) throws CommandException { + String playername = args[0]; + long amount; + try { + amount = Long.parseLong(args[1]); + } catch (NumberFormatException ex) { + sendError(sender, "Invalid amount: " + args[1]); + return; + } + + if (amount < 0) { + sendError(sender, "Amount cannot be negative"); + return; + } + + List dataList = PlayerDataController.Instance.getPlayersData(sender, playername); + + if (dataList.isEmpty()) { + sendError(sender, "Unknown player: " + playername); + return; + } + + for (PlayerData playerdata : dataList) { + PlayerCurrencyData currency = playerdata.currencyData; + currency.setBalance(amount); + playerdata.save(); + sendResult(sender, String.format("Set balance of player \u00A7b%s\u00A77 to \u00A76%,d %s", + playerdata.playername, currency.getBalance(), ConfigMarket.CurrencyName)); + } + } + + @Override + public List addTabCompletionOptions(ICommandSender par1, String[] args) { + if (args.length == 1) { + return getListOfStringsMatchingLastWord(args, new String[]{"balance", "give", "withdraw", "set"}); + } + return null; + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/player/AuctionActionPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/AuctionActionPacket.java index a7549ab85..fca09473f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/AuctionActionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/AuctionActionPacket.java @@ -57,7 +57,7 @@ public class AuctionActionPacket extends AbstractPacket { } @Override - public boolean needsNPC() { return true; } + public boolean needsNPC() { return false; } // Allow opening via command without NPC // ========================================= // Client-side static methods @@ -174,7 +174,9 @@ public class AuctionActionPacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; EntityPlayerMP playerMP = (EntityPlayerMP) player; - if (npc.advanced.role != EnumRoleType.Auctioneer) return; + // Skip role check if NPC is null (opened via command/script) + // Otherwise require Auctioneer role + if (npc != null && npc.advanced.role != EnumRoleType.Auctioneer) return; if (!ConfigMarket.AuctionEnabled) return; int actionOrdinal = in.readInt(); diff --git a/src/main/java/noppes/npcs/client/gui/player/AuctionTooltipHandler.java b/src/main/java/noppes/npcs/client/gui/player/AuctionTooltipHandler.java index f8f58e29b..33966d1e2 100644 --- a/src/main/java/noppes/npcs/client/gui/player/AuctionTooltipHandler.java +++ b/src/main/java/noppes/npcs/client/gui/player/AuctionTooltipHandler.java @@ -8,7 +8,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import noppes.npcs.client.AuctionClientConfig; +import noppes.npcs.constants.EnumClaimType; import noppes.npcs.containers.ContainerAuctionListing; +import noppes.npcs.containers.ContainerAuctionSell; import noppes.npcs.containers.ContainerAuctionTrades; import noppes.npcs.controllers.data.AuctionClaim; import noppes.npcs.controllers.data.AuctionListing; @@ -41,6 +43,10 @@ public class AuctionTooltipHandler { else if (screen instanceof GuiAuctionTrades) { addTradesTooltip((GuiAuctionTrades) screen, stack, tooltip); } + // Check if we're in the sell GUI + else if (screen instanceof GuiAuctionSell) { + addSellTooltip((GuiAuctionSell) screen, stack, tooltip); + } } /** @@ -54,10 +60,7 @@ public class AuctionTooltipHandler { AuctionListing listing = container.getListingForItem(stack); if (listing == null) return; - // Add separator tooltip.add(""); - tooltip.add(EnumChatFormatting.DARK_GRAY + "--- " + EnumChatFormatting.GOLD + - StatCollector.translateToLocal("auction.title") + EnumChatFormatting.DARK_GRAY + " ---"); // Seller tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.seller") @@ -94,22 +97,21 @@ public class AuctionTooltipHandler { ContainerAuctionTrades container = (ContainerAuctionTrades) gui.inventorySlots; if (container == null) return; - // Check if it's an active listing - AuctionListing listing = container.getListingForItem(stack); - if (listing != null) { + // Check if it's an item I'm selling + AuctionListing sellingListing = container.getSellingListingForItem(stack); + if (sellingListing != null) { tooltip.add(""); - tooltip.add(EnumChatFormatting.DARK_GRAY + "--- " + EnumChatFormatting.GOLD + - StatCollector.translateToLocal("auction.trades.activeListing") + EnumChatFormatting.DARK_GRAY + " ---"); + tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("auction.trades.selling")); - if (listing.hasBids()) { + if (sellingListing.hasBids()) { tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.currentBid") - .replace("%s", EnumChatFormatting.GOLD + formatCurrency(listing.currentBid))); - tooltip.add(EnumChatFormatting.GRAY + String.format(StatCollector.translateToLocal("auction.bids"), listing.bidCount)); + .replace("%s", EnumChatFormatting.GOLD + formatCurrency(sellingListing.currentBid))); + tooltip.add(EnumChatFormatting.GRAY + String.format(StatCollector.translateToLocal("auction.bids"), sellingListing.bidCount)); } else { tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.noBids")); } - long timeRemaining = listing.getTimeRemaining(); + long timeRemaining = sellingListing.getTimeRemaining(); String timeText = StatCollector.translateToLocal("auction.timeLeft") .replace("%s", formatTimeRemaining(timeRemaining)); tooltip.add((timeRemaining < 3600000 ? EnumChatFormatting.RED : EnumChatFormatting.WHITE) + timeText); @@ -119,29 +121,65 @@ public class AuctionTooltipHandler { return; } + // Check if it's an item I'm bidding on + AuctionListing biddingListing = container.getBiddingListingForItem(stack); + if (biddingListing != null) { + tooltip.add(""); + tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.trades.bidding")); + + tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.currentBid") + .replace("%s", EnumChatFormatting.GOLD + formatCurrency(biddingListing.currentBid))); + tooltip.add(EnumChatFormatting.GRAY + String.format(StatCollector.translateToLocal("auction.bids"), biddingListing.bidCount)); + + long timeRemaining = biddingListing.getTimeRemaining(); + String timeText = StatCollector.translateToLocal("auction.timeLeft") + .replace("%s", formatTimeRemaining(timeRemaining)); + tooltip.add((timeRemaining < 3600000 ? EnumChatFormatting.RED : EnumChatFormatting.WHITE) + timeText); + + tooltip.add(""); + tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.trades.clickToRebid")); + return; + } + // Check if it's a claim AuctionClaim claim = container.getClaimForItem(stack); if (claim != null) { tooltip.add(""); - String claimTitle; + // Title based on claim type switch (claim.type) { case ITEM: - claimTitle = StatCollector.translateToLocal("auction.claim.item"); + if (claim.isReturned) { + // Expired - returned to seller + tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocal("auction.trades.expired")); + } else { + // Won item + tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("auction.trades.won")); + } break; case CURRENCY: - claimTitle = StatCollector.translateToLocal("auction.claim.currency"); + // Sold - money to claim + tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("auction.trades.sold")); + if (claim.itemName != null && !claim.itemName.isEmpty()) { + tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.claim.soldItem") + .replace("%s", EnumChatFormatting.WHITE + claim.itemName)); + } + if (claim.otherPlayerName != null && !claim.otherPlayerName.isEmpty()) { + tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.claim.buyer") + .replace("%s", EnumChatFormatting.WHITE + claim.otherPlayerName)); + } break; case REFUND: - claimTitle = StatCollector.translateToLocal("auction.claim.refund"); + // Outbid - refund available + tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocal("auction.trades.outbid")); + if (claim.otherPlayerName != null && !claim.otherPlayerName.isEmpty()) { + tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.claim.outbidBy") + .replace("%s", EnumChatFormatting.WHITE + claim.otherPlayerName)); + } break; - default: - claimTitle = "Claim"; } - tooltip.add(EnumChatFormatting.DARK_GRAY + "--- " + EnumChatFormatting.GOLD + - claimTitle + EnumChatFormatting.DARK_GRAY + " ---"); - + // Amount for currency claims (including REFUND) if (claim.type.isCurrency()) { tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.claim.amount") .replace("%s", EnumChatFormatting.GOLD + formatCurrency(claim.currency))); @@ -158,10 +196,40 @@ public class AuctionTooltipHandler { } tooltip.add(""); - tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("auction.claim.clickToClaim")); + + // Show rebid option for REFUND claims with item (active auction) + if (claim.type == EnumClaimType.REFUND && claim.item != null) { + tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("auction.trades.leftClickRebid")); + tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.trades.rightClickRefund")); + } else { + tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("auction.claim.clickToClaim")); + } } } + /** + * Add sell page tooltip info. + */ + private static void addSellTooltip(GuiAuctionSell gui, ItemStack stack, List tooltip) { + ContainerAuctionSell container = (ContainerAuctionSell) gui.inventorySlots; + if (container == null) return; + + // Check if this is the sell slot item + ItemStack sellItem = container.getItemToSell(); + if (sellItem != null && ItemStack.areItemStacksEqual(stack, sellItem)) { + // This is the item in the sell slot + tooltip.add(""); + tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.sell.leftClear")); + tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.sell.rightRemove")); + return; + } + + // This is an inventory item - show add controls + tooltip.add(""); + tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.sell.leftAdd")); + tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.sell.rightAddOne")); + } + /** * Format currency with commas. */ diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiAuctionSell.java b/src/main/java/noppes/npcs/client/gui/player/GuiAuctionSell.java index 8fe8c2d9c..4f67c781c 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiAuctionSell.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiAuctionSell.java @@ -16,7 +16,6 @@ import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.client.AuctionClientConfig; import noppes.npcs.containers.ContainerAuctionSell; import noppes.npcs.entity.EntityNPCInterface; -import org.lwjgl.opengl.GL11; import java.util.ArrayList; import java.util.List; @@ -305,14 +304,8 @@ public class GuiAuctionSell extends GuiAuctionInterface implements ITextfieldLis super.drawGuiContainerForegroundLayer(mouseX, mouseY); if (hasSubGui()) return; - // Draw tooltips for buttons + // Draw tooltips for buttons (icons, not items - item tooltips handled by AuctionTooltipHandler) drawSellPageTooltips(mouseX, mouseY); - - // Sell slot tooltip - drawSellSlotTooltip(mouseX, mouseY); - - // Inventory item tooltip (only add extra info, item tooltip is handled by AuctionTooltipHandler) - drawInventoryTooltip(mouseX, mouseY); } /** Draw tooltips for sell page buttons */ @@ -333,64 +326,7 @@ public class GuiAuctionSell extends GuiAuctionInterface implements ITextfieldLis } if (tooltip != null && !tooltip.isEmpty()) { - drawTooltip(tooltip, mouseX - guiLeft, mouseY - guiTop); + drawHoveringText(tooltip, mouseX - guiLeft, mouseY - guiTop, fontRendererObj); } } - - /** Draw tooltip for sell slot */ - private void drawSellSlotTooltip(int mouseX, int mouseY) { - int slotX = guiLeft + contentX + 30; - int slotY = guiTop + contentY + 55; - - if (mouseX >= slotX && mouseX < slotX + 18 && mouseY >= slotY && mouseY < slotY + 18) { - ItemStack sellItem = sellContainer.getItemToSell(); - if (sellItem != null) { - List tooltip = new ArrayList<>(); - tooltip.add(EnumChatFormatting.GOLD + StatCollector.translateToLocal("auction.sell.slotTitle")); - tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.sell.leftClear")); - tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.sell.rightRemove")); - drawTooltip(tooltip, mouseX - guiLeft, mouseY - guiTop); - } - } - } - - /** Draw tooltip for inventory items */ - private void drawInventoryTooltip(int mouseX, int mouseY) { - Slot hoveredSlot = getSlotUnderMouse(mouseX, mouseY); - if (hoveredSlot != null && sellContainer.isPlayerInventorySlot(hoveredSlot.slotNumber)) { - if (hoveredSlot.getStack() != null) { - List tooltip = new ArrayList<>(); - tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.sell.leftAdd")); - tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.sell.rightAddOne")); - drawTooltip(tooltip, mouseX - guiLeft, mouseY - guiTop + 40); - } - } - } - - /** Get slot under mouse position */ - private Slot getSlotUnderMouse(int mouseX, int mouseY) { - for (int i = 0; i < inventorySlots.inventorySlots.size(); i++) { - Slot slot = (Slot) inventorySlots.inventorySlots.get(i); - if (isMouseOverSlot(slot, mouseX, mouseY)) { - return slot; - } - } - return null; - } - - /** Check if mouse is over a slot */ - private boolean isMouseOverSlot(Slot slot, int mouseX, int mouseY) { - int x = guiLeft + slot.xDisplayPosition; - int y = guiTop + slot.yDisplayPosition; - return mouseX >= x && mouseX < x + 16 && mouseY >= y && mouseY < y + 16; - } - - /** Draw tooltip with proper GL state */ - private void drawTooltip(List tooltip, int x, int y) { - GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); - drawHoveringText(tooltip, x, y, fontRendererObj); - GL11.glPopAttrib(); - GL11.glPopMatrix(); - } } diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiAuctionTrades.java b/src/main/java/noppes/npcs/client/gui/player/GuiAuctionTrades.java index 2bcdce495..0d6e3d98d 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiAuctionTrades.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiAuctionTrades.java @@ -95,10 +95,24 @@ public class GuiAuctionTrades extends GuiAuctionInterface implements IGuiData { // Left-click on active bid = open bidding GUI to increase bid AuctionActionPacket.openBidding(listing.id); NoppesUtil.clickSound(); - } else if (claim != null && mouseButton == 0) { - // Left-click on claim = show claim - setPending(slot, PendingOp.CLAIM); - NoppesUtil.clickSound(); + } else if (claim != null) { + // Handle claim clicks + if (claim.type == EnumClaimType.REFUND && claim.item != null) { + // REFUND with item = can rebid + if (mouseButton == 0) { + // Left-click = open bidding to rebid + AuctionActionPacket.openBidding(claim.listingId); + NoppesUtil.clickSound(); + } else if (mouseButton == 1) { + // Right-click = show refund claim confirmation + setPending(slot, PendingOp.CLAIM); + NoppesUtil.clickSound(); + } + } else if (mouseButton == 0) { + // Normal claim - left-click shows claim confirmation + setPending(slot, PendingOp.CLAIM); + NoppesUtil.clickSound(); + } } } @@ -112,18 +126,31 @@ public class GuiAuctionTrades extends GuiAuctionInterface implements IGuiData { playConfirmSound(); } clearPending(); - } else if (pendingOp == PendingOp.CLAIM && mouseButton == 0) { - // Left-click confirms claim + } else if (pendingOp == PendingOp.CLAIM) { AuctionClaim claim = tradesContainer.getClaimAt(pendingSlot); if (claim != null) { - if (claim.type.isItem()) { - AuctionActionPacket.claimItem(claim.id); + // For REFUND claims with item (rebid option), right-click confirms refund + // For all others, left-click confirms claim + boolean shouldClaim = (claim.type == EnumClaimType.REFUND && claim.item != null) + ? mouseButton == 1 // Right-click for rebiddable refunds + : mouseButton == 0; // Left-click for normal claims + + if (shouldClaim) { + if (claim.type.isItem()) { + AuctionActionPacket.claimItem(claim.id); + } else { + AuctionActionPacket.claimCurrency(claim.id); + } + playConfirmSound(); + clearPending(); } else { - AuctionActionPacket.claimCurrency(claim.id); + // Wrong button - cancel operation + clearPending(); + NoppesUtil.clickSound(); } - playConfirmSound(); + } else { + clearPending(); } - clearPending(); } else { // Wrong button - cancel operation clearPending(); @@ -197,10 +224,14 @@ public class GuiAuctionTrades extends GuiAuctionInterface implements IGuiData { drawIconOverlay(x, y, ICON_CHECK); } } else { - // Draw coin icon for currency/refund claims (no item in slot) + // Draw coin icon for currency claims or refund claims without item AuctionClaim claim = tradesContainer.getClaimAt(slot); - if (claim != null && (claim.type == EnumClaimType.CURRENCY || claim.type == EnumClaimType.REFUND)) { - drawIconOverlay(x, y, ICON_COIN); + if (claim != null) { + // Show coin if: CURRENCY claim OR REFUND claim without item + if (claim.type == EnumClaimType.CURRENCY || + (claim.type == EnumClaimType.REFUND && claim.item == null)) { + drawIconOverlay(x, y, ICON_COIN); + } } } } @@ -213,16 +244,21 @@ public class GuiAuctionTrades extends GuiAuctionInterface implements IGuiData { AuctionClaim claim = tradesContainer.getClaimAt(slot); if (listing != null) { - // Active listing or bid - Blue - return TINT_BLUE; + if (tradesContainer.isSellingAt(slot)) { + // Selling - Blue + return TINT_BLUE; + } else { + // Bidding - Yellow + return TINT_YELLOW; + } } else if (claim != null) { switch (claim.type) { case CURRENCY: // Sold item - Green return TINT_GREEN; case REFUND: - // Outbid - Yellow - return TINT_YELLOW; + // Outbid - Red (whether rebiddable or not) + return TINT_RED; case ITEM: // Won item (green) or Returned/Expired (red) return claim.isReturned ? TINT_RED : TINT_GREEN; @@ -286,14 +322,18 @@ public class GuiAuctionTrades extends GuiAuctionInterface implements IGuiData { tooltip.add(EnumChatFormatting.GOLD + String.format("%,d", claim.currency) + " " + AuctionClientConfig.getCurrencyName()); break; case REFUND: - tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.trades.refundClaim")); - if (!claim.itemName.isEmpty()) { - tooltip.add(EnumChatFormatting.WHITE + claim.itemName); - } + tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocal("auction.trades.outbid")); if (!claim.otherPlayerName.isEmpty()) { tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("auction.trades.outbidBy") + ": " + EnumChatFormatting.AQUA + claim.otherPlayerName); } tooltip.add(EnumChatFormatting.GOLD + String.format("%,d", claim.currency) + " " + AuctionClientConfig.getCurrencyName()); + // Show rebid option if item is present (active listing) + if (claim.item != null) { + tooltip.add(""); + tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("auction.trades.leftClickRebid")); + tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("auction.trades.rightClickRefund")); + return; // Skip the generic claim message + } break; case ITEM: if (claim.isReturned) { diff --git a/src/main/java/noppes/npcs/containers/ContainerAuctionTrades.java b/src/main/java/noppes/npcs/containers/ContainerAuctionTrades.java index 2d871bced..772cba7ce 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAuctionTrades.java +++ b/src/main/java/noppes/npcs/containers/ContainerAuctionTrades.java @@ -247,7 +247,7 @@ public class ContainerAuctionTrades extends ContainerAuction { return slot >= 0 && slot < SLOT_COUNT && slotTypes[slot] == 2; } - /** Find listing matching item */ + /** Find listing matching item (searches both selling and bidding) */ public AuctionListing getListingForItem(ItemStack stack) { if (stack == null) return null; for (AuctionListing listing : activeListings) { @@ -259,6 +259,24 @@ public class ContainerAuctionTrades extends ContainerAuction { return null; } + /** Find listing in selling list */ + public AuctionListing getSellingListingForItem(ItemStack stack) { + if (stack == null) return null; + for (AuctionListing listing : activeListings) { + if (listing.item != null && ItemStack.areItemStacksEqual(listing.item, stack)) return listing; + } + return null; + } + + /** Find listing in bidding list */ + public AuctionListing getBiddingListingForItem(ItemStack stack) { + if (stack == null) return null; + for (AuctionListing bid : activeBids) { + if (bid.item != null && ItemStack.areItemStacksEqual(bid.item, stack)) return bid; + } + return null; + } + /** Find claim matching item */ public AuctionClaim getClaimForItem(ItemStack stack) { if (stack == null) return null; diff --git a/src/main/java/noppes/npcs/containers/InventoryAuctionDisplay.java b/src/main/java/noppes/npcs/containers/InventoryAuctionDisplay.java index 0a15720fe..50d2b50e7 100644 --- a/src/main/java/noppes/npcs/containers/InventoryAuctionDisplay.java +++ b/src/main/java/noppes/npcs/containers/InventoryAuctionDisplay.java @@ -48,16 +48,21 @@ public class InventoryAuctionDisplay implements IInventory { /** * Set a claim item in the inventory. - * Shows actual item for ITEM claims, empty slot for CURRENCY/REFUND (icon drawn by GUI). + * Shows actual item for ITEM claims. + * For CURRENCY claims, shows coin icon (null item). + * For REFUND claims, shows item if present (for rebid option), otherwise coin icon. */ public void setClaimItem(int slot, AuctionClaim claim) { if (slot >= 0 && slot < size) { claims.set(slot, claim); listings.set(slot, null); if (claim != null) { - if (claim.type == EnumClaimType.CURRENCY || claim.type == EnumClaimType.REFUND) { - // No item - gold coin icon drawn by GUI + if (claim.type == EnumClaimType.CURRENCY) { + // Sold - gold coin icon drawn by GUI items[slot] = null; + } else if (claim.type == EnumClaimType.REFUND) { + // Outbid - show item if present (for rebid), otherwise coin + items[slot] = claim.item != null ? claim.item.copy() : null; } else if (claim.item != null) { // Show actual item for ITEM claims items[slot] = claim.item.copy(); diff --git a/src/main/java/noppes/npcs/controllers/AuctionController.java b/src/main/java/noppes/npcs/controllers/AuctionController.java index b78fa0649..708c3bb0e 100644 --- a/src/main/java/noppes/npcs/controllers/AuctionController.java +++ b/src/main/java/noppes/npcs/controllers/AuctionController.java @@ -363,10 +363,10 @@ public class AuctionController { if (listing.hasBids()) { long penalty = (long) (listing.currentBid * ConfigMarket.CancellationPenaltyPercent); - // Refund bidder + // Refund bidder (no item - can't rebid on cancelled auction) AuctionClaim refundClaim = AuctionClaim.createRefundClaim( listing.highBidderUUID, listing.highBidderName, listing.id, listing.currentBid, - listing.item.getDisplayName(), listing.sellerName); + listing.item.getDisplayName(), listing.sellerName, null); addClaim(refundClaim); // Remove from bidder's active bids @@ -451,24 +451,29 @@ public class AuctionController { } PlayerCurrencyData currency = playerData.currencyData; - if (!currency.canAfford(bidAmount)) { + + // Store previous bidder info + UUID previousBidder = listing.highBidderUUID; + long previousBid = listing.currentBid; + boolean isSameBidder = previousBidder != null && previousBidder.equals(playerUUID); + + // Calculate amount to charge + long amountToCharge = isSameBidder ? (bidAmount - previousBid) : bidAmount; + + if (!currency.canAfford(amountToCharge)) { return "You cannot afford this bid."; } - // Store previous bidder info for refund - UUID previousBidder = listing.highBidderUUID; - long previousBid = listing.currentBid; - // Deduct bid from new bidder FIRST - if (!currency.withdraw(bidAmount)) { + if (!currency.withdraw(amountToCharge)) { return "Failed to deduct bid amount."; } - // Refund previous bidder if any - if (listing.hasBids() && previousBidder != null) { + // Refund previous bidder if different player (include item for rebid option) + if (listing.hasBids() && previousBidder != null && !isSameBidder) { AuctionClaim refundClaim = AuctionClaim.createRefundClaim( previousBidder, listing.highBidderName, listing.id, previousBid, - listing.item.getDisplayName(), playerName); + listing.item.getDisplayName(), playerName, listing.item); addClaim(refundClaim); // Remove from previous bidder's active bids @@ -550,11 +555,11 @@ public class AuctionController { return "Failed to deduct buyout amount."; } - // Refund previous bidder if any + // Refund previous bidder if any (no item - auction ended via buyout) if (listing.hasBids() && listing.highBidderUUID != null) { AuctionClaim refundClaim = AuctionClaim.createRefundClaim( listing.highBidderUUID, listing.highBidderName, listing.id, listing.currentBid, - listing.item.getDisplayName(), playerName); + listing.item.getDisplayName(), playerName, null); addClaim(refundClaim); // Remove from previous bidder's active bids diff --git a/src/main/java/noppes/npcs/controllers/data/AuctionClaim.java b/src/main/java/noppes/npcs/controllers/data/AuctionClaim.java index bbc1b06ac..4d489a166 100644 --- a/src/main/java/noppes/npcs/controllers/data/AuctionClaim.java +++ b/src/main/java/noppes/npcs/controllers/data/AuctionClaim.java @@ -70,14 +70,14 @@ public class AuctionClaim { return claim; } - /** Create claim for outbid refund (stores item name for tooltip, not full item) */ - public static AuctionClaim createRefundClaim(UUID playerUUID, String playerName, String listingId, long currency, String itemName, String outbidderName) { + /** Create claim for outbid refund (stores item for display and rebid option) */ + public static AuctionClaim createRefundClaim(UUID playerUUID, String playerName, String listingId, long currency, String itemName, String outbidderName, ItemStack item) { AuctionClaim claim = new AuctionClaim(); claim.playerUUID = playerUUID; claim.playerName = playerName; claim.listingId = listingId; claim.type = EnumClaimType.REFUND; - claim.item = null; // No item stored for refund claims + claim.item = item != null ? item.copy() : null; // Store item for display and rebid claim.itemName = itemName != null ? itemName : ""; claim.otherPlayerName = outbidderName != null ? outbidderName : ""; claim.currency = currency; diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index a77d6444b..dc2757916 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -1822,6 +1822,19 @@ auction.trades.leftClickConfirm=Left-click again to confirm auction.trades.otherClickCancel=Any other click to cancel auction.trades.buyer=Buyer auction.trades.outbidBy=Outbid by +auction.trades.selling=Selling +auction.trades.bidding=Bidding +auction.trades.sold=Sold +auction.trades.won=Won +auction.trades.expired=Expired +auction.trades.outbid=Outbid +auction.trades.clickToRebid=Click to increase bid +auction.trades.leftClickRebid=Left-click to rebid +auction.trades.rightClickRefund=Right-click to claim refund +auction.claim.soldItem=Item: %s +auction.claim.buyer=Buyer: %s +auction.claim.outbidItem=Item: %s +auction.claim.outbidBy=Outbid by: %s # Sell Page - Buyout Toggle auction.sell.allowBuyout=Allow Buy Now