Updated formatter api.

Author: Qubilux

.run/Publish to Local Maven.run.xml

@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="Publish to Local Maven" type="GradleRunConfiguration" factoryName="Gradle">
+        <ExternalSystemSettings>
+            <option name="executionName"/>
+            <option name="externalProjectPath" value="$PROJECT_DIR$"/>
+            <option name="externalSystemIdString" value="GRADLE"/>
+            <option name="scriptParameters" value=""/>
+            <option name="taskDescriptions">
+                <list/>
+            </option>
+            <option name="taskNames">
+                <list>
+                    <option value="publishAllPublicationsToMavenLocalRepository"/>
+                </list>
+            </option>
+            <option name="vmOptions"/>
+        </ExternalSystemSettings>
+        <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+        <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+        <DebugAllEnabled>false</DebugAllEnabled>
+        <method v="2"/>
+    </configuration>
+</component>

build.gradle

@@ -8,6 +8,7 @@ buildscript {
     }
     dependencies {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'org.parchmentmc', name: 'librarian', version: '1.+', changing: true
         classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
     }
 }
@@ -18,6 +19,7 @@ plugins {
 
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
+apply plugin: 'org.parchmentmc.librarian.forgegradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
@@ -205,7 +207,7 @@ dependencies {
     // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
     // The user-dev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.18.1-39.1.0'
+    minecraft 'net.minecraftforge:forge:1.18.2-40.1.0'
 
     // Real mod deobf dependency examples - these get remapped to your current mappings
     // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency

src/api/java/com/ultreon/mods/advanceddebug/api/client/formatter/IFormatterContext.java

@@ -0,0 +1,70 @@
+package com.ultreon.mods.advanceddebug.api.client.formatter;
+
+@SuppressWarnings("UnusedReturnValue")
+public interface IFormatterContext {
+    IFormatterContext keyword(String text);
+
+    IFormatterContext number(String text);
+
+    IFormatterContext number(Number number);
+
+    IFormatterContext string(String text);
+
+    IFormatterContext stringEscape(String text);
+
+    IFormatterContext operator(String text);
+
+    IFormatterContext identifier(String text);
+
+    IFormatterContext parameter(String text);
+
+    IFormatterContext parameter(String text, Object value);
+
+    IFormatterContext comment(String text);
+
+    IFormatterContext error(String text);
+
+    IFormatterContext className(String text);
+
+    IFormatterContext enumConstant(Enum<?> enumValue);
+
+    IFormatterContext enumConstant(String text);
+
+    IFormatterContext packageName(String text);
+
+    IFormatterContext methodName(String text);
+
+    IFormatterContext functionName(String text);
+
+    IFormatterContext callName(String text);
+
+    IFormatterContext field(String text);
+
+    IFormatterContext annotation(String text);
+
+    IFormatterContext normal(String text);
+
+    IFormatterContext classValue(Class<?> clazz);
+
+    IFormatterContext space();
+
+    IFormatterContext separator();
+
+    IFormatterContext hex(String hexString);
+
+    IFormatterContext hexValue(int number);
+
+    IFormatterContext intValue(int number);
+
+    IFormatterContext longValue(long number);
+
+    IFormatterContext floatValue(float number);
+
+    IFormatterContext doubleValue(double number);
+
+    IFormatterContext stringEscaped(String text);
+
+    IFormatterContext charsEscaped(String text);
+
+    IFormatterContext other(Object e);
+}

src/api/java/com/ultreon/mods/advanceddebug/api/client/menu/Formatter.java

@@ -1,23 +1,24 @@
 package com.ultreon.mods.advanceddebug.api.client.menu;
 
 import com.ultreon.mods.advanceddebug.api.IAdvancedDebug;
+import com.ultreon.mods.advanceddebug.api.client.formatter.IFormatterContext;
 import com.ultreon.mods.advanceddebug.api.common.IFormatter;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.registries.ForgeRegistryEntry;
 
-public abstract class Formatter<T> extends ForgeRegistryEntry<Formatter<T>> implements IFormatter {
+public abstract class Formatter<T> extends ForgeRegistryEntry<Formatter<T>> implements IFormatter<T> {
     private final Class<T> clazz;
 
     public Formatter(Class<T> clazz, ResourceLocation name) {
         this.clazz = clazz;
         this.setRegistryName(name);
     }
 
-    public abstract void format(T obj, StringBuilder sb);
-
     @Override
-    public final String format(Object obj) {
-        return IAdvancedDebug.get().getGui().format(obj);
+    public abstract void format(T obj, IFormatterContext context);
+
+    public final void formatOther(Object obj, IFormatterContext context) {
+        IAdvancedDebug.get().getGui().format(obj, context);
     }
 
     public Class<T> clazz() {

src/api/java/com/ultreon/mods/advanceddebug/api/client/menu/IDebugGui.java

@@ -1,10 +1,11 @@
 package com.ultreon.mods.advanceddebug.api.client.menu;
 
+import com.ultreon.mods.advanceddebug.api.client.formatter.IFormatterContext;
 import com.ultreon.mods.advanceddebug.api.common.IFormatter;
 
 import javax.annotation.Nullable;
 
-public interface IDebugGui extends IFormatter {
+public interface IDebugGui extends IFormatter<Object> {
     <T extends DebugPage> T registerPage(T page);
 
     @Nullable
@@ -20,7 +21,7 @@ public interface IDebugGui extends IFormatter {
 
     void prev();
 
-    String format(Object obj);
+    void format(Object obj, IFormatterContext context);
 
     Formatter<Object> getDefault();
 }

src/api/java/com/ultreon/mods/advanceddebug/api/common/IFormatter.java

@@ -1,5 +1,7 @@
 package com.ultreon.mods.advanceddebug.api.common;
 
-public interface IFormatter {
-    String format(Object obj);
+import com.ultreon.mods.advanceddebug.api.client.formatter.IFormatterContext;
+
+public interface IFormatter<T> {
+    void format(T obj, IFormatterContext context);
 }