Update a bunch of libs, rename some of the mod events to more

meaningful names.

src/main/java/net/minecraftforge/common/ForgeConfig.java

@@ -354,7 +354,7 @@ public class ForgeConfig
     }
 
     @Subscribe
-    public void postInit(FMLPostInitializationEvent evt)
+    public void postInit(FMLPostResourceLoadEvent evt)
     {
         ForgeChunkManager.loadConfiguration();
     }

src/main/java/net/minecraftforge/common/ForgeMod.java

@@ -22,7 +22,12 @@ package net.minecraftforge.common;
 import net.minecraftforge.fml.FMLWorldPersistenceHook;
 import net.minecraftforge.fml.VersionChecker;
 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.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext;
 import net.minecraftforge.server.command.ForgeCommand;
 import net.minecraftforge.versions.forge.ForgeVersion;
@@ -39,11 +44,6 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.fluids.UniversalBucket;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
-import net.minecraftforge.fml.common.event.FMLModIdMappingEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
 import net.minecraftforge.fml.common.gameevent.PlayerEvent;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.MarkerManager;
@@ -107,7 +107,7 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
     }
 
 
-    public void preInit(FMLPreInitializationEvent evt)
+    public void preInit(FMLPreregistrationEvent evt)
     {
         CapabilityItemHandler.register();
         CapabilityFluidHandler.register();
@@ -136,7 +136,7 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
     }
 */
 
