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

#21 ad option to go back from final sell menu (option to go back place item menu)

Browse Source
This commit is contained in:
Kiran Hart 2022-11-25 14:17:21 -05:00
parent 13652e485f
commit 6ecb9bb204
No known key found for this signature in database
GPG Key ID: 5F36C7BC79D3EBC3
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/ca/tweetzy/auctionhouse/guis/sell/GUISellAuction.java
View File

@ -20,6 +20,8 @@ package ca.tweetzy.auctionhouse.guis.sell;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.ahv3.api.ListingResult;
import ca.tweetzy.auctionhouse.ahv3.api.ListingType;
import ca.tweetzy.auctionhouse.ahv3.model.BundleUtil;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
import ca.tweetzy.auctionhouse.auction.AuctionedItem;
@ -35,6 +37,7 @@ import ca.tweetzy.core.gui.GuiUtils;
import ca.tweetzy.core.gui.events.GuiClickEvent;
import ca.tweetzy.core.utils.NumberUtils;
import ca.tweetzy.core.utils.PlayerUtils;
import ca.tweetzy.core.utils.nms.NBTEditor;
import ca.tweetzy.flight.utils.QuickItem;
import ca.tweetzy.flight.utils.Replacer;
import lombok.NonNull;
@ -68,7 +71,14 @@ public final class GUISellAuction extends AbstractPlaceholderGui {
setDefaultItem(GuiUtils.createButtonItem(Settings.GUI_SELL_AUCTION_BG_ITEM.getMaterial(), " "));
setRows(6);
setOnClose(close -> PlayerUtils.giveItem(close.player, this.auctionPlayer.getItemBeingListed()));
setOnClose(close -> {
if (BundleUtil.isBundledItem(this.auctionPlayer.getItemBeingListed()))
PlayerUtils.giveItem(close.player, BundleUtil.extractBundleItems(this.auctionPlayer.getItemBeingListed()));
else
PlayerUtils.giveItem(close.player, this.auctionPlayer.getItemBeingListed());
this.auctionPlayer.setItemBeingListed(null);
});
draw();
}
@ -76,6 +86,16 @@ public final class GUISellAuction extends AbstractPlaceholderGui {
private void draw() {
reset();
setButton(getRows() - 1, 0, QuickItem
.of(Objects.requireNonNull(Settings.GUI_BACK_BTN_ITEM.getMaterial().parseItem()))
.name(Settings.GUI_BACK_BTN_NAME.getString())
.lore(Settings.GUI_BACK_BTN_LORE.getStringList())
.make(), click -> {
click.gui.close();
click.manager.showGUI(click.player, new GUISellPlaceItem(this.auctionPlayer, NBTEditor.contains(this.auctionPlayer.getItemBeingListed(), "AuctionBundleItem") ? GUISellPlaceItem.ViewMode.BUNDLE_ITEM : GUISellPlaceItem.ViewMode.SINGLE_ITEM, ListingType.BIN));
});
if (Settings.ALLOW_PLAYERS_TO_DEFINE_AUCTION_TIME.getBoolean()) {
final long[] times = AuctionAPI.getInstance().getRemainingTimeValues(this.listingTime);

22
src/main/java/ca/tweetzy/auctionhouse/guis/sell/GUISellBin.java
View File

@ -20,6 +20,8 @@ package ca.tweetzy.auctionhouse.guis.sell;
import ca.tweetzy.auctionhouse.AuctionHouse;
import ca.tweetzy.auctionhouse.ahv3.api.ListingResult;
import ca.tweetzy.auctionhouse.ahv3.api.ListingType;
import ca.tweetzy.auctionhouse.ahv3.model.BundleUtil;
import ca.tweetzy.auctionhouse.api.AuctionAPI;
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
import ca.tweetzy.auctionhouse.auction.AuctionedItem;
@ -35,6 +37,7 @@ import ca.tweetzy.core.gui.GuiUtils;
import ca.tweetzy.core.gui.events.GuiClickEvent;
import ca.tweetzy.core.utils.NumberUtils;
import ca.tweetzy.core.utils.PlayerUtils;
import ca.tweetzy.core.utils.nms.NBTEditor;
import ca.tweetzy.flight.utils.QuickItem;
import ca.tweetzy.flight.utils.Replacer;
import lombok.NonNull;
@ -64,7 +67,14 @@ public final class GUISellBin extends AbstractPlaceholderGui {
setDefaultItem(GuiUtils.createButtonItem(Settings.GUI_SELL_BIN_BG_ITEM.getMaterial(), " "));
setRows(6);
setOnClose(close -> PlayerUtils.giveItem(close.player, this.auctionPlayer.getItemBeingListed()));
setOnClose(close -> {
if (BundleUtil.isBundledItem(this.auctionPlayer.getItemBeingListed()))
PlayerUtils.giveItem(close.player, BundleUtil.extractBundleItems(this.auctionPlayer.getItemBeingListed()));
else
PlayerUtils.giveItem(close.player, this.auctionPlayer.getItemBeingListed());
this.auctionPlayer.setItemBeingListed(null);
});
draw();
}
@ -72,6 +82,16 @@ public final class GUISellBin extends AbstractPlaceholderGui {
private void draw() {
reset();
setButton(getRows() - 1, 0, QuickItem
.of(Objects.requireNonNull(Settings.GUI_BACK_BTN_ITEM.getMaterial().parseItem()))
.name(Settings.GUI_BACK_BTN_NAME.getString())
.lore(Settings.GUI_BACK_BTN_LORE.getStringList())
.make(), click -> {
click.gui.close();
click.manager.showGUI(click.player, new GUISellPlaceItem(this.auctionPlayer, NBTEditor.contains(this.auctionPlayer.getItemBeingListed(), "AuctionBundleItem") ? GUISellPlaceItem.ViewMode.BUNDLE_ITEM : GUISellPlaceItem.ViewMode.SINGLE_ITEM, ListingType.BIN));
});
if (Settings.ALLOW_PLAYERS_TO_DEFINE_AUCTION_TIME.getBoolean()) {
final long[] times = AuctionAPI.getInstance().getRemainingTimeValues(this.listingTime);