From b5ba054fe5baec555d0f0a7b10df4726ba360f74 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 26 Feb 2013 00:16:57 -0500 Subject: [PATCH] Update libs for 1.5. Lots of new libs. --- .../modloader/ModLoaderClientHelper.java | 4 ++-- fml/common/cpw/mods/fml/common/IASMHook.java | 21 ++++++++++++++++++ fml/common/cpw/mods/fml/common/Mod.java | 15 +++++++++++++ .../mods/fml/relauncher/CoreFMLLibraries.java | 6 ++--- fml/eclipse-workspace-dev.zip | Bin 22735 -> 20746 bytes fml/install/fml.py | 4 ++-- 6 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 fml/common/cpw/mods/fml/common/IASMHook.java diff --git a/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java b/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java index 4d3016653c..82636ee3f8 100644 --- a/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java +++ b/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java @@ -20,7 +20,7 @@ import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import com.google.common.base.Equivalences; +import com.google.common.base.Equivalence; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.Iterables; @@ -73,7 +73,7 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper FMLLog.log(mc.getModId(), Level.SEVERE, e, "A severe problem was detected with the mod %s during the addRenderer call. Continuing, but expect odd results", mc.getModId()); } - MapDifference, Render> difference = Maps.difference(RenderManager.field_78727_a.field_78729_o, renderers, Equivalences.identity()); + MapDifference, Render> difference = Maps.difference(RenderManager.field_78727_a.field_78729_o, renderers, Equivalence.identity()); for ( Entry, Render> e : difference.entriesOnlyOnLeft().entrySet()) { diff --git a/fml/common/cpw/mods/fml/common/IASMHook.java b/fml/common/cpw/mods/fml/common/IASMHook.java new file mode 100644 index 0000000000..dbfd47b955 --- /dev/null +++ b/fml/common/cpw/mods/fml/common/IASMHook.java @@ -0,0 +1,21 @@ +package cpw.mods.fml.common; + +import org.objectweb.asm.tree.ClassNode; + +public interface IASMHook { + /** + * Inject the {@link Mod} class node into this instance. This allows retrieval from custom + * attributes or other artifacts in your mod class + * + * @param modClassNode The mod class + * @return optionally a code generated class that will be injected into the classloader + */ + ClassNode inject(ClassNode modClassNode); + /** + * Allow mods to manipulate classes loaded from this {@link Mod}'s jar file. The {@link Mod} + * class is always guaranteed to be called first + * + * @param node The class being loaded + */ + void modifyClass(String className, ClassNode node); +} diff --git a/fml/common/cpw/mods/fml/common/Mod.java b/fml/common/cpw/mods/fml/common/Mod.java index 51d753723c..fb80182380 100644 --- a/fml/common/cpw/mods/fml/common/Mod.java +++ b/fml/common/cpw/mods/fml/common/Mod.java @@ -111,6 +111,21 @@ public @interface Mod * @return A certificate fingerprint that is expected for this mod. */ String certificateFingerprint() default ""; + + /** + * The language the mod is authored in. This will be used to control certain libraries being downloaded. + * Valid values are currently "java", "scala" + * + * @return The language the mod is authored in + */ + String modLanguage() default "java"; + /** + * An optional ASM hook class, that can be used to apply ASM to classes loaded from this mod. It is also given + * the ASM tree of the class declaring {@link Mod} to with what it will. + * + * @return The name of a class to be loaded and executed. Must implement {@link IASMHook}. + */ + String asmHookClass() default ""; /** * Mark the designated method as to be called at if there is something wrong with the certificate fingerprint of * the mod's jar, or it is missing, or otherwise a problem. diff --git a/fml/common/cpw/mods/fml/relauncher/CoreFMLLibraries.java b/fml/common/cpw/mods/fml/relauncher/CoreFMLLibraries.java index 303258257a..400ae5b465 100644 --- a/fml/common/cpw/mods/fml/relauncher/CoreFMLLibraries.java +++ b/fml/common/cpw/mods/fml/relauncher/CoreFMLLibraries.java @@ -2,8 +2,8 @@ package cpw.mods.fml.relauncher; public class CoreFMLLibraries implements ILibrarySet { - private static String[] libraries = { "argo-2.25.jar","guava-12.0.1.jar","asm-all-4.0.jar", "bcprov-jdk15on-147.jar" }; - private static String[] checksums = { "bb672829fde76cb163004752b86b0484bd0a7f4b", "b8e78b9af7bf45900e14c6f958486b6ca682195f", "98308890597acb64047f7e896638e0d98753ae82", "b6f5d9926b0afbde9f4dbe3db88c5247be7794bb" }; + private static String[] libraries = { "argo-small-3.2.jar","guava-14.0-rc3.jar","asm-all-4.1.jar", "bcprov-jdk15on-148.jar" }; + private static String[] checksums = { "58912ea2858d168c50781f956fa5b59f0f7c6b51", "931ae21fa8014c3ce686aaa621eae565fefb1a6a", "054986e962b88d8660ae4566475658469595ef58", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65" }; @Override public String[] getLibraries() @@ -20,7 +20,7 @@ public class CoreFMLLibraries implements ILibrarySet @Override public String getRootURL() { - return "http://files.minecraftforge.net/fmllibs/%s"; + return System.getProperty("fml.core.libraries.mirror", "http://files.minecraftforge.net/fmllibs/%s"); } } diff --git a/fml/eclipse-workspace-dev.zip b/fml/eclipse-workspace-dev.zip index 26a33422b118bc2c141e9a84c253f1c945ef346b..dd8d91bdd151605f5494dbc265c8c085a84004b5 100644 GIT binary patch literal 20746 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 RATq$OH5y>;K;YYd{}0SR{Zaq` diff --git a/fml/install/fml.py b/fml/install/fml.py index 2f8927c6d1..053cd684eb 100644 --- a/fml/install/fml.py +++ b/fml/install/fml.py @@ -12,7 +12,7 @@ mcp_version = '7.23' def download_deps(mcp_path): ret = True - for lib in ['argo-2.25.jar', 'guava-12.0.1.jar', 'guava-12.0.1-sources.jar', 'asm-all-4.0.jar', 'asm-all-4.0-source.jar', 'bcprov-jdk15on-147.jar']: + for lib in ['argo-3.2-src.jar','guava-14.0-rc3.jar','asm-4.1.tar.gz','asm-debug-all-4.1.jar','bcprov-debug-jdk15on-148.jar','bcprov-jdk15on-148-src.zip','guava-14.0-rc3-sources.jar']: libF = os.path.join(mcp_path, 'lib') if not os.path.isdir(libF): os.makedirs(libF) @@ -24,7 +24,7 @@ def download_deps(mcp_path): urllib.urlretrieve('http://files.minecraftforge.net/fmllibs/' + lib, target) print 'Downloaded %s' % lib except: - print 'Download %s failed, download manually from http://files.minecraftforge.net/fmllibs/%s or http://files.minecraftforge.net/fmllibs/fml_libs_dev.zip and place in MCP/lib' % (lib, lib) + print 'Download %s failed, download manually from http://files.minecraftforge.net/fmllibs/%s or http://files.minecraftforge.net/fmllibs/fml_libs_dev15.zip and place in mcp/lib' % (lib, lib) ret = False return ret