Added an event for registering commands. closes #6968 (#6969)

This commit is contained in:
Jared authored and GitHub committed 2020-07-15 12:30:41 -07:00
1 parent 6722e7a428
commit 00013865b0
6 files changed
+67 -15

No files matched your search

@@ -28,6 +28,7 @@ import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.common.loot.LootModifierManager;
import net.minecraftforge.common.util.FakePlayerFactory;
import net.minecraftforge.event.AddReloadListenerEvent;
import net.minecraftforge.event.RegisterCommandsEvent;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.event.world.ChunkEvent;
@@ -39,6 +40,8 @@ import net.minecraftforge.event.TickEvent;
import net.minecraftforge.event.TickEvent.ClientTickEvent;
import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.event.TickEvent.ServerTickEvent;
import net.minecraftforge.server.command.ForgeCommand;
import net.minecraftforge.server.command.ConfigCommand;
public class ForgeInternalHandler
{
@@ -112,6 +115,13 @@ public class ForgeInternalHandler
ForgeHooks.updateBurns();
}
@SubscribeEvent
public void onCommandsRegister(RegisterCommandsEvent event)
{
new ForgeCommand(event.getDispatcher());
ConfigCommand.register(event.getDispatcher());
}
private static LootModifierManager INSTANCE;
@SubscribeEvent
@@ -114,7 +114,6 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
modEventBus.addListener(this::gatherData);
modEventBus.register(this);
ATTRIBUTES.register(modEventBus);
MinecraftForge.EVENT_BUS.addListener(this::serverStarting);
MinecraftForge.EVENT_BUS.addListener(this::serverStopping);
MinecraftForge.EVENT_BUS.addGenericListener(SoundEvent.class, this::missingSoundMapping);
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ForgeConfig.clientSpec);
@@ -147,12 +146,6 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook
*/
}
public void serverStarting(FMLServerStartingEvent evt)
{
new ForgeCommand(evt.getCommandDispatcher());
ConfigCommand.register(evt.getCommandDispatcher());
}
public void serverStopping(FMLServerStoppingEvent evt)
{
WorldWorkerManager.clear();