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/parts/networking/PartCable.java
+1 -2
View File
@@ -43,7 +43,6 @@ import appeng.api.parts.BusSupport;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartModel;
import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
import appeng.api.util.AEPartLocation;
@@ -129,7 +128,7 @@ public class PartCable extends AEBasePart implements IPartCable
{
newPart = parts.cableSmart().stack( newColor, 1 );
}
else if( this.getCableConnectionType() == AECableType.DENSE )
else if( this.getCableConnectionType() == AECableType.DENSE_SMART )
{
newPart = parts.cableDense().stack( newColor, 1 );
}
src/main/java/appeng/parts/networking/PartDenseCable.java
+2 -2
View File
@@ -55,7 +55,7 @@ public class PartDenseCable extends PartCable
@Override
public AECableType getCableConnectionType()
{
return AECableType.DENSE;
return AECableType.DENSE_SMART;
}
@Override
@@ -152,7 +152,7 @@ public class PartDenseCable extends PartCable
if( te instanceof IGridHost )
{
final AECableType t = ( (IGridHost) te ).getCableConnectionType( of.getOpposite() );
return t == AECableType.DENSE;
return t == AECableType.DENSE_SMART;
}
return false;
}