From b90d7a838ec7e9bc60216f411f105607035f7dd1 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 27 Jun 2017 16:27:29 -0700 Subject: [PATCH] Fix Biome unit test --- .../java/net/minecraftforge/common/ForgeHooks.java | 11 +++++++++-- .../minecraftforge/test/BiomeSpawnableListTest.java | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 4515467cfe..80b9376630 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -127,6 +127,7 @@ import net.minecraftforge.event.world.NoteBlockEvent; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.LoaderState; import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -1248,16 +1249,22 @@ public class ForgeHooks public static boolean loadAdvancements(Map map) { boolean errored = false; - Loader.instance().setActiveModContainer(null); + setActiveModContainer(null); //Loader.instance().getActiveModList().forEach((mod) -> loadFactories(mod)); for (ModContainer mod : Loader.instance().getActiveModList()) { errored |= !loadAdvancements(map, mod); } - Loader.instance().setActiveModContainer(null); + setActiveModContainer(null); return errored; } + private static void setActiveModContainer(ModContainer mod) + { + if (Loader.instance().getLoaderState() != LoaderState.NOINIT) //Unit Tests.. + Loader.instance().setActiveModContainer(mod); + } + private static boolean loadAdvancements(Map map, ModContainer mod) { return CraftingHelper.findFiles(mod, "assets/" + mod.getModId() + "/advancements", null, diff --git a/src/test/java/net/minecraftforge/test/BiomeSpawnableListTest.java b/src/test/java/net/minecraftforge/test/BiomeSpawnableListTest.java index 9f6d7063cf..1c579ac2d7 100644 --- a/src/test/java/net/minecraftforge/test/BiomeSpawnableListTest.java +++ b/src/test/java/net/minecraftforge/test/BiomeSpawnableListTest.java @@ -9,6 +9,7 @@ import net.minecraft.init.Biomes; import net.minecraft.init.Bootstrap; import net.minecraft.world.biome.Biome; import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.registry.EntityRegistry; import net.minecraftforge.fml.common.registry.ForgeTestRunner; import org.junit.BeforeClass; @@ -26,6 +27,7 @@ public class BiomeSpawnableListTest @BeforeClass public static void setUp() throws Exception { + Loader.instance(); Bootstrap.register(); creatureTypeHorse = EnumHelper.addCreatureType("biomespawnablelisttest:horse", AbstractHorse.class, 20, Material.AIR, true, true); }