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

Covered dense cables (#3030)

Browse Source 
* Renamed all dense smart cable related things to include smart
* Added dense covered cables
* Added abstract PartDenseCable to reduce redundant code
* Added dense covered recipes

* Ensures ItemPart ordering to be consitent.

Now takes the metadata into account to preserve the ordering for colored
items instead of just the part type name and depend on the insertion
order of a hashmap.
This commit is contained in:
yueh
2017-08-17 18:41:39 +02:00
committed by GitHub
parent 4f9fd1b369
commit b61219ef88
77 changed files with 818 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/api/definitions/ApiParts.java
+13 -5
View File
@@ -42,7 +42,8 @@ public final class ApiParts implements IParts
private final AEColoredItemDefinition cableSmart;
private final AEColoredItemDefinition cableCovered;
private final AEColoredItemDefinition cableGlass;
private final AEColoredItemDefinition cableDense;
private final AEColoredItemDefinition cableDenseCovered;
private final AEColoredItemDefinition cableDenseSmart;
// private final AEColoredItemDefinition lumenCableSmart;
// private final AEColoredItemDefinition lumenCableCovered;
// private final AEColoredItemDefinition lumenCableGlass;
@@ -94,7 +95,8 @@ public final class ApiParts implements IParts
this.cableSmart = constructColoredDefinition( itemPart, PartType.CABLE_SMART );
this.cableCovered = constructColoredDefinition( itemPart, PartType.CABLE_COVERED );
this.cableGlass = constructColoredDefinition( itemPart, PartType.CABLE_GLASS );
this.cableDense = constructColoredDefinition( itemPart, PartType.CABLE_DENSE_SMART );
this.cableDenseCovered = constructColoredDefinition( itemPart, PartType.CABLE_DENSE_COVERED );
this.cableDenseSmart = constructColoredDefinition( itemPart, PartType.CABLE_DENSE_SMART );
// this.lumenCableSmart = Optional.absent(); // has yet to be implemented, no PartType defined for it yet
// this.lumenCableCovered = Optional.absent(); // has yet to be implemented, no PartType defined for it yet
// this.lumenCableGlass = Optional.absent(); // has yet to be implemented, no PartType defined for it yet
@@ -166,9 +168,15 @@ public final class ApiParts implements IParts
}
@Override
public AEColoredItemDefinition cableDense()
public AEColoredItemDefinition cableDenseCovered()
{
return this.cableDense;
return this.cableDenseCovered;
}
@Override
public AEColoredItemDefinition cableDenseSmart()
{
return this.cableDenseSmart;
}
@Override
@@ -193,7 +201,7 @@ public final class ApiParts implements IParts
}
@Override
public AEColoredItemDefinition lumenCableDense()
public AEColoredItemDefinition lumenDenseCableSmart()
{
throw new MissingDefinition( "Lumen Dense Cable has yet to be implemented." );
// return this.lumenCableDense;