code generators plugin now automatically declare the generated libraries as dependencies

Author: Pesekjak

api/build.gradle.kts

@@ -17,13 +17,6 @@ repositories {
 
 dependencies {
 
-    sequenceOf(
-        "machine-materials",
-        "machine-blockdata",
-    ).forEach {
-        implementation(files("/libs/$it.jar"))
-    }
-
     implementation(libs.machine.nbt)
     implementation(libs.machine.scriptive)
     implementation(libs.jetbrains.annotations) // overrides default compileOnly

code-generators/src/main/java/org/machinemc/generators/Generators.java

@@ -32,21 +32,24 @@ private Generators() {
      */
     public static void run(final File projectDir) {
         try {
-            if (projectDir.isFile()) return;
-            final File outputDir = new File(projectDir.getPath() + "/libs");
-            if (!outputDir.exists() && !outputDir.mkdirs())
-                throw new IOException("Folder for Machine libraries could not be created");
-
-            final CodeGenerator materials = new MaterialsLibGenerator(outputDir);
-            if (!materials.isExists()) materials.generate();
-
-            final CodeGenerator blockdata = new BlockDataLibGenerator(outputDir);
-            if (!blockdata.isExists()) blockdata.generate();
-
+            run0(projectDir);
         } catch (Throwable throwable) {
             System.out.println("Machine Library Generator unexpectedly ended.");
             throw new RuntimeException(throwable);
         }
     }
 
+    private static void run0(final File projectDir) throws Throwable {
+        if (projectDir.isFile()) return;
+        final File outputDir = new File(projectDir.getPath() + "/libs");
+        if (!outputDir.exists() && !outputDir.mkdirs())
+            throw new IOException("Folder for Machine libraries could not be created");
+
+        final CodeGenerator materials = new MaterialsLibGenerator(outputDir);
+        if (!materials.isExists()) materials.generate();
+
+        final CodeGenerator blockdata = new BlockDataLibGenerator(outputDir);
+        if (!blockdata.isExists()) blockdata.generate();
+    }
+
 }

code-generators/src/main/java/org/machinemc/generators/blockdata/BlockData.java

@@ -427,7 +427,7 @@ else if (property.getType() == Property.Type.NUMBER)
         // loadProperties method
         mv = cw.visitMethod(Opcodes.ACC_PROTECTED,
                 "loadProperties",
-                "(" + Type.getType(Object[].class).getDescriptor() + ")V",
+                "([Ljava/lang/Object;)V",
                 null,
                 new String[0]);
         mv.visitAnnotation(Type.getType(Override.class).getDescriptor(), true).visitEnd();

code-generators/src/main/java/org/machinemc/generators/blockdata/BlockDataLibGenerator.java

@@ -22,7 +22,6 @@
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
 
 import java.io.File;
 import java.io.IOException;
@@ -51,7 +50,7 @@ public void generate() throws IOException {
         CodeGenerator.visitGeneratedAnnotation(cw, BlockDataLibGenerator.class);
         final MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_ABSTRACT,
                 "getName",
-                "()" + Type.getType(String.class).getDescriptor(),
+                "()Ljava/lang/String;",
                 null,
                 new String[0]);
         mv.visitEnd();

code-generators/src/main/java/org/machinemc/generators/blockdata/Property.java

@@ -147,7 +147,7 @@ public byte[] generate() {
         // getName method
         mv = cw.visitMethod(Opcodes.ACC_PUBLIC,
                 "getName",
-                "()" + org.objectweb.asm.Type.getType(String.class).getDescriptor(),
+                "()Ljava/lang/String;",
                 null,
                 new String[0]);
         mv.visitAnnotation(org.objectweb.asm.Type.getType(Override.class).getDescriptor(), true).visitEnd();

code-generators/src/main/kotlin/machine.generator-library.gradle.kts

@@ -1,3 +1,18 @@
 import org.machinemc.generators.LibraryGeneratorPlugin
 
-apply<LibraryGeneratorPlugin>()
+plugins {
+    `java-library`
+}
+
+apply<LibraryGeneratorPlugin>()
+
+dependencies {
+
+    sequenceOf(
+            "machine-materials",
+            "machine-blockdata",
+    ).forEach {
+        implementation(files("libs/$it.jar"))
+    }
+
+}

server/build.gradle.kts

@@ -20,13 +20,6 @@ dependencies {
 
     implementation(project(":api"))
 
-    sequenceOf(
-        "machine-materials",
-        "machine-blockdata",
-    ).forEach {
-        implementation(files("libs/$it.jar"))
-    }
-
     implementation(libs.google.guava)
     implementation(libs.google.gson)
     implementation(libs.netty.all)