add some basic manifold + more java sourcews

Author: lineargraph

build-src/build.gradle.kts

@@ -26,7 +26,8 @@ dependencies {
 	api("org.ow2.asm:asm-analysis:9.7")
 	api("com.gradleup.shadow:shadow-gradle-plugin:9.0.0-beta12")
 	api("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
-	val kotlinVersion = "2.0.0"
+	val kotlinVersion = "2.0.20"
 	api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$kotlinVersion")
 	api("org.jetbrains.kotlin.plugin.lombok:org.jetbrains.kotlin.plugin.lombok.gradle.plugin:$kotlinVersion")
+	api("systems.manifold.manifold-gradle-plugin:systems.manifold.manifold-gradle-plugin.gradle.plugin:0.0.2-alpha")
 }

build-src/src/main/kotlin/Dependencies.kt

@@ -1,6 +1,7 @@
 object Dependencies {
     val LIB_NINE_PATCH = "io.github.juuxel:libninepatch:1.2.0"
     val JB_ANNOTATIONS = "org.jetbrains:annotations:24.0.1"
+    val JSPECIFY = "org.jspecify:jspecify:1.0.0"
 
     /**
      * Intentionally old version of GSON to properly compile on 1.8.9

build-src/src/main/kotlin/PreProcessorArgs.kt

@@ -0,0 +1,32 @@
+import org.gradle.api.Project
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.kotlin.dsl.getByName
+import javax.inject.Inject
+
+abstract class PreProcessorArgs {
+    @get:Inject
+    protected abstract val project: Project
+
+    companion object {
+        val nameRegex = "^[A-Z_][A-Z_0-9]*$".toRegex()
+    }
+
+    class Args(val task: JavaCompile) {
+        fun define(name: String, value: String) {
+            require(name.matches(nameRegex))
+            task.options.compilerArgs.add("-A$name=$value")
+        }
+
+        fun define(name: String, value: Int) {
+            define(name, value.toString())
+        }
+    }
+
+    fun forCompilation(task: JavaCompile, init: Args.() -> Unit): Args {
+        return Args(task).also(init)
+    }
+
+    fun forDefaultCompilation(init: Args.() -> Unit): Args {
+        return forCompilation(project.tasks.getByName<JavaCompile>("compileJava"), init)
+    }
+}

build-src/src/main/kotlin/moulconfig.leaf.gradle.kts

@@ -16,6 +16,8 @@ dependencies {
 	shadowInclude(project(":common", configuration = "singleFile"))
 	"implementation"(Dependencies.LIB_NINE_PATCH)
 	shadowInclude(Dependencies.LIB_NINE_PATCH)
+	compileOnly(Dependencies.JB_ANNOTATIONS)
+	compileOnly(Dependencies.JSPECIFY)
 }
 
 val shadowJar by tasks.named("shadowJar", ShadowJar::class) {

build-src/src/main/kotlin/moulconfig.manifold.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+	id("systems.manifold.manifold-gradle-plugin")
+}
+
+manifold {
+	manifoldVersion.set("2025.1.25")
+}
+
+dependencies {
+	val manifoldSubSystems = listOf(
+		"strings" to false,
+		"preprocessor" to false,
+	)
+	manifoldSubSystems.forEach { (name, rt) ->
+		if (rt)
+			implementation("systems.manifold:manifold-$name-rt:${manifold.manifoldVersion.get()}")
+		annotationProcessor("systems.manifold:manifold-$name:${manifold.manifoldVersion.get()}")
+	}
+}
+extensions.create<PreProcessorArgs>("preprocessorArgs", PreProcessorArgs::class)

common/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
     annotationProcessor(Dependencies.LOMBOK)
     compileOnly(Dependencies.LOMBOK)
     compileOnly(Dependencies.JB_ANNOTATIONS)
+    compileOnly(Dependencies.JSPECIFY)
     implementation(Dependencies.LIB_NINE_PATCH)
     compileOnly(Dependencies.LEGACY_GSON)
 }

common/src/main/java/io/github/notenoughupdates/moulconfig/common/IFontRenderer.java

@@ -0,0 +1,33 @@
+package io.github.notenoughupdates.moulconfig.common;
+
+import io.github.notenoughupdates.moulconfig.common.text.StructuredText;
+import org.jspecify.annotations.NullMarked;
+
+import java.util.List;
+
+@NullMarked
+public interface IFontRenderer {
+    int getHeight();
+
+    default int getStringWidth(String string) {
+        return getStringWidth(StructuredText.of(string));
+    }
+
+    int getStringWidth(StructuredText structuredText);
+
+    default int getCharWidth(char c) {
+        return getStringWidth(Character.toString(c));
+    }
+
+    List<StructuredText> splitText(StructuredText structuredText, int width);
+
+    default List<StructuredText> splitLines(StructuredText structuredText) {
+        return splitText(structuredText, Integer.MAX_VALUE);
+    }
+
+    default String trimStringToWidth(String string, int width) {
+        return trimStringToWidth(string, width, false);
+    }
+
+    String trimStringToWidth(String string, int width, boolean reversed);
+}

common/src/main/java/io/github/notenoughupdates/moulconfig/common/IFontRenderer.kt

@@ -1,6 +1,7 @@
 package io.github.notenoughupdates.moulconfig.xml.loaders
 
 import io.github.notenoughupdates.moulconfig.common.IMinecraft
+import io.github.notenoughupdates.moulconfig.common.text.StructuredText
 import io.github.notenoughupdates.moulconfig.gui.component.CollapsibleComponent
 import io.github.notenoughupdates.moulconfig.gui.component.TextComponent
 import io.github.notenoughupdates.moulconfig.observer.GetSetter
@@ -19,7 +20,7 @@ class BasicCollapsibleLoader : XMLGuiLoader.Basic<CollapsibleComponent> {
         val title = context.getPropertyFromAttribute(element, QName("title"), String::class.java)!!
         val textComponent = TextComponent(
             IMinecraft.instance.defaultFontRenderer,
-            title,
+            { StructuredText.of(title.get()) },
             IMinecraft.instance.defaultFontRenderer.getStringWidth(title.get()),
             TextComponent.TextAlignment.LEFT,
             false,

common/src/main/java/io/github/notenoughupdates/moulconfig/xml/loaders/BasicCollapsibleLoader.kt

@@ -40,6 +40,7 @@ dependencies {
     annotationProcessor(Dependencies.LOMBOK)
     compileOnly(Dependencies.LOMBOK)
     compileOnly(Dependencies.JB_ANNOTATIONS)
+    compileOnly(Dependencies.JSPECIFY)
 }
 
 sourceSets.main {