aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2022-08-07 16:53:06 +0200
committerGitHub <noreply@github.com>2022-08-07 16:53:06 +0200
commit9d4fbd3d99a403b67a4b1f90c30f8b1f08ae7ca1 (patch)
treeb0cd15f3fdaa671378926980d0aa6bf4c4116e74
parent96f8ca477eb66a6cf5c7eec20e0574692418a591 (diff)
downloadNotEnoughUpdates-9d4fbd3d99a403b67a4b1f90c30f8b1f08ae7ca1.tar.gz
NotEnoughUpdates-9d4fbd3d99a403b67a4b1f90c30f8b1f08ae7ca1.tar.bz2
NotEnoughUpdates-9d4fbd3d99a403b67a4b1f90c30f8b1f08ae7ca1.zip
Bazaar Sacks (#206)
* adding bazaar sacks profit * using english number format * I feel like people could forget so I made it show insta sell price by default Co-authored-by: nopo <noahogno@gmail.com>
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java2
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BazaarSacksProfit.java182
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/TooltipTweaks.java8
3 files changed, 192 insertions, 0 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index 6bf6d86b..9931f945 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -34,6 +34,7 @@ import io.github.moulberry.notenoughupdates.listener.NEUEventListener;
import io.github.moulberry.notenoughupdates.listener.OldAnimationChecker;
import io.github.moulberry.notenoughupdates.listener.RenderListener;
import io.github.moulberry.notenoughupdates.miscfeatures.AuctionProfit;
+import io.github.moulberry.notenoughupdates.miscfeatures.BazaarSacksProfit;
import io.github.moulberry.notenoughupdates.miscfeatures.CrystalOverlay;
import io.github.moulberry.notenoughupdates.miscfeatures.CrystalWishingCompassSolver;
import io.github.moulberry.notenoughupdates.miscfeatures.CustomItemEffects;
@@ -289,6 +290,7 @@ public class NotEnoughUpdates {
MinecraftForge.EVENT_BUS.register(new SignCalculator());
MinecraftForge.EVENT_BUS.register(TrophyRewardOverlay.getInstance());
MinecraftForge.EVENT_BUS.register(PowerStoneStatsDisplay.getInstance());
+ MinecraftForge.EVENT_BUS.register(BazaarSacksProfit.getInstance());
MinecraftForge.EVENT_BUS.register(navigation);
if (Minecraft.getMinecraft().getResourceManager() instanceof IReloadableResourceManager) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BazaarSacksProfit.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BazaarSacksProfit.java
new file mode 100644
index 00000000..c80713a4
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BazaarSacksProfit.java
@@ -0,0 +1,182 @@
+/*
+ * 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.miscfeatures;
+
+import com.google.gson.JsonObject;
+import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.core.util.StringUtils;
+import io.github.moulberry.notenoughupdates.miscgui.TrophyRewardOverlay;
+import io.github.moulberry.notenoughupdates.util.ItemUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ContainerChest;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+import net.minecraftforge.fml.common.eventhandler.EventPriority;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import org.lwjgl.input.Keyboard;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+public class BazaarSacksProfit {
+
+ private static BazaarSacksProfit INSTANCE = null;
+ private boolean showSellOrderPrice = false;
+ private boolean pressedShiftLast = false;
+
+ public static BazaarSacksProfit getInstance() {
+ if (INSTANCE == null) {
+ INSTANCE = new BazaarSacksProfit();
+ }
+ return INSTANCE;
+ }
+
+ private final Map<String, Integer> prices = new HashMap<>();
+ private final Map<String, String> names = new HashMap<>();
+ private final List<String> invalidNames = new ArrayList<>();
+
+ @SubscribeEvent
+ public void onGuiOpen(GuiOpenEvent event) {
+ showSellOrderPrice = false;
+ prices.clear();
+ names.clear();
+ invalidNames.clear();
+ }
+
+ @SubscribeEvent(priority = EventPriority.LOW)
+ public void onItemTooltipLow(ItemTooltipEvent event) {
+ if (!NotEnoughUpdates.INSTANCE.config.tooltipTweaks.bazaarSacksProfit) return;
+ if (!inBazaar()) return;
+
+ ItemStack itemStack = event.itemStack;
+ String displayName = itemStack.getDisplayName();
+ if (!displayName.equals("§bSell Sacks Now")) return;
+
+ boolean shift = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
+ if (!pressedShiftLast && shift) {
+ showSellOrderPrice = !showSellOrderPrice;
+ }
+ pressedShiftLast = shift;
+
+ if (prices.isEmpty()) {
+ out:
+ for (String line : ItemUtils.getLore(itemStack)) {
+ if (line.contains("§7x ")) {
+ String[] split = line.split("§7x ");
+ String rawAmount = StringUtils.cleanColour(split[0]).replace(",", "").substring(1);
+ int amount = Integer.parseInt(rawAmount);
+ String bazaarName = split[1].split(" §7for")[0];
+ for (Map.Entry<String, JsonObject> entry : NotEnoughUpdates.INSTANCE.manager
+ .getItemInformation()
+ .entrySet()) {
+ String internalName = entry.getKey();
+ JsonObject object = entry.getValue();
+ if (object.has("displayname")) {
+ String displayname = object.get("displayname").getAsString();
+ if (displayname.equals(bazaarName)) {
+ prices.put(internalName, amount);
+ names.put(internalName, bazaarName);
+ continue out;
+ }
+ }
+ }
+ System.out.println("no bazaar item in repo found for '" + bazaarName + "'");
+ invalidNames.add(bazaarName);
+ }
+ }
+ }
+
+ event.toolTip.removeIf(line -> line.contains("§7x ") || line.contains("You earn:"));
+
+ Map<String, Float> map = new HashMap<>();
+ DecimalFormat formatter = (DecimalFormat) NumberFormat.getNumberInstance(Locale.ENGLISH);
+ formatter.applyPattern("#,##0");
+ double totalPrice = 0;
+ for (Map.Entry<String, Integer> entry : prices.entrySet()) {
+ String internalName = entry.getKey();
+ int amount = entry.getValue();
+ String name = names.get(internalName);
+
+ JsonObject bazaarInfo = NotEnoughUpdates.INSTANCE.manager.auctionManager.getBazaarInfo(internalName);
+
+ float price = 0;
+ if (bazaarInfo != null) {
+
+ if (showSellOrderPrice) {
+ if (bazaarInfo.has("curr_buy")) {
+ price = bazaarInfo.get("curr_buy").getAsFloat();
+ } else {
+ System.err.println("curr_sell does not exist for '" + internalName + "'");
+ }
+ } else {
+ if (bazaarInfo.has("curr_sell")) {
+ price = bazaarInfo.get("curr_sell").getAsFloat();
+ } else {
+ System.err.println("curr_sell does not exist for '" + internalName + "'");
+ }
+ }
+ }
+ float extraPrice = price * amount;
+ String priceFormat = formatter.format(extraPrice);
+ totalPrice += extraPrice;
+ map.put("§a" + formatter.format(amount) + "§7x §f" + name + " §6" + priceFormat, extraPrice);
+ }
+
+ if (showSellOrderPrice) {
+ event.toolTip.add(4, "§7Sell order price: §6" + formatter.format(totalPrice));
+ } else {
+ event.toolTip.add(4, "§7Instantly sell price: §6" + formatter.format(totalPrice));
+ }
+
+ event.toolTip.add(4, "");
+ for (String name : invalidNames) {
+ event.toolTip.add(4, name + " §cMissing repo data!");
+ }
+ for (String text : TrophyRewardOverlay.sortByValue(map).keySet()) {
+ event.toolTip.add(4, text);
+ }
+
+ event.toolTip.add("");
+ if (!showSellOrderPrice) {
+ event.toolTip.add("§8[Press SHIFT to show sell order price]");
+ } else {
+ event.toolTip.add("§8[Press SHIFT to show instantly sell price]");
+ }
+ }
+
+ public static boolean inBazaar() {
+ if (!NotEnoughUpdates.INSTANCE.isOnSkyblock()) return false;
+
+ Minecraft minecraft = Minecraft.getMinecraft();
+ if (minecraft == null || minecraft.thePlayer == null) return false;
+
+ Container inventoryContainer = minecraft.thePlayer.openContainer;
+ if (!(inventoryContainer instanceof ContainerChest)) return false;
+ ContainerChest containerChest = (ContainerChest) inventoryContainer;
+ return containerChest.getLowerChestInventory().getDisplayName().getUnformattedText().startsWith("Bazaar ");
+ }
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/TooltipTweaks.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/TooltipTweaks.java
index bcb7e8a7..0729df97 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/TooltipTweaks.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/TooltipTweaks.java
@@ -180,4 +180,12 @@ public class TooltipTweaks {
)
@ConfigEditorBoolean
public boolean powerStoneStats = true;
+
+ @Expose
+ @ConfigOption(
+ name = "Bazaar Sacks Profit",
+ desc = "Orders the items in your sacks in the bazaar inventory and adding buy order toggle"
+ )
+ @ConfigEditorBoolean
+ public boolean bazaarSacksProfit = true;
}