Auction Fixes + Auction API Hookup

This commit is contained in:
Kam committed 2026-01-24 15:11:50 -05:00
1 parent 64c29377c4
commit 3577701edf
29 files changed
+1897 -1013

No files matched your search

@@ -28,7 +28,7 @@ public class AuctionCommand extends CommandKamkeelBase {
@Override
public String getDescription() {
return "Auction House operations";
return "Auction operations";
}
@SubCommand(
@@ -135,7 +135,7 @@ public class AuctionCommand extends CommandKamkeelBase {
}
@SubCommand(
desc = "Open the Auction House GUI",
desc = "Open the Auction GUI",
usage = "",
permission = 0
)
@@ -154,7 +154,7 @@ public class AuctionCommand extends CommandKamkeelBase {
// Open the auction GUI without requiring an NPC
NoppesUtilServer.sendOpenGui(player, EnumGuiType.PlayerAuction, null);
sendResult(sender, "Opening Auction House...");
sendResult(sender, "Opening Auction...");
}
@Override
@@ -4,8 +4,8 @@ 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 noppes.npcs.controllers.data.PlayerTradeData;
import java.util.List;
@@ -38,7 +38,7 @@ public class MoneyCommand extends CommandKamkeelBase {
}
for (PlayerData playerdata : dataList) {
PlayerCurrencyData currency = playerdata.currencyData;
PlayerTradeData currency = playerdata.tradeData;
long balance = currency.getBalance();
sendResult(sender, String.format("Player \u00A7b%s\u00A77 has \u00A76%,d %s",
playerdata.playername, balance, ConfigMarket.CurrencyName));
@@ -72,7 +72,7 @@ public class MoneyCommand extends CommandKamkeelBase {
}
for (PlayerData playerdata : dataList) {
PlayerCurrencyData currency = playerdata.currencyData;
PlayerTradeData currency = playerdata.tradeData;
if (currency.deposit(amount)) {
playerdata.save();
sendResult(sender, String.format("Gave \u00A76%,d %s\u00A77 to player \u00A7b%s\u00A77. New balance: \u00A76%,d",
@@ -111,7 +111,7 @@ public class MoneyCommand extends CommandKamkeelBase {
}
for (PlayerData playerdata : dataList) {
PlayerCurrencyData currency = playerdata.currencyData;
PlayerTradeData currency = playerdata.tradeData;
if (currency.withdraw(amount)) {
playerdata.save();
sendResult(sender, String.format("Withdrew \u00A76%,d %s\u00A77 from player \u00A7b%s\u00A77. New balance: \u00A76%,d",
@@ -150,7 +150,7 @@ public class MoneyCommand extends CommandKamkeelBase {
}
for (PlayerData playerdata : dataList) {
PlayerCurrencyData currency = playerdata.currencyData;
PlayerTradeData currency = playerdata.tradeData;
currency.setBalance(amount);
playerdata.save();
sendResult(sender, String.format("Set balance of player \u00A7b%s\u00A77 to \u00A76%,d %s",
@@ -832,6 +832,15 @@ public class ProfileController implements IProfileHandler {
else
compound = (NBTTagCompound) compound.copy();
playerData.setNBT(compound);
// Trade data is shared across all profile slots - copy from player's live data
PlayerData liveData = PlayerData.get(player);
if (liveData != null) {
NBTTagCompound tradeCompound = new NBTTagCompound();
liveData.tradeData.writeToNBT(tradeCompound);
playerData.tradeData.readFromNBT(tradeCompound);
}
return playerData;
}
@@ -5,6 +5,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.controllers.data.PlayerTradeData;
import java.util.ArrayList;
import java.util.List;
@@ -19,7 +20,10 @@ public class CNPCData implements IProfileData {
@Override
public NBTTagCompound getCurrentNBT(EntityPlayer player) {
PlayerData customNPCData = PlayerData.get(player);
return customNPCData.getNBT();
NBTTagCompound compound = customNPCData.getNBT();
compound.removeTag(PlayerTradeData.NBT_KEY);
return compound;
}
@Override
@@ -32,6 +36,10 @@ public class CNPCData implements IProfileData {
@Override
public void setNBT(EntityPlayer player, NBTTagCompound replace) {
PlayerData customNPCData = PlayerData.get(player);
NBTTagCompound sharedData = new NBTTagCompound();
customNPCData.tradeData.writeToNBT(sharedData);
if (replace.hasNoTags()) {
PlayerData newData = new PlayerData();
newData.player = player;
@@ -39,6 +47,8 @@ public class CNPCData implements IProfileData {
} else {
customNPCData.setNBT(replace);
}
customNPCData.tradeData.readFromNBT(sharedData);
customNPCData.updateClient = true;
}
@@ -338,6 +338,9 @@ public class AuctionActionPacket extends AbstractPacket {
NBTTagCompound response = new NBTTagCompound();
response.setBoolean("TradesData", true);
// Send player's max trade slots (permission-aware)
response.setInteger("MaxTradeSlots", controller.getMaxTradesForPlayer(player));
// Active listings (items player is selling)
List<AuctionListing> listings = controller.getPlayerActiveListings(player.getUniqueID());
NBTTagList listingsNBT = new NBTTagList();
@@ -354,8 +357,8 @@ public class AuctionActionPacket extends AbstractPacket {
}
response.setTag("ActiveBids", bidsNBT);
// Claims (items/currency to claim)
List<AuctionClaim> claims = controller.getPlayerClaims(player.getUniqueID());
// Claims (items/currency to claim) - now from PlayerData
List<AuctionClaim> claims = controller.getPlayerClaims(player);
NBTTagList claimsNBT = new NBTTagList();
for (AuctionClaim claim : claims) {
claimsNBT.appendTag(claim.writeToNBT(new NBTTagCompound()));
@@ -488,7 +491,7 @@ public class AuctionActionPacket extends AbstractPacket {
private void sendError(EntityPlayerMP player, String message) {
player.addChatMessage(new net.minecraft.util.ChatComponentText(
net.minecraft.util.EnumChatFormatting.RED + "[Auction House] " + message));
net.minecraft.util.EnumChatFormatting.RED + "[Auction] " + message));
}
private void sendTradesUpdate(EntityPlayerMP player) {
@@ -53,7 +53,7 @@ public class GetTraderData extends AbstractPacket {
// Player balance
PlayerData data = PlayerData.get(player);
compound.setLong("Balance", data.currencyData.getBalance());
compound.setLong("Balance", data.tradeData.getBalance());
// Stock info
compound.setBoolean("StockEnabled", role.stock.enableStock);
@@ -110,6 +110,9 @@ public class CustomNpcsPermissions {
public static final Permission PROFILE_REGION_BYPASS = new Permission("customnpcs.profile.region-bypass");
public static final Permission PROFILE_MAX = new Permission("customnpcs.profile.max.*");
// Auction
public static final Permission AUCTION_TRADES_MAX = new Permission("customnpcs.auction.trades.*");
public static CustomNpcsPermissions Instance;
private Method hasPermission;
@@ -68,6 +68,11 @@ public class ServerTickHandler {
playerData.onLogout();
}
// Clear auction permission cache on logout
if (AuctionController.Instance != null) {
AuctionController.Instance.onPlayerLogout(event.player.getUniqueID());
}
// Save and unload the player's profile data on logout
ProfileController.Instance.logout(event.player);
}
@@ -15,11 +15,11 @@ import net.minecraft.nbt.NBTTagCompound;
public class AuctionClientConfig {
// Cached values from server
private static long listingFee = 0;
private static String currencyName = "Gold";
private static int auctionDurationHours = 48;
private static String currencyName = "Coins";
private static int auctionDurationHours = 24;
private static double minBidIncrement = 0.05;
private static int maxActiveListings = 10;
private static int claimExpirationDays = 30;
private static int maxActiveListings = 8;
private static int claimExpirationDays = 20;
private static boolean auctionEnabled = false;
/**
@@ -47,11 +47,11 @@ public class AuctionClientConfig {
*/
public static void reset() {
listingFee = 0;
currencyName = "Gold";
auctionDurationHours = 48;
currencyName = "Coins";
auctionDurationHours = 24;
minBidIncrement = 0.05;
maxActiveListings = 10;
claimExpirationDays = 30;
maxActiveListings = 8;
claimExpirationDays = 20;
auctionEnabled = false;
}
@@ -45,7 +45,7 @@ public class GuiAuctionSell extends GuiAuctionInterface implements ITextfieldLis
private final ContainerAuctionSell sellContainer;
private long startingPrice = 0;
private long buyoutPrice = 0;
private boolean allowBuyout = false;
private boolean allowBuyout = true;
private String errorMessage = null;
// Buttons
@@ -55,7 +55,8 @@ public class GuiAuctionTrades extends GuiAuctionInterface implements IGuiData {
public GuiAuctionTrades(EntityNPCInterface npc, ContainerAuctionTrades container) {
super(npc, container);
this.tradesContainer = container;
this.maxTradeSlots = AuctionClientConfig.getMaxActiveListings() * 2;
// Initial value from client config, updated when server sends trades data
this.maxTradeSlots = AuctionClientConfig.getMaxActiveListings();
}
@Override
@@ -372,6 +373,8 @@ public class GuiAuctionTrades extends GuiAuctionInterface implements IGuiData {
if (compound.hasKey("TradesData")) {
// Full trades data received from server
tradesContainer.setTradesData(compound);
// Update max trade slots from server (permission-aware)
this.maxTradeSlots = tradesContainer.getMaxTradeSlots();
clearPending();
} else if (compound.hasKey("TradesUpdate")) {
// Legacy flag - should not happen now but keep for safety
@@ -11,16 +11,13 @@ import java.util.Arrays;
public class ConfigMarket {
public static Configuration config;
public final static String MARKET = "Market";
public final static String CURRENCY = "Market.Currency";
public final static String TRADER = "Market.Trader";
public final static String AUCTION = "Market.Auction";
public final static String AUCTION_LOGGING = "Market.Auction.Logging";
// =========================================
// Market General
// =========================================
public static boolean MarketEnabled = true;
// Max trades grid = 9x5 = 45 slots
public static final int MAX_TRADE_SLOTS = 45;
public static final int MIN_TRADE_SLOTS = 1;
// =========================================
// Currency Settings
@@ -30,20 +27,15 @@ public class ConfigMarket {
public static long StartingBalance = 0;
public static long MaxBalance = Long.MAX_VALUE;
// =========================================
// Trader Settings
// =========================================
public static boolean EnableStockByDefault = false;
public static String DefaultResetType = "NONE";
// =========================================
// Auction Settings
// =========================================
public static boolean AuctionEnabled = true;
public static int AuctionDurationHours = 24;
public static long ListingFee = 10;
public static long MinimumListingPrice = 1;
public static double SalesTaxPercent = 0.05;
public static int DefaultMaxListings = 5;
public static int DefaultMaxTrades = 8;
public static int SnipeProtectionMinutes = 2;
public static int ClaimExpirationDays = 20;
public static double MinBidIncrementPercent = 0.05;
@@ -67,18 +59,12 @@ public class ConfigMarket {
try {
config.load();
// =========================================
// Market General
// =========================================
MarketEnabled = config.get(MARKET, "Enable Market System", true,
"Enable the market/economy system").getBoolean(true);
// =========================================
// Currency Settings
// =========================================
config.setCategoryComment(CURRENCY, "CNPC+ Currency system settings. When UseVault is enabled, all currency operations use Vault instead of the built-in system.");
UseVault = config.get(CURRENCY, "Use Vault", true,
UseVault = config.get(CURRENCY, "Use Vault", false,
"If true, use Vault API for all currency operations instead of CNPC+ built-in currency. The built-in currency data will be preserved but unused.").getBoolean(false);
CurrencyName = config.get(CURRENCY, "Currency Name", "Coins",
@@ -90,24 +76,13 @@ public class ConfigMarket {
MaxBalance = config.get(CURRENCY, "Max Balance", Integer.MAX_VALUE,
"Maximum currency balance a player can have").getInt(Integer.MAX_VALUE);
// =========================================
// Trader Settings
// =========================================
config.setCategoryComment(TRADER, "Trader stock system settings");
EnableStockByDefault = config.get(TRADER, "Enable Stock By Default", false,
"Enable stock system by default for new traders").getBoolean(false);
DefaultResetType = config.get(TRADER, "Default Reset Type", "NONE",
"Default stock reset type (NONE, MCDAILY, MCWEEKLY, RLDAILY, RLWEEKLY)").getString();
// =========================================
// Auction Settings
// =========================================
config.setCategoryComment(AUCTION, "Auction House system settings. The Auction House allows players to list items for sale with bidding and buyout options.");
config.setCategoryComment(AUCTION, "Auction system settings. The Auction allows players to list items for sale with bidding and buyout options.");
AuctionEnabled = config.get(AUCTION, "Enable Auction House", true,
"Enable the Auction House system").getBoolean(true);
AuctionEnabled = config.get(AUCTION, "Enable Auction", true,
"Enable the Auction system").getBoolean(true);
AuctionDurationHours = config.get(AUCTION, "Auction Duration Hours", 24,
"Default duration for auctions in hours").getInt(24);
@@ -115,11 +90,16 @@ public class ConfigMarket {
ListingFee = config.get(AUCTION, "Listing Fee", 10,
"Flat fee charged when creating a listing").getInt(10);
MinimumListingPrice = config.get(AUCTION, "Minimum Listing Price", 1,
"Minimum starting price for auction listings").getInt(1);
if (MinimumListingPrice < 1) MinimumListingPrice = 1;
SalesTaxPercent = config.get(AUCTION, "Sales Tax Percent", 0.05,
"Percentage of sale price taken as tax (0.05 = 5%). Tax is deleted as a currency sink.").getDouble(0.05);
DefaultMaxListings = config.get(AUCTION, "Default Max Listings", 5,
"Default maximum number of active listings per player").getInt(5);
int maxTrades = config.get(AUCTION, "Default Max Trades", 8,
"Default maximum number of trade slots per player (listings + bids + claims). Min: 1, Max: 45. Players can have more via customnpcs.auction.trades.X permissions.").getInt(8);
DefaultMaxTrades = Math.max(MIN_TRADE_SLOTS, Math.min(MAX_TRADE_SLOTS, maxTrades));
SnipeProtectionMinutes = config.get(AUCTION, "Snipe Protection Minutes", 2,
"When a bid is placed with less than this many minutes remaining, the auction is extended to this duration").getInt(2);
@@ -136,7 +116,7 @@ public class ConfigMarket {
// =========================================
// Auction Logging Settings
// =========================================
config.setCategoryComment(AUCTION_LOGGING, "Auction House logging settings. Enable specific log types to track auction activity.");
config.setCategoryComment(AUCTION_LOGGING, "Auction logging settings. Enable specific log types to track auction activity.");
AuctionLoggingEnabled = config.get(AUCTION_LOGGING, "Enable Auction Logging", false,
"Master switch for auction logging. If false, no auction events are logged.").getBoolean(false);
@@ -163,10 +143,6 @@ public class ConfigMarket {
"Log when claims are collected").getBoolean(true);
// Set category order
config.setCategoryPropertyOrder(MARKET, new ArrayList<>(Arrays.asList(
"Enable Market System"
)));
config.setCategoryPropertyOrder(CURRENCY, new ArrayList<>(Arrays.asList(
"Use Vault",
"Currency Name",
@@ -174,17 +150,13 @@ public class ConfigMarket {
"Max Balance"
)));
config.setCategoryPropertyOrder(TRADER, new ArrayList<>(Arrays.asList(
"Enable Stock By Default",
"Default Reset Type"
)));
config.setCategoryPropertyOrder(AUCTION, new ArrayList<>(Arrays.asList(
"Enable Auction House",
"Enable Auction",
"Auction Duration Hours",
"Listing Fee",
"Minimum Listing Price",
"Sales Tax Percent",
"Default Max Listings",
"Default Max Trades",
"Snipe Protection Minutes",
"Claim Expiration Days",
"Min Bid Increment Percent",
@@ -31,6 +31,7 @@ public class ContainerAuctionTrades extends ContainerAuction {
private List<AuctionListing> activeBids = new ArrayList<>();
private List<AuctionClaim> claims = new ArrayList<>();
private int hiddenSlot = -1;
private int maxTradeSlots = 8; // Player's max trade slots (permission-aware, synced from server)
// Slot type tracking for proper accessor methods
private int[] slotTypes = new int[SLOT_COUNT]; // 0=empty, 1=selling, 2=bidding, 3=claim
@@ -72,6 +73,11 @@ public class ContainerAuctionTrades extends ContainerAuction {
// Clear existing data
clearData();
// Read player's max trade slots (permission-aware)
if (compound.hasKey("MaxTradeSlots")) {
maxTradeSlots = compound.getInteger("MaxTradeSlots");
}
List<AuctionListing> newListings = new ArrayList<>();
List<AuctionListing> newBids = new ArrayList<>();
List<AuctionClaim> newClaims = new ArrayList<>();
@@ -341,4 +347,7 @@ public class ContainerAuctionTrades extends ContainerAuction {
}
public int getHiddenSlot() { return hiddenSlot; }
/** Get player's max trade slots (synced from server based on permissions) */
public int getMaxTradeSlots() { return maxTradeSlots; }
}
@@ -105,7 +105,7 @@ public class ContainerNPCTrader extends ContainerNpcInterface {
long currencyCost = role.getCurrencyCost(i);
if (currencyCost > 0) {
PlayerData data = PlayerData.get(entityplayer);
if (data.currencyData.getBalance() < currencyCost) {
if (data.tradeData.getBalance() < currencyCost) {
return null; // Can't afford currency cost
}
}
@@ -117,7 +117,7 @@ public class ContainerNPCTrader extends ContainerNpcInterface {
// Withdraw currency cost (after item consumption to maintain order)
if (currencyCost > 0) {
PlayerData data = PlayerData.get(entityplayer);
data.currencyData.withdraw(currencyCost);
data.tradeData.withdraw(currencyCost);
}
// Consume stock
@@ -25,7 +25,7 @@ public class AuctionConfigSync {
compound.setString("CurrencyName", getEffectiveCurrencyName());
compound.setInteger("AuctionDurationHours", ConfigMarket.AuctionDurationHours);
compound.setDouble("MinBidIncrement", ConfigMarket.MinBidIncrementPercent);
compound.setInteger("MaxActiveListings", ConfigMarket.DefaultMaxListings);
compound.setInteger("MaxActiveListings", ConfigMarket.DefaultMaxTrades);
compound.setInteger("ClaimExpirationDays", ConfigMarket.ClaimExpirationDays);
return compound;
}
File diff suppressed because it is too large. Load diff
@@ -364,6 +364,17 @@ public class PlayerDataController {
return data;
}
public PlayerData getData(UUID uuid) {
EntityPlayer player = getPlayerFromUUID(uuid);
PlayerData data;
if (player == null) {
data = new PlayerData();
data.setNBT(PlayerDataController.Instance.loadPlayerData(uuid.toString()));
} else
data = PlayerData.get(player);
return data;
}
public void addPlayerMessage(String username, PlayerMail mail) {
mail.time = System.currentTimeMillis();
@@ -2,11 +2,15 @@ package noppes.npcs.controllers.data;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.api.handler.data.IAuctionClaim;
import noppes.npcs.api.item.IItemStack;
import noppes.npcs.config.ConfigMarket;
import noppes.npcs.constants.EnumClaimType;
import noppes.npcs.scripted.NpcAPI;
import java.util.UUID;
public class AuctionClaim {
public class AuctionClaim implements IAuctionClaim {
public String id;
public UUID playerUUID;
public String playerName;
@@ -100,6 +104,95 @@ public class AuctionClaim {
return playerUUID != null && playerUUID.equals(uuid);
}
// =========================================
// IAuctionClaim Implementation
// =========================================
@Override
public String getId() {
return id;
}
@Override
public String getPlayerUUID() {
return playerUUID != null ? playerUUID.toString() : null;
}
@Override
public String getPlayerName() {
return playerName;
}
@Override
public String getListingId() {
return listingId;
}
@Override
public int getType() {
return type.ordinal();
}
@Override
public boolean isItemClaim() {
return type == EnumClaimType.ITEM;
}
@Override
public boolean isCurrencyClaim() {
return type == EnumClaimType.CURRENCY;
}
@Override
public boolean isRefundClaim() {
return type == EnumClaimType.REFUND;
}
@Override
public IItemStack getItem() {
return item != null ? NpcAPI.Instance().getIItemStack(item) : null;
}
@Override
public String getItemName() {
return itemName;
}
@Override
public long getCurrency() {
return currency;
}
@Override
public String getOtherPlayerName() {
return otherPlayerName;
}
@Override
public long getCreatedTime() {
return createdTime;
}
@Override
public boolean isClaimed() {
return claimed;
}
@Override
public boolean isReturnedItem() {
return isReturned;
}
@Override
public long getDaysUntilExpiration() {
return getDaysUntilExpiration(ConfigMarket.ClaimExpirationDays);
}
@Override
public boolean isExpired() {
return isExpired(ConfigMarket.ClaimExpirationDays);
}
public NBTTagCompound writeToNBT(NBTTagCompound compound) {
compound.setString("ID", id);
compound.setString("PlayerUUID", playerUUID != null ? playerUUID.toString() : "");
@@ -8,7 +8,7 @@ import java.util.regex.Pattern;
/**
* Filter for auction listings.
* Supports search by item name and sorting options.
* Supports search by item name or seller name and sorting options.
*/
public class AuctionFilter {
private static final Pattern COLOR_CODE_PATTERN = Pattern.compile("§[0-9a-fk-or]", Pattern.CASE_INSENSITIVE);
@@ -37,26 +37,42 @@ public class AuctionFilter {
return stripped.toLowerCase().trim();
}
/** Check if item name matches search text */
public boolean matchesSearch(String itemName) {
/** Check if item name or seller name matches search text */
public boolean matchesSearch(String itemName, String sellerName) {
if (!hasSearchText()) return true;
String normalized = normalizeForSearch(itemName);
return normalized.contains(normalizedSearch);
String normalizedItem = normalizeForSearch(itemName);
String normalizedSeller = normalizeForSearch(sellerName);
// Match if search text is found in either item name or seller name
return normalizedItem.contains(normalizedSearch) || normalizedSeller.contains(normalizedSearch);
}
/** Advanced search - all words must be present */
public boolean matchesSearchAdvanced(String itemName) {
/** Legacy method - only checks item name */
public boolean matchesSearch(String itemName) {
return matchesSearch(itemName, "");
}
/** Advanced search - all words must be present in item name OR seller name */
public boolean matchesSearchAdvanced(String itemName, String sellerName) {
if (!hasSearchText()) return true;
String normalized = normalizeForSearch(itemName);
String normalizedItem = normalizeForSearch(itemName);
String normalizedSeller = normalizeForSearch(sellerName);
String[] words = normalizedSearch.split("\\s+");
for (String word : words) {
if (!word.isEmpty() && !normalized.contains(word)) {
return false;
if (!word.isEmpty()) {
// Word must be in item name OR seller name
if (!normalizedItem.contains(word) && !normalizedSeller.contains(word)) {
return false;
}
}
}
return true;
}
/** Legacy method - only checks item name */
public boolean matchesSearchAdvanced(String itemName) {
return matchesSearchAdvanced(itemName, "");
}
public void reset() {
searchText = "";
sortBy = EnumAuctionSort.NEWEST;
@@ -2,11 +2,15 @@ package noppes.npcs.controllers.data;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.api.handler.data.IAuctionListing;
import noppes.npcs.api.item.IItemStack;
import noppes.npcs.config.ConfigMarket;
import noppes.npcs.constants.EnumAuctionStatus;
import noppes.npcs.scripted.NpcAPI;
import java.util.UUID;
public class AuctionListing {
public class AuctionListing implements IAuctionListing {
public String id;
public UUID sellerUUID;
public String sellerName;
@@ -40,22 +44,6 @@ public class AuctionListing {
this.endTime = this.createdTime + durationMs;
}
public boolean hasBids() {
return bidCount > 0 && highBidderUUID != null;
}
public boolean hasBuyout() {
return buyoutPrice > 0;
}
public boolean isExpired() {
return System.currentTimeMillis() >= endTime;
}
public boolean isActive() {
return status == EnumAuctionStatus.ACTIVE && !isExpired();
}
public long getTimeRemaining() {
return Math.max(0, endTime - System.currentTimeMillis());
}
@@ -88,6 +76,136 @@ public class AuctionListing {
}
}
// =========================================
// IAuctionListing Implementation
// =========================================
@Override
public String getId() {
return id;
}
@Override
public String getSellerUUID() {
return sellerUUID != null ? sellerUUID.toString() : null;
}
@Override
public String getSellerName() {
return sellerName;
}
@Override
public IItemStack getItem() {
return item != null ? NpcAPI.Instance().getIItemStack(item) : null;
}
@Override
public long getStartingPrice() {
return startingPrice;
}
@Override
public long getBuyoutPrice() {
return buyoutPrice;
}
@Override
public long getCurrentBid() {
return currentBid;
}
@Override
public String getHighBidderUUID() {
return highBidderUUID != null ? highBidderUUID.toString() : null;
}
@Override
public String getHighBidderName() {
return highBidderName;
}
@Override
public int getBidCount() {
return bidCount;
}
@Override
public long getCreatedTime() {
return createdTime;
}
@Override
public long getEndTime() {
return endTime;
}
@Override
public long getRemainingTime() {
return getTimeRemaining();
}
@Override
public int getStatus() {
return status.ordinal();
}
@Override
public long getMinimumBid() {
return getMinimumBid(ConfigMarket.MinBidIncrementPercent);
}
@Override
public boolean isSeller(String playerUUID) {
if (playerUUID == null || sellerUUID == null) return false;
return sellerUUID.toString().equals(playerUUID);
}
@Override
public boolean isHighBidder(String playerUUID) {
if (playerUUID == null || highBidderUUID == null) return false;
return highBidderUUID.toString().equals(playerUUID);
}
@Override
public String getRemainingTimeFormatted() {
long remaining = getTimeRemaining();
if (remaining <= 0) return "Ended";
long hours = remaining / (60 * 60 * 1000);
long minutes = (remaining % (60 * 60 * 1000)) / (60 * 1000);
if (hours > 0) {
return hours + "h " + minutes + "m";
} else if (minutes > 0) {
return minutes + "m";
} else {
long seconds = (remaining % (60 * 1000)) / 1000;
return seconds + "s";
}
}
// Override existing methods with @Override annotation
@Override
public boolean hasBids() {
return bidCount > 0 && highBidderUUID != null;
}
@Override
public boolean hasBuyout() {
return buyoutPrice > 0;
}
@Override
public boolean isExpired() {
return System.currentTimeMillis() >= endTime;
}
@Override
public boolean isActive() {
return status == EnumAuctionStatus.ACTIVE && !isExpired();
}
public NBTTagCompound writeToNBT(NBTTagCompound compound) {
compound.setString("ID", id);
compound.setString("SellerUUID", sellerUUID != null ? sellerUUID.toString() : "");
@@ -1,232 +0,0 @@
package noppes.npcs.controllers.data;
import kamkeel.npcs.util.VaultUtil;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.api.handler.IPlayerCurrencyData;
import noppes.npcs.config.ConfigMarket;
/**
* Stores player currency balance.
* This data is NOT profile slot bound - all profile slots share the same currency pool.
* When Vault API is available and UseVault config is enabled, operations delegate to Vault.
* The built-in CNPC+ currency data is always preserved in NBT, but unused when Vault is active.
*/
public class PlayerCurrencyData implements IPlayerCurrencyData {
private final PlayerData playerData;
// Built-in CNPC+ currency (always saved, used as fallback)
private long balance;
private long lifetimeEarned;
private long lifetimeSpent;
public PlayerCurrencyData(PlayerData playerData) {
this.playerData = playerData;
this.balance = ConfigMarket.StartingBalance;
this.lifetimeEarned = 0;
this.lifetimeSpent = 0;
}
/**
* Check if Vault should be used for currency operations.
* Requires both config enabled AND Vault actually available.
*/
private boolean shouldUseVault() {
return ConfigMarket.UseVault && VaultUtil.isEnabled();
}
/**
* Get player name for Vault operations
*/
private String getPlayerName() {
if (playerData != null && playerData.player != null) {
return playerData.player.getCommandSenderName();
}
return playerData != null ? playerData.playername : null;
}
public void readFromNBT(NBTTagCompound compound) {
if (compound.hasKey("CurrencyBalance")) {
this.balance = compound.getLong("CurrencyBalance");
} else {
this.balance = ConfigMarket.StartingBalance;
}
this.lifetimeEarned = compound.getLong("CurrencyLifetimeEarned");
this.lifetimeSpent = compound.getLong("CurrencyLifetimeSpent");
}
public void writeToNBT(NBTTagCompound compound) {
// Always save built-in currency data (preserved even when using Vault)
compound.setLong("CurrencyBalance", this.balance);
compound.setLong("CurrencyLifetimeEarned", this.lifetimeEarned);
compound.setLong("CurrencyLifetimeSpent", this.lifetimeSpent);
}
/**
* Get the current balance
*/
@Override
public long getBalance() {
if (shouldUseVault()) {
String playerName = getPlayerName();
if (playerName != null) {
return (long) VaultUtil.getBalance(playerName);
}
}
return balance;
}
/**
* Set the balance directly (use with caution)
*/
@Override
public void setBalance(long balance) {
if (balance < 0) {
balance = 0;
}
if (balance > ConfigMarket.MaxBalance) {
balance = ConfigMarket.MaxBalance;
}
if (shouldUseVault()) {
String playerName = getPlayerName();
if (playerName != null) {
VaultUtil.setBalance(playerName, balance);
return;
}
}
this.balance = balance;
}
/**
* Add currency to balance (deposit)
*
* @param amount Amount to add
* @return true if successful, false if would exceed max balance
*/
@Override
public boolean deposit(long amount) {
if (amount <= 0) {
return false;
}
if (shouldUseVault()) {
String playerName = getPlayerName();
if (playerName != null) {
boolean success = VaultUtil.addMoney(playerName, amount);
if (success) {
this.lifetimeEarned += amount;
}
return success;
}
}
// Built-in currency
long newBalance = this.balance + amount;
if (newBalance > ConfigMarket.MaxBalance) {
return false;
}
if (newBalance < this.balance) {
// Overflow protection
return false;
}
this.balance = newBalance;
this.lifetimeEarned += amount;
return true;
}
/**
* Remove currency from balance (withdraw)
*
* @param amount Amount to remove
* @return true if successful, false if insufficient funds
*/
@Override
public boolean withdraw(long amount) {
if (amount <= 0) {
return false;
}
if (shouldUseVault()) {
String playerName = getPlayerName();
if (playerName != null) {
boolean success = VaultUtil.withdrawMoney(playerName, amount);
if (success) {
this.lifetimeSpent += amount;
}
return success;
}
}
// Built-in currency
if (this.balance < amount) {
return false;
}
this.balance -= amount;
this.lifetimeSpent += amount;
return true;
}
/**
* Check if player can afford an amount
*/
@Override
public boolean canAfford(long amount) {
if (shouldUseVault()) {
String playerName = getPlayerName();
if (playerName != null) {
return VaultUtil.has(playerName, amount);
}
}
return this.balance >= amount;
}
/**
* Get lifetime earned currency
*/
@Override
public long getLifetimeEarned() {
return lifetimeEarned;
}
/**
* Get lifetime spent currency
*/
@Override
public long getLifetimeSpent() {
return lifetimeSpent;
}
/**
* Format the balance for display
*/
@Override
public String formatBalance() {
if (shouldUseVault()) {
return VaultUtil.format(getBalance());
}
return formatAmount(this.balance);
}
/**
* Format an amount for display
*/
public static String formatAmount(long amount) {
return String.format("%,d %s", amount, ConfigMarket.CurrencyName);
}
/**
* Check if Vault is being used for currency operations.
* Returns true only if config is enabled AND Vault is actually available.
*/
@Override
public boolean isUsingVault() {
return shouldUseVault();
}
/**
* Check if Vault is configured (regardless of availability)
*/
public boolean isVaultConfigured() {
return ConfigMarket.UseVault;
}
}
@@ -17,7 +17,7 @@ import noppes.npcs.CustomNpcs;
import noppes.npcs.LogWriter;
import noppes.npcs.api.entity.ICustomNpc;
import noppes.npcs.api.handler.IPlayerBankData;
import noppes.npcs.api.handler.IPlayerCurrencyData;
import noppes.npcs.api.handler.IPlayerTradeData;
import noppes.npcs.api.handler.IPlayerData;
import noppes.npcs.api.handler.IPlayerDialogData;
import noppes.npcs.api.handler.IPlayerFactionData;
@@ -46,6 +46,8 @@ import java.io.FileOutputStream;
import java.util.HashSet;
import java.util.UUID;
import static noppes.npcs.util.CustomNPCsThreader.customNPCThread;
public class PlayerData implements IExtendedEntityProperties, IPlayerData {
public PlayerDialogData dialogData = new PlayerDialogData(this);
public PlayerBankData bankData = new PlayerBankData(this);
@@ -60,8 +62,8 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
public DataSkinOverlays skinOverlays = new DataSkinOverlays(this);
public MagicData magicData = new MagicData();
// Currency data - NOT slot-bound, shared across all profile slots
public PlayerCurrencyData currencyData = new PlayerCurrencyData(this);
// Trade data (currency + auction claims) - shared across all profile slots
public PlayerTradeData tradeData = new PlayerTradeData(this);
public ActionManager actionManager = new ActionManager();
public PlayerDataScript scriptData;
@@ -134,6 +136,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
animationData.readFromNBT(data);
effectData.readFromNBT(data);
magicData.readToNBT(data);
tradeData.readFromNBT(data);
if (player != null) {
playername = player.getCommandSenderName();
@@ -176,6 +179,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
animationData.writeToNBT(compound);
effectData.writeToNBT(compound);
magicData.writeToNBT(compound);
tradeData.writeToNBT(compound);
compound.setString("PlayerName", playername);
compound.setString("UUID", uuid);
@@ -228,6 +232,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
transportData.saveNBTData(compound);
factionData.saveNBTData(compound);
mailData.saveNBTData(compound);
tradeData.writeToNBT(compound);
compound.setString("PlayerName", playername);
compound.setString("UUID", uuid);
DBCAddon.instance.writeToNBT(this, compound);
@@ -241,6 +246,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
transportData.loadNBTData(data);
factionData.loadNBTData(data);
mailData.loadNBTData(data);
tradeData.readFromNBT(data);
if (player != null) {
playername = player.getCommandSenderName();
uuid = player.getPersistentID().toString();
@@ -401,8 +407,8 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
return mailData;
}
public IPlayerCurrencyData getCurrencyData() {
return currencyData;
public IPlayerTradeData getTradeData() {
return tradeData;
}
public synchronized void save() {
@@ -414,9 +420,6 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
}
final NBTTagCompound compound = getNBT();
// Currency data is saved at player level, NOT per profile slot
currencyData.writeToNBT(compound);
final String filename;
if (ConfigMain.DatFormat) {
filename = uuid + ".dat";
@@ -453,10 +456,6 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
if (data.hasNoTags()) {
data = getNBT();
}
// Load currency BEFORE setNBT - currency is player-level, NOT per profile slot
currencyData.readFromNBT(data);
setNBT(data);
}
@@ -0,0 +1,414 @@
package noppes.npcs.controllers.data;
import kamkeel.npcs.util.VaultUtil;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import noppes.npcs.api.handler.IPlayerTradeData;
import noppes.npcs.api.handler.data.IAuctionClaim;
import noppes.npcs.config.ConfigMarket;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* Stores player's trade-related data: currency and auction claims.
* This data is shared across all profile slots.
* Uses CopyOnWriteArrayList for thread-safety when adding claims asynchronously.
*/
public class PlayerTradeData implements IPlayerTradeData {
// NBT key used by trade data - excluded from per-slot profile saving
public static final String NBT_KEY = "TradeData";
private final PlayerData playerData;
// =========================================
// Currency Data
// =========================================
// Built-in CNPC+ currency (always saved, used as fallback)
private long balance;
private long lifetimeEarned;
private long lifetimeSpent;
// =========================================
// Auction Claims Data
// =========================================
// Thread-safe list for claims - can be modified from CNPC+ thread
private final CopyOnWriteArrayList<AuctionClaim> claims = new CopyOnWriteArrayList<>();
public PlayerTradeData(PlayerData playerData) {
this.playerData = playerData;
this.balance = ConfigMarket.StartingBalance;
this.lifetimeEarned = 0;
this.lifetimeSpent = 0;
}
// =========================================
// Currency Methods
// =========================================
/**
* Check if Vault should be used for currency operations.
* Requires both config enabled AND Vault actually available.
*/
private boolean shouldUseVault() {
return ConfigMarket.UseVault && VaultUtil.isEnabled();
}
/**
* Get player name for Vault operations
*/
private String getPlayerName() {
if (playerData != null && playerData.player != null) {
return playerData.player.getCommandSenderName();
}
return playerData != null ? playerData.playername : null;
}
/**
* Get the current balance
*/
@Override
public long getBalance() {
if (shouldUseVault()) {
String playerName = getPlayerName();
if (playerName != null) {
return (long) VaultUtil.getBalance(playerName);
}
}
return balance;
}
/**
* Set the balance directly (use with caution)
*/
@Override
public void setBalance(long balance) {
if (balance < 0) {
balance = 0;
}
if (balance > ConfigMarket.MaxBalance) {
balance = ConfigMarket.MaxBalance;
}
if (shouldUseVault()) {
String playerName = getPlayerName();
if (playerName != null) {
VaultUtil.setBalance(playerName, balance);
return;
}
}
this.balance = balance;
}
/**
* Add currency to balance (deposit)
*
* @param amount Amount to add
* @return true if successful, false if would exceed max balance
*/
@Override
public boolean deposit(long amount) {
if (amount <= 0) {
return false;
}
if (shouldUseVault()) {
String playerName = getPlayerName();
if (playerName != null) {
boolean success = VaultUtil.addMoney(playerName, amount);
if (success) {
this.lifetimeEarned += amount;
}
return success;
}
}
// Built-in currency
long newBalance = this.balance + amount;
if (newBalance > ConfigMarket.MaxBalance) {
return false;
}
if (newBalance < this.balance) {
// Overflow protection
return false;
}
this.balance = newBalance;
this.lifetimeEarned += amount;
return true;
}
/**
* Remove currency from balance (withdraw)
*
* @param amount Amount to remove
* @return true if successful, false if insufficient funds
*/
@Override
public boolean withdraw(long amount) {
if (amount <= 0) {
return false;
}
if (shouldUseVault()) {
String playerName = getPlayerName();
if (playerName != null) {
boolean success = VaultUtil.withdrawMoney(playerName, amount);
if (success) {
this.lifetimeSpent += amount;
}
return success;
}
}
// Built-in currency
if (this.balance < amount) {
return false;
}
this.balance -= amount;
this.lifetimeSpent += amount;
return true;
}
/**
* Check if player can afford an amount
*/
@Override
public boolean canAfford(long amount) {
if (shouldUseVault()) {
String playerName = getPlayerName();
if (playerName != null) {
return VaultUtil.has(playerName, amount);
}
}
return this.balance >= amount;
}
/**
* Get lifetime earned currency
*/
@Override
public long getLifetimeEarned() {
return lifetimeEarned;
}
/**
* Get lifetime spent currency
*/
@Override
public long getLifetimeSpent() {
return lifetimeSpent;
}
/**
* Format the balance for display
*/
@Override
public String formatBalance() {
if (shouldUseVault()) {
return VaultUtil.format(getBalance());
}
return formatAmount(this.balance);
}
/**
* Format an amount for display
*/
public static String formatAmount(long amount) {
return String.format("%,d %s", amount, ConfigMarket.CurrencyName);
}
/**
* Check if Vault is being used for currency operations.
* Returns true only if config is enabled AND Vault is actually available.
*/
@Override
public boolean isUsingVault() {
return shouldUseVault();
}
/**
* Check if Vault is configured (regardless of availability)
*/
public boolean isVaultConfigured() {
return ConfigMarket.UseVault;
}
// =========================================
// Auction Claims Methods
// =========================================
/**
* Add a claim to this player's pending claims.
* Thread-safe - can be called from any thread.
*/
public void addClaim(AuctionClaim claim) {
if (claim != null && !claim.claimed) {
claims.add(claim);
}
}
/**
* Get all unclaimed claims for this player (internal use).
* Returns a copy of the list for safe iteration.
*/
public List<AuctionClaim> getClaimsList() {
List<AuctionClaim> result = new ArrayList<>();
for (AuctionClaim claim : claims) {
if (!claim.claimed) {
result.add(claim);
}
}
return result;
}
/**
* Get all unclaimed claims for this player (API).
*/
@Override
public IAuctionClaim[] getClaims() {
List<AuctionClaim> result = getClaimsList();
return result.toArray(new IAuctionClaim[0]);
}
/**
* Get a specific claim by ID (internal use).
*/
public AuctionClaim getClaimInternal(String claimId) {
for (AuctionClaim claim : claims) {
if (claim.id.equals(claimId) && !claim.claimed) {
return claim;
}
}
return null;
}
/**
* Get a specific claim by ID (API).
*/
@Override
public IAuctionClaim getClaim(String claimId) {
return getClaimInternal(claimId);
}
/**
* Mark a claim as claimed and remove it.
*/
public boolean claimAndRemove(String claimId) {
for (AuctionClaim claim : claims) {
if (claim.id.equals(claimId) && !claim.claimed) {
claim.claimed = true;
claims.remove(claim);
return true;
}
}
return false;
}
/**
* Get count of unclaimed claims.
*/
@Override
public int getClaimCount() {
int count = 0;
for (AuctionClaim claim : claims) {
if (!claim.claimed) {
count++;
}
}
return count;
}
/**
* Check if player has any unclaimed claims.
*/
@Override
public boolean hasClaims() {
for (AuctionClaim claim : claims) {
if (!claim.claimed) {
return true;
}
}
return false;
}
/**
* Process expired claims - removes claims older than expiration days.
* Returns number of claims removed.
*/
public int processExpiredClaims() {
int expirationDays = ConfigMarket.ClaimExpirationDays;
int removed = 0;
Iterator<AuctionClaim> iterator = claims.iterator();
while (iterator.hasNext()) {
AuctionClaim claim = iterator.next();
if (!claim.claimed && claim.isExpired(expirationDays)) {
claims.remove(claim);
removed++;
}
}
return removed;
}
// =========================================
// NBT Serialization
// =========================================
public void readFromNBT(NBTTagCompound compound) {
NBTTagCompound tradeData = compound.getCompoundTag(NBT_KEY);
if (tradeData == null || tradeData.hasNoTags()) {
// No trade data found, use defaults
this.balance = ConfigMarket.StartingBalance;
this.lifetimeEarned = 0;
this.lifetimeSpent = 0;
claims.clear();
return;
}
// Currency
if (tradeData.hasKey("CurrencyBalance")) {
this.balance = tradeData.getLong("CurrencyBalance");
} else {
this.balance = ConfigMarket.StartingBalance;
}
this.lifetimeEarned = tradeData.getLong("CurrencyLifetimeEarned");
this.lifetimeSpent = tradeData.getLong("CurrencyLifetimeSpent");
// Claims
claims.clear();
if (tradeData.hasKey("AuctionClaims")) {
NBTTagList claimsList = tradeData.getTagList("AuctionClaims", 10);
for (int i = 0; i < claimsList.tagCount(); i++) {
AuctionClaim claim = AuctionClaim.fromNBT(claimsList.getCompoundTagAt(i));
if (!claim.claimed) {
claims.add(claim);
}
}
}
}
public void writeToNBT(NBTTagCompound compound) {
NBTTagCompound tradeData = new NBTTagCompound();
// Currency - always save built-in currency data (preserved even when using Vault)
tradeData.setLong("CurrencyBalance", this.balance);
tradeData.setLong("CurrencyLifetimeEarned", this.lifetimeEarned);
tradeData.setLong("CurrencyLifetimeSpent", this.lifetimeSpent);
// Claims
NBTTagList claimsList = new NBTTagList();
for (AuctionClaim claim : claims) {
if (!claim.claimed) {
claimsList.appendTag(claim.writeToNBT(new NBTTagCompound()));
}
}
tradeData.setTag("AuctionClaims", claimsList);
compound.setTag(NBT_KEY, tradeData);
}
}
@@ -426,7 +426,7 @@ public class RoleTrader extends RoleInterface {
// Player balance
PlayerData data = PlayerData.get(player);
compound.setLong("Balance", data.currencyData.getBalance());
compound.setLong("Balance", data.tradeData.getBalance());
// Stock info
compound.setBoolean("StockEnabled", stock.enableStock);
@@ -65,6 +65,7 @@ import noppes.npcs.api.gui.ICustomGui;
import noppes.npcs.api.handler.IAbilityHandler;
import noppes.npcs.api.handler.IActionManager;
import noppes.npcs.api.handler.IAnimationHandler;
import noppes.npcs.api.handler.IAuctionHandler;
import noppes.npcs.api.handler.IAttributeHandler;
import noppes.npcs.api.handler.ICloneHandler;
import noppes.npcs.api.handler.ICustomEffectHandler;
@@ -90,6 +91,7 @@ import noppes.npcs.config.ConfigScript;
import noppes.npcs.constants.EnumAnimationPart;
import noppes.npcs.containers.ContainerNpcInterface;
import noppes.npcs.controllers.AnimationController;
import noppes.npcs.controllers.AuctionController;
import noppes.npcs.controllers.ChunkController;
import noppes.npcs.controllers.CustomEffectController;
import noppes.npcs.controllers.DialogController;
@@ -385,6 +387,15 @@ public class NpcAPI extends AbstractNpcAPI {
return TelegraphController.Instance.create(type);
}
@Override
public IAuctionHandler getAuctions() {
this.checkWorld();
if (!noppes.npcs.config.ConfigMarket.AuctionEnabled) {
return null;
}
return AuctionController.getInstance();
}
@Override
public String[] getAllBiomeNames() {
List<String> biomes = new ArrayList<>();
@@ -901,36 +901,36 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
@Override
public long getCurrencyBalance() {
return getData().currencyData.getBalance();
return getData().tradeData.getBalance();
}
@Override
public void setCurrencyBalance(long amount) {
getData().currencyData.setBalance(amount);
getData().tradeData.setBalance(amount);
}
@Override
public boolean depositCurrency(long amount) {
return getData().currencyData.deposit(amount);
return getData().tradeData.deposit(amount);
}
@Override
public boolean withdrawCurrency(long amount) {
return getData().currencyData.withdraw(amount);
return getData().tradeData.withdraw(amount);
}
@Override
public boolean canAffordCurrency(long amount) {
return getData().currencyData.canAfford(amount);
return getData().tradeData.canAfford(amount);
}
@Override
public boolean isUsingVaultCurrency() {
return getData().currencyData.isUsingVault();
return getData().tradeData.isUsingVault();
}
@Override
public String getFormattedCurrencyBalance() {
return getData().currencyData.formatBalance();
return getData().tradeData.formatBalance();
}
}