keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix mod lifecycle event names

Browse source
This commit is contained in:
mezz 2019-01-14 14:00:15 -08:00
parent 99452a8b45
commit 118eac8f39
6 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/minecraftforge/common/ForgeMod.java
View file

@ -25,7 +25,7 @@ import net.minecraftforge.fml.WorldPersistenceHooks;
import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
import net.minecraftforge.fml.common.event.FMLModIdMappingEvent;
import net.minecraftforge.fml.common.event.FMLPostResourceLoadEvent;
import net.minecraftforge.fml.common.event.FMLPreregistrationEvent;
import net.minecraftforge.fml.common.event.FMLPreRegistrationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext;
@ -107,7 +107,7 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
}
public void preInit(FMLPreregistrationEvent evt)
public void preInit(FMLPreRegistrationEvent evt)
{
CapabilityItemHandler.register();
CapabilityFluidHandler.register();

8
src/main/java/net/minecraftforge/fml/ModLoadingStage.java
View file

@ -19,10 +19,10 @@
package net.minecraftforge.fml;
import net.minecraftforge.fml.common.event.PostRegistrationEvent;
import net.minecraftforge.fml.common.event.FMLPostRegistrationEvent;
import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
import net.minecraftforge.fml.common.event.FMLPostResourceLoadEvent;
import net.minecraftforge.fml.common.event.FMLPreregistrationEvent;
import net.minecraftforge.fml.common.event.FMLPreRegistrationEvent;
import net.minecraftforge.fml.common.event.ModLifecycleEvent;
import java.util.function.Function;
@ -33,9 +33,9 @@ public enum ModLoadingStage
ERROR(null),
VALIDATE(null),
CONSTRUCT(null),
PREINIT(()-> FMLPreregistrationEvent::new),
PREINIT(()-> FMLPreRegistrationEvent::new),
SIDEDINIT(SidedProvider.SIDEDINIT::get),
INIT(()-> PostRegistrationEvent::new),
INIT(()-> FMLPostRegistrationEvent::new),
POSTINIT(()-> FMLPostResourceLoadEvent::new),
COMPLETE(()->FMLLoadCompleteEvent::new),
DONE(null);

12
src/main/java/net/minecraftforge/fml/common/Mod.java
View file

@ -27,14 +27,14 @@ import java.lang.annotation.Target;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent;
import net.minecraftforge.fml.common.event.FMLPostResourceLoadEvent;
import net.minecraftforge.fml.common.event.FMLPreregistrationEvent;
import net.minecraftforge.fml.common.event.FMLPreRegistrationEvent;
import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent;
import net.minecraftforge.fml.common.event.FMLServerStartedEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.event.FMLServerStoppedEvent;
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
import net.minecraftforge.fml.common.event.ModLifecycleEvent;
import net.minecraftforge.fml.common.event.PostRegistrationEvent;
import net.minecraftforge.fml.common.event.FMLPostRegistrationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
/**
@ -67,9 +67,9 @@ public @interface Mod
*
* These suggestions are mostly just suggestions on what to do in each event.
* <ul>
* <li> {@link FMLPreregistrationEvent} : Run before anything else. Read your config, create blocks,
* <li> {@link FMLPreRegistrationEvent} : Run before anything else. Read your config, create blocks,
* items, etc, and register them with the {@link GameRegistry}.</li>
* <li> {@link PostRegistrationEvent} : Do your mod setup. Build whatever data structures you care about. Register recipes,
* <li> {@link FMLPostRegistrationEvent} : Do your mod setup. Build whatever data structures you care about. Register recipes,
* send {@link FMLInterModComms} messages to other mods.</li>
* <li> {@link FMLPostResourceLoadEvent} : Handle interaction with other mods, complete your setup based on this.</li>
* </ul>
@ -86,9 +86,9 @@ public @interface Mod
* The second set of events are more specialized, for receiving notification of specific
* information.
* <ul>
* <li> {@link FMLFingerprintViolationEvent} : Sent just before {@link FMLPreregistrationEvent}
* <li> {@link FMLFingerprintViolationEvent} : Sent just before {@link FMLPreRegistrationEvent}
* if something is wrong with your mod signature</li>
* <li> {@link IMCEvent} : Sent just after {@link PostRegistrationEvent} if you have IMC messages waiting
* <li> {@link IMCEvent} : Sent just after {@link FMLPostRegistrationEvent} if you have IMC messages waiting
* from other mods</li>
* </ul>
*

6
src/main/java/net/minecraftforge/fml/common/event/PostRegistrationEvent.java → src/main/java/net/minecraftforge/fml/common/event/FMLPostRegistrationEvent.java
View file

@ -22,7 +22,7 @@ package net.minecraftforge.fml.common.event;
import net.minecraftforge.fml.ModContainer;
/**
* Called after {@link FMLPreregistrationEvent} and before {@link FMLPostResourceLoadEvent} during mod
* Called after {@link FMLPreRegistrationEvent} and before {@link FMLPostResourceLoadEvent} during mod
* startup.
*
* This is the second of three commonly called events during mod initialization.
@ -34,10 +34,10 @@ import net.minecraftforge.fml.ModContainer;
* @see net.minecraftforge.fml.common.Mod.EventHandler for how to subscribe to this event
* @author cpw
*/
public class PostRegistrationEvent extends ModLifecycleEvent
public class FMLPostRegistrationEvent extends ModLifecycleEvent
{
public PostRegistrationEvent(final ModContainer container)
public FMLPostRegistrationEvent(final ModContainer container)
{
super(container);
}

2
src/main/java/net/minecraftforge/fml/common/event/FMLPostResourceLoadEvent.java
View file

@ -22,7 +22,7 @@ package net.minecraftforge.fml.common.event;
import net.minecraftforge.fml.ModContainer;
/**
* Called after {@link PostRegistrationEvent} has been dispatched on every mod. This is the third and last
* Called after {@link FMLPostRegistrationEvent} has been dispatched on every mod. This is the third and last
* commonly called event during mod initialization.
*
* Recommended activities: interact with other mods to establish cross-mod behaviours.

6
src/main/java/net/minecraftforge/fml/common/event/FMLPreregistrationEvent.java → src/main/java/net/minecraftforge/fml/common/event/FMLPreRegistrationEvent.java
View file

@ -22,7 +22,7 @@ package net.minecraftforge.fml.common.event;
import net.minecraftforge.fml.ModContainer;
/**
* Called before {@link PostRegistrationEvent} during mod startup.
* Called before {@link FMLPostRegistrationEvent} during mod startup.
*
* This is the first of three commonly called events during mod initialization.
*
@ -36,9 +36,9 @@ import net.minecraftforge.fml.ModContainer;
* @see net.minecraftforge.fml.common.Mod.EventHandler for how to subscribe to this event
* @author cpw
*/
public class FMLPreregistrationEvent extends ModLifecycleEvent
public class FMLPreRegistrationEvent extends ModLifecycleEvent
{
public FMLPreregistrationEvent(final ModContainer container)
public FMLPreRegistrationEvent(final ModContainer container)
{
super(container);
}