Partially added item highlighting for JEI.

Vexatos · Vexatos · commit d4128c7c1586 · 2016-07-16T14:09:13.000+02:00
diff --git a/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala b/src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
@@ -11,7 +11,7 @@ import li.cil.oc.common
 import li.cil.oc.common.container.ComponentSlot
 import li.cil.oc.common.container.Player
 import li.cil.oc.integration.Mods
-import li.cil.oc.integration.util.NEI
+import li.cil.oc.integration.util.ItemSearch
 import li.cil.oc.util.RenderState
 import net.minecraft.client.gui.Gui
 import net.minecraft.client.renderer.GlStateManager
@@ -77,7 +77,7 @@ abstract class DynamicGuiContainer[C <: Container](container: C) extends CustomG
     hoveredSlot = (inventorySlots.inventorySlots collect {
       case slot: Slot if isPointInRegion(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX, mouseY) => slot
     }).headOption
-    hoveredStackNEI = NEI.hoveredStack(this, mouseX, mouseY)
+    hoveredStackNEI = ItemSearch.hoveredStack(this, mouseX, mouseY)
 
     super.drawScreen(mouseX, mouseY, dt)
 
diff --git a/src/main/scala/li/cil/oc/client/gui/traits/InputBuffer.scala b/src/main/scala/li/cil/oc/client/gui/traits/InputBuffer.scala
@@ -3,7 +3,7 @@ package li.cil.oc.client.gui.traits
 import li.cil.oc.api
 import li.cil.oc.client.KeyBindings
 import li.cil.oc.client.Textures
-import li.cil.oc.integration.util.NEI
+import li.cil.oc.integration.util.ItemSearch
 import li.cil.oc.util.RenderState
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.gui.inventory.GuiContainer
@@ -71,7 +71,7 @@ trait InputBuffer extends DisplayBuffer {
   override def handleKeyboardInput() {
     super.handleKeyboardInput()
 
-    if (this.isInstanceOf[GuiContainer] && NEI.isInputFocused) return
+    if (this.isInstanceOf[GuiContainer] && ItemSearch.isInputFocused) return
 
     val code = Keyboard.getEventKey
     if (buffer != null && code != Keyboard.KEY_ESCAPE && code != Keyboard.KEY_F11) {
diff --git a/src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala b/src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala
@@ -2,24 +2,28 @@ package li.cil.oc.integration.jei
 
 import li.cil.oc.Settings
 import li.cil.oc.integration.util.ItemBlacklist
+import li.cil.oc.integration.util.ItemSearch
 import mezz.jei.api.IItemRegistry
 import mezz.jei.api.IJeiHelpers
 import mezz.jei.api.IJeiRuntime
 import mezz.jei.api.IModPlugin
 import mezz.jei.api.IModRegistry
 import mezz.jei.api.IRecipeRegistry
 import mezz.jei.api.JEIPlugin
+import net.minecraft.client.gui.inventory.GuiContainer
+import net.minecraft.item.ItemStack
 
 @JEIPlugin
 class ModPluginOpenComputers extends IModPlugin {
-  override def onJeiHelpersAvailable(jeiHelpers: IJeiHelpers): Unit = {
+
+  override def onJeiHelpersAvailable(jeiHelpers: IJeiHelpers) {
     ItemBlacklist.consumers += jeiHelpers.getItemBlacklist.addItemToBlacklist
   }
 
-  override def onItemRegistryAvailable(itemRegistry: IItemRegistry): Unit = {
+  override def onItemRegistryAvailable(itemRegistry: IItemRegistry) {
   }
 
-  override def register(registry: IModRegistry): Unit = {
+  override def register(registry: IModRegistry) {
     if (Settings.get.lootRecrafting) {
       registry.addRecipeHandlers(LootDiskCyclingRecipeHandler)
     }
@@ -36,9 +40,17 @@ class ModPluginOpenComputers extends IModPlugin {
     registry.addRecipes(CallbackDocHandler.getRecipes(registry))
   }
 
-  override def onRecipeRegistryAvailable(recipeRegistry: IRecipeRegistry): Unit = {
+  override def onRecipeRegistryAvailable(recipeRegistry: IRecipeRegistry) {
   }
 
-  override def onRuntimeAvailable(jeiRuntime: IJeiRuntime): Unit = {
+  var stackUnderMouse: (GuiContainer, Int, Int) => Option[ItemStack] = null
+
+  override def onRuntimeAvailable(jeiRuntime: IJeiRuntime) {
+    if (stackUnderMouse == null) {
+      ItemSearch.stackFocusing += ((container, mouseX, mouseY) => stackUnderMouse(container, mouseX, mouseY))
+    }
+    stackUnderMouse = (container, mouseX, mouseY) => Option(jeiRuntime.getItemListOverlay.getStackUnderMouse)
+
+    // TODO check for focused input
   }
 }
diff --git a/src/main/scala/li/cil/oc/integration/util/ItemSearch.scala b/src/main/scala/li/cil/oc/integration/util/ItemSearch.scala
@@ -0,0 +1,66 @@
+package li.cil.oc.integration.util
+
+/* TODO NEI
+import codechicken.nei.LayoutManager
+*/
+
+import li.cil.oc.integration.Mods
+import net.minecraft.client.gui.inventory.GuiContainer
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.Optional
+
+import scala.collection.mutable
+
+object ItemSearch {
+
+  val focusedInput = mutable.Set.empty[() => Boolean]
+  val stackFocusing = mutable.Set.empty[(GuiContainer, Int, Int) => Option[ItemStack]]
+
+  def isInputFocused: Boolean = {
+    if (Mods.NotEnoughItems.isAvailable) {
+      initNEI()
+    }
+    for (f <- focusedInput) {
+      if (f()) return true
+    }
+    false
+  }
+
+  def hoveredStack(container: GuiContainer, mouseX: Int, mouseY: Int): Option[ItemStack] = {
+    if (Mods.NotEnoughItems.isAvailable) {
+      initNEI()
+    }
+    for (f <- stackFocusing) {
+      f(container, mouseX, mouseY).foreach(stack => return Option(stack))
+    }
+    None
+  }
+
+  // NEI
+
+  private var neiHoveredStack: (GuiContainer, Int, Int) => Option[ItemStack] = null
+  private var neiInputFocused: () => Boolean = null
+
+  @Optional.Method(modid = Mods.NotEnoughItems.id)
+  private def initNEI() {
+    if (neiInputFocused == null) {
+      neiInputFocused = () => try isInputFocused0 catch {
+        case _: Throwable => false
+      }
+      focusedInput += neiInputFocused
+    }
+    if (neiHoveredStack == null) {
+      neiHoveredStack = (container, mouseX, mouseY) =>
+        try Option(hoveredStack0(container, mouseX, mouseY)) catch {
+          case t: Throwable => None
+        }
+      stackFocusing += neiHoveredStack
+    }
+  }
+
+  @Optional.Method(modid = Mods.NotEnoughItems.id)
+  private def isInputFocused0 = false // TODO NEI LayoutManager.getInputFocused != null
+
+  @Optional.Method(modid = Mods.NotEnoughItems.id)
+  private def hoveredStack0(container: GuiContainer, mouseX: Int, mouseY: Int) = null: ItemStack // TODO NEI LayoutManager.instance.getStackUnderMouse(container, mouseX, mouseY)
+}
diff --git a/src/main/scala/li/cil/oc/integration/util/NEI.scala b/src/main/scala/li/cil/oc/integration/util/NEI.scala
