Redirect xyz.wagyourtail package to com.jsmacrosce

Author: EastArctica

common/src/main/java/com/jsmacrosce/jsmacros/core/library/impl/FReflection.java

@@ -83,6 +83,7 @@ public <T> Class<T> getClass(String name) throws ClassNotFoundException {
             case "void":
                 return (Class<T>) void.class;
             default:
+                name = redirectWagYourTail(name);
                 return (Class<T>) Class.forName(name, true, classLoader);
         }
     }
@@ -105,6 +106,9 @@ public <T> Class<T> getClass(String name) throws ClassNotFoundException {
     )
     @DocletReplaceReturn("GetJava.Type$Reflection<C>")
     public <T> Class<T> getClass(String name, String name2) throws ClassNotFoundException {
+        name = redirectWagYourTail(name);
+        name2 = redirectWagYourTail(name2);
+
         try {
             return getClass(name);
         } catch (ClassNotFoundException e) {
@@ -320,6 +324,8 @@ public <T> ProxyBuilder<T> createClassProxyBuilder(Class<T> clazz, Class<?>... i
      * @since 1.6.5
      */
     public <T> ClassBuilder<T> createClassBuilder(String cName, Class<T> clazz, Class<?>... interfaces) throws NotFoundException, CannotCompileException {
+        cName = redirectWagYourTail(cName);
+
         return new ClassBuilder<>(cName, clazz, interfaces);
     }
 
@@ -350,6 +356,7 @@ public LibraryBuilder createLibraryBuilder(String name, boolean perExec, String.
      * @since 1.8.4
      */
     public void createLibrary(String className, String javaCode) {
+        // TODO: Should we dynamically redirect xyz.wagyourtail to com.jsmacrosce in here?
         runner.libraryRegistry.addLibrary((Class<? extends BaseLibrary>) compileJavaClass(className, javaCode));
     }
 
@@ -368,6 +375,7 @@ public void createLibrary(String className, String javaCode) {
      * @since 1.8.4
      */
     public Class<?> compileJavaClass(String className, String code) {
+        // TODO: Should we dynamically redirect xyz.wagyourtail to com.jsmacrosce in here?
         Class<?> clazz = Reflect.compile(className, code).type();
         JAVA_CLASS_CACHE.putIfAbsent(className, new ArrayList<>());
         JAVA_CLASS_CACHE.get(className).add(clazz);
@@ -380,6 +388,8 @@ public Class<?> compileJavaClass(String className, String code) {
      * @since 1.8.4
      */
     public Class<?> getCompiledJavaClass(String className) {
+        className = redirectWagYourTail(className);
+
         List<Class<?>> versions = JAVA_CLASS_CACHE.get(className);
         return versions == null ? null : versions.get(versions.size() - 1);
     }
@@ -390,6 +400,7 @@ public Class<?> getCompiledJavaClass(String className) {
      * @since 1.8.4
      */
     public List<Class<?>> getAllCompiledJavaClassVersions(String className) {
+        className = redirectWagYourTail(className);
         List<Class<?>> versions = JAVA_CLASS_CACHE.get(className);
         return versions == null ? Collections.emptyList() : ImmutableList.copyOf(versions);
     }
@@ -437,6 +448,10 @@ public String getClassName(Object o) {
         }
     }
 
+    public static String redirectWagYourTail(String name) {
+        return name.replace("xyz.wagyourtail.", "com.jsmacrosce.");
+    }
+
     /**
      * I know this is probably bad practice, but lets be real, this whole library is bad practice, So I can make it
      * worse, right? at least this should work better than {@code try/catch}'ing using

extension/graal/src/main/java/com/jsmacrosce/jsmacros/graal/language/impl/GraalLanguageDefinition.java

@@ -10,6 +10,7 @@
 import com.jsmacrosce.jsmacros.core.event.BaseEvent;
 import com.jsmacrosce.jsmacros.core.extensions.Extension;
 import com.jsmacrosce.jsmacros.core.language.BaseLanguage;
+import com.jsmacrosce.jsmacros.core.library.impl.FReflection;
 import com.jsmacrosce.jsmacros.core.language.EventContainer;
 import com.jsmacrosce.jsmacros.core.library.BaseLibrary;
 import com.jsmacrosce.jsmacros.graal.GraalConfig;
@@ -23,6 +24,7 @@
 public class GraalLanguageDefinition extends BaseLanguage<Context, GraalScriptContext> {
     private static volatile Engine engine = null;
     public static final boolean isJsInstalled;
+    private static final ClassLoader REDIRECTING_CLASS_LOADER = new RedirectingClassLoader(FReflection.classLoader);
 
     static {
         // Create a temporary engine just to check available languages
@@ -68,7 +70,9 @@ protected Context buildContext(File currentDir, String lang, Map<String, String>
                 .engine(engine)
                 .allowAllAccess(true)
                 .allowNativeAccess(true)
-                .allowExperimentalOptions(true);
+                .allowExperimentalOptions(true)
+                .allowHostClassLookup(name -> true)
+                .hostClassLoader(REDIRECTING_CLASS_LOADER);
 
         for (Map.Entry<String, String> e : extraLangOptions.entrySet()) {
             try {
@@ -204,4 +208,23 @@ public GraalScriptContext createContext(BaseEvent event, File file) {
         return new GraalScriptContext(runner, event, file);
     }
 
+    private static final class RedirectingClassLoader extends ClassLoader {
+        private RedirectingClassLoader(ClassLoader parent) {
+            super(parent);
+        }
+
+        @Override
+        protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+            try {
+                return super.loadClass(name, resolve);
+            } catch (ClassNotFoundException e) {
+                String redirected = FReflection.redirectWagYourTail(name);
+                if (!redirected.equals(name)) {
+                    return super.loadClass(redirected, resolve);
+                }
+                throw e;
+            }
+        }
+    }
+
 }