From 56a3926b863497defa3681a66db64166b2dc41e5 Mon Sep 17 00:00:00 2001 From: cpw Date: Mon, 14 Jan 2019 22:32:43 -0500 Subject: [PATCH] Fix up event naming, move them to sensible packages and document everything a bit. --- .../com/example/examplemod/ExampleMod.java | 6 +-- .../minecraftforge/common/ForgeConfig.java | 2 +- .../net/minecraftforge/common/ForgeMod.java | 16 +++--- .../fml/LifecycleEventProvider.java | 10 ++-- .../net/minecraftforge/fml/ModLoader.java | 44 +++++++++++++++-- .../minecraftforge/fml/ModLoadingStage.java | 16 +++--- .../net/minecraftforge/fml/SidedProvider.java | 10 ++-- .../net/minecraftforge/fml/common/Mod.java | 30 ++++++------ .../event/FMLPostRegistrationEvent.java | 44 ----------------- .../common/event/FMLPreRegistrationEvent.java | 45 ----------------- .../lifecycle/FMLClientSetupEvent.java} | 20 ++++++-- .../event/lifecycle/FMLCommonSetupEvent.java | 49 +++++++++++++++++++ .../FMLDedicatedServerSetupEvent.java} | 20 ++++++-- .../FMLFingerprintViolationEvent.java | 2 +- .../lifecycle}/FMLLoadCompleteEvent.java | 2 +- .../lifecycle}/FMLModIdMappingEvent.java | 2 +- .../lifecycle/InterModEnqueueEvent.java} | 18 ++++--- .../event/lifecycle/InterModProcessEvent.java | 45 +++++++++++++++++ .../lifecycle}/ModLifecycleEvent.java | 14 +++++- .../server}/FMLServerAboutToStartEvent.java | 5 +- .../server}/FMLServerStartedEvent.java | 2 +- .../server}/FMLServerStartingEvent.java | 2 +- .../server}/FMLServerStoppedEvent.java | 2 +- .../server}/FMLServerStoppingEvent.java | 2 +- .../server}/ServerLifecycleEvent.java | 2 +- .../fml/javafmlmod/FMLModContainer.java | 10 ++-- .../fml/server/ServerLifecycleHooks.java | 10 ++-- .../debug/block/MaterialFogColorTest.java | 2 +- .../debug/block/NeighborNotifyEventTest.java | 2 +- .../debug/block/StickyBlockTest.java | 2 +- .../debug/chat/ClientChatEventTest.java | 2 +- .../debug/chat/ClientCommandTest.java | 2 +- .../debug/chat/CommandTreeBaseTest.java | 2 +- .../debug/chat/EntitySelectorFactoryTest.java | 2 +- .../client/CustomTextureAtlasSpriteTest.java | 2 +- .../debug/client/FOVModifierEventTest.java | 2 +- .../debug/client/model/AnimatedModelTest.java | 2 +- .../client/model/ModelLoaderRegistryTest.java | 2 +- .../rendering/FastTESRTransparentTest.java | 2 +- .../rendering/VertexBufferNormalTest.java | 2 +- .../debug/entity/BlockEntityUpdateTest.java | 2 +- .../EntityTravelToDimensionEventTest.java | 2 +- .../entity/ProjectileImpactEventTest.java | 2 +- .../living/BabyEntitySpawnEventTest.java | 2 +- .../entity/living/CheckSpawnEventTest.java | 2 +- .../living/CustomSpawnPlacementTest.java | 2 +- .../debug/entity/living/DamageEventTest.java | 4 +- .../living/EquipmentChangeEventTest.java | 2 +- .../entity/player/CriticalHitEventTest.java | 4 +- .../debug/entity/player/DamageReworkTest.java | 2 +- .../entity/player/ItemPickupEventTest.java | 2 +- .../player/PlayerInteractEventTest.java | 2 +- .../entity/player/PlayerSetSpawnTest.java | 2 +- .../debug/fluid/ColoredFluidTest.java | 2 +- .../fluid/CreateFluidSourceEventTest.java | 2 +- .../debug/fluid/DynBucketTest.java | 2 +- .../debug/fluid/FluidPlaceBlockEventTest.java | 2 +- .../debug/fluid/ItemFluidHandlerTest.java | 4 +- .../debug/gameplay/AnytimeSleepingTest.java | 2 +- .../gameplay/BrewingRecipeRegistryTest.java | 4 +- .../gameplay/DifficultyChangeEventTest.java | 2 +- .../debug/gameplay/DynamicBannerTest.java | 2 +- .../EnchantmentLevelSetEventTest.java | 2 +- .../debug/gameplay/GiveItemToPlayerTest.java | 2 +- .../debug/gameplay/NoBedSleepingTest.java | 2 +- .../debug/gameplay/PotionRegistryTest.java | 2 +- .../debug/gameplay/RecipeMatchingTest.java | 2 +- .../advancement/AdvancementCriterionTest.java | 2 +- .../advancement/AdvancementEventTest.java | 2 +- .../gameplay/loot/LootContextTweaksTest.java | 2 +- .../gameplay/loot/LootTableLoadEventTest.java | 2 +- .../debug/gameplay/loot/LootTableTest.java | 2 +- .../debug/item/BonemealEventTest.java | 2 +- .../debug/item/HorseArmorTest.java | 2 +- .../debug/item/ItemFishedEventTest.java | 2 +- .../debug/item/MapDataTest.java | 2 +- .../debug/item/PotionShouldRenderTest.java | 2 +- .../debug/misc/EnumPlantTypeTest.java | 4 +- .../debug/mod/CapabilityTest.java | 2 +- .../debug/mod/ClientLoadingExceptionTest.java | 6 +-- .../debug/mod/ConfigAnnotationTest.java | 4 +- .../debug/mod/ObjectHolderAnnotationTest.java | 2 +- .../debug/mod/PermissionTest.java | 4 +- .../debug/network/BigNetworkMessageTest.java | 2 +- .../debug/network/TrackingTargetTest.java | 2 +- .../debug/util/TextureDumper.java | 2 +- .../debug/world/ChunkCapabilityTest.java | 2 +- .../debug/world/ChunkWatchEventTest.java | 2 +- .../debug/world/DecorateEventDebug.java | 2 +- .../debug/world/TileEntityLoadingTest.java | 2 +- .../debug/world/WorldCapabilityTest.java | 2 +- .../world/WorldProviderCanSleepAtTest.java | 2 +- .../fml/test/ForgeNetworkTestMod.java | 2 +- .../fml/test/SpecialSpawnEventTest.java | 2 +- .../test/SelectorHandlerTest.java | 2 +- 95 files changed, 333 insertions(+), 251 deletions(-) delete mode 100644 src/main/java/net/minecraftforge/fml/common/event/FMLPostRegistrationEvent.java delete mode 100644 src/main/java/net/minecraftforge/fml/common/event/FMLPreRegistrationEvent.java rename src/main/java/net/minecraftforge/fml/{common/event/FMLClientInitEvent.java => event/lifecycle/FMLClientSetupEvent.java} (64%) create mode 100644 src/main/java/net/minecraftforge/fml/event/lifecycle/FMLCommonSetupEvent.java rename src/main/java/net/minecraftforge/fml/{common/event/FMLServerInitEvent.java => event/lifecycle/FMLDedicatedServerSetupEvent.java} (63%) rename src/main/java/net/minecraftforge/fml/{common/event => event/lifecycle}/FMLFingerprintViolationEvent.java (97%) rename src/main/java/net/minecraftforge/fml/{common/event => event/lifecycle}/FMLLoadCompleteEvent.java (96%) rename src/main/java/net/minecraftforge/fml/{common/event => event/lifecycle}/FMLModIdMappingEvent.java (98%) rename src/main/java/net/minecraftforge/fml/{common/event/FMLPostResourceLoadEvent.java => event/lifecycle/InterModEnqueueEvent.java} (62%) create mode 100644 src/main/java/net/minecraftforge/fml/event/lifecycle/InterModProcessEvent.java rename src/main/java/net/minecraftforge/fml/{common/event => event/lifecycle}/ModLifecycleEvent.java (73%) rename src/main/java/net/minecraftforge/fml/{common/event => event/server}/FMLServerAboutToStartEvent.java (88%) rename src/main/java/net/minecraftforge/fml/{common/event => event/server}/FMLServerStartedEvent.java (96%) rename src/main/java/net/minecraftforge/fml/{common/event => event/server}/FMLServerStartingEvent.java (96%) rename src/main/java/net/minecraftforge/fml/{common/event => event/server}/FMLServerStoppedEvent.java (96%) rename src/main/java/net/minecraftforge/fml/{common/event => event/server}/FMLServerStoppingEvent.java (95%) rename src/main/java/net/minecraftforge/fml/{common/event => event/server}/ServerLifecycleEvent.java (96%) diff --git a/mdk/src/main/java/com/example/examplemod/ExampleMod.java b/mdk/src/main/java/com/example/examplemod/ExampleMod.java index 329ecabc8a..f0fff588d5 100644 --- a/mdk/src/main/java/com/example/examplemod/ExampleMod.java +++ b/mdk/src/main/java/com/example/examplemod/ExampleMod.java @@ -6,9 +6,9 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLServerStartingEvent; import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/net/minecraftforge/common/ForgeConfig.java b/src/main/java/net/minecraftforge/common/ForgeConfig.java index e0fe66ccc4..f7c5040013 100644 --- a/src/main/java/net/minecraftforge/common/ForgeConfig.java +++ b/src/main/java/net/minecraftforge/common/ForgeConfig.java @@ -354,7 +354,7 @@ public class ForgeConfig } @Subscribe - public void postInit(FMLPostResourceLoadEvent evt) + public void postInit(InterModProcessEvent evt) { ForgeChunkManager.loadConfiguration(); } diff --git a/src/main/java/net/minecraftforge/common/ForgeMod.java b/src/main/java/net/minecraftforge/common/ForgeMod.java index 376c3d75b1..4fb5f878e0 100644 --- a/src/main/java/net/minecraftforge/common/ForgeMod.java +++ b/src/main/java/net/minecraftforge/common/ForgeMod.java @@ -22,12 +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.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; +import net.minecraftforge.fml.event.lifecycle.FMLModIdMappingEvent; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; +import net.minecraftforge.fml.event.server.FMLServerStartingEvent; +import net.minecraftforge.fml.event.server.FMLServerStoppingEvent; import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext; import net.minecraftforge.server.command.ForgeCommand; import net.minecraftforge.versions.forge.ForgeVersion; @@ -107,7 +107,7 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook } - public void preInit(FMLPreRegistrationEvent evt) + public void preInit(FMLCommonSetupEvent evt) { CapabilityItemHandler.register(); CapabilityFluidHandler.register(); @@ -136,7 +136,7 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook } */ - public void postInit(FMLPostResourceLoadEvent evt) + public void postInit(InterModProcessEvent evt) { registerAllBiomesAndGenerateEvents(); //ForgeChunkManager.loadConfiguration(); diff --git a/src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java b/src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java index b2885bd0df..e6bea2caf0 100644 --- a/src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java +++ b/src/main/java/net/minecraftforge/fml/LifecycleEventProvider.java @@ -19,7 +19,7 @@ package net.minecraftforge.fml; -import net.minecraftforge.fml.common.event.ModLifecycleEvent; +import net.minecraftforge.fml.event.lifecycle.ModLifecycleEvent; import net.minecraftforge.fml.javafmlmod.FMLModContainer; import net.minecraftforge.forgespi.language.ILifecycleEvent; @@ -30,10 +30,10 @@ import java.util.function.Supplier; public enum LifecycleEventProvider { CONSTRUCT(()->new LifecycleEvent(ModLoadingStage.CONSTRUCT)), - PREINIT(()->new LifecycleEvent(ModLoadingStage.PREINIT)), - SIDEDINIT(()->new LifecycleEvent(ModLoadingStage.SIDEDINIT)), - INIT(()->new LifecycleEvent(ModLoadingStage.INIT)), - POSTINIT(()->new LifecycleEvent(ModLoadingStage.POSTINIT)), + SETUP(()->new LifecycleEvent(ModLoadingStage.COMMON_SETUP)), + SIDED_SETUP(()->new LifecycleEvent(ModLoadingStage.SIDED_SETUP)), + ENQUEUE_IMC(()->new LifecycleEvent(ModLoadingStage.ENQUEUE_IMC)), + PROCESS_IMC(()->new LifecycleEvent(ModLoadingStage.PROCESS_IMC)), COMPLETE(()->new LifecycleEvent(ModLoadingStage.COMPLETE)); public void dispatch(Consumer> errorHandler) { diff --git a/src/main/java/net/minecraftforge/fml/ModLoader.java b/src/main/java/net/minecraftforge/fml/ModLoader.java index a7d58347ca..662c2451e1 100644 --- a/src/main/java/net/minecraftforge/fml/ModLoader.java +++ b/src/main/java/net/minecraftforge/fml/ModLoader.java @@ -45,6 +45,42 @@ import java.util.stream.Stream; import static net.minecraftforge.fml.Logging.CORE; import static net.minecraftforge.fml.Logging.LOADING; +/** + * Loads mods. + * + * Dispatch cycle is seen in {@link #loadMods()} and {@link #finishMods()} + * + * Overall sequence for loadMods is: + *
+ *
CONSTRUCT
+ *
Constructs the mod instance. Mods can typically setup basic environment such as Event listeners + * and Configuration specifications here.
+ *
Automated dispatches
+ *
Dispatches automated elements : {@link net.minecraftforge.fml.common.Mod.EventBusSubscriber}, + * {@link net.minecraftforge.event.RegistryEvent}, {@link net.minecraftforge.common.capabilities.CapabilityInject} + * and others
+ *
CONFIG_LOAD
+ *
Dispatches ConfigLoadEvent to mods
+ *
COMMON_SETUP
+ *
Dispatches {@link net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent} to mods
+ *
SIDED_SETUP
+ *
Dispatches {@link net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent} or + * {@link net.minecraftforge.fml.event.lifecycle.FMLDedicatedServerSetupEvent} to mods
+ *
+ * + * Overall sequence for finishMods is: + *
+ *
ENQUEUE_IMC
+ *
Dispatches {@link net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent} to mods, + * for enqueuing {@link InterModComms} messages for other mods to receive subsequently
+ *
PROCESS_IMC
+ *
Dispatches {@link net.minecraftforge.fml.event.lifecycle.InterModProcessEvent} to mods, + * for processing {@link InterModComms} messages received from other mods prior to this event
+ *
COMPLETE
+ *
Dispatches {@link net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent} to mods, + * and completes the mod loading sequence.
+ *
+ */ public class ModLoader { private static final Logger LOGGER = LogManager.getLogger(); @@ -91,9 +127,9 @@ public class ModLoader ObjectHolderRegistry.findObjectHolders(); CapabilityManager.INSTANCE.injectCapabilities(modList.getAllScanData()); GameData.fireRegistryEvents(); - dispatchAndHandleError(LifecycleEventProvider.PREINIT); + dispatchAndHandleError(LifecycleEventProvider.SETUP); DistExecutor.runWhenOn(Dist.CLIENT, ModLoader::fireClientEvents); - dispatchAndHandleError(LifecycleEventProvider.SIDEDINIT); + dispatchAndHandleError(LifecycleEventProvider.SIDED_SETUP); } private void dispatchAndHandleError(LifecycleEventProvider event) { @@ -130,8 +166,8 @@ public class ModLoader public void finishMods() { - dispatchAndHandleError(LifecycleEventProvider.INIT); - dispatchAndHandleError(LifecycleEventProvider.POSTINIT); + dispatchAndHandleError(LifecycleEventProvider.ENQUEUE_IMC); + dispatchAndHandleError(LifecycleEventProvider.PROCESS_IMC); dispatchAndHandleError(LifecycleEventProvider.COMPLETE); GameData.freezeData(); } diff --git a/src/main/java/net/minecraftforge/fml/ModLoadingStage.java b/src/main/java/net/minecraftforge/fml/ModLoadingStage.java index b39bebb133..06dae55983 100644 --- a/src/main/java/net/minecraftforge/fml/ModLoadingStage.java +++ b/src/main/java/net/minecraftforge/fml/ModLoadingStage.java @@ -19,11 +19,7 @@ package net.minecraftforge.fml; -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.ModLifecycleEvent; +import net.minecraftforge.fml.event.lifecycle.*; import java.util.function.Function; import java.util.function.Supplier; @@ -33,11 +29,11 @@ public enum ModLoadingStage ERROR(null), VALIDATE(null), CONSTRUCT(null), - PREINIT(()-> FMLPreRegistrationEvent::new), - SIDEDINIT(SidedProvider.SIDEDINIT::get), - INIT(()-> FMLPostRegistrationEvent::new), - POSTINIT(()-> FMLPostResourceLoadEvent::new), - COMPLETE(()->FMLLoadCompleteEvent::new), + COMMON_SETUP(()-> FMLCommonSetupEvent::new), + SIDED_SETUP(SidedProvider.SIDED_SETUP_EVENT::get), + ENQUEUE_IMC(()-> InterModEnqueueEvent::new), + PROCESS_IMC(()-> InterModProcessEvent::new), + COMPLETE(()-> FMLLoadCompleteEvent::new), DONE(null); private final Supplier> modLifecycleEventFunction; diff --git a/src/main/java/net/minecraftforge/fml/SidedProvider.java b/src/main/java/net/minecraftforge/fml/SidedProvider.java index b03ca93957..e3b18727b1 100644 --- a/src/main/java/net/minecraftforge/fml/SidedProvider.java +++ b/src/main/java/net/minecraftforge/fml/SidedProvider.java @@ -24,8 +24,8 @@ import net.minecraft.server.dedicated.DedicatedServer; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.fml.client.ClientHooks; -import net.minecraftforge.fml.common.event.FMLClientInitEvent; -import net.minecraftforge.fml.common.event.FMLServerInitEvent; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLDedicatedServerSetupEvent; import net.minecraftforge.fml.loading.FMLEnvironment; import java.util.function.Function; @@ -38,9 +38,9 @@ public enum SidedProvider c->c.get().getDataFixer(), s->s.get().getDataFixer(), ()-> { throw new UnsupportedOperationException(); }), - SIDEDINIT( - (Function, Function>)c-> mc->new FMLClientInitEvent(c, mc), - s-> mc->new FMLServerInitEvent(s, mc), + SIDED_SETUP_EVENT( + (Function, Function>)c-> mc->new FMLClientSetupEvent(c, mc), + s-> mc->new FMLDedicatedServerSetupEvent(s, mc), ()-> { throw new UnsupportedOperationException(); }), STRIPCHARS( (Function, Function>)c-> ClientHooks::stripSpecialChars, diff --git a/src/main/java/net/minecraftforge/fml/common/Mod.java b/src/main/java/net/minecraftforge/fml/common/Mod.java index f8b4134da9..37cfbdca69 100644 --- a/src/main/java/net/minecraftforge/fml/common/Mod.java +++ b/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.FMLFingerprintViolationEvent; -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.FMLPostRegistrationEvent; +import net.minecraftforge.fml.event.lifecycle.FMLFingerprintViolationEvent; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent; +import net.minecraftforge.fml.event.server.FMLServerStartedEvent; +import net.minecraftforge.fml.event.server.FMLServerStartingEvent; +import net.minecraftforge.fml.event.server.FMLServerStoppedEvent; +import net.minecraftforge.fml.event.server.FMLServerStoppingEvent; +import net.minecraftforge.fml.event.lifecycle.ModLifecycleEvent; +import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; 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. *
    - *
  • {@link FMLPreRegistrationEvent} : Run before anything else. Read your config, create blocks, + *
  • {@link FMLCommonSetupEvent} : Run before anything else. Read your config, create blocks, * items, etc, and register them with the {@link GameRegistry}.
    • - *
  • {@link FMLPostRegistrationEvent} : Do your mod setup. Build whatever data structures you care about. Register recipes, + *
  • {@link InterModEnqueueEvent} : Do your mod setup. Build whatever data structures you care about. Register recipes, * send {@link FMLInterModComms} messages to other mods.
    • - *
  • {@link FMLPostResourceLoadEvent} : Handle interaction with other mods, complete your setup based on this.
    • + *
  • {@link InterModProcessEvent} : Handle interaction with other mods, complete your setup based on this.
    • *
*

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. *

    - *
  • {@link FMLFingerprintViolationEvent} : Sent just before {@link FMLPreRegistrationEvent} + *
  • {@link FMLFingerprintViolationEvent} : Sent just before {@link FMLCommonSetupEvent} * if something is wrong with your mod signature
    • - *
  • {@link IMCEvent} : Sent just after {@link FMLPostRegistrationEvent} if you have IMC messages waiting + *
  • {@link IMCEvent} : Sent just after {@link InterModEnqueueEvent} if you have IMC messages waiting * from other mods
    • *
* diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLPostRegistrationEvent.java b/src/main/java/net/minecraftforge/fml/common/event/FMLPostRegistrationEvent.java deleted file mode 100644 index dd1ec4aacb..0000000000 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLPostRegistrationEvent.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Minecraft Forge - * Copyright (c) 2016-2018. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package net.minecraftforge.fml.common.event; - -import net.minecraftforge.fml.ModContainer; - -/** - * Called after {@link FMLPreRegistrationEvent} and before {@link FMLPostResourceLoadEvent} during mod - * startup. - * - * This is the second of three commonly called events during mod initialization. - * - * Recommended activities: Register your recipes and Ore Dictionary entries in the - * {@link net.minecraftforge.fml.common.registry.GameRegistry} and {@link net.minecraftforge.oredict.OreDictionary} - * Dispatch requests through {@link FMLInterModComms} to other mods, to tell them what you wish them to do. - * - * @see net.minecraftforge.fml.common.Mod.EventHandler for how to subscribe to this event - * @author cpw - */ -public class FMLPostRegistrationEvent extends ModLifecycleEvent -{ - - public FMLPostRegistrationEvent(final ModContainer container) - { - super(container); - } -} diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLPreRegistrationEvent.java b/src/main/java/net/minecraftforge/fml/common/event/FMLPreRegistrationEvent.java deleted file mode 100644 index 0692f0584a..0000000000 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLPreRegistrationEvent.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Minecraft Forge - * Copyright (c) 2016-2018. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package net.minecraftforge.fml.common.event; - -import net.minecraftforge.fml.ModContainer; - -/** - * Called before {@link FMLPostRegistrationEvent} during mod startup. - * - * This is the first of three commonly called events during mod initialization. - * - * Recommended activities: - * Setup your logging {@link #getModLog()} - * Load any configuration data you might have {@link #getSuggestedConfigurationFile()} - * Search for a version.properties file and load it {@link #getVersionProperties()} - * Configure your {@link ModMetadata} programmatically {@link #getModMetadata()} - * Discover parts of your mod by using annotation search {@link #getAsmData()} - * - * @see net.minecraftforge.fml.common.Mod.EventHandler for how to subscribe to this event - * @author cpw - */ -public class FMLPreRegistrationEvent extends ModLifecycleEvent -{ - public FMLPreRegistrationEvent(final ModContainer container) - { - super(container); - } -} diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLClientInitEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLClientSetupEvent.java similarity index 64% rename from src/main/java/net/minecraftforge/fml/common/event/FMLClientInitEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/FMLClientSetupEvent.java index 1b54aae8b4..a6407a5d9f 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLClientInitEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLClientSetupEvent.java @@ -17,18 +17,32 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.lifecycle; import net.minecraft.client.Minecraft; import net.minecraftforge.fml.ModContainer; import java.util.function.Supplier; -public class FMLClientInitEvent extends ModLifecycleEvent +/** + * This is the second of four commonly called events during mod lifecycle startup. + * + * Called before {@link InterModEnqueueEvent} + * Called after {@link FMLCommonSetupEvent} + * + * Called on {@link net.minecraftforge.api.distmarker.Dist#CLIENT} - the game client. + * + * Alternative to {@link FMLDedicatedServerSetupEvent}. + * + * Do client only setup with this event, such as KeyBindings. + * + * This is a parallel dispatch event. + */ +public class FMLClientSetupEvent extends ModLifecycleEvent { private final Supplier minecraftSupplier; - public FMLClientInitEvent(Supplier mc, ModContainer container) + public FMLClientSetupEvent(Supplier mc, ModContainer container) { super(container); this.minecraftSupplier = mc; diff --git a/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLCommonSetupEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLCommonSetupEvent.java new file mode 100644 index 0000000000..020f84fe11 --- /dev/null +++ b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLCommonSetupEvent.java @@ -0,0 +1,49 @@ +/* + * Minecraft Forge + * Copyright (c) 2016-2018. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.fml.event.lifecycle; + +import net.minecraftforge.fml.ModContainer; + +import java.util.function.Consumer; + +/** + * This is the first of four commonly called events during mod initialization. + * + * Called before {@link FMLClientSetupEvent} or {@link FMLDedicatedServerSetupEvent} during mod startup. + * + * Called after {@link net.minecraftforge.event.RegistryEvent.Register} events have been fired. + * + * Either register your listener using {@link net.minecraftforge.fml.AutomaticEventSubscriber} and + * {@link net.minecraftforge.eventbus.api.SubscribeEvent} or + * {@link net.minecraftforge.eventbus.api.IEventBus#addListener(Consumer)} in your constructor. + * + * Most non-specific mod setup will be performed here. Note that this is a parallel dispatched event - you cannot + * interact with game state in this event. + * + * @see net.minecraftforge.fml.DeferredWorkQueue to enqueue work to run on the main game thread after this event has + * completed dispatch + */ +public class FMLCommonSetupEvent extends ModLifecycleEvent +{ + public FMLCommonSetupEvent(final ModContainer container) + { + super(container); + } +} diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLServerInitEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLDedicatedServerSetupEvent.java similarity index 63% rename from src/main/java/net/minecraftforge/fml/common/event/FMLServerInitEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/FMLDedicatedServerSetupEvent.java index 90626b7607..4c69b5471f 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLServerInitEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLDedicatedServerSetupEvent.java @@ -17,18 +17,32 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.lifecycle; import net.minecraft.server.dedicated.DedicatedServer; import net.minecraftforge.fml.ModContainer; import java.util.function.Supplier; -public class FMLServerInitEvent extends ModLifecycleEvent +/** + * This is the second of four commonly called events during mod lifecycle startup. + * + * Called before {@link InterModEnqueueEvent} + * Called after {@link FMLCommonSetupEvent} + * + * Called on {@link net.minecraftforge.api.distmarker.Dist#DEDICATED_SERVER} - the dedicated game server. + * + * Alternative to {@link FMLClientSetupEvent}. + * + * Do dedicated server specific activities with this event. + * + * This is a parallel dispatch event. + */ +public class FMLDedicatedServerSetupEvent extends ModLifecycleEvent { private final Supplier serverSupplier; - public FMLServerInitEvent(Supplier server, ModContainer container) + public FMLDedicatedServerSetupEvent(Supplier server, ModContainer container) { super(container); this.serverSupplier = server; diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLFingerprintViolationEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLFingerprintViolationEvent.java similarity index 97% rename from src/main/java/net/minecraftforge/fml/common/event/FMLFingerprintViolationEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/FMLFingerprintViolationEvent.java index 8d53049e8b..a756e7c15e 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLFingerprintViolationEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLFingerprintViolationEvent.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.lifecycle; import java.io.File; import java.util.Set; diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLLoadCompleteEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLLoadCompleteEvent.java similarity index 96% rename from src/main/java/net/minecraftforge/fml/common/event/FMLLoadCompleteEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/FMLLoadCompleteEvent.java index f5588844f6..69385e0ccf 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLLoadCompleteEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLLoadCompleteEvent.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.lifecycle; import net.minecraftforge.fml.ModContainer; diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLModIdMappingEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLModIdMappingEvent.java similarity index 98% rename from src/main/java/net/minecraftforge/fml/common/event/FMLModIdMappingEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/FMLModIdMappingEvent.java index e30fc514df..dcb8d9c690 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLModIdMappingEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLModIdMappingEvent.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.lifecycle; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLPostResourceLoadEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/InterModEnqueueEvent.java similarity index 62% rename from src/main/java/net/minecraftforge/fml/common/event/FMLPostResourceLoadEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/InterModEnqueueEvent.java index 4b5d243285..1fc604bf60 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLPostResourceLoadEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/lifecycle/InterModEnqueueEvent.java @@ -17,21 +17,25 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.lifecycle; import net.minecraftforge.fml.ModContainer; /** - * Called after {@link FMLPostRegistrationEvent} has been dispatched on every mod. This is the third and last - * commonly called event during mod initialization. + * This is the third of four commonly called events during mod lifecycle startup. * - * Recommended activities: interact with other mods to establish cross-mod behaviours. + * Called before {@link InterModProcessEvent} + * Called after {@link FMLClientSetupEvent} or {@link FMLDedicatedServerSetupEvent} * - * @author cpw + * + * Enqueue {@link net.minecraftforge.fml.InterModComms} messages to other mods with this event. + * + * This is a parallel dispatch event. */ -public class FMLPostResourceLoadEvent extends ModLifecycleEvent +public class InterModEnqueueEvent extends ModLifecycleEvent { - public FMLPostResourceLoadEvent(final ModContainer container) + + public InterModEnqueueEvent(final ModContainer container) { super(container); } diff --git a/src/main/java/net/minecraftforge/fml/event/lifecycle/InterModProcessEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/InterModProcessEvent.java new file mode 100644 index 0000000000..d8e6e1aa3f --- /dev/null +++ b/src/main/java/net/minecraftforge/fml/event/lifecycle/InterModProcessEvent.java @@ -0,0 +1,45 @@ +/* + * Minecraft Forge + * Copyright (c) 2016-2018. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.fml.event.lifecycle; + +import net.minecraftforge.fml.ModContainer; + +import java.util.function.Predicate; + +/** + * This is the fourth of four commonly called events during mod lifecycle startup. + * + * Called after {@link InterModEnqueueEvent} + * + * Retrieve {@link net.minecraftforge.fml.InterModComms} {@link net.minecraftforge.fml.InterModComms.IMCMessage} suppliers + * and process them as you wish with this event. + * + * This is a parallel dispatch event. + * + * @see #getIMCStream() + * @see #getIMCStream(Predicate) + */ +public class InterModProcessEvent extends ModLifecycleEvent +{ + public InterModProcessEvent(final ModContainer container) + { + super(container); + } +} diff --git a/src/main/java/net/minecraftforge/fml/common/event/ModLifecycleEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/ModLifecycleEvent.java similarity index 73% rename from src/main/java/net/minecraftforge/fml/common/event/ModLifecycleEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/ModLifecycleEvent.java index 5730424d49..0eaa04645e 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/ModLifecycleEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/lifecycle/ModLifecycleEvent.java @@ -17,11 +17,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.lifecycle; import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.ModContainer; +import java.util.function.Predicate; +import java.util.stream.Stream; + /** * Parent type to all ModLifecycle events. This is based on Forge EventBus. They fire through the * ModContainer's eventbus instance. @@ -40,4 +44,12 @@ public class ModLifecycleEvent extends Event String cn = getClass().getName(); return cn.substring(cn.lastIndexOf('.')+4,cn.length()-5); } + + public Stream getIMCStream() { + return InterModComms.getMessages(this.container.getModId()); + } + + public Stream getIMCStream(Predicate methodFilter) { + return InterModComms.getMessages(this.container.getModId(), methodFilter); + } } diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLServerAboutToStartEvent.java b/src/main/java/net/minecraftforge/fml/event/server/FMLServerAboutToStartEvent.java similarity index 88% rename from src/main/java/net/minecraftforge/fml/common/event/FMLServerAboutToStartEvent.java rename to src/main/java/net/minecraftforge/fml/event/server/FMLServerAboutToStartEvent.java index 232cbdc647..3164cc73df 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLServerAboutToStartEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/server/FMLServerAboutToStartEvent.java @@ -17,12 +17,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.server; import net.minecraft.server.MinecraftServer; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; /** - * Called before the server begins loading anything. Called after {@link FMLPostResourceLoadEvent} on the dedicated + * Called before the server begins loading anything. Called after {@link InterModProcessEvent} 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. diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartedEvent.java b/src/main/java/net/minecraftforge/fml/event/server/FMLServerStartedEvent.java similarity index 96% rename from src/main/java/net/minecraftforge/fml/common/event/FMLServerStartedEvent.java rename to src/main/java/net/minecraftforge/fml/event/server/FMLServerStartedEvent.java index b408fa9e47..fd9283fd66 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartedEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/server/FMLServerStartedEvent.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.server; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartingEvent.java b/src/main/java/net/minecraftforge/fml/event/server/FMLServerStartingEvent.java similarity index 96% rename from src/main/java/net/minecraftforge/fml/common/event/FMLServerStartingEvent.java rename to src/main/java/net/minecraftforge/fml/event/server/FMLServerStartingEvent.java index 3beb847cfc..6cc56022e3 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartingEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/server/FMLServerStartingEvent.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.server; import com.mojang.brigadier.CommandDispatcher; import net.minecraft.command.CommandSource; diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppedEvent.java b/src/main/java/net/minecraftforge/fml/event/server/FMLServerStoppedEvent.java similarity index 96% rename from src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppedEvent.java rename to src/main/java/net/minecraftforge/fml/event/server/FMLServerStoppedEvent.java index a93ce08f9c..32e59f1a8d 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppedEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/server/FMLServerStoppedEvent.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.server; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppingEvent.java b/src/main/java/net/minecraftforge/fml/event/server/FMLServerStoppingEvent.java similarity index 95% rename from src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppingEvent.java rename to src/main/java/net/minecraftforge/fml/event/server/FMLServerStoppingEvent.java index 41ba245611..377f0e2481 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLServerStoppingEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/server/FMLServerStoppingEvent.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.server; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/net/minecraftforge/fml/common/event/ServerLifecycleEvent.java b/src/main/java/net/minecraftforge/fml/event/server/ServerLifecycleEvent.java similarity index 96% rename from src/main/java/net/minecraftforge/fml/common/event/ServerLifecycleEvent.java rename to src/main/java/net/minecraftforge/fml/event/server/ServerLifecycleEvent.java index b83d5ca3a4..ef0196febf 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/ServerLifecycleEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/server/ServerLifecycleEvent.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.fml.common.event; +package net.minecraftforge.fml.event.server; import net.minecraft.server.MinecraftServer; import net.minecraftforge.eventbus.api.Event; diff --git a/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java b/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java index 59d274b02a..5b431beb84 100644 --- a/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java +++ b/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java @@ -29,7 +29,7 @@ import net.minecraftforge.fml.ModContainer; 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.event.lifecycle.ModLifecycleEvent; import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.ModFileScanData; @@ -54,10 +54,10 @@ public class FMLModContainer extends ModContainer LOGGER.debug("Creating FMLModContainer instance for {} with classLoader {} & {}", className, modClassLoader, getClass().getClassLoader()); this.scanResults = modFileScanResults; triggerMap.put(ModLoadingStage.CONSTRUCT, dummy().andThen(this::beforeEvent).andThen(this::constructMod).andThen(this::afterEvent)); - triggerMap.put(ModLoadingStage.PREINIT, dummy().andThen(this::beforeEvent).andThen(this::preinitMod).andThen(this::fireEvent).andThen(this::afterEvent)); - triggerMap.put(ModLoadingStage.SIDEDINIT, dummy().andThen(this::beforeEvent).andThen(this::fireEvent).andThen(this::afterEvent)); - triggerMap.put(ModLoadingStage.INIT, dummy().andThen(this::beforeEvent).andThen(this::initMod).andThen(this::fireEvent).andThen(this::afterEvent)); - triggerMap.put(ModLoadingStage.POSTINIT, dummy().andThen(this::beforeEvent).andThen(this::fireEvent).andThen(this::afterEvent)); + triggerMap.put(ModLoadingStage.COMMON_SETUP, dummy().andThen(this::beforeEvent).andThen(this::preinitMod).andThen(this::fireEvent).andThen(this::afterEvent)); + triggerMap.put(ModLoadingStage.SIDED_SETUP, dummy().andThen(this::beforeEvent).andThen(this::fireEvent).andThen(this::afterEvent)); + triggerMap.put(ModLoadingStage.ENQUEUE_IMC, dummy().andThen(this::beforeEvent).andThen(this::initMod).andThen(this::fireEvent).andThen(this::afterEvent)); + triggerMap.put(ModLoadingStage.PROCESS_IMC, dummy().andThen(this::beforeEvent).andThen(this::fireEvent).andThen(this::afterEvent)); triggerMap.put(ModLoadingStage.COMPLETE, dummy().andThen(this::beforeEvent).andThen(this::completeLoading).andThen(this::fireEvent).andThen(this::afterEvent)); this.eventBus = IEventBus.create(this::onEventFailed); diff --git a/src/main/java/net/minecraftforge/fml/server/ServerLifecycleHooks.java b/src/main/java/net/minecraftforge/fml/server/ServerLifecycleHooks.java index 3cf8192b7b..c958265275 100644 --- a/src/main/java/net/minecraftforge/fml/server/ServerLifecycleHooks.java +++ b/src/main/java/net/minecraftforge/fml/server/ServerLifecycleHooks.java @@ -29,11 +29,11 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.LogicalSidedProvider; -import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.event.FMLServerStartedEvent; -import net.minecraftforge.fml.common.event.FMLServerStoppedEvent; -import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; +import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent; +import net.minecraftforge.fml.event.server.FMLServerStartingEvent; +import net.minecraftforge.fml.event.server.FMLServerStartedEvent; +import net.minecraftforge.fml.event.server.FMLServerStoppedEvent; +import net.minecraftforge.fml.event.server.FMLServerStoppingEvent; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.fml.packs.ResourcePackLoader; import org.apache.logging.log4j.LogManager; diff --git a/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java b/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java index a429d70e51..88bb64d688 100644 --- a/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java +++ b/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java @@ -44,7 +44,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; diff --git a/src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java b/src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java index f59c159ab4..16e3518d40 100644 --- a/src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java +++ b/src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java @@ -23,7 +23,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent.NeighborNotifyEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java b/src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java index a757fd4e34..63c26892d6 100644 --- a/src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java +++ b/src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java @@ -38,7 +38,7 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java b/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java index 8f1c058ac9..9fc56d742b 100644 --- a/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java @@ -23,7 +23,7 @@ import net.minecraftforge.client.event.ClientChatEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @Mod(modid = "clientchateventtest", name = "Client Chat Event Test", version = "0.0.0", clientSideOnly = true) diff --git a/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java b/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java index 1d050c5d1f..3b1dde73c2 100644 --- a/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java @@ -28,7 +28,7 @@ import net.minecraft.util.text.TextComponentString; import net.minecraftforge.client.ClientCommandHandler; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.registries.GameData; diff --git a/src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java b/src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java index fe3dc15c63..32c3967b7d 100644 --- a/src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java @@ -25,7 +25,7 @@ import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.event.FMLServerStartingEvent; import net.minecraftforge.server.command.CommandTreeBase; @Mod(modid = CommandTreeBaseTest.MOD_ID, name = "CommandTreeBaseTest", version = "1.0.0", acceptableRemoteVersions = "*") diff --git a/src/test/java/net/minecraftforge/debug/chat/EntitySelectorFactoryTest.java b/src/test/java/net/minecraftforge/debug/chat/EntitySelectorFactoryTest.java index 013df0fbff..7b556bd313 100644 --- a/src/test/java/net/minecraftforge/debug/chat/EntitySelectorFactoryTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/EntitySelectorFactoryTest.java @@ -27,7 +27,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.fml.common.IEntitySelectorFactory; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import javax.annotation.Nonnull; diff --git a/src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java b/src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java index b7e9236067..4df2ca5569 100644 --- a/src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java +++ b/src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java @@ -32,7 +32,7 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java b/src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java index c71ae0f96e..46f5b85467 100644 --- a/src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java +++ b/src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java @@ -24,7 +24,7 @@ import net.minecraftforge.client.event.EntityViewRenderEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; /** diff --git a/src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java b/src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java index cf33bccee6..547296c930 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java @@ -70,7 +70,7 @@ import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.EntityRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java index 42b2db2169..b224d3f7c8 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java @@ -61,7 +61,7 @@ import net.minecraftforge.common.property.Properties; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; diff --git a/src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java b/src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java index 574fc5de7f..7efb44b902 100644 --- a/src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java +++ b/src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java @@ -55,7 +55,7 @@ import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java b/src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java index ae6abb4c4d..504c63f747 100644 --- a/src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java +++ b/src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java @@ -33,7 +33,7 @@ import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.EntityRegistry; @Mod(modid = "wrnormal", name = "WRNormal", version = "1.0", acceptableRemoteVersions = "*") diff --git a/src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java b/src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java index adf27aaf57..25e7d129e8 100644 --- a/src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java @@ -26,7 +26,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.event.FMLServerStartingEvent; @Mod(modid = "entityupdateblockedtest", name = "Entity Update Blocked Test", version = "1.0.0", acceptableRemoteVersions = "*") public class BlockEntityUpdateTest diff --git a/src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java b/src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java index ed5b24be53..b46e02a72f 100644 --- a/src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java @@ -23,7 +23,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityTravelToDimensionEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java b/src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java index b32d11394b..7f5470de0f 100644 --- a/src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java @@ -22,7 +22,7 @@ package net.minecraftforge.debug.entity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.ProjectileImpactEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java index c14e088a25..c90e1df244 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java @@ -23,7 +23,7 @@ import net.minecraft.entity.passive.EntityCow; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.BabyEntitySpawnEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = BabyEntitySpawnEventTest.MODID, name = "BreedingTest", version = "1.0", acceptableRemoteVersions = "*") diff --git a/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java index 81665d6a68..7998cb8c35 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java @@ -23,7 +23,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/CustomSpawnPlacementTest.java b/src/test/java/net/minecraftforge/debug/entity/living/CustomSpawnPlacementTest.java index ba36a829c4..a2422fdf11 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/CustomSpawnPlacementTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/CustomSpawnPlacementTest.java @@ -25,7 +25,7 @@ import net.minecraft.entity.EntitySpawnPlacementRegistry; import net.minecraft.entity.monster.EntityStray; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; @Mod(modid = CustomSpawnPlacementTest.MOD_ID, name = "Custom SpawnPlacementType test mod", version = "1.0", acceptableRemoteVersions = "*") public class CustomSpawnPlacementTest diff --git a/src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java index 308371920b..f79fc14e2e 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java @@ -38,8 +38,8 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLServerStartingEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java index 7e76eece79..b4a7d4dfb5 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java @@ -22,7 +22,7 @@ package net.minecraftforge.debug.entity.living; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEquipmentChangeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java b/src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java index 1e10cb54b3..399cec0bb4 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java @@ -23,8 +23,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.CriticalHitEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.Event.Result; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java b/src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java index 8685e52fed..2bfacfdb2b 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java @@ -28,7 +28,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @Mod(modid = "playerdamagereworktest", name = "PlayerDamageReworkTest", version = "0.0.0", acceptableRemoteVersions = "*") diff --git a/src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java b/src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java index a7192478e4..697db311b9 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; diff --git a/src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java b/src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java index 550987ff71..10602242d4 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java @@ -33,7 +33,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java b/src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java index dfb002317b..5540cdc255 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java @@ -23,7 +23,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerSetSpawnEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java b/src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java index 312b2e718e..803b61beff 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java @@ -32,7 +32,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; diff --git a/src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java b/src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java index f529fab41f..300b999e1d 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java @@ -23,7 +23,7 @@ import net.minecraft.init.Blocks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent.CreateFluidSourceEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.Event.Result; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java b/src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java index 42e8718400..bc81b4cc81 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java @@ -72,7 +72,7 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.Event.Result; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java b/src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java index a8c66b6664..79b71e7bc2 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java @@ -26,7 +26,7 @@ import net.minecraft.world.biome.BiomeHills; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; /** diff --git a/src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java b/src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java index f26254ba4f..f96401ace7 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java @@ -29,8 +29,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLLoadCompleteEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/AnytimeSleepingTest.java b/src/test/java/net/minecraftforge/debug/gameplay/AnytimeSleepingTest.java index ce76ffdf80..fdffed58e2 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/AnytimeSleepingTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/AnytimeSleepingTest.java @@ -30,7 +30,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.entity.player.SleepingTimeCheckEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java b/src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java index b08b41e89d..9a7e19f487 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java @@ -24,8 +24,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.brewing.BrewingRecipeRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import org.apache.logging.log4j.Logger; @Mod(modid = "brewingreciperegistrytest", name = "BrewingRecipeRegistryTest", version = "0.0.0", acceptableRemoteVersions = "*") diff --git a/src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java index 951d86dce0..ed6133860c 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java @@ -23,7 +23,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.DifficultyChangeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/DynamicBannerTest.java b/src/test/java/net/minecraftforge/debug/gameplay/DynamicBannerTest.java index 46fb546b02..1da502c9d3 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/DynamicBannerTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/DynamicBannerTest.java @@ -40,7 +40,7 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java index f141334ef4..1be5cae55d 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java @@ -22,7 +22,7 @@ package net.minecraftforge.debug.gameplay; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.enchanting.EnchantmentLevelSetEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java b/src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java index 5c7e3baee0..184a846481 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java @@ -24,7 +24,7 @@ import net.minecraft.util.EnumActionResult; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.items.ItemHandlerHelper; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java b/src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java index 5c79f584f3..99a370ee98 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java @@ -48,7 +48,7 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.entity.player.PlayerWakeUpEvent; import net.minecraftforge.event.entity.player.SleepingLocationCheckEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.Event.Result; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java b/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java index a4bec4cc8e..bc7a3d35e3 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java @@ -33,7 +33,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeVersion; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; import java.util.Random; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java b/src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java index 203a107661..c34373de33 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java @@ -35,7 +35,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.oredict.ShapedOreRecipe; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java index 418f303d8a..9ecd88ff43 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java @@ -25,7 +25,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java index 3adbff0184..c15c02e149 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java @@ -22,7 +22,7 @@ package net.minecraftforge.debug.gameplay.advancement; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.AdvancementEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java index 143d4b00a5..16b71d9529 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java @@ -45,7 +45,7 @@ import net.minecraft.world.storage.loot.properties.EntityProperty; import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java index 71c238be87..80462dccf3 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java @@ -26,7 +26,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @Mod(modid = LootTableLoadEventTest.MODID, name = "LootTableLoadEventTest", version = "1.0", acceptableRemoteVersions = "*") diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java index f9da40cb8e..fb8ec4cbf9 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java @@ -32,7 +32,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.event.entity.living.LootingLevelEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @Mod(modid = LootTableTest.MODID, name = "Loot Table Debug", version = "1.0", acceptableRemoteVersions = "*") diff --git a/src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java b/src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java index 085c53b8d2..a85923312c 100644 --- a/src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java +++ b/src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java @@ -23,7 +23,7 @@ import net.minecraft.util.EnumHand; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.BonemealEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java b/src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java index ebad668771..26f864373f 100644 --- a/src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java +++ b/src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java @@ -34,7 +34,7 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @EventBusSubscriber diff --git a/src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java b/src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java index 28e78bfeab..de2855bc23 100644 --- a/src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java +++ b/src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java @@ -26,7 +26,7 @@ import net.minecraft.world.biome.Biome; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ItemFishedEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/item/MapDataTest.java b/src/test/java/net/minecraftforge/debug/item/MapDataTest.java index 45a213d97f..b1720ef8bb 100644 --- a/src/test/java/net/minecraftforge/debug/item/MapDataTest.java +++ b/src/test/java/net/minecraftforge/debug/item/MapDataTest.java @@ -47,7 +47,7 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java b/src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java index b9efa4e198..b693dfcf16 100644 --- a/src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java +++ b/src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java @@ -23,7 +23,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; @Mod(modid = PotionShouldRenderTest.modID, name = "No Potion Effect Render Test", version = "0.0.0", acceptableRemoteVersions = "*") diff --git a/src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java b/src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java index ee8497f8db..fab30f3103 100644 --- a/src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java +++ b/src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java @@ -22,8 +22,8 @@ package net.minecraftforge.debug.misc; import net.minecraftforge.common.BiomeManager.BiomeType; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import org.apache.logging.log4j.Logger; @Mod(modid = "enumplanttypetest", name = "EnumPlantTypeTest", version = "1.0", acceptableRemoteVersions = "*") diff --git a/src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java b/src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java index d10b8e8848..10be68c25c 100644 --- a/src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java @@ -41,7 +41,7 @@ import net.minecraftforge.common.capabilities.ICapabilitySerializable; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java b/src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java index 334b7cea8e..c582db34b1 100644 --- a/src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java @@ -27,9 +27,9 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.client.gui.CustomModLoadingErrorDisplayException; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLLoadCompleteEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @Mod(modid = "clientexceptiontest", version = "1.0", name = "Client Exception Test", clientSideOnly = true) diff --git a/src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java b/src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java index 6c4f6ceba1..096e94bb10 100644 --- a/src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java @@ -32,8 +32,8 @@ import net.minecraftforge.common.config.Config.Type; import net.minecraftforge.common.config.ConfigManager; import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java b/src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java index 2c73d7a678..87a2c58ea5 100644 --- a/src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java @@ -25,7 +25,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; diff --git a/src/test/java/net/minecraftforge/debug/mod/PermissionTest.java b/src/test/java/net/minecraftforge/debug/mod/PermissionTest.java index 22ec0c555b..6bfa7abeb9 100644 --- a/src/test/java/net/minecraftforge/debug/mod/PermissionTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/PermissionTest.java @@ -33,8 +33,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLServerStartingEvent; import net.minecraftforge.server.permission.DefaultPermissionLevel; import net.minecraftforge.server.permission.PermissionAPI; import net.minecraftforge.server.permission.context.BlockPosContext; diff --git a/src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java b/src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java index 40722ada48..8fe1e90aee 100644 --- a/src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java +++ b/src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java @@ -23,7 +23,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; diff --git a/src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java b/src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java index 6beed78510..7b88f69a24 100644 --- a/src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java +++ b/src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java @@ -24,7 +24,7 @@ import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.init.Items; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; diff --git a/src/test/java/net/minecraftforge/debug/util/TextureDumper.java b/src/test/java/net/minecraftforge/debug/util/TextureDumper.java index 9812bf8ec1..77bd2df8ca 100644 --- a/src/test/java/net/minecraftforge/debug/util/TextureDumper.java +++ b/src/test/java/net/minecraftforge/debug/util/TextureDumper.java @@ -23,7 +23,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; import org.lwjgl.BufferUtils; diff --git a/src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java b/src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java index 5386177a35..365aa1c4d2 100644 --- a/src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java +++ b/src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java @@ -37,7 +37,7 @@ import net.minecraftforge.common.capabilities.ICapabilitySerializable; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import javax.annotation.Nonnull; diff --git a/src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java b/src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java index 8406556d63..ef8de2755d 100644 --- a/src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java +++ b/src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.ChunkWatchEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = ChunkWatchEventTest.MODID, name = "Chunk Watch Event Test", version = "1.0", acceptableRemoteVersions = "*") diff --git a/src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java b/src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java index e5d03915f2..a6c45e00f1 100644 --- a/src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java +++ b/src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java @@ -23,7 +23,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.Event.Result; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java b/src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java index 50bbd79977..558e503365 100644 --- a/src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java +++ b/src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java @@ -33,7 +33,7 @@ import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java b/src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java index cc097454a8..c027376c60 100644 --- a/src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java +++ b/src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java @@ -33,7 +33,7 @@ import net.minecraftforge.common.capabilities.ICapabilitySerializable; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; diff --git a/src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java b/src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java index 29fd9efcd9..06a0d267ab 100644 --- a/src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java +++ b/src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java @@ -27,7 +27,7 @@ import net.minecraft.world.WorldProvider; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; @Mod(modid = WorldProviderCanSleepAtTest.MODID, name = "Can Sleep At Test", version = "0.0.0", acceptableRemoteVersions = "*") public class WorldProviderCanSleepAtTest diff --git a/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java b/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java index 424f64bae2..f1949073a5 100644 --- a/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java +++ b/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java @@ -26,7 +26,7 @@ import net.minecraft.network.PacketBuffer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; import net.minecraftforge.fml.common.network.FMLEventChannel; import net.minecraftforge.fml.common.network.FMLNetworkEvent; diff --git a/src/test/java/net/minecraftforge/fml/test/SpecialSpawnEventTest.java b/src/test/java/net/minecraftforge/fml/test/SpecialSpawnEventTest.java index 383608abbd..ae7bf3912f 100644 --- a/src/test/java/net/minecraftforge/fml/test/SpecialSpawnEventTest.java +++ b/src/test/java/net/minecraftforge/fml/test/SpecialSpawnEventTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @Mod(modid = SpecialSpawnEventTest.MOD_ID, version = "1.0", acceptableRemoteVersions="*") diff --git a/src/test/java/net/minecraftforge/test/SelectorHandlerTest.java b/src/test/java/net/minecraftforge/test/SelectorHandlerTest.java index c1a1971333..6c07dbc257 100644 --- a/src/test/java/net/minecraftforge/test/SelectorHandlerTest.java +++ b/src/test/java/net/minecraftforge/test/SelectorHandlerTest.java @@ -29,7 +29,7 @@ import net.minecraftforge.common.command.SelectorHandler; import net.minecraftforge.common.command.SelectorHandlerManager; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.event.FMLInitializationEvent; @Mod(modid = "selectorhandlertest", name = "Selector Handler Test", version = "0.0.0", acceptableRemoteVersions = "*") public class SelectorHandlerTest