From 960b215139a340be2976c07a4e6f270e2856dfaf Mon Sep 17 00:00:00 2001 From: Chris Sanders Date: Thu, 29 Oct 2015 16:39:39 -0500 Subject: [PATCH] Revert "Set debug regardless. This happens before FML sets deobfuscation." This reverts commit f3c4945019c0725b02df085ff745ffd3fd0b38e9. Revert "Always check isFMLDeobfuscated for null status." This reverts commit d12d3f271c9a499897bb8f1d5f01ca74b8e7ae3d. Revert "Perform nasty filter switch to gurarantee that we'll switch into INIT." This reverts commit bdda81fb265a56ab0262e9b71fd87f7f7441becb. --- .../asm/mixin/MixinEnvironment.java | 114 ++++++------------ .../mixin/transformer/MixinTransformer.java | 4 +- 2 files changed, 38 insertions(+), 80 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index ea2f47b3..57a43040 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -24,39 +24,40 @@ */ package org.spongepowered.asm.mixin; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; -import net.minecraft.launchwrapper.IClassNameTransformer; -import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; +import java.io.File; +import java.io.Serializable; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.filter.AbstractFilter; import org.apache.logging.log4j.core.helpers.Booleans; -import org.apache.logging.log4j.message.Message; +import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.appender.AbstractAppender; import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; import org.spongepowered.asm.mixin.transformer.MixinTransformer; import org.spongepowered.asm.util.ITokenProvider; import org.spongepowered.asm.util.PrettyPrinter; -import java.io.File; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; + +import net.minecraft.launchwrapper.IClassNameTransformer; +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; /** @@ -405,60 +406,28 @@ public class MixinEnvironment implements ITokenProvider { static class MixinLogger { - static MixinFilter filter = new MixinFilter(); + static MixinAppender appender = new MixinAppender("MixinLogger", null, null); public MixinLogger() { - // Prep ugly hack for INIT phase org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); - log.addFilter(filter); - log.setLevel(Level.DEBUG); + log.addAppender(appender); } - // Commence ugly hack for INIT phase - static class MixinFilter extends AbstractFilter { + static class MixinAppender extends AbstractAppender { - @Override - public Result filter(final org.apache.logging.log4j.core.Logger logger, final Level level, final Marker marker, final String msg, - final Object... params) { - if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(msg)) { - MixinEnvironment.gotoPhase(Phase.INIT); - } - // Log entries can be filtered before the blackboard has this value. We'll just look it up. - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; + protected MixinAppender(String name, Filter filter, Layout layout) { + super(name, filter, layout); + // TODO Auto-generated constructor stub } @Override - public Result filter(final org.apache.logging.log4j.core.Logger logger, final Level level, final Marker marker, final Object msg, - final Throwable t) { - if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(msg)) { + public void append(LogEvent event) { + if (event.getLevel() == Level.DEBUG && "Validating minecraft".equals(event.getMessage().getFormat())) { + // transition to INIT MixinEnvironment.gotoPhase(Phase.INIT); } - // Log entries can be filtered before the blackboard has this value. We'll just look it up. - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; - } - - @Override - public Result filter(final org.apache.logging.log4j.core.Logger logger, final Level level, final Marker marker, final Message msg, - final Throwable t) { - if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(msg.getFormattedMessage())) { - MixinEnvironment.gotoPhase(Phase.INIT); - } - // Log entries can be filtered before the blackboard has this value. We'll just look it up. - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; - } - - @Override - public Result filter(final LogEvent event) { - if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(event.getMessage().getFormattedMessage())) { - MixinEnvironment.gotoPhase(Phase.INIT); - } - // Log entries can be filtered before the blackboard has this value. We'll just look it up. - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; } + } } @@ -985,20 +954,9 @@ public class MixinEnvironment implements ITokenProvider { } if (phase == Phase.DEFAULT) { - // Remove filter + // remove appender org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); - for (Iterator iter = log.getFilters(); iter.hasNext();) { - final Filter filter = iter.next(); - if (filter instanceof MixinLogger.MixinFilter) { - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - // If FML isn't in obfuscated environment, we need to hotswap the log level back - if (isFMLDeobfuscated != null && !isFMLDeobfuscated) { - log.setLevel(Level.INFO); - } - iter.remove(); - break; - } - } + log.removeAppender(MixinLogger.appender); } MixinEnvironment.currentPhase = phase; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java index 4c5325c7..adcc3004 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -354,7 +354,7 @@ public class MixinTransformer extends TreeTransformer { boolean locked = this.lock.push().isSet(); MixinEnvironment environment = MixinEnvironment.getCurrentEnvironment(); - + if (this.currentEnvironment != environment && !locked) { try { this.init(environment); @@ -363,7 +363,7 @@ public class MixinTransformer extends TreeTransformer { throw new RuntimeException(ex); } } - + try { SortedSet mixins = null; boolean invalidRef = false;