diff --git a/dependencies.gradle b/dependencies.gradle index 83560dd..c902972 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,6 +4,7 @@ dependencies { // compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-527-GTNH:dev") compile("com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev") compile("com.github.GTNewHorizons:NotEnoughItems:2.7.23-GTNH:dev") + compile("com.github.GTNewHorizons:FindIt:1.3.10:dev") // compile("com.github.GTNewHorizons:Baubles:1.0.4:dev") // compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.7:dev") diff --git a/src/main/java/me/towdium/jecalculation/event/handlers/NEIEventHandler.java b/src/main/java/me/towdium/jecalculation/event/handlers/NEIEventHandler.java index 5230da5..bda588d 100644 --- a/src/main/java/me/towdium/jecalculation/event/handlers/NEIEventHandler.java +++ b/src/main/java/me/towdium/jecalculation/event/handlers/NEIEventHandler.java @@ -3,15 +3,20 @@ package me.towdium.jecalculation.event.handlers; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; +import com.gtnh.findit.FindIt; + import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; import codechicken.nei.guihook.IContainerInputHandler; +import cpw.mods.fml.common.Loader; import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.gui.JecaGui; import me.towdium.jecalculation.nei.NEIPlugin; public class NEIEventHandler implements IContainerInputHandler { + private static final boolean isFindItLoaded = Loader.isModLoaded("findit"); + @Override public boolean keyTyped(GuiContainer guiContainer, char c, int i) { return false; @@ -20,6 +25,10 @@ public class NEIEventHandler implements IContainerInputHandler { @Override public void onKeyTyped(GuiContainer guiContainer, char c, int i) {} + protected String getFindItKeyBind() { + return FindIt.isExtraUtilitiesLoaded() ? "gui.xu_ping" : "gui.findit.find_item"; + } + @Override public boolean lastKeyTyped(GuiContainer guiContainer, char keyChar, int keyCode) { if (guiContainer == Minecraft.getMinecraft().currentScreen && guiContainer instanceof JecaGui) { @@ -35,6 +44,11 @@ public class NEIEventHandler implements IContainerInputHandler { if (keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) { return NEIPlugin.openRecipeGui(stack, false); } + if (isFindItLoaded) { + if (keyCode == NEIClientConfig.getKeyBinding(getFindItKeyBind())) { + return NEIPlugin.findItem(stack); + } + } return false; } diff --git a/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java b/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java index 60b3a26..2495a69 100644 --- a/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java +++ b/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java @@ -5,6 +5,9 @@ import java.lang.reflect.Method; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import com.gtnh.findit.FindItNetwork; +import com.gtnh.findit.service.itemfinder.FindItemRequest; + import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; @@ -106,4 +109,19 @@ public class NEIPlugin { } return false; } + + public static boolean findItem(Object rep) { + if (rep instanceof FluidStack) { + ItemStack itemStack = FluidStackToItemStack.getItemStack((FluidStack) rep); + if (itemStack != null) { + rep = itemStack; + } + } + if (rep instanceof ItemStack) { + FindItNetwork.CHANNEL.sendToServer(new FindItemRequest((ItemStack) rep)); + + } + return true; + } + }