TheKodeToad/loading-fixes #7
|
@ -17,6 +17,7 @@ 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
|
||||
|
@ -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) {
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
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;
|
||||
|
@ -40,7 +42,7 @@ public class MixinClassLoader extends URLClassLoader {
|
|||
if (in == null)
|
||||
return null;
|
||||
|
||||
return in.readAllBytes();
|
||||
return NonsenseMixinService.getTransformer().transformClass(MixinEnvironment.getCurrentEnvironment(), name, in.readAllBytes());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
private final ReEntranceLock lock = new ReEntranceLock(1);
|
||||
private final ContainerHandleVirtual handle = new ContainerHandleVirtual(getName());
|
||||
@Getter
|
||||
static IMixinTransformer transformer;
|
||||
private final ReEntranceLock lock = new ReEntranceLock(1);
|
||||
private final ContainerHandleVirtual handle = new ContainerHandleVirtual(getName());
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "NonsenseMixinService";
|
||||
}
|
||||
@Override
|
||||
public String getName() {
|
||||
return "NonsenseMixinService";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isValid() {
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public boolean isValid() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void prepare() {
|
||||
@Override
|
||||
public void prepare() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public MixinEnvironment.Phase getInitialPhase() {
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public MixinEnvironment.Phase getInitialPhase() {
|
||||
return MixinEnvironment.Phase.PREINIT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void offer(IMixinInternal internal) {
|
||||
if (internal instanceof IMixinTransformerFactory) {
|
||||
transformer = ((IMixinTransformerFactory) internal).createTransformer();
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void offer(IMixinInternal internal) {
|
||||
if (internal instanceof IMixinTransformerFactory) {
|
||||
transformer = ((IMixinTransformerFactory) internal).createTransformer();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
@Override
|
||||
public void init() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void beginPhase() {
|
||||
@Override
|
||||
public void beginPhase() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void checkEnv(Object bootSource) {
|
||||
@Override
|
||||
public void checkEnv(Object bootSource) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ReEntranceLock getReEntranceLock() {
|
||||
return lock;
|
||||
}
|
||||
@Override
|
||||
public ReEntranceLock getReEntranceLock() {
|
||||
return lock;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IClassProvider getClassProvider() {
|
||||
return this;
|
||||
}
|
||||
@Override
|
||||
public IClassProvider getClassProvider() {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IClassBytecodeProvider getBytecodeProvider() {
|
||||
return this;
|
||||
}
|
||||
@Override
|
||||
public IClassBytecodeProvider getBytecodeProvider() {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ITransformerProvider getTransformerProvider() {
|
||||
return this;
|
||||
}
|
||||
@Override
|
||||
public ITransformerProvider getTransformerProvider() {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IClassTracker getClassTracker() {
|
||||
return this;
|
||||
}
|
||||
@Override
|
||||
public IClassTracker getClassTracker() {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMixinAuditTrail getAuditTrail() {
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public IMixinAuditTrail getAuditTrail() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<String> getPlatformAgents() {
|
||||
return List.of();
|
||||
}
|
||||
@Override
|
||||
public Collection<String> getPlatformAgents() {
|
||||
return Collections.singletonList("org.spongepowered.asm.launch.platform.MixinPlatformAgentDefault");
|
||||
}
|
||||
|
||||
@Override
|
||||
public IContainerHandle getPrimaryContainer() {
|
||||
return handle;
|
||||
}
|
||||
@Override
|
||||
public IContainerHandle getPrimaryContainer() {
|
||||
return handle;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<IContainerHandle> getMixinContainers() {
|
||||
return List.of();
|
||||
}
|
||||
@Override
|
||||
public Collection<IContainerHandle> getMixinContainers() {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputStream getResourceAsStream(String name) {
|
||||
return Launcher.getInstance().getTargetClassLoader().getResourceAsStream(name);
|
||||
}
|
||||
@Override
|
||||
public InputStream getResourceAsStream(String name) {
|
||||
return Launcher.getInstance().getTargetClassLoader().getResourceAsStream(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSideName() {
|
||||
return Launcher.getInstance().getEnv().getMixinName();
|
||||
}
|
||||
@Override
|
||||
public String getSideName() {
|
||||
return Launcher.getInstance().getEnv().getMixinName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public MixinEnvironment.CompatibilityLevel getMinCompatibilityLevel() {
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public MixinEnvironment.CompatibilityLevel getMinCompatibilityLevel() {
|
||||
return MixinEnvironment.CompatibilityLevel.JAVA_8;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MixinEnvironment.CompatibilityLevel getMaxCompatibilityLevel() {
|
||||
return null;
|
||||
}
|
||||
@Override
|
||||
public MixinEnvironment.CompatibilityLevel getMaxCompatibilityLevel() {
|
||||
return MixinEnvironment.CompatibilityLevel.JAVA_22;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ILogger getLogger(String name) {
|
||||
return NonsenseMixinLogger.get(name);
|
||||
}
|
||||
@Override
|
||||
public ILogger getLogger(String name) {
|
||||
return NonsenseMixinLogger.get(name);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ClassNode getClassNode(String name) throws IOException {
|
||||
return getClassNode(name, true);
|
||||
}
|
||||
@Override
|
||||
public ClassNode getClassNode(String name) throws IOException {
|
||||
return getClassNode(name, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ClassNode getClassNode(String name, boolean runTransformers) throws IOException {
|
||||
byte[] bytes;
|
||||
if (runTransformers){
|
||||
bytes = transformer.transformClass(MixinEnvironment.getCurrentEnvironment(), name,
|
||||
Launcher.getInstance().getTargetClassLoader().getClassBytes(name));
|
||||
} else {
|
||||
bytes = Launcher.getInstance().getTargetClassLoader().getClassBytes(name);
|
||||
}
|
||||
ClassReader reader = new MixinClassReader(bytes, name);
|
||||
ClassNode node = new ClassNode();
|
||||
reader.accept(node, 0);
|
||||
return node;
|
||||
}
|
||||
@Override
|
||||
public ClassNode getClassNode(String name, boolean runTransformers) throws IOException {
|
||||
byte[] bytes;
|
||||
if (runTransformers && transformer != null) {
|
||||
bytes = transformer.transformClass(MixinEnvironment.getCurrentEnvironment(), name,
|
||||
Launcher.getInstance().getTargetClassLoader().getClassBytes(name));
|
||||
} else {
|
||||
bytes = Launcher.getInstance().getTargetClassLoader().getClassBytes(name);
|
||||
}
|
||||
ClassReader reader = new MixinClassReader(bytes, name);
|
||||
ClassNode node = new ClassNode();
|
||||
reader.accept(node, 0);
|
||||
return node;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Deprecated
|
||||
public URL[] getClassPath() {
|
||||
return new URL[0];
|
||||
}
|
||||
@Override
|
||||
@Deprecated
|
||||
public URL[] getClassPath() {
|
||||
return new URL[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<?> findClass(String name) throws ClassNotFoundException {
|
||||
return Class.forName(name, false, Launcher.getInstance().getTargetClassLoader());
|
||||
}
|
||||
@Override
|
||||
public Class<?> findClass(String name) throws ClassNotFoundException {
|
||||
return Class.forName(name, false, Launcher.getInstance().getTargetClassLoader());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<?> findClass(String name, boolean initialize) throws ClassNotFoundException {
|
||||
return Class.forName(name, initialize, Launcher.getInstance().getTargetClassLoader());
|
||||
}
|
||||
@Override
|
||||
public Class<?> findClass(String name, boolean initialize) throws ClassNotFoundException {
|
||||
return Class.forName(name, initialize, Launcher.getInstance().getTargetClassLoader());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<?> findAgentClass(String name, boolean initialize) throws ClassNotFoundException {
|
||||
return Class.forName(name, initialize, Launcher.getInstance().getTargetClassLoader());
|
||||
}
|
||||
@Override
|
||||
public Class<?> findAgentClass(String name, boolean initialize) throws ClassNotFoundException {
|
||||
return Class.forName(name, initialize, Launcher.getInstance().getTargetClassLoader());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerInvalidClass(String className) {
|
||||
@Override
|
||||
public void registerInvalidClass(String className) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isClassLoaded(String className) {
|
||||
return Launcher.getInstance().getTargetClassLoader().isClassLoaded(className);
|
||||
}
|
||||
@Override
|
||||
public boolean isClassLoaded(String className) {
|
||||
return Launcher.getInstance().getTargetClassLoader().isClassLoaded(className);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getClassRestrictions(String className) {
|
||||
return "";
|
||||
}
|
||||
@Override
|
||||
public String getClassRestrictions(String className) {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<ITransformer> getTransformers() {
|
||||
return List.of();
|
||||
}
|
||||
@Override
|
||||
public Collection<ITransformer> getTransformers() {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<ITransformer> getDelegatedTransformers() {
|
||||
return List.of();
|
||||
}
|
||||
@Override
|
||||
public Collection<ITransformer> getDelegatedTransformers() {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addTransformerExclusion(String name) {
|
||||
@Override
|
||||
public void addTransformerExclusion(String name) {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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));
|
||||
|
|
Loading…
Reference in a new issue