AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 02:12:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Highlighting slots to indicate which items can go where in most GUIs.

Browse Source
This commit is contained in:
Florian Nücke 2014-08-28 07:54:14 +02:00
parent 75c7318784
commit 6761983cd6
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
View File

@ -2,7 +2,7 @@ package li.cil.oc.client.gui
import li.cil.oc.client.Textures import li.cil.oc.client.Textures
import li.cil.oc.common.Tier import li.cil.oc.common.Tier
import li.cil.oc.common.container.ComponentSlot import li.cil.oc.common.container.{ComponentSlot, Player}
import li.cil.oc.util.RenderState import li.cil.oc.util.RenderState
import net.minecraft.client.renderer.Tessellator import net.minecraft.client.renderer.Tessellator
import net.minecraft.client.renderer.texture.TextureMap import net.minecraft.client.renderer.texture.TextureMap
@ -10,7 +10,11 @@ import net.minecraft.inventory.{Container, Slot}
import net.minecraft.util.StatCollector import net.minecraft.util.StatCollector
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import scala.collection.convert.WrapAsScala._
abstract class DynamicGuiContainer(container: Container) extends CustomGuiContainer(container) { abstract class DynamicGuiContainer(container: Container) extends CustomGuiContainer(container) {
protected var hoveredSlot: Option[Slot] = None
override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) { override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) {
fontRenderer.drawString( fontRenderer.drawString(
StatCollector.translateToLocal("container.inventory"), StatCollector.translateToLocal("container.inventory"),
@ -22,15 +26,25 @@ abstract class DynamicGuiContainer(container: Container) extends CustomGuiContai
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize) drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize)
} }
override def drawScreen(mouseX: Int, mouseY: Int, dt: Float) {
hoveredSlot = (inventorySlots.inventorySlots collect {
case slot: Slot if isPointInRegion(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX, mouseY) => slot
}).headOption
super.drawScreen(mouseX, mouseY, dt)
}
override def drawSlotInventory(slot: Slot) { override def drawSlotInventory(slot: Slot) {
slot match { slot match {
case component: ComponentSlot if component.tier == Tier.None => // Ignore. case component: ComponentSlot if component.tier == Tier.None => // Ignore.
case _ => case _ =>
if (slot.slotNumber < container.inventorySlots.size() - 36) { if (!isInPlayerInventory(slot)) {
GL11.glDisable(GL11.GL_DEPTH_TEST)
GL11.glDisable(GL11.GL_LIGHTING) GL11.glDisable(GL11.GL_LIGHTING)
drawSlotBackground(slot.xDisplayPosition - 1, slot.yDisplayPosition - 1) drawSlotBackground(slot.xDisplayPosition - 1, slot.yDisplayPosition - 1)
GL11.glEnable(GL11.GL_LIGHTING) GL11.glEnable(GL11.GL_LIGHTING)
GL11.glEnable(GL11.GL_DEPTH_TEST)
} }
RenderState.makeItBlend() RenderState.makeItBlend()
super.drawSlotInventory(slot) super.drawSlotInventory(slot)
GL11.glDisable(GL11.GL_BLEND) GL11.glDisable(GL11.GL_BLEND)
@ -44,6 +58,21 @@ abstract class DynamicGuiContainer(container: Container) extends CustomGuiContai
GL11.glEnable(GL11.GL_DEPTH_TEST) GL11.glEnable(GL11.GL_DEPTH_TEST)
case _ => case _ =>
} }
if (mc.thePlayer.inventory.getItemStack == null) hoveredSlot.foreach(hovered => {
val currentIsInPlayerInventory = isInPlayerInventory(slot)
val hoveredIsInPlayerInventory = isInPlayerInventory(hovered)
if (currentIsInPlayerInventory != hoveredIsInPlayerInventory) {
if ((currentIsInPlayerInventory && slot.getHasStack && hovered.isItemValid(slot.getStack)) ||
(hoveredIsInPlayerInventory && hovered.getHasStack && slot.isItemValid(hovered.getStack))) {
GL11.glDisable(GL11.GL_DEPTH_TEST)
GL11.glDisable(GL11.GL_LIGHTING)
drawGradientRect(slot.xDisplayPosition, slot.yDisplayPosition, slot.xDisplayPosition + 16, slot.yDisplayPosition + 16, 0x80FFFFFF, 0x80FFFFFF)
GL11.glEnable(GL11.GL_LIGHTING)
GL11.glEnable(GL11.GL_DEPTH_TEST)
}
}
})
} }
} }
@ -58,4 +87,9 @@ abstract class DynamicGuiContainer(container: Container) extends CustomGuiContai
t.addVertexWithUV(x, y, zLevel, 0, 0) t.addVertexWithUV(x, y, zLevel, 0, 0)
t.draw() t.draw()
} }
private def isInPlayerInventory(slot: Slot) = container match {
case player: Player => slot.inventory == player.playerInventory
case _ => false
}
} }