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

Finally use Java7 <>

Browse Source
This commit is contained in:
yueh
2017-07-20 21:21:45 +02:00
parent 8ec8babb6a
commit 7de90ed0ae
145 changed files with 315 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/storage/ItemBasicStorageCell.java
+1 -1
View File
@@ -223,7 +223,7 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe
public ActionResult<ItemStack> onItemRightClick( final World world, final EntityPlayer player, final EnumHand hand )
{
this.disassembleDrive( player.getHeldItem( hand ), world, player );
return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItem( hand ) );
return new ActionResult<>( EnumActionResult.SUCCESS, player.getHeldItem( hand ) );
}
private boolean disassembleDrive( final ItemStack stack, final World world, final EntityPlayer player )
src/main/java/appeng/items/storage/ItemViewCell.java
+3 -3
View File
@@ -51,7 +51,7 @@ public class ItemViewCell extends AEBaseItem implements ICellWorkbenchItem
{
IPartitionList<IAEItemStack> myPartitionList = null;
final MergedPriorityList<IAEItemStack> myMergedList = new MergedPriorityList<IAEItemStack>();
final MergedPriorityList<IAEItemStack> myMergedList = new MergedPriorityList<>();
for( final ItemStack currentViewCell : list )
{
@@ -107,11 +107,11 @@ public class ItemViewCell extends AEBaseItem implements ICellWorkbenchItem
{
if( hasFuzzy )
{
myMergedList.addNewList( new FuzzyPriorityList<IAEItemStack>( priorityList, fzMode ), !hasInverter );
myMergedList.addNewList( new FuzzyPriorityList<>( priorityList, fzMode ), !hasInverter );
}
else
{
myMergedList.addNewList( new PrecisePriorityList<IAEItemStack>( priorityList ), !hasInverter );
myMergedList.addNewList( new PrecisePriorityList<>( priorityList ), !hasInverter );
}
myPartitionList = myMergedList;