Move LVT naming into a separate module

This makes is possible to be used in other programs as a library.

Author: DenWav

build.gradle.kts

@@ -9,8 +9,11 @@ plugins {
 dependencies {
     api(libs.checker)
 
+    implementation(projects.codebookLvt)
+
     implementation(libs.guice)
     implementation(libs.inject)
+    implementation(libs.guava)
 
     implementation(libs.gson)
     implementation(libs.bytes)
@@ -20,7 +23,7 @@ dependencies {
     implementation(libs.unpick.cli)
 
     implementation(platform(libs.hypo.platform))
-    implementation(libs.bundles.hypo)
+    implementation(libs.bundles.hypo.full)
 
     implementation(libs.lorenz)
 
@@ -38,6 +41,12 @@ dependencies {
     testImplementation(libs.mockito.junit)
 }
 
+tasks.jar {
+    manifest {
+        attributes("Automatic-Module-Name" to "io.papermc.codebook")
+    }
+}
+
 publishing {
     publications {
         codebook {

codebook-lvt/build.gradle.kts

@@ -0,0 +1,36 @@
+plugins {
+    `java-library`
+    id("codebook")
+}
+
+dependencies {
+    implementation(platform(libs.hypo.platform))
+
+    api(libs.checker)
+    api(libs.bundles.hypo.base)
+    api(libs.lorenz)
+
+    implementation(libs.guice)
+    implementation(libs.inject)
+    implementation(libs.guava)
+
+    implementation(libs.bundles.hypo.impl)
+    implementation(libs.bundles.asm)
+}
+
+tasks.jar {
+    manifest {
+        attributes("Automatic-Module-Name" to "io.papermc.codebook.lvt")
+    }
+}
+
+publishing {
+    publications {
+        codebook {
+            pom {
+                name.set("codebook-lvt")
+                description.set("LVT naming tool for PaperMC")
+            }
+        }
+    }
+}

…va/io/papermc/codebook/lvt/LvtNamer.java …va/io/papermc/codebook/lvt/LvtNamer.javasrc/main/java/io/papermc/codebook/lvt/LvtNamer.java renamed to codebook-lvt/src/main/java/io/papermc/codebook/lvt/LvtNamer.java src/main/java/io/papermc/codebook/lvt/LvtNamer.java renamed to codebook-lvt/src/main/java/io/papermc/codebook/lvt/LvtNamer.java

@@ -23,7 +23,6 @@
 package io.papermc.codebook.lvt;
 
 import dev.denwav.hypo.asm.AsmClassData;
-import dev.denwav.hypo.asm.AsmConstructorData;
 import dev.denwav.hypo.asm.AsmMethodData;
 import dev.denwav.hypo.core.HypoContext;
 import dev.denwav.hypo.hydrate.generic.HypoHydration;
@@ -122,13 +121,7 @@ private void fillNames0(final MethodData method) throws IOException {
             }
         }
 
-        final MethodNode node;
-        if (method instanceof AsmMethodData) {
-            node = ((AsmMethodData) method).getNode();
-        } else {
-            node = ((AsmConstructorData) method).getNode();
-        }
-
+        final MethodNode node = ((AsmMethodData) method).getNode();
         final ClassData parentClass = method.parentClass();
         // A method cannot be both a lambda expression and a local class, so if we've already determined an outer
         // method, there's nothing to do here.

…permc/codebook/lvt/LvtTypeSuggester.java …permc/codebook/lvt/LvtTypeSuggester.javasrc/main/java/io/papermc/codebook/lvt/LvtTypeSuggester.java renamed to codebook-lvt/src/main/java/io/papermc/codebook/lvt/LvtTypeSuggester.java src/main/java/io/papermc/codebook/lvt/LvtTypeSuggester.java renamed to codebook-lvt/src/main/java/io/papermc/codebook/lvt/LvtTypeSuggester.java

@@ -24,7 +24,6 @@
 
 import dev.denwav.hypo.asm.HypoAsmUtil;
 import dev.denwav.hypo.model.data.types.JvmType;
-import java.util.Arrays;
 import java.util.List;
 import java.util.function.Predicate;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -54,7 +53,14 @@ public static String capitalize(final String name, final int index) {
     }
 
     public static Predicate<String> equalsAny(final String... strings) {
-        return s -> Arrays.stream(strings).anyMatch(Predicate.isEqual(s));
+        return s -> {
+            for (final String string : strings) {
+                if (string.equals(s)) {
+                    return true;
+                }
+            }
+            return false;
+        };
     }
 
     public static String findNextWord(final int start, final String str) {