diff options
Diffstat (limited to 'src/main/java')
6 files changed, 73 insertions, 622 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java index ce7b21b2..000158a4 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java @@ -37,8 +37,8 @@ import io.github.moulberry.notenoughupdates.mbgui.MBGuiGroupAligned; import io.github.moulberry.notenoughupdates.mbgui.MBGuiGroupFloating; import io.github.moulberry.notenoughupdates.miscfeatures.EnchantingSolvers; import io.github.moulberry.notenoughupdates.miscfeatures.SunTzu; -import io.github.moulberry.notenoughupdates.miscgui.GuiPriceGraph; import io.github.moulberry.notenoughupdates.miscgui.NeuSearchCalculator; +import io.github.moulberry.notenoughupdates.miscgui.pricegraph.GuiPriceGraph; import io.github.moulberry.notenoughupdates.options.NEUConfigEditor; import io.github.moulberry.notenoughupdates.util.Constants; import io.github.moulberry.notenoughupdates.util.GuiTextures; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java index 14f75fb0..794df0f4 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java @@ -142,7 +142,8 @@ public class NotEnoughUpdates { //Stolen from Biscut and used for detecting whether in skyblock private static final Set<String> SKYBLOCK_IN_ALL_LANGUAGES = Sets.newHashSet("SKYBLOCK", "\u7A7A\u5C9B\u751F\u5B58", "\u7A7A\u5CF6\u751F\u5B58", - "SKIBLOCK"); // april fools language + "SKIBLOCK" + ); // april fools language public static NotEnoughUpdates INSTANCE = null; public static HashMap<String, String> petRarityToColourMap = new HashMap<String, String>() {{ put("UNKNOWN", EnumChatFormatting.RED.toString()); @@ -255,6 +256,9 @@ public class NotEnoughUpdates { if (config.apiData.moulberryCodesApi.isEmpty()) { config.apiData.moulberryCodesApi = "moulberry.codes"; } + if (config.ahGraph.serverUrl.trim().isEmpty()) { + config.ahGraph.serverUrl = "pricehistory.notenoughupdates.org"; + } saveConfig(); } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java b/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java index 329ab796..1faac488 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java @@ -25,7 +25,7 @@ import com.google.gson.JsonObject; import io.github.moulberry.notenoughupdates.ItemPriceInformation; import io.github.moulberry.notenoughupdates.NEUManager; import io.github.moulberry.notenoughupdates.NotEnoughUpdates; -import io.github.moulberry.notenoughupdates.miscgui.GuiPriceGraph; +import io.github.moulberry.notenoughupdates.miscgui.pricegraph.LocalGraphDataProvider; import io.github.moulberry.notenoughupdates.recipes.Ingredient; import io.github.moulberry.notenoughupdates.recipes.ItemShopRecipe; import io.github.moulberry.notenoughupdates.recipes.NeuRecipe; @@ -306,7 +306,7 @@ public class APIManager { ItemPriceInformation.updateAuctionableItemsList(); didFirstUpdate = true; } - GuiPriceGraph.addToCache(lowestBins, false); + LocalGraphDataProvider.INSTANCE.savePrices(lowestBins, false); }); } @@ -778,7 +778,7 @@ public class APIManager { bazaarJson.add(transformHypixelBazaarToNEUItemId(entry.getKey()), productInfo); } } - GuiPriceGraph.addToCache(bazaarJson, true); + LocalGraphDataProvider.INSTANCE.savePrices(bazaarJson, true); }); } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiPriceGraph.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiPriceGraph.java deleted file mode 100644 index c03a72a6..00000000 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiPriceGraph.java +++ /dev/null @@ -1,611 +0,0 @@ -/* - * Copyright (C) 2022 NotEnoughUpdates contributors - * - * This file is part of NotEnoughUpdates. - * - * NotEnoughUpdates is free software: you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation, either - * version 3 of the License, or (at your option) any later version. - * - * NotEnoughUpdates is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>. - */ - -package io.github.moulberry.notenoughupdates.miscgui; - -import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import io.github.moulberry.notenoughupdates.NotEnoughUpdates; -import io.github.moulberry.notenoughupdates.util.SpecialColour; -import io.github.moulberry.notenoughupdates.util.Utils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.text.SimpleDateFormat; -import java.time.Instant; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.TreeMap; -import java.util.stream.Collectors; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -public class GuiPriceGraph extends GuiScreen { - - private static final Gson GSON = new GsonBuilder().create(); - private static final SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - private final ResourceLocation TEXTURE; - private static final int X_SIZE = 364; - private static final int Y_SIZE = 215; - private ItemData itemData; - private double highestValue; - private long firstTime; - private long lastTime; - private double lowestValue; - private String itemName; - private final String itemId; - private int guiLeft; - private int guiTop; - private ItemStack itemStack = null; - private boolean loaded = false; - /** - * 0 = hour - * 1 = day - * 2 = week - * 3 = all - * 4 = custom - **/ - private int mode = NotEnoughUpdates.INSTANCE.config.ahGraph.defaultMode; - private long customStart = 0; - private long customEnd = 0; - private boolean customSelecting = false; - - public GuiPriceGraph(String itemId) { - switch (NotEnoughUpdates.INSTANCE.config.ahGraph.graphStyle) { - case 1: - TEXTURE = new ResourceLocation("notenoughupdates:price_graph_gui/price_information_gui_dark.png"); - break; - case 2: - TEXTURE = new ResourceLocation("notenoughupdates:price_graph_gui/price_information_gui_phqdark.png"); - break; - case 3: - TEXTURE = new ResourceLocation("notenoughupdates:price_graph_gui/price_information_gui_fsr.png"); - break; - default: - TEXTURE = new ResourceLocation("notenoughupdates:price_graph_gui/price_information_gui.png"); - break; - } - this.itemId = itemId; - if (NotEnoughUpdates.INSTANCE.manager.getItemInformation().containsKey(itemId)) { - JsonObject itemInfo = NotEnoughUpdates.INSTANCE.manager.getItemInformation().get(itemId); - itemName = itemInfo.get("displayname").getAsString(); - itemStack = NotEnoughUpdates.INSTANCE.manager.jsonToStack(itemInfo); - } - loadData(); - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - guiLeft = (width - X_SIZE) / 2; - guiTop = (height - Y_SIZE) / 2; - - Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE); - GlStateManager.color(1, 1, 1, 1); - Utils.drawTexturedRect(guiLeft, guiTop, X_SIZE, Y_SIZE, - 0, X_SIZE / 512f, 0, Y_SIZE / 512f, GL11.GL_NEAREST - ); - Utils.drawTexturedRect(guiLeft + 245, guiTop + 17, 16, 16, - 0, 16 / 512f, (mode == 0 ? 215 : 231) / 512f, (mode == 0 ? 231 : 247) / 512f, GL11.GL_NEAREST - ); - Utils.drawTexturedRect(guiLeft + 263, guiTop + 17, 16, 16, - 16 / 512f, 32 / 512f, (mode == 1 ? 215 : 231) / 512f, (mode == 1 ? 231 : 247) / 512f, GL11.GL_NEAREST - ); - Utils.drawTexturedRect(guiLeft + 281, guiTop + 17, 16, 16, - 32 / 512f, 48 / 512f, (mode == 2 ? 215 : 231) / 512f, (mode == 2 ? 231 : 247) / 512f, GL11.GL_NEAREST - ); - Utils.drawTexturedRect(guiLeft + 299, guiTop + 17, 16, 16, - 48 / 512f, 64 / 512f, (mode == 3 ? 215 : 231) / 512f, (mode == 3 ? 231 : 247) / 512f, GL11.GL_NEAREST - ); - - if (itemName != null && itemStack != null) { - Utils.drawItemStack(itemStack, guiLeft + 16, guiTop + 11); - Utils.drawStringScaledMax(itemName, guiLeft + 35, guiTop + 13, false, - 0xffffff, 1.77f, 208 - ); - } - - if (!loaded) - Utils.drawStringCentered("Loading...", guiLeft + 166, guiTop + 116, false, 0xffffff00); - else if ( - itemData == null || itemData.get() == null || itemData.get().size() <= 1) - Utils.drawStringCentered("No data found.", guiLeft + 166, guiTop + 116, false, 0xffff0000); - else { - int graphColor = SpecialColour.specialToChromaRGB(NotEnoughUpdates.INSTANCE.config.ahGraph.graphColor); - int graphColor2 = SpecialColour.specialToChromaRGB(NotEnoughUpdates.INSTANCE.config.ahGraph.graphColor2); - Integer lowestDist = null; - Long lowestDistTime = null; - HashMap<Integer, Integer> secondLineData = new HashMap<>(); - for (int i = (itemData.isBz() ? 1 : 0); i >= 0; i--) { - Utils.drawGradientRect(0, guiLeft + 17, guiTop + 35, guiLeft + 315, guiTop + 198, - changeAlpha(i == 0 ? graphColor : graphColor2, 120), changeAlpha(i == 0 ? graphColor : graphColor2, 10) - ); - Integer prevX = null; - Integer prevY = null; - for (Long time : itemData.get().keySet()) { - double price = itemData.isBz() - ? i == 0 ? itemData.bz.get(time).b : itemData.bz.get(time).s - : itemData.ah.get(time); - int xPos = (int) map(time, firstTime, lastTime, guiLeft + 17, guiLeft + 315); - int yPos = (int) map(price, highestValue + 10d, lowestValue - 10d, guiTop + 35, guiTop + 198); - if (prevX != null) { - Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE); - GlStateManager.color(1, 1, 1, 1); - Utils.drawTexturedQuad( - prevX, - prevY, - xPos, - yPos, - xPos, - guiTop + 35, - prevX, - guiTop + 35, - 18 / 512f, - 19 / 512f, - 36 / 512f, - 37 / 512f, - GL11.GL_NEAREST - ); - if (i == 0) { - Utils.drawLine(prevX, prevY + 0.5f, xPos, yPos + 0.5f, 2, graphColor); - if (itemData.isBz()) - Utils.drawLine( - prevX, - secondLineData.get(prevX) + 0.5f, - xPos, - secondLineData.get(xPos) + 0.5f, - 2, - graphColor2 - ); - } - } - if (i == 1) - secondLineData.put(xPos, yPos); - if (mouseX >= guiLeft + 17 && mouseX <= guiLeft + 315 && mouseY >= guiTop + 35 && mouseY <= guiTop + 198) { - int dist = Math.abs(mouseX - xPos); - if (lowestDist == null || dist < lowestDist) { - lowestDist = dist; - lowestDistTime = time; - } - } - prevX = xPos; - prevY = yPos; - } - } - boolean showDays = lastTime - firstTime > 86400; - int prevNum = showDays ? Date.from(Instant.ofEpochSecond(firstTime)).getDate() : Date.from(Instant.ofEpochSecond( - firstTime)).getHours(); - long prevXPos = -100; - for (long time = firstTime; time <= lastTime; time += showDays ? 3600 : 60) { - int num = showDays - ? Date.from(Instant.ofEpochSecond(time)).getDate() - : Date.from(Instant.ofEpochSecond(time)).getHours(); - if (num != prevNum) { - int xPos = (int) map(time, firstTime, lastTime, guiLeft + 17, guiLeft + 315); - if (Math.abs(prevXPos - xPos) > 30) { - Utils.drawStringCentered(String.valueOf(num), xPos, guiTop + 206, false, 0x8b8b8b); - prevXPos = xPos; - } - prevNum = num; - } - } - for (int i = 0; i <= 6; i++) { - long price = (long) map(i, 0, 6, highestValue, lowestValue); - String formattedPrice = formatPrice(price); - Utils.drawStringF(formattedPrice, guiLeft + 320, - (float) map(i, 0, 6, guiTop + 35, guiTop + 198) - - Minecraft.getMinecraft().fontRendererObj.FONT_HEIGHT / 2f, false, 0x8b8b8b - ); - } - if (customSelecting) { - Utils.drawDottedLine(customStart, guiTop + 36, customStart, guiTop + 197, 2, 10, 0xFFc6c6c6); - Utils.drawDottedLine(customEnd, guiTop + 36, customEnd, guiTop + 197, 2, 10, 0xFFc6c6c6); - Utils.drawDottedLine(customStart, guiTop + 36, customEnd, guiTop + 36, 2, 10, 0xFFc6c6c6); - Utils.drawDottedLine(customStart, guiTop + 197, customEnd, guiTop + 197, 2, 10, 0xFFc6c6c6); - } - if (lowestDist != null && !customSelecting) { - double price = itemData.isBz() ? itemData.bz.get(lowestDistTime).b : itemData.ah.get(lowestDistTime); - Double price2 = itemData.isBz() ? itemData.bz.get(lowestDistTime).s : null; - int xPos = (int) map(lowestDistTime, firstTime, lastTime, guiLeft + 17, guiLeft + 315); - int yPos = (int) map(price, highestValue + 10d, lowestValue - 10d, guiTop + 35, guiTop + 198); - int yPos2 = price2 != null - ? (int) map(price2, highestValue + 10d, lowestValue - 10d, guiTop + 35, guiTop + 198) - : 0; - - Utils.drawLine(xPos, guiTop + 35, xPos, guiTop + 198, 2, 0x4D8b8b8b); - Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE); - GlStateManager.color(1, 1, 1, 1); - Utils.drawTexturedRect(xPos - 2.5f, yPos - 2.5f, 5, 5, - 0, 5 / 512f, 247 / 512f, 252 / 512f, GL11.GL_NEAREST - ); - if (price2 != null) { - Utils.drawTexturedRect(xPos - 2.5f, yPos2 - 2.5f, 5, 5, - 0, 5 / 512f, 247 / 512f, 252 / 512f, GL11.GL_NEAREST - ); - } - - Date date = Date.from(Instant.ofEpochSecond(lowestDistTime)); - SimpleDateFormat displayFormat = new SimpleDateFormat("'§b'd MMMMM yyyy '§eat§b' HH:mm"); - NumberFormat nf = NumberFormat.getInstance(); - ArrayList<String> text = new ArrayList<>(); - text.add(displayFormat.format(date)); - if (itemData.isBz()) { - text.add(EnumChatFormatting.YELLOW + "" + EnumChatFormatting.BOLD + "Bazaar Insta-Buy: " + - EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + nf.format(price)); - text.add(EnumChatFormatting.YELLOW + "" + EnumChatFormatting.BOLD + "Bazaar Insta-Sell: " + - EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + nf.format(price2)); - } else { - text.add(EnumChatFormatting.YELLOW + "" + EnumChatFormatting.BOLD + "Lowest BIN: " + - EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + nf.format(price)); - } - drawHoveringText(text, xPos, yPos); - } - } - - if (mouseY >= guiTop + 17 && mouseY <= guiTop + 35 && mouseX >= guiLeft + 244 && mouseX <= guiLeft + 316) { - int index = (mouseX - guiLeft - 245) / 18; - switch (index) { - case 0: - Gui.drawRect(guiLeft + 245, guiTop + 17, guiLeft + 261, guiTop + 33, 0x80ffffff); - drawHoveringText(Collections.singletonList("Show 1 Hour"), mouseX, mouseY); - break; - case 1: - Gui.drawRect(guiLeft + 263, guiTop + 17, guiLeft + 279, guiTop + 33, 0x80ffffff); - drawHoveringText(Collections.singletonList("Show 1 Day"), mouseX, mouseY); - break; - case 2: - Gui.drawRect(guiLeft + 281, guiTop + 17, guiLeft + 297, guiTop + 33, 0x80ffffff); - drawHoveringText(Collections.singletonList("Show 1 Week"), mouseX, mouseY); - break; - case 3: - Gui.drawRect(guiLeft + 299, guiTop + 17, guiLeft + 315, guiTop + 33, 0x80ffffff); - drawHoveringText(Collections.singletonList("Show All"), mouseX, mouseY); - break; - } - } - } - - @Override - protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { - super.mouseClicked(mouseX, mouseY, mouseButton); - if (mouseY >= guiTop + 17 && mouseY <= guiTop + 35 && mouseX >= guiLeft + 244 && mouseX <= guiLeft + 316) { - mode = (mouseX - guiLeft - 245) / 18; - loadData(); - } else if (mouseY >= guiTop + 35 && mouseY <= guiTop + 198 && mouseX >= guiLeft + 17 && mouseX <= guiLeft + 315) { - customSelecting = true; - customStart = mouseX; - customEnd = mouseX; - } - } - - @Override - protected void mouseReleased(int mouseX, int mouseY, int state) { - super.mouseReleased(mouseX, mouseY, state); - if (customSelecting) { - customSelecting = false; - customStart = (int) map(customStart, guiLeft + 17, guiLeft + 315, firstTime, lastTime); - customEnd = (int) map(mouseX, guiLeft + 17, guiLeft + 315, firstTime, lastTime); - if (customStart > customEnd) { - long temp = customStart; - customStart = customEnd; - customEnd = temp; - } - if (customEnd - customStart != 0) { - mode = 4; - loadData(); - } - } - } - - @Override - protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) { - super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick); - if (customSelecting) { - customEnd = mouseX < guiLeft + 18 ? guiLeft + 18 : Math.min(mouseX, guiLeft + 314); - } - } - - private void loadData() { - itemData = null; - loaded = false; - new Thread(() -> { - File dir = new File("config/notenoughupdates/prices"); - if (!dir.exists()) { - loaded = true; - return; - } - File[] files = dir.listFiles(); - ItemData itemData = new ItemData(); - if (files == null) return; - for (File file : files) { - if (!file.getName().endsWith(".gz")) continue; - HashMap<String, ItemData> data2 = load(file); - if (data2 == null || !data2.containsKey(itemId)) continue; - if (data2.get(itemId).isBz()) { - if (itemData.bz == null) itemData.bz = data2.get(itemId).bz; - else itemData.bz.putAll(data2.get(itemId).bz); - } else if (itemData.ah == null) itemData.ah = data2.get(itemId).ah; - else itemData.ah.putAll(data2.get(itemId).ah); - } - if (itemData.get() != null && !itemData.get().isEmpty()) { - if (mode < 3) - itemData = new ItemData( - new TreeMap<>(itemData.get().entrySet().stream() - .filter(e -> e.getKey() > System.currentTimeMillis() / 1000 - - (mode == 0 ? 3600 : mode == 1 ? 86400 : 604800)) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))), - itemData.isBz() - ); - else if (mode == 4) - itemData = new ItemData( - new TreeMap<>(itemData.get().entrySet().stream() - .filter(e -> e.getKey() >= customStart && e.getKey() <= customEnd) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))), - itemData.isBz() - ); - if (itemData.get() == null || itemData.get().isEmpty()) { - loaded = true; - return; - } - this.itemData = trimData(itemData); - firstTime = this.itemData.get().firstKey(); - lastTime = this.itemData.get().lastKey(); - highestValue = this.itemData.isBz() ? this.itemData.bz.get(firstTime).b : this.itemData.ah.get(firstTime); - lowestValue = this.itemData.isBz() ? this.itemData.bz.get(firstTime).b : this.itemData.ah.get(firstTime); - for (long key : this.itemData.get().keySet()) { - double value1 = this.itemData.isBz() ? this.itemData.bz.get(key).b : this.itemData.ah.get(key); - Double value2 = this.itemData.isBz() ? this.itemData.bz.get(key).s : null; - if (value1 > highestValue) highestValue = value1; - if (value2 != null && value2 > highestValue) highestValue = value2; - if (value1 < lowestValue) lowestValue = value1; - if (value2 != null && value2 < lowestValue) lowestValue = value2; - } - } - loaded = true; - }).start(); - } - - public static void addToCache(JsonObject items, boolean bazaar) { - if (!NotEnoughUpdates.INSTANCE.config.ahGraph.graphEnabled) return; - try { - File dir = new File("config/notenoughupdates/prices"); - if (!dir.exists() && !dir.mkdir()) return; - File[] files = dir.listFiles(); - if (files != null) - for (File file : files) { - if (!file.getName().endsWith(".gz")) continue; - if (file.lastModified() < - System.currentTimeMillis() - NotEnoughUpdates.INSTANCE.config.ahGraph.dataRetention * 86400000L) - //noinspection ResultOfMethodCallIgnored - file.delete(); - } - Date date = new Date(); - Long epochSecond = date.toInstant().getEpochSecond(); - File file = new File(dir, "prices_" + format.format(date) + ".gz"); - HashMap<String, ItemData> prices = new HashMap<>(); - if (file.exists()) { - HashMap<String, ItemData> tempPrices = load(file); - if (tempPrices != null) prices = tempPrices; - } - for (Map.Entry<String, JsonElement> item : items.entrySet()) { - addOrUpdateItemPriceInfo(item, prices, epochSecond, bazaar); - } - //noinspection ResultOfMethodCallIgnored - file.createNewFile(); - try ( - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter( - new GZIPOutputStream(new FileOutputStream(file)), - StandardCharsets.UTF_8 - )) - ) { - writer.write(GSON.toJson(prices)); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - private static void addOrUpdateItemPriceInfo( - Map.Entry<String, JsonElement> item, - HashMap<String, ItemData> prices, - long timestamp, - boolean bazaar - ) { - String itemName = item.getKey(); - ItemData existingItemData = null; - if (prices.containsKey(itemName)) { - existingItemData = prices.get(itemName); - } - - // Handle transitions from ah to bz (the other direction typically doesn't happen) - if (existingItemData != null) { - if (existingItemData.isBz() && !bazaar) { - return; - } - - if (!existingItemData.isBz() && bazaar) { - prices.remove(itemName); - existingItemData = null; - } - } - - if (bazaar) { - if (!item.getValue().getAsJsonObject().has("curr_buy") || - !item.getValue().getAsJsonObject().has("curr_sell") - ) { - return; - } - - BzData bzData = new BzData( - item.getValue().getAsJsonObject().get("curr_buy").getAsFloat(), - item.getValue().getAsJsonObject().get("curr_sell").getAsFloat() - ); - - if (existingItemData != null) { - existingItemData.bz.put(timestamp, bzData); - } else { - TreeMap<Long, Object> mapData = new TreeMap<>(); - mapData.put(timestamp, bzData); - prices.put(item.getKey(), new ItemData(mapData, true)); - } - } else { - if (existingItemData != null) { - prices.get(item.getKey()).ah.put(timestamp, item.getValue().getAsBigDecimal().longValue()); - } else { - TreeMap<Long, Object> mapData = new TreeMap<>(); - mapData.put(timestamp, item.getValue().getAsLong()); - prices.put(item.getKey(), new ItemData(mapData, false)); - } - } - } - - private ItemData trimData(ItemData itemData) { - long first = itemData.get().firstKey(); - long last = itemData.get().lastKey(); - ItemData trimmed = new ItemData(); - if (itemData.isBz()) - trimmed.bz = new TreeMap<>(); - else - trimmed.ah = new TreeMap<>(); - int zones = NotEnoughUpdates.INSTANCE.config.ahGraph.graphZones; - Long[] dataArray = - !itemData.isBz() ? itemData.ah.keySet().toArray(new Long[0]) : itemData.bz.keySet().toArray(new Long[0]); - int prev = 0; - for (int i = 0; i < zones; i++) { - long lowest = (long) map(i, 0, zones, first, last); - long highest = (long) map(i + 1, 0, zones, first, last); - int amount = 0; - double sumBuy = 0; - double sumSell = 0; - for (int l = prev; l < dataArray.length; l++) { - if (dataArray[l] >= lowest && dataArray[l] <= highest) { - amount++; - sumBuy += itemData.isBz() ? itemData.bz.get(dataArray[l]).b : itemData.ah.get(dataArray[l]); - if (itemData.isBz()) sumSell += itemData.bz.get(dataArray[l]).s; - prev = l + 1; - } else if (dataArray[l] > highest) - break; - } - if (amount > 0) { - if (itemData.isBz()) - trimmed.bz.put(lowest, new BzData((float) (sumBuy / amount), (float) (sumSell / amount))); - else - trimmed.ah.put(lowest, (long) (sumBuy / amount)); - } - } - return trimmed; - } - - private static HashMap<String, ItemData> load(File file) { - Type type = new TypeToken<HashMap<String, ItemData>>() { - }.getType(); - if (file.exists()) { - try ( - BufferedReader reader = new BufferedReader(new InputStreamReader( - new GZIPInputStream(new FileInputStream(file)), - StandardCharsets.UTF_8 - )) - ) { - return GSON.fromJson(reader, type); - } catch (Exception e) { - System.out.println("Deleting " + file.getName() + " because it is probably corrupted."); - //noinspection ResultOfMethodCallIgnored - file.delete(); - } - } - return null; - } - - private static double map(double x, double in_min, double in_max, double out_min, double out_max) { - return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; - } - - private static String formatPrice(long price) { - DecimalFormat df = new DecimalFormat("#.00"); - if (price >= 1000000000) { - return df.format(price / 1000000000f) + "B"; - } else if (price >= 1000000) { - return df.format(price / 1000000f) + "M"; - } else if (price >= 1000) { - return df.format(price / 1000f) + "K"; - } - return String.valueOf(price); - } - - private int changeAlpha(int origColor, int alpha) { - origColor = origColor & 0x00ffffff; //drop the previous alpha value - return (alpha << 24) | origColor; //add the one the user inputted - } -} - -class ItemData { - public TreeMap<Long, Long> ah = null; - public TreeMap<Long, BzData> bz = null; - - public ItemData() { - } - - public ItemData(TreeMap<Long, ?> map, boolean bz) { - if (bz) - this.bz = (TreeMap<Long, BzData>) map; - else - this.ah = (TreeMap<Long, Long>) map; - } - - public TreeMap<Long, ?> get() { - return !isBz() ? ah : bz; - } - - public boolean isBz() { - return bz != null && !bz.isEmpty(); - } -} - -class BzData { - double b; - double s; - - public BzData(double b, double s) { - this.b = b; - this.s = s; - } -} diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java index 53906cd8..49053316 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java @@ -369,7 +369,7 @@ public class NEUConfig extends Config { @Expose @Category( - name = "AH/BZ Graph", + name = "Price Graph", desc = "Graph of auction and bazaar prices" ) public AHGraph ahGraph = new AHGraph(); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java index 58c58e3c..ff5bdf62 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java @@ -25,6 +25,7 @@ import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditor import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorDropdown; import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorKeybind; import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorSlider; +import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorText; import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigOption; import org.lwjgl.input.Keyboard; @@ -32,7 +33,7 @@ public class AHGraph { @Expose @ConfigOption( name = "Enable AH/BZ Price Graph", - desc = "Enable or disable the graph. Disabling this will also make it so that no price data is stored.", + desc = "Enable or disable the graph.", searchTags = {"auction", "bazaar"} ) @ConfigEditorBoolean @@ -58,6 +59,16 @@ public class AHGraph { @Expose @ConfigOption( + name = "Default Time", + desc = "Change the default time period for the graph." + ) + @ConfigEditorDropdown( + values = {"1 Hour", "1 Day", "1 Week", "All Time"} + ) + public int defaultMode = 1; + + @Expose + @ConfigOption( name = "Graph Colour", desc = "Set a custom colour for the graph.", searchTags = "color" @@ -76,13 +87,60 @@ public class AHGraph { @Expose @ConfigOption( - name = "Default Time", - desc = "Change the default time period for the graph." + name = "Moving Average", + desc = "Whether the graph should have a moving average line or not." + ) + @ConfigEditorBoolean + public boolean movingAverages = false; + // Disabled by default because it looks weird to people who don't know what it is + + @Expose + @ConfigOption( + name = "Moving Average Size (%)", + desc = "The percent of the time displayed that should be averaged." + ) + @ConfigEditorSlider( + minValue = 0.05f, + maxValue = 0.5f, + minStep = 0.05f + ) + public double movingAveragePercent = 0.2; + + @Expose + @ConfigOption( + name = "Moving Average Colour", + desc = "Set a custom colour for the graph's moving average line.", + searchTags = "color" + ) + @ConfigEditorColour + public String movingAverageColor = "0:255:0:255:171"; + + @Expose + @ConfigOption( + name = "Secondary Moving Average Colour", + desc = "Set a custom colour for the second graph's secondary moving average line line.", + searchTags = "color" + ) + @ConfigEditorColour + public String movingAverageColor2 = "0:255:255:109:0"; + + @Expose + @ConfigOption( + name = "Data Source", + desc = "Where NEU should get the data for the graph.\nPrices are only stored locally if this is set to 'Local'." ) @ConfigEditorDropdown( - values = {"1 Hour", "1 Day", "1 Week", "All Time"} + values = {"Server", "Local"} ) - public int defaultMode = 1; + public int dataSource = 0; + + @Expose + @ConfigOption( + name = "Price History API", + desc = "§4Do §lNOT §r§4change this, unless you know exactly what you are doing\n§fDefault: §apricehistory.notenoughupdates.org" + ) + @ConfigEditorText + public String serverUrl = "pricehistory.notenoughupdates.org"; @Expose @ConfigOption( |