From 1f4c5b005889d5f665b1d36ef106fec383ff8e1a Mon Sep 17 00:00:00 2001 From: miozune Date: Thu, 1 Sep 2022 23:07:31 +0900 Subject: [PATCH] Fix inventory slots not being highlighted (#9) --- src/main/java/com/gtnh/findit/FindIt.java | 6 ------ .../service/itemfinder/ClientItemFindService.java | 14 +++++++++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gtnh/findit/FindIt.java b/src/main/java/com/gtnh/findit/FindIt.java index f4eaed7..f6be170 100644 --- a/src/main/java/com/gtnh/findit/FindIt.java +++ b/src/main/java/com/gtnh/findit/FindIt.java @@ -1,6 +1,5 @@ package com.gtnh.findit; -import codechicken.nei.guihook.GuiContainerManager; import com.gtnh.findit.service.blockfinder.BlockFindService; import com.gtnh.findit.service.blockfinder.ClientBlockFindService; import com.gtnh.findit.service.cooldown.SearchCooldownService; @@ -48,11 +47,6 @@ public class FindIt { @Mod.EventHandler public void postInit(FMLPostInitializationEvent event) { - if (event.getSide() == Side.CLIENT && FindIt.isExtraUtilitiesLoaded()) { - GuiContainerManager.inputHandlers.removeIf((inputHandler) -> - inputHandler.getClass().getName().equals("com.rwtema.extrautils.nei.ping.NEIPing") - ); - } } public static SearchCooldownService getCooldownService() { diff --git a/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java b/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java index 0cf3cfd..184c394 100644 --- a/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java +++ b/src/main/java/com/gtnh/findit/service/itemfinder/ClientItemFindService.java @@ -1,7 +1,7 @@ package com.gtnh.findit.service.itemfinder; -import codechicken.nei.NEIClientUtils; import codechicken.nei.api.API; +import codechicken.nei.event.NEIConfigsLoadedEvent; import codechicken.nei.guihook.GuiContainerManager; import com.gtnh.findit.FindIt; import com.gtnh.findit.FindItNetwork; @@ -38,6 +38,7 @@ public class ClientItemFindService extends ItemFindService { GuiContainerManager.addInputHandler(new ItemFindInputHandler()); MinecraftForge.EVENT_BUS.register(new GuiListener()); + MinecraftForge.EVENT_BUS.register(new NEIEventListener()); FMLCommonHandler.instance().bus().register(new TickListener()); } @@ -141,6 +142,17 @@ public class ClientItemFindService extends ItemFindService { } } + public static class NEIEventListener { + @SubscribeEvent + public void onNEIConfigsLoaded(NEIConfigsLoadedEvent event) { + if (FindIt.isExtraUtilitiesLoaded()) { + GuiContainerManager.inputHandlers.removeIf((inputHandler) -> + inputHandler.getClass().getName().equals("com.rwtema.extrautils.nei.ping.NEIPing") + ); + } + } + } + public static ClientItemFindService getInstance() { return (ClientItemFindService) FindIt.getItemFindService(); }