fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update MCP Mappings to stable_32

Browse Source 
Some mapping updates are just straight up weird. 20170516 -> isBlockSolid, 20170517 -> causesDownwardCurrent
This commit is contained in:
Gunther De Wachter
2017-07-03 06:54:45 +02:00
parent 780ce89ac3
commit 890eef1803
67 changed files with 213 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/model/GlassBakedModel.java
+5 -5
View File
@@ -219,10 +219,10 @@ class GlassBakedModel implements IBakedModel
UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( vertexFormat );
builder.setTexture( sprite );
putVertex( builder, normal, c1.xCoord, c1.yCoord, c1.zCoord, sprite, u1, v1 );
putVertex( builder, normal, c2.xCoord, c2.yCoord, c2.zCoord, sprite, u1, v2 );
putVertex( builder, normal, c3.xCoord, c3.yCoord, c3.zCoord, sprite, u2, v2 );
putVertex( builder, normal, c4.xCoord, c4.yCoord, c4.zCoord, sprite, u2, v1 );
putVertex( builder, normal, c1.x, c1.y, c1.z, sprite, u1, v1 );
putVertex( builder, normal, c2.x, c2.y, c2.z, sprite, u1, v2 );
putVertex( builder, normal, c3.x, c3.y, c3.z, sprite, u2, v2 );
putVertex( builder, normal, c4.x, c4.y, c4.z, sprite, u2, v1 );
return builder.build();
}
@@ -251,7 +251,7 @@ class GlassBakedModel implements IBakedModel
break;
}
case NORMAL:
builder.put( e, (float) normal.xCoord, (float) normal.yCoord, (float) normal.zCoord, 0f );
builder.put( e, (float) normal.x, (float) normal.y, (float) normal.z, 0f );
break;
default:
builder.put( e );
src/main/java/appeng/client/render/model/RenderHelper.java
+3 -3
View File
@@ -86,11 +86,11 @@ final class RenderHelper
{
default:
case X:
return new Vec3d( vec.xCoord + delta, vec.yCoord, vec.zCoord );
return new Vec3d( vec.x + delta, vec.y, vec.z );
case Y:
return new Vec3d( vec.xCoord, vec.yCoord + delta, vec.zCoord );
return new Vec3d( vec.x, vec.y + delta, vec.z );
case Z:
return new Vec3d( vec.xCoord, vec.yCoord, vec.zCoord + delta );
return new Vec3d( vec.x, vec.y, vec.z + delta );
}
}
}