MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Improve mod loading

Browse Source
This commit is contained in:
Marcel Konrad
2022-07-09 00:26:17 +02:00
parent 4af529f0d8
commit c7a7774dba
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/exopandora/worldhandler/WorldHandler.java
View File

@@ -27,6 +27,7 @@ import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig.Type; import net.minecraftforge.fml.config.ModConfig.Type;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.fml.loading.FMLPaths;
@@ -41,7 +42,6 @@ public class WorldHandler
{ {
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ModLoadingContext modLoadingContext = ModLoadingContext.get(); ModLoadingContext modLoadingContext = ModLoadingContext.get();
MinecraftForge.EVENT_BUS.addListener(this::registerCommands);
DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> new SafeRunnable() DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> new SafeRunnable()
{ {
@Override @Override
@@ -50,9 +50,8 @@ public class WorldHandler
Config.setupDirectories(WorldHandler.USERCONTENT_PATH); Config.setupDirectories(WorldHandler.USERCONTENT_PATH);
modLoadingContext.registerConfig(Type.CLIENT, Config.CLIENT_SPEC, Main.MODID + "/" + Main.MODID + ".toml"); modLoadingContext.registerConfig(Type.CLIENT, Config.CLIENT_SPEC, Main.MODID + "/" + Main.MODID + ".toml");
UsercontentLoader.load(WorldHandler.USERCONTENT_PATH); UsercontentLoader.load(WorldHandler.USERCONTENT_PATH);
modEventBus.addListener(WorldHandler.this::clientSetup);
modEventBus.addListener(WorldHandler.this::registerClientReloadListeners);
modEventBus.addListener(WorldHandler.this::registerKeyMappingsEvent); modEventBus.addListener(WorldHandler.this::registerKeyMappingsEvent);
modEventBus.addListener(WorldHandler.this::registerClientReloadListeners);
modEventBus.addListener(Content::createRegistry); modEventBus.addListener(Content::createRegistry);
modEventBus.addListener(Category::createRegistry); modEventBus.addListener(Category::createRegistry);
modEventBus.addListener(Content::register); modEventBus.addListener(Content::register);
@@ -60,6 +59,8 @@ public class WorldHandler
} }
}); });
modLoadingContext.registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> "ANY", (remote, isServer) -> true)); modLoadingContext.registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> "ANY", (remote, isServer) -> true));
modEventBus.addListener(this::clientSetup);
modEventBus.addListener(this::commonSetup);
} }
@SubscribeEvent @SubscribeEvent
@@ -70,6 +71,12 @@ public class WorldHandler
MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::clientTickEvent); MinecraftForge.EVENT_BUS.addListener(ClientEventHandler::clientTickEvent);
} }
@SubscribeEvent
public void commonSetup(FMLCommonSetupEvent event)
{
MinecraftForge.EVENT_BUS.addListener(this::registerCommands);
}
@SubscribeEvent @SubscribeEvent
public void registerKeyMappingsEvent(RegisterKeyMappingsEvent event) public void registerKeyMappingsEvent(RegisterKeyMappingsEvent event)
{ {