diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java index 3891a2da1..b7f7459c8 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java @@ -28,15 +28,14 @@ import java.util.Map; import java.util.Set; @IFMLLoadingPlugin.MCVersion("1.7.10") -@IFMLLoadingPlugin.TransformerExclusions( - { +@IFMLLoadingPlugin.TransformerExclusions({ "com.gtnewhorizons.angelica.transform.RedirectorTransformer", - "com.gtnewhorizons.angelica.glsm.GLStateManager" - } -) + "com.gtnewhorizons.angelica.glsm.GLStateManager"}) @IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE - 5) public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { + private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("angelica.dumpClass", "false")); + private static boolean OBF_ENV; public static final Logger LOGGER = LogManager.getLogger("Angelica"); private String[] transformerClasses; @@ -97,7 +96,7 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { @Override public void injectData(Map data) { - // no-op + OBF_ENV = (boolean) data.get("runtimeDeobfuscationEnabled"); } @Override @@ -115,6 +114,17 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { return Mixins.getEarlyMixins(loadedCoreMods); } + public static boolean DUMP_CLASSES() { + return DUMP_CLASSES || !OBF_ENV; + } + + /** + * Returns true if we are in an obfuscated environment, returns false in dev environment. + */ + public static boolean isObfEnv() { + return OBF_ENV; + } + private static final ImmutableMap MODS_BY_CLASS = ImmutableMap.builder() .put("optifine.OptiFineForgeTweaker", TargetedMod.OPTIFINE) .put("fastcraft.Tweaker", TargetedMod.FASTCRAFT) diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/BlockTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/BlockTransformer.java index d4b830857..e4dcfdb97 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/BlockTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/transform/BlockTransformer.java @@ -1,6 +1,8 @@ package com.gtnewhorizons.angelica.transform; import com.google.common.collect.ImmutableList; +import com.gtnewhorizon.gtnhlib.asm.ASMUtil; +import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import net.minecraft.launchwrapper.IClassTransformer; import org.apache.commons.lang3.tuple.Pair; import org.objectweb.asm.ClassReader; @@ -10,9 +12,8 @@ import org.objectweb.asm.tree.ClassNode; import java.util.List; public class BlockTransformer implements IClassTransformer { - public static final String BlockClass = "net/minecraft/block/Block"; - public static final String BlockPackage = BlockClass.substring(0, BlockClass.lastIndexOf('/') + 1); - private static final String BlockClassFriendly = BlockClass.replace('/', '.'); + + private static final String BlockClassFriendly = "net.minecraft.block.Block"; public static final List> BlockBoundsFields = ImmutableList.of( Pair.of("minX", "field_149759_B"), Pair.of("minY", "field_149760_C"), @@ -28,18 +29,20 @@ public class BlockTransformer implements IClassTransformer { */ @Override public byte[] transform(String name, String transformedName, byte[] basicClass) { - if(basicClass != null && transformedName.equals(BlockClassFriendly)) { + if (basicClass != null && BlockClassFriendly.equals(transformedName)) { final ClassReader cr = new ClassReader(basicClass); final ClassNode cn = new ClassNode(); cr.accept(cn, 0); - - cn.fields.removeIf(node -> BlockBoundsFields.stream().anyMatch(pair -> node.name.equals(pair.getLeft()) || node.name.equals(pair.getRight()))); - + cn.fields.removeIf(field -> BlockBoundsFields.stream().anyMatch(pair -> field.name.equals(pair.getLeft()) || field.name.equals(pair.getRight()))); ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS); cn.accept(cw); - basicClass = cw.toByteArray(); + final byte[] bytes = cw.toByteArray(); + if (AngelicaTweaker.DUMP_CLASSES()) { + ASMUtil.saveAsRawClassFile(basicClass, transformedName + "_PRE", this); + ASMUtil.saveAsRawClassFile(bytes, transformedName + "_POST", this); + } + return bytes; } - return basicClass; } } diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/HUDCachingTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/HUDCachingTransformer.java index ced7533af..c3b3b4393 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/HUDCachingTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/transform/HUDCachingTransformer.java @@ -2,10 +2,9 @@ package com.gtnewhorizons.angelica.transform; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.gtnewhorizon.gtnhlib.asm.ASMUtil; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.Launch; -import org.apache.commons.io.FileUtils; import org.spongepowered.asm.lib.ClassReader; import org.spongepowered.asm.lib.ClassWriter; import org.spongepowered.asm.lib.Opcodes; @@ -18,19 +17,14 @@ import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.transformers.MixinClassWriter; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.file.Files; import java.util.List; import java.util.Map; public class HUDCachingTransformer implements IClassTransformer, Opcodes { - static final String HUDCaching = "com/gtnewhorizons/angelica/hudcaching/HUDCaching$HUDCachingHooks"; - private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("angelica.dumpClass", "false")); - static final Map> ReturnEarlyMethods = ImmutableMap.of( + private static final String HUDCaching = "com/gtnewhorizons/angelica/hudcaching/HUDCaching$HUDCachingHooks"; + private static final Map> ReturnEarlyMethods = ImmutableMap.of( "thaumcraft.client.lib.RenderEventHandler", ImmutableList.of("renderOverlay"), "com.kentington.thaumichorizons.client.lib.RenderEventHandler", ImmutableList.of("renderOverlay") ); @@ -70,43 +64,13 @@ public class HUDCachingTransformer implements IClassTransformer, Opcodes { MixinClassWriter cw = new MixinClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES); cn.accept(cw); final byte[] bytes = cw.toByteArray(); - saveTransformedClass(bytes, transformedName); + if (AngelicaTweaker.DUMP_CLASSES()) { + ASMUtil.saveAsRawClassFile(basicClass, transformedName + "_PRE", this); + ASMUtil.saveAsRawClassFile(bytes, transformedName + "_POST", this); + } return bytes; } return basicClass; } - - private File outputDir = null; - private void saveTransformedClass(final byte[] data, final String transformedName) { - if (!DUMP_CLASSES) { - return; - } - if (outputDir == null) { - outputDir = new File(Launch.minecraftHome, "ASM_HUD_CACHING"); - try { - FileUtils.deleteDirectory(outputDir); - } catch (IOException ignored) {} - if (!outputDir.exists()) { - //noinspection ResultOfMethodCallIgnored - outputDir.mkdirs(); - } - } - final String fileName = transformedName.replace('.', File.separatorChar); - final File classFile = new File(outputDir, fileName + ".class"); - final File outDir = classFile.getParentFile(); - if (!outDir.exists()) { - //noinspection ResultOfMethodCallIgnored - outDir.mkdirs(); - } - if (classFile.exists()) { - //noinspection ResultOfMethodCallIgnored - classFile.delete(); - } - try (final OutputStream output = Files.newOutputStream(classFile.toPath())) { - output.write(data); - } catch (IOException e) { - AngelicaTweaker.LOGGER.error("Could not save transformed class (byte[]) " + transformedName, e); - } - } } diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java index eea3fa38f..5ac611d91 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java @@ -1,14 +1,12 @@ package com.gtnewhorizons.angelica.transform; import com.google.common.collect.ImmutableSet; +import com.gtnewhorizon.gtnhlib.asm.ASMUtil; import com.gtnewhorizon.gtnhlib.asm.ClassConstantPoolParser; -import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import net.coderbot.iris.IrisLogging; import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; -import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.tuple.Pair; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; @@ -23,12 +21,8 @@ import org.objectweb.asm.tree.LdcInsnNode; import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; -import java.nio.file.Files; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -38,17 +32,12 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import static com.gtnewhorizons.angelica.transform.BlockTransformer.BlockBoundsFields; -import static com.gtnewhorizons.angelica.transform.BlockTransformer.BlockClass; -import static com.gtnewhorizons.angelica.transform.BlockTransformer.BlockPackage; - /** * This transformer redirects many GL calls to our custom GLStateManager */ public class RedirectorTransformer implements IClassTransformer { private static final boolean ASSERT_MAIN_THREAD = Boolean.parseBoolean(System.getProperty("angelica.assertMainThread", "false")); - private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("angelica.dumpClass", "false")); private static final String Drawable = "org/lwjgl/opengl/Drawable"; private static final String GLStateManager = "com/gtnewhorizons/angelica/glsm/GLStateManager"; private static final String GL11 = "org/lwjgl/opengl/GL11"; @@ -57,6 +46,9 @@ public class RedirectorTransformer implements IClassTransformer { private static final String GL20 = "org/lwjgl/opengl/GL20"; private static final String Project = "org/lwjgl/util/glu/Project"; + private static final String BlockClass = "net/minecraft/block/Block"; + private static final String BlockPackage = "net/minecraft/block/Block"; + private static final String OpenGlHelper = "net/minecraft/client/renderer/OpenGlHelper"; private static final String EXTBlendFunc = "org/lwjgl/opengl/EXTBlendFuncSeparate"; private static final String ARBMultiTexture = "org/lwjgl/opengl/ARBMultitexture"; @@ -233,9 +225,9 @@ public class RedirectorTransformer implements IClassTransformer { } private boolean isVanillaBlockSubclass(String className) { - if(className.startsWith(BlockTransformer.BlockPackage)) { - for(String exclusion : VanillaBlockExclusions) { - if(className.startsWith(exclusion)) { + if (className.startsWith(BlockPackage)) { + for (String exclusion : VanillaBlockExclusions) { + if (className.startsWith(exclusion)) { return false; } } @@ -281,7 +273,10 @@ public class RedirectorTransformer implements IClassTransformer { final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS); cn.accept(cw); final byte[] bytes = cw.toByteArray(); - saveTransformedClass(bytes, transformedName); + if (AngelicaTweaker.DUMP_CLASSES()) { + ASMUtil.saveAsRawClassFile(basicClass, transformedName + "_PRE", this); + ASMUtil.saveAsRawClassFile(bytes, transformedName + "_POST", this); + } return bytes; } return basicClass; @@ -309,7 +304,7 @@ public class RedirectorTransformer implements IClassTransformer { } else { // Check if we declare any known field names Set fieldsDeclaredByClass = cn.fields.stream().map(f -> f.name).collect(Collectors.toSet()); - doWeShadow = BlockBoundsFields.stream().anyMatch(pair -> fieldsDeclaredByClass.contains(pair.getLeft()) || fieldsDeclaredByClass.contains(pair.getRight())); + doWeShadow = BlockTransformer.BlockBoundsFields.stream().anyMatch(pair -> fieldsDeclaredByClass.contains(pair.getLeft()) || fieldsDeclaredByClass.contains(pair.getRight())); } if(doWeShadow) { AngelicaTweaker.LOGGER.info("Class '{}' shadows one or more block bounds fields, these accesses won't be redirected!", cn.name); @@ -383,7 +378,7 @@ public class RedirectorTransformer implements IClassTransformer { else if ((node.getOpcode() == Opcodes.GETFIELD || node.getOpcode() == Opcodes.PUTFIELD) && node instanceof FieldInsnNode fNode) { if(!blockOwnerExclusions.contains(fNode.owner) && isBlockSubclass(fNode.owner) && isSodiumEnabled()) { Pair fieldToRedirect = null; - for(Pair blockPairs : BlockBoundsFields) { + for(Pair blockPairs : BlockTransformer.BlockBoundsFields) { if(fNode.name.equals(blockPairs.getLeft()) || fNode.name.equals(blockPairs.getRight())) { fieldToRedirect = blockPairs; break; @@ -430,40 +425,6 @@ public class RedirectorTransformer implements IClassTransformer { return changed; } - private File outputDir = null; - - private void saveTransformedClass(final byte[] data, final String transformedName) { - if (!DUMP_CLASSES) { - return; - } - if (outputDir == null) { - outputDir = new File(Launch.minecraftHome, "ASM_REDIRECTOR"); - try { - FileUtils.deleteDirectory(outputDir); - } catch (IOException ignored) {} - if (!outputDir.exists()) { - //noinspection ResultOfMethodCallIgnored - outputDir.mkdirs(); - } - } - final String fileName = transformedName.replace('.', File.separatorChar); - final File classFile = new File(outputDir, fileName + ".class"); - final File outDir = classFile.getParentFile(); - if (!outDir.exists()) { - //noinspection ResultOfMethodCallIgnored - outDir.mkdirs(); - } - if (classFile.exists()) { - //noinspection ResultOfMethodCallIgnored - classFile.delete(); - } - try (final OutputStream output = Files.newOutputStream(classFile.toPath())) { - output.write(data); - } catch (IOException e) { - AngelicaTweaker.LOGGER.error("Could not save transformed class (byte[]) " + transformedName, e); - } - } - private static class RedirectMap extends HashMap { public static RedirectMap newMap() { return new RedirectMap<>(); diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/ExtraUtilsTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/compat/ExtraUtilsTransformer.java index 1d775cb73..0bc31a6f6 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/ExtraUtilsTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/transform/compat/ExtraUtilsTransformer.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.transform.compat; +import com.gtnewhorizon.gtnhlib.asm.ASMUtil; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import net.minecraft.launchwrapper.IClassTransformer; import org.objectweb.asm.ClassReader; @@ -51,7 +52,12 @@ public class ExtraUtilsTransformer implements IClassTransformer { ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS); cn.accept(cw); - return cw.toByteArray(); + final byte[] bytes = cw.toByteArray(); + if (AngelicaTweaker.DUMP_CLASSES()) { + ASMUtil.saveAsRawClassFile(basicClass, transformedName + "_PRE", this); + ASMUtil.saveAsRawClassFile(bytes, transformedName + "_POST", this); + } + return bytes; } public void addThreadSafeISBRHAnnotation(String transformedName, ClassNode cn) { diff --git a/src/main/java/jss/notfine/asm/RenderBlocksTransformer.java b/src/main/java/jss/notfine/asm/RenderBlocksTransformer.java index d5968df8b..fe5c46a14 100644 --- a/src/main/java/jss/notfine/asm/RenderBlocksTransformer.java +++ b/src/main/java/jss/notfine/asm/RenderBlocksTransformer.java @@ -2,6 +2,8 @@ package jss.notfine.asm; import static jss.notfine.asm.ASMUtils.matchesNodeSequence; +import com.gtnewhorizon.gtnhlib.asm.ASMUtil; +import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import net.minecraft.launchwrapper.IClassTransformer; import org.apache.commons.lang3.tuple.Pair; @@ -32,9 +34,13 @@ public class RenderBlocksTransformer implements IClassTransformer { public byte[] transform(String name, String transformedName, byte[] basicClass) { if ("net.minecraft.client.renderer.RenderBlocks".equals(transformedName)) { - return patchRenderBlocks(basicClass); + final byte[] bytes = patchRenderBlocks(basicClass); + if (AngelicaTweaker.DUMP_CLASSES()) { + ASMUtil.saveAsRawClassFile(basicClass, transformedName + "_PRE", this); + ASMUtil.saveAsRawClassFile(bytes, transformedName + "_POST", this); + } + return bytes; } - return basicClass; } diff --git a/src/main/java/jss/notfine/asm/WorldRendererTransformer.java b/src/main/java/jss/notfine/asm/WorldRendererTransformer.java index 2c0cc518a..771c288ee 100644 --- a/src/main/java/jss/notfine/asm/WorldRendererTransformer.java +++ b/src/main/java/jss/notfine/asm/WorldRendererTransformer.java @@ -2,6 +2,8 @@ package jss.notfine.asm; import static jss.notfine.asm.ASMUtils.matchesNodeSequence; +import com.gtnewhorizon.gtnhlib.asm.ASMUtil; +import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import net.minecraft.launchwrapper.IClassTransformer; import org.apache.logging.log4j.LogManager; @@ -26,9 +28,13 @@ public class WorldRendererTransformer implements IClassTransformer { public byte[] transform(String name, String transformedName, byte[] basicClass) { if ("net.minecraft.client.renderer.WorldRenderer".equals(transformedName)) { - return patchWorldRenderer(basicClass); + final byte[] bytes = patchWorldRenderer(basicClass); + if (AngelicaTweaker.DUMP_CLASSES()) { + ASMUtil.saveAsRawClassFile(basicClass, transformedName + "_PRE", this); + ASMUtil.saveAsRawClassFile(bytes, transformedName + "_POST", this); + } + return bytes; } - return basicClass; }