add option for craft cost

3 files changed, 42 insertions, 39 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 f936ceb1..63a58fb1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
@@ -241,8 +241,8 @@ public class NEUConfig extends Config {
 
 	@Expose
 	@Category(
-		name = "Todo Overlay",
-		desc = "Todo Overlay"
+		name = "Misc Overlays",
+		desc = "Miscellaneous Overlays"
 	)
 	public MiscOverlays miscOverlays = new MiscOverlays();
 
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 29edb314..3a7d0b81 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
@@ -24,7 +24,6 @@ import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigAccord
 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.ConfigEditorColour;
 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;
@@ -295,39 +294,4 @@ public class Misc {
 	)
 	@ConfigEditorBoolean
 	public boolean abiphoneFavourites = true;
-
-	@ConfigOption(
-		name = "Museum Overlay",
-		desc = ""
-	)
-	@ConfigEditorAccordion(id = 2)
-	public boolean museumAccordion = false;
-
-	@ConfigOption(
-		name = "Show Museum Items",
-		desc = "Show real items instead of green dye in the museum"
-	)
-	@ConfigAccordionId(id = 2)
-	@ConfigEditorBoolean
-	@Expose
-	public boolean museumItemShow = true;
-
-	@ConfigOption(
-		name = "Highlight the virtual museum items",
-		desc = "Highlight virtual museum items"
-	)
-	@ConfigAccordionId(id = 2)
-	@ConfigEditorColour
-	@Expose
-	public String museumItemColor = "0:255:0:255:0";
-
-	@Expose
-	@ConfigOption(
-		name = "Enable Overlay",
-		desc = "Show the cheapest items you have not yet donated to the Museum"
-	)
-	@ConfigEditorBoolean
-	@ConfigAccordionId(id = 2)
-	public boolean museumCheapestItemOverlay = true;
-
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java
index bb713041..f6710514 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java
@@ -24,6 +24,7 @@ import io.github.moulberry.notenoughupdates.core.config.Position;
 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.ConfigEditorColour;
 import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorDraggableList;
 import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorDropdown;
 import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigOption;
@@ -436,5 +437,43 @@ public class MiscOverlays {
 		desc = ""
 	)
 	@ConfigEditorAccordion(id = 1)
-	public boolean museumOverlay = true;
+	public boolean museumAccordion = true;
+
+	@Expose
+	@ConfigOption(
+		name = "Show Museum Items",
+		desc = "Show real items instead of green dye in the museum"
+	)
+	@ConfigAccordionId(id = 1)
+	@ConfigEditorBoolean
+	public boolean museumItemShow = true;
+
+	@Expose
+	@ConfigOption(
+		name = "Highlight virtual museum items",
+		desc = "Highlight virtual museum items with a background color"
+	)
+	@ConfigAccordionId(id = 1)
+	@ConfigEditorColour
+	public String museumItemColor = "0:255:0:255:0";
+
+	@Expose
+	@ConfigOption(
+		name = "Show Items to donate",
+		desc = "Show the cheapest items you have not yet donated to the Museum"
+	)
+	@ConfigEditorBoolean
+	@ConfigAccordionId(id = 1)
+	public boolean museumCheapestItemOverlay = true;
+
+	@Expose
+	@ConfigOption(
+		name = "Value calculation",
+		desc = "Choose the source for the value calculation"
+	)
+	@ConfigEditorDropdown(
+		values = {"Lowest BIN", "Craft cost"}
+	)
+	@ConfigAccordionId(id = 1)
+	public int museumCheapestItemOverlayValueSource = 0;
 }