Merge pull request #395 from Rushmead/1.9

Fix Shit!
This commit is contained in:
Modmuss50 2016-03-26 16:05:14 +00:00
commit ee16097339
2 changed files with 6 additions and 14 deletions

View file

@ -51,7 +51,7 @@ if (ENV.BUILD_NUMBER) {
} }
minecraft { minecraft {
version = "1.9-12.16.0.1784-1.9" version = "1.9-12.16.0.1811-1.9"
mappings = "snapshot_20160316" mappings = "snapshot_20160316"
replace "@MODVERSION@", project.version replace "@MODVERSION@", project.version
// makeObfSourceJar = false // makeObfSourceJar = false

View file

@ -31,14 +31,6 @@ public class RenderCablePart implements IBakedModel
public void addCubeToList(Vecs3dCube cube, ArrayList<BakedQuad> list, BlockPartFace face, public void addCubeToList(Vecs3dCube cube, ArrayList<BakedQuad> list, BlockPartFace face,
ModelRotation modelRotation, TextureAtlasSprite cubeTexture) ModelRotation modelRotation, TextureAtlasSprite cubeTexture)
{ {
System.out.print(" Max X:" + cube.getMaxX());
System.out.print(" Min X:" + cube.getMinX());
System.out.print(" Max Y:" + cube.getMaxY());
System.out.print(" Min Y:" + cube.getMinY());
System.out.print(" Max Z:" + cube.getMaxZ());
System.out.print(" Min Z:" + cube.getMinZ());
BlockFaceUV uv = new BlockFaceUV(new float[] { (float) cube.getMinX(), (float) cube.getMinY(), BlockFaceUV uv = new BlockFaceUV(new float[] { (float) cube.getMinX(), (float) cube.getMinY(),
(float) cube.getMaxX(), (float) cube.getMaxY() }, 0); (float) cube.getMaxX(), (float) cube.getMaxY() }, 0);
face = new BlockPartFace(null, 0, "", uv); face = new BlockPartFace(null, 0, "", uv);
@ -52,7 +44,7 @@ public class RenderCablePart implements IBakedModel
EnumFacing.UP, modelRotation, null, true, true));// up EnumFacing.UP, modelRotation, null, true, true));// up
list.add(faceBakery.makeBakedQuad( list.add(faceBakery.makeBakedQuad(
new Vector3f((float) cube.getMinX(), (float) cube.getMinY(), (float) cube.getMinZ()), new Vector3f((float) cube.getMinX(), (float) cube.getMinY(), (float) cube.getMinZ()),
new Vector3f((float) cube.getMaxX(), (float) cube.getMaxY(), (float) cube.getMinZ()), face, cubeTexture, new Vector3f((float) cube.getMaxX(), (float) cube.getMaxY(), (float) cube.getMaxZ()), face, cubeTexture,
EnumFacing.NORTH, modelRotation, null, true, true));// north EnumFacing.NORTH, modelRotation, null, true, true));// north
list.add(faceBakery.makeBakedQuad( list.add(faceBakery.makeBakedQuad(
new Vector3f((float) cube.getMinX(), (float) cube.getMinY(), (float) cube.getMaxZ()), new Vector3f((float) cube.getMinX(), (float) cube.getMinY(), (float) cube.getMaxZ()),
@ -97,13 +89,13 @@ public class RenderCablePart implements IBakedModel
} }
if (state.getValue(CableMultipart.NORTH)) if (state.getValue(CableMultipart.NORTH))
{ {
addCubeToList(new Vecs3dCube(thickness, thickness, lastThickness, lastThickness, lastThickness, 16.0), addCubeToList(new Vecs3dCube(thickness, thickness, 0.0, lastThickness, lastThickness, thickness), list,
list, face, ModelRotation.X0_Y0, texture); face, ModelRotation.X0_Y0, texture);
} }
if (state.getValue(CableMultipart.SOUTH)) if (state.getValue(CableMultipart.SOUTH))
{ {
addCubeToList(new Vecs3dCube(thickness, thickness, 0.0, lastThickness , lastThickness, thickness), list, addCubeToList(new Vecs3dCube(thickness, thickness, lastThickness, lastThickness, lastThickness, 16.0),
face, ModelRotation.X0_Y0, texture); list, face, ModelRotation.X0_Y0, texture);
} }
if (state.getValue(CableMultipart.EAST)) if (state.getValue(CableMultipart.EAST))
{ {