Refactor Accessories Helper: Introduce new configuration structure and add option to highlight duplicate accessories

CHANGELOG.md

@@ -1,3 +1,30 @@
+# Release 6.8.2
+
+## Highlight
+* Storage Overlay changes
+  * Add darkening effect to slots that do not match the search text
+  * Add an option to reopen the previous backpack when running /storage
+  * Add a small highlight to hovered backpacks/ender chests
+  * Fix search not indexing item tooltips
+  * Fix some things overlapping with the search bar
+  * Fix being able to interact with slots through the search bar
+* Fix Kuudra Profit Calculation for enchantments
+* Fix Hunting Box Helper
+* Fix SkyBlock Item List exclusion zones not working sometimes
+* Fix new waypoints not respecting group options
+* Fix Fancy Bars config not mentioning the new Vitality bar
+
+## What's Changed
+* fix new waypoints not respecting group options by @viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/2597
+* Remove Config Check For SkyBlock Item List Exclusion Zones by @Alex33856 in https://github.com/SkyblockerMod/Skyblocker/pull/2599
+* some more storage overlay things by @viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/2598
+* fix weird clicky behavior in the screen of the overlay of the storage by @viciscat in https://github.com/SkyblockerMod/Skyblocker/pull/2610
+
+
+**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v6.8.1+26.2...v6.8.2+26.2
+
+___
+
 # Release 6.8.1
 
 ## Highlight

gradle.properties

@@ -59,7 +59,7 @@ checkstyle_version=13.6.0
 mod_publish_plugin_version=2.1.1
 
 # Mod Properties
-mod_version = 6.8.1
+mod_version = 6.8.2
 maven_group = de.hysky
 archives_base_name = skyblocker
 modrinth_id=y6DuFGwJ

src/main/java/de/hysky/skyblocker/config/CommonTags.java

@@ -16,8 +16,9 @@ public final class CommonTags {
 	public static final Component ADDED_IN_6_7_0 = Component.literal("v6.7.0");
 	public static final Component ADDED_IN_6_8_0 = Component.literal("v6.8.0");
 	public static final Component ADDED_IN_6_8_1 = Component.literal("v6.8.1");
+	public static final Component ADDED_IN_6_8_2 = Component.literal("v6.8.2");
 
-	public static final Component LATEST_VERSION_TAG = ADDED_IN_6_8_1;
+	public static final Component LATEST_VERSION_TAG = ADDED_IN_6_8_2;
 
 	/// Common tags for {@link net.minecraft.client.KeyMapping KeyMappings} to make them all easily searchable.
 	public static final Component[] KEY_MAPPING = { Component.translatable("skyblocker.config.tag.keyBind"), Component.translatable("skyblocker.config.tag.keyMapping") };

src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java

@@ -79,16 +79,50 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 								newValue -> config.helpers.enableAnvilHelper = newValue)
 						.controller(ConfigUtils.createBooleanController())
 						.build())
