Commit Graph
3380 Commits
Author SHA1 Message Date
Kam 692b985237 Cleanup for Langs + Abilities 2026-01-20 23:50:42 -05:00
Kam 04e2a57cb4 Auction Merge 2026-01-20 21:07:18 -05:00
Kam 384b61832d Hitbox Fixes 2026-01-19 16:29:24 -05:00
Kam 0328be57eb Add BukkitUtil, VaultUtil for Future Economy Handling 2026-01-12 12:50:08 -05:00
Kam 63c704f80a Fix Compile 2026-01-12 05:55:49 -05:00
Kam ff5ce2f556 Add Ability Hooks to NPCs 2026-01-11 20:35:53 -05:00
Kam 276465a175 Merge branch 'ability' into dev 2026-01-11 20:35:45 -05:00
Kam 11808df036 Script Hook Handler 2026-01-11 17:15:13 -05:00
Kam cc94773845 Merge pull request #250 from KAMKEEL/review-ability-system-variables-in-custom-npc+
Refactor ability logic: remove vertical KB, add teleport modes, cutter/guard updates, collision & sounds
2026-01-11 16:05:00 -05:00
Kam 828e99d427 Revise ability logic and configs 2026-01-11 16:04:49 -05:00
Kam 3dc56aba06 Update api 2026-01-10 23:06:39 -05:00
Kam a0184206bf Update api 2026-01-10 23:06:30 -05:00
Kam fdb2ff98d8 Large Ability changes, cleanup, langs, fixes. 2026-01-10 23:06:13 -05:00
Claude c7d04cb9d3 Simplify ability interrupt logic and reorganize GUI
- Remove interruptThreshold field entirely - interrupts now based on damage source type
- Update canInterrupt() to only allow interrupts from direct physical hits (not magic/fire/explosions)
- Interruption only occurs during WINDUP phase, not ACTIVE
- Reorganize SubGuiAbilityConfig into 4 tabs: General, Type, Target, Effects
- Increase GUI size to 420x216 for better layout
2026-01-10 10:32:24 +00:00
Claude b40fec2270 Clean up imports to use short class names
Replace fully qualified class names with proper imports in ability files:
- Added cpw.mods.fml.relauncher.Side and SideOnly imports
- Added IAbilityConfigCallback and SubGuiAbilityConfig imports
- Added SubGuiAbility* imports for each ability type
- Replaced @cpw.mods.fml.relauncher.SideOnly(...) with @SideOnly(Side.CLIENT)
- Replaced fully qualified return types with short class names
2026-01-10 10:03:10 +00:00
Claude f28d3483e6 Refactor Ability GUI to support third-party extensibility
This refactoring allows third-party mods to provide their own custom GUI
for ability type settings by extending SubGuiAbilityConfig.

Changes:
- Refactored SubGuiAbilityConfig as base class with GuiMenuTopButton tabs
- Added virtual methods: initTypeTab(), handleTypeButton(), handleTypeTextField()
- Added createConfigGui() method to Ability base class for GUI instantiation
- Created 15 SubGuiAbility* subclasses in new ability package
- Updated GuiNPCAbilities and GuiNpcManageAbilities to use ability.createConfigGui()

Third-party mods can now:
1. Create a custom Ability subclass
2. Extend SubGuiAbilityConfig with their own GUI
3. Override createConfigGui() to return their custom GUI
2026-01-10 09:48:37 +00:00
Kam 479a2c5384 Update api 2026-01-10 02:17:00 -05:00
Kam bd9e0fdf43 Update api 2026-01-10 02:16:49 -05:00
Kam 18bab07f33 Fix Slam 2026-01-09 16:22:39 -05:00
Kam 166c8aa228 Ability Push 2026-01-09 15:29:00 -05:00
Kam 3e85557984 Update api 2026-01-06 15:15:44 -05:00
bigguy345 60af203165 Renamed to moveFromGlobalToLocal 2026-01-05 20:32:18 +02:00
bigguy345 e8ef60deb4 Important IAnimation takeTasksFrom global instance in AnimationController to local instance in entity AnimationData 2026-01-05 20:25:34 +02:00
bigguy345 db0aa94a3a IAnimation instead of Animation 2026-01-05 20:17:55 +02:00
bigguy345 eb660b38ae Added IAnimation consumers to API 2026-01-05 17:14:45 +02:00
bigguy345 a39178c75b Animation Data Store (for cross event/frame data handling) 2026-01-05 16:54:41 +02:00
bigguy345 68681931f8 Animation Data Store (for cross event/frame data handling) 2026-01-05 16:53:58 +02:00
bigguy345 a33acee117 Added Animation task consumers (much better than animation events) 2026-01-05 16:49:48 +02:00
Kam db14662e90 Fix auction GUI tab actions 2026-01-04 20:10:58 -05:00
Kam eb67763d77 Merge pull request #247 from KAMKEEL/fix-auction-gui-layout-and-logic
Show auction inventory only on Create tab; widen and reflow Auction GUI
2026-01-04 15:59:25 -05:00
Kam bc7e768d5f Show auction inventory only on create tab 2026-01-04 15:59:01 -05:00
Claude e7f6177be8 Add Auctioneer role to NPC GUI and connect auction system
- Add Auctioneer to role dropdown in GuiNpcAdvanced
- Create GuiNpcAuctioneer setup GUI for configuring:
  - Tab visibility (browse, my listings, my bids, claims)
  - Player actions (create, bid, buyout)
  - Custom welcome/disabled messages
