From 7edc7d74d47cb8ca489060fc9897182ad46b18c4 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 2 Aug 2012 09:31:03 -0230 Subject: [PATCH] Change some event names, hook up the event code for server events for FML --- .../cpw/mods/fml/common/FMLModContainer.java | 97 +++++++------------ common/cpw/mods/fml/common/LoaderState.java | 12 +-- common/cpw/mods/fml/common/Mod.java | 33 +++++++ ...tarted.java => FMLServerStartedEvent.java} | 4 +- ...rting.java => FMLServerStartingEvent.java} | 4 +- ...pping.java => FMLServerStoppingEvent.java} | 4 +- eclipse/FML-Server/.project | 5 + 7 files changed, 86 insertions(+), 73 deletions(-) rename common/cpw/mods/fml/common/event/{FMLServerStarted.java => FMLServerStartedEvent.java} (71%) rename common/cpw/mods/fml/common/event/{FMLServerStarting.java => FMLServerStartingEvent.java} (74%) rename common/cpw/mods/fml/common/event/{FMLServerStopping.java => FMLServerStoppingEvent.java} (71%) diff --git a/common/cpw/mods/fml/common/FMLModContainer.java b/common/cpw/mods/fml/common/FMLModContainer.java index 4de0d86394..5f0037ddf8 100644 --- a/common/cpw/mods/fml/common/FMLModContainer.java +++ b/common/cpw/mods/fml/common/FMLModContainer.java @@ -23,6 +23,12 @@ import java.util.Map; import com.google.common.base.Throwables; import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.BiMap; +import com.google.common.collect.ImmutableBiMap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterators; +import com.google.common.collect.ImmutableBiMap.Builder; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.eventbus.EventBus; @@ -37,6 +43,10 @@ import cpw.mods.fml.common.event.FMLConstructionEvent; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartedEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.FMLServerStoppingEvent; +import cpw.mods.fml.common.event.FMLStateEvent; import cpw.mods.fml.common.registry.FMLRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.versioning.ArtifactVersion; @@ -60,6 +70,17 @@ public class FMLModContainer implements ModContainer private Multimap, Object> annotations; private DefaultArtifactVersion processedVersion; + private static final BiMap, Class> modAnnotationTypes = ImmutableBiMap., Class>builder() + .put(FMLPreInitializationEvent.class, Mod.PreInit.class) + .put(FMLInitializationEvent.class, Mod.Init.class) + .put(FMLPostInitializationEvent.class, Mod.PostInit.class) + .put(FMLServerStartingEvent.class, Mod.ServerStarting.class) + .put(FMLServerStartedEvent.class, Mod.ServerStarted.class) + .put(FMLServerStoppingEvent.class, Mod.ServerStopping.class) + .build(); + private static final BiMap, Class> modTypeAnnotations = modAnnotationTypes.inverse(); + + public FMLModContainer(String className, File modSource, Map modDescriptor) { this.className = className; @@ -202,23 +223,8 @@ public class FMLModContainer implements ModContainer { for (Annotation a : m.getAnnotations()) { - Class[] paramTypes; - if (a.annotationType() == Mod.PreInit.class) - { - paramTypes = Mod.PreInit.paramTypes; - } - else if (a.annotationType() == Mod.Init.class) - { - paramTypes = Mod.Init.paramTypes; - } - else if (a.annotationType() == Mod.PostInit.class) - { - paramTypes = Mod.PostInit.paramTypes; - } - else - { - continue; - } + Class[] paramTypes = new Class[] { modTypeAnnotations.get(a.annotationType()) }; + if (Arrays.equals(m.getParameterTypes(), paramTypes)) { m.setAccessible(true); @@ -247,12 +253,12 @@ public class FMLModContainer implements ModContainer Field f = (Field) o; f.set(modInstance, modMetadata); } - - for (Object o : annotations.get(Block.class)) - { - Field f = (Field) o; - f.set(modInstance, GameRegistry.buildBlock(this, f.getType(), f.getAnnotation(Block.class))); - } +//TODO +// for (Object o : annotations.get(Block.class)) +// { +// Field f = (Field) o; +// f.set(modInstance, GameRegistry.buildBlock(this, f.getType(), f.getAnnotation(Block.class))); +// } } @Subscribe @@ -275,47 +281,16 @@ public class FMLModContainer implements ModContainer } @Subscribe - public void preInitMod(FMLPreInitializationEvent event) + public void handleModStateEvent(FMLStateEvent event) { + Class annotation = modAnnotationTypes.get(event.getClass()); + if (annotation == null) + { + return; + } try { - for (Object o : annotations.get(Mod.PreInit.class)) - { - Method m = (Method) o; - m.invoke(modInstance, event); - } - } - catch (Throwable t) - { - controller.errorOccurred(this, t); - Throwables.propagateIfPossible(t); - } - } - - @Subscribe - public void initMod(FMLInitializationEvent event) - { - try - { - for (Object o : annotations.get(Mod.Init.class)) - { - Method m = (Method) o; - m.invoke(modInstance, event); - } - } - catch (Throwable t) - { - controller.errorOccurred(this, t); - Throwables.propagateIfPossible(t); - } - } - - @Subscribe - public void postInitMod(FMLPostInitializationEvent event) - { - try - { - for (Object o : annotations.get(Mod.PostInit.class)) + for (Object o : annotations.get(annotation)) { Method m = (Method) o; m.invoke(modInstance, event); diff --git a/common/cpw/mods/fml/common/LoaderState.java b/common/cpw/mods/fml/common/LoaderState.java index f7de8786bf..d59720b924 100644 --- a/common/cpw/mods/fml/common/LoaderState.java +++ b/common/cpw/mods/fml/common/LoaderState.java @@ -7,9 +7,9 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStarted; -import cpw.mods.fml.common.event.FMLServerStarting; -import cpw.mods.fml.common.event.FMLServerStopping; +import cpw.mods.fml.common.event.FMLServerStartedEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.event.FMLStateEvent; /** @@ -26,9 +26,9 @@ public enum LoaderState INITIALIZATION("Initializing mods", FMLInitializationEvent.class), POSTINITIALIZATION("Post-initializing mods", FMLPostInitializationEvent.class), AVAILABLE("Mod loading complete", FMLLoadCompleteEvent.class), - SERVER_STARTING("Server starting", FMLServerStarting.class), - SERVER_STARTED("Server started", FMLServerStarted.class), - SERVER_STOPPING("Server stopping", FMLServerStopping.class), + SERVER_STARTING("Server starting", FMLServerStartingEvent.class), + SERVER_STARTED("Server started", FMLServerStartedEvent.class), + SERVER_STOPPING("Server stopping", FMLServerStoppingEvent.class), ERRORED("Mod Loading errored",null); diff --git a/common/cpw/mods/fml/common/Mod.java b/common/cpw/mods/fml/common/Mod.java index 237934e60a..a9801b925d 100644 --- a/common/cpw/mods/fml/common/Mod.java +++ b/common/cpw/mods/fml/common/Mod.java @@ -21,6 +21,9 @@ import java.lang.annotation.Target; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartedEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.FMLServerStoppingEvent; import net.minecraft.src.ItemBlock; @@ -91,6 +94,36 @@ public @interface Mod public @interface PostInit { static Class[] paramTypes = new Class[] { FMLPostInitializationEvent.class }; } + /** + * Mark the designated method as being called at the "server-starting" phase + * @author cpw + * + */ + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.METHOD) + public @interface ServerStarting { + static Class[] paramTypes = new Class[] { FMLServerStartingEvent.class }; + } + /** + * Mark the designated method as being called at the "post-initialization" phase + * @author cpw + * + */ + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.METHOD) + public @interface ServerStarted { + static Class[] paramTypes = new Class[] { FMLServerStartedEvent.class }; + } + /** + * Mark the designated method as being called at the "post-initialization" phase + * @author cpw + * + */ + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.METHOD) + public @interface ServerStopping { + static Class[] paramTypes = new Class[] { FMLServerStoppingEvent.class }; + } /** * Populate the annotated field with the mod instance. * @author cpw diff --git a/common/cpw/mods/fml/common/event/FMLServerStarted.java b/common/cpw/mods/fml/common/event/FMLServerStartedEvent.java similarity index 71% rename from common/cpw/mods/fml/common/event/FMLServerStarted.java rename to common/cpw/mods/fml/common/event/FMLServerStartedEvent.java index 5168e52f59..36bab33635 100644 --- a/common/cpw/mods/fml/common/event/FMLServerStarted.java +++ b/common/cpw/mods/fml/common/event/FMLServerStartedEvent.java @@ -3,10 +3,10 @@ package cpw.mods.fml.common.event; import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.LoaderState.ModState; -public class FMLServerStarted extends FMLStateEvent +public class FMLServerStartedEvent extends FMLStateEvent { - public FMLServerStarted(Object... data) + public FMLServerStartedEvent(Object... data) { super(data); } diff --git a/common/cpw/mods/fml/common/event/FMLServerStarting.java b/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java similarity index 74% rename from common/cpw/mods/fml/common/event/FMLServerStarting.java rename to common/cpw/mods/fml/common/event/FMLServerStartingEvent.java index 92fc6f747d..ba2339db8e 100644 --- a/common/cpw/mods/fml/common/event/FMLServerStarting.java +++ b/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java @@ -3,12 +3,12 @@ package cpw.mods.fml.common.event; import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.LoaderState.ModState; -public class FMLServerStarting extends FMLStateEvent +public class FMLServerStartingEvent extends FMLStateEvent { private Object server; - public FMLServerStarting(Object... data) + public FMLServerStartingEvent(Object... data) { super(data); this.server = data[0]; diff --git a/common/cpw/mods/fml/common/event/FMLServerStopping.java b/common/cpw/mods/fml/common/event/FMLServerStoppingEvent.java similarity index 71% rename from common/cpw/mods/fml/common/event/FMLServerStopping.java rename to common/cpw/mods/fml/common/event/FMLServerStoppingEvent.java index 20483e0bf5..e60730d3d6 100644 --- a/common/cpw/mods/fml/common/event/FMLServerStopping.java +++ b/common/cpw/mods/fml/common/event/FMLServerStoppingEvent.java @@ -3,10 +3,10 @@ package cpw.mods.fml.common.event; import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.LoaderState.ModState; -public class FMLServerStopping extends FMLStateEvent +public class FMLServerStoppingEvent extends FMLStateEvent { - public FMLServerStopping(Object... data) + public FMLServerStoppingEvent(Object... data) { super(data); } diff --git a/eclipse/FML-Server/.project b/eclipse/FML-Server/.project index 83bfea26b7..6162db34c4 100644 --- a/eclipse/FML-Server/.project +++ b/eclipse/FML-Server/.project @@ -50,6 +50,11 @@ 2 MCP_LOC/src-work/common + + common/fmlversion.properties + 1 + MCP_LOC/FML/fmlversion.properties +