From 82004fe70331452112ae74af191166c1186fb2a6 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 10 Nov 2013 13:15:26 -0500 Subject: [PATCH] Kill more references to modloader. --- .../mods/fml/common/FMLDummyContainer.java | 4 +- .../main/java/cpw/mods/fml/common/Loader.java | 9 +--- .../mods/fml/common/asm/FMLSanityChecker.java | 41 ------------------- .../deobf/FMLDeobfuscatingRemapper.java | 6 --- 4 files changed, 2 insertions(+), 58 deletions(-) diff --git a/fml/src/main/java/cpw/mods/fml/common/FMLDummyContainer.java b/fml/src/main/java/cpw/mods/fml/common/FMLDummyContainer.java index 55f02c1b5..90720af22 100644 --- a/fml/src/main/java/cpw/mods/fml/common/FMLDummyContainer.java +++ b/fml/src/main/java/cpw/mods/fml/common/FMLDummyContainer.java @@ -50,9 +50,7 @@ public class FMLDummyContainer extends DummyModContainer implements WorldAccessC meta.authorList=Arrays.asList("cpw, LexManos"); meta.description="The Forge Mod Loader provides the ability for systems to load mods " + "from the file system. It also provides key capabilities for mods to be able " + - "to cooperate and provide a good modding environment. " + - "The mod loading system is compatible with ModLoader, all your ModLoader " + - "mods should work."; + "to cooperate and provide a good modding environment. "; meta.url="https://github.com/MinecraftForge/FML/wiki"; meta.updateUrl="https://github.com/MinecraftForge/FML/wiki"; meta.screenshots=new String[0]; diff --git a/fml/src/main/java/cpw/mods/fml/common/Loader.java b/fml/src/main/java/cpw/mods/fml/common/Loader.java index 86c176f8b..23692a023 100644 --- a/fml/src/main/java/cpw/mods/fml/common/Loader.java +++ b/fml/src/main/java/cpw/mods/fml/common/Loader.java @@ -278,20 +278,13 @@ public class Loader /** * The primary loading code * - * This is visited during first initialization by Minecraft to scan and load - * the mods from all sources 1. The minecraft jar itself (for loading of in - * jar mods- I would like to remove this if possible but forge depends on it - * at present) 2. The mods directory with expanded subdirs, searching for - * mods named mod_*.class 3. The mods directory for zip and jar files, - * searching for mod classes named mod_*.class again * * The found resources are first loaded into the {@link #modClassLoader} * (always) then scanned for class resources matching the specification * above. * * If they provide the {@link Mod} annotation, they will be loaded as - * "FML mods", which currently is effectively a NO-OP. If they are - * determined to be {@link BaseModProxy} subclasses they are loaded as such. + * "FML mods" * * Finally, if they are successfully loaded as classes, they are then added * to the available mod list. diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java b/fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java index 3a0bf4882..d3c40a137 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java +++ b/fml/src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java @@ -47,25 +47,6 @@ public class FMLSanityChecker implements IFMLCallHook private static final String FMLFINGERPRINT = "51:0A:FB:4C:AF:A4:A0:F2:F5:CF:C5:0E:B4:CC:3C:30:24:4A:E3:8E".toLowerCase().replace(":", ""); private static final String FORGEFINGERPRINT = "E3:C3:D5:0C:7C:98:6D:F7:4C:64:5C:0A:C5:46:39:74:1C:90:A5:57".toLowerCase().replace(":", ""); private static final String MCFINGERPRINT = "CD:99:95:96:56:F7:53:DC:28:D8:63:B4:67:69:F7:F8:FB:AE:FC:FC".toLowerCase().replace(":", ""); - static class MLDetectorClassVisitor extends ClassVisitor - { - private boolean foundMarker = false; - private MLDetectorClassVisitor() - { - super(Opcodes.ASM4); - } - - @Override - public FieldVisitor visitField(int arg0, String arg1, String arg2, String arg3, Object arg4) - { - if ("fmlMarker".equals(arg1)) - { - foundMarker = true; - } - return null; - } - } - private LaunchClassLoader cl; public static File fmlLocation; @@ -192,28 +173,6 @@ public class FMLSanityChecker implements IFMLCallHook { FMLRelaunchLog.severe("FML appears to be missing any signature data. This is not a good thing"); } - byte[] mlClass = cl.getClassBytes("ModLoader"); - // Only care in obfuscated env - if (mlClass == null) - { - return null; - } - MLDetectorClassVisitor mlTester = new MLDetectorClassVisitor(); - ClassReader cr = new ClassReader(mlClass); - cr.accept(mlTester, ClassReader.SKIP_CODE); - if (!mlTester.foundMarker) - { - JOptionPane.showMessageDialog(null, "CRITICAL ERROR
" + - "ModLoader was detected in this environment
" + - "ForgeModLoader cannot be installed alongside ModLoader
" + - "All mods should work without ModLoader being installed
" + - "Because ForgeModLoader is 100% compatible with ModLoader
" + - "Re-install Minecraft Forge or Forge ModLoader into a clean
" + - "jar and try again.", - "ForgeModLoader critical error", - JOptionPane.ERROR_MESSAGE); - throw new RuntimeException("Invalid ModLoader class detected"); - } return null; } diff --git a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index e40cd3475..253aa26ff 100644 --- a/fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/fml/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -108,12 +108,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { } } classNameBiMap = builder.build(); - // Special case some mappings for modloader mods - mcpBuilder.put("BaseMod","net/minecraft/src/BaseMod"); - mcpBuilder.put("ModLoader","net/minecraft/src/ModLoader"); - mcpBuilder.put("EntityRendererProxy","net/minecraft/src/EntityRendererProxy"); - mcpBuilder.put("MLProp","net/minecraft/src/MLProp"); - mcpBuilder.put("TradeEntry","net/minecraft/src/TradeEntry"); mcpNameBiMap = mcpBuilder.build(); } catch (IOException ioe)