diff --git a/fml/common/cpw/mods/fml/common/FMLModContainer.java b/fml/common/cpw/mods/fml/common/FMLModContainer.java index 58984b8a6..c9e28d2b6 100644 --- a/fml/common/cpw/mods/fml/common/FMLModContainer.java +++ b/fml/common/cpw/mods/fml/common/FMLModContainer.java @@ -430,6 +430,7 @@ public class FMLModContainer implements ModContainer String expectedFingerprint = (String) descriptor.get("certificateFingerprint"); + fingerprintNotPresent = true; if (expectedFingerprint != "" && !sourceFingerprints.contains(expectedFingerprint)) { Level warnLevel = Level.SEVERE; @@ -442,13 +443,14 @@ public class FMLModContainer implements ModContainer else { certificate = certificates[certList.indexOf(expectedFingerprint)]; + fingerprintNotPresent = false; } annotations = gatherAnnotations(clazz); isNetworkMod = FMLNetworkHandler.instance().registerNetworkMod(this, clazz, event.getASMHarvestedData()); modInstance = clazz.newInstance(); if (fingerprintNotPresent) { - handleModStateEvent(new FMLFingerprintViolationEvent(source.isDirectory(), source, ImmutableSet.copyOf(this.sourceFingerprints))); + eventBus.post(new FMLFingerprintViolationEvent(source.isDirectory(), source, ImmutableSet.copyOf(this.sourceFingerprints))); } ProxyInjector.inject(this, event.getASMHarvestedData(), FMLCommonHandler.instance().getSide()); processFieldAnnotations(event.getASMHarvestedData()); diff --git a/fml/conf/joined.exc b/fml/conf/joined.exc index 70e873d00..929704fa2 100644 --- a/fml/conf/joined.exc +++ b/fml/conf/joined.exc @@ -4556,6 +4556,7 @@ net/minecraft/src/MerchantRecipeList.func_77203_a(Lnet/minecraft/src/ItemStack;L net/minecraft/src/MerchantRecipeList.func_77204_a(Ljava/io/DataInputStream;)Lnet/minecraft/src/MerchantRecipeList;=java/io/IOException|p_77204_0_ net/minecraft/src/MerchantRecipeList.func_77205_a(Lnet/minecraft/src/MerchantRecipe;)V=|p_77205_1_ net/minecraft/src/MinecraftAppletImpl.(Lnet/minecraft/client/MinecraftApplet;Ljava/awt/Canvas;Lnet/minecraft/client/MinecraftApplet;IIZ)V=|p_i3013_1_,p_i3013_2_,p_i3013_3_,p_i3013_4_,p_i3013_5_,p_i3013_6_ +net/minecraft/src/MinecraftAppletImpl.func_71406_c(Lnet/minecraft/src/CrashReport;)V=|p_71406_1_ net/minecraft/src/MinecraftAppletImpl.func_71384_a()V=org/lwjgl/LWJGLException| net/minecraft/src/MinecraftException.(Ljava/lang/String;)V=|p_i3733_1_ net/minecraft/src/MinecraftFakeLauncher.(Ljava/util/Map;)V=|p_i3001_1_ diff --git a/fml/mc_versions.cfg b/fml/mc_versions.cfg index 5c3be2265..6f1f12e85 100644 --- a/fml/mc_versions.cfg +++ b/fml/mc_versions.cfg @@ -28,6 +28,6 @@ server_url = http://assets.minecraft.net/1_4_6/minecraft_server.jar client_md5 = 48677dc4c2b98c29918722b5ab27b4fd server_md5 = b0700fa969dbf0ff085082cde87384d2 mcp_ver = 7.25 -mcp_url = http://files.minecraftforge.net/mcpmirror/mcp725pre1.zip -mcp_md5 = d33dadec14762196ecaa17d74462d90e +mcp_url = http://mcp.ocean-labs.de/files/archive/mcp725.zip +mcp_md5 = a7276589fca4974d40eb4e27ba41ba16