Customizable low battery notification percentage

Signed-off-by: Lilly Rose Berner <lilly@lostluma.net>

Author: LostLuma

platforms/common/src/main/java/dynamic_fps/impl/DynamicFPSMod.java

@@ -186,7 +186,9 @@ public static boolean shouldShowLevels() {
 	}
 
 	public static void onBatteryChargeChanged(int before, int after) {
-		if (before > 10 && after <= 10) {
+		int percentage = DynamicFPSConfig.INSTANCE.batteryTracker().notifications().percent();
+
+		if (before > percentage && after <= percentage) {
 			showNotification("battery_critical", "reminder");
 		}
 	}
@@ -230,7 +232,7 @@ private static void initClickHandler() {
 		}
 	}
 	private static void showNotification(String titleTranslationKey, String iconPath) {
-		if (!DynamicFPSConfig.INSTANCE.batteryTracker().notifications()) {
+		if (!DynamicFPSConfig.INSTANCE.batteryTracker().notifications().enabled()) {
 			return;
 		}
 

platforms/common/src/main/java/dynamic_fps/impl/compat/ClothConfig.java

@@ -167,14 +167,28 @@ public static Screen genConfigScreen(Screen parent) {
 		battery.add(
 			entryBuilder.startBooleanToggle(
 				Components.translatable("config", "battery_tracker_notifications"),
-				batteryTracker.notifications()
+				batteryTracker.notifications().enabled()
 			)
-			.setDefaultValue(defaultConfig.batteryTracker().notifications())
-			.setSaveConsumer(batteryTracker::setNotifications)
+			.setDefaultValue(defaultConfig.batteryTracker().notifications().enabled())
+			.setSaveConsumer(batteryTracker.notifications()::setEnabled)
 			.setTooltip(Components.translatable("config", "battery_tracker_notifications_tooltip"))
 			.build()
 		);
 
+		battery.add(
+			entryBuilder.startIntSlider(
+				Components.translatable("config", "battery_notification_percentage"),
+				batteryTracker.notifications().percent(),
+				1,
+				50
+			)
+			.setDefaultValue(defaultConfig.batteryTracker().notifications().percent())
+			.setSaveConsumer(batteryTracker.notifications()::setPercent)
+			.setTextGetter(ClothConfig::valueAsPercentMessage)
+			.setTooltip(Components.translatable("config", "battery_notification_percentage_tooltip"))
+			.build()
+		);
+
 		battery.add(
 			entryBuilder.startEnumSelector(
 				Components.translatable("config", "battery_indicator_condition"),
@@ -259,7 +273,7 @@ public static Screen genConfigScreen(Screen parent) {
 					)
 					.setDefaultValue((int) (standard.rawVolumeMultiplier(source) * 100))
 					.setSaveConsumer(value -> instance.setVolumeMultiplier(source, value / 100f))
-					.setTextGetter(ClothConfig::volumeMultiplierMessage)
+					.setTextGetter(ClothConfig::valueAsPercentMessage)
 					.build()
 				);
 			}
@@ -387,7 +401,7 @@ private static Component fpsTargetMessage(int step) {
 		}
 	}
 
-	private static Component volumeMultiplierMessage(int value) {
+	private static Component valueAsPercentMessage(int value) {
 		return Components.literal(Integer.toString(value) + "%");
 	}
 

platforms/common/src/main/java/dynamic_fps/impl/config/BatteryTrackerConfig.java

@@ -6,7 +6,7 @@
 public class BatteryTrackerConfig {
 	private boolean enabled;
 	private boolean switchStates;
-	private boolean notifications;
+	private NotificationConfig notifications;
 	private DisplayConfig display;
 
 	public boolean enabled() {
@@ -25,18 +25,35 @@ public void setSwitchStates(boolean value) {
 		this.switchStates = value;
 	}
 
-	public boolean notifications() {
+	public NotificationConfig notifications() {
 		return this.notifications;
 	}
 
-	public void setNotifications(boolean value) {
-		this.notifications = value;
-	}
-
 	public DisplayConfig display() {
 		return this.display;
 	}
 
+	public static class NotificationConfig {
+		private boolean enabled;
+		private int percent;
+
+		public boolean enabled() {
+			return this.enabled;
+		}
+
+		public void setEnabled(boolean value) {
+			this.enabled = value;
+		}
+
+		public int percent() {
+			return this.percent;
+		}
+
+		public void setPercent(int value) {
+			this.percent = value;
+		}
+	}
+
 	public static class DisplayConfig {
 		private BatteryIndicatorCondition condition;
 		private BatteryIndicatorPlacement placement;

platforms/common/src/main/java/dynamic_fps/impl/config/Serialization.java

@@ -139,6 +139,9 @@ private static void upgradeConfig(JsonObject config) {
 		// v3.5.0
 		upgradeIdleConfig(config);
 
+		// v3.9.0
+		upgradeBatteryNotificationConfig(config);
+
 		// version agnostic
 		addMissingFields(config, (JsonObject) JsonUtil.toJsonTree(DynamicFPSConfig.DEFAULTS));
 	}
@@ -224,6 +227,32 @@ private static void upgradeIdleConfig(JsonObject root) {
 		root.add("idle", idle);
 	}
 
+	private static void upgradeBatteryNotificationConfig(JsonObject root) {
+		// Convert battery notification to object
+		// - { "notifications": true, ... }
+		// + { "notifications": { "enabled": true, "percent": 10 }, ... }
+		if (!root.has("battery_tracker")) {
+			return;
+		}
+
+		JsonObject battery = root.getAsJsonObject("battery_tracker");
+
+		if (!battery.has("notifications")) {
+			return;
+		}
+
+		JsonPrimitive field = battery.getAsJsonPrimitive("notifications");
+
+		if (!field.isBoolean()) {
+			return;
+		}
+
+		JsonObject notifications = new JsonObject();
+		notifications.add("enabled", field);
+
+		battery.add("notifications", notifications);
+	}
+
 	private static @Nullable JsonObject getStatesAsObject(JsonObject root) {
 		if (!root.has("states")) {
 			return null;

platforms/common/src/main/resources/assets/dynamic_fps/data/default_config.json

@@ -9,7 +9,10 @@
     "battery_tracker": {
         "enabled": false,
         "switch_states": false,
-        "notifications": true,
+        "notifications": {
+            "enabled": true,
+            "percent": 10
+        },
         "display": {
             "condition": "critical",
             "placement": "top_left"

platforms/common/src/main/resources/assets/dynamic_fps/lang/en_us.json

@@ -55,6 +55,9 @@
     "config.dynamic_fps.battery_tracker_notifications": "Battery Notifications",
     "config.dynamic_fps.battery_tracker_notifications_tooltip": "Receive in-game notifications about your battery status.",
 
+    "config.dynamic_fps.battery_notification_percentage": "Notification Threshold",
+    "config.dynamic_fps.battery_notification_percentage_tooltip": "Set at which battery level a charging reminder is sent.",
+
     "config.dynamic_fps.battery_indicator_condition": "Battery Indicator Condition",
     "config.dynamic_fps.battery_indicator_condition_disabled": "Disabled",
     "config.dynamic_fps.battery_indicator_condition_draining": "While discharging",