Registered forge events on both MinecraftForge.EVENT_BUS and FMLCommonHandler.instance().bus().

This commit is contained in:
luisc committed 2021-12-23 10:26:46 -06:00
1 parent ce9b9fb59d
commit e5edbe002e
3 files changed
+4 -12

No files matched your search

+4 -1
View File
@@ -180,7 +180,10 @@ public class CustomNpcs {
MinecraftForge.EVENT_BUS.register(scriptPlayerEventHandler);
FMLCommonHandler.instance().bus().register(scriptPlayerEventHandler);
FMLCommonHandler.instance().bus().register(new ScriptForgeEventHandler().registerForgeEvents());
ScriptForgeEventHandler forgeEventHandler = new ScriptForgeEventHandler();
MinecraftForge.EVENT_BUS.register(forgeEventHandler.registerForgeEvents());
FMLCommonHandler.instance().bus().register(forgeEventHandler.registerForgeEvents());
FMLCommonHandler.instance().bus().register(new ServerTickHandler());
registerNpc(EntityNPCHumanMale.class, "npchumanmale");
@@ -69,13 +69,6 @@ public class ServerEventsHandler {
// exps.put(player.getCommandSenderName(), player.experienceTotal);
// }
@SubscribeEvent
public void invoke(CommandEvent event){
if(CustomNpcs.getServer() != null && ScriptController.Instance.forgeScripts.isEnabled()) {
EventHooks.onForgeEvent(new ForgeEvent(event), event);
}
}
@SubscribeEvent
public void invoke(EntityInteractEvent event) {
ItemStack item = event.entityPlayer.getCurrentEquippedItem();
@@ -170,10 +170,6 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
}
}
}
String eventName = CommandEvent.class.getName();
int i = eventName.lastIndexOf(".");
eventName = StringUtils.uncapitalize(eventName.substring(i + 1).replace("$", ""));
hookList.add(eventName);
}
hooks.setUnsortedList(hookList);
addScroll(hooks);