- Add PlayerAuction container handler in CommonProxy
- Add PlayerAuction GUI handler in ClientProxy
- Add all role.auctioneer lang keys to en_US.lang
2026-01-04 20:37:00 +00:00
Kam 7b42ad7796 Merge pull request #246 from KAMKEEL/review-and-fix-auction-trader-market-system
Harden auctions and trader flows: validation, UI safety, admin cancel/refund, and config fixes
2026-01-04 15:21:28 -05:00
Kam d657bab73c Harden auction display and trader stock init 2026-01-04 15:21:11 -05:00
Claude 77c8e418eb Update market plan doc: convert to implementation status recap
- Changed from planning document to status tracking document
- Documented completed phases (2-6)
- Documented not yet implemented phases (1, 7)
- Documented removed features (categories, separate controllers)
- Added file inventory and localization keys reference
- Added design decisions summary
- Added next steps section
2026-01-04 10:29:57 +00:00
Claude 740c2852e5 Refactor auction system: consolidate controllers, add lang keys, remove categories
- Consolidate AuctionLogger and AuctionNotificationController into AuctionController
- Add inline logging and notification methods to AuctionController
- Add comprehensive LANG keys for all auction GUI strings
- Update EnumAuctionSort and EnumAuctionDuration to use lang keys
- Remove category filtering system (EnumAuctionCategory deleted)
- Update AuctionFilter to remove category references
- Update GuiAuction and all sub-GUIs to use StatCollector.translateToLocal()
- Update AuctionListing to remove category field and NBT serialization
2026-01-04 10:26:56 +00:00
Claude a1de79053b Implement Phase 6: GUI components, notifications, and logging system
Add auction GUI components:
- GuiAuction: Main auction browse interface with search, categories,
  sorting, pagination, and live countdown timers
- SubGuiAuctionBid: Bid placement dialog with quick bid buttons
- SubGuiAuctionCreate: Listing creation form with duration options
- SubGuiAuctionDetails: Item details view with 2x scaled rendering
- ContainerAuction: Container class for auction GUI inventory

Add notification system:
- AuctionNotificationController: Handles real-time notifications
- Supports outbid, won, sold, expired, cancelled events
- Queues notifications for offline players
- Sends pending notifications on player login

Add auction logging:
- AuctionLogger: Comprehensive logging to CNPC+ log system
- Logs all auction events (create, bid, buyout, expire, claim)
- Includes system startup and processing tick logs
- Admin action tracking

Integrate with existing systems:
- Initialize AuctionNotificationController on server start
- Hook player login for notification delivery
- Add logging calls to all AuctionController methods
2026-01-04 10:09:40 +00:00
Claude d09c6b0c81 Add auction filtering and sorting system
New files:
- EnumAuctionSort: Sorting options (price, time, name, bids, etc.)
- AuctionFilter: Search/filter criteria with builder pattern
- AuctionDataPacket: Large packet for server->client listing data

AuctionController changes:
- getFilteredListings(): Main filtering/pagination method
- sortListings(): Comprehensive sorting by various criteria
- quickSearch(): Convenience method for simple searches
- FilterResult: Pagination result container

AuctionListing changes:
- Added bidCount field with NBT persistence
- Added creationTime alias methods

AuctionActionPacket changes:
- QueryListings: Filter-based search
- QueryMyListings: Player's own listings
- QueryMyBids: Player's active bids
- QueryClaimable: Items ready to claim

NoppesUtil changes:
- Auction data storage and IAuctionData interface
- Client-side data handling for GUI integration
2026-01-04 09:33:29 +00:00
Claude 57f9b706bf Implement Phase 5: Network packets, permissions, and scripting API
- Add auction permission nodes (use, list, bid, buyout, admin)
- Create AuctionActionPacket for client-server communication
  - Supports: CreateListing, PlaceBid, Buyout, CancelListing, ClaimItem, ClaimProceeds
  - Includes permission checks and validation
