Upstream/Auction-House
1
0
Fork 0
mirror of https://github.com/kiranhart/Auction-House.git synced 2025-03-01 21:51:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

2.130.2

Browse Source
This commit is contained in:
Kiran Hart 2024-11-18 16:13:01 -05:00
parent 5ad523af7b
commit 7b303506a7
No known key found for this signature in database
GPG Key ID: 5F36C7BC79D3EBC3
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -8,14 +8,14 @@
<name>AuctionHouse</name> <name>AuctionHouse</name>
<description>The ultimate auction solution for your server</description> <description>The ultimate auction solution for your server</description>
<version>2.130.1</version> <version>2.130.2</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<author>Kiran Hart</author> <author>Kiran Hart</author>
<jarName>${project.name}</jarName> <jarName>${project.name}</jarName>
<main.class>${project.groupId}.${project.artifactId}.${project.name}</main.class> <main.class>${project.groupId}.${project.artifactId}.${project.name}</main.class>
<java.version>8</java.version> <java.version>8</java.version>
<flight.version>3.28.0</flight.version> <flight.version>3.28.1</flight.version>
<flight.path>ca.tweetzy</flight.path> <flight.path>ca.tweetzy</flight.path>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>

1
src/main/java/ca/tweetzy/auctionhouse/auction/AuctionPlayer.java
View File

@ -152,6 +152,7 @@ public class AuctionPlayer {
this.auctionSortType = Enum.valueOf(AuctionSortType.class, Settings.DEFAULT_FILTER_SORT.getString()); this.auctionSortType = Enum.valueOf(AuctionSortType.class, Settings.DEFAULT_FILTER_SORT.getString());
this.selectedSaleType = Enum.valueOf(AuctionSaleType.class, Settings.DEFAULT_FILTER_SALE_TYPE.getString()); this.selectedSaleType = Enum.valueOf(AuctionSaleType.class, Settings.DEFAULT_FILTER_SALE_TYPE.getString());
this.currentSearchPhrase = ""; this.currentSearchPhrase = "";
this.selectedCurrencyFilter = AuctionHouse.getCurrencyManager().getAllCurrency();
} }
public void resetTransactionFilter() { public void resetTransactionFilter() {

18
src/main/java/ca/tweetzy/auctionhouse/guis/core/GUIAuctionHouse.java
View File

@ -610,11 +610,23 @@ public final class GUIAuctionHouse extends AuctionUpdatingPagedGUI<AuctionedItem
QuickItem QuickItem
.of(AuctionAPI.getInstance().getPlayerHead(this.auctionPlayer.getPlayer().getName())) .of(AuctionAPI.getInstance().getPlayerHead(this.auctionPlayer.getPlayer().getName()))
.name(Replacer.replaceVariables(Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_NAME.getString(), "filter_category", auctionPlayer.getSelectedFilter().getTranslatedType(), "filter_auction_type", auctionPlayer.getSelectedSaleType().getTranslatedType(), "filter_sort_order", auctionPlayer.getAuctionSortType().getTranslatedType())) .name(Replacer.replaceVariables(Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_NAME.getString(), "filter_category", auctionPlayer.getSelectedFilter().getTranslatedType(), "filter_auction_type", auctionPlayer.getSelectedSaleType().getTranslatedType(), "filter_sort_order", auctionPlayer.getAuctionSortType().getTranslatedType()))
.lore(this.player, Replacer.replaceVariables(Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_LORE.getStringList(), "filter_category", auctionPlayer.getSelectedFilter().getTranslatedType(), "filter_auction_type", auctionPlayer.getSelectedSaleType().getTranslatedType(), "filter_sort_order", auctionPlayer.getAuctionSortType().getTranslatedType())) .lore(this.player, Replacer.replaceVariables(Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_LORE.getStringList(),
"filter_category", auctionPlayer.getSelectedFilter().getTranslatedType(),
"filter_auction_type", auctionPlayer.getSelectedSaleType().getTranslatedType(),
"filter_sort_order", auctionPlayer.getAuctionSortType().getTranslatedType(),
"filter_currency", auctionPlayer.getSelectedCurrencyFilter().getDisplayName()
))
.make() : QuickItem .make() : QuickItem
.of(materialToBeUsed) .of(materialToBeUsed)
.name(Replacer.replaceVariables(Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_NAME.getString(), "filter_category", auctionPlayer.getSelectedFilter().getTranslatedType(), "filter_auction_type", auctionPlayer.getSelectedSaleType().getTranslatedType(), "filter_sort_order", auctionPlayer.getAuctionSortType().getTranslatedType())) .name(Replacer.replaceVariables(Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_NAME.getString(),
.lore(this.player, Replacer.replaceVariables(Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_LORE.getStringList(), "filter_category", auctionPlayer.getSelectedFilter().getTranslatedType(), "filter_auction_type", auctionPlayer.getSelectedSaleType().getTranslatedType(), "filter_sort_order", auctionPlayer.getAuctionSortType().getTranslatedType())).make(); "filter_category", auctionPlayer.getSelectedFilter().getTranslatedType(),
"filter_auction_type", auctionPlayer.getSelectedSaleType().getTranslatedType(),
"filter_sort_order", auctionPlayer.getAuctionSortType().getTranslatedType()))
.lore(this.player, Replacer.replaceVariables(Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_LORE.getStringList(),
"filter_category", auctionPlayer.getSelectedFilter().getTranslatedType(),
"filter_auction_type", auctionPlayer.getSelectedSaleType().getTranslatedType(),
"filter_sort_order", auctionPlayer.getAuctionSortType().getTranslatedType(),
"filter_currency", auctionPlayer.getSelectedCurrencyFilter().getDisplayName())).make();
if (Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_ENABLED.getBoolean()) { if (Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_ENABLED.getBoolean()) {
setButton(Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_SLOT.getInt(), item, e -> { setButton(Settings.GUI_AUCTION_HOUSE_ITEMS_FILTER_MENU_SLOT.getInt(), item, e -> {

4
src/main/java/ca/tweetzy/auctionhouse/managers/FilterManager.java
View File

@ -61,10 +61,10 @@ public class FilterManager {
} }
public void loadItems() { public void loadItems() {
AuctionHouse.getInstance().getDataManager().getFilterWhitelist(all -> all.forEach(this::addFilterItem)); AuctionHouse.getDataManager().getFilterWhitelist(all -> all.forEach(this::addFilterItem));
} }
public void saveFilterWhitelist(boolean async) { public void saveFilterWhitelist(boolean async) {
AuctionHouse.getInstance().getDataManager().saveFilterWhitelist(getFilterWhitelist(), async); AuctionHouse.getDataManager().saveFilterWhitelist(getFilterWhitelist(), async);
} }
} }