Updated to 2.4.0

will have a release later

Author: Prunoideae

build.gradle

@@ -9,7 +9,7 @@ apply from: 'https://files.latmod.com/public/markdown-git-changelog.gradle'
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
 
 def ENV = System.getenv()
-version = "${mod_version}-build.60"
+version = "${mod_version}-build.62"
 archivesBaseName = project.archives_base_name
 group = project.maven_group
 

gradle.properties

@@ -3,9 +3,9 @@ org.gradle.daemon=false
 loom.platform=forge
 mod_id=probejs
 archives_base_name=probejs
-mod_version=2.3.0
+mod_version=2.4.0
 maven_group=com.prunoideae
 mod_author=Prunoideae
-minecraft_version=1.18.1
-forge_version=39.0.5
-kubejs_version=1801.4.0-build.254
+minecraft_version=1.18.2
+forge_version=40.0.32
+kubejs_version=1802.5.0-build.324

settings.gradle

@@ -6,4 +6,4 @@ pluginManagement {
 	}
 }
 
-rootProject.name = 'ProbeJS-1.18.1'
+rootProject.name = 'ProbeJS-1.18.2'

src/main/java/com/prunoideae/probejs/formatter/SpecialTypes.java

@@ -27,7 +27,7 @@ public static void init() {
                 String inner = new FormatterType(parType.getParamTypes().get(0)).format(0, 0);
                 return "() => %s".formatted(inner);
             }
-            return "() => any)";
+            return "() => any";
         });
         NameResolver.putTypeFormatter(Function.class, t -> {
             if (t instanceof TypeInfoParameterized parType && parType.getParamTypes().size() == 2) {

src/main/java/com/prunoideae/probejs/info/ClassInfo.java

@@ -5,6 +5,7 @@
 import com.prunoideae.probejs.info.type.InfoTypeResolver;
 import com.prunoideae.probejs.info.type.TypeInfoParameterized;
 import com.prunoideae.probejs.info.type.TypeInfoVariable;
+import dev.latvian.mods.rhino.mod.util.RemappingHelper;
 import it.unimi.dsi.fastutil.Function;
 
 import java.lang.reflect.Modifier;
@@ -56,7 +57,7 @@ private ClassInfo(Class<?> clazz) {
         interfaces = Arrays.stream(clazzRaw.getInterfaces()).map(ClassInfo::getOrCache).collect(Collectors.toList());
         parameters = Arrays.stream(clazzRaw.getTypeParameters()).map(InfoTypeResolver::resolveType).collect(Collectors.toList());
         methodInfo = Arrays.stream(clazzRaw.getMethods())
-                .map(MethodInfo::new)
+                .map(m -> new MethodInfo(m, clazz))
                 .filter(m -> ClassResolver.acceptMethod(m.getName()))
                 .filter(m -> !m.shouldHide())
                 .collect(Collectors.toList());

src/main/java/com/prunoideae/probejs/info/FieldInfo.java

@@ -8,6 +8,7 @@
 
 import javax.swing.*;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -19,8 +20,13 @@ public class FieldInfo {
     private final Object value;
     private ITypeInfo info;
 
+    private static String getRemappedOrDefault(Field field) {
+        String s = MethodInfo.RUNTIME.getMappedField(field.getDeclaringClass(), field);
+        return s.isEmpty() ? field.getName() : s;
+    }
+
     public FieldInfo(Field field) {
-        name = field.getAnnotation(RemapForJS.class) != null ? field.getAnnotation(RemapForJS.class).value() : field.getName();
+        name = getRemappedOrDefault(field);
         modifiers = field.getModifiers();
         shouldHide = field.getAnnotation(HideFromJS.class) != null;
         info = InfoTypeResolver.resolveType(field.getGenericType());

src/main/java/com/prunoideae/probejs/info/MethodInfo.java

@@ -1,9 +1,12 @@
 package com.prunoideae.probejs.info;
 
+import com.prunoideae.probejs.formatter.ClassResolver;
 import com.prunoideae.probejs.info.type.ITypeInfo;
 import com.prunoideae.probejs.info.type.InfoTypeResolver;
+import dev.latvian.mods.rhino.mod.util.RemappingHelper;
 import dev.latvian.mods.rhino.util.HideFromJS;
 import dev.latvian.mods.rhino.util.RemapForJS;
+import dev.latvian.mods.rhino.util.Remapper;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -13,15 +16,21 @@
 import java.util.stream.Collectors;
 
 public class MethodInfo {
+    public static final Remapper RUNTIME = RemappingHelper.createModRemapper();
     private final String name;
     private final boolean shouldHide;
     private final int modifiers;
     private ITypeInfo returnType;
     private List<ParamInfo> params;
     private List<ITypeInfo> typeVariables;
 
-    public MethodInfo(Method method) {
-        this.name = method.getAnnotation(RemapForJS.class) != null ? method.getAnnotation(RemapForJS.class).value() : method.getName();
+    private static String getRemappedOrDefault(Method method, Class<?> from) {
+        String s = RUNTIME.getMappedMethod(from, method);
+        return s.isEmpty() ? method.getName() : s;
+    }
+
+    public MethodInfo(Method method, Class<?> from) {
+        this.name = getRemappedOrDefault(method, from);
         this.shouldHide = method.getAnnotation(HideFromJS.class) != null;
         this.modifiers = method.getModifiers();
         this.returnType = InfoTypeResolver.resolveType(method.getGenericReturnType());