🚀 1.1.0

Signed-off-by: Qboi123 <30625109+Qboi123@users.noreply.github.com>

Author: Qubilux

.gitignore

@@ -25,11 +25,9 @@ atlassian-ide-plugin.xml
 *.ctxt
 
 # Package Files #
-*.jar
 *.war
 *.nar
 *.ear
-*.zip
 *.tar.gz
 *.rar
 

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0-api.jar

@@ -0,0 +1 @@
+f1fa2797e65a6fa5db2ec0499e4a9b0d

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0-api.jar.md5

@@ -0,0 +1 @@
+5c650839777dce4242877861da6944aed8b98503

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0-api.jar.sha1

@@ -0,0 +1 @@
+6aa083b262bc3ceb4f80be7e772937c6952d9bbf9c9dbc73969c9a0c87e817f4

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0-api.jar.sha256

@@ -0,0 +1 @@
+fe2f3eee914658e36c60e801620980de479ac0ccaa62b5d41bd443470e04f0c1eb583f35b63317fae9757d59feda3574496e6fa4729663a4fdc0cb8d3667d1e0

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0-api.jar.sha512

@@ -0,0 +1 @@
+bdd4bd8a0ae87a68453e1b19fbd433bd

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0.jar

@@ -0,0 +1 @@
+578c20aea086cf9a9df74dada550b7677d6659c3

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0.jar.md5

@@ -0,0 +1 @@
+04e6655d2ef8f7f53bababa507188d090cb15a23ec22beaf46fc51511b115979

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0.jar.sha1

@@ -0,0 +1 @@
+2d127b7071268d21da3dd329e1cd528b00eb1b6487b307834074b724070a542ba8d0490d2203e2e6f69edfd5323c5cf6268ddeaf45bc220458ea21bdfd34b8b1

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0.jar.sha256

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.ultreon.mods</groupId>
+  <artifactId>advanced-debug</artifactId>
+  <version>1.1.0</version>
+  <dependencies/>
+</project>

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0.jar.sha512

@@ -0,0 +1 @@
+f6d67e7d4b8da712f9497dba14705d4f

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0.pom

@@ -0,0 +1 @@
+58ff8b108db118f41611aa8694810b0c3c01b546

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0.pom.md5

@@ -0,0 +1 @@
+fde38a5bef2d557f75293c81928d17caf30c5c44aadd74537fc99df541abb21d

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0.pom.sha1

@@ -0,0 +1 @@
+463f139b9637710847b95d3a6f0eae41c55635406b9356dc21c11259d35394d44ed58d38a6810727147c7aacaab4b81f0d43b11382a63d7435741878a5b38d1d

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0.pom.sha256

@@ -3,11 +3,12 @@
   <groupId>com.ultreon.mods</groupId>
   <artifactId>advanced-debug</artifactId>
   <versioning>
-    <latest>1.0.0</latest>
-    <release>1.0.0</release>
+    <latest>1.1.0</latest>
+    <release>1.1.0</release>
     <versions>
       <version>1.0.0</version>
+      <version>1.1.0</version>
     </versions>
-    <lastUpdated>20220309161544</lastUpdated>
+    <lastUpdated>20220309170001</lastUpdated>
   </versioning>
 </metadata>

.maven_repo/com/ultreon/mods/advanced-debug/1.1.0/advanced-debug-1.1.0.pom.sha512

@@ -1 +1 @@
-81f5a446c38246dc20e1b28bc3738ab2
+6287310fea2162b1f7cee1ed008f113b

.maven_repo/com/ultreon/mods/advanced-debug/maven-metadata.xml

@@ -1 +1 @@
-9db4384936482ec3adcdaa22c07f6e415cd3a66c
+93aad76df12fd2028f700b27c6d29b8c643028fa

.maven_repo/com/ultreon/mods/advanced-debug/maven-metadata.xml.md5

@@ -1 +1 @@
-2fe0c83577617298d9b19b06b2a9961b80df95cd0c79850e4a5e76455d4357d7
+3fbafb66b3f8e32a90605e6f68896bf06d7e76904f5258214128912bfdc53392

.maven_repo/com/ultreon/mods/advanced-debug/maven-metadata.xml.sha1

@@ -1 +1 @@
-a367e14b49d98ec34614ecd4d2ee8a3e61b28dc00b77a0dffeadf42146edae1a1d3241fe290097aea3045b3788745acc0fda6d09af4bb946739b910f4d614f23
+dce74fc63bce183f08c534c71824b0430ec9e95dd8c91b0bfb1572725dfcab0132e4bfe49cdb066f31427c1c621a0a523df5de247bb166d2a69d0362fd7a6954