- Register packet in PacketHandler
- Add auction scripting API methods to ScriptPlayer:
  - getAuctionListingCount()
  - getMaxAuctionListings()
  - hasAuctionClaims()
  - getAuctionClaimCount()
  - getActiveAuctionBidCount()
2026-01-04 08:57:13 +00:00
Claude c1dc58ae54 Implement Phase 4: Auction House core system
- Add auction enums:
  - EnumAuctionDuration.java - configurable auction durations (SHORT/MEDIUM/LONG/VERY_LONG)
  - EnumAuctionStatus.java - listing statuses (ACTIVE/SOLD/EXPIRED/CANCELLED/CLAIMED)
  - EnumAuctionCategory.java - auto-categorization of items for browsing

- Add AuctionListing.java data class:
  - Complete auction listing with seller/bidder tracking
  - Pricing with starting price, buyout price, current bid
  - Timing with snipe protection (extends TO X minutes, not by)
  - Item validation (checks trade restrictions and blacklist)
  - Previous bidder tracking for refund notifications
  - NBT serialization for persistence

- Add AuctionController.java:
  - Global auction house management
  - Create/cancel/finalize listings
  - Bid placement with automatic outbid refunds via claims system
  - Buyout support with immediate sale
  - Claim system for sellers (proceeds) and buyers (items)
  - Search and filter by category/name
  - Periodic expiration processing
  - Persistence via auctions.dat

- Add RoleAuctioneer.java NPC role:
  - Configurable tabs (listings, my listings, my bids, claims)
  - Configurable permissions (create, bid, buyout)
  - Custom welcome/disabled messages
  - Opens auction GUI on interaction

- Update ConfigMarket.java:
  - Duration-specific settings (hours and fees)
  - Removed deprecated AvailableDurations string

- Update EnumRoleType.java - add Auctioneer
- Update EnumGuiType.java - add PlayerAuction, SetupAuctioneer
- Update DataAdvanced.java - handle Auctioneer role creation
- Update CustomNpcs.java - initialize AuctionController
2026-01-04 08:43:55 +00:00
Claude dc9d15f3e3 Implement Phase 3: Item Attributes & Restrictions
- Add ItemTradeAttribute.java for trade restriction utilities
  - TAG_UNTRADEABLE for items that cannot be traded
  - Check existing TAG_PROFILE_SLOT and TAG_SOULBIND tags
  - canTrade() checks all three restriction types
  - getTradeBlockReason() returns localization key for UI
  - Utility methods for setting/getting each restriction type
  - clearAllRestrictions() and getRestrictionSummary() helpers

- Add AuctionBlacklist.java controller
  - Blacklist items by registry name (e.g., "minecraft:diamond_sword")
  - Blacklist entire mods by mod ID (e.g., "minecraft")
  - Blacklist items with specific NBT tags (supports dot notation)
  - isBlacklisted() and getBlacklistReason() for checking
  - Persistence via auction_blacklist.dat
  - Add/remove methods for each blacklist type

- Initialize AuctionBlacklist in CustomNpcs.java

- Add scripting API methods to ScriptItemStack.java
  - canTrade() - check if item can be traded
  - getTradeBlockReason() - get block reason
  - isUntradeable() / setUntradeable() - manage untradeable flag
  - isProfileSlotBound() / getProfileSlot() / setProfileSlotBound()
  - isSoulbound() / getSoulbindOwner() / removeSoulbind()
  - clearTradeRestrictions() - remove all restrictions
  - getRestrictionSummary() - human-readable summary
2026-01-04 08:34:45 +00:00
Claude c9f77bed05 Implement Phase 2: Trader Enhancements with stock and currency system
- Add EnumStockReset.java for stock reset timing types
  - NONE, MCDAILY, MCWEEKLY, MCCUSTOM (MC time)
  - RLDAILY, RLWEEKLY, RLCUSTOM (real time)
  - Helper methods for interval calculation and display formatting

- Add TraderStock.java for stock management
  - Per-slot stock limits with -1 for unlimited
  - Per-player vs per-server stock tracking modes
  - Automatic reset timer with configurable intervals
  - PlayerTraderStock inner class for per-player tracking
  - NBT serialization for persistence

- Modify RoleTrader.java to support stock and currency
  - Add TraderStock instance for stock management
  - Add useCurrency flag and slotPrices array for virtual currency
  - Auto-check for stock reset on interact()
  - Helper methods: hasStock(), getAvailableStock(), consumeStock()
  - Helper methods: getSlotPrice(), setSlotPrice(), hasSlotPrice()
  - getTimeUntilResetFormatted() for GUI display

