Skip to content

Commit

Permalink
Updating to 1.7.10 :D Fixing glass
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Behrhof committed Jun 26, 2014
1 parent bef0d9f commit 6ca6f9e
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 52 deletions.
6 changes: 3 additions & 3 deletions build.properties
View file
@@ -1,7 +1,7 @@
minecraft_version=1.7.10_pre4
minecraft_version=1.7.10
minecraft_version_old=1.7.2
forge_version=10.12.2.1143-prerelease
mantle_version=150.1d8388b
forge_version=10.13.0.1151
mantle_version=152.e3820d9
FMP_version=1.1.0.268
CCLIB_version=1.1.0.77
NEI_version=1.0.1
Expand Down
51 changes: 22 additions & 29 deletions src/main/java/tconstruct/blocks/GlassBlockConnected.java
View file
Expand Up @@ -61,18 +61,11 @@ public int getRenderBlockPass ()

/**
* This is checked to see if the texture should connect to this block
*
* @param par2
* x
* @param par3
* y
* @param par4
* z
* @param par5
* ID this block is asking to connect to (may be 0 if there is no
* block)
* @param par6
* Metadata of the block this block is trying to connect to
* @param par2 x
* @param par3 y
* @param par4 z
* @param par5 ID this block is asking to connect to (may be 0 if there is no block)
* @param par6 Metadata of the block this block is trying to connect to
* @return true if should connect
*/
public boolean shouldConnectToBlock (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, int par6)
Expand Down Expand Up @@ -371,11 +364,11 @@ else if (isOpenRight)
}
else if (isOpenUp && isOpenDown && isOpenLeft)
{
return icons[13];
return icons[14];
}
else if (isOpenUp && isOpenDown && isOpenRight)
{
return icons[14];
return icons[13];
}
else if (isOpenUp && isOpenLeft && isOpenRight)
{
Expand All @@ -395,19 +388,19 @@ else if (isOpenLeft && isOpenRight)
}
else if (isOpenDown && isOpenLeft)
{
return icons[9];
return icons[10];
}
else if (isOpenDown && isOpenRight)
{
return icons[10];
return icons[9];
}
else if (isOpenUp && isOpenLeft)
{
return icons[7];
return icons[8];
}
else if (isOpenUp && isOpenRight)
{
return icons[8];
return icons[7];
}
else if (isOpenDown)
{
Expand All @@ -419,11 +412,11 @@ else if (isOpenUp)
}
else if (isOpenLeft)
{
return icons[4];
return icons[3];
}
else if (isOpenRight)
{
return icons[3];
return icons[4];
}
break;
case 4:
Expand Down Expand Up @@ -535,11 +528,11 @@ else if (isOpenRight)
}
else if (isOpenUp && isOpenDown && isOpenLeft)
{
return icons[14];
return icons[13];
}
else if (isOpenUp && isOpenDown && isOpenRight)
{
return icons[13];
return icons[14];
}
else if (isOpenUp && isOpenLeft && isOpenRight)
{
Expand All @@ -559,19 +552,19 @@ else if (isOpenLeft && isOpenRight)
}
else if (isOpenDown && isOpenLeft)
{
return icons[10];
return icons[9];
}
else if (isOpenDown && isOpenRight)
{
return icons[9];
return icons[10];
}
else if (isOpenUp && isOpenLeft)
{
return icons[8];
return icons[7];
}
else if (isOpenUp && isOpenRight)
{
return icons[7];
return icons[8];
}
else if (isOpenDown)
{
Expand All @@ -583,11 +576,11 @@ else if (isOpenUp)
}
else if (isOpenLeft)
{
return icons[3];
return icons[4];
}
else if (isOpenRight)
{
return icons[4];
return icons[3];
}
break;
}
Expand Down Expand Up @@ -648,4 +641,4 @@ public boolean canPlaceTorchOnTop (World world, int x, int y, int z)
{
return true;
}
}
}
35 changes: 15 additions & 20 deletions src/main/java/tconstruct/blocks/GlassPaneConnected.java
View file
Expand Up @@ -338,11 +338,11 @@ else if (isOpenRight)
}
else if (isOpenUp && isOpenDown && isOpenLeft)
{
return icons[13];
return icons[14];
}
else if (isOpenUp && isOpenDown && isOpenRight)
{
return icons[14];
return icons[13];
}
else if (isOpenUp && isOpenLeft && isOpenRight)
{
Expand All @@ -362,19 +362,19 @@ else if (isOpenLeft && isOpenRight)
}
else if (isOpenDown && isOpenLeft)
{
return icons[9];
return icons[10];
}
else if (isOpenDown && isOpenRight)
{
return icons[10];
return icons[9];
}
else if (isOpenUp && isOpenLeft)
{
return icons[7];
return icons[8];
}
else if (isOpenUp && isOpenRight)
{
return icons[8];
return icons[7];
}
else if (isOpenDown)
{
Expand All @@ -386,11 +386,11 @@ else if (isOpenUp)
}
else if (isOpenLeft)
{
return icons[4];
return icons[3];
}
else if (isOpenRight)
{
return icons[3];
return icons[4];
}
break;
case 4:
Expand Down Expand Up @@ -526,19 +526,19 @@ else if (isOpenLeft && isOpenRight)
}
else if (isOpenDown && isOpenLeft)
{
return icons[10];
return icons[9];
}
else if (isOpenDown && isOpenRight)
{
return icons[9];
return icons[10];
}
else if (isOpenUp && isOpenLeft)
{
return icons[8];
return icons[7];
}
else if (isOpenUp && isOpenRight)
{
return icons[7];
return icons[8];
}
else if (isOpenDown)
{
Expand All @@ -550,11 +550,11 @@ else if (isOpenUp)
}
else if (isOpenLeft)
{
return icons[3];
return icons[4];
}
else if (isOpenRight)
{
return icons[4];
return icons[3];
}
break;
}
Expand Down Expand Up @@ -690,11 +690,6 @@ public boolean canPaneConnectTo (IBlockAccess access, int x, int y, int z, Forge
@Override
public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
{
// if(par5 == 0 || par5 == 1){
// return par1IBlockAccess.getBlock(par2, par3, par4) != this.blockID;
// }else{
// return true;
// }
return true;
}
}
}

0 comments on commit 6ca6f9e

Please sign in to comment.