-				// Accessories Helper Widget
-				.option(Option.<Boolean>createBuilder()
-						.name(Component.translatable("skyblocker.config.helpers.enableAccessoriesHelperWidget"))
-						.description(Component.translatable("skyblocker.config.helpers.enableAccessoriesHelperWidget.@Tooltip"))
-						.tags(CommonTags.ADDED_IN_6_0_0)
-						.binding(defaults.helpers.enableAccessoriesHelperWidget,
-								() -> config.helpers.enableAccessoriesHelperWidget,
-								newValue -> config.helpers.enableAccessoriesHelperWidget = newValue)
-						.controller(ConfigUtils.createBooleanController())
+				// Accessories
+<<<<<<< HEAD
+.group(OptionGroup.createBuilder()
+		.name(Component.translatable("skyblocker.config.helpers.accessories"))
+		.collapsed(true)
+		.option(Option.<Boolean>createBuilder()
+				.name(Component.translatable("skyblocker.config.helpers.accessories.enableAccessoriesHelperWidget"))
+				.description(Component.translatable("skyblocker.config.helpers.accessories.enableAccessoriesHelperWidget.@Tooltip"))
+				.tags(CommonTags.ADDED_IN_6_0_0)
+				.binding(defaults.helpers.accessories.enableAccessoriesHelperWidget,
+						() -> config.helpers.accessories.enableAccessoriesHelperWidget,
+						newValue -> config.helpers.accessories.enableAccessoriesHelperWidget = newValue)
+				.controller(ConfigUtils.createBooleanController())
+				.build())
+		.option(Option.<Boolean>createBuilder()
+				.name(Component.translatable("skyblocker.config.helpers.accessories.showDuplicateAccessories"))
+				.binding(defaults.helpers.accessories.showDuplicateAccessories,
+						() -> config.helpers.accessories.showDuplicateAccessories,
+						newValue -> config.helpers.accessories.showDuplicateAccessories = newValue)
+				.controller(ConfigUtils.createBooleanController())
+				.build())
+		.build())
+=======
+				.group(OptionGroup.createBuilder()
+						.name(Component.translatable("skyblocker.config.helpers.accessories"))
+						.collapsed(true)
+						.option(Option.<Boolean>createBuilder()
+								.name(Component.translatable("skyblocker.config.helpers.accessories.enableAccessoriesHelperWidget"))
+								.description(Component.translatable("skyblocker.config.helpers.accessories.enableAccessoriesHelperWidget.@Tooltip"))
+								.tags(CommonTags.ADDED_IN_6_0_0)
+								.binding(defaults.helpers.accessories.enableAccessoriesHelperWidget,
+										() -> config.helpers.accessories.enableAccessoriesHelperWidget,
+										newValue -> config.helpers.accessories.enableAccessoriesHelperWidget = newValue)
+								.controller(ConfigUtils.createBooleanController())
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Component.translatable("skyblocker.config.helpers.accessories.showDuplicateAccessories"))
+								.binding(defaults.helpers.accessories.showDuplicateAccessories,
+										() -> config.helpers.accessories.showDuplicateAccessories,
+										newValue -> config.helpers.accessories.showDuplicateAccessories = newValue)
+								.controller(ConfigUtils.createBooleanController())
+								.build())
 						.build())
+>>>>>>> 85f1ed11d (Removed the green - jsut higlighting uniques)
 
 				// Builder's Wand and Ruler Preview
 				.group(OptionGroup.createBuilder()

src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java

@@ -289,6 +289,15 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
 										newValue -> config.uiAndVisuals.storageOverlay.rememberSearch = newValue)
 								.controller(ConfigUtils.createBooleanController())
 								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Component.translatable("skyblocker.config.uiAndVisuals.storageOverlay.rememberOpened"))
+								.description(Component.translatable("skyblocker.config.uiAndVisuals.storageOverlay.rememberOpened.@Tooltip"))
+								.tags(CommonTags.ADDED_IN_6_8_2)
+								.binding(defaults.uiAndVisuals.storageOverlay.rememberOpened,
+										() -> config.uiAndVisuals.storageOverlay.rememberOpened,
+										newValue -> config.uiAndVisuals.storageOverlay.rememberOpened = newValue)
+								.controller(ConfigUtils.createBooleanController())
+								.build())
 						.build()
 				)
 

src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java

