fix click callback running on init, fully remove vanilla mode

rosebudmods · May 19, 2024 · ff67c95 · ff67c95
1 parent 34ff997
commit ff67c95
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 11 deletions.
diff --git a/src/main/java/io/ix0rai/rainglow/config/DeferredSaveOption.java b/src/main/java/io/ix0rai/rainglow/config/DeferredSaveOption.java
@@ -33,7 +33,9 @@ public void set(T value) {
 			this.deferredValue = object;
 		} else {
 			this.deferredValue = object;
-			this.clickCallback.accept(object);
+			if (!object.equals(this.value)) {
+				this.clickCallback.accept(object);
+			}
 			// note: update callback is called on save
 		}
 	}

diff --git a/src/main/resources/assets/rainglow/custom_modes/vanilla.json b/src/main/resources/assets/rainglow/custom_modes/vanilla.json
diff --git a/src/main/resources/assets/rainglow/lang/de_de.json b/src/main/resources/assets/rainglow/lang/de_de.json
@@ -16,7 +16,6 @@
   "rainglow.mode.rainbow": "Regenbogen",
   "rainglow.mode.all_colours": "Alle Farben",
   "rainglow.mode.monochrome": "Monochrom",
-  "rainglow.mode.vanilla": "Standard",
   "rainglow.mode.custom": "Benutzerdefiniert",
   "rainglow.mode.trans_pride": "Transgender Pride!",
   "rainglow.mode.lesbian_pride": "Lesbian Pride!",

diff --git a/src/main/resources/assets/rainglow/lang/en_us.json b/src/main/resources/assets/rainglow/lang/en_us.json
@@ -25,7 +25,6 @@
   "rainglow.mode.rainbow": "Rainbow",
   "rainglow.mode.all_colours": "All Colours",
   "rainglow.mode.monochrome": "Monochrome",
-  "rainglow.mode.vanilla": "Vanilla",
   "rainglow.mode.custom": "Custom",
   "rainglow.mode.trans_pride": "Transgender Pride!",
   "rainglow.mode.lesbian_pride": "Lesbian Pride!",

diff --git a/src/main/resources/assets/rainglow/lang/fr_fr.json b/src/main/resources/assets/rainglow/lang/fr_fr.json
@@ -16,7 +16,6 @@
   "rainglow.mode.rainbow": "Arc-en-ciel",
   "rainglow.mode.all_colours": "Toutes les Couleurs",
   "rainglow.mode.monochrome": "Monochrome",
-  "rainglow.mode.vanilla": "Vanille",
   "rainglow.mode.custom": "Personnalisé",
   "rainglow.mode.trans_pride": "Fierté Transgenre !",
   "rainglow.mode.lesbian_pride": "Fierté Lesbienne !",