wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chainged config file to toml and fixed some general config stuff

Browse Source
This commit is contained in:
coolGi2007
2021-12-09 05:24:14 +00:00
parent 56faf3fdb6
commit 5dec52e493
9 changed files with 68 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/build.gradle
+7
View File
@@ -27,3 +27,10 @@ publishing {
// Add repositories to publish to here.
}
}
dependencies {
implementation("com.moandjiezana.toml:toml4j:${rootProject.toml_version}")
shadowMe("com.moandjiezana.toml:toml4j:${rootProject.toml_version}") {
exclude(module: "gson")
}
}
common/src/main/java/com/seibel/lod/common/Config.java
+10 -10
View File
@@ -52,37 +52,37 @@ public class Config extends ConfigGui
// Since the original config system uses forge stuff, that means we have to rewrite the whole config system
@ScreenEntry(to = "client")
public static ScreenEntry client;
public static Client client;
public static class Client
{
@Category("client")
@ScreenEntry(to = "graphics")
public static ScreenEntry graphics;
public static Graphics graphics;
@Category("client")
@ScreenEntry(to = "worldGenerator")
public static ScreenEntry worldGenerator;
public static WorldGenerator worldGenerator;
@Category("client")
@ScreenEntry(to = "advanced")
public static ScreenEntry advanced;
public static Advanced advanced;
public static class Graphics
{
@Category("client.graphics")
@ScreenEntry(to = "quality")
public static ScreenEntry quality;
public static Quality quality;
@Category("client.graphics")
@ScreenEntry(to = "fogQuality")
public static ScreenEntry fogQuality;
public static FogQuality fogQuality;
@Category("client.graphics")
@ScreenEntry(to = "advancedGraphics")
public static ScreenEntry advancedGraphics;
public static AdvancedGraphics advancedGraphics;
public static class Quality
@@ -179,15 +179,15 @@ public class Config extends ConfigGui
{
@Category("client.advanced")
@ScreenEntry(to = "threading")
public static ScreenEntry threading;
public static Threading threading;
@Category("client.advanced")
@ScreenEntry(to = "debugging")
public static ScreenEntry debugging;
public static Debugging debugging;
@Category("client.advanced")
@ScreenEntry(to = "buffers")
public static ScreenEntry buffers;
public static Buffers buffers;
public static class Threading
common/src/main/java/com/seibel/lod/common/LodCommonMain.java
-11
View File
@@ -23,18 +23,7 @@ public class LodCommonMain {
}
// TODO[CONFIG]: Find a better way to initialise everything
public static void initConfig() {
ConfigGui.init(ModInfo.ID, Config.class);
ConfigGui.init(ModInfo.ID, Config.Client.class);
ConfigGui.init(ModInfo.ID, Config.Client.Graphics.class);
ConfigGui.init(ModInfo.ID, Config.Client.Graphics.Quality.class);
ConfigGui.init(ModInfo.ID, Config.Client.Graphics.FogQuality.class);
ConfigGui.init(ModInfo.ID, Config.Client.Graphics.AdvancedGraphics.class);
ConfigGui.init(ModInfo.ID, Config.Client.WorldGenerator.class);
ConfigGui.init(ModInfo.ID, Config.Client.Advanced.class);
ConfigGui.init(ModInfo.ID, Config.Client.Advanced.Threading.class);
ConfigGui.init(ModInfo.ID, Config.Client.Advanced.Debugging.class);
ConfigGui.init(ModInfo.ID, Config.Client.Advanced.Buffers.class);
}
}
common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java
+37 -26
View File
@@ -2,13 +2,10 @@ package com.seibel.lod.common.wrappers.config;
import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.moandjiezana.toml.Toml;
import com.moandjiezana.toml.TomlWriter;
import com.mojang.blaze3d.vertex.PoseStack;
import com.seibel.lod.core.ModInfo;
//import net.fabricmc.api.EnvType;
//import net.fabricmc.api.Environment;
//import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
@@ -26,6 +23,8 @@ import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -39,9 +38,8 @@ import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.regex.Pattern;
/**
* which is based upon TinyConfig
* Based upon TinyConfig
* https://github.com/Minenash/TinyConfig
*
* Credits to Motschen
@@ -106,6 +104,13 @@ public abstract class ConfigGui {
To make a textured button to the options screen look in the mixins/MixinOptionsScreen class and TexturedButtonWidget class
Remember to add the MixinOptionsScreen to your ModID.mixins.json
*/
/*
This is a small to do list for the config
Make config save
Add a way to add min and max from another variable
*/
private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
@@ -114,14 +119,14 @@ public abstract class ConfigGui {
protected static class EntryInfo {
Field field;
Object widget;
int width;
int width = 0;
int max;
Map.Entry<EditBox, Component> error;
Object defaultValue;
Object value;
String tempValue;
boolean inLimits = true;
String id;
String id; // ModID
TranslatableComponent name;
int index;
boolean button = false; // This asks if it is a button to goto a new screen
@@ -132,28 +137,29 @@ public abstract class ConfigGui {
public static final Map<String,Class<?>> configClass = new HashMap<>();
private static Path path;
private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create();
public static void init(String modid, Class<?> config) {
path = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(modid + ".json");
path = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(modid + ".toml");
configClass.put(modid, config);
for (Field field : config.getFields()) {
EntryInfo info = new EntryInfo();
if (field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class) || field.isAnnotationPresent(ScreenEntry.class))
// TODO: Fix the check for client/server
// TODO[CONFIG]: Fix the check for client/server
// if (Minecraft.getInstance().getEnvironmentType() == EnvType.CLIENT)
initClient(modid, field, info);
if (field.isAnnotationPresent(Entry.class))
try {
info.defaultValue = field.get(null);
} catch (IllegalAccessException ignored) {}
if (field.isAnnotationPresent(ScreenEntry.class)) {
ConfigGui.init(modid, field.getType());
}
}
// File saving stuff
// TODO[CONFIG]: Change to .toml
try {
gson.fromJson(Files.newBufferedReader(path), config);
new Toml().read(Files.newBufferedReader(path)).to(config);
} catch (Exception e) {
write(modid);
}
@@ -168,11 +174,15 @@ public abstract class ConfigGui {
}
}
private static void initClient(String modid, Field field, EntryInfo info) {
// This adds the buttons to the queue to be rendered
Class<?> type = field.getType();
Category c = field.getAnnotation(Category.class);
Entry e = field.getAnnotation(Entry.class);
ScreenEntry s = field.getAnnotation(ScreenEntry.class);
info.width = e != null ? e.width() : 0;
if (e!=null)
info.width = e.width();
else if (s!=null)
info.width = s.width();
info.field = field;
info.id = modid;
info.category = c != null ? c.value() : "";
@@ -180,20 +190,20 @@ public abstract class ConfigGui {
if (e != null) {
if (!e.name().equals(""))
info.name = new TranslatableComponent(e.name());
if (type == int.class)
if (type == int.class) // For int
textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
else if (type == double.class)
else if (type == double.class) // For double
textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false);
else if (type == String.class || type == List.class) {
else if (type == String.class || type == List.class) { // For string or list
info.max = e.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) e.max();
textField(info, String::length, null, Math.min(e.min(), 0), Math.max(e.max(), 1), true);
} else if (type == boolean.class) {
} else if (type == boolean.class) { // For boolean
Function<Object, Component> func = value -> new TextComponent((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
info.widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
info.value = !(Boolean) info.value;
button.setMessage(func.apply(info.value));
}, func);
} else if (type.isEnum()) {
} else if (type.isEnum()) { // For enum
List<?> values = Arrays.asList(field.getType().getEnumConstants());
Function<Object, Component> func = value -> new TranslatableComponent(modid + ".config." + "enum." + type.getSimpleName() + "." + info.value.toString());
info.widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
@@ -244,13 +254,13 @@ public abstract class ConfigGui {
};
}
// Creates the modid.json
// Creates the modid.toml
public static void write(String modid) {
path = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(modid + ".json");
path = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(modid + ".toml");
try {
if (!Files.exists(path))
Files.createFile(path);
Files.write(path, gson.toJson(configClass.get(modid).getDeclaredConstructor().newInstance()).getBytes());
new TomlWriter().write(configClass.get(modid).getDeclaredConstructor().newInstance(), path.toFile());
} catch (Exception e) {
e.printStackTrace();
}
@@ -284,7 +294,7 @@ public abstract class ConfigGui {
}
private void loadValues() {
try {
gson.fromJson(Files.newBufferedReader(path), configClass.get(modid));
new Toml().read(Files.newBufferedReader(path)).to(configClass.get(modid));
} catch (Exception e) {
write(modid);
}
@@ -368,7 +378,7 @@ public abstract class ConfigGui {
widget.setFilter(processor);
this.list.addButton(widget, resetButton, null, name);
} else if (info.button) {
Button widget = new Button(this.width / 2 - 100, this.height - 28, 200, 20, name, (button -> {
Button widget = new Button(this.width / 2 - info.width, this.height - 28, info.width*2, 20, name, (button -> {
Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, ModInfo.ID, info.gotoScreen));
}));
this.list.addButton(widget, null, null, null);
@@ -493,6 +503,7 @@ public abstract class ConfigGui {
public @interface ScreenEntry {
String to();
String name() default "";
int width() default 100;
}
// Where the @Category is defined
common/src/main/resources/assets/lod/lang/en_us.json
+1 -5
View File
@@ -116,9 +116,5 @@
"lod.config.enum.GpuUploadMethod.DATA": "Data",
"lod.config.enum.BufferRebuildTimes.FREQUENT": "Frequent",
"lod.config.enum.BufferRebuildTimes.NORMAL": "Normal",
"lod.config.enum.BufferRebuildTimes.RARE": "Rare",
"toast.lod.title": "Distant Horizons",
"key.lod.category": "Distant Horizons",
"key.lod.DebugToggle": "Debug toggle",
"key.lod.DrawToggle": "Draw toggle"
"lod.config.enum.BufferRebuildTimes.RARE": "Rare"
}
fabric/build.gradle
+6
View File
@@ -35,6 +35,11 @@ dependencies {
exclude(group: "net.fabricmc.fabric-api")
}
implementation("com.moandjiezana.toml:toml4j:${rootProject.toml_version}")
shadowMe("com.moandjiezana.toml:toml4j:${rootProject.toml_version}") {
exclude(module: "gson")
}
common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowMe(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
@@ -83,6 +88,7 @@ shadowJar {
configurations = [project.configurations.shadowMe]
relocate 'org.tukaani', 'shaded.tukaani'
relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
relocate 'com.moandjiezana.toml', 'shaded.moandjiezana.toml'
classifier "dev-shadow"
}
fabric/src/main/java/com/seibel/lod/fabric/Main.java
-2
View File
@@ -42,8 +42,6 @@ public class Main implements ClientModInitializer
// This is a client mod so it should implement ClientModInitializer and in fabric.mod.json it should have "environment": "client"
// Once it works on servers change the implement to ModInitializer and in fabric.mod.json it should be "environment": "*"
public static Main instance;
public static ClientProxy client_proxy;
forge/build.gradle
+6
View File
@@ -29,6 +29,11 @@ dependencies {
common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
implementation("com.moandjiezana.toml:toml4j:${rootProject.toml_version}")
forgeDependencies("com.moandjiezana.toml:toml4j:${rootProject.toml_version}") {
exclude(module: "gson")
}
// forgeDependencies(project(":core")) { transitive false }
forgeDependencies('org.tukaani:xz:1.9')
@@ -60,6 +65,7 @@ shadowJar {
configurations = [project.configurations.shadowMe]
relocate 'org.tukaani', 'shaded.tukaani'
relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
relocate 'com.moandjiezana.toml', 'shaded.moandjiezana.toml'
classifier "dev-shadow"
}
gradle.properties
+1
View File
@@ -6,6 +6,7 @@ minecraft_version=1.17.1
archives_base_name=DistantHorizons
mod_version=1.5.4a
maven_group=com.seibel.lod
toml_version=0.7.2
fabric_loader_version=0.11.6
fabric_api_version=0.37.1+1.17