3.18.0

Took 9 minutes
Tweetzy · Aug 3, 2024 · 33941d5 · 33941d5
1 parent 1b811e5
commit 33941d5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,15 +8,15 @@
 
     <name>Markets</name>
     <description>A new take on traditional player owned shops</description>
-    <version>2.17.4</version>
+    <version>2.18.0</version>
     <packaging>jar</packaging>
 
     <properties>
         <author>Kiran Hart</author>
         <jarName>${project.name}</jarName>
         <main.class>${project.groupId}.${project.artifactId}.${project.name}</main.class>
         <java.version>16</java.version>
-        <flight.version>3.22.3</flight.version>
+        <flight.version>3.24.0</flight.version>
         <flight.path>ca.tweetzy</flight.path>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

diff --git a/src/main/java/ca/tweetzy/markets/gui/shared/selector/CurrencyPickerGUI.java b/src/main/java/ca/tweetzy/markets/gui/shared/selector/CurrencyPickerGUI.java
@@ -55,7 +55,7 @@ protected void drawFixed() {
 				if (click.clickType == ClickType.RIGHT) {
 					click.manager.showGUI(click.player, new MaterialPickerGUI(this, null, null, (event, selected) -> {
 						if (selected != null) {
-							this.selectedCurrency.accept(new ItemCurrency(), selected.parseItem());
+							this.selectedCurrency.accept(new ItemCurrency(), selected);
 						}
 					}));
 				}

diff --git a/src/main/java/ca/tweetzy/markets/gui/shared/view/requests/RequestCreateGUI.java b/src/main/java/ca/tweetzy/markets/gui/shared/view/requests/RequestCreateGUI.java
@@ -225,7 +225,7 @@ private void drawRequestItem() {
 				click.manager.showGUI(click.player, new MaterialPickerGUI(this, null, "", (event, selected) -> {
 
 					if (selected != null) {
-						final ItemStack item = selected.parseItem();
+						final ItemStack item = selected;
 						item.setAmount(1);
 
 						this.request.setRequestedItem(item);

diff --git a/src/main/java/ca/tweetzy/markets/gui/user/category/MarketCategoryEditGUI.java b/src/main/java/ca/tweetzy/markets/gui/user/category/MarketCategoryEditGUI.java
@@ -181,7 +181,7 @@ private void drawIconButton() {
 				click.manager.showGUI(click.player, new MaterialPickerGUI(this, null, "", (event, selected) -> {
 
 					if (selected != null) {
-						this.category.setIcon(selected.parseItem());
+						this.category.setIcon(selected);
 						this.category.sync(result -> {
 							if (result == SynchronizeResult.SUCCESS)
 								click.manager.showGUI(click.player, new MarketCategoryEditGUI(click.player, MarketCategoryEditGUI.this.market, MarketCategoryEditGUI.this.category));

diff --git a/src/main/java/ca/tweetzy/markets/gui/user/market/MarketSettingsGUI.java b/src/main/java/ca/tweetzy/markets/gui/user/market/MarketSettingsGUI.java
@@ -168,9 +168,9 @@ private void executeLayoutHandle(@NonNull final GuiClickEvent click, @NonNull fi
 			click.manager.showGUI(click.player, new MaterialPickerGUI(this, null, null, (event, selected) -> {
 				if (selected != null)
 					if (layoutType == MarketLayoutType.HOME)
-						this.market.getHomeLayout().setBackgroundItem(selected.parseItem());
+						this.market.getHomeLayout().setBackgroundItem(selected);
 					else
-						this.market.getCategoryLayout().setBackgroundItem(selected.parseItem());
+						this.market.getCategoryLayout().setBackgroundItem(selected);
 
 				this.market.sync(result -> {
 					if (result == SynchronizeResult.SUCCESS)

diff --git a/src/main/java/ca/tweetzy/markets/model/manager/MarketManager.java b/src/main/java/ca/tweetzy/markets/model/manager/MarketManager.java
@@ -31,7 +31,7 @@ public MarketManager() {
 	public List<MarketItem> getSearchResults(@NonNull final Player searcher, @NonNull final String keywords) {
 		final List<MarketItem> marketItems = new ArrayList<>();
 		final List<Market> possibleSearchMarkets = getOpenMarketsExclusive(searcher).stream().filter(market -> !market.getBannedUsers().contains(searcher.getUniqueId())).toList();
-
+//		final List<Market> possibleSearchMarkets = getOpenMarketsInclusive();
 
 		// populate items into search list
 		possibleSearchMarkets.forEach(market -> market.getCategories().forEach(category -> marketItems.addAll(category.getInStockItems())));