probably game changing rng meter changes (#295)

* probably game changing rng meter changes

* Updating the rng score with data from repo. This is needed since hypixel doesn't show the exact values for selected items. (Only 3k instead of 3,100)

3 files changed, 103 insertions, 8 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipRngListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipRngListener.java
index bbbb9049..fdae53ea 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipRngListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipRngListener.java
@@ -27,6 +27,8 @@ import io.github.moulberry.notenoughupdates.events.RepositoryReloadEvent;
 import io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer;
 import io.github.moulberry.notenoughupdates.util.Calculator;
 import io.github.moulberry.notenoughupdates.util.Constants;
+import io.github.moulberry.notenoughupdates.util.ItemResolutionQuery;
+import io.github.moulberry.notenoughupdates.util.ItemUtils;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
@@ -135,14 +137,18 @@ public class ItemTooltipRngListener {
 		event.toolTip.addAll(newToolTip);
 	}
 
-	private String getFormatCoinsPer(ItemStack stack, int needed, int multiplier, String name) {
-		String internalName = neu.manager.getInternalNameForItem(stack);
-		double bin = neu.manager.auctionManager.getBazaarOrBin(internalName);
-		if (bin <= 0) return null;
+	private String getFormatCoinsPer(ItemStack stack, int needed, int multiplier, String label) {
+		String internalName = neu.manager.createItemResolutionQuery().withItemStack(stack).resolveInternalName();
+		double profit = neu.manager.auctionManager.getBazaarOrBin(internalName);
+		if (profit <= 0) return null;
 
-		double coinsPer = (bin / needed) * multiplier;
+		//ask hypixel nicely to release a 'chest price api' with 4 dimensions for us. the 4 dimensions needed are: item name, floor, normal/mm, s/s+
+//		double chestPrice = grabChestPrice(stack, internalName);
+//		profit -= chestPrice;
+
+		double coinsPer = (profit / needed) * multiplier;
 		String format = StringUtils.shortNumberFormat(coinsPer);
-		return "§7Coins per " + name + ": §6" + format + " coins";
+		return "§7Coins per " + label + ": §6" + format + " coins";
 	}
 
 	private void fractionDisplay(List<String> newToolTip, String line) {
@@ -256,10 +262,12 @@ public class ItemTooltipRngListener {
 		Map<String, Integer> runsData;
 		String labelPlural;
 		String labelSingular;
+		String repoCategory;
 		if (openChestName.contains("Catacombs")) {
 			runsData = dungeonData;
 			labelPlural = "Runs";
 			labelSingular = "Run";
+			repoCategory = "catacombs";
 		} else { // Slayer
 			Matcher matcher = SLAYER_INVENTORY_TITLE_PATTERN.matcher(openChestName);
 			if (!matcher.matches()) {
@@ -271,6 +279,12 @@ public class ItemTooltipRngListener {
 			runsData = slayerData.get(slayerName);
 			labelPlural = "Bosses";
 			labelSingular = "Boss";
+			repoCategory = "slayer";
+		}
+
+		int repoScore = getRepoScore(stack, repoCategory);
+		if (repoScore != -1) {
+			needed = repoScore;
 		}
 
 		handleArrowKeys(runsData);
@@ -282,7 +296,7 @@ public class ItemTooltipRngListener {
 		String name = (String) runsData.keySet().toArray()[currentSelected];
 		int gainPerRun = runsData.get(name);
 
-		int runsNeeded = needed / gainPerRun;
+		int runsNeeded = (int) Math.floor((double) needed / (double) gainPerRun);
 		int runsHaving = having / gainPerRun;
 		String runsNeededFormat = GuiProfileViewer.numberFormat.format(runsNeeded);
 		String runsHavingFormat = GuiProfileViewer.numberFormat.format(runsHaving);
@@ -309,6 +323,49 @@ public class ItemTooltipRngListener {
 		}
 	}
 
+	private int getRepoScore(ItemStack stack, String repoCategory) {
+		ItemResolutionQuery query =
+			NotEnoughUpdates.INSTANCE.manager.createItemResolutionQuery().withItemStack(stack).withCurrentGuiContext();
+		String internalName = query.resolveInternalName();
+
+		JsonObject jsonObject = Constants.RNGSCORE;
+		if (jsonObject == null) {
+			Utils.showOutdatedRepoNotification();
+			return -1;
+		}
+
+		String repoType = grabRepoType(stack);
+		if (!jsonObject.has(repoCategory)) return -1;
+
+		JsonObject category = jsonObject.get(repoCategory).getAsJsonObject();
+		if (!category.has(repoType)) return -1;
+
+		JsonObject typeObject = category.get(repoType).getAsJsonObject();
+		if (!typeObject.has(internalName)) return -1;
+
+		return typeObject.get(internalName).getAsInt();
+	}
+
+	// Determines the floor or the slayer type from where the item can be obtained. E.g. F7, M3, Revenant Horror or Sven Packmaster
+	private String grabRepoType(ItemStack stack) {
+		String openChestName = Utils.getOpenChestName();
+		if (openChestName.contains("Catacombs")) {
+			if (openChestName.equals("Catacombs RNG Meter")) {
+				List<String> list = ItemUtils.getLore(stack);
+				String line = list.get(4);
+				return line.substring(26, 28);
+			} else {
+				// supporting more pages (f7/m7)
+				if (openChestName.contains("(")) {
+					return openChestName.substring(17, 19);
+				}
+				return openChestName.substring(11, 13);
+			}
+		} else {
+			return openChestName.substring(0, openChestName.length() - 9);
+		}
+	}
+
 	private void handleArrowKeys(Map<String, Integer> runsData) {
 		boolean left = Keyboard.isKeyDown(Keyboard.KEY_LEFT);
 		boolean right = Keyboard.isKeyDown(Keyboard.KEY_RIGHT);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/Constants.java b/src/main/java/io/github/moulberry/notenoughupdates/util/Constants.java
index 1d226dc8..ef030367 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/Constants.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/Constants.java
@@ -71,6 +71,7 @@ public class Constants {
 	public static JsonObject REFORGESTONES;
 	public static JsonObject TROPHYFISH;
 	public static JsonObject WEIGHT;
+	public static JsonObject RNGSCORE;
 
 	private static final ReentrantLock lock = new ReentrantLock();
 
@@ -92,6 +93,7 @@ public class Constants {
 			REFORGESTONES = Utils.getConstant("reforgestones", gson);
 			TROPHYFISH = Utils.getConstant("trophyfish", gson);
 			WEIGHT = Utils.getConstant("weight", gson);
+			RNGSCORE = Utils.getConstant("rngscore", gson);
 		} catch (Exception ex) {
 			ex.printStackTrace();
 		} finally {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
index 48eb6fad..75086b1f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
@@ -19,10 +19,11 @@
 
 package io.github.moulberry.notenoughupdates.util;
 
-import com.google.common.collect.Iterables;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import io.github.moulberry.notenoughupdates.NEUManager;
+import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.core.util.StringUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.inventory.GuiChest;
@@ -37,6 +38,7 @@ import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -170,6 +172,40 @@ public class ItemResolutionQuery {
 			}
 			return null;
 		}
+		if (guiName.equals("Catacombs RNG Meter")) {
+			return resolveItemInCatacombsRngMeter();
+		}
+		return null;
+	}
+
+	private String resolveItemInCatacombsRngMeter() {
+		List<String> lore = ItemUtils.getLore(compound);
+		if (lore.size() > 16) {
+			String s = lore.get(15);
+			if (s.equals("§7Selected Drop")) {
+				String displayName = lore.get(16);
+				return getInternalNameByDisplayName(displayName);
+			}
+		}
+
+		return null;
+	}
+
+	private String getInternalNameByDisplayName(String displayName) {
+		String cleanDisplayName = StringUtils.cleanColour(displayName);
+		for (Map.Entry<String, JsonObject> entry : NotEnoughUpdates.INSTANCE.manager
+			.getItemInformation()
+			.entrySet()) {
+
+			JsonObject object = entry.getValue();
+			if (object.has("displayname")) {
+				String name = object.get("displayname").getAsString();
+				if (StringUtils.cleanColour(name).equals(cleanDisplayName)) {
+					return entry.getKey();
+				}
+			}
+		}
+
 		return null;
 	}