- Modify ContainerNPCTrader.java for transactions
  - Check stock availability before purchase
  - Handle virtual currency purchases via CurrencyController
  - Fall back to item-based currency when useCurrency disabled
  - Consume stock after successful purchase
2026-01-04 08:29:03 +00:00
Claude 60b985d33d Fix currency storage to use main PlayerData file
- Currency now stored in main player save file, not separate file
- Currency excluded from getNBT/setNBT (slot-specific data)
- Currency saved in save() after getNBT(), loaded before setNBT()
- This ensures currency is preserved during profile slot changes
- Removed loadCurrency() and saveCurrency() separate file methods
- Updated VaultHelper to call save() instead of saveCurrency()
2026-01-04 08:23:50 +00:00
Claude 7e6b17c106 Implement Phase 1: Currency System foundation
- Add ConfigMarket.java with separate market.cfg config file
  - Currency settings (name, starting balance, max balance, Vault integration)
  - Auction settings (durations, fees, snipe protection, claim expiration)
  - Trader settings (stock system defaults)

- Add PlayerCurrencyData.java for balance storage
  - NOT profile slot bound - shared across all slots
  - Tracks balance, lifetime earned, and lifetime spent
  - Deposit/withdraw with overflow protection

- Add VaultHelper.java for Bukkit hybrid server integration
  - Reflection-based VaultAPI integration
  - Falls back to internal currency when Vault unavailable
  - Supports getBalance, deposit, withdraw, transfer operations

- Add CurrencyController.java for currency operations
  - Claims system for auction refunds and NPC payments
  - Claim expiration with configurable days
  - Persistence via currency_claims.dat

- Update PlayerData.java to integrate currency
  - Separate loadCurrency/saveCurrency methods
  - Currency file stored separately from slot data

- Add scripting API methods to ScriptPlayer.java
  - getCurrencyBalance(), addCurrency(), removeCurrency()
  - canAffordCurrency(), getCurrencyName(), formatCurrency()
  - hasPendingClaims(), getPendingClaimsTotal(), claimAllCurrency()
2026-01-04 08:14:29 +00:00
Claude 4093bf9adf Move market configs to main.cfg with dedicated categories
Configuration now uses the main config file with nested categories:
- market (main category)
  - market.currency (currency system settings)
  - market.auction (auction house settings)
  - market.trader (trader stock settings)

This keeps all market/economy settings in one place within the
existing main configuration file.
2026-01-04 07:56:30 +00:00
Claude cdf30af20c Add auction configuration, timing rules, and finalize design decisions
Design Decisions Added:
- Modify Bid feature: auto-reclaim and re-bid from claims
- Default 5 auction slots per player (configurable)
- 30-day claim expiration (configurable)
- Percentage-based minimum bid increment (configurable)
- Snipe protection: extend TO 5 minutes when bid near end (configurable)
- Auction durations: 2h, 12h, 24h, 48h (configurable)

Item Restrictions Updated:
- Reuse existing ProfileSlotRequirement (cnpc_profile_slot NBT tag)
- Reuse existing SoulbindRequirement (cnpc_soulbind NBT tag)
- Add new CNPC_Untradeable attribute

Configuration Reference Added:
- Full auction.cfg with all settings
- Currency configuration
- Trader stock configuration
- Complete permission nodes table

Updated conclusion with all finalized decisions.
2026-01-04 07:49:44 +00:00
Claude c647179c26 Update CNPC 1.11 Market Plan with design decisions
- Add confirmed design decisions section based on discussion:
  - Outbid refunds go to claims (not direct balance)
  - Use existing CustomNPC+ permission system pattern
  - Currency is NOT profile slot bound (shared across slots)
  - Use existing gold coin (CustomItems.coinGold) for display
  - Stock reset timer shown as banner ABOVE trader GUI

- Add Feature 4: Item Attributes & Restrictions
  - Untradeable, SlotBound, SoulBound item attributes
  - Auction house item blacklist system (by item, mod, NBT tag)

- Add Feature 5: Admin Auction Management
  - Admin GUI for viewing/managing all listings
  - Force cancel, edit, end auctions early
  - Blacklist management GUI
  - Audit logging for admin actions

- Update implementation phases (now 5 phases)
- Update file summary with new files
- Update testing strategy with new test cases
- Update API/scripting extensions with item attribute methods
2026-01-04 07:37:28 +00:00
Kam a1461665d1 Update api 2026-01-04 02:30:39 -05:00
Kam c5c35a1113 Update api 2026-01-04 02:10:58 -05:00
Kam 1eef2f871a Merge remote-tracking branch 'origin/claude/plan-market-updates-od0M1' into dev 2026-01-04 02:10:43 -05:00