From 206068c3acfd70e67574c22fe51fc0ab8e46ca80 Mon Sep 17 00:00:00 2001
From: MehVahdJukaar <matteogozzi1998@gmail.com>
Date: Sat, 1 Jun 2024 20:18:10 +0200
Subject: [PATCH] build

---
 build.properties                                  |  4 ++--
 changelog.txt                                     | 11 ++---------
 .../experimental/config/VariantsConfig.java       | 15 ++++++++-------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/build.properties b/build.properties
index 42992a7cd..42d8aba5f 100644
--- a/build.properties
+++ b/build.properties
@@ -1,9 +1,9 @@
-#Sat Jun 01 15:50:12 UTC 2024
+#Sat Jun 01 18:18:10 UTC 2024
 mapping_version=1.20.1
 version=4.0
 mod_name=Quark
 mc_version=1.20.1
 mapping_channel=official
 mod_id=quark
-build_number=453
+build_number=454
 dir_output=../Build Output/Quark/
diff --git a/changelog.txt b/changelog.txt
index 9e5c24919..cf9735f0f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,9 +1,2 @@
-- Fixed pathfinder quill duplicating when used in offhand
-- Fixed magnets only pushing armor items
-- Fixed magnets pushing players regardless of whether they have armor or not
-- Rune colors are now extensible. Custom ones can be added by mods
-- Variant selector and rotation lock HUD overlays can now render similar to crosshair, Improving visibility in bright environments
-- You can now middle click a block to select it with variant selector, either when you have a variant block or a hammer in hand
-- Variant selector wheel wont appear anymore for blocks with no variants
-- Hammer won't play swing animation when it didn't change a variant
-- Fixed magnets not pulling certain magnetic items
\ No newline at end of file
+- Fixed a crash when middle clicking a block and having Variant Selector module off
+- Middle clicking a variant block while NOT having its parent variant in hand will now make you select the latter
\ No newline at end of file
diff --git a/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java b/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java
index bc32b598f..080fc72de 100644
--- a/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java
+++ b/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java
@@ -55,13 +55,13 @@ public class VariantsConfig implements IConfigType {
 	)
 	private List<String> blacklist = Arrays.asList("minecraft:snow", "minecraft:bamboo", "minecraft:bamboo_block");
 
-	private Map<Block, VariantMap> blockVariants = new HashMap<>();
-	private Map<Block, Block> originals = new HashMap<>();
-	private Multimap<String, String> aliasMap = HashMultimap.create();
-	private Multimap<Block, ManualVariant> manualVariantMap = HashMultimap.create();
+	private final Map<Block, VariantMap> blockVariants = new HashMap<>();
+	private final Map<Block, Block> originals = new HashMap<>();
+	private final Multimap<String, String> aliasMap = HashMultimap.create();
+	private final Multimap<Block, ManualVariant> manualVariantMap = HashMultimap.create();
 
-	private List<String> visibleVariants = new ArrayList<>();
-	private List<String> sortedSuffixes;
+	private final List<String> visibleVariants = new ArrayList<>();
+	private final List<String> sortedSuffixes = new ArrayList<>();
 
 	public VariantsConfig() {}
 
@@ -72,6 +72,7 @@ public void onReload(ZetaModule module, ConfigFlagManager flagManager) {
 		originals.clear();
 		aliasMap.clear();
 		manualVariantMap.clear();
+		sortedSuffixes.clear();
 
 		if(module != null && !module.enabled)
 			return;
@@ -79,7 +80,7 @@ public void onReload(ZetaModule module, ConfigFlagManager flagManager) {
 		for(String s : variantTypes)
 			visibleVariants.add(s.replaceAll("!", ""));
 
-		sortedSuffixes = new ArrayList<>(visibleVariants);
+		sortedSuffixes.addAll(visibleVariants);
 		sortedSuffixes.sort((s1, s2) -> { // sort by amount of _
 			int ct1 = s1.replaceAll("[^_]", "").length();
 			int ct2 = s2.replaceAll("[^_]", "").length();