.maven_repo/com/ultreon/mods/advanced-debug/maven-metadata.xml.sha256

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Publish to Maven" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Publish to Main Maven" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />

.maven_repo/com/ultreon/mods/advanced-debug/maven-metadata.xml.sha512

@@ -22,13 +22,64 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
 group = 'com.ultreon.mods'
-version = '1.0.0'
+version = '1.1.0'
 
 java {
     archivesBaseName = 'advanced-debug'
     toolchain.languageVersion = JavaLanguageVersion.of(17)
 }
 
+Project proj = project
+
+eclipse {
+    classpath {
+        file {
+            whenMerged { cp ->
+                project.logger.lifecycle "[eclipse] Excluding sourceSet outputs from eclipse dependencies for project '${project.path}'"
+                cp.entries.grep { it.kind == 'lib' }.each { entry ->
+                    rootProject.allprojects { Project project ->
+                        String buildDirPath = project.buildDir.path.replace('\\', '/') + '/'
+                        String entryPath = entry.path
+
+                        if (entryPath.startsWith(buildDirPath)) {
+                            cp.entries.remove entry
+
+                            if (project != proj) {
+                                boolean projectContainsProjectDep = false
+                                for (Configuration cfg : proj.configurations) {
+                                    boolean cfgContainsProjectDependency = cfg.allDependencies.withType(ProjectDependency).collect { it.dependencyProject }.contains(project)
+                                    if(cfgContainsProjectDependency) {
+                                        projectContainsProjectDep = true
+                                        break
+                                    }
+                                }
+                                if (!projectContainsProjectDep) {
+                                    throw new GradleException("The project '${proj.path}' has a dependency to the outputs of project '${project.path}', but not to the project itself. This is not allowed because it will cause compilation in eclipse to behave differently than in gradle.")
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+sourceSets {
+    // Note that just declaring this source set creates two configurations.
+    api {
+        java {
+
+        }
+    }
+    main {
+        java {
+            compileClasspath += api.output
+            runtimeClasspath += api.output
+        }
+    }
+}
+
 minecraft {
     // The mappings can be changed at any time and must be in the following format.
     // Channel:   Version:
@@ -144,6 +195,12 @@ repositories {
     // }
 }
 
+configurations {
+   apiImplementation.extendsFrom(implementation)
+   apiCompileOnly.extendsFrom(compileOnly)
+   apiRuntimeOnly.extendsFrom(runtimeOnly)
+}
+
 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.
@@ -178,6 +235,67 @@ jar {
                 "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
+
+    dependsOn "apiJar"
+}
+
+classes {
+    dependsOn "apiClasses"
+
+    doLast {
+        // Add directories with generated sources (might be several - one for every supported language).
+        copy {
+            from sourceSets.api.output.classesDirs
+            into sourceSets.main.output.classesDirs.singleFile
+            duplicatesStrategy DuplicatesStrategy.EXCLUDE
+        }
+    }
+}
+
+processResources {
+    dependsOn "processApiResources"
+
+    // Add output directories of the source set's resources.
+    from sourceSets.api.output.resourcesDir
+}
+
+// Example for how to get properties into the manifest for reading at runtime.
+task apiJar (type: Jar) {
+    manifest {
+        attributes([
+                "Specification-Title"     : "advanceddebug",
+                "Specification-Vendor"    : "Qboi123",
+                "Specification-Version"   : "1", // We are version 1 of ourselves
+                "Implementation-Title"    : project.name,
+                "Implementation-Version"  : project.jar.archiveVersion,
+                "Implementation-Vendor"   : "Qboi123",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
+    }
+
+    // Add directories with generated sources (might be several - one for every supported language).
+    from sourceSets.api.output.classesDirs
+
+    // Add output directories of the source set's resources.
+    from sourceSets.api.output.resourcesDir
+
+    classifier "api"
+}
+
+reobf {
+    jar {
+
+    }
+
+    apiJar {
+        dependsOn createMcpToSrg
+        mappings = createMcpToSrg.outputs.files.singleFile
+    }
+}
+
+artifacts {
+    archives apiJar
+    archives jar
 }
 
 jar.finalizedBy('reobfJar')
@@ -192,12 +310,21 @@ publishing {
     }
     publications {
         //noinspection GroovyAssignabilityCheck
-        gpr(MavenPublication) {
+        main(MavenPublication) {
             from components.java
+            artifact apiJar
+            pom.withXml {
+                //noinspection GroovyImplicitNullArgumentCall
+                def pomNode = asNode()
+                pomNode.dependencies.'*'.findAll() {
+                    it.groupId.text() == 'net.minecraftforge' && it.artifactId.text() == "forge"
+                }.each() {
+                    it.parent().remove(it)
+                }
+            }
         }
     }
 }
-
 tasks.withType(GenerateModuleMetadata) {
     enabled = false
 }

.run/Publish to Maven.run.xml

@@ -0,0 +1,22 @@
+package com.ultreon.mods.advanceddebug.api;
+
+import com.ultreon.mods.advanceddebug.api.client.menu.IDebugGui;
+import com.ultreon.mods.advanceddebug.api.client.registry.IFormatterRegistry;
+
+import java.lang.reflect.InvocationTargetException;
+
+public interface IAdvancedDebug {
+    static IAdvancedDebug get() {
+        try {
+            return (IAdvancedDebug) Class.forName("com.ultreon.mods.advanceddebug.AdvancedDebug").getDeclaredMethod("getInstance").invoke(null);
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException | ClassNotFoundException e) {
+            throw new IllegalStateException("Can't get instance object of the Advanced Debug Mod.");
+        }
+    }
+
+    IDebugGui getGui();
+
+    IFormatterRegistry getFormatterRegistry();
+
+    String getModId();
+}

build.gradle

@@ -1,8 +1,8 @@
-package com.ultreon.mods.advanceddebug.client.menu;
+package com.ultreon.mods.advanceddebug.api.client.menu;
 
 import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.ultreon.mods.advanceddebug.common.*;
+import com.ultreon.mods.advanceddebug.api.common.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.phys.Vec3;
@@ -23,25 +23,25 @@ public DebugPage(String modId, String name) {
         this.resourceLocation = new ResourceLocation(modId, name);
     }
 
-    public abstract void render(PoseStack poseStack, DebugRenderContext ctx);
+    public abstract void render(PoseStack poseStack, IDebugRenderContext ctx);
 
-    protected static Formattable getFormatted(String s) {
+    protected static IFormattable getFormatted(String s) {
         return () -> s;
     }
 
-    protected static Formattable getMultiplier(double multiplier) {
+    protected static IFormattable getMultiplier(double multiplier) {
         return new Multiplier(multiplier);
     }
 
-    protected static Formattable getSize(int w, int h) {
+    protected static IFormattable getSize(int w, int h) {
         return new IntSize(w, h);
     }
 
-    protected static Formattable getSize(float w, float h) {
+    protected static IFormattable getSize(float w, float h) {
         return new FloatSize(w, h);
     }
 
-    protected static Formattable getPercentage(double value) {
+    protected static IFormattable getPercentage(double value) {
         return new Percentage(value);
     }
 
@@ -53,22 +53,18 @@ protected static Color getColor(int rgb) {
         return new Color(rgb);
     }
 
-    protected static Formattable getAngle(double angle) {
+    protected static IFormattable getAngle(double angle) {
         return new Angle(angle * 360.0d);
     }
 
-    protected static Formattable getRadians(double angle) {
+    protected static IFormattable getRadians(double angle) {
         return new Angle(Math.toDegrees(angle));
     }
 
-    protected static Formattable getDegrees(double angle) {
+    protected static IFormattable getDegrees(double angle) {
         return new Angle(angle);
     }
 
-    protected static MoonPhase getMoonPhase(int index) {
-        return MoonPhase.fromIndex(index);
-    }
-
     public Minecraft getMinecraft() {
         return mc;
     }

src/api/java/com/ultreon/mods/advanceddebug/api/IAdvancedDebug.java

@@ -1,21 +1,23 @@
-package com.ultreon.mods.advanceddebug.client.menu;
+package com.ultreon.mods.advanceddebug.api.client.menu;
 
+import com.ultreon.mods.advanceddebug.api.IAdvancedDebug;
+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>> {
+public abstract class Formatter<T> extends ForgeRegistryEntry<Formatter<T>> implements IFormatter {
     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);
 
+    public abstract void format(T obj, StringBuilder sb);
 
-    protected final String format(Object obj) {
-        return DebugGui.format(obj);
+    @Override
+    public final String format(Object obj) {
+        return IAdvancedDebug.get().getGui().format(obj);
     }
 
     public Class<T> clazz() {