fix: support fabric context update mutated stack

[ZurrTum]

Add ContainerItemContext support to EnergyStorageAdapter
related to TechReborn/TechReborn#3302

Question:

EnergyStorage.ITEM.registerForItems has context parameter but is not used.

refinedstorage2/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java

Lines 829 to 847 in a18776d

	private void registerEnergyItemProviders() {
	EnergyStorage.ITEM.registerForItems(
	(stack, context) -> new EnergyStorageAdapter(Items.INSTANCE.getWirelessGrid().createEnergyStorage(stack)),
	Items.INSTANCE.getWirelessGrid()
	);
	Items.INSTANCE.getControllers().forEach(controller -> EnergyStorage.ITEM.registerForItems(
	(stack, context) -> new EnergyStorageAdapter(controller.get().createEnergyStorage(stack)),
	controller.get()
	));
	EnergyStorage.ITEM.registerForItems(
	(stack, context) -> new EnergyStorageAdapter(PortableGridBlockItem.createEnergyStorage(stack)),
	Items.INSTANCE.getPortableGrid()
	);
	EnergyStorage.ITEM.registerForItems(
	(stack, context) ->
	new EnergyStorageAdapter(Items.INSTANCE.getWirelessAutocraftingMonitor().createEnergyStorage(stack)),
	Items.INSTANCE.getWirelessAutocraftingMonitor()
	);
	}

Discovered by comparing TechReborn:
https://github.com/TechReborn/Energy/blob/da313914b1efe29632300900ba06f95e8c1d60b8/src/main/java/team/reborn/energy/impl/EnergyImpl.java#L23-L29

EnergyStorage.ITEM.registerFallback((stack, ctx) -> {
        if (stack.getItem() instanceof SimpleEnergyItem energyItem) {
                return SimpleEnergyItem.createStorage(ctx, energyItem.getEnergyCapacity(stack), energyItem.getEnergyMaxInput(stack), energyItem.getEnergyMaxOutput(stack));
        } else {
                return null;
        }
});

https://github.com/TechReborn/Energy/blob/da313914b1efe29632300900ba06f95e8c1d60b8/src/main/java/team/reborn/energy/impl/SimpleItemEnergyStorageImpl.java#L48-L62

private final ContainerItemContext ctx;
...
private boolean trySetEnergy(long energyAmountPerCount, long count, TransactionContext transaction) {
        ItemStack newStack = ctx.getItemVariant().toStack();
        SimpleEnergyItem.setStoredEnergyUnchecked(newStack, energyAmountPerCount);
        ItemVariant newVariant = ItemVariant.of(newStack);

        // Try to convert exactly `count` items.
        try (Transaction nested = transaction.openNested()) {
                if (ctx.extract(ctx.getItemVariant(), count, nested) == count && ctx.insert(newVariant, count, nested) == count) {
                        nested.commit();
                        return true;
                }
        }

        return false;
}

Simple fix:

if (ctx != null) {
        ItemStack itemStack = null;
        if (energyStorage instanceof ItemBlockEnergyStorage itemBlockEnergyStorage) {
                itemStack = itemBlockEnergyStorage.getStack();
        } else if (energyStorage instanceof ItemEnergyStorage itemEnergyStorage) {
                itemStack = itemEnergyStorage.getStack();
        }
        if (itemStack != null) {
                ctx.exchange(ItemVariant.of(itemStack), 1, transaction);
        }
}

Because the code structure is too nested, itemStack cannot be accessed directly, so it is obtained through instanceof.
Maybe the data structure needs to be optimized

[ZurrTum]

More

https://github.com/TechReborn/TechReborn/blob/1.21/RebornCore/src/main/java/reborncore/common/powerSystem/PowerAcceptorBlockEntity.java#L192

ContainerItemContext.ofSingleSlot(InventoryStorage.of(inventory, null).getSlots().get(slot)).find(EnergyStorage.ITEM)

find function call:

EnergyStorage.ITEM.find(containerItemContext.getItemVariant().toStack(), containerItemContext)

EnergyStorage.ITEM.registerForItems((stack, context) -> new EnergyStorageAdapter...

toStack will create a new copy:

this.isBlank() ? ItemStack.EMPTY : new ItemStack(this.getRegistryEntry(), count, this.getComponents());

[raoulvdberge]

Thanks, I will review this this weekend.

[raoulvdberge]

Why did you close this PR?

[ZurrTum]

Because I thought it was inactive and it was a simple fix. Code structure may also need to be adjusted to support ContainerItemContext.

[raoulvdberge]

I've been inactive the past 2 weeks yes, but was still planning to merge this...

[raoulvdberge]

Thank you for the fix, I've integrated this in PR #741