AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-28 07:25:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix for the render bug in mc 1.7.2 that flips textures horizontally on +x and -z, closes #114

Browse Source
This commit is contained in:
Florian Nücke 2014-03-26 19:14:49 +01:00
parent 3a9c6d2b14
commit 56d76c5fb9
1 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,8 @@
package li.cil.oc.client.renderer.block package li.cil.oc.client.renderer.block
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler
import cpw.mods.fml.common.Loader
import li.cil.oc.Blocks
import li.cil.oc.client.renderer.tileentity.{CableRenderer, RobotRenderer} import li.cil.oc.client.renderer.tileentity.{CableRenderer, RobotRenderer}
import li.cil.oc.common.block._ import li.cil.oc.common.block._
import li.cil.oc.common.tileentity import li.cil.oc.common.tileentity
@ -10,8 +12,6 @@ import net.minecraft.util.IIcon
import net.minecraft.world.IBlockAccess import net.minecraft.world.IBlockAccess
import net.minecraftforge.common.util.ForgeDirection import net.minecraftforge.common.util.ForgeDirection
import org.lwjgl.opengl.GL11 import org.lwjgl.opengl.GL11
import li.cil.oc.Blocks
import scala.Some
object BlockRenderer extends ISimpleBlockRenderingHandler { object BlockRenderer extends ISimpleBlockRenderingHandler {
var getRenderId = -1 var getRenderId = -1
@ -60,7 +60,8 @@ object BlockRenderer extends ISimpleBlockRenderingHandler {
GL11.glPopMatrix() GL11.glPopMatrix()
} }
override def renderWorldBlock(world: IBlockAccess, x: Int, y: Int, z: Int, block: Block, modelId: Int, renderer: RenderBlocks) = override def renderWorldBlock(world: IBlockAccess, x: Int, y: Int, z: Int, block: Block, modelId: Int, realRenderer: RenderBlocks) = {
val renderer = patchedRenderer(realRenderer)
world.getTileEntity(x, y, z) match { world.getTileEntity(x, y, z) match {
case keyboard: tileentity.Keyboard => case keyboard: tileentity.Keyboard =>
if (keyboard.facing == ForgeDirection.UP || keyboard.facing == ForgeDirection.DOWN) { if (keyboard.facing == ForgeDirection.UP || keyboard.facing == ForgeDirection.DOWN) {
@ -142,4 +143,47 @@ object BlockRenderer extends ISimpleBlockRenderingHandler {
true true
case _ => renderer.renderStandardBlock(block, x, y, z) case _ => renderer.renderStandardBlock(block, x, y, z)
} }
}
val isOneSevenTwo = Loader.instance.getMinecraftModContainer.getVersion == "1.7.2"
def patchedRenderer(renderer: RenderBlocks) = if (isOneSevenTwo) {
PatchedRenderBlocks.blockAccess = renderer.blockAccess
PatchedRenderBlocks.overrideBlockTexture = renderer.overrideBlockTexture
PatchedRenderBlocks.flipTexture = renderer.flipTexture
PatchedRenderBlocks.renderAllFaces = renderer.renderAllFaces
PatchedRenderBlocks.useInventoryTint = renderer.useInventoryTint
PatchedRenderBlocks.renderFromInside = renderer.renderFromInside
PatchedRenderBlocks.renderMinX = renderer.renderMinX
PatchedRenderBlocks.renderMaxX = renderer.renderMaxX
PatchedRenderBlocks.renderMinY = renderer.renderMinY
PatchedRenderBlocks.renderMaxY = renderer.renderMaxY
PatchedRenderBlocks.renderMinZ = renderer.renderMinZ
PatchedRenderBlocks.renderMaxZ = renderer.renderMaxZ
PatchedRenderBlocks.lockBlockBounds = renderer.lockBlockBounds
PatchedRenderBlocks.partialRenderBounds = renderer.partialRenderBounds
PatchedRenderBlocks.uvRotateEast = renderer.uvRotateEast
PatchedRenderBlocks.uvRotateWest = renderer.uvRotateWest
PatchedRenderBlocks.uvRotateSouth = renderer.uvRotateSouth
PatchedRenderBlocks.uvRotateNorth = renderer.uvRotateNorth
PatchedRenderBlocks.uvRotateTop = renderer.uvRotateTop
PatchedRenderBlocks.uvRotateBottom = renderer.uvRotateBottom
PatchedRenderBlocks
}
else renderer
object PatchedRenderBlocks extends RenderBlocks {
override def renderFaceXPos(block: Block, x: Double, y: Double, z: Double, texture: IIcon) {
flipTexture = !flipTexture
super.renderFaceXPos(block, x, y, z, texture)
flipTexture = !flipTexture
}
override def renderFaceZNeg(block: Block, x: Double, y: Double, z: Double, texture: IIcon) {
flipTexture = !flipTexture
super.renderFaceZNeg(block, x, y, z, texture)
flipTexture = !flipTexture
}
}
} }