Alpha 7

Author: lowercasebtw

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.configuration-cache=false
 # Mod properties
 mod.name=LightConfig
 mod.id=lightconfig
-mod.version=1.0-alpha.6
+mod.version=1.0-alpha.7
 mod.group=org.visuals.legacy
 mod.description=A config library.
 mod.source=https://github.com/Legacy-Visuals-Project/LightConfig

src/main/java/org/visuals/legacy/lightconfig/lib/v1/Config.java

@@ -25,6 +25,7 @@
 package org.visuals.legacy.lightconfig.lib.v1;
 
 import com.google.gson.JsonObject;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.screens.Screen;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -35,22 +36,22 @@
 import org.visuals.legacy.lightconfig.lib.v1.serialization.Json;
 import org.visuals.legacy.lightconfig.lib.v1.type.Type;
 
+import java.io.File;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
 public abstract class Config {
 	protected final Logger logger = LoggerFactory.getLogger(this.getClass());
 	protected final List<AbstractConfigField<?>> configFields = new ArrayList<>();
 	protected final String id;
-	protected final Path path;
+	protected final File configFile;
 	protected final Json.Serializer serializer;
 	protected final Json.Deserializer deserializer;
 
-	public Config(final String id, final Path path, final ConfigSerializer<?> serializer, final ConfigDeserializer<?> deserializer) {
+	public Config(final String id, final ConfigSerializer<?> serializer, final ConfigDeserializer<?> deserializer) {
 		this.id = id;
-		this.path = path;
+		this.configFile = FabricLoader.getInstance().getConfigDir().resolve(id + ".json").toFile();
 		if (!(serializer instanceof Json.Serializer && deserializer instanceof Json.Deserializer)) {
 			throw new RuntimeException("Only json serialization is currently supported! Please use Json.SERIALIZER/Json.DESERIALIZER!");
 		}
@@ -59,8 +60,8 @@ public Config(final String id, final Path path, final ConfigSerializer<?> serial
 		this.deserializer = (Json.Deserializer) deserializer;
 	}
 
-	public Config(final String id, final Path path) {
-		this(id, path, new Json.Serializer(), new Json.Deserializer());
+	public Config(final String id) {
+		this(id, new Json.Serializer(), new Json.Deserializer());
 	}
 
 	public BooleanConfigField booleanFieldOf(final String name, final boolean defaultValue) {
@@ -88,15 +89,15 @@ public <T extends Enum<T>> EnumConfigField<T> enumFieldOf(final String name, fin
 	}
 
 	public void load() {
-		if (!this.path.toFile().exists()) {
+		if (!this.configFile.exists()) {
 			this.logger.info("Config file doesn't exist! Creating one...");
 			this.save();
 			return;
 		}
 
 		boolean success = true;
 		try {
-			final String json = Files.readString(this.path);
+			final String json = Files.readString(this.configFile.toPath());
 			final JsonObject object = this.deserializer.deserialize(json).getAsJsonObject();
 			if (object == null) {
 				this.logger.warn("Failed to load config! Defaulting to original settings.");
@@ -137,7 +138,7 @@ public void save() {
 		});
 
 		try {
-			Files.write(this.path, this.serializer.serialize(object));
+			Files.write(this.configFile.toPath(), this.serializer.serialize(object));
 		} catch (Exception ignored) {
 			this.logger.warn("Failed to save config!");
 			return;
@@ -147,7 +148,6 @@ public void save() {
 	}
 
 	public void reset() {
-		// TODO: When implementing the screen system/idk, implement a event listener for like reload resource packs or whatever
 		this.configFields.forEach(AbstractConfigField::restore);
 		this.save();
 	}
@@ -161,11 +161,11 @@ public List<AbstractConfigField<?>> getConfigFields() {
 	}
 
 	public String getId() {
-		return id;
+		return this.id;
 	}
 
-	public Path getPath() {
-		return path;
+	public File getConfigFile() {
+		return this.configFile;
 	}
 
 	public abstract Screen getConfigScreen(@Nullable Screen parent);

src/main/java/org/visuals/legacy/lightconfig/lib/v1/events/ConfigFieldReset.java

@@ -0,0 +1,15 @@
+package org.visuals.legacy.lightconfig.lib.v1.events;
+
+import org.visuals.legacy.lightconfig.lib.v1.field.AbstractConfigField;
+
+public class ConfigFieldReset extends Event {
+	private final AbstractConfigField<?> field;
+
+	public ConfigFieldReset(final AbstractConfigField<?> field) {
+		this.field = field;
+	}
+
+	public <T> AbstractConfigField<T> getField() {
+		return (AbstractConfigField<T>) this.field;
+	}
+}

src/main/java/org/visuals/legacy/lightconfig/lib/v1/field/AbstractConfigField.java

@@ -26,6 +26,7 @@
 
 import net.minecraft.client.gui.components.AbstractWidget;
 import org.visuals.legacy.lightconfig.lib.v1.Config;
+import org.visuals.legacy.lightconfig.lib.v1.events.ConfigFieldReset;
 import org.visuals.legacy.lightconfig.lib.v1.events.ConfigValueChanged;
 import org.visuals.legacy.lightconfig.lib.v1.events.EventManager;
 import org.visuals.legacy.lightconfig.lib.v1.serialization.ConfigDeserializer;
@@ -75,12 +76,11 @@ public T getDefaultValue() {
 	}
 
 	public void restore() {
+		this.eventManager.dispatch(new ConfigFieldReset(this));
 		this.setValue(this.getDefaultValue());
 	}
 
 	public void onValueChanged(BiConsumer<T, T> biConsumer) {
-		this.eventManager.listen(ConfigValueChanged.class, event -> {
-			biConsumer.accept((T) event.getOldValue(), (T) event.getNewValue());
-		});
+		this.eventManager.listen(ConfigValueChanged.class, event -> biConsumer.accept((T) event.getOldValue(), (T) event.getNewValue()));
 	}
 }