dungeons and pv bingo tab (#93)

4 files changed, 98 insertions, 8 deletions

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 1d03a2d1..25c47fce 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
@@ -12,20 +12,20 @@ import io.github.moulberry.notenoughupdates.miscgui.GuiEnchantColour;
 import io.github.moulberry.notenoughupdates.miscgui.GuiInvButtonEditor;
 import io.github.moulberry.notenoughupdates.miscgui.NEUOverlayPlacements;
 import io.github.moulberry.notenoughupdates.options.customtypes.NEUDebugFlag;
-import io.github.moulberry.notenoughupdates.options.seperateSections.AccessoryBag;
 import io.github.moulberry.notenoughupdates.options.seperateSections.AHGraph;
 import io.github.moulberry.notenoughupdates.options.seperateSections.AHTweaks;
+import io.github.moulberry.notenoughupdates.options.seperateSections.AccessoryBag;
 import io.github.moulberry.notenoughupdates.options.seperateSections.ApiKey;
 import io.github.moulberry.notenoughupdates.options.seperateSections.Calendar;
 import io.github.moulberry.notenoughupdates.options.seperateSections.CustomArmour;
-import io.github.moulberry.notenoughupdates.options.seperateSections.Dungeons;
 import io.github.moulberry.notenoughupdates.options.seperateSections.DungeonMapConfig;
+import io.github.moulberry.notenoughupdates.options.seperateSections.Dungeons;
 import io.github.moulberry.notenoughupdates.options.seperateSections.Enchanting;
 import io.github.moulberry.notenoughupdates.options.seperateSections.Fishing;
 import io.github.moulberry.notenoughupdates.options.seperateSections.ImprovedSBMenu;
 import io.github.moulberry.notenoughupdates.options.seperateSections.InventoryButtons;
-import io.github.moulberry.notenoughupdates.options.seperateSections.Itemlist;
 import io.github.moulberry.notenoughupdates.options.seperateSections.ItemOverlays;
+import io.github.moulberry.notenoughupdates.options.seperateSections.Itemlist;
 import io.github.moulberry.notenoughupdates.options.seperateSections.LocationEdit;
 import io.github.moulberry.notenoughupdates.options.seperateSections.Mining;
 import io.github.moulberry.notenoughupdates.options.seperateSections.Misc;
@@ -33,9 +33,10 @@ import io.github.moulberry.notenoughupdates.options.seperateSections.MiscOverlay
 import io.github.moulberry.notenoughupdates.options.seperateSections.NeuAuctionHouse;
 import io.github.moulberry.notenoughupdates.options.seperateSections.Notifications;
 import io.github.moulberry.notenoughupdates.options.seperateSections.PetOverlay;
+import io.github.moulberry.notenoughupdates.options.seperateSections.ProfileViewer;
+import io.github.moulberry.notenoughupdates.options.seperateSections.SkillOverlays;
 import io.github.moulberry.notenoughupdates.options.seperateSections.SlayerOverlay;
 import io.github.moulberry.notenoughupdates.options.seperateSections.SlotLocking;
-import io.github.moulberry.notenoughupdates.options.seperateSections.SkillOverlays;
 import io.github.moulberry.notenoughupdates.options.seperateSections.StorageGUI;
 import io.github.moulberry.notenoughupdates.options.seperateSections.Toolbar;
 import io.github.moulberry.notenoughupdates.options.seperateSections.TooltipTweaks;
@@ -327,6 +328,13 @@ public class NEUConfig extends Config {
 
 	@Expose
 	@Category(
+		name = "Profile Viewer",
+		desc = "Profile Viewer"
+	)
+	public ProfileViewer profileViewer = new ProfileViewer();
+
+	@Expose
+	@Category(
 		name = "Api Key",
 		desc = "Api Key"
 	)
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHTweaks.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHTweaks.java
index 0d21a96f..63c4fe8d 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHTweaks.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHTweaks.java
@@ -66,8 +66,8 @@ public class AHTweaks {
 
 	@Expose
 	@ConfigOption(
-		name = "Warning Threshold",
-		desc = "Threshold for BIN warning\nExample: 10% means warn if sell price is 10% lower than lowestbin"
+		name = "Undercut Warning Threshold",
+		desc = "Threshold for BIN warning\nExample: 10% means warn if sell price is 10% lower than lowest bin"
 	)
 	@ConfigEditorSlider(
 		minValue = 0.0f,
@@ -77,6 +77,19 @@ public class AHTweaks {
 	@ConfigAccordionId(id = 1)
 	public float warningThreshold = 10f;
 
+	@Expose
+	@ConfigOption(
+		name = "Overcut Warning Threshold",
+		desc = "Threshold for BIN warning\nExample: 50% means warn if sell price is 50% higher than lowest bin"
+	)
+	@ConfigEditorSlider(
+		minValue = 0.0f,
+		maxValue = 100.0f,
+		minStep = 5f
+	)
+	@ConfigAccordionId(id = 1)
+	public float overcutWarningThreshold = 50f;
+
 	@ConfigOption(
 		name = "Sort Warning",
 		desc = ""
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Misc.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Misc.java
index 058b13d8..e872bfc0 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Misc.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Misc.java
@@ -1,7 +1,13 @@
 package io.github.moulberry.notenoughupdates.options.seperateSections;
 
 import com.google.gson.annotations.Expose;
-import io.github.moulberry.notenoughupdates.core.config.annotations.*;
+import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigAccordionId;
+import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorAccordion;
+import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorBoolean;
+import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorButton;
+import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorDropdown;
+import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorSlider;
+import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigOption;
 
 public class Misc {
 	@Expose
@@ -141,4 +147,4 @@ public class Misc {
 	@ConfigEditorBoolean
 	public boolean disableNPCRetexturing = false;
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ProfileViewer.java
new file mode 100644
index 00000000..2e1d0619
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ProfileViewer.java
@@ -0,0 +1,63 @@
+package io.github.moulberry.notenoughupdates.options.seperateSections;
+
+import com.google.gson.annotations.Expose;
+import io.github.moulberry.notenoughupdates.core.config.annotations.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ProfileViewer {
+
+	@ConfigOption(
+		name = "Profile Viewer info",
+		desc =
+			"The Profile Viewer requires you to have an \u00A72api key\u00A77 set (if you don't have one set do \u00A72/api new\u00A77)\n"
+	)
+	@ConfigEditorFSR(
+		runnableId = 12,
+		buttonText = ""
+	)
+	public boolean pvInfo = false;
+
+	@Expose
+	@ConfigOption(
+		name = "Open Profile Viewer",
+		desc = "Brings up the profile viewer (/pv)\n" +
+			"Shows stats and networth of players"
+	)
+	@ConfigEditorButton(
+		runnableId = 13,
+		buttonText = "Open"
+	)
+	public boolean openPV = true;
+
+	@Expose
+	@ConfigOption(
+		name = "Page layout",
+		desc = "\u00a7rSelect the order of the pages at the top of the Profile Viewer\n" +
+			"\u00a7eDrag text to rearrange"
+	)
+	@ConfigEditorDraggableList(
+		exampleText = {
+			"\u00a7eBasic Info",
+			"\u00a7eDungeons",
+			"\u00a7eExtra Info",
+			"\u00a7eInventories",
+			"\u00a7eCollections",
+			"\u00a7ePets",
+			"\u00a7eMining",
+			"\u00a7eBingo",
+		},
+		allowRemovingElements = false
+	)
+	public List<Integer> pageLayout = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7));
+
+	@Expose
+	@ConfigOption(
+		name = "Always show bingo tab",
+		desc = "Always show bingo tab or only show it when the bingo profile is selected"
+	)
+	@ConfigEditorBoolean
+	public boolean alwaysShowBingoTab = false;
+}