fix(spell): 修复法术错误处理和参数验证机制

- 添加了详细的法术错误消息和错误类型分类
- 实现了统一的错误处理机制，包括语法错误、参数错误、数学错误和内部错误
- 修复了括号匹配、if语句配对、循环语句配对等语法检查
- 改进了法术参数类型验证和重载匹配逻辑
- 添加了除零检测和存储空值检查
- 优化了法术序列执行中的错误传播机制
- 修复了魔力不足和参数类型不匹配的错误处理
- 更新了法术值类型定义和匹配逻辑
- 改进了魔杖界面和插件相关的错误处理逻辑

Author: creepebucket

src/main/java/org/creepebucket/programmable_magic/ModUtils.java

@@ -1,6 +1,7 @@
 package org.creepebucket.programmable_magic;
 
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.tags.TagKey;
@@ -77,6 +78,15 @@ public static boolean sendErrorMessageToPlayer(Component message, Player player)
         return false;
     }
 
+    public static Component formatSpellError(Component kind, Component detail) {
+        return Component.translatable("message.programmable_magic.error.spell_error_header")
+                .withStyle(ChatFormatting.RED)
+                .append(Component.literal(" "))
+                .append(kind.copy().withStyle(ChatFormatting.GOLD))
+                .append(Component.literal("\n"))
+                .append(detail.copy().withStyle(ChatFormatting.GRAY));
+    }
+
     /**
      * 由插件物品聚合魔杖数值：
      * - 遍历每个插件物品，构造插件实例并调用其 adjustWandValues。

src/main/java/org/creepebucket/programmable_magic/entities/SpellEntity.java

@@ -76,6 +76,7 @@ public void tick() {
         // 执行法术序列逻辑
 
         if (this.level().isClientSide) { spawnParticles(); return; }
+        if (this.spellData != null && Boolean.TRUE.equals(this.spellData.getCustomData("spell_error", Boolean.class))) { this.discard(); return; }
 
         // 若已附加“弹丸附加”效果，则先进行严格命中检测并结算伤害（严格：沿速度向量扫掠）
         handleProjectileAttachHit();
@@ -239,6 +240,7 @@ private void simplifyPendingExpressions(SpellItemLogic boundary) {
         if (start == null || end == null || start == boundary) return; // 空区间或起点即边界，直接跳过
         SpellSequence slice = cloneRange(start, end);
         SpellSequence simplified = SpellUtils.calculateSpellSequence(caster, spellData, slice);
+        if (this.spellData != null && Boolean.TRUE.equals(this.spellData.getCustomData("spell_error", Boolean.class))) { this.discard(); return; }
         spellSequence.replaceSection(start, end, simplified);
     }
 

src/main/java/org/creepebucket/programmable_magic/gui/wand/WandMenu.java

@@ -375,7 +375,7 @@ private void saveWandInvToStack(Player player) {
         if (st.isEmpty()) return;
         int n = this.wandInv.getContainerSize();
         var list = new ArrayList<ItemStack>(n);
-        for (int i = 0; i < n; i++) if (!this.wandInv.getItem(i).isEmpty()) list.add(this.wandInv.getItem(i));
+        for (int i = 0; i < n; i++) list.add(this.wandInv.getItem(i).copy());
         st.set(ModDataComponents.WAND_STACKS_SMALL.get(), list);
     }
 
@@ -401,7 +401,7 @@ private void saveWandInvToSavedStacks(Player player) {
         if (st.isEmpty()) return;
         int n = this.wandInv.getContainerSize();
         var list = new ArrayList<ItemStack>(n);
-        for (int i = 0; i < n; i++) if (!this.wandInv.getItem(i).isEmpty()) list.add(this.wandInv.getItem(i).copy());
+        for (int i = 0; i < n; i++) list.add(this.wandInv.getItem(i).copy());
         st.set(ModDataComponents.WAND_SAVED_STACKS.get(), list);
     }
 
@@ -413,6 +413,7 @@ public void removed(Player player) {
         super.removed(player);
         saveWandInvToStack(player);
         savePluginsToStack(player);
+        if (!player.level().isClientSide) getWandStack().set(ModDataComponents.WAND_LAST_RELEASE_TIME.get(), player.level().getGameTime());
     }
 
     @Override

src/main/java/org/creepebucket/programmable_magic/gui/wand/WandScreen.java

@@ -96,13 +96,22 @@ public int computeStep() {
         return 1;
     }
 
+    private int getVisibleSpellSlots() {
+        var win = Minecraft.getInstance().getWindow();
+        int sw = win.getGuiScaledWidth();
+        return Math.max(1, Math.floorDiv(sw - 200, 16) - 4);
+    }
+
     /**
      * 更新法术偏移并同步给 Menu。
      */
     public void updateSpellIndex(int delta) {
         int prev = this.spellIndexOffset;
         int cap = this.menu.getSpellSlotCapacity();
-        int next = Mth.clamp(prev + delta, 0, cap);
+        int visible = getVisibleSpellSlots();
+        int maxOffset = Math.max(0, cap - visible);
+        int next = Mth.clamp(prev + delta, 0, maxOffset);
+        if (next == prev) return;
         this.spellIndexOffset = next;
         sendMenuData(WandMenu.KEY_SPELL_OFFSET, this.spellIndexOffset);
     }

src/main/java/org/creepebucket/programmable_magic/gui/wand/slots/OffsetSlot.java

@@ -37,6 +37,11 @@ private boolean inRange(int idx) {
         return idx >= 0 && idx < inv.getContainerSize();
     }
 
