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

More stuff ingame and showing up.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-01 01:01:32 +02:00
parent 6a88728544
commit 077ff17078
864 changed files with 11515 additions and 11761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/Platform.java
+1342 -1393
View File
File diff suppressed because it is too large Load Diff
src/main/java/appeng/util/helpers/ItemComparisonHelper.java
+8 -10
View File
@@ -26,8 +26,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import appeng.api.config.FuzzyMode;
import appeng.util.item.OreHelper;
import appeng.util.item.OreReference;
/**
@@ -104,14 +102,14 @@ public class ItemComparisonHelper
return ( percentDamagedOfA > mode.breakPoint ) == ( percentDamagedOfB > mode.breakPoint );
}
}
final OreReference aOR = OreHelper.INSTANCE.getOre( a ).orElse( null );
final OreReference bOR = OreHelper.INSTANCE.getOre( b ).orElse( null );
if( OreHelper.INSTANCE.sameOre( aOR, bOR ) )
{
return true;
}
// FIXME
// final OreReference aOR = OreHelper.INSTANCE.getOre( a ).orElse( null );
// final OreReference bOR = OreHelper.INSTANCE.getOre( b ).orElse( null );
//
// if( OreHelper.INSTANCE.sameOre( aOR, bOR ) )
// {
// return true;
// }
return a.isItemEqual( b );
}