Grimoire texture and code tweaks

common/src/main/java/miyucomics/hexical/mixin/CastingHarnessMixin.java

@@ -1,6 +1,7 @@
 package miyucomics.hexical.mixin;
 
 import at.petrak.hexcasting.api.addldata.ADMediaHolder;
+import at.petrak.hexcasting.api.misc.DiscoveryHandlers;
 import at.petrak.hexcasting.api.spell.casting.CastingContext;
 import at.petrak.hexcasting.api.spell.casting.CastingHarness;
 import at.petrak.hexcasting.api.spell.casting.ControllerInfo;
@@ -31,7 +32,7 @@
 import java.util.Collections;
 import java.util.List;
 
-@Mixin(value = CastingHarness.class)
+@Mixin(value = CastingHarness.class, priority = 1005)
 public class CastingHarnessMixin {
 	@Unique private final CastingHarness hexical$harness = (CastingHarness) (Object) this;
 
@@ -67,15 +68,15 @@ private void withdrawMediaWisp(int mediaCost, boolean allowOvercast, CallbackInf
 		}
 	}
 
-	@Inject(method = "executeIota", at = @At("HEAD"), cancellable = true, locals = LocalCapture.CAPTURE_FAILEXCEPTION, remap = false)
-	private void executeIotaMacro (Iota iota, ServerWorld world, CallbackInfoReturnable<ControllerInfo> cir) {
+	@Inject(method = "executeIota", at = @At("HEAD"), cancellable = true, remap = false)
+	private void expandGrimoire (Iota iota, ServerWorld world, CallbackInfoReturnable<ControllerInfo> cir) {
 		CastingContext ctx = hexical$harness.getCtx();
 		List<Iota> toExecute = new ArrayList<>(Collections.singleton(iota));
 		if (ctx.getSpellCircle() != null)
 			return;
 		if (!hexical$harness.getEscapeNext() && iota.getType() == HexIotaTypes.PATTERN && !((PatternIota) iota).getPattern().sigsEqual(HexPattern.fromAngles("qqqaw", HexDir.EAST))) {
 			HexPattern pattern = ((PatternIota) iota).getPattern();
-			toExecute = CastingUtils.Companion.grimoireLookup(ctx.getCaster(), pattern);
+			toExecute = CastingUtils.Companion.grimoireLookup(ctx.getCaster(), pattern, DiscoveryHandlers.collectItemSlots(ctx));
 			if (toExecute == null)
 				toExecute = new ArrayList<>(Collections.singleton(iota));
 		}

common/src/main/java/miyucomics/hexical/mixin/ClientPlayerEntityMixin.java

@@ -30,7 +30,7 @@ private void onInputUpdate(CallbackInfo info) {
 		input.pressingRight = keys.rightKey.isPressed();
 		input.jumping = keys.jumpKey.isPressed();
 		input.sneaking = keys.sneakKey.isPressed();
-		if (!client.player.isSprinting())
+		if (client.player != null)
 			client.player.setSprinting(keys.sprintKey.isPressed());
 	}
 }

common/src/main/java/miyucomics/hexical/utils/CastingUtils.kt

@@ -7,6 +7,7 @@ import at.petrak.hexcasting.api.spell.math.HexPattern
 import miyucomics.hexical.interfaces.CastingContextMixinInterface
 import miyucomics.hexical.items.GrimoireItem
 import miyucomics.hexical.registry.HexicalItems
+import net.minecraft.item.ItemStack
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.server.world.ServerWorld
 import net.minecraft.text.Text
@@ -29,18 +30,12 @@ class CastingUtils {
 			return false
 		}
 
-		fun grimoireLookup(player: ServerPlayerEntity, pattern: HexPattern): List<Iota>? {
-			for (stack in player.inventory.main) {
-				if (stack.item != HexicalItems.GRIMOIRE_ITEM)
-					continue
-				val value = GrimoireItem.getPatternInGrimoire(stack, pattern, player.getWorld())
-				if (value != null)
-					return value
-			}
-			for (stack in player.inventory.offHand) {
+		fun grimoireLookup(player: ServerPlayerEntity, pattern: HexPattern, slots: List<ItemStack>): List<Iota>? {
+			for (stack in slots) {
 				if (stack.item != HexicalItems.GRIMOIRE_ITEM)
 					continue
 				val value = GrimoireItem.getPatternInGrimoire(stack, pattern, player.getWorld())
+				player.sendMessage(Text.literal(value.toString()))
 				if (value != null)
 					return value
 			}