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

More damaged item search work. GT tools are so special

Browse Source
This commit is contained in:
PrototypeTrousers
2022-10-26 13:10:25 -03:00
parent 9bcf45b7e2
commit 833f8aca2a
4 changed files with 98 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/integration/modules/jei/JEIMissingItem.java
+14 -5
View File
@@ -60,20 +60,24 @@ public class JEIMissingItem implements IRecipeTransferError {
if (allIngredient instanceof ItemStack) {
ItemStack stack = (ItemStack) allIngredient;
if (!stack.isEmpty()) {
IAEItemStack search = AEItemStack.fromItemStack(stack);
if (stack.getItem().isDamageable() || Platform.isGTDamageableItem(stack.getItem())) {
Collection<IAEItemStack> fuzzy = available.findFuzzy(AEItemStack.fromItemStack(stack), FuzzyMode.IGNORE_ALL);
Collection<IAEItemStack> fuzzy = available.findFuzzy(search, FuzzyMode.IGNORE_ALL);
if (fuzzy.size() > 0) {
for (IAEItemStack itemStack : fuzzy) {
if (itemStack.getStackSize() > 0) {
if (itemStack.fuzzyComparison(AEItemStack.fromItemStack(stack), FuzzyMode.IGNORE_ALL)) {
found = true;
break;
if (Platform.isGTDamageableItem(stack.getItem())) {
if (!(stack.getMetadata() == itemStack.getDefinition().getMetadata())) {
continue;
}
}
found = true;
break;
}
}
}
} else {
IAEItemStack ext = available.findPrecise(AEItemStack.fromItemStack(stack));
IAEItemStack ext = available.findPrecise(search);
if (ext != null) {
IAEItemStack usedStack = used.findPrecise(ext);
if (ext.getStackSize() > 0 && (usedStack == null || ext.getStackSize() > usedStack.getStackSize())) {
@@ -153,6 +157,11 @@ public class JEIMissingItem implements IRecipeTransferError {
if (fuzzy.size() > 0) {
for (IAEItemStack itemStack : fuzzy) {
if (itemStack.getStackSize() > 0) {
if (Platform.isGTDamageableItem(stack.getItem())) {
if (!(stack.getMetadata() == itemStack.getDefinition().getMetadata())) {
continue;
}
}
found = true;
used.add(itemStack.copy().setStackSize(1));
valid.add(itemStack.copy().setStackSize(1).createItemStack());