From af46b0c6b8d38d876e59e523d4af4c939053a988 Mon Sep 17 00:00:00 2001 From: vicisacat Date: Fri, 22 Mar 2024 08:43:08 +0100 Subject: start --- .../gui/auctions_gui/auction_type_widget/all.png | Bin 0 -> 268 bytes .../gui/auctions_gui/auction_type_widget/auctions.png | Bin 0 -> 271 bytes .../gui/auctions_gui/auction_type_widget/back.png | Bin 0 -> 220 bytes .../gui/auctions_gui/auction_type_widget/bin.png | Bin 0 -> 275 bytes .../gui/auctions_gui/auction_type_widget/hover.png | Bin 0 -> 142 bytes .../textures/gui/auctions_gui/browser/background.png | Bin 0 -> 1063 bytes .../gui/auctions_gui/browser/background_view.png | Bin 0 -> 837 bytes .../gui/auctions_gui/rarity_widget/background.png | Bin 0 -> 410 bytes .../textures/gui/auctions_gui/rarity_widget/hover.png | Bin 0 -> 137 bytes .../textures/gui/auctions_gui/sort_widget/back.png | Bin 0 -> 186 bytes .../textures/gui/auctions_gui/sort_widget/high.png | Bin 0 -> 295 bytes .../textures/gui/auctions_gui/sort_widget/hover.png | Bin 0 -> 143 bytes .../textures/gui/auctions_gui/sort_widget/low.png | Bin 0 -> 307 bytes .../textures/gui/auctions_gui/sort_widget/rand.png | Bin 0 -> 294 bytes .../textures/gui/auctions_gui/sort_widget/soon.png | Bin 0 -> 305 bytes .../skyblocker/textures/gui/sprites/down_arrow_even.png | Bin 0 -> 137 bytes .../skyblocker/textures/gui/sprites/up_arrow_even.png | Bin 0 -> 137 bytes src/main/resources/skyblocker.mixins.json | 5 ++++- 18 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/all.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/auctions.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/back.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/bin.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/hover.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/browser/background.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/browser/background_view.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/rarity_widget/background.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/rarity_widget/hover.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/back.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/high.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/hover.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/low.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/rand.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/soon.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/down_arrow_even.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/up_arrow_even.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/all.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/all.png new file mode 100644 index 00000000..8842041d Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/all.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/auctions.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/auctions.png new file mode 100644 index 00000000..1de6b9aa Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/auctions.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/back.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/back.png new file mode 100644 index 00000000..58e84c34 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/back.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/bin.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/bin.png new file mode 100644 index 00000000..b816a9fb Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/bin.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/hover.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/hover.png new file mode 100644 index 00000000..cb55b1f0 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/auction_type_widget/hover.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/browser/background.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/browser/background.png new file mode 100644 index 00000000..ca52a9e8 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/browser/background.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/browser/background_view.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/browser/background_view.png new file mode 100644 index 00000000..34bf95c4 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/browser/background_view.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/rarity_widget/background.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/rarity_widget/background.png new file mode 100644 index 00000000..d55e1973 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/rarity_widget/background.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/rarity_widget/hover.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/rarity_widget/hover.png new file mode 100644 index 00000000..81ca8ef0 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/rarity_widget/hover.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/back.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/back.png new file mode 100644 index 00000000..890b98d7 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/back.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/high.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/high.png new file mode 100644 index 00000000..4e8a455a Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/high.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/hover.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/hover.png new file mode 100644 index 00000000..eeb6b1c6 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/hover.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/low.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/low.png new file mode 100644 index 00000000..c53864fc Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/low.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/rand.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/rand.png new file mode 100644 index 00000000..d7dea847 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/rand.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/soon.png b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/soon.png new file mode 100644 index 00000000..d72acf59 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/auctions_gui/sort_widget/soon.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/down_arrow_even.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/down_arrow_even.png new file mode 100644 index 00000000..94243d0a Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/down_arrow_even.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/up_arrow_even.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/up_arrow_even.png new file mode 100644 index 00000000..2243bb95 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/up_arrow_even.png differ diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index 9f5f8240..9a911b86 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -52,5 +52,8 @@ ], "injectors": { "defaultRequire": 1 - } + }, + "mixins": [ + "accessor.SlotAccessor" + ] } -- cgit From 1afa4bfdf9c8fc4a80d252868d72001c7a34f185 Mon Sep 17 00:00:00 2001 From: vicisacat Date: Sun, 24 Mar 2024 17:47:39 +0100 Subject: localization and config --- .../resources/assets/skyblocker/lang/en_us.json | 23 +++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index b1f3df9f..bda6a909 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -11,6 +11,7 @@ "text.skyblocker.quit_config": "Changes Not Saved", "text.skyblocker.quit_config_sure": "Are you sure you want to quit editing the config? Changes will not be saved!", "text.skyblocker.quit_discard": "Quit & Discard Changes", + "text.skyblocker.confirm": "Confirm", "text.skyblocker.config": "Open Config...", "text.skyblocker.source": "Source", "text.skyblocker.website": "Website", @@ -168,6 +169,9 @@ "text.autoconfig.skyblocker.option.general.searchOverlay.historyLabel": "History:", "text.autoconfig.skyblocker.option.general.betterPartyFinder": "Better Party Finder", "text.autoconfig.skyblocker.option.general.fancyCraftingTable": "Fancy Crafting Table UI", + "text.autoconfig.skyblocker.option.general.betterAuctionHouse": "Better Auction House", + "text.autoconfig.skyblocker.option.general.betterAuctionHouse.enabled": "Enabled", + "text.autoconfig.skyblocker.option.general.betterAuctionHouse.highlightUnderAvgPrice": "Highlight BIN under average price", "skyblocker.itemTooltip.nullMessage": "§cItem price information on tooltip will renew in max 60 seconds. If not, check latest.log", "skyblocker.itemTooltip.noData": "§cNo Data", @@ -619,9 +623,26 @@ "skyblocker.partyFinder.deList": "Click to de-list", "skyblocker.partyFinder.join": "Click to join", + "skyblocker.fancyAuctionHouse.editBid": "Click to edit bid!", + "skyblocker.fancyAuctionHouse.price": "Price:", + "skyblocker.fancyAuctionHouse.newBid": "New Bid:", + "skyblocker.fancyAuctionHouse.buy": "Buy!", + "skyblocker.fancyAuctionHouse.bid": "Bid!", + "skyblocker.fancyAuctionHouse.cantAfford": "Can't Afford!", + "skyblocker.fancyAuctionHouse.alreadyTopBid": "Already Top Bid!", + "skyblocker.fancyAuctionHouse.differentProfile": "On a different profile", + "skyblocker.fancyAuctionHouse.didntWin": "Didn't win :(", + "skyblocker.fancyAuctionHouse.changeProfile": "Change Profile", + "skyblocker.fancyAuctionHouse.collectAuction": "Collect Auction", + "skyblocker.fancyAuctionHouse.collectBid": "Collect Bid", + "skyblocker.fancyAuctionHouse.auctionEnded": "Auction Ended!", + "skyblocker.fancyAuctionHouse.cancelAuction": "Cancel Auction", + "skyblocker.fancyAuctionHouse.yourAuction": "This is your auction!", + "skyblocker.fancyAuctionHouse.youPay": "You pay: %s", + "skyblocker.crimson.kuudra.noArrowPoison": "No Arrow Poison!", "skyblocker.crimson.kuudra.lowArrowPoison": "Low on Arrow Poison!", - + "skyblocker.waypoints.ordered.groupNonExistent": "§cThe waypoint group %s doesn't exist.", "skyblocker.waypoints.ordered.add.invalidHexColor": "§cInvalid HEX color code!", "skyblocker.waypoints.ordered.addAt.success": "Added a waypoint in group %s at index %d.", -- cgit From 59279546a8b403ef6d4914d8688181fe9d4ec99e Mon Sep 17 00:00:00 2001 From: vicisacat Date: Tue, 2 Apr 2024 18:03:53 +0200 Subject: move mixin --- src/main/resources/skyblocker.mixins.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index 9a911b86..80093a4b 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -48,12 +48,11 @@ "accessor.ScreenAccessor", "accessor.SkullBlockEntityAccessor", "accessor.WorldRendererAccessor", - "discordipc.ConnectionMixin" + "discordipc.ConnectionMixin", + "accessor.SlotAccessor" ], "injectors": { "defaultRequire": 1 }, - "mixins": [ - "accessor.SlotAccessor" - ] + "mixins": [] } -- cgit From 27e9e7b90a76bb662fd7a5f8fe1d7fbec17a8cb9 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Fri, 12 Apr 2024 18:10:12 -0400 Subject: Refactor fancy auction house - Add color and center rarity filter text - Use ItemUtils.getNbtTooltips - Use longs for item prices --- src/main/resources/skyblocker.mixins.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index 80093a4b..1466d8f2 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -47,12 +47,11 @@ "accessor.RecipeBookWidgetAccessor", "accessor.ScreenAccessor", "accessor.SkullBlockEntityAccessor", + "accessor.SlotAccessor", "accessor.WorldRendererAccessor", - "discordipc.ConnectionMixin", - "accessor.SlotAccessor" + "discordipc.ConnectionMixin" ], "injectors": { "defaultRequire": 1 - }, - "mixins": [] + } } -- cgit