From f39c28236bc47a9e5395b041b494fdd7f332734e Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 7 Jul 2020 02:48:49 +1000 Subject: ah nearly done --- .../moulberry/notenoughupdates/CustomAH.java | 553 ---------- .../moulberry/notenoughupdates/CustomAHGui.java | 16 - .../moulberry/notenoughupdates/NEUManager.java | 144 +-- .../moulberry/notenoughupdates/NEUOverlay.java | 15 +- .../notenoughupdates/NotEnoughUpdates.java | 49 +- .../moulberry/notenoughupdates/StreamerMode.java | 2 +- .../notenoughupdates/auction/AuctionManager.java | 315 ++++++ .../notenoughupdates/auction/CustomAH.java | 1055 ++++++++++++++++++++ .../notenoughupdates/auction/CustomAHGui.java | 16 + .../moulberry/notenoughupdates/util/Utils.java | 25 + 10 files changed, 1462 insertions(+), 728 deletions(-) delete mode 100644 src/main/java/io/github/moulberry/notenoughupdates/CustomAH.java delete mode 100644 src/main/java/io/github/moulberry/notenoughupdates/CustomAHGui.java create mode 100644 src/main/java/io/github/moulberry/notenoughupdates/auction/AuctionManager.java create mode 100644 src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java create mode 100644 src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAHGui.java (limited to 'src/main/java') diff --git a/src/main/java/io/github/moulberry/notenoughupdates/CustomAH.java b/src/main/java/io/github/moulberry/notenoughupdates/CustomAH.java deleted file mode 100644 index f0e3437f..00000000 --- a/src/main/java/io/github/moulberry/notenoughupdates/CustomAH.java +++ /dev/null @@ -1,553 +0,0 @@ -package io.github.moulberry.notenoughupdates; - -import io.github.moulberry.notenoughupdates.util.TexLoc; -import io.github.moulberry.notenoughupdates.util.Utils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.gui.inventory.GuiChest; -import net.minecraft.client.gui.inventory.GuiEditSign; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; - -import java.awt.*; -import java.text.NumberFormat; -import java.util.*; -import java.util.List; - -import static io.github.moulberry.notenoughupdates.GuiTextures.*; - -public class CustomAH extends Gui { - - private static final ResourceLocation creativeTabSearch = new ResourceLocation("textures/gui/container/creative_inventory/tab_item_search.png"); - private static final ResourceLocation creativeInventoryTabs = new ResourceLocation("textures/gui/container/creative_inventory/tabs.png"); - - private List auctionIds = new ArrayList<>(); - - private boolean scrollClicked = false; - - private int startingBid = 0; - - private GuiTextField searchField = null; - private GuiTextField priceField = null; - - private boolean renderOverAuctionView = false; - private long lastRenderDisable = 0; - - private int eventButton; - private long lastMouseEvent; - - private int splits = 2; - - private int ySplit = 35; - private int ySplitSize = 18; - - private float scrollAmount; - - private int guiLeft = 0; - private int guiTop = 0; - - private NEUManager manager; - - public CustomAH(NEUManager manager) { - this.manager = manager; - } - - private void init() { - FontRenderer fr = Minecraft.getMinecraft().fontRendererObj; - this.searchField = new GuiTextField(0, fr, this.guiLeft + 82, this.guiTop + 6, - 89, fr.FONT_HEIGHT); - this.priceField = new GuiTextField(1, fr, this.guiLeft + 82, this.guiTop + 6, - 89, fr.FONT_HEIGHT); - - this.searchField.setMaxStringLength(15); - this.searchField.setEnableBackgroundDrawing(false); - this.searchField.setTextColor(16777215); - this.searchField.setVisible(true); - this.searchField.setCanLoseFocus(false); - this.searchField.setFocused(true); - this.searchField.setText(""); - - this.priceField.setMaxStringLength(10); - this.priceField.setEnableBackgroundDrawing(false); - this.priceField.setTextColor(16777215); - this.priceField.setVisible(true); - this.priceField.setCanLoseFocus(false); - this.priceField.setFocused(false); - this.priceField.setText(""); - } - - public boolean isRenderOverAuctionView() { - return renderOverAuctionView || (System.currentTimeMillis() - lastRenderDisable) < 500; - } - - public void setRenderOverAuctionView(boolean renderOverAuctionView) { - if(this.renderOverAuctionView && !renderOverAuctionView) lastRenderDisable = System.currentTimeMillis(); - this.renderOverAuctionView = renderOverAuctionView; - } - - private int getXSize() { - return 195; - } - - private int getYSize() { - return 136 + ySplitSize*splits; - } - - private TexLoc tl = new TexLoc(0, 0, Keyboard.KEY_M); - - public List getTooltipForAucId(String aucId) { - NEUManager.Auction auc = manager.getAuctionItems().get(aucId); - - List tooltip = new ArrayList<>(); - - for(String line : auc.getStack().getTooltip(Minecraft.getMinecraft().thePlayer, false)) { - tooltip.add(EnumChatFormatting.GRAY+line); - } - - long timeUntilEnd = auc.end - System.currentTimeMillis(); - - long seconds = timeUntilEnd / 1000 % 60; - long minutes = (timeUntilEnd / 1000 / 60) % 60; - long hours = (timeUntilEnd / 1000 / 60 / 60) % 24; - long days = (timeUntilEnd / 1000 / 60 / 60 / 24); - - String endsIn = EnumChatFormatting.YELLOW+""; - if(timeUntilEnd < 0) { - endsIn += "Ended!"; - } else if(minutes == 0 && hours == 0 && days == 0) { - endsIn += seconds + "s"; - } else if(hours==0 && days==0) { - endsIn += minutes + "m" + seconds + "s"; - } else if(days==0) { - if(hours <= 6) { - endsIn += hours + "h" + minutes + "m" + seconds + "s"; - } else { - endsIn += hours + "h"; - } - } else { - endsIn += days + "d" + hours + "h"; - } - - NumberFormat format = NumberFormat.getInstance(Locale.US); - - tooltip.add(EnumChatFormatting.DARK_GRAY+""+EnumChatFormatting.STRIKETHROUGH+"-----------------"); - tooltip.add(EnumChatFormatting.GRAY+"Seller: [CLICK TO SEE]"); - - if(auc.bin) { - tooltip.add(EnumChatFormatting.GRAY+"Buy it now: "+ - EnumChatFormatting.GOLD+format.format(auc.starting_bid)); - } else { - if(auc.bid_count > 0) { - tooltip.add(EnumChatFormatting.GRAY+"Bids: "+EnumChatFormatting.GREEN+auc.bid_count+" bids"); - tooltip.add(""); - tooltip.add(EnumChatFormatting.GRAY+"Top bid: "+ - EnumChatFormatting.GOLD+format.format(auc.highest_bid_amount)); - tooltip.add(EnumChatFormatting.GRAY+"Bidder: [CLICK TO SEE]"); - } else { - tooltip.add(EnumChatFormatting.GRAY+"Starting bid: "+ - EnumChatFormatting.GOLD+format.format(auc.starting_bid)); - } - } - - tooltip.add(""); - tooltip.add(EnumChatFormatting.GRAY+"Ends in: "+endsIn); - tooltip.add(""); - tooltip.add(EnumChatFormatting.YELLOW+"Click to inspect!"); - - return tooltip; - } - - public boolean isEditingPrice() { - return Minecraft.getMinecraft().currentScreen instanceof GuiEditSign; - } - - public void drawScreen(int mouseX, int mouseY) { - Mouse.setGrabbed(false); - ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); - int width = scaledResolution.getScaledWidth(); - int height = scaledResolution.getScaledHeight(); - - if(searchField == null || priceField == null) init(); - - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - - tl.handleKeyboardInput(); - - guiLeft = (width - getXSize())/2; - guiTop = (height - getYSize())/2; - this.searchField.xPosition = guiLeft + 82; - this.searchField.yPosition = guiTop + 6; - - this.searchField.setFocused(true); - this.priceField.setFocused(false); - - if(!isEditingPrice()) priceField.setText("IAUSHDIUAH"); - - List tooltipToRender = null; - if(Minecraft.getMinecraft().currentScreen instanceof GuiChest) { - GuiChest auctionView = (GuiChest) Minecraft.getMinecraft().currentScreen; - - int auctionViewLeft = guiLeft+getXSize()+4; - - Minecraft.getMinecraft().getTextureManager().bindTexture(auction_view); - this.drawTexturedModalRect(auctionViewLeft, guiTop, 0, 0, 78, 172); - - try { - ItemStack itemStack = auctionView.inventorySlots.getSlot(13).getStack(); - Utils.drawItemStack(itemStack, auctionViewLeft+31, guiTop+35); - - ItemStack bidStack = auctionView.inventorySlots.getSlot(29).getStack(); - Utils.drawItemStack(bidStack, auctionViewLeft+31, guiTop+100); - - ItemStack historyStack = auctionView.inventorySlots.getSlot(33).getStack(); - - ItemStack changeBidStack = auctionView.inventorySlots.getSlot(31).getStack(); - - if(changeBidStack != null && changeBidStack.getTagCompound().hasKey("AttributeModifiers")) { - Minecraft.getMinecraft().getTextureManager().bindTexture(auction_view_buttons); - boolean hover = mouseX > auctionViewLeft+31 && mouseX guiTop+126 && mouseY < guiTop+126+16; - this.drawTexturedModalRect(auctionViewLeft+31, guiTop+126, hover?16:0, 0, 16, 16); - } else { - changeBidStack = null; - } - - if(mouseX > auctionViewLeft+31 && mouseX guiTop+35 && mouseY < guiTop+35+16) { - if(itemStack != null) tooltipToRender = itemStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); - } else if(mouseY > guiTop+100 && mouseY < guiTop+100+16) { - if(bidStack != null) tooltipToRender = bidStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); - } else if(mouseY > guiTop+61 && mouseY < guiTop+61+16) { - if(historyStack != null) tooltipToRender = historyStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); - } else if(mouseY > guiTop+126 && mouseY < guiTop+126+16) { - if(changeBidStack != null) tooltipToRender = changeBidStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); - } - } - } catch(NullPointerException e) { //i cant be bothered - } - } else if(isEditingPrice()) { - int auctionViewLeft = guiLeft+getXSize()+4; - - if(priceField.getText().equals("IAUSHDIUAH")) priceField.setText(""+startingBid); - - searchField.setFocused(false); - priceField.setFocused(true); - priceField.xPosition = auctionViewLeft+18; - priceField.yPosition = guiTop+18; - - Minecraft.getMinecraft().getTextureManager().bindTexture(auction_price); - this.drawTexturedModalRect(auctionViewLeft, guiTop, 0, 0, 96, 99); - priceField.drawTextBox(); - - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - Minecraft.getMinecraft().getTextureManager().bindTexture(auction_view_buttons); - this.drawTexturedModalRect(auctionViewLeft+16, guiTop+32, 0, 16, 30, 16); - this.drawTexturedModalRect(auctionViewLeft+16+34, guiTop+32, 0, 16, 30, 16); - this.drawTexturedModalRect(auctionViewLeft+16, guiTop+50, 0, 16, 30, 16); - this.drawTexturedModalRect(auctionViewLeft+16+34, guiTop+50, 0, 16, 30, 16); - this.drawTexturedModalRect(auctionViewLeft+16, guiTop+68, 0, 32, 64, 16); - - FontRenderer fr = Minecraft.getMinecraft().fontRendererObj; - Utils.drawStringCentered("x2", fr, auctionViewLeft+16+15, guiTop+32+8, false, - Color.BLACK.getRGB()); - Utils.drawStringCentered("+50%", fr, auctionViewLeft+16+34+15, guiTop+32+8, false, - Color.BLACK.getRGB()); - Utils.drawStringCentered("+25%", fr, auctionViewLeft+16+15, guiTop+50+8, false, - Color.BLACK.getRGB()); - Utils.drawStringCentered("+10%", fr, auctionViewLeft+16+34+15, guiTop+50+8, false, - Color.BLACK.getRGB()); - Utils.drawStringCentered("Set Amount", fr, auctionViewLeft+16+32, guiTop+68+8, false, - Color.BLACK.getRGB()); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - - GuiEditSign editSign = (GuiEditSign) Minecraft.getMinecraft().currentScreen; - TileEntitySign tes = (TileEntitySign)Utils.getField(GuiEditSign.class, editSign, - "tileSign", "field_146848_f"); - tes.lineBeingEdited = 0; - tes.signText[0] = new ChatComponentText(priceField.getText()); - } - - Minecraft.getMinecraft().getTextureManager().bindTexture(creativeTabSearch); - this.drawTexturedModalRect(guiLeft, guiTop, 0, 0, getXSize(), ySplit); - int y = guiTop+ySplit; - for(int i=0; i itemX && mouseX < itemX+16) { - if(mouseY > itemY && mouseY < itemY+16) { - tooltipToRender = getTooltipForAucId(aucid); - } - } - } catch(Exception e) { - break out; - } - } - } - - searchField.drawTextBox(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - - if(auctionIds.size() == 0 && searchField.getText().length() == 0) { - drawRect(guiLeft+8, guiTop+17, guiLeft+170, guiTop+107+18*splits, - new Color(100, 100, 100, 100).getRGB()); - - FontRenderer fr = Minecraft.getMinecraft().fontRendererObj; - int strWidth = fr.getStringWidth("Loading items..."); - fr.drawString("Loading items...", guiLeft+(8+170-strWidth)/2, guiTop+(17+107+18*splits)/2, Color.BLACK.getRGB()); - } - - Minecraft.getMinecraft().getTextureManager().bindTexture(creativeInventoryTabs); - this.drawTexturedModalRect(guiLeft+175, guiTop+18+(int)((95+ySplitSize*2)*scrollAmount), - 256-(scrollClicked?12:24), 0, 12, 15); - - if(tooltipToRender != null) { - Utils.drawHoveringText(tooltipToRender, mouseX, mouseY, width, - height, -1, Minecraft.getMinecraft().fontRendererObj); - } - } - - public void handleMouseInput() { - ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft()); - int width = scaledResolution.getScaledWidth(); - int height = scaledResolution.getScaledHeight(); - - int mouseX = Mouse.getEventX() * width / Minecraft.getMinecraft().displayWidth; - int mouseY = height - Mouse.getEventY() * height / Minecraft.getMinecraft().displayHeight - 1; - int mouseButton = Mouse.getEventButton(); - - if (Mouse.getEventButtonState()) { - this.eventButton = mouseButton; - this.lastMouseEvent = Minecraft.getSystemTime(); - mouseClicked(mouseX, mouseY, this.eventButton); - } else if (mouseButton != -1) { - this.eventButton = -1; - mouseReleased(mouseX, mouseY, mouseButton); - } else if (this.eventButton != -1 && this.lastMouseEvent > 0L) { - long l = Minecraft.getSystemTime() - this.lastMouseEvent; - mouseClickMove(mouseX, mouseY, this.eventButton, l); - } - - int dWheel = Mouse.getDWheel(); - - scrollAmount = scrollAmount - dWheel/((float)auctionIds.size()-(5+splits)); - scrollAmount = Math.max(0, Math.min(1, scrollAmount)); - } - - private String niceAucId(String aucId) { - if(aucId.length()!=32) return aucId; - - StringBuilder niceAucId = new StringBuilder(); - niceAucId.append(aucId, 0, 8); - niceAucId.append("-"); - niceAucId.append(aucId, 8, 12); - niceAucId.append("-"); - niceAucId.append(aucId, 12, 16); - niceAucId.append("-"); - niceAucId.append(aucId, 16, 20); - niceAucId.append("-"); - niceAucId.append(aucId, 20, 32); - return niceAucId.toString(); - } - - public void updateSearch() { - scrollAmount = 0; - auctionIds.clear(); - try { - for(Map.Entry entry : manager.getAuctionItems().entrySet()) { - if(searchField.getText().length() == 0 || - Utils.cleanColour(entry.getValue().extras).toLowerCase().contains(searchField.getText().toLowerCase())) { - auctionIds.add(entry.getKey()); - } - } - } catch(ConcurrentModificationException e) { - updateSearch(); - } - } - - public boolean keyboardInput() { - if(isEditingPrice() && Keyboard.getEventKey() == Keyboard.KEY_RETURN) { - Minecraft.getMinecraft().displayGuiScreen(null); - } else if(Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) { - return false; - } - keyTyped(Keyboard.getEventCharacter(), Keyboard.getEventKey()); - return true; - } - - public void keyTyped(char typedChar, int keyCode) { - if(searchField == null || priceField == null) init(); - - if(!isEditingPrice()) { - if(this.searchField.textboxKeyTyped(typedChar, keyCode)) { - this.updateSearch(); - } - } else { - priceField.textboxKeyTyped(typedChar, keyCode); - } - } - - private void increasePriceByFactor(float factor) { - String price = priceField.getText().trim(); - StringBuilder priceNumbers = new StringBuilder(); - for(int i=0; i= 48 && (int)c <= 57) { - priceNumbers.append(c); - } else { - break; - } - } - int priceI = 0; - if(priceNumbers.length() > 0) { - priceI = Integer.parseInt(priceNumbers.toString()); - } - String end = price.substring(priceNumbers.length()); - priceField.setText((int)(priceI*factor) + end); - } - - protected void mouseClicked(int mouseX, int mouseY, int mouseButton) { - searchField.mouseClicked(mouseX, mouseY, mouseButton); - - int totalItems = auctionIds.size(); - int itemsScroll = (int)Math.floor((totalItems*scrollAmount)/9f)*9; - - int maxItemScroll = Math.max(0, totalItems - (5+splits)*9); - itemsScroll = Math.min(itemsScroll, maxItemScroll); - - if(mouseButton == 0 && Minecraft.getMinecraft().currentScreen instanceof GuiChest) { - GuiChest auctionView = (GuiChest) Minecraft.getMinecraft().currentScreen; - - if(mouseX > guiLeft+getXSize()+4+31 && mouseX < guiLeft+getXSize()+4+31+16) { - if(mouseY > guiTop+100 && mouseY < guiTop+100+16) { - Minecraft.getMinecraft().playerController.windowClick(auctionView.inventorySlots.windowId, - 29, 2, 3, Minecraft.getMinecraft().thePlayer); - } else if(mouseY > guiTop+126 && mouseY < guiTop+126+16) { - Minecraft.getMinecraft().playerController.windowClick(auctionView.inventorySlots.windowId, - 31, 0, 4, Minecraft.getMinecraft().thePlayer); - } - } - } - if(mouseButton == 0 && isEditingPrice()) { - int auctionViewLeft = guiLeft+getXSize()+4; - System.out.println("1"); - - if(mouseX > auctionViewLeft+16 && mouseX < auctionViewLeft+16+64) { - System.out.println("2"); - if(mouseY > guiTop+32 && mouseY < guiTop+32+16) { - System.out.println("3"); - if(mouseX < auctionViewLeft+16+32) { - //top left - increasePriceByFactor(2); - } else { - //top right - increasePriceByFactor(1.5f); - } - } else if(mouseY > guiTop+50 && mouseY < guiTop+50+16) { - if(mouseX < auctionViewLeft+16+32) { - //mid left - increasePriceByFactor(1.25f); - } else { - //mid right - increasePriceByFactor(1.1f); - } - } else if(mouseY > guiTop+68 && mouseY < guiTop+68+16) { - //bottom - Minecraft.getMinecraft().displayGuiScreen(null); - } - } - - this.drawTexturedModalRect(auctionViewLeft+16, guiTop+32, 0, 16, 30, 16); - this.drawTexturedModalRect(auctionViewLeft+16+34, guiTop+32, 0, 16, 30, 16); - this.drawTexturedModalRect(auctionViewLeft+16, guiTop+50, 0, 16, 30, 16); - this.drawTexturedModalRect(auctionViewLeft+16+34, guiTop+50, 0, 16, 30, 16); - this.drawTexturedModalRect(auctionViewLeft+16, guiTop+68, 0, 32, 64, 16); - } - - out: - for(int i=0; i<5+splits; i++) { - int itemY = guiTop + i*18 + 18; - for(int j=0; j<9; j++) { - int itemX = guiLeft + j*18 + 9; - int id = itemsScroll + i*9 + j; - if(auctionIds.size() <= id) break out; - - String aucid; - try { - aucid = auctionIds.get(id); - } catch (IndexOutOfBoundsException e) { break out; } - - NEUManager.Auction auc = manager.getAuctionItems().get(aucid); - long timeUntilEnd = auc.end - System.currentTimeMillis(); - - if(timeUntilEnd > 0) { - if(mouseX > itemX && mouseX < itemX+16) { - if(mouseY > itemY && mouseY < itemY+16) { - startingBid = Math.max(auc.starting_bid, auc.highest_bid_amount); - NotEnoughUpdates.INSTANCE.sendChatMessage("/viewauction "+niceAucId(aucid)); - } - } - } - - - } - } - - int y = guiTop+18+(int)((95+ySplitSize*2)*scrollAmount); - if(mouseX > guiLeft+175 && mouseX < guiLeft+175+12) { - if(mouseY > y && mouseY < y+15) { - scrollClicked = true; - return; - } - } - scrollClicked = false; - } - - protected void mouseReleased(int mouseX, int mouseY, int state) { - scrollClicked = false; - } - - protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) { - if(scrollClicked) { - int yMin = guiTop+18 + 8; - int yMax = guiTop+18+(95+ySplitSize*2) + 8; - - scrollAmount = (mouseY-yMin)/(float)(yMax-yMin); - scrollAmount = Math.max(0, Math.min(1, scrollAmount)); - } - } -} diff --git a/src/main/java/io/github/moulberry/notenoughupdates/CustomAHGui.java b/src/main/java/io/github/moulberry/notenoughupdates/CustomAHGui.java deleted file mode 100644 index af7486a0..00000000 --- a/src/main/java/io/github/moulberry/notenoughupdates/CustomAHGui.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.github.moulberry.notenoughupdates; - -import net.minecraft.client.gui.GuiScreen; -import org.lwjgl.input.Mouse; - -public class CustomAHGui extends GuiScreen { - - public CustomAHGui() { - this.allowUserInput = true; - } - - public boolean doesGuiPauseGame() { - return false; - } - -} diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java index 502cebe9..c1056108 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java @@ -1,6 +1,8 @@ package io.github.moulberry.notenoughupdates; import com.google.gson.*; +import io.github.moulberry.notenoughupdates.auction.AuctionManager; +import io.github.moulberry.notenoughupdates.auction.CustomAH; import io.github.moulberry.notenoughupdates.options.Options; import io.github.moulberry.notenoughupdates.util.HypixelApi; import net.minecraft.client.Minecraft; @@ -32,10 +34,10 @@ public class NEUManager { private final NotEnoughUpdates neu; public final NEUIO neuio; public final Gson gson; + public final AuctionManager auctionManager; private TreeMap itemMap = new TreeMap<>(); - private TreeMap> tagWordMap = new TreeMap<>(); private TreeMap>> titleWordMap = new TreeMap<>(); private TreeMap>> loreWordMap = new TreeMap<>(); @@ -60,13 +62,7 @@ public class NEUManager { private JsonObject auctionPricesJson = null; private long auctionLastUpdate = 0; - private TreeMap auctionItems = new TreeMap<>(); - public CustomAH customAH = new CustomAH(this); - - private HashMap uuidToName = new HashMap<>(); - private HashMap craftCost = new HashMap<>(); - private HashMap> usagesMap = new HashMap<>(); public File configLocation; @@ -80,6 +76,7 @@ public class NEUManager { this.neu = neu; this.configLocation = configLocation; this.neuio = neuio; + this.auctionManager = new AuctionManager(this); GsonBuilder gsonBuilder = new GsonBuilder().setPrettyPrinting(); gsonBuilder.registerTypeAdapter(Options.Option.class, Options.createSerializer()); @@ -108,47 +105,6 @@ public class NEUManager { } } - public class Auction { - public String auctioneerUuid; - public long end; - public int starting_bid; - public int highest_bid_amount; - public int bid_count; - public boolean bin; - public String category; - public String extras; - public String item_bytes; - private ItemStack stack; - - public Auction(String auctioneerUuid, long end, int starting_bid, int highest_bid_amount, int bid_count, - boolean bin, String category, String extras, String item_bytes) { - this.auctioneerUuid = auctioneerUuid; - this.end = end; - this.starting_bid = starting_bid; - this.highest_bid_amount = highest_bid_amount; - this.bid_count = bid_count; - this.bin = bin; - this.category = category; - this.extras = extras; - this.item_bytes = item_bytes; - } - - public ItemStack getStack() { - if(stack != null) { - return stack; - } else { - JsonObject item = getJsonFromItemBytes(item_bytes); - ItemStack stack = jsonToStack(item, false); - this.stack = stack; - return stack; - } - } - } - - public TreeMap getAuctionItems() { - return auctionItems; - } - public class CraftInfo { public boolean fromRecipe = false; public boolean vanillaItem = false; @@ -486,90 +442,6 @@ public class NEUManager { } } - ScheduledExecutorService auctionUpdateSES = Executors.newSingleThreadScheduledExecutor(); - private AtomicInteger auctionUpdateId = new AtomicInteger(0); - public void updateAuctions() { - HashMap pages = new HashMap<>(); - - HashMap args = new HashMap<>(); - args.put("page", "0"); - AtomicInteger totalPages = new AtomicInteger(1); - AtomicInteger currentPages = new AtomicInteger(0); - hypixelApi.getHypixelApiAsync(config.apiKey.value, "skyblock/auctions", - args, jsonObject -> { - if (jsonObject.get("success").getAsBoolean()) { - pages.put(0, jsonObject); - totalPages.set(jsonObject.get("totalPages").getAsInt()); - currentPages.incrementAndGet(); - - for (int i = 1; i < totalPages.get(); i++) { - int j = i; - HashMap args2 = new HashMap<>(); - args2.put("page", "" + i); - hypixelApi.getHypixelApiAsync(config.apiKey.value, "skyblock/auctions", - args2, jsonObject2 -> { - if (jsonObject2.get("success").getAsBoolean()) { - pages.put(j, jsonObject2); - currentPages.incrementAndGet(); - } else { - currentPages.incrementAndGet(); - } - } - ); - } - } - } - ); - - long startTime = System.currentTimeMillis(); - - int currentAuctionUpdateId = auctionUpdateId.incrementAndGet(); - - auctionUpdateSES.schedule(new Runnable() { - public void run() { - if(auctionUpdateId.get() != currentAuctionUpdateId) return; - System.out.println(currentPages.get() + "/" + totalPages.get()); - if (System.currentTimeMillis() - startTime > 20000) return; - - if (currentPages.get() == totalPages.get()) { - TreeMap auctionItemsTemp = new TreeMap<>(); - - for (int pageNum : pages.keySet()) { - System.out.println(pageNum + "/" + pages.size()); - JsonObject page = pages.get(pageNum); - JsonArray auctions = page.get("auctions").getAsJsonArray(); - for (int i = 0; i < auctions.size(); i++) { - JsonObject auction = auctions.get(i).getAsJsonObject(); - - String auctionUuid = auction.get("uuid").getAsString(); - String auctioneerUuid = auction.get("auctioneer").getAsString(); - long end = auction.get("end").getAsLong(); - int starting_bid = auction.get("starting_bid").getAsInt(); - int highest_bid_amount = auction.get("highest_bid_amount").getAsInt(); - int bid_count = auction.get("bids").getAsJsonArray().size(); - boolean bin = false; - if(auction.has("bin")) { - bin = auction.get("bin").getAsBoolean(); - } - String category = auction.get("category").getAsString(); - String extras = auction.get("item_lore").getAsString().replaceAll("\n"," ") + " " + - auction.get("extra").getAsString(); - String item_bytes = auction.get("item_bytes").getAsString(); - - auctionItemsTemp.put(auctionUuid, new Auction(auctioneerUuid, end, starting_bid, highest_bid_amount, - bid_count, bin, category, extras, item_bytes)); - } - } - auctionItems = auctionItemsTemp; - customAH.updateSearch(); - return; - } - - auctionUpdateSES.schedule(this, 1000L, TimeUnit.MILLISECONDS); - } - }, 3000L, TimeUnit.MILLISECONDS); - } - /** * Loads the item in to the itemMap and also stores various words associated with this item * in to titleWordMap and loreWordMap. These maps are used in the searching algorithm. @@ -836,7 +708,7 @@ public class NEUManager { * follow a word matching the previous sub query. eg. "ench po" will match "enchanted pork" but will not match * "pork enchanted". */ - private Set search(String query, TreeMap>> wordMap) { + public Set search(String query, TreeMap>> wordMap) { HashMap> matches = null; query = clean(query).toLowerCase(); @@ -898,6 +770,7 @@ public class NEUManager { tag = tag.getTagList("i", 10).getCompoundTagAt(0); int id = tag.getShort("id"); int damage = tag.getShort("Damage"); + int count = tag.getShort("Count"); tag = tag.getCompoundTag("tag"); String internalname = ""; @@ -948,6 +821,7 @@ public class NEUManager { } item.addProperty("damage", damage); + if(count > 1) item.addProperty("count", count); item.addProperty("nbttag", tag.toString()); return item; @@ -1390,6 +1264,10 @@ public class NEUManager { ItemStack stack = new ItemStack(Item.itemRegistry.getObject( new ResourceLocation(json.get("itemid").getAsString()))); + if(json.has("count")) { + stack.stackSize = json.get("count").getAsInt(); + } + if(stack.getItem() == null) { stack = new ItemStack(Items.diamond, 1, 10); //Purple broken texture item } else { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java index 97964042..95ceb21f 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java @@ -183,9 +183,9 @@ public class NEUOverlay extends Gui { int mouseX = Mouse.getX() / scaledresolution.getScaleFactor(); int mouseY = height - Mouse.getY() / scaledresolution.getScaleFactor(); - if(lastMouseX != mouseX || lastMouseY != mouseY) { - millisLastMouseMove = System.currentTimeMillis(); - } + //if(lastMouseX != mouseX || lastMouseY != mouseY) { + // millisLastMouseMove = System.currentTimeMillis(); + //} lastMouseX = mouseX; lastMouseY = mouseY; @@ -461,7 +461,7 @@ public class NEUOverlay extends Gui { if(Minecraft.getMinecraft().currentScreen == null) return false; Keyboard.enableRepeatEvents(true); - int keyPressed = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() : Keyboard.getEventKey(); + int keyPressed = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter()+256 : Keyboard.getEventKey(); if(disabled) { if(Keyboard.getEventKeyState() && keyPressed == manager.keybindToggleDisplay.getKeyCode()) { @@ -1307,6 +1307,7 @@ public class NEUOverlay extends Gui { int scaledItemPaddedSize = (int)((ITEM_SIZE+ITEM_PADDING)*sortOrderScaleFactor); int iconTop = height-getBoxPadding()-(ITEM_SIZE+scaledITEM_SIZE)/2-1; + boolean hoveredOverControl = false; for(int i=0; i iconTop && mouseY < iconTop+scaledITEM_SIZE) { if(mouseX > orderIconX && mouseX < orderIconX+scaledITEM_SIZE) { + hoveredOverControl = true; if(System.currentTimeMillis() - millisLastMouseMove > 400) { String text = EnumChatFormatting.GRAY+"Order "; if(i == COMPARE_MODE_ALPHABETICAL) text += "Alphabetically"; @@ -1344,6 +1346,7 @@ public class NEUOverlay extends Gui { if(mouseY > iconTop && mouseY < iconTop+scaledITEM_SIZE) { if(mouseX > sortIconX && mouseX < sortIconX+scaledITEM_SIZE) { + hoveredOverControl = true; if(System.currentTimeMillis() - millisLastMouseMove > 400) { String text = EnumChatFormatting.GRAY+"Filter "; if(i == SORT_MODE_ALL) text = EnumChatFormatting.GRAY+"No Filter"; @@ -1359,6 +1362,10 @@ public class NEUOverlay extends Gui { } } + if(!hoveredOverControl) { + millisLastMouseMove = System.currentTimeMillis(); + } + if(!hoverInv) { iterateItemSlots(new ItemSlotConsumer() { public void consume(int x, int y, int id) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java index 6d8e91e7..2946f930 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java @@ -6,6 +6,7 @@ import com.mojang.authlib.Agent; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication; +import io.github.moulberry.notenoughupdates.auction.CustomAHGui; import io.github.moulberry.notenoughupdates.commands.SimpleCommand; import io.github.moulberry.notenoughupdates.infopanes.CollectionLogInfoPane; import io.github.moulberry.notenoughupdates.util.Utils; @@ -91,13 +92,13 @@ public class NotEnoughUpdates { return s; } + private GuiScreen openGui = null; + ScheduledExecutorService guiDelaySES = Executors.newScheduledThreadPool(1); SimpleCommand collectionLogCommand = new SimpleCommand("neucl", new SimpleCommand.ProcessCommandRunnable() { public void processCommand(ICommandSender sender, String[] args) { if(!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) { - guiDelaySES.schedule(()->{ - Minecraft.getMinecraft().displayGuiScreen(new GuiInventory(Minecraft.getMinecraft().thePlayer)); - }, 20L, TimeUnit.MILLISECONDS); + openGui = new GuiInventory(Minecraft.getMinecraft().thePlayer); } manager.updatePrices(); overlay.displayInformationPane(new CollectionLogInfoPane(overlay, manager)); @@ -106,13 +107,10 @@ public class NotEnoughUpdates { SimpleCommand neuAhCommand = new SimpleCommand("neuah", new SimpleCommand.ProcessCommandRunnable() { public void processCommand(ICommandSender sender, String[] args) { - if(!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) { - guiDelaySES.schedule(()->{ - Minecraft.getMinecraft().displayGuiScreen(new CustomAHGui()); - Mouse.setGrabbed(false); - }, 20L, TimeUnit.MILLISECONDS); - manager.updateAuctions(); - } + openGui = new CustomAHGui(); + manager.auctionManager.customAH.lastOpen = System.currentTimeMillis(); + manager.auctionManager.customAH.clearSearch(); + manager.auctionManager.customAH.updateSearch(); } }); @@ -208,6 +206,13 @@ public class NotEnoughUpdates { private HashMap newItemAddMap = new HashMap<>(); @SubscribeEvent public void onTick(TickEvent.ClientTickEvent event) { + if(openGui != null) { + Minecraft.getMinecraft().displayGuiScreen(openGui); + openGui = null; + } + if(hasSkyblockScoreboard()) { + manager.auctionManager.tick(); + } if(currChatMessage != null && System.currentTimeMillis() - lastChatMessage > CHAT_MSG_COOLDOWN) { lastChatMessage = System.currentTimeMillis(); Minecraft.getMinecraft().thePlayer.sendChatMessage(currChatMessage); @@ -280,20 +285,22 @@ public class NotEnoughUpdates { AtomicBoolean missingRecipe = new AtomicBoolean(false); @SubscribeEvent public void onGuiOpen(GuiOpenEvent event) { - if(event.gui == null && manager.customAH.isRenderOverAuctionView() && + manager.auctionManager.customAH.lastGuiScreenSwitch = System.currentTimeMillis(); + + if(event.gui == null && manager.auctionManager.customAH.isRenderOverAuctionView() && !(Minecraft.getMinecraft().currentScreen instanceof CustomAHGui)) { - //todo + event.gui = new CustomAHGui(); } if(!(event.gui instanceof GuiChest || event.gui instanceof GuiEditSign)) { - manager.customAH.setRenderOverAuctionView(false); - } else if(event.gui instanceof GuiChest && (manager.customAH.isRenderOverAuctionView() || + manager.auctionManager.customAH.setRenderOverAuctionView(false); + } else if(event.gui instanceof GuiChest && (manager.auctionManager.customAH.isRenderOverAuctionView() || Minecraft.getMinecraft().currentScreen instanceof CustomAHGui)){ GuiChest chest = (GuiChest) event.gui; ContainerChest container = (ContainerChest) chest.inventorySlots; String containerName = container.getLowerChestInventory().getDisplayName().getUnformattedText(); - manager.customAH.setRenderOverAuctionView(containerName.trim().equals("Auction View") || + manager.auctionManager.customAH.setRenderOverAuctionView(containerName.trim().equals("Auction View") || containerName.trim().equals("BIN Auction View")); } @@ -497,9 +504,9 @@ public class NotEnoughUpdates { @SubscribeEvent public void onGuiScreenDrawPre(GuiScreenEvent.DrawScreenEvent.Pre event) { - if(event.gui instanceof CustomAHGui || manager.customAH.isRenderOverAuctionView()) { + if(event.gui instanceof CustomAHGui || manager.auctionManager.customAH.isRenderOverAuctionView()) { event.setCanceled(true); - manager.customAH.drawScreen(event.mouseX, event.mouseY); + manager.auctionManager.customAH.drawScreen(event.mouseX, event.mouseY); } } @@ -527,9 +534,9 @@ public class NotEnoughUpdates { */ @SubscribeEvent public void onGuiScreenMouse(GuiScreenEvent.MouseInputEvent.Pre event) { - if(event.gui instanceof CustomAHGui || manager.customAH.isRenderOverAuctionView()) { + if(event.gui instanceof CustomAHGui || manager.auctionManager.customAH.isRenderOverAuctionView()) { event.setCanceled(true); - manager.customAH.handleMouseInput(); + manager.auctionManager.customAH.handleMouseInput(); //overlay.mouseInput(); return; } @@ -549,8 +556,8 @@ public class NotEnoughUpdates { boolean started = false; @SubscribeEvent public void onGuiScreenKeyboard(GuiScreenEvent.KeyboardInputEvent.Pre event) { - if(event.gui instanceof CustomAHGui || manager.customAH.isRenderOverAuctionView()) { - if(manager.customAH.keyboardInput()) { + if(event.gui instanceof CustomAHGui || manager.auctionManager.customAH.isRenderOverAuctionView()) { + if(manager.auctionManager.customAH.keyboardInput()) { event.setCanceled(true); Minecraft.getMinecraft().dispatchKeypresses(); } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/StreamerMode.java b/src/main/java/io/github/moulberry/notenoughupdates/StreamerMode.java index 47f2da10..3ad2eba6 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/StreamerMode.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/StreamerMode.java @@ -8,7 +8,7 @@ import java.util.regex.Pattern; public class StreamerMode { - private static final Pattern lobbyPattern = Pattern.compile("(mini|mega)([0-9]{1,3}[A-Z])"); + private static final Pattern lobbyPattern = Pattern.compile("(mini|mega|m|M)([0-9]{1,3}[A-Z])"); public static String filterLobbyNames(String line) { Matcher matcher = lobbyPattern.matcher(line); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/auction/AuctionManager.java b/src/main/java/io/github/moulberry/notenoughupdates/auction/AuctionManager.java new file mode 100644 index 00000000..3d636f8a --- /dev/null +++ b/src/main/java/io/github/moulberry/notenoughupdates/auction/AuctionManager.java @@ -0,0 +1,315 @@ +package io.github.moulberry.notenoughupdates.auction; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import io.github.moulberry.notenoughupdates.NEUManager; +import io.github.moulberry.notenoughupdates.util.Utils; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + +import java.util.*; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +public class AuctionManager { + + private NEUManager manager; + public final CustomAH customAH; + + private int totalPages = 0; + private int lastApiUpdate; + private LinkedList needUpdate = new LinkedList<>(); + private TreeMap auctionMap = new TreeMap<>(); + + public TreeMap>> extrasToAucIdMap = new TreeMap<>(); + + private long lastPageUpdate = 0; + private long lastCustomAHSearch = 0; + private long lastCleanup = 0; + + public AuctionManager(NEUManager manager) { + this.manager = manager; + customAH = new CustomAH(manager); + } + + public TreeMap getAuctionItems() { + return auctionMap; + } + + public class Auction { + public String auctioneerUuid; + public long end; + public int starting_bid; + public int highest_bid_amount; + public int bid_count; + public boolean bin; + public String category; + public String rarity; + public String item_bytes; + private ItemStack stack; + + public Auction(String auctioneerUuid, long end, int starting_bid, int highest_bid_amount, int bid_count, + boolean bin, String category, String rarity, String item_bytes) { + this.auctioneerUuid = auctioneerUuid; + this.end = end; + this.starting_bid = starting_bid; + this.highest_bid_amount = highest_bid_amount; + this.bid_count = bid_count; + this.bin = bin; + this.category = category; + this.rarity = rarity; + this.item_bytes = item_bytes; + } + + public ItemStack getStack() { + if(stack != null) { + return stack; + } else { + JsonObject item = manager.getJsonFromItemBytes(item_bytes); + ItemStack stack = manager.jsonToStack(item, false); + this.stack = stack; + return stack; + } + } + } + + public void tick() { + if(System.currentTimeMillis() - lastPageUpdate > 5*1000) { + lastPageUpdate = System.currentTimeMillis(); + updatePageTick(); + } + if(System.currentTimeMillis() - lastCleanup > 120*1000) { + lastCleanup = System.currentTimeMillis(); + cleanup(); + } + if(System.currentTimeMillis() - lastCustomAHSearch > 60*1000) { + lastCustomAHSearch = System.currentTimeMillis(); + customAH.updateSearch(); + } + } + + private void cleanup() { + try { + Set toRemove = new HashSet<>(); + for(Map.Entry entry : auctionMap.entrySet()) { + long timeToEnd = entry.getValue().end - System.currentTimeMillis(); + if(timeToEnd < -60) { + toRemove.add(entry.getKey()); + } + } + for(String aucid : toRemove) { + auctionMap.remove(aucid); + extrasToAucIdMap.remove(aucid); + } + } catch(ConcurrentModificationException e) { + cleanup(); + } + } + + private void updatePageTick() { + if(totalPages == 0) { + getPageFromAPI(0); + } else { + if(needUpdate.isEmpty()) resetNeedUpdate(); + + int pageToUpdate; + for(pageToUpdate = needUpdate.pop(); pageToUpdate >= totalPages && !needUpdate.isEmpty(); + pageToUpdate = needUpdate.pop()) {} + + getPageFromAPI(pageToUpdate); + } + } + + String[] rarityArr = new String[] { + "COMMON", "UNCOMMON", "RARE", "EPIC", "LEGENDARY", "MYTHIC", "SPECIAL", "VERY SPECIAL", + }; + + public int checkItemType(String lore, String... typeMatches) { + String[] split = lore.split("\n"); + for(int i=split.length-1; i>=0; i--) { + String line = split[i]; + for(String rarity : rarityArr) { + for(int j=0; j args = new HashMap<>(); + args.put("page", ""+page); + manager.hypixelApi.getHypixelApiAsync(manager.config.apiKey.value, "skyblock/auctions", + args, jsonObject -> { + if (jsonObject.get("success").getAsBoolean()) { + //pages.put(page, jsonObject); + totalPages = jsonObject.get("totalPages").getAsInt(); + + int lastUpdated = jsonObject.get("lastUpdated").getAsInt(); + + if(lastApiUpdate != lastUpdated) { + resetNeedUpdate(); + } + + lastApiUpdate = lastUpdated; + + String[] categoryItemType = new String[]{"sword","fishingrod","pickaxe","axe", + "shovel","petitem","travelscroll","reforgestone","bow"}; + + JsonArray auctions = jsonObject.get("auctions").getAsJsonArray(); + for (int i = 0; i < auctions.size(); i++) { + JsonObject auction = auctions.get(i).getAsJsonObject(); + + String auctionUuid = auction.get("uuid").getAsString(); + String auctioneerUuid = auction.get("auctioneer").getAsString(); + long end = auction.get("end").getAsLong(); + int starting_bid = auction.get("starting_bid").getAsInt(); + int highest_bid_amount = auction.get("highest_bid_amount").getAsInt(); + int bid_count = auction.get("bids").getAsJsonArray().size(); + boolean bin = false; + if(auction.has("bin")) { + bin = auction.get("bin").getAsBoolean(); + } + String sbCategory = auction.get("category").getAsString(); + String extras = auction.get("extra").getAsString(); + String item_lore = auction.get("item_lore").getAsString(); + String item_bytes = auction.get("item_bytes").getAsString(); + String rarity = auction.get("tier").getAsString(); + + String tag = extras + " " + Utils.cleanColour(item_lore).replaceAll("\n", " "); + + int wordIndex=0; + for(String str : tag.split(" ")) { + str = Utils.cleanColour(str).toLowerCase(); + if(!extrasToAucIdMap.containsKey(str)) { + extrasToAucIdMap.put(str, new HashMap<>()); + } + if(!extrasToAucIdMap.get(str).containsKey(auctionUuid)) { + extrasToAucIdMap.get(str).put(auctionUuid, new ArrayList<>()); + } + extrasToAucIdMap.get(str).get(auctionUuid).add(wordIndex); + wordIndex++; + } + + //Categories + String category = sbCategory; //§6§lLEGENDARY FISHING ROD + int itemType = checkItemType(item_lore, "SWORD", "FISHING ROD", "PICKAXE", + "AXE", "SHOVEL", "PET ITEM", "TRAVEL SCROLL", "REFORGE STONE", "BOW"); + if(itemType >= 0 && itemType < categoryItemType.length) { + category = categoryItemType[itemType]; + } + if(extras.startsWith("Enchanted Book")) category = "ebook"; + if(extras.endsWith("Potion")) category = "potion"; + if(extras.contains("Rune")) category = "rune"; + if(item_lore.substring(2).startsWith("Furniture")) category = "furniture"; + if(item_lore.split("\n")[0].endsWith("Pet") || + item_lore.split("\n")[0].endsWith("Mount")) category = "pet"; + + auctionMap.put(auctionUuid, new Auction(auctioneerUuid, end, starting_bid, highest_bid_amount, + bid_count, bin, category, rarity, item_bytes)); + } + } + } + ); + } + + private void resetNeedUpdate() { + for(Integer page=0; page pages = new HashMap<>(); + + HashMap args = new HashMap<>(); + args.put("page", "0"); + AtomicInteger totalPages = new AtomicInteger(1); + AtomicInteger currentPages = new AtomicInteger(0); + manager.hypixelApi.getHypixelApiAsync(manager.config.apiKey.value, "skyblock/auctions", + args, jsonObject -> { + if (jsonObject.get("success").getAsBoolean()) { + pages.put(0, jsonObject); + totalPages.set(jsonObject.get("totalPages").getAsInt()); + currentPages.incrementAndGet(); + + for (int i = 1; i < totalPages.get(); i++) { + int j = i; + HashMap args2 = new HashMap<>(); + args2.put("page", "" + i); + manager.hypixelApi.getHypixelApiAsync(manager.config.apiKey.value, "skyblock/auctions", + args2, jsonObject2 -> { + if (jsonObject2.get("success").getAsBoolean()) { + pages.put(j, jsonObject2); + currentPages.incrementAndGet(); + } else { + currentPages.incrementAndGet(); + } + } + ); + } + } + } + ); + + long startTime = System.currentTimeMillis(); + + int currentAuctionUpdateId = auctionUpdateId.incrementAndGet(); + + auctionUpdateSES.schedule(new Runnable() { + public void run() { + if(auctionUpdateId.get() != currentAuctionUpdateId) return; + System.out.println(currentPages.get() + "/" + totalPages.get()); + if (System.currentTimeMillis() - startTime > 20000) return; + + if (currentPages.get() == totalPages.get()) { + TreeMap auctionItemsTemp = new TreeMap<>(); + + for (int pageNum : pages.keySet()) { + System.out.println(pageNum + "/" + pages.size()); + JsonObject page = pages.get(pageNum); + JsonArray auctions = page.get("auctions").getAsJsonArray(); + for (int i = 0; i < auctions.size(); i++) { + JsonObject auction = auctions.get(i).getAsJsonObject(); + + String auctionUuid = auction.get("uuid").getAsString(); + String auctioneerUuid = auction.get("auctioneer").getAsString(); + long end = auction.get("end").getAsLong(); + int starting_bid = auction.get("starting_bid").getAsInt(); + int highest_bid_amount = auction.get("highest_bid_amount").getAsInt(); + int bid_count = auction.get("bids").getAsJsonArray().size(); + boolean bin = false; + if(auction.has("bin")) { + bin = auction.get("bin").getAsBoolean(); + } + String category = auction.get("category").getAsString(); + String extras = auction.get("item_lore").getAsString().replaceAll("\n"," ") + " " + + auction.get("extra").getAsString(); + String item_bytes = auction.get("item_bytes").getAsString(); + + auctionItemsTemp.put(auctionUuid, new Auction(auctioneerUuid, end, starting_bid, highest_bid_amount, + bid_count, bin, category, extras, item_bytes)); + } + } + auctionItems = auctionItemsTemp; + customAH.updateSearch(); + return; + } + + auctionUpdateSES.schedule(this, 1000L, TimeUnit.MILLISECONDS); + } + }, 3000L, TimeUnit.MILLISECONDS); + }*/ + +} diff --git a/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java b/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java new file mode 100644 index 00000000..0cc17afe --- /dev/null +++ b/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java @@ -0,0 +1,1055 @@ +package io.github.moulberry.notenoughupdates.auction; + +import io.github.moulberry.notenoughupdates.NEUManager; +import io.github.moulberry.notenoughupdates.NotEnoughUpdates; +import io.github.moulberry.notenoughupdates.util.TexLoc; +import io.github.moulberry.notenoughupdates.util.Utils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.gui.inventory.GuiChest; +import net.minecraft.client.gui.inventory.GuiEditSign; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntitySign; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.input.Keyboard; +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL14; + +import java.awt.*; +import java.text.NumberFormat; +import java.util.*; +import java.util.List; + +import static io.github.moulberry.notenoughupdates.GuiTextures.*; + +public class CustomAH extends Gui { + + private static final ResourceLocation creativeTabSearch = + new ResourceLocation("textures/gui/container/creative_inventory/tab_item_search.png"); + private static final ResourceLocation creativeInventoryTabs = + new ResourceLocation("textures/gui/container/creative_inventory/tabs.png"); + + private List auctionIds = new ArrayList<>(); + + private boolean scrollClicked = false; + + private int startingBid = 0; + + private int clickedMainCategory = -1; + private int clickedSubCategory = -1; + + private GuiTextField searchField = null; + private GuiTextField priceField = null; + + private boolean renderOverAuctionView = false; + private long lastRenderDisable = 0; + + private int eventButton; + private long lastMouseEvent; + public long lastOpen; + public long lastGuiScreenSwitch; + + private int splits = 2; + + private int ySplit = 35; + private int ySplitSize = 18; + + private float scrollAmount; + + private int guiLeft = 0; + private int guiTop = 0; + + private Category CATEGORY_SWORD = new Category("sword", "Swords", "diamond_sword"); + private Category CATEGORY_ARMOR = new Category("armor", "Armor", "diamond_chestplate"); + private Category CATEGORY_BOWS = new Category("bow", "Bows", "bow"); + private Category CATEGORY_ACCESSORIES = new Category("accessories", "Accessories", "diamond"); + + private Category CATEGORY_FISHING_ROD = new Category("fishingrod", "Fishing Rods", "fishing_rod"); + private Category CATEGORY_PICKAXE = new Category("pickaxe", "Pickaxes", "iron_pickaxe"); + private Category CATEGORY_AXE = new Category("axe", "Axes", "iron_axe"); + private Category CATEGORY_SHOVEL = new Category("shovel", "Shovels", "iron_shovel"); + + private Category CATEGORY_PET_ITEM = new