Merge pull request 'TheKodeToad/loading-fixes' (#7) from TheKodeToad/loading-fixes into main

Reviewed-on: https://git-esnesnon.ecorous.org/esnesnon/nonsense-loader/pulls/7

minecraft/src/main/java/org/ecorous/esnesnon/nonsense/loader/example/mixin/TitleScreenMixin.java

@@ -0,0 +1,25 @@
+package org.ecorous.esnesnon.nonsense.loader.example.mixin;
+
+import net.minecraft.client.gui.components.FocusableTextWidget;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(TitleScreen.class)
+public abstract class TitleScreenMixin extends Screen {
+
+	protected TitleScreenMixin(Component title) {
+		super(title);
+	}
+
+	@Inject(method = "createNormalMenuOptions", at = @At("TAIL"), remap = false)
+	private void showExample(int y, int rowHeight, CallbackInfo ci) {
+		var widget = new FocusableTextWidget(200, Component.literal("<insert frog here!>"), this.font);
+		widget.setPosition(width / 2 - widget.getWidth(), 20);
+		addRenderableOnly(widget);
+	}
+}

minecraft/src/main/resources/example_mod.mixins.json

@@ -4,7 +4,9 @@
   "package": "org.ecorous.esnesnon.nonsense.loader.example.mixin",
   "compatibilityLevel": "JAVA_21",
   "mixins": [],
-  "client": [],
+  "client": [
+    "TitleScreenMixin"
+  ],
   "injectors": {
     "defaultRequire": 1
   }

minecraft/src/main/resources/nonsense.mod.toml

@@ -16,6 +16,6 @@ breaks = [
 ]
 
 [nonsense.extensions]
-pre_launch = "org/ecorous/esnesnon/nonsense/loader/example/ExamplePreLaunchExtension"
+pre_launch = "org.ecorous.esnesnon.nonsense.loader.example.ExamplePreLaunchExtension"
 mixin_config = "example_mod.mixins.json"
 

src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/LoaderImpl.java

@@ -12,11 +12,12 @@ import java.util.*;
 import com.google.gson.Gson;
 import org.ecorous.esnesnon.nonsense.loader.api.Loader;
 import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
-import org.ecorous.esnesnon.nonsense.loader.impl.launch.MixinClassloader;
+import org.ecorous.esnesnon.nonsense.loader.impl.launch.MixinClassLoader;
 import org.ecorous.esnesnon.nonsense.loader.impl.plugin.NonsensePlugin;
 import lombok.Getter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.spongepowered.asm.mixin.MixinEnvironment;
 
 public class LoaderImpl implements Loader {
 	// TODO decide this
@@ -40,14 +41,14 @@ public class LoaderImpl implements Loader {
 	private final Path gameDir, configDir, modsDir;
 
 	@Getter
-	private final MixinClassloader classloader;
+	private final MixinClassLoader classloader;
 
 	@Getter
 	private final Gson gson = new Gson();
 
 	private LoaderImpl(String[] args, Env env) {
 		instance = this;
-		this.classloader = (MixinClassloader) this.getClass().getClassLoader();
+		this.classloader = (MixinClassLoader) this.getClass().getClassLoader();
 		this.args = args;
 		this.env = env;
 
@@ -64,11 +65,21 @@ public class LoaderImpl implements Loader {
 		}
 
 		discoverPlugins();
-
+		advanceMixinState();
 		LOGGER.info("Launching...");
 		plugins.forEach(NonsensePlugin::run);
 	}
 
+	private void advanceMixinState(){
+		try {
+			MethodHandle m = MethodHandles.privateLookupIn(MixinEnvironment.class, MethodHandles.lookup()).findStatic(MixinEnvironment.class, "gotoPhase", MethodType.methodType(void.class, MixinEnvironment.Phase.class));
+			m.invoke(MixinEnvironment.Phase.INIT);
+			m.invoke(MixinEnvironment.Phase.DEFAULT);
+		} catch (Throwable e) {
+			throw new RuntimeException(e);
+		}
+	}
+
 	@SuppressWarnings("unused")
 	public static void run(String[] args, Env env) {
 		if (instance != null) {

src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/launch/Launcher.java

@@ -1,17 +1,9 @@
 package org.ecorous.esnesnon.nonsense.loader.impl.launch;
 
-import java.io.File;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.ecorous.esnesnon.nonsense.loader.api.env.Env;
@@ -23,8 +15,7 @@ import org.spongepowered.asm.service.IPropertyKey;
 public class Launcher {
 
 	@Getter
-	private final MixinClassloader targetClassLoader;
+	private final MixinClassLoader targetClassLoader;
-	private final List<Path> classPath;
 
 	@Getter
 	private static Launcher instance;
@@ -45,15 +36,12 @@ public class Launcher {
 		}
 		instance = this;
 		this.env = env;
-		classPath = Arrays.stream(System.getProperty("java.class.path").split(File.pathSeparator)).filter(s -> !"*".equals(s)).map(Paths::get).toList();
+		targetClassLoader = new MixinClassLoader();
-		targetClassLoader = new MixinClassloader(classPath.stream().map(Path::toUri).map((URI uri) -> {
+		targetClassLoader.excludePackage("org.slf4j");
-			try {
+		targetClassLoader.excludePackage("org.spongepowered");
-				return uri.toURL();
+		targetClassLoader.excludePackage("org.apache.logging");
-			} catch (MalformedURLException e) {
+		targetClassLoader.excludePackage("org.ecorous.esnesnon.nonsense.loader.impl.launch");
-				// TODO
+		targetClassLoader.excludePackage("org.ecorous.esnesnon.nonsense.loader.api.env");
-				throw new RuntimeException(e);
-			}
-		}).toArray(URL[]::new), this.getClass().getClassLoader());
 
 		Thread.currentThread().setContextClassLoader(targetClassLoader);
 

src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/launch/MixinClassLoader.java

@@ -0,0 +1,129 @@
+package org.ecorous.esnesnon.nonsense.loader.impl.launch;
+
+import org.ecorous.esnesnon.nonsense.loader.impl.mixin.NonsenseMixinService;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.MixinEnvironment;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+
+public class MixinClassLoader extends URLClassLoader {
+
+    private static final ClassLoader SYSTEM = ClassLoader.getSystemClassLoader();
+    private final List<String> exclusions = new ArrayList<>();
+
+    static {
+        registerAsParallelCapable();
+    }
+
+    public MixinClassLoader() {
+        super(new URL[0], null);
+        excludePackage("java");
+        excludePackage("com.sun");
+        excludePackage("sun");
+        excludePackage("jdk");
+    }
+
+    public boolean isClassLoaded(String name) {
+        return findLoadedClass(name) != null;
+    }
+
+    public byte[] getClassBytes(String name) throws IOException {
+        String binName = name.replace('.', '/');
+        String path = binName.concat(".class");
+
+        try (InputStream in = getResourceAsStream(path)) {
+            if (in == null)
+                return null;
+
+            return NonsenseMixinService.getTransformer().transformClass(MixinEnvironment.getCurrentEnvironment(), name, in.readAllBytes());
+        }
+    }
+
+    public void excludePackage(String name) {
+        exclusions.add(name + '.');
+    }
+
+    @Override
+    public void addURL(URL url) {
+        super.addURL(url);
+    }
+
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        synchronized (getClassLoadingLock(name)) {
+            for (String prefix : exclusions) {
+                if (name.startsWith(prefix)) {
+                    return SYSTEM.loadClass(name);
+                }
+            }
+
+            Class<?> loaded = findLoadedClass(name);
+            if (loaded != null)
+                return loaded;
+
+            Class<?> result = findClass(name);
+
+            if (resolve)
+                resolveClass(result);
+
+            return result;
+        }
+    }
+
+    @Override
+    public synchronized Class<?> findClass(String name) throws ClassNotFoundException {
+        try {
+            byte[] bytes = getClassBytes(name);
+            if (bytes == null)
+                throw new ClassNotFoundException(name);
+
+            return defineClass(name, bytes, 0, bytes.length);
+        } catch (IOException e) {
+            throw new ClassNotFoundException(name, e);
+        }
+    }
+
+    @Nullable
+    @Override
+    public URL getResource(String name) {
+        URL parentUrl = super.getResource(name);
+
+        if (parentUrl != null)
+            return parentUrl;
+
+        return SYSTEM.getResource(name);
+    }
+
+    @Override
+    public Enumeration<URL> getResources(String name) throws IOException {
+        Enumeration<URL> parentResources = super.getResources(name);
+        Enumeration<URL> systemResources = SYSTEM.getResources(name);
+
+        if (parentResources.hasMoreElements() && systemResources.hasMoreElements()) {
+            List<URL> list = new ArrayList<>();
+
+            while (parentResources.hasMoreElements())
+                list.add(parentResources.nextElement());
+
+            while (systemResources.hasMoreElements())
+                list.add(systemResources.nextElement());
+
+            return Collections.enumeration(list);
+        }
+
+        if (parentResources.hasMoreElements())
+            return parentResources;
+
+        if (systemResources.hasMoreElements())
+            return systemResources;
+
+        return Collections.enumeration(Collections.emptyList());
+    }
+}

src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/launch/MixinClassloader.java

@@ -1,54 +0,0 @@
-package org.ecorous.esnesnon.nonsense.loader.impl.launch;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-public class MixinClassloader extends URLClassLoader {
-
-	static {
-		registerAsParallelCapable();
-	}
-
-	public MixinClassloader(URL[] urls, ClassLoader parent) {
-		super(urls, parent);
-	}
-
-	@Override
-	public void addURL(URL url) {
-		super.addURL(url);
-	}
-
-	public boolean isClassLoaded(String name) {
-		return findLoadedClass(name) != null;
-	}
-
-    @Override
-    public Class<?> findClass(String name) throws ClassNotFoundException {
-        try {
-            byte[] bytes = getClassBytes(name);
-            if (bytes == null) {
-                throw new ClassNotFoundException(name);
-            }
-
-			synchronized (getClassLoadingLock(name)) {
-				return defineClass(name, bytes, 0, bytes.length);
-			}
-		} catch (IOException aa) {
-			throw new ClassNotFoundException(name, aa);
-		}
-
-	}
-
-	public byte[] getClassBytes(String name) throws IOException {
-		String path = name.replace(".", "/").concat(".class");
-		synchronized (getClassLoadingLock(name)) {
-			try (InputStream in = getResourceAsStream(path)) {
-				if (in == null)
-					return null;
-				return in.readAllBytes();
-			}
-		}
-	}
-}

src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mixin/NonsenseMixinLogger.java

@@ -1,5 +1,6 @@
 package org.ecorous.esnesnon.nonsense.loader.impl.mixin;
 
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -20,7 +21,7 @@ public class NonsenseMixinLogger extends LoggerAdapterAbstract {
 
 	public NonsenseMixinLogger(String name){
 		super(name);
-		log = LoggerFactory.getLogger(name);
+		log = LoggerFactory.getLogger("Nonsense Loader/"+name.substring(0, 1).toUpperCase(Locale.ROOT)+name.substring(1));
 	}
 
 	@Override

src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/mixin/NonsenseMixinService.java

@@ -1,5 +1,13 @@
 package org.ecorous.esnesnon.nonsense.loader.impl.mixin;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import lombok.Getter;
 import org.ecorous.esnesnon.nonsense.loader.impl.launch.Launcher;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.tree.ClassNode;
@@ -13,198 +21,193 @@ import org.spongepowered.asm.service.*;
 import org.spongepowered.asm.transformers.MixinClassReader;
 import org.spongepowered.asm.util.ReEntranceLock;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collection;
-import java.util.List;
-
 public class NonsenseMixinService implements IMixinService, IClassProvider, IClassBytecodeProvider, ITransformerProvider, IClassTracker {
-    static IMixinTransformer transformer;
+	@Getter
-    private final ReEntranceLock lock = new ReEntranceLock(1);
+	static IMixinTransformer transformer;
-    private final ContainerHandleVirtual handle = new ContainerHandleVirtual(getName());
+	private final ReEntranceLock lock = new ReEntranceLock(1);
+	private final ContainerHandleVirtual handle = new ContainerHandleVirtual(getName());
 
-    @Override
+	@Override
-    public String getName() {
+	public String getName() {
-        return "NonsenseMixinService";
+		return "NonsenseMixinService";
-    }
+	}
 
-    @Override
+	@Override
-    public boolean isValid() {
+	public boolean isValid() {
-        return true;
+		return true;
-    }
+	}
 
-    @Override
+	@Override
-    public void prepare() {
+	public void prepare() {
 
-    }
+	}
 
-    @Override
+	@Override
-    public MixinEnvironment.Phase getInitialPhase() {
+	public MixinEnvironment.Phase getInitialPhase() {
-        return null;
+		return MixinEnvironment.Phase.PREINIT;
-    }
+	}
 
-    @Override
+	@Override
-    public void offer(IMixinInternal internal) {
+	public void offer(IMixinInternal internal) {
-        if (internal instanceof IMixinTransformerFactory) {
+		if (internal instanceof IMixinTransformerFactory) {
-            transformer = ((IMixinTransformerFactory) internal).createTransformer();
+			transformer = ((IMixinTransformerFactory) internal).createTransformer();
-        }
+		}
-    }
+	}
 
-    @Override
+	@Override
-    public void init() {
+	public void init() {
 
-    }
+	}
 
-    @Override
+	@Override
-    public void beginPhase() {
+	public void beginPhase() {
 
-    }
+	}
 
-    @Override
+	@Override
-    public void checkEnv(Object bootSource) {
+	public void checkEnv(Object bootSource) {
 
-    }
+	}
 
-    @Override
+	@Override
-    public ReEntranceLock getReEntranceLock() {
+	public ReEntranceLock getReEntranceLock() {
-        return lock;
+		return lock;
-    }
+	}
 
-    @Override
+	@Override
-    public IClassProvider getClassProvider() {
+	public IClassProvider getClassProvider() {
-        return this;
+		return this;
-    }
+	}
 
-    @Override
+	@Override
-    public IClassBytecodeProvider getBytecodeProvider() {
+	public IClassBytecodeProvider getBytecodeProvider() {
-        return this;
+		return this;
-    }
+	}
 
-    @Override
+	@Override
-    public ITransformerProvider getTransformerProvider() {
+	public ITransformerProvider getTransformerProvider() {
-        return this;
+		return this;
-    }
+	}
 
-    @Override
+	@Override
-    public IClassTracker getClassTracker() {
+	public IClassTracker getClassTracker() {
-        return this;
+		return this;
-    }
+	}
 
-    @Override
+	@Override
-    public IMixinAuditTrail getAuditTrail() {
+	public IMixinAuditTrail getAuditTrail() {
-        return null;
+		return null;
-    }
+	}
 
-    @Override
+	@Override
-    public Collection<String> getPlatformAgents() {
+	public Collection<String> getPlatformAgents() {
-        return List.of();
+		return Collections.singletonList("org.spongepowered.asm.launch.platform.MixinPlatformAgentDefault");
-    }
+	}
 
-    @Override
+	@Override
-    public IContainerHandle getPrimaryContainer() {
+	public IContainerHandle getPrimaryContainer() {
-        return handle;
+		return handle;
-    }
+	}
 
-    @Override
+	@Override
-    public Collection<IContainerHandle> getMixinContainers() {
+	public Collection<IContainerHandle> getMixinContainers() {
-        return List.of();
+		return List.of();
-    }
+	}
 
-    @Override
+	@Override
-    public InputStream getResourceAsStream(String name) {
+	public InputStream getResourceAsStream(String name) {
-        return Launcher.getInstance().getTargetClassLoader().getResourceAsStream(name);
+		return Launcher.getInstance().getTargetClassLoader().getResourceAsStream(name);
-    }
+	}
 
-    @Override
+	@Override
-    public String getSideName() {
+	public String getSideName() {
-        return Launcher.getInstance().getEnv().getMixinName();
+		return Launcher.getInstance().getEnv().getMixinName();
-    }
+	}
 
-    @Override
+	@Override
-    public MixinEnvironment.CompatibilityLevel getMinCompatibilityLevel() {
+	public MixinEnvironment.CompatibilityLevel getMinCompatibilityLevel() {
-        return null;
+		return MixinEnvironment.CompatibilityLevel.JAVA_8;
-    }
+	}
 
-    @Override
+	@Override
-    public MixinEnvironment.CompatibilityLevel getMaxCompatibilityLevel() {
+	public MixinEnvironment.CompatibilityLevel getMaxCompatibilityLevel() {
-        return null;
+		return MixinEnvironment.CompatibilityLevel.JAVA_22;
-    }
+	}
 
-    @Override
+	@Override
-    public ILogger getLogger(String name) {
+	public ILogger getLogger(String name) {
-        return NonsenseMixinLogger.get(name);
+		return NonsenseMixinLogger.get(name);
-    }
+	}
 
 
-    @Override
+	@Override
-    public ClassNode getClassNode(String name) throws IOException {
+	public ClassNode getClassNode(String name) throws IOException {
-        return getClassNode(name, true);
+		return getClassNode(name, true);
-    }
+	}
 
-    @Override
+	@Override
-    public ClassNode getClassNode(String name, boolean runTransformers) throws IOException {
+	public ClassNode getClassNode(String name, boolean runTransformers) throws IOException {
-        byte[] bytes;
+		byte[] bytes;
-        if (runTransformers){
+		if (runTransformers && transformer != null) {
-            bytes = transformer.transformClass(MixinEnvironment.getCurrentEnvironment(), name,
+			bytes = transformer.transformClass(MixinEnvironment.getCurrentEnvironment(), name,
-                    Launcher.getInstance().getTargetClassLoader().getClassBytes(name));
+					Launcher.getInstance().getTargetClassLoader().getClassBytes(name));
-        } else {
+		} else {
-            bytes = Launcher.getInstance().getTargetClassLoader().getClassBytes(name);
+			bytes = Launcher.getInstance().getTargetClassLoader().getClassBytes(name);
-        }
+		}
-        ClassReader reader = new MixinClassReader(bytes, name);
+		ClassReader reader = new MixinClassReader(bytes, name);
-        ClassNode node = new ClassNode();
+		ClassNode node = new ClassNode();
-        reader.accept(node, 0);
+		reader.accept(node, 0);
-        return node;
+		return node;
-    }
+	}
 
-    @Override
+	@Override
-    @Deprecated
+	@Deprecated
-    public URL[] getClassPath() {
+	public URL[] getClassPath() {
-        return new URL[0];
+		return new URL[0];
-    }
+	}
 
-    @Override
+	@Override
-    public Class<?> findClass(String name) throws ClassNotFoundException {
+	public Class<?> findClass(String name) throws ClassNotFoundException {
-        return Class.forName(name, false, Launcher.getInstance().getTargetClassLoader());
+		return Class.forName(name, false, Launcher.getInstance().getTargetClassLoader());
-    }
+	}
 
-    @Override
+	@Override
-    public Class<?> findClass(String name, boolean initialize) throws ClassNotFoundException {
+	public Class<?> findClass(String name, boolean initialize) throws ClassNotFoundException {
-        return Class.forName(name, initialize, Launcher.getInstance().getTargetClassLoader());
+		return Class.forName(name, initialize, Launcher.getInstance().getTargetClassLoader());
-    }
+	}
 
-    @Override
+	@Override
-    public Class<?> findAgentClass(String name, boolean initialize) throws ClassNotFoundException {
+	public Class<?> findAgentClass(String name, boolean initialize) throws ClassNotFoundException {
-        return Class.forName(name, initialize, Launcher.getInstance().getTargetClassLoader());
+		return Class.forName(name, initialize, Launcher.getInstance().getTargetClassLoader());
-    }
+	}
 
-    @Override
+	@Override
-    public void registerInvalidClass(String className) {
+	public void registerInvalidClass(String className) {
 
-    }
+	}
 
-    @Override
+	@Override
-    public boolean isClassLoaded(String className) {
+	public boolean isClassLoaded(String className) {
-        return Launcher.getInstance().getTargetClassLoader().isClassLoaded(className);
+		return Launcher.getInstance().getTargetClassLoader().isClassLoaded(className);
-    }
+	}
 
-    @Override
+	@Override
-    public String getClassRestrictions(String className) {
+	public String getClassRestrictions(String className) {
-        return "";
+		return "";
-    }
+	}
 
-    @Override
+	@Override
-    public Collection<ITransformer> getTransformers() {
+	public Collection<ITransformer> getTransformers() {
-        return List.of();
+		return List.of();
-    }
+	}
 
-    @Override
+	@Override
-    public Collection<ITransformer> getDelegatedTransformers() {
+	public Collection<ITransformer> getDelegatedTransformers() {
-        return List.of();
+		return List.of();
-    }
+	}
 
-    @Override
+	@Override
-    public void addTransformerExclusion(String name) {
+	public void addTransformerExclusion(String name) {
 
-    }
+	}
 }

src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/plugin/game/Minecraft.java

@@ -70,7 +70,7 @@ public class Minecraft implements NonsensePlugin {
 				throw new RuntimeException(e);
 			}
 		}).forEachOrdered(LoaderImpl.getInstance().getClassloader()::addURL);
-		LOGGER.info("Found {} mods", mods.size()+classpathMods.size());
+		LOGGER.info("Found {} mod(s)", mods.size()+classpathMods.size());
 
 		classpathMods.parallelStream().map(ModPropertiesReader::readFile).forEachOrdered(modProperties::add);
 		mods.parallelStream().map(ModPropertiesReader::read).forEachOrdered(opt -> opt.ifPresent(modProperties::add));