mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-04 23:53:01 +00:00
Code Issues Releases Wiki Activity

Update CT integration

Browse Source 
Sadly we have to disable -Werror, as the annotation class files are not
available on maven, so this produces a warning.
This commit is contained in:
SquidDev
2019-12-24 19:16:06 +00:00
parent 037cbabb32
commit 4320a4f851
12 changed files with 240 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/dan200/computercraft/shared/turtle/items/ItemTurtle.java
View File

@@ -66,12 +66,10 @@ public class ItemTurtle extends ItemComputerBase implements ITurtleItem
ComputerFamily family = getFamily();
list.add( create( -1, null, -1, null, null, 0, null ) );
for( ITurtleUpgrade upgrade : TurtleUpgrades.getVanillaUpgrades() )
{
if( !TurtleUpgrades.suitableForFamily( family, upgrade ) ) continue;
list.add( create( -1, null, -1, null, upgrade, 0, null ) );
}
TurtleUpgrades.getVanillaUpgrades()
.filter( x -> TurtleUpgrades.suitableForFamily( family, x ) )
.map( x -> create( -1, null, -1, null, x, 0, null ) )
.forEach( list::add );
}
@Nonnull

2
src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
View File

@@ -65,7 +65,7 @@ public class TurtleTool extends AbstractTurtleUpgrade
public TurtleTool( ResourceLocation id, ItemStack craftItem, ItemStack toolItem )
{
super( id, -1, TurtleUpgradeType.Tool, craftItem );
super( id, TurtleUpgradeType.Tool, craftItem );
this.item = toolItem;
}