+    @Override
+    public boolean isActive() {
+        return inRange(targetIndex());
+    }
+
     @Override
     public boolean hasItem() {
         int idx = targetIndex();

src/main/java/org/creepebucket/programmable_magic/items/Wand.java

@@ -32,6 +32,17 @@ public class Wand extends BowItem implements IItemExtension {
     private final int slots;
     private final int pluginSlots;
 
+    private static boolean hasAutoChargePlugin(ItemStack stack) {
+        java.util.List<ItemStack> plugins = stack.get(ModDataComponents.WAND_PLUGINS.get());
+        if (plugins == null) return false;
+        for (ItemStack it : plugins) {
+            if (it == null || it.isEmpty()) continue;
+            var id = BuiltInRegistries.ITEM.getKey(it.getItem());
+            if (id != null && "wand_plugin_auto_charge".equals(id.getPath())) return true;
+        }
+        return false;
+    }
+
     /**
      * 构造一个魔杖实例。
      * @param properties 物品属性
@@ -59,6 +70,8 @@ public Wand(Properties properties, int slots, int pluginSlots) {
      */
     public InteractionResult use(Level level, Player player, InteractionHand hand) {
         if (player.isShiftKeyDown()) {
+            ItemStack stack = player.getItemInHand(hand);
+            stack.set(ModDataComponents.WAND_LAST_RELEASE_TIME.get(), level.getGameTime());
             if (!level.isClientSide && player instanceof ServerPlayer serverPlayer) {
                 serverPlayer.openMenu(
                         new SimpleMenuProvider(
@@ -72,6 +85,8 @@ public InteractionResult use(Level level, Player player, InteractionHand hand) {
         }
 
         // 非潜行：进入“使用”态（按住右键充能，松手释放）
+        ItemStack stack = player.getItemInHand(hand);
+        if (!hasAutoChargePlugin(stack)) stack.set(ModDataComponents.WAND_LAST_RELEASE_TIME.get(), level.getGameTime());
         player.startUsingItem(hand);
         return InteractionResult.SUCCESS;
     }
@@ -174,17 +189,10 @@ public void inventoryTick(ItemStack stack, ServerLevel level, Entity entity, @Nu
         if (!isHeld) return;
 
         java.util.List<ItemStack> plugins = stack.get(ModDataComponents.WAND_PLUGINS.get());
-        boolean hasAuto = false;
-        if (plugins != null) {
-            for (ItemStack it : plugins) {
-                if (it == null || it.isEmpty()) continue;
-                var id = BuiltInRegistries.ITEM.getKey(it.getItem());
-                if (id != null && "wand_plugin_auto_charge".equals(id.getPath())) { hasAuto = true; break; }
-            }
-        }
-        if (!hasAuto) return;
+        if (!hasAutoChargePlugin(stack)) return;
 
         if (level.isClientSide) {
+            if (player.containerMenu instanceof WandMenu) return;
             boolean using = player.isUsingItem() && (player.getUseItem() == stack);
             if (using) return; // 按住使用时由 onUseTick 负责 HUD
 

src/main/java/org/creepebucket/programmable_magic/registries/ModDataComponents.java

@@ -38,18 +38,18 @@ public class ModDataComponents {
     // 直接存储完整 ItemStack（含数据组件/自定义状态）
     public static final DeferredHolder<DataComponentType<?>, DataComponentType<List<ItemStack>>> WAND_STACKS_BIG =
             DATA_COMPONENTS.registerComponentType("wand_stacks_big", builder -> builder
-                    .persistent(Codec.list(ItemStack.CODEC))
+                    .persistent(Codec.list(ItemStack.OPTIONAL_CODEC))
                     .networkSynchronized(ByteBufCodecs.collection(ArrayList::new, ItemStack.OPTIONAL_STREAM_CODEC)));
 
     public static final DeferredHolder<DataComponentType<?>, DataComponentType<List<ItemStack>>> WAND_STACKS_SMALL =
             DATA_COMPONENTS.registerComponentType("wand_stacks_small", builder -> builder
-                    .persistent(Codec.list(ItemStack.CODEC))
+                    .persistent(Codec.list(ItemStack.OPTIONAL_CODEC))
                     .networkSynchronized(ByteBufCodecs.collection(ArrayList::new, ItemStack.OPTIONAL_STREAM_CODEC)));
 
     // 隐藏保存：供左键释放读取
     public static final DeferredHolder<DataComponentType<?>, DataComponentType<List<ItemStack>>> WAND_SAVED_STACKS =
             DATA_COMPONENTS.registerComponentType("wand_saved_stacks", builder -> builder
-                    .persistent(Codec.list(ItemStack.CODEC))
+                    .persistent(Codec.list(ItemStack.OPTIONAL_CODEC))
                     .networkSynchronized(ByteBufCodecs.collection(ArrayList::new, ItemStack.OPTIONAL_STREAM_CODEC)));
 
 

src/main/java/org/creepebucket/programmable_magic/spells/SpellLogic.java

@@ -20,6 +20,7 @@
 import java.util.List;
 
 import static org.creepebucket.programmable_magic.ModUtils.sendErrorMessageToPlayer;
+import static org.creepebucket.programmable_magic.ModUtils.formatSpellError;
 import static org.creepebucket.programmable_magic.spells.SpellUtils.getSeps;
 import static org.creepebucket.programmable_magic.spells.SpellValueType.NUMBER;
 
@@ -93,7 +94,10 @@ public void execute() {
         boolean r = consumePendingItemsFromInventory();
         if (!r) {
             // 未能按预期扣除物品
-            sendErrorMessageToPlayer(Component.translatable("message.programmable_magic.error.wand.placeholder_consume_failed"), player);
+            sendErrorMessageToPlayer(formatSpellError(
+                    Component.translatable("message.programmable_magic.error.kind.param"),
+                    Component.translatable("message.programmable_magic.error.wand.placeholder_consume_failed")
+            ), player);
             return;
         }
         // 4. 创建法术实体