Merge branch 'jei-relay-gui-handler' of https://github.com/Vexatos/OpenComputers into master-MC1.9.4

fnuecke · fnuecke · commit 809d2a433f50 · 2016-07-18T19:23:07.000+02:00
# Conflicts:
#	src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala
diff --git a/src/main/scala/li/cil/oc/client/gui/Relay.scala b/src/main/scala/li/cil/oc/client/gui/Relay.scala
@@ -27,7 +27,7 @@ import org.lwjgl.util.Rectangle
 class Relay(playerInventory: InventoryPlayer, val relay: tileentity.Relay) extends DynamicGuiContainer(new container.Relay(playerInventory, relay)) with INEIGuiHandler {
   private val format = new DecimalFormat("#.##hz")
 
-  private val tabPosition = new Rectangle(xSize, 10, 23, 26)
+  val tabPosition = new Rectangle(xSize, 10, 23, 26)
 
   override protected def drawSecondaryBackgroundLayer(): Unit = {
     super.drawSecondaryBackgroundLayer()
diff --git a/src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala b/src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala
@@ -35,32 +35,7 @@ class ModPluginOpenComputers extends IModPlugin {
     registry.addRecipeHandlers(CallbackDocHandler.CallbackDocRecipeHandler)
     registry.addRecipes(CallbackDocHandler.getRecipes(registry))
 
-    def useNBT(names: String*) = names.map(name => {
-      val info = Items.get(name)
-      Option(info.item).getOrElse(Item.getItemFromBlock(info.block))
-    }).filter(_ != null).distinct.foreach(registry.getJeiHelpers.getSubtypeRegistry.useNbtForSubtypes(_))
-
-    // Only the preconfigured blocks and items have to be here.
-    useNBT(
-      Constants.BlockName.Microcontroller,
-      Constants.BlockName.Robot,
-
-      Constants.ItemName.Drone,
-      Constants.ItemName.Tablet
-    )
-
-    registry.getJeiHelpers.getSubtypeRegistry.registerNbtInterpreter(Items.get(Constants.ItemName.Floppy).item(), new ISubtypeInterpreter {
-      override def getSubtypeInfo(stack: ItemStack): String = {
-        if (!stack.hasTagCompound) return null
-        val compound: NBTTagCompound = stack.getTagCompound
-        val data = new NBTTagCompound
-        // Separate loot disks from normal floppies
-        if (compound.hasKey(Settings.namespace + "lootFactory")) {
-          data.setTag(Settings.namespace + "lootFactory", compound.getTag(Settings.namespace + "lootFactory"))
-        }
-        if (data.hasNoTags) null else data.toString
-      }
-    })
+    registry.addAdvancedGuiHandlers(RelayGuiHandler)
   }
 
   private var stackUnderMouse: (GuiContainer, Int, Int) => Option[ItemStack] = null
@@ -70,7 +45,5 @@ class ModPluginOpenComputers extends IModPlugin {
       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/jei/RelayGuiHandler.scala b/src/main/scala/li/cil/oc/integration/jei/RelayGuiHandler.scala
@@ -0,0 +1,18 @@
+package li.cil.oc.integration.jei
+
+import java.awt.Rectangle
+import java.util
+
+import li.cil.oc.client.gui.Relay
+import mezz.jei.api.gui.IAdvancedGuiHandler
+
+import scala.collection.convert.WrapAsJava._
+
+object RelayGuiHandler extends IAdvancedGuiHandler[Relay] {
+
+  override def getGuiContainerClass: Class[Relay] = classOf[Relay]
+
+  override def getGuiExtraAreas(gui: Relay): util.List[Rectangle] = List(
+    new Rectangle(gui.windowX + gui.tabPosition.getX, gui.windowY + gui.tabPosition.getY, gui.tabPosition.getWidth, gui.tabPosition.getHeight)
+  )
+}
