add null checks to invwrapper mixins (#98)

MicrocontrollersDev · web-flow · commit bbbdc3387988 · 2025-04-27T10:34:22.000-04:00
* add null checks to invwrapper mixins

* remove excess getStackInSlot calls
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/forge/InvWrapperMixin_ImproveInsertion.java b/src/main/java/club/sk1er/patcher/mixins/performance/forge/InvWrapperMixin_ImproveInsertion.java
@@ -22,7 +22,9 @@ public class InvWrapperMixin_ImproveInsertion {
 
     @Inject(method = "insertItem", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/items/ItemHandlerHelper;canItemStacksStack(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z"), cancellable = true)
     private void patcher$earlyExit(int slot, ItemStack stack, boolean simulate, CallbackInfoReturnable<ItemStack> cir) {
+        if (this.inv == null) return;
         ItemStack stackInSlot = this.inv.getStackInSlot(slot);
+        if (stackInSlot == null) return;
         if (stackInSlot.stackSize >= Math.min(stackInSlot.getMaxStackSize(), this.inv.getInventoryStackLimit())) {
             cir.setReturnValue(stack);
         }
diff --git a/src/main/java/club/sk1er/patcher/mixins/performance/forge/SidedInvWrapperMixin_ImproveInsertion.java b/src/main/java/club/sk1er/patcher/mixins/performance/forge/SidedInvWrapperMixin_ImproveInsertion.java
@@ -24,7 +24,9 @@ public class SidedInvWrapperMixin_ImproveInsertion {
 
     @Inject(method = "insertItem", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/items/ItemHandlerHelper;canItemStacksStack(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z", shift = At.Shift.BEFORE), cancellable = true)
     private void patcher$earlyExit(int slot, ItemStack stack, boolean simulate, CallbackInfoReturnable<ItemStack> cir) {
+        if (this.inv == null) return;
         ItemStack stackInSlot = this.inv.getStackInSlot(slot);
+        if (stackInSlot == null) return;
         if (stackInSlot.stackSize >= Math.min(stackInSlot.getMaxStackSize(), this.inv.getInventoryStackLimit())) {
             cir.setReturnValue(stack);
         }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@ public class InvWrapperMixin_ImproveInsertion {`
`22`	`22`
`23`	`23`	`@Inject(method = "insertItem", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/items/ItemHandlerHelper;canItemStacksStack(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z"), cancellable = true)`
`24`	`24`	`private void patcher$earlyExit(int slot, ItemStack stack, boolean simulate, CallbackInfoReturnable<ItemStack> cir) {`
	`25`	`+ if (this.inv == null) return;`
`25`	`26`	`ItemStack stackInSlot = this.inv.getStackInSlot(slot);`
	`27`	`+ if (stackInSlot == null) return;`
`26`	`28`	`if (stackInSlot.stackSize >= Math.min(stackInSlot.getMaxStackSize(), this.inv.getInventoryStackLimit())) {`
`27`	`29`	`cir.setReturnValue(stack);`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@ public class SidedInvWrapperMixin_ImproveInsertion {`
`24`	`24`
`25`	`25`	`@Inject(method = "insertItem", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/items/ItemHandlerHelper;canItemStacksStack(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z", shift = At.Shift.BEFORE), cancellable = true)`
`26`	`26`	`private void patcher$earlyExit(int slot, ItemStack stack, boolean simulate, CallbackInfoReturnable<ItemStack> cir) {`
	`27`	`+ if (this.inv == null) return;`
`27`	`28`	`ItemStack stackInSlot = this.inv.getStackInSlot(slot);`
	`29`	`+ if (stackInSlot == null) return;`
`28`	`30`	`if (stackInSlot.stackSize >= Math.min(stackInSlot.getMaxStackSize(), this.inv.getInventoryStackLimit())) {`
`29`	`31`	`cir.setReturnValue(stack);`
`30`	`32`	`}`