Skip to content

fix(render): adapt hodgepodge fixBottomFaceUV #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boubou19 merged 3 commits into from
Jan 5, 2026
Merged

fix(render): adapt hodgepodge fixBottomFaceUV #171

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15f958f
fix(render): adapt hodgepodge fixBottomFaceUV
leagris Jan 2, 2026
2cdbd92
Merge branch 'master' into fixBottomFaceUV
boubou19 Jan 5, 2026
dd0eb73
Merge branch 'master' into fixBottomFaceUV
Dream-Master Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/main/scala/li/cil/oc/common/block/Screen.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package li.cil.oc.common.block

import java.util

import cpw.mods.fml.relauncher.Side
import cpw.mods.fml.relauncher.SideOnly
import li.cil.oc.Constants
Expand All @@ -20,6 +19,7 @@ import net.minecraft.entity.EntityLivingBase
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.entity.projectile.EntityArrow
import net.minecraft.item.ItemStack
import net.minecraft.launchwrapper.Launch
import net.minecraft.util.IIcon
import net.minecraft.world.IBlockAccess
import net.minecraft.world.World
Expand Down Expand Up @@ -115,10 +115,13 @@ class Screen(val tier: Int) extends RedstoneAware {
def tv = Array(Icons.bvb, Icons.bvm, Icons.bvt)
}

private final val fixedBottomFaceUV: Boolean = java.lang.Boolean.TRUE.equals(Launch.blackboard.get("hodgepodge.FixesConfig.fixBottomFaceUV"))

// This an ugly monstrosity, but it's still better than having to manually
// compute ambient occlusion in a custom block renderer to keep the lighting
// pretty... which would be even more grotesque.
override def getIcon(world: IBlockAccess, x: Int, y: Int, z: Int, worldSide: ForgeDirection, localSide: ForgeDirection) =
override def getIcon(world: IBlockAccess, x: Int, y: Int, z: Int, worldSide: ForgeDirection, localSide: ForgeDirection) = {
val unflipDown = worldSide == ForgeDirection.DOWN && fixedBottomFaceUV
world.getTileEntity(x, y, z) match {
case screen: tileentity.Screen if screen.width > 1 || screen.height > 1 =>
val right = screen.width - 1
Expand All @@ -128,24 +131,24 @@ class Screen(val tier: Int) extends RedstoneAware {
case ForgeDirection.NORTH => (px, py)
case ForgeDirection.UP => screen.yaw match {
case ForgeDirection.SOUTH =>
(px, py)
if (unflipDown) (right - px, py) else (px, py)
case ForgeDirection.NORTH =>
(right - px, bottom - py)
if (unflipDown) (px, bottom - py) else (right - px, bottom - py)
case ForgeDirection.EAST =>
(right - px, py)
if (unflipDown) (right - px, bottom - py) else (right - px, py)
case ForgeDirection.WEST =>
(px, bottom - py)
if (unflipDown) (px, py) else (px, bottom - py)
case _ => throw new AssertionError("yaw has invalid value")
}
case ForgeDirection.DOWN => screen.yaw match {
case ForgeDirection.SOUTH =>
(px, bottom - py)
if (unflipDown) (right - px, bottom - py) else (px, bottom - py)
case ForgeDirection.NORTH =>
(right - px, py)
if (unflipDown) (px, py) else (right - px, py)
case ForgeDirection.EAST =>
(right - px, bottom - py)
if (unflipDown) (right - px, py) else (right - px, bottom - py)
case ForgeDirection.WEST =>
(px, py)
if (unflipDown) (px, bottom - py) else (px, py)
case _ => throw new AssertionError("yaw has invalid value")
}
case _ => throw new AssertionError("pitch has invalid value")
Expand Down Expand Up @@ -219,8 +222,8 @@ class Screen(val tier: Int) extends RedstoneAware {
else (Icons.sse, Icons.snw)
val Array(t, m, b) = screen.pitch match {
case ForgeDirection.NORTH => screen.yaw match {
case ForgeDirection.SOUTH => Icons.th
case ForgeDirection.NORTH => Icons.bh
case ForgeDirection.SOUTH => if (unflipDown) Icons.bh else Icons.th
case ForgeDirection.NORTH => if (unflipDown) Icons.th else Icons.bh
case ForgeDirection.EAST => Icons.bv
case ForgeDirection.WEST => Icons.tv
case _ => throw new AssertionError("yaw has invalid value")
Expand Down Expand Up @@ -255,6 +258,7 @@ class Screen(val tier: Int) extends RedstoneAware {
}
case _ => getIcon(localSide, 0)
}
}

override def getIcon(side: ForgeDirection, metadata: Int) =
side match {
Expand Down