fix: 🐛 Fixed Sojourner's Staff to always cycle to next light source when one runs out

Author: P3pp3rF1y

gradle.properties

@@ -13,7 +13,7 @@ loader_version_range=[4,)
 mod_id=reliquary
 mod_name=Reliquary Reincarnations
 mod_license=All Rights Reserved
-mod_version=2.0.86
+mod_version=2.0.87
 mod_group_id=net.p3pp3rf1y
 mod_authors=P3pp3rF1y
 mod_description=Two words: magical swag. Oh, and a gun.

src/main/java/reliquary/item/SojournerStaffItem.java

@@ -75,24 +75,23 @@ private void scanForMatchingTorchesToFillInternalStorage(ItemStack staff, Player
 	}
 
 	public ItemStack getCurrentTorch(ItemStack stack) {
-		return getFromHandler(stack, handler -> getCurrentTorchIndex(stack) < handler.size() ? handler.getStackInSlot(getCurrentTorchIndex(stack)) : ItemStack.EMPTY);
+		return getFromHandler(stack, handler -> handler.getStackInSlot(getCurrentTorchIndex(stack, handler.size())));
 	}
 
 	public int getTorchCount(ItemStack stack) {
-		return getFromHandler(stack, handler -> getCurrentTorchIndex(stack) < handler.size() ? handler.getAmountAsInt(getCurrentTorchIndex(stack)) : 0);
+		return getFromHandler(stack, handler -> handler.getAmountAsInt(getCurrentTorchIndex(stack, handler.size())));
 	}
 
 	private void cycleTorchMode(ItemStack stack, boolean next) {
-		ItemStack currentTorch = getCurrentTorch(stack);
-		if (getCurrentTorchIndex(stack) != TORCH_SLOT && currentTorch.isEmpty()) {
-			return;
-		}
 		runOnHandler(stack, handler -> {
 			int slots = handler.size();
+			int currentIndex = getCurrentTorchIndex(stack, slots);
+			if (currentIndex != TORCH_SLOT && handler.getStackInSlot(currentIndex).isEmpty()) {
+				return;
+			}
 			if (slots == 1) {
 				return;
 			}
-			int currentIndex = getCurrentTorchIndex(stack);
 			stack.set(ModDataComponents.TORCH_INDEX, (byte) Math.floorMod(currentIndex + (next ? 1 : -1), slots));
 		});
 	}
@@ -101,6 +100,15 @@ private int getCurrentTorchIndex(ItemStack stack) {
 		return stack.getOrDefault(ModDataComponents.TORCH_INDEX, (byte) 0);
 	}
 
+	private int getCurrentTorchIndex(ItemStack stack, int slots) {
+		int currentIndex = getCurrentTorchIndex(stack);
+		if (currentIndex < TORCH_SLOT || currentIndex >= slots) {
+			currentIndex = Mth.clamp(currentIndex, TORCH_SLOT, slots - 1);
+			stack.set(ModDataComponents.TORCH_INDEX, (byte) currentIndex);
+		}
+		return currentIndex;
+	}
+
 	@Override
 	protected void addMoreInformation(ItemStack staff, HolderLookup.@Nullable Provider registries, TooltipBuilder tooltipBuilder) {
 		StringJoiner joiner = new StringJoiner(";");
@@ -175,8 +183,7 @@ private boolean removeTorches(Player player, ItemStack staff, BlockPos placeBloc
 			int distance = (int) player.getEyePosition(1).distanceTo(new Vec3(placeBlockAt.getX(), placeBlockAt.getY(), placeBlockAt.getZ()));
 			int cost = 1 + distance / Config.COMMON.items.sojournerStaff.tilePerCostMultiplier.get();
 
-			int torchIndex = getCurrentTorchIndex(staff);
-			return useCharge(staff, torchIndex, cost);
+			return getFromHandler(staff, handler -> useCharge(staff, getCurrentTorchIndex(staff, handler.size()), cost));
 		}
 		return true;
 	}
@@ -232,9 +239,7 @@ protected boolean removeSlotWhenEmpty(int slot) {
 	protected void removeSlot(ItemStack containerStack, int slot) {
 		runOnHandler(containerStack, handler -> {
 			handler.removeSlot(slot);
-			if (getCurrentTorchIndex(containerStack) >= handler.size()) {
-				cycleTorchMode(containerStack, false);
-			}
+			getCurrentTorchIndex(containerStack, createHandler(containerStack).size());
 		});
 
 	}