fix listeners

Bawnorton · Oct 15, 2024 · 960ea9e · 960ea9e
1 parent bdb3c23
commit 960ea9e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 2.0.3
+
+- Fix listener method signatures no longer matching the javadoc
+
+# 2.0.2
+
+- Fix listener ap generation to use spec
+
 # 2.0.1
 
 - Fix default naming not applying correctly

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx4G
 fabric_versions=1.20.1, 1.21.1
 neoforge_versions=1.21.1
 
-mod_version=2.0.1
+mod_version=2.0.3
 mod_group=com.bawnorton
 mod_id=configurable
 mod_name=Configurable

diff --git a/src/main/java/com/bawnorton/configurable/ap/yacl/YaclListener.java b/src/main/java/com/bawnorton/configurable/ap/yacl/YaclListener.java
@@ -18,7 +18,7 @@ protected void addNeededImports(Consumer<String> adder) {
 
     @Override
     protected String getSpec(int depth) {
-        return "%s::%s".formatted(
+        return "(option, value) -> %s.%s(value)".formatted(
                 owner.substring(owner.lastIndexOf(".") + 1),
                 methodName
         );

diff --git a/src/main/java/com/bawnorton/configurable/ap/yacl/YaclOption.java b/src/main/java/com/bawnorton/configurable/ap/yacl/YaclOption.java
@@ -64,7 +64,7 @@ protected String getSpec(int depth) {
             spec.append("%1$s.flag(%2$s)\n".formatted("\t".repeat(depth), optionFlags));
         }
         if (!listeners.isEmpty()) {
-            spec.append("%1$s.listeners(%2$s)\n".formatted("\t".repeat(depth), listeners));
+            spec.append("%1$s.listeners(%2$s)\n".formatted("\t".repeat(depth), listeners.getSpec(depth + 1)));
         }
         spec.append("%1$s.build()".formatted("\t".repeat(depth)));
         return spec.toString();