Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
SenseiKiwi 2014-05-05 19:55:43 -04:00
commit ef2e9cc561
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
View file

@ -178,8 +178,9 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
TileEntity tile = world.getBlockTileEntity(x, y, z);
if (tile instanceof TileEntityDimDoor)
{
int metadata = world.getBlockMetadata(x, y, z);
TileEntityDimDoor dimTile = (TileEntityDimDoor) tile;
dimTile.openOrClosed = this.isDoorOnRift(world, x, y, z);
dimTile.openOrClosed = this.isDoorOnRift(world, x, y, z)&&this.isUpperDoorBlock(metadata);
dimTile.orientation = this.getFullMetadata(world, x, y, z) & 7;
}
return this;

34
src/main/java/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java
View file

@ -213,50 +213,50 @@ public class RenderDimDoor extends TileEntitySpecialRenderer
{
case 0:
GL11.glVertex3d(x + .01F, y, z);
GL11.glVertex3d(x + .01, y , z + 1.0D);
GL11.glVertex3d(x + .01F, y - 1, z);
GL11.glVertex3d(x + .01, y - 1, z + 1.0D);
GL11.glVertex3d(x + .01, y + 1, z + 1.0D);
GL11.glVertex3d(x + .01, y + 1, z);
break;
case 1:
GL11.glVertex3d(x, y + 1, z + .01);
GL11.glVertex3d(x + 1, y + 1, z + .01);
GL11.glVertex3d(x + 1, y , z + .01);
GL11.glVertex3d(x, y , z + .01);
GL11.glVertex3d(x + 1, y -1, z + .01);
GL11.glVertex3d(x, y -1, z + .01);
break;
case 2:
GL11.glVertex3d(x + .99, y + 1, z);
GL11.glVertex3d(x + .99, y + 1, z + 1.0D);
GL11.glVertex3d(x + .99, y , z + 1.0D);
GL11.glVertex3d(x + .99, y , z);
GL11.glVertex3d(x + .99, y - 1, z + 1.0D);
GL11.glVertex3d(x + .99, y - 1, z);
break;
case 3:
GL11.glVertex3d(x, y , z + .99);
GL11.glVertex3d(x + 1, y , z + .99);
GL11.glVertex3d(x, y -1, z + .99);
GL11.glVertex3d(x + 1, y -1, z + .99);
GL11.glVertex3d(x + 1, y + 1, z + .99);
GL11.glVertex3d(x, y + 1, z + .99);
break;
case 4:
GL11.glVertex3d(x + .15F, y , z);
GL11.glVertex3d(x + .15, y , z + 1.0D);
GL11.glVertex3d(x + .15F, y - 1 , z);
GL11.glVertex3d(x + .15, y - 1, z + 1.0D);
GL11.glVertex3d(x + .15, y + 1, z + 1.0D);
GL11.glVertex3d(x + .15, y + 1, z);
break;
case 5:
GL11.glVertex3d(x, y + 1, z + .15);
GL11.glVertex3d(x + 1, y + 1, z + .15);
GL11.glVertex3d(x + 1, y , z + .15);
GL11.glVertex3d(x, y , z + .15);
GL11.glVertex3d(x + 1, y - 1, z + .15);
GL11.glVertex3d(x, y - 1, z + .15);
break;
case 6:
GL11.glVertex3d(x + .85, y + 1, z);
GL11.glVertex3d(x + .85, y + 1, z + 1.0D);
GL11.glVertex3d(x + .85, y , z + 1.0D);
GL11.glVertex3d(x + .85, y , z);
GL11.glVertex3d(x + .85, y - 1, z + 1.0D);
GL11.glVertex3d(x + .85, y - 1, z);
break;
case 7:
GL11.glVertex3d(x, y , z + .85);
GL11.glVertex3d(x + 1, y , z + .85);
GL11.glVertex3d(x, y - 1, z + .85);
GL11.glVertex3d(x + 1, y - 1, z + .85);
GL11.glVertex3d(x + 1, y + 1, z + .85);
GL11.glVertex3d(x, y + 1, z + .85);
break;
@ -307,4 +307,4 @@ public class RenderDimDoor extends TileEntitySpecialRenderer
}
}
}
}
}