frogmc/FrogLoader
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: frogmc:e5d4a343cac4f183eca1322a5e3ce33fdfa2fd29
Branches Tags
frogmc:main
..
compare: frogmc:287214acba01830083c1de0623326f723a9a2822
Branches Tags
frogmc:main

No commits in common. "e5d4a343cac4f183eca1322a5e3ce33fdfa2fd29" and "287214acba01830083c1de0623326f723a9a2822" have entirely different histories.
e5d4a343ca ... 287214acba

10 changed files with 233 additions and 338 deletions
Show stats Expand all files Collapse all files

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

@ -1,25 +0,0 @@
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);
}
}

4
minecraft/src/main/resources/example_mod.mixins.json
View file

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

2
minecraft/src/main/resources/nonsense.mod.toml
View file

@ -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"

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

@ -12,12 +12,11 @@ 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
@ -41,14 +40,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;
@ -65,21 +64,11 @@ 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) {

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

@ -1,9 +1,17 @@
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;
@ -15,7 +23,8 @@ 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;
@ -36,12 +45,15 @@ public class Launcher {
}
instance = this;
this.env = env;
targetClassLoader = new MixinClassLoader();
targetClassLoader.excludePackage("org.slf4j");
targetClassLoader.excludePackage("org.spongepowered");
targetClassLoader.excludePackage("org.apache.logging");
targetClassLoader.excludePackage("org.ecorous.esnesnon.nonsense.loader.impl.launch");
targetClassLoader.excludePackage("org.ecorous.esnesnon.nonsense.loader.api.env");
classPath = Arrays.stream(System.getProperty("java.class.path").split(File.pathSeparator)).filter(s -> !"*".equals(s)).map(Paths::get).toList();
targetClassLoader = new MixinClassloader(classPath.stream().map(Path::toUri).map((URI uri) -> {
try {
return uri.toURL();
} catch (MalformedURLException e) {
// TODO
throw new RuntimeException(e);
}
}).toArray(URL[]::new), this.getClass().getClassLoader());
Thread.currentThread().setContextClassLoader(targetClassLoader);

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

@ -1,129 +0,0 @@
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());
}
}

54
src/main/java/org/ecorous/esnesnon/nonsense/loader/impl/launch/MixinClassloader.java Normal file
View file

@ -0,0 +1,54 @@
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();
}
}
}
}

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

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

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

@ -1,13 +1,5 @@
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;
@ -21,8 +13,13 @@ 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 {
@Getter
static IMixinTransformer transformer;
private final ReEntranceLock lock = new ReEntranceLock(1);
private final ContainerHandleVirtual handle = new ContainerHandleVirtual(getName());
@ -44,7 +41,7 @@ public class NonsenseMixinService implements IMixinService, IClassProvider, ICla
@Override
public MixinEnvironment.Phase getInitialPhase() {
return MixinEnvironment.Phase.PREINIT;
return null;
}
@Override
@ -101,7 +98,7 @@ public class NonsenseMixinService implements IMixinService, IClassProvider, ICla
@Override
public Collection<String> getPlatformAgents() {
return Collections.singletonList("org.spongepowered.asm.launch.platform.MixinPlatformAgentDefault");
return List.of();
}
@Override
@ -126,12 +123,12 @@ public class NonsenseMixinService implements IMixinService, IClassProvider, ICla
@Override
public MixinEnvironment.CompatibilityLevel getMinCompatibilityLevel() {
return MixinEnvironment.CompatibilityLevel.JAVA_8;
return null;
}
@Override
public MixinEnvironment.CompatibilityLevel getMaxCompatibilityLevel() {
return MixinEnvironment.CompatibilityLevel.JAVA_22;
return null;
}
@Override
@ -148,7 +145,7 @@ public class NonsenseMixinService implements IMixinService, IClassProvider, ICla
@Override
public ClassNode getClassNode(String name, boolean runTransformers) throws IOException {
byte[] bytes;
if (runTransformers && transformer != null) {
if (runTransformers){
bytes = transformer.transformClass(MixinEnvironment.getCurrentEnvironment(), name,
Launcher.getInstance().getTargetClassLoader().getClassBytes(name));
} else {

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

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