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

Changed the Parts and Material enum to be more java compliant.

Browse Source 
Renamed Dense Cables to Dense Smart Cables.
This commit is contained in:
Gunther De Wachter
2017-07-16 02:22:30 +02:00
parent 16b5b5aea2
commit 6648d18f00
325 changed files with 1786 additions and 1776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/cablebus/CableBuilder.java
+8 -8
View File
@@ -101,8 +101,8 @@ class CableBuilder
case SMART:
textureFolder = "parts/cable/smart/";
break;
case DENSE:
textureFolder = "parts/cable/dense/";
case DENSE_SMART:
textureFolder = "parts/cable/dense_smart/";
break;
default:
throw new IllegalStateException( "Cable type " + cableType + " does not support connections." );
@@ -127,8 +127,8 @@ class CableBuilder
case SMART:
addCableCore( CableCoreType.COVERED, color, quadsOut );
break;
case DENSE:
addCableCore( CableCoreType.DENSE, color, quadsOut );
case DENSE_SMART:
addCableCore( CableCoreType.DENSE_SMART, color, quadsOut );
break;
default:
}
@@ -149,7 +149,7 @@ class CableBuilder
case COVERED:
cubeBuilder.addCube( 5, 5, 5, 11, 11, 11 );
break;
case DENSE:
case DENSE_SMART:
cubeBuilder.addCube( 3, 3, 3, 13, 13, 13 );
break;
}
@@ -456,7 +456,7 @@ class CableBuilder
addSmartConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut );
return;
}
else if( connectionType != AECableType.DENSE )
else if( connectionType != AECableType.DENSE_SMART )
{
addCoveredConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut );
return;
@@ -467,7 +467,7 @@ class CableBuilder
// We render all faces except the one on the connection side
cubeBuilder.setDrawFaces( EnumSet.complementOf( EnumSet.of( facing ) ) );
TextureAtlasSprite texture = connectionTextures.get( AECableType.DENSE ).get( cableColor );
TextureAtlasSprite texture = connectionTextures.get( AECableType.DENSE_SMART ).get( cableColor );
cubeBuilder.setTexture( texture );
addDenseCableSizedCube( facing, cubeBuilder );
@@ -499,7 +499,7 @@ class CableBuilder
{
CubeBuilder cubeBuilder = new CubeBuilder( format, quadsOut );
TextureAtlasSprite texture = connectionTextures.get( AECableType.DENSE ).get( cableColor );
TextureAtlasSprite texture = connectionTextures.get( AECableType.DENSE_SMART ).get( cableColor );
cubeBuilder.setTexture( texture );
setStraightCableUVs( cubeBuilder, facing, 5, 11 );
src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
+5 -5
View File
@@ -164,8 +164,8 @@ public class CableBusBakedModel implements IBakedModel
{
case GLASS:
return firstType == AECableType.GLASS && secondType == AECableType.GLASS;
case DENSE:
return firstType == AECableType.DENSE && secondType == AECableType.DENSE;
case DENSE_SMART:
return firstType == AECableType.DENSE_SMART && secondType == AECableType.DENSE_SMART;
}
return true;
@@ -200,7 +200,7 @@ public class CableBusBakedModel implements IBakedModel
case SMART:
cableBuilder.addStraightSmartConnection( facing, cableColor, renderState.getChannelsOnSide().get( facing ), quadsOut );
break;
case DENSE:
case DENSE_SMART:
cableBuilder.addStraightDenseConnection( facing, cableColor, renderState.getChannelsOnSide().get( facing ), quadsOut );
break;
}
@@ -228,7 +228,7 @@ public class CableBusBakedModel implements IBakedModel
case SMART:
cableBuilder.addConstrainedSmartConnection( facing, cableColor, distance, channels, quadsOut );
break;
case DENSE:
case DENSE_SMART:
// Dense cables do not render connections to parts since none can be attached
break;
}
@@ -253,7 +253,7 @@ public class CableBusBakedModel implements IBakedModel
case SMART:
cableBuilder.addSmartConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut );
break;
case DENSE:
case DENSE_SMART:
cableBuilder.addDenseConnection( facing, cableColor, connectionType, cableBusAdjacent, channels, quadsOut );
break;
}
src/main/java/appeng/client/render/cablebus/CableCoreType.java
+2 -2
View File
@@ -40,7 +40,7 @@ import appeng.core.AppEng;
*/
public enum CableCoreType
{
GLASS( "parts/cable/core/glass" ), COVERED( "parts/cable/core/covered" ), DENSE( "parts/cable/core/dense" );
GLASS( "parts/cable/core/glass" ), COVERED( "parts/cable/core/covered" ), DENSE_SMART( "parts/cable/core/dense_smart" );
private static final Map<AECableType, CableCoreType> cableMapping = generateCableMapping();
@@ -55,7 +55,7 @@ public enum CableCoreType
result.put( AECableType.GLASS, CableCoreType.GLASS );
result.put( AECableType.COVERED, CableCoreType.COVERED );
result.put( AECableType.SMART, CableCoreType.COVERED );
result.put( AECableType.DENSE, CableCoreType.DENSE );
result.put( AECableType.DENSE_SMART, CableCoreType.DENSE_SMART );
return ImmutableMap.copyOf( result );
}