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

Format sourcecode

Browse Source
This commit is contained in:
yueh
2017-07-20 21:17:10 +02:00
parent 66437897be
commit 621910df91
295 changed files with 2142 additions and 1562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/helpers/ItemComparisonHelper.java
+7 -4
View File
@@ -87,13 +87,15 @@ public class ItemComparisonHelper
*/
public boolean isEqualItem( @Nonnull final ItemStack left, @Nonnull final ItemStack right )
{
return this.isItemEqual(left, right);
return this.isItemEqual( left, right );
}
/**
* A slightly different method from ItemStack.java to skip the isEmpty() check. This allows you to check for identical empty spots..
* A slightly different method from ItemStack.java to skip the isEmpty() check. This allows you to check for
* identical empty spots..
*/
public boolean isItemEqual( ItemStack left, ItemStack right ) {
public boolean isItemEqual( ItemStack left, ItemStack right )
{
return left.getItem() == right.getItem() && left.getItemDamage() == right.getItemDamage();
}
@@ -395,7 +397,8 @@ public class ItemComparisonHelper
return true;
}
if( ( ta == null && tb == null ) || ( ta != null && ta.hasNoTags() && tb == null ) || ( tb != null && tb.hasNoTags() && ta == null ) || ( ta != null && ta.hasNoTags() && tb != null && tb.hasNoTags() ) )
if( ( ta == null && tb == null ) || ( ta != null && ta.hasNoTags() && tb == null ) || ( tb != null && tb
.hasNoTags() && ta == null ) || ( ta != null && ta.hasNoTags() && tb != null && tb.hasNoTags() ) )
{
return true;
}