@@ -4,8 +4,10 @@
 import de.hysky.skyblocker.skyblock.item.SkyblockItemRarity;
 import de.hysky.skyblocker.utils.Location;
 import de.hysky.skyblocker.utils.waypoint.Waypoint;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import net.minecraft.client.resources.language.I18n;
 
 public class HelperConfig {
@@ -21,7 +23,7 @@ public class HelperConfig {
 
 	public boolean enableAnvilHelper = true;
 
-	public boolean enableAccessoriesHelperWidget = true;
+	public Accessories accessories = new Accessories();
 
 	public BuildersWand buildersWand = new BuildersWand();
 
@@ -45,16 +47,26 @@ public class HelperConfig {
 
 	public GreatSpookEvent greatSpookEvent = new GreatSpookEvent();
 
-	public CenturyRaffle centuryRaffle = new CenturyRaffle();
+	public static class Accessories {
+	public boolean enableAccessoriesHelperWidget = true;
+
+	public boolean showDuplicateAccessories = true;
+}
+
+	public static class Accessories {
+		public boolean enableAccessoriesHelperWidget = true;
+
+		public boolean showDuplicateAccessories = true;
+	}
 
 	public static class BuildersWand {
-		public boolean enableBuildersWandPreview = true;
+	public boolean enableBuildersWandPreview = true;
 
-		public float previewOpacity = 0.5f;
+	public float previewOpacity = 0.5f;
 	}
 
 	public static class MythologicalRitual {
-		public boolean enableMythologicalRitualHelper = true;
+	public boolean enableMythologicalRitualHelper = true;
 	}
 
 	public static class Jerry {
@@ -122,11 +134,6 @@ public String toString() {
 		}
 	}
 
-	// Placeholder!
-	public static class Loadouts {
-
-	}
-
 	public static class FairySouls {
 		public boolean enableFairySoulsHelper = false;
 
@@ -177,10 +184,4 @@ public static class ItemPrice {
 	public static class GreatSpookEvent {
 		public boolean enableMathTeacherHelper = true;
 	}
-
-	public static class CenturyRaffle {
-		public boolean enableRaffleTaskHighlight = true;
-
-		public boolean enableRaffleRewardHighlight = true;
-	}
 }

src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java

@@ -126,6 +126,8 @@ public static class StorageOverlay {
 
 		public boolean rememberSearch = false;
 
+		public boolean rememberOpened = false;
+
 		// present in case we need to patch it out for x or y reason
 		public transient boolean doNotResetCursor = true;
 	}

src/main/java/de/hysky/skyblocker/skyblock/accessories/AccessoriesContainerSolver.java

@@ -4,34 +4,69 @@
 import de.hysky.skyblocker.utils.container.SimpleContainerSolver;
 import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.util.CommonColors;
 import net.minecraft.util.ARGB;
+import net.minecraft.util.CommonColors;
+import net.minecraft.world.item.ItemStack;
 import org.jspecify.annotations.Nullable;
 
 import java.util.List;
 
 public class AccessoriesContainerSolver extends SimpleContainerSolver {
-	private static final int COLOR = ARGB.color(0.7f, CommonColors.GREEN);
+<<<<<<< HEAD
+	private static final int UNIQUE_COLOR = ARGB.color(0.7f, CommonColors.GREEN);
+	private static final int DUPLICATE_COLOR = ARGB.color(0.7f, CommonColors.RED);
+=======
+>>>>>>> 85f1ed11d (Removed the green - jsut higlighting uniques)
 	public static final AccessoriesContainerSolver INSTANCE = new AccessoriesContainerSolver();
-
+	private static final int DUPLICATE_COLOR = ARGB.color(0.45f, CommonColors.RED);
 	@Nullable String highlightedAccessory;
 
 	protected AccessoriesContainerSolver() {
 		super(AccessoriesHelper.ACCESSORY_BAG_TITLE);
 	}
 
 	@Override
+<<<<<<< HEAD
+public List<ColorHighlight> getColors(Int2ObjectMap<ItemStack> slots) {
+	return slots.int2ObjectEntrySet().stream()
+			.map(entry -> {
+				int slot = entry.getIntKey();
+				ItemStack stack = entry.getValue();
+
+				String id = stack.getSkyblockId();
+
+				if (id.isEmpty()) return null;
+
+				if (SkyblockerConfigManager.get().helpers.accessories.enableAccessoriesHelperWidget
+						&& SkyblockerConfigManager.get().helpers.accessories.showDuplicateAccessories
+						&& AccessoriesHelper.duplicateSlots.contains(slot)) {
+					return new ColorHighlight(slot, DUPLICATE_COLOR);
+				}
+
+				return new ColorHighlight(slot, UNIQUE_COLOR);
+			})
+			.filter(java.util.Objects::nonNull)
+			.toList();
+}
+=======
 	public List<ColorHighlight> getColors(Int2ObjectMap<ItemStack> slots) {
 		if (highlightedAccessory == null) return List.of();
 		return slots.int2ObjectEntrySet().stream()
-				.filter(entry -> entry.getValue().getSkyblockId().equals(highlightedAccessory))
-				.map(entry -> new ColorHighlight(entry.getIntKey(), COLOR))
+				.filter(entry ->
+						SkyblockerConfigManager.get().helpers.accessories.enableAccessoriesHelperWidget
+								&& SkyblockerConfigManager.get().helpers.accessories.showDuplicateAccessories
+								&& AccessoriesHelper.duplicateSlots.contains(entry.getIntKey()))
+				.map(entry -> new ColorHighlight(entry.getIntKey(), DUPLICATE_COLOR))
 				.toList();
 	}
+>>>>>>> 85f1ed11d (Removed the green - jsut higlighting uniques)
 
 	@Override
 	public boolean isEnabled() {
-		return SkyblockerConfigManager.get().helpers.enableAccessoriesHelperWidget;
+		return SkyblockerConfigManager.get().helpers.accessories.showDuplicateAccessories;
+<<<<<<< HEAD
+}
+=======
 	}
+>>>>>>> 85f1ed11d (Removed the green - jsut higlighting uniques)
 }