From 419c349a1f22fea9820c0d3a50c39cb655b98945 Mon Sep 17 00:00:00 2001 From: RealMangoRage Date: Sun, 25 Aug 2024 13:38:31 -0700 Subject: [PATCH] [1.21.1] Optionally supply `FMLJavaModLoadingContext` as a param to mod constructors (#10074) Also made `FMLJavaModLoadingContext` extend `ModLoadingContext`. See the PR description for example usage. --- .../minecraftforge/fml/ModLoadingContext.java | 45 ++++++++++++++----- .../javafmlmod/AutomaticEventSubscriber.java | 2 +- .../javafmlmod/FMLJavaModLoadingContext.java | 15 ++++++- .../fml/javafmlmod/FMLModContainer.java | 15 ++++--- .../com/example/examplemod/ExampleMod.java | 7 ++- .../net/minecraftforge/common/ForgeMod.java | 14 +++--- .../minecraftforge/common/MinecraftForge.java | 43 +++--------------- .../event/lifecycle/FMLConstructModEvent.java | 4 ++ .../creativetabs/CreativeModeTabTest.java | 5 +-- .../debug/gameplay/biome/BiomeTestMod.java | 5 ++- .../crafting/ConditionalRecipeTest.java | 6 +++ .../crafting/CustomIngredientsTest.java | 6 +++ .../gameplay/criterion/CriterionTest.java | 5 ++- .../DatapackBuiltinEntriesProviderTest.java | 6 +++ .../item/GatherComponentsEventTest.java | 5 ++- .../gameplay/loot/ConditionalLootPools.java | 6 +++ .../loot/GlobalLootModifiersTest.java | 5 ++- .../NetworkDatapackRegistryTest.java | 6 +++ .../java/net/minecraftforge/mdk/Datagen.java | 5 ++- .../net/minecraftforge/test/BaseTestMod.java | 6 ++- .../minecraftforge/test/TestHelperMod.java | 6 +++ 21 files changed, 138 insertions(+), 79 deletions(-) diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java b/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java index bfe5e4d248..30cba0f1c2 100644 --- a/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java +++ b/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java @@ -19,28 +19,51 @@ public class ModLoadingContext { private static final Logger LOGGER = LogUtils.getLogger(); private static final ThreadLocal context = ThreadLocal.withInitial(ModLoadingContext::new); + private ModContainer activeContainer; private Object languageExtension; private ModLoadingStage stage; + /** + * @deprecated Use the context provided by your language loader in your mod's constructor + */ + @Deprecated(forRemoval = true, since="1.21.1") public static ModLoadingContext get() { return context.get(); } - private ModContainer activeContainer; - + /** + * @deprecated Going to be moved to ForgeHooks for Internal use. + */ + @Deprecated(forRemoval = true, since="1.21.1") public void setActiveContainer(final ModContainer container) { this.activeContainer = container; this.languageExtension = container == null ? null : container.contextExtension.get(); } + /** + * Going to be moved to ForgeHooks for Internal use. + * @deprecated Override/Use {@link ModLoadingContext#getContainer()} + */ + @Deprecated(forRemoval = true, since="1.21.1") public ModContainer getActiveContainer() { return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer; } + /** + * @deprecated Going to be moved to ForgeHooks for Internal use. + */ + @Deprecated(forRemoval = true, since="1.21.1") public String getActiveNamespace() { return activeContainer == null ? "minecraft" : activeContainer.getNamespace(); } + /** + * @return {@link ModLoadingContext#getActiveContainer()} by default. + */ + public ModContainer getContainer() { + return getActiveContainer(); + } + /** * Register an {@link IExtensionPoint} with the mod container. * @param point The extension point to register @@ -48,7 +71,7 @@ public class ModLoadingContext * @param The type signature of the extension operator */ public > void registerExtensionPoint(Class> point, Supplier extension) { - getActiveContainer().registerExtensionPoint(point, extension); + getContainer().registerExtensionPoint(point, extension); } /** @@ -57,7 +80,7 @@ public class ModLoadingContext * @param displayTest The {@link IExtensionPoint.DisplayTest} to register */ public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) { - getActiveContainer().registerDisplayTest(() -> displayTest); + getContainer().registerDisplayTest(() -> displayTest); } /** @@ -66,7 +89,7 @@ public class ModLoadingContext * @param displayTest The {@link Supplier} to register */ public void registerDisplayTest(Supplier displayTest) { - getActiveContainer().registerDisplayTest(displayTest); + getContainer().registerDisplayTest(displayTest); } /** @@ -76,7 +99,7 @@ public class ModLoadingContext * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate) */ public void registerDisplayTest(String version, BiPredicate remoteVersionTest) { - getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest)); + getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest)); } /** @@ -86,29 +109,29 @@ public class ModLoadingContext * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate) */ public void registerDisplayTest(Supplier suppliedVersion, BiPredicate remoteVersionTest) { - getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest)); + getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest)); } public void registerConfig(ModConfig.Type type, IConfigSpec spec) { if (spec.isEmpty()) { // This handles the case where a mod tries to register a config, without any options configured inside it. - LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getActiveContainer().getModId()); + LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId()); return; } - getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer())); + getContainer().addConfig(new ModConfig(type, spec, getContainer())); } public void registerConfig(ModConfig.Type type, IConfigSpec spec, String fileName) { if (spec.isEmpty()) { // This handles the case where a mod tries to register a config, without any options configured inside it. - LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getActiveContainer().getModId(), fileName); + LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName); return; } - getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName)); + getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName)); } diff --git a/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java b/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java index 5197a94f30..078b13f62b 100644 --- a/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java +++ b/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; /** * Automatic eventbus subscriber - reads {@link EventBusSubscriber} - * annotations and passes the class instances to the {@link nBus} + * annotations and passes the class instances to the {@link Bus} * defined by the annotation. Defaults to {@code MinecraftForge#EVENT_BUS} */ public class AutomaticEventSubscriber { diff --git a/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLJavaModLoadingContext.java b/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLJavaModLoadingContext.java index a0ab85442f..08d3ef642d 100644 --- a/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLJavaModLoadingContext.java +++ b/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLJavaModLoadingContext.java @@ -8,7 +8,10 @@ package net.minecraftforge.fml.javafmlmod; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.ModLoadingContext; -public class FMLJavaModLoadingContext +/** + * Use the context provided by your language loader in your mod's constructor + */ +public class FMLJavaModLoadingContext extends ModLoadingContext { private final FMLModContainer container; @@ -24,11 +27,21 @@ public class FMLJavaModLoadingContext return container.getEventBus(); } + /** + * @return {@link FMLModContainer} by default. + */ + @Override + public FMLModContainer getContainer() { + return container; + } /** * Helper to get the right instance from the {@link ModLoadingContext} correctly. * @return The FMLJavaMod language specific extension from the ModLoadingContext + * + * @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor */ + @Deprecated(forRemoval = true, since="1.21.1") public static FMLJavaModLoadingContext get() { return ModLoadingContext.get().extension(); } diff --git a/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java b/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java index f8566aa88e..4deaaaf4cd 100644 --- a/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java +++ b/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java @@ -21,6 +21,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; +import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Objects; import java.util.Optional; @@ -32,6 +33,7 @@ public class FMLModContainer extends ModContainer { private final IEventBus eventBus; private Object modInstance; private final Class modClass; + private final FMLJavaModLoadingContext context = new FMLJavaModLoadingContext(this); public FMLModContainer(IModInfo info, String className, ModFileScanData modFileScanResults, ModuleLayer gameLayer) { super(info); @@ -40,10 +42,7 @@ public class FMLModContainer extends ModContainer { activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod); this.eventBus = BusBuilder.builder().setExceptionHandler(FMLModContainer::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build(); this.configHandler = Optional.of(ce->this.eventBus.post(ce.self())); - final FMLJavaModLoadingContext contextExtension = new FMLJavaModLoadingContext(this); - this.contextExtension = () -> contextExtension; - - + this.contextExtension = () -> context; try { var moduleName = info.getOwningFile().moduleName(); var module = gameLayer.findModule(moduleName) @@ -63,7 +62,13 @@ public class FMLModContainer extends ModContainer { private void constructMod() { try { LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName()); - this.modInstance = modClass.getDeclaredConstructor().newInstance(); + Constructor constructor; + try { + constructor = modClass.getDeclaredConstructor(context.getClass()); + } catch (NoSuchMethodException | SecurityException exception) { + constructor = modClass.getDeclaredConstructor(); + } + this.modInstance = constructor.getParameterCount() == 0 ? constructor.newInstance() : constructor.newInstance(context); LOGGER.trace(LOADING, "Loaded mod instance {} of type {}", getModId(), modClass.getName()); } catch (Throwable e) { // When a mod constructor throws an exception, it's wrapped in an InvocationTargetException which hides the diff --git a/mdk/src/main/java/com/example/examplemod/ExampleMod.java b/mdk/src/main/java/com/example/examplemod/ExampleMod.java index 478de83be4..6e8f900bb1 100644 --- a/mdk/src/main/java/com/example/examplemod/ExampleMod.java +++ b/mdk/src/main/java/com/example/examplemod/ExampleMod.java @@ -18,7 +18,6 @@ import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; @@ -61,9 +60,9 @@ public class ExampleMod output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event }).build()); - public ExampleMod() + public ExampleMod(FMLJavaModLoadingContext context) { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + IEventBus modEventBus = context.getModEventBus(); // Register the commonSetup method for modloading modEventBus.addListener(this::commonSetup); @@ -82,7 +81,7 @@ public class ExampleMod modEventBus.addListener(this::addCreative); // Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.SPEC); + context.registerConfig(ModConfig.Type.COMMON, Config.SPEC); } private void commonSetup(final FMLCommonSetupEvent event) diff --git a/src/main/java/net/minecraftforge/common/ForgeMod.java b/src/main/java/net/minecraftforge/common/ForgeMod.java index 7a55c2447f..1cb8485fed 100644 --- a/src/main/java/net/minecraftforge/common/ForgeMod.java +++ b/src/main/java/net/minecraftforge/common/ForgeMod.java @@ -63,6 +63,7 @@ import net.minecraftforge.fluids.ForgeFlowingFluid; import net.minecraftforge.fml.*; import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.event.lifecycle.*; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.*; import net.minecraftforge.registries.holdersets.AndHolderSet; import net.minecraftforge.registries.holdersets.AnyHolderSet; @@ -72,7 +73,6 @@ import net.minecraftforge.registries.holdersets.OrHolderSet; import net.minecraftforge.network.NetworkInitialization; import net.minecraftforge.network.tasks.ForgeNetworkConfigurationHandler; import net.minecraftforge.event.server.ServerStoppingEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.server.command.EnumArgument; import net.minecraftforge.server.command.ModIdArgument; @@ -370,7 +370,7 @@ public class ForgeMod { enableMilkFluid = true; } - public ForgeMod() { + public ForgeMod(FMLJavaModLoadingContext context) { LOGGER.info(FORGEMOD,"Forge mod loading, version {}, for MC {} with MCP {}", ForgeVersion.getVersion(), MCPVersion.getMCVersion(), MCPVersion.getMCPVersion()); INSTANCE = this; MinecraftForge.initialize(); @@ -387,7 +387,7 @@ public class ForgeMod { CrashReportCallables.registerCrashCallable("FML", ForgeVersion::getSpec); CrashReportCallables.registerCrashCallable("Forge", ()->ForgeVersion.getGroup()+":"+ForgeVersion.getVersion()); - final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + final IEventBus modEventBus = context.getModEventBus(); // Forge-provided datapack registries modEventBus.addListener((DataPackRegistryEvent.NewRegistry event) -> { event.dataPackRegistry(ForgeRegistries.Keys.BIOME_MODIFIERS, BiomeModifier.DIRECT_CODEC); @@ -404,13 +404,13 @@ public class ForgeMod { } MinecraftForge.EVENT_BUS.addListener(this::serverStopping); - ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ForgeConfig.clientSpec); - ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, ForgeConfig.serverSpec); - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ForgeConfig.commonSpec); + context.registerConfig(ModConfig.Type.CLIENT, ForgeConfig.clientSpec); + context.registerConfig(ModConfig.Type.SERVER, ForgeConfig.serverSpec); + context.registerConfig(ModConfig.Type.COMMON, ForgeConfig.commonSpec); modEventBus.register(ForgeConfig.class); ForgeDeferredRegistriesSetup.setup(modEventBus); // Forge does not display problems when the remote is not matching. - ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, ()->new IExtensionPoint.DisplayTest(()->"ANY", (remote, isServer)-> true)); + context.registerDisplayTest(IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION); StartupMessageManager.addModMessage("Forge version "+ForgeVersion.getVersion()); MinecraftForge.EVENT_BUS.addListener(VillagerTradingManager::loadTrades); diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java index a0ee6c3f4e..6b866ac32d 100644 --- a/src/main/java/net/minecraftforge/common/MinecraftForge.java +++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java @@ -30,13 +30,12 @@ import java.util.function.Supplier; public class MinecraftForge { + /** - * The core Forge EventBusses, all events for Forge will be fired on these, - * you should use this to register all your listeners. - * This replaces every register*Handler() function in the old version of Forge. - * TERRAIN_GEN_BUS for terrain gen events - * ORE_GEN_BUS for ore gen events - * EVENT_BUS for everything else + * The EventBus for all the Forge Events. + * + * Events marked with {@link net.minecraftforge.fml.event.IModBusEvent} + * belong on the ModBus and not this bus */ public static final IEventBus EVENT_BUS = BusBuilder.builder().startShutdown().useModLauncher().build(); @@ -85,36 +84,4 @@ public class MinecraftForge () -> new ConfigScreenHandler.ConfigScreenFactory(screenFunction) ); } - -/* - public static void preloadCrashClasses(ASMDataTable table, String modID, Set classes) - { - //Find all ICrashReportDetail's handlers and preload them. - List all = Lists.newArrayList(); - for (ASMData asm : table.getAll(ICrashReportDetail.class.getName().replace('.', '/'))) - all.add(asm.getClassName()); - for (ASMData asm : table.getAll(ICrashCallable.class.getName().replace('.', '/'))) - all.add(asm.getClassName()); - - all.retainAll(classes); - - if (all.size() == 0) - return; - - ForgeMod.log.debug("Preloading CrashReport Classes"); - Collections.sort(all); //Sort it because I like pretty output ;) - for (String name : all) - { - ForgeMod.log.debug("\t{}", name); - try - { - Class.forName(name.replace('/', '.'), false, MinecraftForge.class.getClassLoader()); - } - catch (Exception e) - { - LOGGER.error("Could not find class for name '{}'.", name, e); - } - } - } -*/ } diff --git a/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLConstructModEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLConstructModEvent.java index a1f917c450..a03ae05c6c 100644 --- a/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLConstructModEvent.java +++ b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLConstructModEvent.java @@ -8,6 +8,10 @@ package net.minecraftforge.fml.event.lifecycle; import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModLoadingStage; +/** + * Supplied as a param to your mod's constructor to get access + * to the mod EventBus and various mod-specific objects. + */ public class FMLConstructModEvent extends ParallelDispatchEvent { public FMLConstructModEvent(final ModContainer container, final ModLoadingStage stage) { super(container, stage); diff --git a/src/test/java/net/minecraftforge/debug/creativetabs/CreativeModeTabTest.java b/src/test/java/net/minecraftforge/debug/creativetabs/CreativeModeTabTest.java index dcd1065c17..21e2eb1049 100644 --- a/src/test/java/net/minecraftforge/debug/creativetabs/CreativeModeTabTest.java +++ b/src/test/java/net/minecraftforge/debug/creativetabs/CreativeModeTabTest.java @@ -12,7 +12,6 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTab.TabVisibility; -import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.DyeItem; import net.minecraft.world.item.ItemStack; @@ -36,11 +35,11 @@ public class CreativeModeTabTest { private static final ResourceKey COLORS = ResourceKey.create(Registries.CREATIVE_MODE_TAB, ResourceLocation.fromNamespaceAndPath(MOD_ID, "colors")); private static final ResourceKey SEARCH = ResourceKey.create(Registries.CREATIVE_MODE_TAB, ResourceLocation.fromNamespaceAndPath(MOD_ID, "search")); - public CreativeModeTabTest() { + public CreativeModeTabTest(FMLJavaModLoadingContext context) { if (!ENABLED) return; - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + IEventBus modEventBus = context.getModEventBus(); modEventBus.addListener(CreativeModeTabTest::onCreativeModeTabRegister); modEventBus.addListener(CreativeModeTabTest::onCreativeModeTabBuildContents); diff --git a/src/test/java/net/minecraftforge/debug/gameplay/biome/BiomeTestMod.java b/src/test/java/net/minecraftforge/debug/gameplay/biome/BiomeTestMod.java index 5ed1331696..2b5500f5ab 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/biome/BiomeTestMod.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/biome/BiomeTestMod.java @@ -28,6 +28,7 @@ import net.minecraftforge.common.world.BiomeModifier; import net.minecraftforge.common.world.ForgeBiomeModifiers; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.test.BaseTestMod; @@ -44,8 +45,8 @@ public class BiomeTestMod extends BaseTestMod { private static final ResourceKey ADD_OVERWORLD_NETHERITE_BLOCK_ORE = ResourceKey.create(ForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(BiomeTestMod.MOD_ID, "add_overworld_netherite_block_ore")); private static final ResourceKey> OVERWORLD_NETHERITE_BLOCK_ORE = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.fromNamespaceAndPath(BiomeTestMod.MOD_ID, "overworld_netherite_block_ore")); - public BiomeTestMod() { - var modBus = FMLJavaModLoadingContext.get().getModEventBus(); + public BiomeTestMod(FMLJavaModLoadingContext context) { + super(context); modBus.addListener(BiomeTestMod::onDataGen); } diff --git a/src/test/java/net/minecraftforge/debug/gameplay/crafting/ConditionalRecipeTest.java b/src/test/java/net/minecraftforge/debug/gameplay/crafting/ConditionalRecipeTest.java index 695b11fc8f..6556163699 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/crafting/ConditionalRecipeTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/crafting/ConditionalRecipeTest.java @@ -33,6 +33,8 @@ import net.minecraftforge.common.crafting.conditions.IConditionBuilder; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.gametest.GameTestHolder; import net.minecraftforge.test.BaseTestMod; @@ -41,6 +43,10 @@ import net.minecraftforge.test.BaseTestMod; public class ConditionalRecipeTest extends BaseTestMod { static final String MODID = "conditional_recipe"; + public ConditionalRecipeTest(FMLJavaModLoadingContext context) { + super(context); + } + @SubscribeEvent public void gatherData(GatherDataEvent event) { var gen = event.getGenerator(); diff --git a/src/test/java/net/minecraftforge/debug/gameplay/crafting/CustomIngredientsTest.java b/src/test/java/net/minecraftforge/debug/gameplay/crafting/CustomIngredientsTest.java index 17c61ca904..3f234a4f5e 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/crafting/CustomIngredientsTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/crafting/CustomIngredientsTest.java @@ -8,6 +8,8 @@ package net.minecraftforge.debug.gameplay.crafting; import java.util.concurrent.CompletableFuture; import java.util.function.Function; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.jetbrains.annotations.Nullable; import net.minecraft.core.HolderLookup; @@ -56,6 +58,10 @@ public class CustomIngredientsTest extends BaseTestMod implements INBTBuilder { private static final TagKey LEFT = tag("left"); private static final TagKey RIGHT = tag("right"); + public CustomIngredientsTest(FMLJavaModLoadingContext context) { + super(context); + } + @SubscribeEvent public void gatherData(GatherDataEvent event) { var gen = event.getGenerator(); diff --git a/src/test/java/net/minecraftforge/debug/gameplay/criterion/CriterionTest.java b/src/test/java/net/minecraftforge/debug/gameplay/criterion/CriterionTest.java index 0f1e6802a7..ce73b36f41 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/criterion/CriterionTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/criterion/CriterionTest.java @@ -37,6 +37,8 @@ import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.gametest.GameTestHolder; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -55,7 +57,8 @@ public final class CriterionTest extends BaseTestMod { public static final String TEST_CRITERION_ID = "break_glass_with_fish"; public static final ResourceLocation TEST_ADVANCEMENT_ID = ResourceLocation.fromNamespaceAndPath(MOD_ID, TEST_CRITERION_ID); - public CriterionTest() { + public CriterionTest(FMLJavaModLoadingContext context) { + super(context); MinecraftForge.EVENT_BUS.addListener(this::onBlockBreak); } diff --git a/src/test/java/net/minecraftforge/debug/gameplay/data/DatapackBuiltinEntriesProviderTest.java b/src/test/java/net/minecraftforge/debug/gameplay/data/DatapackBuiltinEntriesProviderTest.java index 17390cb638..7ea6333c92 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/data/DatapackBuiltinEntriesProviderTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/data/DatapackBuiltinEntriesProviderTest.java @@ -27,6 +27,8 @@ import net.minecraftforge.common.world.ForgeBiomeModifiers; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.test.BaseTestMod; @@ -50,6 +52,10 @@ public class DatapackBuiltinEntriesProviderTest extends BaseTestMod { ); }; + public DatapackBuiltinEntriesProviderTest(FMLJavaModLoadingContext context) { + super(context); + } + @SubscribeEvent public void onDataGen(GatherDataEvent event) { var gen = event.getGenerator(); diff --git a/src/test/java/net/minecraftforge/debug/gameplay/item/GatherComponentsEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/item/GatherComponentsEventTest.java index 22ab98f29a..2245215841 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/item/GatherComponentsEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/item/GatherComponentsEventTest.java @@ -14,6 +14,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.GatherComponentsEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.gametest.GameTestHolder; import net.minecraftforge.test.BaseTestMod; @@ -25,7 +27,8 @@ import java.util.Optional; public class GatherComponentsEventTest extends BaseTestMod { public static final String MOD_ID = "gather_components_test_event"; - public GatherComponentsEventTest() { + public GatherComponentsEventTest(FMLJavaModLoadingContext context) { + super(context); IEventBus bus = MinecraftForge.EVENT_BUS; bus.addListener(this::onItem); } diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/ConditionalLootPools.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/ConditionalLootPools.java index 5e6c4d81cf..b749f090d8 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/loot/ConditionalLootPools.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/ConditionalLootPools.java @@ -22,6 +22,8 @@ import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.test.BaseTestMod; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.common.crafting.conditions.IConditionBuilder; @@ -43,6 +45,10 @@ public class ConditionalLootPools extends BaseTestMod { private static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID); private static final RegistryObject TEST_BLOCK = BLOCKS.register("test", () -> new Block(BlockBehaviour.Properties.of())); + public ConditionalLootPools(FMLJavaModLoadingContext context) { + super(context); + } + @SubscribeEvent public void runData(GatherDataEvent event) { event.getGenerator().addProvider(event.includeServer(), new LootProvider(event.getGenerator().getPackOutput(), event.getLookupProvider())); diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java index 8779d8bac7..bce7db6d98 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/GlobalLootModifiersTest.java @@ -60,6 +60,8 @@ import net.minecraftforge.common.loot.IGlobalLootModifier; import net.minecraftforge.common.loot.LootModifier; import net.minecraftforge.common.loot.LootTableIdCondition; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.RegistryObject; import net.minecraftforge.test.BaseTestMod; import net.minecraftforge.fml.common.Mod; @@ -105,7 +107,8 @@ public class GlobalLootModifiersTest extends BaseTestMod { private static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID); private static final RegistryObject TEST_ITEM = ITEMS.register("test", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties())); - public GlobalLootModifiersTest() { + public GlobalLootModifiersTest(FMLJavaModLoadingContext context) { + super(context); testItem(lookup -> getSmelterAxe(lookup.lookup(Registries.ENCHANTMENT).get(), true)); } diff --git a/src/test/java/net/minecraftforge/debug/registries/NetworkDatapackRegistryTest.java b/src/test/java/net/minecraftforge/debug/registries/NetworkDatapackRegistryTest.java index 930d6137a9..98978793b0 100644 --- a/src/test/java/net/minecraftforge/debug/registries/NetworkDatapackRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/registries/NetworkDatapackRegistryTest.java @@ -7,6 +7,8 @@ package net.minecraftforge.debug.registries; import java.util.Set; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.slf4j.Logger; import com.mojang.logging.LogUtils; @@ -38,6 +40,10 @@ public class NetworkDatapackRegistryTest extends BaseTestMod { private static final ResourceKey TEST_ENTRY = ResourceKey.create(REGISTRY_KEY, rl(MODID, "test_entry")); private static final ResourceLocation TEST_VALUE = rl(MODID, "test_value"); + public NetworkDatapackRegistryTest(FMLJavaModLoadingContext context) { + super(context); + } + @SubscribeEvent public void onNewDatapackRegistry(DataPackRegistryEvent.NewRegistry event) { event.dataPackRegistry(REGISTRY_KEY, DataObject.DIRECT_CODEC, DataObject.DIRECT_CODEC); diff --git a/src/test/java/net/minecraftforge/mdk/Datagen.java b/src/test/java/net/minecraftforge/mdk/Datagen.java index c4535ac36a..872448b558 100644 --- a/src/test/java/net/minecraftforge/mdk/Datagen.java +++ b/src/test/java/net/minecraftforge/mdk/Datagen.java @@ -12,6 +12,7 @@ import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.metadata.pack.PackMetadataSection; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import java.util.Optional; @@ -20,8 +21,8 @@ import java.util.Optional; public class Datagen { static final String MOD_ID = "mdk_datagen"; - public Datagen() { - FMLJavaModLoadingContext.get().getModEventBus().addListener(Datagen::gatherData); + public Datagen(FMLJavaModLoadingContext context) { + context.getModEventBus().addListener(Datagen::gatherData); } private static void gatherData(GatherDataEvent event) { diff --git a/src/test/java/net/minecraftforge/test/BaseTestMod.java b/src/test/java/net/minecraftforge/test/BaseTestMod.java index e25b02c440..b103e8b963 100644 --- a/src/test/java/net/minecraftforge/test/BaseTestMod.java +++ b/src/test/java/net/minecraftforge/test/BaseTestMod.java @@ -15,17 +15,19 @@ import net.minecraft.core.HolderLookup; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.CreativeModeTab.TabVisibility; import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; +import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; public abstract class BaseTestMod { private List> testItems = new ArrayList<>(); + protected final IEventBus modBus; - protected BaseTestMod() { + public BaseTestMod(FMLJavaModLoadingContext context) { // TODO: Some form of enable flag? - var modBus = FMLJavaModLoadingContext.get().getModEventBus(); + this.modBus = context.getModEventBus(); modBus.register(this); Class cls = getClass(); diff --git a/src/test/java/net/minecraftforge/test/TestHelperMod.java b/src/test/java/net/minecraftforge/test/TestHelperMod.java index c47deb28e2..ec8f137dbd 100644 --- a/src/test/java/net/minecraftforge/test/TestHelperMod.java +++ b/src/test/java/net/minecraftforge/test/TestHelperMod.java @@ -21,6 +21,8 @@ import net.minecraft.world.item.Items; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.RegisterEvent; /* A place where I can put common utility stuff for now. Until I re-write the test codebase. */ @@ -29,6 +31,10 @@ public class TestHelperMod extends BaseTestMod { public static final String MOD_ID = "test_helper_mod"; public static final ResourceKey TAB = ResourceKey.create(Registries.CREATIVE_MODE_TAB, ResourceLocation.fromNamespaceAndPath(MOD_ID, "test_items")); + public TestHelperMod(FMLJavaModLoadingContext context) { + super(context); + } + @SubscribeEvent public void onRegister(RegisterEvent event) { event.register(Registries.CREATIVE_MODE_TAB, h -> {