Merge pull request #1 from rhysdh540/master

feature parity with architectury injectables

.gitignore

@@ -5,13 +5,7 @@ build/
 !**/src/test/**/build/
 
 ### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
+.idea/
 out/
 !**/src/main/**/out/
 !**/src/test/**/out/

build.gradle.kts

@@ -35,7 +35,7 @@ val asmVersion: String by project.properties
 
 dependencies {
     implementation(gradleApi())
-    implementation("org.ow2.asm:asm:${asmVersion}")
+    implementation("org.ow2.asm:asm-tree:${asmVersion}")
 
     testImplementation(kotlin("test"))
 }
@@ -68,6 +68,10 @@ val annotationJar = tasks.register<Jar>("annotationJar") {
     }
 }
 
+tasks.assemble {
+    dependsOn(annotationJar)
+}
+
 kotlin {
     jvmToolchain(8)
 }

expect-platform-test/build.gradle

@@ -9,8 +9,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath "xyz.wagyourtail.unimined.expect-platform:expect-platform:1.0-SNAPSHOT"
-        classpath "org.ow2.asm:asm:9.7"
+        classpath "xyz.wagyourtail.unimined.expect-platform:expect-platform:1.0.0"
+        classpath "org.ow2.asm:asm-tree:9.7"
     }
 }
 
@@ -44,17 +44,17 @@ dependencies {
     implementation(expectPlatform.annotationsDep)
 }
 
-tasks.create("aExpectPlatform", ExpectPlatformFiles) {
+tasks.register("aExpectPlatform", ExpectPlatformFiles) {
     platformName = "a"
     inputCollection = sourceSets.main.output
 }
 
-tasks.create("bExpectPlatform", ExpectPlatformFiles) {
+tasks.register("bExpectPlatform", ExpectPlatformFiles) {
     platformName = "b"
     inputCollection = sourceSets.main.output
 }
 
-tasks.create("cExpectPlatform", ExpectPlatformFiles) {
+tasks.register("cExpectPlatform", ExpectPlatformFiles) {
     platformName = "c"
     inputCollection = sourceSets.main.output
 }

expect-platform-test/src/main/java/xyz/wagyourtail/ept/Main.java

@@ -1,11 +1,25 @@
 package xyz.wagyourtail.ept;
 
 import xyz.wagyourtail.unimined.expect.annotation.ExpectPlatform;
+import xyz.wagyourtail.unimined.expect.annotation.PlatformOnly;
+import xyz.wagyourtail.unimined.expect.Target;
 
 public class Main {
 
     public static void main(String[] args) {
+        System.out.println("current platform: " + Target.getCurrentTarget());
+
+        Target.getCurrentTarget();
+        Target.getCurrentTarget();
+
         System.out.println(platformTest("test"));
+
+        try {
+            Main.class.getDeclaredMethod("platformOnlyTest");
+            System.out.println("platformOnlyTest exists");
+        } catch (NoSuchMethodException e) {
+            System.out.println("platformOnlyTest does not exist");
+        }
     }
 
     @ExpectPlatform(
@@ -18,4 +32,7 @@ public static String platformTest(String name) {
         throw new AssertionError();
     }
 
+    @PlatformOnly({"a", "b"})
+    public static void platformOnlyTest() {
+    }
 }

src/annotations/java/xyz/wagyourtail/unimined/expect/Target.java

@@ -0,0 +1,13 @@
+package xyz.wagyourtail.unimined.expect;
+
+public final class Target {
+	private Target() {
+	}
+
+	/**
+	 * @return the currently targeted platform
+	 */
+	public static String getCurrentTarget() {
+		throw new AssertionError("failed to transform method");
+	}
+}

src/annotations/java/xyz/wagyourtail/unimined/expect/annotation/ExpectPlatform.java

@@ -2,12 +2,13 @@
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
  * Annotate public static methods to replace their contents with platform specific implementations.
  */
-@Retention(java.lang.annotation.RetentionPolicy.CLASS)
+@Retention(RetentionPolicy.CLASS)
 @Target(ElementType.METHOD)
 public @interface ExpectPlatform {
 
@@ -25,4 +26,10 @@
         String target();
     }
 
+    // marker annotation for transformed methods
+    @Retention(RetentionPolicy.CLASS)
+    @Target(ElementType.METHOD)
+    @interface Transformed {
+    }
+
 }

src/annotations/java/xyz/wagyourtail/unimined/expect/annotation/PlatformOnly.java

@@ -0,0 +1,19 @@
+package xyz.wagyourtail.unimined.expect.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotate a method to only be present on specified platforms.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.METHOD)
+public @interface PlatformOnly {
+	String[] value();
+
+	String FORGE = "forge";
+	String FABRIC = "fabric";
+	String QUIILT = "quilt";
+}

src/main/kotlin/xyz/wagyourtail/unimined/expect/ExpectPlatformExtension.kt

@@ -3,16 +3,14 @@ package xyz.wagyourtail.unimined.expect
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.attributes.Attribute
-import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.Internal
 import xyz.wagyourtail.unimined.expect.transform.ExpectPlatformTransform
 
 abstract class ExpectPlatformExtension(val project: Project) {
     @get:Internal
-    val version = ExpectPlatformExtension::class.java.`package`.implementationVersion ?: "1.0-SNAPSHOT"
-
-    val annotationsDep = "xyz.wagyourtail.unimined:expect-platform:$version:annotations"
+    val version = ExpectPlatformExtension::class.java.`package`.implementationVersion ?: "1.0.0-SNAPSHOT"
 
+    val annotationsDep = "xyz.wagyourtail.unimined.expect-platform:expect-platform:$version:annotations"
 
     fun platform(platformName: String, configuration: Configuration) {
         val expectPlatformAttribute = Attribute.of("expectPlatform.${configuration.name}", Boolean::class.javaObjectType)