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

More constants, less magic numbers!

Browse Source
This commit is contained in:
Florian Nücke 2014-06-10 00:55:48 +02:00
parent b4b7678c8a
commit 84cdff345a
17 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/client/gui/Case.scala
View File

@ -34,7 +34,7 @@ class Case(playerInventory: InventoryPlayer, val computer: tileentity.Case) exte
override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) = { override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) = {
super.drawGuiContainerForegroundLayer(mouseX, mouseY) super.drawGuiContainerForegroundLayer(mouseX, mouseY)
GL11.glPushAttrib(0xFFFFFFFF) // Me lazy... prevents NEI render glitch. GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) // Me lazy... prevents NEI render glitch.
fontRenderer.drawString( fontRenderer.drawString(
StatCollector.translateToLocal(computer.getInvName), StatCollector.translateToLocal(computer.getInvName),
8, 6, 0x404040) 8, 6, 0x404040)

2
src/main/scala/li/cil/oc/client/gui/Rack.scala
View File

@ -85,7 +85,7 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends
override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) = { override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) = {
super.drawGuiContainerForegroundLayer(mouseX, mouseY) super.drawGuiContainerForegroundLayer(mouseX, mouseY)
GL11.glPushAttrib(0xFFFFFFFF) // Prevents NEI render glitch. GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) // Prevents NEI render glitch.
fontRenderer.drawString( fontRenderer.drawString(
StatCollector.translateToLocal(rack.getInvName), StatCollector.translateToLocal(rack.getInvName),

2
src/main/scala/li/cil/oc/client/gui/Robot.scala
View File

@ -139,7 +139,7 @@ class Robot(playerInventory: InventoryPlayer, val robot: tileentity.Robot) exten
protected override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) { protected override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) {
drawBufferLayer() drawBufferLayer()
GL11.glPushAttrib(0xFFFFFFFF) // Me lazy... prevents NEI render glitch. GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) // Me lazy... prevents NEI render glitch.
if (isPointInRegion(powerX, powerY, powerWidth, powerHeight, mouseX, mouseY)) { if (isPointInRegion(powerX, powerY, powerWidth, powerHeight, mouseX, mouseY)) {
val tooltip = new java.util.ArrayList[String] val tooltip = new java.util.ArrayList[String]
val format = StatCollector.translateToLocal(Settings.namespace + "gui.Robot.Power") + ": %d%% (%d/%d)" val format = StatCollector.translateToLocal(Settings.namespace + "gui.Robot.Power") + ": %d%% (%d/%d)"

2
src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala
View File

@ -70,7 +70,7 @@ class RobotAssembler(playerInventory: InventoryPlayer, val assembler: tileentity
} }
override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) = { override def drawGuiContainerForegroundLayer(mouseX: Int, mouseY: Int) = {
GL11.glPushAttrib(0xFFFFFFFF) // Me lazy... prevents NEI render glitch. GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) // Me lazy... prevents NEI render glitch.
if (!assemblerContainer.isAssembling) { if (!assemblerContainer.isAssembling) {
def drawMessage(message: String) { def drawMessage(message: String) {
fontRenderer.drawString( fontRenderer.drawString(

2
src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
View File

@ -22,7 +22,7 @@ object WirelessNetworkDebugRenderer {
val py = player.lastTickPosY + (player.posY - player.lastTickPosY) * e.partialTicks val py = player.lastTickPosY + (player.posY - player.lastTickPosY) * e.partialTicks
val pz = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * e.partialTicks val pz = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * e.partialTicks
GL11.glPushAttrib(0xFFFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
GL11.glPushMatrix() GL11.glPushMatrix()
GL11.glTranslated(-px, -py, -pz) GL11.glTranslated(-px, -py, -pz)
RenderState.makeItBlend() RenderState.makeItBlend()

2
src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
View File

@ -194,7 +194,7 @@ object BlockRenderer extends ISimpleBlockRenderingHandler {
renderFaceZPos(block, metadata, renderer) renderFaceZPos(block, metadata, renderer)
renderFaceZNeg(block, metadata, renderer) renderFaceZNeg(block, metadata, renderer)
GL11.glPushAttrib(0xFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.makeItBlend() RenderState.makeItBlend()
RenderState.disableLighting() RenderState.disableLighting()

2
src/main/scala/li/cil/oc/client/renderer/item/ItemRenderer.scala
View File

@ -70,6 +70,7 @@ object ItemRenderer extends IItemRenderer {
val res = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight) val res = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight)
val fontRenderer = renderItem.getFontRendererFromRenderManager val fontRenderer = renderItem.getFontRendererFromRenderManager
if (fontRenderer != null && res.getScaleFactor > 1) { if (fontRenderer != null && res.getScaleFactor > 1) {
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
GL11.glPushMatrix() GL11.glPushMatrix()
GL11.glTranslatef(4f + 2f / res.getScaleFactor, 9f + 2f / res.getScaleFactor, 0) GL11.glTranslatef(4f + 2f / res.getScaleFactor, 9f + 2f / res.getScaleFactor, 0)
GL11.glScalef(1f / res.getScaleFactor, 1f / res.getScaleFactor, 1f) GL11.glScalef(1f / res.getScaleFactor, 1f / res.getScaleFactor, 1f)
@ -85,6 +86,7 @@ object ItemRenderer extends IItemRenderer {
GL11.glTranslatef(0, fontRenderer.FONT_HEIGHT, 0) GL11.glTranslatef(0, fontRenderer.FONT_HEIGHT, 0)
} }
GL11.glPopMatrix() GL11.glPopMatrix()
GL11.glPopAttrib()
} }
} }
} }

2
src/main/scala/li/cil/oc/client/renderer/tileentity/CaseRenderer.scala
View File

@ -13,7 +13,7 @@ object CaseRenderer extends TileEntitySpecialRenderer {
override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) { override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
val computer = tileEntity.asInstanceOf[Case] val computer = tileEntity.asInstanceOf[Case]
if (computer.isRunning) { if (computer.isRunning) {
GL11.glPushAttrib(0xFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.disableLighting() RenderState.disableLighting()
RenderState.makeItBlend() RenderState.makeItBlend()

2
src/main/scala/li/cil/oc/client/renderer/tileentity/ChargerRenderer.scala
View File

@ -14,7 +14,7 @@ object ChargerRenderer extends TileEntitySpecialRenderer {
override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) { override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
val charger = tileEntity.asInstanceOf[Charger] val charger = tileEntity.asInstanceOf[Charger]
if (charger.chargeSpeed > 0) { if (charger.chargeSpeed > 0) {
GL11.glPushAttrib(0xFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.disableLighting() RenderState.disableLighting()
RenderState.makeItBlend() RenderState.makeItBlend()

2
src/main/scala/li/cil/oc/client/renderer/tileentity/DisassemblerRenderer.scala
View File

@ -13,7 +13,7 @@ object DisassemblerRenderer extends TileEntitySpecialRenderer {
override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) { override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
val disassembler = tileEntity.asInstanceOf[tileentity.Disassembler] val disassembler = tileEntity.asInstanceOf[tileentity.Disassembler]
if (disassembler.isActive) { if (disassembler.isActive) {
GL11.glPushAttrib(0xFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.disableLighting() RenderState.disableLighting()
RenderState.makeItBlend() RenderState.makeItBlend()

2
src/main/scala/li/cil/oc/client/renderer/tileentity/GeolyzerRenderer.scala
View File

@ -10,7 +10,7 @@ import li.cil.oc.client.Textures
object GeolyzerRenderer extends TileEntitySpecialRenderer { object GeolyzerRenderer extends TileEntitySpecialRenderer {
override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) { override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
GL11.glPushAttrib(0xFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.disableLighting() RenderState.disableLighting()
RenderState.makeItBlend() RenderState.makeItBlend()

2
src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
View File

@ -31,7 +31,7 @@ object HologramRenderer extends TileEntitySpecialRenderer with Callable[Int] wit
hologram = te.asInstanceOf[Hologram] hologram = te.asInstanceOf[Hologram]
if (!hologram.hasPower) return if (!hologram.hasPower) return
GL11.glPushAttrib(0xFFFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.makeItBlend() RenderState.makeItBlend()
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE) GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE)

2
src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala
View File

@ -13,7 +13,7 @@ object PowerDistributorRenderer extends TileEntitySpecialRenderer {
override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) { override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
val distributor = tileEntity.asInstanceOf[tileentity.PowerDistributor] val distributor = tileEntity.asInstanceOf[tileentity.PowerDistributor]
if (distributor.globalBuffer > 0) { if (distributor.globalBuffer > 0) {
GL11.glPushAttrib(0xFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.disableLighting() RenderState.disableLighting()
RenderState.makeItBlend() RenderState.makeItBlend()

2
src/main/scala/li/cil/oc/client/renderer/tileentity/RackRenderer.scala
View File

@ -13,7 +13,7 @@ object RackRenderer extends TileEntitySpecialRenderer {
override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) = { override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) = {
val rack = tileEntity.asInstanceOf[Rack] val rack = tileEntity.asInstanceOf[Rack]
if (rack.anyRunning) { if (rack.anyRunning) {
GL11.glPushAttrib(0xFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.disableLighting() RenderState.disableLighting()
RenderState.makeItBlend() RenderState.makeItBlend()

2
src/main/scala/li/cil/oc/client/renderer/tileentity/RobotAssemblerRenderer.scala
View File

@ -13,7 +13,7 @@ object RobotAssemblerRenderer extends TileEntitySpecialRenderer {
override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) { override def renderTileEntityAt(tileEntity: TileEntity, x: Double, y: Double, z: Double, f: Float) {
val assembler = tileEntity.asInstanceOf[RobotAssembler] val assembler = tileEntity.asInstanceOf[RobotAssembler]
GL11.glPushAttrib(0xFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.disableLighting() RenderState.disableLighting()
RenderState.makeItBlend() RenderState.makeItBlend()

2
src/main/scala/li/cil/oc/client/renderer/tileentity/RouterRenderer.scala
View File

@ -14,7 +14,7 @@ object RouterRenderer extends TileEntitySpecialRenderer {
val router = tileEntity.asInstanceOf[tileentity.Router] val router = tileEntity.asInstanceOf[tileentity.Router]
val activity = math.max(0, 1 - (System.currentTimeMillis() - router.lastMessage) / 1000.0) val activity = math.max(0, 1 - (System.currentTimeMillis() - router.lastMessage) / 1000.0)
if (activity > 0) { if (activity > 0) {
GL11.glPushAttrib(0xFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.disableLighting() RenderState.disableLighting()
RenderState.makeItBlend() RenderState.makeItBlend()

2
src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
View File

@ -44,7 +44,7 @@ object ScreenRenderer extends TileEntitySpecialRenderer {
return return
} }
GL11.glPushAttrib(0xFFFFFF) GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
RenderState.disableLighting() RenderState.disableLighting()
RenderState.makeItBlend() RenderState.makeItBlend()