From 2867dfdfa5013cde542beeb296120f68e455debe Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 10 Nov 2013 12:01:26 -0500 Subject: [PATCH] Remove all public all the time from Minecraft. It is unnecessary with ModLoader gone. DEAL WITH IT. File AT public requests, make a coremod, whatever. This needed to die. --- .../asm/transformers/AccessTransformer.java | 37 +------------------ 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java index 92e1d14c3e..65eee8a470 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java +++ b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java @@ -49,7 +49,6 @@ import com.google.common.collect.Multimap; import com.google.common.io.LineProcessor; import com.google.common.io.Resources; -import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; import cpw.mods.fml.relauncher.FMLRelaunchLog; public class AccessTransformer implements IClassTransformer @@ -161,42 +160,17 @@ public class AccessTransformer implements IClassTransformer public byte[] transform(String name, String transformedName, byte[] bytes) { if (bytes == null) { return null; } - boolean makeAllPublic = FMLDeobfuscatingRemapper.INSTANCE.isRemappedClass(name); if (DEBUG) { - FMLRelaunchLog.fine("Considering all methods and fields on %s (%s): %b\n", name, transformedName, makeAllPublic); + FMLRelaunchLog.fine("Considering all methods and fields on %s (%s)\n", name, transformedName); } - if (!makeAllPublic && !modifiers.containsKey(name)) { return bytes; } + if (!modifiers.containsKey(name)) { return bytes; } ClassNode classNode = new ClassNode(); ClassReader classReader = new ClassReader(bytes); classReader.accept(classNode, 0); - if (makeAllPublic) - { - // class - Modifier m = new Modifier(); - m.targetAccess = ACC_PUBLIC; - m.modifyClassVisibility = true; - modifiers.put(name,m); - // fields - m = new Modifier(); - m.targetAccess = ACC_PUBLIC; - m.name = "*"; - modifiers.put(name,m); - // methods - m = new Modifier(); - m.targetAccess = ACC_PUBLIC; - m.name = "*"; - m.desc = ""; - modifiers.put(name,m); - if (DEBUG) - { - System.out.printf("Injected all public modifiers for %s (%s)\n", name, transformedName); - } - } - Collection mods = modifiers.get(name); for (Modifier m : mods) { @@ -454,11 +428,4 @@ public class AccessTransformer implements IClassTransformer } } } - public void ensurePublicAccessFor(String modClazzName) - { - Modifier m = new Modifier(); - m.setTargetAccess("public"); - m.modifyClassVisibility = true; - modifiers.put(modClazzName, m); - } }