Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #4089: Render cable core on straight lines of different types. #4103

Merged
merged 1 commit into from Jul 23, 2019
Merged

Fixes #4089: Render cable core on straight lines of different types. #4103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/appeng/client/render/cablebus/CableBuilder.java
View file
Open in desktop
Expand Up @@ -493,6 +493,11 @@ else if( connectionType == AECableType.COVERED || connectionType == AECableType.
this.addCoveredConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut );
return;
}
else if( connectionType == AECableType.DENSE_COVERED )
{
this.addDenseCoveredConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut );
return;
}

CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut );

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
View file
Open in desktop
Expand Up @@ -172,7 +172,7 @@ private static boolean isStraightLine( AECableType cableType, EnumMap<EnumFacing

final AECableType secondType = sides.get( firstSide.getOpposite() );

return firstType == secondType;
return firstType == secondType && cableType == firstType && cableType == secondType;
}

private void addCableQuads( CableBusRenderState renderState, List<BakedQuad> quadsOut )
Expand Down