Commit Graph

570 Commits

Author SHA1 Message Date
Kiran Hart
961eee800e
Merge remote-tracking branch 'origin/main' 2023-08-15 15:50:02 -04:00
Kiran Hart
9f9a3bd3f4
Merge pull request #69 from potatoru/regex-pstat
Pstat placeholder parse improvement
2023-08-15 15:49:37 -04:00
Alexander Morozov
6cef9f7181 Use regex to match pstat player name 2023-08-15 10:57:14 +11:00
Kiran Hart
1ef68e8c5a
fix variables
Took 1 minute
2023-08-11 10:08:12 -04:00
Kiran Hart
d4beb618ec
block filter menu search behind cmd perm (auctionhouse.cmd.search). Closes #67
Took 2 minutes
2023-08-11 09:56:26 -04:00
Kiran Hart
043975cc47
🗃️ fixed transaction list not filtering properly until you click refresh
Took 1 minute
2023-08-11 09:53:16 -04:00
Kiran Hart
ebd443075e
📚 fix enchantment searching on books
Took 11 minutes
2023-08-11 09:50:23 -04:00
Kiran Hart
38f17da446
🍾 fix splash potions not being categorized under the potion category
Took 20 seconds
2023-08-11 09:16:50 -04:00
Kiran Hart
0af9c3e752
🏷️ adjust variables for transaction view menu
Took 2 minutes
2023-08-11 09:16:17 -04:00
Kiran Hart
58b17ae27f
🚪 fix back button icon for transaction menu type (Closes #68)
Took 3 minutes
2023-08-11 09:06:01 -04:00
Kiran Hart
20fe5f7798
🔄️ call bid event from custom amount w/o confirm synchronously
Took 7 minutes
2023-08-08 18:07:33 -04:00
Kiran Hart
56cef59c37
remove tick delay on listing create
Took 2 minutes
2023-08-07 18:49:19 -04:00
Kiran Hart
d42054968d
🔎 revert match regex for searching
Took 6 minutes
2023-08-03 20:15:09 -04:00
Kiran Hart
0ced08ddce
🪙 use new UltraEconomy methods
Took 9 minutes
2023-07-30 19:01:51 -04:00
Kiran Hart
bf5803f342
🪲 fix bug where players can still cancel items with bids on them using the end all button
Took 4 minutes
2023-07-30 18:21:49 -04:00
Kiran Hart
fce9b5b753
Meteor Client Dupe Fix regarding crafting packet
Took 1 minute
2023-07-23 18:34:17 -04:00
Kiran Hart
bc6fa36ea9
🌍 add translation node: general.cannot cancel item with bid
Took 5 minutes
2023-07-21 10:53:13 -04:00
Kiran Hart
106ad885df
🔢 fix model data not working in payment collection menu. Closes #64
Took 3 minutes
2023-07-21 10:43:01 -04:00
Kiran Hart
cef0913984
🐛 ensure that when using realistic bidding & force custom amt, it checks if inputted # is curr + bid inc
Took 3 minutes
2023-07-11 19:15:35 -04:00
Kiran Hart
a06fcf59f2
🐛 fix bug where you can press esc + confirm list button and item will remain in inv but be listed
Took 3 minutes
2023-07-11 19:00:38 -04:00
Kiran Hart
fff6a3f9be
🎨 remove force &f color in getItemName method for items that don't have a custom/coloured name
Took 57 seconds
2023-07-02 18:32:13 -04:00
Kiran Hart
df128270a7
🪶 fix weird lore "dupe" in gui when removing min item prices
Took 2 minutes
2023-07-02 18:29:56 -04:00
Kiran Hart
810444f886
🪶 use flights shaded nptapi instead of having to shade separately
Took 2 minutes
2023-06-20 19:38:40 -04:00
Kiran Hart
9cbc501bdb
🧹 import cleanup
Took 27 seconds
2023-06-20 19:30:56 -04:00
Kiran Hart
ff715baacc
🗃️ transactions filter options
Took 24 minutes
2023-06-20 19:30:17 -04:00
Kiran Hart
0040ae890b
add auctionhouse.auctionchestbypass permission
Took 1 minute
2023-06-20 18:45:48 -04:00
Kiran Hart
f124de2d6b
remove "middleware" checks for some admin commands
Took 7 minutes
2023-06-20 18:42:46 -04:00
Kiran Hart
f9e4cf63e7
1️⃣2️⃣0️⃣ nbt api migration
Took 35 minutes

Took 11 seconds
2023-06-16 08:45:14 -04:00
Kiran Hart
8eb35b7935
🔨 adjust match regex to not be stupid
Took 3 minutes
2023-06-09 16:34:05 -04:00
Kiran Hart
6cb03727d8
🍶 added potions / potion ingredient filter
Took 11 minutes
2023-06-06 18:05:51 -04:00
Kiran Hart
491c8ec4a8
📦 when closing the sell menu (auction/bin) with a bundled listing, if the action was to rejoin, it will give the player the extracted bundle.
Took 3 minutes
2023-06-06 17:47:31 -04:00
Kiran Hart
6071bad99a
➡️ added placeholderapi support to all gui item names and lore
Took 7 minutes
2023-06-02 10:06:59 -04:00
Kiran Hart
29daef5deb
🧹 code cleanup, reduce usage of flight
Took 10 minutes
2023-05-19 09:52:05 -04:00
Kiran Hart
4c67437988
🚫 Finished bid clearing cmd, Closes #49
Took 3 minutes
2023-05-10 20:24:07 -04:00
Kiran Hart
75121ef290
🚫 add clear bids admin command
Took 8 minutes
2023-05-10 20:12:56 -04:00
Kiran Hart
31364807b9
🎶 fixed double sound for page navigation. Closes #58
Took 5 minutes
2023-05-07 19:11:07 -04:00
Kiran Hart
2f6e1ac783
🪲 fixed date range deletion bug. Closes #57
Took 2 minutes
2023-05-05 10:14:43 -04:00
Kiran Hart
67aa3fc6ae
🏷️ Added setting to block sale of items that contain specific NBT tags. Closes #48
Took 4 minutes
2023-04-28 13:35:33 -04:00
Kiran Hart
7c49d17d16
🪲 Fixed bug where when cancelling a listing confirmation for bundled items, it will give the bundle item rather than the individual items
Took 16 minutes
2023-04-28 13:27:39 -04:00
Kiran Hart
b20443feff
🟥🟩 Added option to disable buy out by default in auction sell menu. Closes #31, also Closes #28 from previous commit
Took 4 minutes

Took 18 seconds
2023-04-28 12:07:40 -04:00
Kiran Hart
32531c548c
🪲 Previous commit for issue #52 seemed to have resolved #53 as well. Closes #53 Re-Open if still occurs
Took 56 seconds
2023-04-28 12:00:22 -04:00
Kiran Hart
96a6a5a8d2
🪲 Fixed bid increment logic to make more sense when using realistic bidding mode. Closes #52
Took 15 minutes
2023-04-28 11:54:35 -04:00
Kiran Hart
348fa536d9
🪧 When buyout is toggled, it resets prices if bin is lower than starting, also disabling buy now hides buy now price. Closes #54
Took 4 minutes
2023-04-18 13:49:41 -04:00
Kiran Hart
cdca7755de
🪧 #54 starting bid error message if higher than buyout instead of divide by 2 update.
Took 3 minutes
2023-04-18 13:37:22 -04:00
Kiran Hart
cacb02c25e
🗑️ /ah admin clear, clears collection bin aswell. Closes #55
Took 3 minutes
2023-04-18 13:28:40 -04:00
Kiran Hart
44cbcae4af
🚫⬅️ aesthetic fix first page, previous page button showing after returning from 2nd. Closes #50
Took 7 minutes
2023-04-18 13:19:10 -04:00
Kiran Hart
24f1d9430a
⬅️➡️ Added unique button for actual back navigation (back to another gui not prev page). Closes #51
Took 11 minutes
2023-04-18 13:04:38 -04:00
Kiran Hart
302f3d76dd
🧹 AUTO_REFRESH_DOES_SLOT_CLEAR setting, closes #56
Took 6 minutes
2023-04-18 12:44:14 -04:00
Kiran Hart
d4e91f5dc1
📐 /ah admin clear <player> <returnItems> <giveBidMoneyBack>
Took 11 minutes
2023-04-07 15:56:28 -04:00
Kiran Hart
768e234c88
🔢 Fix negative bidding
Took 3 minutes
2023-04-07 15:15:28 -04:00
Kiran Hart
3763d3d04f
🪲 give cloned item #24
Took 2 minutes
2023-04-05 19:33:02 -04:00
Kiran Hart
1cb0a8d112
🪲 Fix double sending of discord webhook for listing
Took 6 minutes
2023-03-31 15:39:10 -04:00
Kiran Hart
f4f1c942b0
adjust order for dealing with confirm listing death return
Took 13 minutes
2023-03-29 00:55:55 -04:00
Kiran Hart
b40f1068d3
🏷️ auctionhouse.useauctionchest permission for chest usage
Took 1 minute
2023-03-27 18:20:28 -04:00
Kiran Hart
e819953e87
🪲 Fixed bug with payment collection giving wrong user payment
Took 6 minutes
2023-03-26 18:46:12 -04:00
Kiran Hart
cceb6d719d
fix logic back for bundle limit (part of 2.91)
Took 6 minutes
2023-03-24 16:10:08 -04:00
Kiran Hart
fa965583d4
🪲 Fixed transaction final price
Took 2 minutes
2023-03-24 15:50:51 -04:00
Kiran Hart
14af0816e4
🪜 skip select listing type config option, closes #45
Took 5 minutes

Took 38 seconds
2023-03-24 15:40:46 -04:00
Kiran Hart
f44a855e0b
⚙️logic adjustment for bundle limit
Took 35 seconds
2023-03-24 15:24:01 -04:00
Kiran Hart
cdff6579a4
🪧 highest bidder prevent repeats setting
Took 4 minutes
2023-03-21 17:13:15 -04:00
Kiran Hart
a84084cb12
📦 bundle sell limit, closes #43
Took 7 minutes

Took 20 seconds
2023-03-21 16:58:02 -04:00
Kiran Hart
e089ba3445
📦 bundle inspect is 36 slots now, Closes #44
Took 58 seconds
2023-03-21 16:15:08 -04:00
Kiran Hart
eaa8c9812e
🔢 collection bin limit
Took 8 minutes
2023-03-19 02:27:38 -04:00
Kiran Hart
17865973b7
📦 bundle auto open on claim, closes #42
Took 8 minutes

Took 19 seconds
2023-03-19 02:13:06 -04:00
Kiran Hart
c898ddd77f
🪲 resolve custom model data issues, also last commit closes #40
Took 17 minutes

Took 3 minutes
2023-03-14 19:17:59 -04:00
Kiran Hart
bd305d7510
🌠 Fix some meteor client dupe stuff
Took 19 seconds
2023-03-13 18:52:04 -04:00
Kiran Hart
8aa840ef0d
🌠 move meteor client checks into own listener class
Took 13 minutes
2023-03-13 18:51:34 -04:00
Kiran Hart
4b536fa1a8
🌠 fix meteor client issues (off hand swap, and .item head)
Took 7 minutes
2023-03-11 17:37:23 -05:00
Kiran Hart
d30642daaa
🏷️ item_name, from_name, payment_reason added to payment item
Took 37 minutes
2023-03-11 16:45:16 -05:00
Kiran Hart
ff0614a6b6
🐛 fix bug where auction buy now price during broadcast shows current price over actual purchase price
Took 4 minutes
2023-03-10 00:11:21 -05:00
Kiran Hart
f5cdca095d
🗝️ HIGHEST_BID_PREVIEW stack type
Took 3 minutes
2023-03-10 00:02:32 -05:00
Kiran Hart
1ff6ecf5e1
🔄️ remove task
Took 23 seconds
2023-03-09 23:57:00 -05:00
Kiran Hart
744bb74717
🪧 winning bids gui
Took 15 seconds
2023-03-09 23:56:19 -05:00
Kiran Hart
344976203d
🧰 chestshop listener
Took 14 minutes
2023-03-09 23:55:48 -05:00
Kiran Hart
64d140c40c
force assign player instance in AuctionPlayer if null
Took 4 minutes
2023-03-06 13:16:15 -05:00
Kiran Hart
234e84b76d
🔘 add payment collection to collection bin gui
Took 3 minutes
2023-03-03 13:14:00 -05:00
Kiran Hart
74b9df8e92
🎓 payment collection done
Took 3 minutes
2023-03-03 13:03:37 -05:00
Kiran Hart
ddae21c659
⚙️payment settings and command
Took 11 minutes
2023-03-03 12:50:42 -05:00
Kiran Hart
35579ebe44
🪧 adjust sell command logic to use different values depending on force auction settings and buy now settings
Took 5 minutes
2023-03-03 12:01:04 -05:00
Kiran Hart
44e026c211
🏷️ processSell() on listing confirm exit (by esc)
Took 3 minutes
2023-03-03 11:45:40 -05:00
Kiran Hart
10f3607c29
🗝️ call AuctionHouse.getInstance().getDataManager().insertAuctionPayment(new AuctionPayment(... in appropriate places
Took 5 minutes
2023-02-28 23:31:50 -05:00
Kiran Hart
54983ba4a7
👩‍💼 add payment manager
Took 10 seconds
2023-02-28 23:19:05 -05:00
Kiran Hart
4969101072
🏧 add pay(Player player) to AuctionPayment
Took 4 minutes
2023-02-28 23:18:55 -05:00
Kiran Hart
4122316d63
💵 register payment migration 17
Took 20 seconds
2023-02-28 23:12:58 -05:00
Kiran Hart
1fafa40cc9
💵 payments database methods
Took 16 seconds
2023-02-28 23:12:30 -05:00
Kiran Hart
2cb0a5961c
🦆 payments migration
Took 9 minutes
2023-02-28 23:12:07 -05:00
Kiran Hart
dc0dd49560
🪲 Fix regarding infinite items losing their original stack size. Possibly resolves #24, needs confirmation
Took 4 minutes
2023-02-26 18:30:54 -05:00
Kiran Hart
6895ed8a89
☠️Clear item being listed on death to prevent give back on quit
Took 6 minutes
2023-02-26 13:43:29 -05:00
Kiran Hart
0023205147
💨 Fixed bug when force custom bid amount is enabled, clicking to bid on an item would essentially just do nothing
Took 34 seconds
2023-02-23 13:13:26 -05:00
Kiran Hart
fc6574efb9
🐛fixed bug where users can bypass sell limit when using the list button within the main gui
Took 3 minutes

Took 4 minutes
2023-02-23 13:12:44 -05:00
Kiran Hart
acae464405
add %remaining_total_hours% variable to auction stack listings
Took 12 minutes
2023-02-22 16:58:49 -05:00
Kiran Hart
455bca58b7
🪧 redid the entire discord webhook settings
Took 1 hour 4 minutes
2023-02-21 19:04:11 -05:00
Kiran Hart
df86434f13
🎨 Added custom head support by texture url to all legacy guis
Took 2 minutes
2023-02-21 13:48:27 -05:00
Kiran Hart
64efb62737
switch .size() <= 0 to isEmpty()
Took 1 minute
2023-02-21 13:41:19 -05:00
Kiran Hart
85ec3f32d7
🐛 fix bug where players can't use /ah sell after their first sell w.o relogging (caused by setting regarding opening main ah gui after confirm/list)
Took 1 minute
2023-02-21 13:31:07 -05:00
Kiran Hart
8b7084623f
🩹 patch for meteor client no packet close (death+confirm menu)
Took 4 minutes
2023-02-20 16:27:24 -05:00
Kiran Hart
1dfd00dbcb
8️⃣ enforce utf-8 within stream write
Took 2 minutes
2023-02-19 09:31:01 -05:00
Kiran Hart
c91ace0804
🧳 meteor client no packet close work around
Took 2 minutes
2023-02-18 09:56:56 -05:00
Kiran Hart
4bcefadb1a
fix cancel bug giving item despite not taking it
Took 5 minutes
2023-02-17 13:56:14 -05:00
Kiran Hart
f97007e428
add processing state, prevent player from dropping item or switching hotbar slots while listing is in process
Took 32 seconds
2023-02-17 07:36:06 -05:00
Kiran Hart
4cd6bc7ea5
force close inv if open listing menu after list / confirm is off
Took 16 minutes
2023-02-17 07:35:32 -05:00
Kiran Hart
07a5f22ff4
🟢 added additional permissions to admin gui
Took 1 minute
2023-02-15 10:36:19 -05:00
Kiran Hart
336c8ef5a6
📄 show listing error console setting
Took 2 minutes

Took 26 seconds
2023-02-14 13:40:04 -05:00
Kiran Hart
44eeaf4090
adjust default creation delay to 2 ticks, check if main thread b4 calling auction event
Took 3 minutes
2023-02-14 13:37:29 -05:00
Kiran Hart
e3a41dd64c
Add slight delay to auction creation
Took 7 minutes
2023-02-14 13:30:07 -05:00
Kiran Hart
0d441601ac
commit to move to new branch
Took 9 minutes
2023-02-12 11:56:16 -05:00
Kiran Hart
64ad7de626
+ Fixed bug where prompts would be active even after death
Took 4 minutes
2023-02-11 23:29:33 -05:00
Kiran Hart
36a7c9efd3
audio levels, use new quickitem model data of(string), seperate title for bundle listing palce items, simple compare for min item prices
Took 19 minutes
2023-02-04 13:15:55 -05:00
Kiran Hart
862e36f9f7
closes #36
Took 1 minute
2023-01-11 22:38:55 -05:00
Kiran Hart
16268bd795
2.82.0 *
Took 3 minutes
2023-01-07 16:44:42 -05:00
Kiran Hart
4616ad5cb9
🧹 Fixed some global replacement errors
Took 1 minute
2023-01-07 16:35:46 -05:00
Kiran Hart
8c8ffe3914
🔢 Added model data support to remaining gui elements
Took 13 minutes
2023-01-07 16:31:57 -05:00
Kiran Hart
4e0663c175
Alter listing requirement check stage, added cooldown checks to sell guis, Closes #35
Took 2 minutes
2023-01-02 13:46:21 -05:00
Kiran Hart
5b775f520e
add meetsListingRequirements to sell auction / bin guis. Closes #33
Took 2 minutes
2023-01-02 13:41:55 -05:00
Kiran Hart
5160de0f29
implement meetsListingRequirements into sell command and bundle creation
Took 1 minute
2023-01-02 13:39:56 -05:00
Kiran Hart
2258672bf1
extract item pre-listing requirements into meetsListingRequirements
Took 4 minutes
2023-01-02 13:37:56 -05:00
Kiran Hart
70c1cbd682
run bid event async in main auction gui
Took 20 seconds
2023-01-02 13:31:27 -05:00
Kiran Hart
89c3a6001a
add model data option to most items
Took 6 minutes
2023-01-02 13:30:07 -05:00
Kiran Hart
e8acf1d50f
replace old core XMaterial/XSound with Flight's version (renamed to Comp<Material/Sound>
Took 3 minutes
2022-12-16 14:27:48 -05:00
Jeremy
3d39499780
changed to one if instead of 2? 2022-12-13 20:50:03 -05:00
Kiran Hart
ff11baf719
Fixed issue where leaving the server while entering an input would cause item to dupe on rejoin, also clear titles on join
Took 8 minutes
2022-12-13 17:19:02 -05:00
Kiran Hart
e2309428f2
removed debug code for placeholder api chat replacement
Took 5 seconds
2022-12-08 13:26:29 -05:00
Kiran Hart
9eb5740fcd
removed debug code for placeholder api chat replacement
Took 37 seconds
2022-12-08 13:25:10 -05:00
Kiran Hart
553a290484
fix bug where when listing tax is enabled w/confirmation listing, if the player doesn't have enough money to complete listing it dupes the item.
Took 2 minutes
2022-12-07 11:57:10 -05:00
Kiran Hart
416003b410
closes #23 and #22
Took 5 minutes
2022-12-01 22:31:53 -05:00
Kiran Hart
bfeec5a242
force close the bundle menu when not using listing confirmation (#22)
Took 1 minute
2022-11-30 12:48:55 -05:00
Kiran Hart
7a3ec41ca8
fix issue where glass is being taken out of bottom row still
Took 2 minutes
2022-11-30 12:43:23 -05:00
Kiran Hart
47ae641695
fix %value% variable not being replaced during not a valid number msg
Took 47 seconds
2022-11-25 14:58:09 -05:00
Kiran Hart
685f9d445b
starting price will be set to min start price or half the buy out if starting price inputed is more than buyout
Took 2 minutes
2022-11-25 14:54:34 -05:00
Kiran Hart
ce13b5b452
#21 fixed /ah sell -b bug where glass panes could be removed and they were given on close as well 2022-11-25 14:25:15 -05:00
Kiran Hart
6ecb9bb204
#21 ad option to go back from final sell menu (option to go back place item menu) 2022-11-25 14:17:21 -05:00
Kiran Hart
13652e485f
extract some bundle stuff into its own util class
Took 24 minutes
2022-11-25 14:16:56 -05:00
Kiran Hart
4990d28ae3
#21 added more descriptive input (action bar for time units) 2022-11-25 13:58:21 -05:00
Kiran Hart
14cd5351f3
#21 add cancel word to title inputs 2022-11-25 13:57:53 -05:00
Kiran Hart
6748cf3090
#21 add option to use %remaining_days/hours/minutes/seconds% within clock (listing time) lore in sell menus 2022-11-25 13:44:19 -05:00
Kiran Hart
a63067ce85
#21 add return to auction house button to select listing type menu 2022-11-25 13:27:16 -05:00
Kiran Hart
7e41834d7d
fix bundles not saving all items (stopped using a hashset)
Took 25 seconds
2022-11-21 12:31:45 -05:00
Kiran Hart
7acef89912
add back legacy placeholder for money spent
Took 3 minutes
2022-11-21 12:30:50 -05:00
Kiran Hart
563493b946
remove unused settings from old sell gui/system
Took 2 minutes
2022-11-18 18:10:34 -05:00
Kiran Hart
1b22b3a225
project wide reformat/import cleanup
Took 21 seconds
2022-11-18 18:07:48 -05:00
Kiran Hart
667ea9e0ca
delete the selldev command
Took 44 seconds
2022-11-18 18:07:21 -05:00
Kiran Hart
356e850625
switch to title input for ranged deletion of transaction as well
Took 5 minutes
2022-11-18 18:05:41 -05:00
Kiran Hart
9af0b48e0c
use title prompts
Took 8 minutes
2022-11-18 17:56:54 -05:00
Kiran Hart
a57348c1bf
removed unused locale strings
Took 3 minutes
2022-11-18 17:45:31 -05:00
Kiran Hart
a1763f8a7f
remove old list auction method(s) from AuctionAPI, in favour of AuctionCreator
Took 13 minutes
2022-11-18 17:40:47 -05:00
Kiran Hart
d82ae6ae34
remove old sell gui, and implement new one where needed
Took 17 minutes
2022-11-18 17:18:00 -05:00
Kiran Hart
694e36f310
BIN item gui, the continue button now calls AuctionCreator#create (new way of creating listings)
Took 39 seconds
2022-11-18 16:47:28 -05:00
Kiran Hart
c8b55ba1d3
place item gui only returns the tick value instead of doing the currentMillis + 1000L * TICK calc
Took 35 seconds
2022-11-18 16:46:49 -05:00
Kiran Hart
7afb6b1da4
create AuctionCreator
Took 7 seconds
2022-11-18 16:46:07 -05:00
Kiran Hart
f4ae1dafeb
create listing result
Took 46 minutes
2022-11-18 16:45:57 -05:00