Softcoding

- Fixed deployers not able to harvest honeycomb with modded shears #4570
- Safety check for schedule pointer exceeding the total count #7492

src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java

@@ -68,8 +68,8 @@
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
-
 import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.common.ToolActions;
 import net.minecraftforge.common.extensions.IForgeBaseRailBlock;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent.LeftClickBlock;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock;
@@ -427,7 +427,7 @@ protected static InteractionResult safeOnBeehiveUse(BlockState state, Level worl
 		if (honeyLevel < 5)
 			return InteractionResult.PASS;
 
-		if (prevHeldItem.getItem() == Items.SHEARS) {
+		if (prevHeldItem.canPerformAction(ToolActions.SHEARS_HARVEST)) {
 			world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BEEHIVE_SHEAR,
 				SoundSource.NEUTRAL, 1.0F, 1.0F);
 			// <> BeehiveBlock#dropHoneycomb

src/main/java/com/simibubi/create/content/trains/schedule/ScheduleRuntime.java

@@ -110,15 +110,9 @@ public void tick(Level level) {
 			ticksInTransit++;
 			return;
 		}
-		if (currentEntry >= schedule.entries.size()) {
-			currentEntry = 0;
-			if (!schedule.cyclic) {
-				paused = true;
-				completed = true;
-			}
+
+		if (checkEndOfScheduleReached())
 			return;
-		}
-
 		if (cooldown-- > 0)
 			return;
 		if (state == State.IN_TRANSIT)
@@ -144,6 +138,18 @@ public void tick(Level level) {
 		}
 	}
 
+	private boolean checkEndOfScheduleReached() {
+		if (currentEntry < schedule.entries.size())
+			return false;
+
+		currentEntry = 0;
+		if (!schedule.cyclic) {
+			paused = true;
+			completed = true;
+		}
+		return true;
+	}
+
 	public void tickConditions(Level level) {
 		ScheduleEntry entry = schedule.entries.get(currentEntry);
 		List<List<ScheduleWaitCondition>> conditions = entry.conditions;
@@ -182,6 +188,9 @@ public void tickConditions(Level level) {
 	}
 
 	public DiscoveredPath startCurrentInstruction(Level level) {
+		if (checkEndOfScheduleReached())
+			return null;
+
 		ScheduleEntry entry = schedule.entries.get(currentEntry);
 		ScheduleInstruction instruction = entry.instruction;
 		return instruction.start(this, level);