upstream/Applied-Energistics-2-Unofficial
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git synced 2026-10-25 20:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NEI recipe transfer for wildcard metadata ingredients (#1676)

Browse Source 
Co-authored-by: Martin Robertz <dream-master@gmx.net>
This commit is contained in:
Kogepan229andMartin Robertz authored and GitHub committed 2026-10-01 20:51:20 +02:00
1 parent 3ef1451018
commit feac2b6253
2 files changed
+20 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java
+14 -5
View File
@@ -29,6 +29,9 @@ import net.minecraftforge.common.util.Constants.NBT;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.oredict.OreDictionary;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import appeng.api.config.Actionable;
import appeng.api.config.FuzzyMode;
import appeng.api.config.SecurityPermissions;
@@ -47,6 +50,7 @@ import appeng.helpers.IContainerCraftingPacket;
import appeng.items.storage.ItemViewCell;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
import appeng.util.inv.IInventoryDestination;
import appeng.util.item.AEItemStack;
import appeng.util.prioitylist.IPartitionList;
import io.netty.buffer.ByteBuf;
@@ -222,13 +226,18 @@ public class PacketNEIRecipe extends AppEngPacket {
* @param patternItem which {@link ItemStack} to extract
* @return null or a found {@link ItemStack}
*/
private ItemStack extractItemFromPlayerInventory(final EntityPlayer player, final Actionable mode,
final ItemStack patternItem) {
private @Nullable ItemStack extractItemFromPlayerInventory(final @NotNull EntityPlayer player,
final @NotNull Actionable mode, final @NotNull ItemStack patternItem) {
final InventoryAdaptor ia = InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN);
final AEItemStack request = AEItemStack.create(patternItem);
final boolean isSimulated = mode == Actionable.SIMULATE;
final boolean checkFuzzy = request.isOre() || patternItem.getItemDamage() == OreDictionary.WILDCARD_VALUE
|| patternItem.hasTagCompound()
if (patternItem.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
final IInventoryDestination destination = candidate -> candidate.getItem() == patternItem.getItem();
return isSimulated ? ia.simulateSimilarRemove(1, null, FuzzyMode.IGNORE_ALL, destination)
: ia.removeSimilarItems(1, null, FuzzyMode.IGNORE_ALL, destination);
}
final AEItemStack request = AEItemStack.create(patternItem);
final boolean checkFuzzy = request.isOre() || patternItem.hasTagCompound()
|| patternItem.isItemStackDamageable();
if (!checkFuzzy) {
src/main/java/appeng/util/Platform.java
+6 -4
View File
@@ -1696,16 +1696,18 @@ public class Platform {
}
}
final boolean checkFuzzy = ae_req.isOre()
|| providedTemplate.getItemDamage() == OreDictionary.WILDCARD_VALUE
final boolean wildcard = providedTemplate.getItemDamage() == OreDictionary.WILDCARD_VALUE;
final boolean checkFuzzy = ae_req.isOre() || wildcard
|| providedTemplate.hasTagCompound()
|| providedTemplate.isItemStackDamageable();
if (items != null && checkFuzzy) {
for (final IAEItemStack x : items) {
final ItemStack sh = x.getItemStack();
if ((Platform.isSameItemType(providedTemplate, sh) || ae_req.sameOre(x))
&& !Platform.isSameItem(sh, output)) { // Platform.isSameItemType( sh, providedTemplate )
// Recipe wildcards accept any metadata of the same item, even without an ore dictionary entry.
final boolean wildcardMatch = wildcard && sh != null && providedTemplate.getItem() == sh.getItem();
if ((wildcardMatch || Platform.isSameItemType(providedTemplate, sh) || ae_req.sameOre(x))
&& !Platform.isSameItem(sh, output)) {
final ItemStack cp = Platform.cloneItemStack(sh);
cp.stackSize = 1;
ci.setInventorySlotContents(slot, cp);