fix interaction range and some crashes

Author: TropheusJ

src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java

@@ -6,7 +6,6 @@
 import javax.annotation.Nullable;
 
 import com.google.common.cache.Cache;
-import com.jamieswhiteshirt.reachentityattributes.ReachEntityAttributes;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.AllBlocks;
@@ -17,6 +16,7 @@
 import com.simibubi.create.content.logistics.packagePort.PackagePortTargetSelectionHandler;
 import com.simibubi.create.foundation.utility.RaycastHelper;
 import com.simibubi.create.foundation.utility.TickBasedCache;
+import com.simibubi.create.foundation.utility.fabric.ReachUtil;
 
 import net.createmod.catnip.data.WorldAttached;
 import net.createmod.catnip.outliner.Outliner;
@@ -53,8 +53,7 @@ public static void clientTick() {
 		ItemStack mainHandItem = mc.player.getMainHandItem();
 		boolean isWrench = AllItemTags.CHAIN_RIDEABLE.matches(mainHandItem);
 		boolean dismantling = isWrench && mc.player.isShiftKeyDown();
-		double range = mc.player.getAttribute(ReachEntityAttributes.REACH)
-			.getValue() + 1;
+		double range = ReachUtil.reach(mc.player) + 1;
 
 		Vec3 from = RaycastHelper.getTraceOrigin(mc.player);
 		Vec3 to = RaycastHelper.getTraceTarget(mc.player, range, from);

src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainPackageInteractionHandler.java

@@ -4,9 +4,9 @@
 
 import org.apache.commons.lang3.mutable.MutableBoolean;
 
-import com.jamieswhiteshirt.reachentityattributes.ReachEntityAttributes;
 import com.simibubi.create.AllPackets;
 import com.simibubi.create.foundation.utility.RaycastHelper;
+import com.simibubi.create.foundation.utility.fabric.ReachUtil;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
@@ -30,8 +30,7 @@ public static boolean onUse() {
 					.expandTowards(0, 0.5, 0)
 					.inflate(0.45);
 
-				double range = mc.player.getAttribute(ReachEntityAttributes.REACH)
-					.getValue() + 1;
+				double range = ReachUtil.reach(mc.player) + 1;
 				Vec3 from = RaycastHelper.getTraceOrigin(mc.player);
 				Vec3 to = RaycastHelper.getTraceTarget(mc.player, range, from);
 

src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java

@@ -13,6 +13,8 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.RandomSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.LivingEntity;
@@ -161,7 +163,13 @@ public void onNeighborChange(BlockState state, LevelReader level, BlockPos pos,
 		if (neighbor.relative(state.getOptionalValue(FACING)
 				.orElse(Direction.UP))
 			.equals(pos))
-			withBlockEntityDo(level, pos, PackagerBlockEntity::triggerStockCheck);
+			withBlockEntityDo(level, pos, PackagerBlockEntity::scheduleStockCheck);
+	}
+
+	// fabric: stock checks may be scheduled instead of immediate to avoid opening transactions at the wrong time
+	@Override
+	public void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
+		withBlockEntityDo(level, pos, PackagerBlockEntity::triggerStockCheck);
 	}
 
 	@Override

src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlockEntity.java

@@ -3,6 +3,7 @@
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 
@@ -163,6 +164,12 @@ public void tick() {
 		}
 	}
 
+	// fabric: cannot check stock from a transaction close callback
+	public void scheduleStockCheck() {
+		Objects.requireNonNull(this.level);
+		this.level.scheduleTick(this.worldPosition, this.getBlockState().getBlock(), 1);
+	}
+
 	public void triggerStockCheck() {
 		getAvailableItems();
 	}
@@ -464,23 +471,24 @@ public void attemptToSend(List<PackagingRequest> queuedRequests) {
 
 				for (StorageView<ItemVariant> view : targetInv.nonEmptyViews()) {
 					try (Transaction t = Transaction.openOuter()) {
-						int initialCount = requestQueue ? Math.min(64, nextRequest.getCount()) : 64;
 						ItemVariant resource = view.getResource();
+						boolean bulky = !resource.getItem().canFitInsideContainerItems();
+						if (bulky && anyItemPresent)
+							continue;
+
+						int initialCount = requestQueue ? Math.min(64, nextRequest.getCount()) : 64;
 						long extractedAmount = view.extract(resource, initialCount, t);
 						if (extractedAmount == 0)
 							continue;
+
 						ItemStack extracted = resource.toStack((int) extractedAmount);
 						if (requestQueue && !ItemHandlerHelper.canItemStacksStack(extracted, nextRequest.item()))
 							continue;
 
-						boolean bulky = !extracted.getItem()
-							.canFitInsideContainerItems();
-						if (bulky && anyItemPresent)
+						long inserted = extractedItems.insert(resource, extractedAmount, t);
+						if (inserted != extractedAmount)
 							continue;
-
 						anyItemPresent = true;
-						long inserted = extractedItems.insert(resource, extractedAmount, t);
-						long transferred = extractedAmount - inserted;
 						t.commit();
 
 						if (extracted.getItem() instanceof PackageItem)
@@ -492,7 +500,7 @@ public void attemptToSend(List<PackagingRequest> queuedRequests) {
 							continue;
 						}
 
-						nextRequest.subtract((int) transferred);
+						nextRequest.subtract((int) inserted);
 
 						if (!nextRequest.isEmpty()) {
 							if (bulky)

src/main/java/com/simibubi/create/content/logistics/packager/PackagerItemHandler.java

@@ -28,7 +28,7 @@ public long insert(ItemVariant resource, long maxAmount, TransactionContext tran
 			return 0;
 		ItemStack stack = resource.toStack(1);
 		if (blockEntity.unwrapBox(stack, transaction)) {
-			TransactionCallback.onSuccess(transaction, blockEntity::triggerStockCheck);
+			TransactionCallback.onSuccess(transaction, blockEntity::scheduleStockCheck);
 			return 1;
 		} else {
 			return 0;