-    public void postInit(FMLPostInitializationEvent evt)
+    public void postInit(FMLPostResourceLoadEvent evt)
     {
         registerAllBiomesAndGenerateEvents();
         //ForgeChunkManager.loadConfiguration();

src/main/java/net/minecraftforge/common/capabilities/CapabilityManager.java

@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.Callable;
 
-import net.minecraftforge.fml.language.ModFileScanData;
+import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.objectweb.asm.Type;

src/main/java/net/minecraftforge/fml/AutomaticEventSubscriber.java

@@ -22,7 +22,7 @@ package net.minecraftforge.fml;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.language.ModFileScanData;
+import net.minecraftforge.forgespi.language.ModFileScanData;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.loading.moddiscovery.ModAnnotation;
 import org.apache.logging.log4j.LogManager;

src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java

@@ -21,7 +21,7 @@ package net.minecraftforge.fml;
 
 import net.minecraftforge.fml.common.event.ModLifecycleEvent;
 import net.minecraftforge.fml.javafmlmod.FMLModContainer;
-import net.minecraftforge.fml.language.ILifecycleEvent;
+import net.minecraftforge.forgespi.language.ILifecycleEvent;
 
 import java.util.List;
 import java.util.function.Consumer;

src/main/java/net/minecraftforge/fml/ModContainer.java

@@ -19,7 +19,7 @@
 
 package net.minecraftforge.fml;
 
-import net.minecraftforge.fml.language.IModInfo;
+import net.minecraftforge.forgespi.language.IModInfo;
 
 import java.util.Collections;
 import java.util.HashMap;

src/main/java/net/minecraftforge/fml/ModList.java

@@ -19,9 +19,7 @@
 
 package net.minecraftforge.fml;
 
-import com.google.common.collect.Streams;
-import net.minecraftforge.fml.language.ModFileScanData;
-import net.minecraftforge.fml.loading.DefaultModInfos;
+import net.minecraftforge.forgespi.language.ModFileScanData;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;
 import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;

src/main/java/net/minecraftforge/fml/ModLoader.java

@@ -24,7 +24,7 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.capabilities.CapabilityManager;
-import net.minecraftforge.fml.language.IModInfo;
+import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.fml.loading.moddiscovery.ModFile;

src/main/java/net/minecraftforge/fml/ModLoadingException.java

@@ -20,7 +20,7 @@
 package net.minecraftforge.fml;
 
 import com.google.common.collect.Streams;
-import net.minecraftforge.fml.language.IModInfo;
+import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.fml.loading.EarlyLoadingException;
 
 import java.util.Arrays;

src/main/java/net/minecraftforge/fml/ModLoadingStage.java

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

src/main/java/net/minecraftforge/fml/client/ClientHooks.java

@@ -62,7 +62,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.storage.WorldSummary;
 import net.minecraftforge.fml.StartupQuery;
 import net.minecraftforge.fml.client.gui.GuiAccessDenied;
-import net.minecraftforge.fml.language.IModInfo;
+import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.fml.packs.ModFileResourcePack;
 import net.minecraftforge.registries.GameData;
 

src/main/java/net/minecraftforge/fml/client/gui/GuiModList.java

@@ -40,7 +40,7 @@ import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.fml.*;
 import net.minecraftforge.fml.client.ConfigGuiHandler;
 import net.minecraftforge.fml.packs.ResourcePackLoader;
-import net.minecraftforge.fml.language.IModInfo;
+import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.fml.loading.StringUtils;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import org.apache.commons.lang3.tuple.Pair;

src/main/java/net/minecraftforge/fml/common/Mod.java

@@ -25,16 +25,16 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.common.event.ModLifecycleEvent;
 import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostResourceLoadEvent;
+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.registry.GameRegistry;
 
 /**
@@ -67,11 +67,11 @@ public @interface Mod
      *
      * These suggestions are mostly just suggestions on what to do in each event.
      * <ul>
-     * <li> {@link FMLPreInitializationEvent} : 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 FMLInitializationEvent} : Do your mod setup. Build whatever data structures you care about. Register recipes,
+     * <li> {@link PostRegistrationEvent} : Do your mod setup. Build whatever data structures you care about. Register recipes,
      * send {@link FMLInterModComms} messages to other mods.</li>
-     * <li> {@link FMLPostInitializationEvent} : Handle interaction with other mods, complete your setup based on this.</li>
+     * <li> {@link FMLPostResourceLoadEvent} : Handle interaction with other mods, complete your setup based on this.</li>
      * </ul>
      * <p>These are the server lifecycle events. They are fired whenever a server is running, or about to run. Each time a server
      * starts they will be fired in this sequence.
@@ -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 FMLPreInitializationEvent}
+     * <li> {@link FMLFingerprintViolationEvent} : Sent just before {@link FMLPreregistrationEvent}
      * if something is wrong with your mod signature</li>
-     * <li> {@link IMCEvent} : Sent just after {@link FMLInitializationEvent} if you have IMC messages waiting
+     * <li> {@link IMCEvent} : Sent just after {@link PostRegistrationEvent} if you have IMC messages waiting
      * from other mods</li>
      * </ul>
      *

src/main/java/net/minecraftforge/fml/common/event/FMLPostResourceLoadEvent.java

@@ -22,17 +22,16 @@ package net.minecraftforge.fml.common.event;
 import net.minecraftforge.fml.ModContainer;
 
 /**
- * Called after {@link FMLInitializationEvent} has been dispatched on every mod. This is the third and last
+ * Called after {@link PostRegistrationEvent} 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.
  *
- * @see net.minecraftforge.fml.common.Mod.EventHandler for how to subscribe to this event
  * @author cpw
  */
-public class FMLPostInitializationEvent extends ModLifecycleEvent
+public class FMLPostResourceLoadEvent extends ModLifecycleEvent
 {
-    public FMLPostInitializationEvent(final ModContainer container)
+    public FMLPostResourceLoadEvent(final ModContainer container)
     {
         super(container);
     }

src/main/java/net/minecraftforge/fml/common/event/FMLPreregistrationEvent.java

@@ -22,7 +22,7 @@ package net.minecraftforge.fml.common.event;
 import net.minecraftforge.fml.ModContainer;
 
 /**
- * Called before {@link FMLInitializationEvent} during mod startup.
+ * Called before {@link PostRegistrationEvent} 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 FMLPreInitializationEvent extends ModLifecycleEvent
+public class FMLPreregistrationEvent extends ModLifecycleEvent
 {
-    public FMLPreInitializationEvent(final ModContainer container)
+    public FMLPreregistrationEvent(final ModContainer container)
     {
         super(container);
     }

src/main/java/net/minecraftforge/fml/common/event/FMLServerAboutToStartEvent.java

@@ -19,12 +19,10 @@
 
 package net.minecraftforge.fml.common.event;
 
-import com.mojang.brigadier.CommandDispatcher;
-import net.minecraft.command.CommandSource;
 import net.minecraft.server.MinecraftServer;
 
 /**
- * Called before the server begins loading anything. Called after {@link FMLPostInitializationEvent} on the dedicated
+ * Called before the server begins loading anything. Called after {@link FMLPostResourceLoadEvent} on the dedicated
  * server, and after the player has hit "Play Selected World" in the client. Called before {@link FMLServerStartingEvent}.
  *
  * You can obtain a reference to the server with this event.

src/main/java/net/minecraftforge/fml/common/event/PostRegistrationEvent.java

@@ -22,7 +22,7 @@ package net.minecraftforge.fml.common.event;
 import net.minecraftforge.fml.ModContainer;
 
 /**
- * Called after {@link FMLPreInitializationEvent} and before {@link FMLPostInitializationEvent} 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 FMLInitializationEvent extends ModLifecycleEvent
+public class PostRegistrationEvent extends ModLifecycleEvent
 {
 
-    public FMLInitializationEvent(final ModContainer container)
+    public PostRegistrationEvent(final ModContainer container)
     {
         super(container);
     }

src/main/java/net/minecraftforge/fml/javafmlmod/FMLJavaModLanguageProvider.java

@@ -19,10 +19,10 @@
 
 package net.minecraftforge.fml.javafmlmod;
 
-import net.minecraftforge.fml.language.ILifecycleEvent;
-import net.minecraftforge.fml.language.IModLanguageProvider;
-import net.minecraftforge.fml.language.IModInfo;
-import net.minecraftforge.fml.language.ModFileScanData;
+import net.minecraftforge.forgespi.language.ILifecycleEvent;
+import net.minecraftforge.forgespi.language.IModLanguageProvider;
+import net.minecraftforge.forgespi.language.IModInfo;
+import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.objectweb.asm.Type;

src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java

@@ -30,8 +30,8 @@ import net.minecraftforge.fml.ModLoadingException;
 import net.minecraftforge.fml.ModLoadingStage;
 import net.minecraftforge.fml.ModThreadContext;
 import net.minecraftforge.fml.common.event.ModLifecycleEvent;
-import net.minecraftforge.fml.language.IModInfo;
-import net.minecraftforge.fml.language.ModFileScanData;
+import net.minecraftforge.forgespi.language.IModInfo;
+import net.minecraftforge.forgespi.language.ModFileScanData;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/net/minecraftforge/registries/ObjectHolderRegistry.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.language.ModFileScanData;
+import net.minecraftforge.forgespi.language.ModFileScanData;
 
 import com.google.common.collect.Maps;