Use the lens directly for brewing stand events

Author: aromaa

src/mixins/java/org/spongepowered/common/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin.java

@@ -38,6 +38,7 @@
 import org.spongepowered.api.event.SpongeEventFactory;
 import org.spongepowered.api.event.block.entity.BrewingEvent;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
+import org.spongepowered.api.item.inventory.Slot;
 import org.spongepowered.api.item.inventory.transaction.SlotTransaction;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -46,7 +47,9 @@
 import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+import org.spongepowered.common.inventory.adapter.InventoryAdapter;
 import org.spongepowered.common.inventory.adapter.impl.slots.SlotAdapter;
+import org.spongepowered.common.inventory.lens.Lens;
 import org.spongepowered.common.item.util.ItemStackUtil;
 
 import java.util.ArrayList;
@@ -75,7 +78,12 @@ public class BrewingStandBlockEntityMixin {
         fuelStack.grow(1);
         final ItemStackSnapshot originalStack = ItemStackUtil.snapshotOf(fuelStack);
         fuelStack.shrink(1);
-        final SlotTransaction fuelTransaction = new SlotTransaction(((BrewingStand) param3).inventory().slot(4).get(), originalStack, ItemStackUtil.snapshotOf(fuelStack));
+        final Lens lens = ((InventoryAdapter) param3).inventoryAdapter$getRootLens();
+        final SlotTransaction fuelTransaction = new SlotTransaction(
+            (Slot) lens.getLens(4).getAdapter(((InventoryAdapter) param3).inventoryAdapter$getFabric(), ((BrewingStand) param3).inventory()),
+            originalStack,
+            ItemStackUtil.snapshotOf(fuelStack)
+        );
         final ItemStackSnapshot ingredientStack = ItemStackUtil.snapshotOf(((BrewingStandBlockEntityMixin) (Object) param3).items.get(3));
         final BrewingEvent.ConsumeFuel
                 event = SpongeEventFactory.createBrewingEventConsumeFuel(currentCause, (BrewingStand) param3, ingredientStack, Collections.singletonList(fuelTransaction));
@@ -104,17 +112,20 @@ public class BrewingStandBlockEntityMixin {
     private static void impl$callBrewEvents(final Level param0, final BlockPos param1, final BlockState param2, final BrewingStandBlockEntity param3,
                                             final CallbackInfo ci, final ItemStack fuelStack, final boolean isBrewable, final boolean isBrewing, final ItemStack ingredientStack) {
         final Cause currentCause = Sponge.server().causeStackManager().currentCause();
+        final BrewingStandBlockEntityMixin mixinSelf = (BrewingStandBlockEntityMixin) (Object) param3;
         if (isBrewing) {
-            if (((BrewingStandBlockEntityMixin) (Object) param3).brewTime == 0 && isBrewable) {
+            if (mixinSelf.brewTime == 0 && isBrewable) {
                 final List<SlotTransaction> transactions = new ArrayList<>();
+                final Lens lens = ((InventoryAdapter) param3).inventoryAdapter$getRootLens();
                 for (int i = 0; i < 4; ++i) {
-                    final ItemStack original = ((BrewingStandBlockEntityMixin) (Object) param3).impl$originalSlots[i];
-                    final ItemStack replace = ((BrewingStandBlockEntityMixin) (Object) param3).items.get(i);
-                    ((BrewingStandBlockEntityMixin) (Object) param3).impl$originalSlots[i] = null;
+                    final ItemStack original = mixinSelf.impl$originalSlots[i];
+                    final ItemStack replace = mixinSelf.items.get(i);
+                    mixinSelf.impl$originalSlots[i] = null;
                     if (original == replace) {
                         continue;
                     }
-                    transactions.add(new SlotTransaction(((BrewingStand) param3).inventory().slot(i).get(),
+                    transactions.add(new SlotTransaction(
+                        (Slot) lens.getLens(i).getAdapter(((InventoryAdapter) param3).inventoryAdapter$getFabric(), ((BrewingStand) param3).inventory()),
                         ItemStackUtil.snapshotOf(original),
                         ItemStackUtil.snapshotOf(replace)
                     ));
@@ -123,18 +134,18 @@ public class BrewingStandBlockEntityMixin {
                 Sponge.eventManager().post(event);
                 for (final SlotTransaction transaction : transactions) {
                     transaction.custom().ifPresent(item ->
-                        ((BrewingStandBlockEntityMixin) (Object) param3).items.set(((SlotAdapter) transaction.slot()).getOrdinal(), ItemStackUtil.fromSnapshotToNative(item)));
+                        mixinSelf.items.set(((SlotAdapter) transaction.slot()).getOrdinal(), ItemStackUtil.fromSnapshotToNative(item)));
                 }
-            } else if (!isBrewable || ((BrewingStandBlockEntityMixin) (Object) param3).ingredient != ingredientStack.getItem()) {
+            } else if (!isBrewable || mixinSelf.ingredient != ingredientStack.getItem()) {
                 final BrewingEvent.Interrupt event = SpongeEventFactory.createBrewingEventInterrupt(currentCause, (BrewingStand) param3, ItemStackUtil.snapshotOf(ingredientStack));
                 Sponge.eventManager().post(event);
             }
-        } else if (isBrewable && ((BrewingStandBlockEntityMixin) (Object) param3).fuel > 0) {
+        } else if (isBrewable && mixinSelf.fuel > 0) {
             final BrewingEvent.Start event = SpongeEventFactory.createBrewingEventStart(currentCause, (BrewingStand) param3, ItemStackUtil.snapshotOf(ingredientStack));
             if (Sponge.eventManager().post(event)) {
-                ((BrewingStandBlockEntityMixin) (Object) param3).brewTime = 0;
-                ((BrewingStandBlockEntityMixin) (Object) param3).ingredient = Items.AIR;
-                ((BrewingStandBlockEntityMixin) (Object) param3).fuel++;
+                mixinSelf.brewTime = 0;
+                mixinSelf.ingredient = Items.AIR;
+                mixinSelf.fuel++;
             }
         }
     }