Improvement: Config System (#298)

Author: beanbag44

build.gradle.kts

@@ -30,6 +30,7 @@ val discordIPCVersion: String by project
 val classGraphVersion: String by project
 val kotlinVersion: String by project
 val ktorVersion: String by project
+val jacksonVersion: String by project
 val mockkVersion: String by project
 val spairVersion: String by project
 val lwjglVersion: String by project
@@ -80,6 +81,7 @@ repositories {
 }
 
 fabricApi {
+    @Suppress("UnstableApiUsage")
     configureTests {
         modId = "${base.archivesName}-tests"
         eula = true
@@ -173,7 +175,10 @@ dependencies {
         exclude(group = "org.slf4j")
     }
     includeLib("io.ktor:ktor-client-content-negotiation:$ktorVersion")
-    includeLib("io.ktor:ktor-serialization-gson:$ktorVersion")
+    includeLib("io.ktor:ktor-serialization-jackson:$ktorVersion")
+    includeLib("tools.jackson.core:jackson-core:$jacksonVersion")
+    includeLib("tools.jackson.core:jackson-databind:$jacksonVersion")
+    includeLib("tools.jackson.module:jackson-module-kotlin:$jacksonVersion")
 
     // Add mods
     modImplementation("com.github.rfresh2:baritone-fabric:$minecraftVersion-SNAPSHOT")
@@ -221,7 +226,7 @@ tasks {
 
 kotlin {
     compilerOptions {
-        freeCompilerArgs.addAll("-Xcontext-parameters", "-Xconsistent-data-class-copy-visibility")
+        freeCompilerArgs.addAll("-Xcontext-parameters", "-Xconsistent-data-class-copy-visibility", "-Xannotation-default-target=param-property")
     }
 
     jvmToolchain(21)
@@ -267,4 +272,4 @@ publishing {
             }
         }
     }
-}
+}

gradle.properties

@@ -35,6 +35,7 @@ baritoneVersion=1.14.0
 discordIPCVersion=6f6b6cce17
 classGraphVersion=4.8.184
 ktorVersion=3.3.3
+jacksonVersion=3.1.1
 mockkVersion=1.14.7
 spairVersion=1.90.0
 

src/main/java/com/lambda/mixin/CrashReportMixin.java

@@ -18,12 +18,13 @@
 package com.lambda.mixin;
 
 import com.lambda.Lambda;
-import com.lambda.config.Setting;
+import com.lambda.config.EntryLayer;
 import com.lambda.module.Module;
 import com.lambda.module.ModuleRegistry;
 import com.lambda.util.DynamicExceptionKt;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import kotlin.Unit;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.crash.CrashReport;
 import net.minecraft.util.crash.ReportType;
@@ -65,10 +66,17 @@ String injectString(ReportType type, List<String> extraInfo, Operation<String> o
                     .forEach(module -> {
                         list.add(String.format("\t%s", module.getName()));
 
-                        module.getSettings()
-                                .stream()
-                                .filter(Setting::isModified)
-                                .forEach(setting -> list.add(String.format("\t\t%s -> %s", setting.getName(), setting.getValue())));
+                        module.getSettingLayers$lambda().forEachEntry(
+                                true,
+                                null,
+                                (path, single) -> {
+                                    final var setting = single.getEntry();
+                                    if (setting.isModified()) {
+                                        list.add("\t\t" + String.join(".", path.stream().map(EntryLayer.Multiple::getName).toList()) + "." + setting.getName() + " -> " + setting.getValue());
+                                    }
+                                    return Unit.INSTANCE;
+                                }
+                        );
                     });
         }
 

src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -127,6 +127,7 @@ private void onShutdown(CallbackInfo ci) {
      * Inject after the thread field is set so that {@link ThreadExecutor#getThread}
      * is available
      */
+    @SuppressWarnings("JavadocReference")
     @Inject(at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;thread:Ljava/lang/Thread;", shift = At.Shift.AFTER, ordinal = 0, opcode = Opcodes.PUTFIELD), method = "run")
     private void onStartup(CallbackInfo ci) {
         EventFlow.post(new ClientEvent.Startup());

src/main/java/com/lambda/mixin/render/BlockEntityRenderManagerMixin.java

@@ -17,8 +17,8 @@
 
 package com.lambda.mixin.render;
 
-import com.lambda.graphics.outline.OutlineHandler;
 import com.lambda.graphics.outline.OutlineCapturingQueue;
+import com.lambda.graphics.outline.OutlineHandler;
 import com.lambda.graphics.outline.VertexCapture;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

src/main/java/com/lambda/mixin/render/BlockEntityRendererMixin.java

@@ -31,7 +31,7 @@ public interface BlockEntityRendererMixin<T extends BlockEntity> {
 
     @Inject(method = "isInRenderDistance", at = @At("HEAD"), cancellable = true)
     default void forceOutlineRenderDistance(T blockEntity, Vec3d pos, CallbackInfoReturnable<Boolean> cir) {
-        if (OutlineHandler.INSTANCE.shouldCapture(blockEntity.getPos())) {
+        if (OutlineHandler.shouldCapture(blockEntity.getPos())) {
             cir.setReturnValue(true);
         }
     }

src/main/java/com/lambda/mixin/render/CameraMixin.java

@@ -18,9 +18,9 @@
 package com.lambda.mixin.render;
 
 import com.lambda.interaction.managers.rotating.RotationManager;
-import com.lambda.module.modules.render.Freecam;
 import com.lambda.module.modules.render.CameraTweaks;
 import com.lambda.module.modules.render.FreeLook;
+import com.lambda.module.modules.render.Freecam;
 import com.lambda.module.modules.render.NoRender;
 import net.minecraft.block.enums.CameraSubmersionType;
 import net.minecraft.client.render.Camera;

src/main/java/com/lambda/mixin/render/EntityRenderManagerMixin.java

@@ -18,8 +18,8 @@
 package com.lambda.mixin.render;
 
 import com.lambda.graphics.outline.IEntityRenderState;
-import com.lambda.graphics.outline.OutlineHandler;
 import com.lambda.graphics.outline.OutlineCapturingQueue;
+import com.lambda.graphics.outline.OutlineHandler;
 import com.lambda.graphics.outline.VertexCapture;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

src/main/java/com/lambda/mixin/render/GameRendererMixin.java

@@ -19,10 +19,9 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.RenderEvent;
-import com.lambda.gui.DearImGui;
 import com.lambda.graphics.RenderMain;
 import com.lambda.graphics.outline.OutlineCapturingQueue;
-import net.minecraft.client.render.command.OrderedRenderCommandQueueImpl;
+import com.lambda.gui.DearImGui;
 import com.lambda.module.modules.render.BlockOutline;
 import com.lambda.module.modules.render.Bobbing;
 import com.lambda.module.modules.render.NoRender;
@@ -36,6 +35,7 @@
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.RenderTickCounter;
 import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.client.render.command.OrderedRenderCommandQueueImpl;
 import net.minecraft.client.util.ObjectAllocator;
 import net.minecraft.item.ItemStack;
 import org.joml.Matrix4f;

src/main/java/com/lambda/mixin/render/ItemFrameEntityRendererMixin.java

@@ -18,15 +18,15 @@
 package com.lambda.mixin.render;
 
 import com.lambda.graphics.outline.OutlineCapturingQueue;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.ItemFrameEntityRenderer;
 import net.minecraft.client.render.model.BlockStateModel;
 import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 
 @Mixin(ItemFrameEntityRenderer.class)
 public class ItemFrameEntityRendererMixin {