Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
This commit is contained in:
commit
322b0a7da7
2 changed files with 20 additions and 1 deletions
|
@ -326,7 +326,7 @@ public class BusRenderHelper implements IPartRenderHelper
|
|||
@Override
|
||||
public void setFacesToRender(EnumSet<ForgeDirection> faces)
|
||||
{
|
||||
BusRenderer.instance.renderer.faces = faces;
|
||||
BusRenderer.instance.renderer.renderFaces = faces;
|
||||
}
|
||||
|
||||
public void renderBlockCurrentBounds(int x, int y, int z, RenderBlocks renderer)
|
||||
|
|
|
@ -20,6 +20,7 @@ public class RenderBlocksWorkaround extends RenderBlocks
|
|||
{
|
||||
|
||||
public boolean calculations = true;
|
||||
public EnumSet<ForgeDirection> renderFaces = EnumSet.allOf( ForgeDirection.class );
|
||||
public EnumSet<ForgeDirection> faces = EnumSet.allOf( ForgeDirection.class );
|
||||
|
||||
private class LightingCache implements ISimplifiedBundle
|
||||
|
@ -302,6 +303,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
|
|||
{
|
||||
if ( faces.contains( ForgeDirection.WEST ) )
|
||||
{
|
||||
if ( !renderFaces.contains( ForgeDirection.WEST ) )
|
||||
return;
|
||||
|
||||
if ( isFacade )
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
|
@ -353,6 +357,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
|
|||
{
|
||||
if ( faces.contains( ForgeDirection.EAST ) )
|
||||
{
|
||||
if ( !renderFaces.contains( ForgeDirection.EAST ) )
|
||||
return;
|
||||
|
||||
if ( isFacade )
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
|
@ -432,6 +439,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
|
|||
{
|
||||
if ( faces.contains( ForgeDirection.DOWN ) )
|
||||
{
|
||||
if ( !renderFaces.contains( ForgeDirection.DOWN ) )
|
||||
return;
|
||||
|
||||
if ( isFacade )
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
|
@ -483,6 +493,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
|
|||
{
|
||||
if ( faces.contains( ForgeDirection.UP ) )
|
||||
{
|
||||
if ( !renderFaces.contains( ForgeDirection.UP ) )
|
||||
return;
|
||||
|
||||
if ( isFacade )
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
|
@ -534,6 +547,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
|
|||
{
|
||||
if ( faces.contains( ForgeDirection.NORTH ) )
|
||||
{
|
||||
if ( !renderFaces.contains( ForgeDirection.NORTH ) )
|
||||
return;
|
||||
|
||||
if ( isFacade )
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
|
@ -585,6 +601,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
|
|||
{
|
||||
if ( faces.contains( ForgeDirection.SOUTH ) )
|
||||
{
|
||||
if ( !renderFaces.contains( ForgeDirection.SOUTH ) )
|
||||
return;
|
||||
|
||||
if ( isFacade )
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
|
|
Loading…
Reference in a new issue