From d2ef12f718cd68ad6fcc7574b97c7cd7ef540934 Mon Sep 17 00:00:00 2001 From: Cameron Reed Date: Fri, 10 Feb 2023 10:19:22 -0700 Subject: [PATCH] Minor fixes --- gradle.properties | 2 +- .../java/cmods/cmods/api/PropertyUtils.java | 17 +++++++++++++++++ .../cmods/client/options/CmodsOptions.java | 12 ++++-------- 3 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 src/main/java/cmods/cmods/api/PropertyUtils.java diff --git a/gradle.properties b/gradle.properties index 4020672..a7493fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.19.3 yarn_mappings=1.19.3+build.5 loader_version=0.14.13 # Mod Properties -mod_version=1.0.0 +mod_version=1.0.1 maven_group=cmods archives_base_name=cmods # Dependencies diff --git a/src/main/java/cmods/cmods/api/PropertyUtils.java b/src/main/java/cmods/cmods/api/PropertyUtils.java new file mode 100644 index 0000000..c74466b --- /dev/null +++ b/src/main/java/cmods/cmods/api/PropertyUtils.java @@ -0,0 +1,17 @@ +package cmods.cmods.api; + +import org.jetbrains.annotations.Nullable; + +public class PropertyUtils { + public static boolean getBooleanProperty(@Nullable java.util.Properties properties, String key, Boolean default_value) { + if (properties == null) + return default_value; + return Boolean.parseBoolean(properties.getProperty(key, default_value.toString())); + } + + public static int getIntegerProperty(@Nullable java.util.Properties properties, String key, Integer default_value) { + if (properties == null) + return default_value; + return Integer.parseInt(properties.getProperty(key, default_value.toString())); + } +} diff --git a/src/main/java/cmods/cmods/client/options/CmodsOptions.java b/src/main/java/cmods/cmods/client/options/CmodsOptions.java index ad59dea..7e9acf6 100644 --- a/src/main/java/cmods/cmods/client/options/CmodsOptions.java +++ b/src/main/java/cmods/cmods/client/options/CmodsOptions.java @@ -11,6 +11,8 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Properties; +import static cmods.cmods.api.PropertyUtils.getBooleanProperty; + public final class CmodsOptions { private static CmodsOptions instance = null; @@ -82,12 +84,6 @@ public final class CmodsOptions { } } - private static boolean getBooleanProperty(@Nullable Properties properties, String key, Boolean default_value) { - if (properties == null) - return default_value; - return Boolean.parseBoolean(properties.getProperty(key, default_value.toString())); - } - public static class UIOptions { private final String PREFIX = "ui."; @@ -100,8 +96,8 @@ public final class CmodsOptions { void load(@Nullable Properties properties) { - enabled.value = getBooleanProperty(properties, PREFIX + "enabled", true); - show_coordinates.value = getBooleanProperty(properties, PREFIX + "show_coordinates", true); + enabled.value = getBooleanProperty(properties, PREFIX + "enabled", enabled.value); + show_coordinates.value = getBooleanProperty(properties, PREFIX + "show_coordinates", show_coordinates.value); } void save(Properties properties) {