mirror of
https://github.com/kiranhart/Auction-House.git
synced 2024-11-26 06:05:25 +01:00
BIN item gui, the continue button now calls AuctionCreator#create (new way of creating listings)
Took 39 seconds
This commit is contained in:
parent
c8b55ba1d3
commit
694e36f310
@ -19,11 +19,14 @@
|
|||||||
package ca.tweetzy.auctionhouse.guis.sell;
|
package ca.tweetzy.auctionhouse.guis.sell;
|
||||||
|
|
||||||
import ca.tweetzy.auctionhouse.AuctionHouse;
|
import ca.tweetzy.auctionhouse.AuctionHouse;
|
||||||
|
import ca.tweetzy.auctionhouse.ahv3.api.ListingResult;
|
||||||
import ca.tweetzy.auctionhouse.api.AuctionAPI;
|
import ca.tweetzy.auctionhouse.api.AuctionAPI;
|
||||||
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
|
import ca.tweetzy.auctionhouse.auction.AuctionPlayer;
|
||||||
import ca.tweetzy.auctionhouse.auction.AuctionedItem;
|
import ca.tweetzy.auctionhouse.auction.AuctionedItem;
|
||||||
import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType;
|
import ca.tweetzy.auctionhouse.auction.enums.AuctionStackType;
|
||||||
import ca.tweetzy.auctionhouse.guis.AbstractPlaceholderGui;
|
import ca.tweetzy.auctionhouse.guis.AbstractPlaceholderGui;
|
||||||
|
import ca.tweetzy.auctionhouse.guis.GUIAuctionHouse;
|
||||||
|
import ca.tweetzy.auctionhouse.helpers.AuctionCreator;
|
||||||
import ca.tweetzy.auctionhouse.helpers.MaterialCategorizer;
|
import ca.tweetzy.auctionhouse.helpers.MaterialCategorizer;
|
||||||
import ca.tweetzy.auctionhouse.helpers.input.TitleInput;
|
import ca.tweetzy.auctionhouse.helpers.input.TitleInput;
|
||||||
import ca.tweetzy.auctionhouse.settings.Settings;
|
import ca.tweetzy.auctionhouse.settings.Settings;
|
||||||
@ -89,7 +92,7 @@ public final class GUISellBin extends AbstractPlaceholderGui {
|
|||||||
if (parts.length == 2) {
|
if (parts.length == 2) {
|
||||||
if (NumberUtils.isInt(parts[0]) && Arrays.asList("second", "minute", "hour", "day", "week", "month", "year").contains(parts[1].toLowerCase())) {
|
if (NumberUtils.isInt(parts[0]) && Arrays.asList("second", "minute", "hour", "day", "week", "month", "year").contains(parts[1].toLowerCase())) {
|
||||||
if (AuctionAPI.toTicks(string) <= Settings.MAX_CUSTOM_DEFINED_TIME.getInt()) {
|
if (AuctionAPI.toTicks(string) <= Settings.MAX_CUSTOM_DEFINED_TIME.getInt()) {
|
||||||
click.manager.showGUI(click.player, new GUISellBin(GUISellBin.this.auctionPlayer, GUISellBin.this.listingPrice, System.currentTimeMillis() + (1000L * AuctionAPI.toTicks(string)), GUISellBin.this.allowPartialBuy));
|
click.manager.showGUI(click.player, new GUISellBin(GUISellBin.this.auctionPlayer, GUISellBin.this.listingPrice, AuctionAPI.toTicks(string), GUISellBin.this.allowPartialBuy));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -140,21 +143,7 @@ public final class GUISellBin extends AbstractPlaceholderGui {
|
|||||||
|
|
||||||
drawQtyPurchase();
|
drawQtyPurchase();
|
||||||
|
|
||||||
setItem(1, 4, new AuctionedItem(
|
setItem(1, 4, createListingItem().getDisplayStack(AuctionStackType.LISTING_PREVIEW));
|
||||||
UUID.randomUUID(),
|
|
||||||
auctionPlayer.getUuid(),
|
|
||||||
auctionPlayer.getUuid(),
|
|
||||||
auctionPlayer.getPlayer().getName(),
|
|
||||||
auctionPlayer.getPlayer().getName(),
|
|
||||||
MaterialCategorizer.getMaterialCategory(this.auctionPlayer.getItemBeingListed()),
|
|
||||||
this.auctionPlayer.getItemBeingListed(),
|
|
||||||
this.listingPrice,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
this.listingPrice,
|
|
||||||
false, false,
|
|
||||||
this.listingTime
|
|
||||||
).getDisplayStack(AuctionStackType.LISTING_PREVIEW));
|
|
||||||
|
|
||||||
setButton(getRows() - 1, 4, QuickItem
|
setButton(getRows() - 1, 4, QuickItem
|
||||||
.of(Objects.requireNonNull(Settings.GUI_SELL_BIN_ITEM_ITEMS_CONTINUE_ITEM.getMaterial().parseItem()))
|
.of(Objects.requireNonNull(Settings.GUI_SELL_BIN_ITEM_ITEMS_CONTINUE_ITEM.getMaterial().parseItem()))
|
||||||
@ -162,6 +151,18 @@ public final class GUISellBin extends AbstractPlaceholderGui {
|
|||||||
.lore(Settings.GUI_SELL_BIN_ITEM_ITEMS_CONTINUE_LORE.getStringList())
|
.lore(Settings.GUI_SELL_BIN_ITEM_ITEMS_CONTINUE_LORE.getStringList())
|
||||||
.make(), click -> {
|
.make(), click -> {
|
||||||
|
|
||||||
|
click.gui.exit();
|
||||||
|
|
||||||
|
AuctionCreator.create(this.auctionPlayer, createListingItem(), (originalListing, listingResult) -> {
|
||||||
|
if (listingResult != ListingResult.SUCCESS) {
|
||||||
|
PlayerUtils.giveItem(click.player, originalListing.getItem());
|
||||||
|
this.auctionPlayer.setItemBeingListed(null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Settings.OPEN_MAIN_AUCTION_HOUSE_AFTER_MENU_LIST.getBoolean())
|
||||||
|
click.manager.showGUI(click.player, new GUIAuctionHouse(this.auctionPlayer));
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -177,4 +178,25 @@ public final class GUISellBin extends AbstractPlaceholderGui {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private AuctionedItem createListingItem() {
|
||||||
|
final AuctionedItem item = new AuctionedItem(
|
||||||
|
UUID.randomUUID(),
|
||||||
|
auctionPlayer.getUuid(),
|
||||||
|
auctionPlayer.getUuid(),
|
||||||
|
auctionPlayer.getPlayer().getName(),
|
||||||
|
auctionPlayer.getPlayer().getName(),
|
||||||
|
MaterialCategorizer.getMaterialCategory(this.auctionPlayer.getItemBeingListed()),
|
||||||
|
this.auctionPlayer.getItemBeingListed(),
|
||||||
|
this.listingPrice,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
this.listingPrice,
|
||||||
|
false, false,
|
||||||
|
System.currentTimeMillis() + (this.listingTime * 1000L)
|
||||||
|
);
|
||||||
|
|
||||||
|
item.setAllowPartialBuy(this.allowPartialBuy);
|
||||||
|
return item;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user