enhance: 使SkillHandler使用DisguiseState中的技能和技能配置

NiFeather · Oct 11, 2024 · 2e664ed · 2e664ed
1 parent cd38792
commit 2e664ed
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 35 deletions.
diff --git a/src/main/java/xyz/nifeather/morph/misc/DisguiseState.java b/src/main/java/xyz/nifeather/morph/misc/DisguiseState.java
@@ -31,12 +31,10 @@
 import xyz.nifeather.morph.network.server.MorphClientHandler;
 import xyz.nifeather.morph.providers.animation.SingleAnimation;
 import xyz.nifeather.morph.providers.disguise.DisguiseProvider;
-import xyz.nifeather.morph.skills.IMorphSkill;
-import xyz.nifeather.morph.skills.MorphSkillHandler;
-import xyz.nifeather.morph.skills.SkillCooldownInfo;
-import xyz.nifeather.morph.skills.SkillType;
+import xyz.nifeather.morph.skills.*;
 import xyz.nifeather.morph.skills.impl.NoneMorphSkill;
 import xyz.nifeather.morph.storage.playerdata.PlayerMeta;
+import xyz.nifeather.morph.storage.skill.SkillAbilityConfiguration;
 import xyz.nifeather.morph.utilities.ItemUtils;
 import xyz.nifeather.morph.utilities.NbtUtils;
 import xyz.nifeather.morph.utilities.PermissionUtils;
@@ -556,22 +554,36 @@ public void skillLookupIdentifier(@NotNull String newSkillID)
         this.skillLookupIdentifier = newSkillID;
     }
 
+    @Nullable
+    private SkillAbilityConfiguration skillAbilityConfiguration;
+
+    public void setSkillAbilityConfiguration(@Nullable SkillAbilityConfiguration newInstance)
+    {
+        this.skillAbilityConfiguration = newInstance;
+    }
+
+    @Nullable
+    public SkillAbilityConfiguration getSkillAbilityConfiguration()
+    {
+        return skillAbilityConfiguration;
+    }
+
     @NotNull
     private IMorphSkill<?> skill = NoneMorphSkill.instance;
 
     /**
      * 设置此伪装的技能
-     * @param s 目标技能
+     * @param newSkill 目标技能
      * @apiNote 如果目标技能是null，则会fallback到 {@link NoneMorphSkill#instance}
      */
-    public void setSkill(@Nullable IMorphSkill<?> s)
+    public void setSkill(@Nullable IMorphSkill<?> newSkill)
     {
-        if (s == null) s = NoneMorphSkill.instance;
+        if (newSkill == null) newSkill = NoneMorphSkill.instance;
 
         this.skill.onDeEquip(this);
 
-        s.onInitialEquip(this);
-        this.skill = s;
+        newSkill.onInitialEquip(this);
+        this.skill = newSkill;
     }
 
     /**

diff --git a/src/main/java/xyz/nifeather/morph/providers/disguise/DefaultDisguiseProvider.java b/src/main/java/xyz/nifeather/morph/providers/disguise/DefaultDisguiseProvider.java
@@ -23,6 +23,7 @@
 import xyz.nifeather.morph.skills.SkillType;
 import xiamomc.pluginbase.Annotations.Resolved;
 import xiamomc.pluginbase.Messages.MessageStore;
+import xyz.nifeather.morph.storage.skill.ISkillOption;
 
 import java.util.List;
 
@@ -202,6 +203,11 @@ public void postConstructDisguise(DisguiseState state, @Nullable Entity targetEn
         var abilityOptions = abilityHandler.getOptionsFor(state.skillLookupIdentifier());
         abilityOptions.forEach((id, config) -> state.getAbilityUpdater().setAbilityConfig(id.asString(), config));
 
-        state.setSkill(skillHandler.lookupDisguiseSkill(state.skillLookupIdentifier()));
+        var skillEntry = skillHandler.getSkillEntry(state.skillLookupIdentifier());
+        if (skillEntry != null)
+        {
+            state.setSkillAbilityConfiguration(skillEntry.key());
+            state.setSkill(skillEntry.value());
+        }
     }
 }
diff --git a/src/main/java/xyz/nifeather/morph/skills/MorphSkillHandler.java b/src/main/java/xyz/nifeather/morph/skills/MorphSkillHandler.java
@@ -25,6 +25,7 @@
 import xyz.nifeather.morph.messages.MorphStrings;
 import xyz.nifeather.morph.messages.SkillStrings;
 import xyz.nifeather.morph.misc.permissions.CommonPermissions;
+import xyz.nifeather.morph.providers.disguise.DefaultDisguiseProvider;
 import xyz.nifeather.morph.skills.impl.*;
 import xyz.nifeather.morph.storage.skill.ISkillOption;
 import xyz.nifeather.morph.storage.skill.SkillAbilityConfiguration;
@@ -149,7 +150,7 @@ private void update()
      * @return 对应的技能和技能配置，如果没找到则是null
      */
     @Nullable
-    private Pair<SkillAbilityConfiguration, IMorphSkill<?>> getSkillEntry(String identifier)
+    public Pair<SkillAbilityConfiguration, IMorphSkill<?>> getSkillEntry(String identifier)
     {
         if (identifier == null) return null;
 
@@ -215,11 +216,9 @@ public void executeDisguiseSkill(Player player, boolean bypassPermission)
             return;
         }
 
-        var skillEntry= getSkillEntry(state.skillLookupIdentifier());
+        var skill = state.getSkill();
 
-        if (player.getGameMode() == GameMode.SPECTATOR
-            || skillEntry == null
-            || skillEntry.key().getSkillIdentifier().equals(SkillType.NONE))
+        if (player.getGameMode() == GameMode.SPECTATOR || skill == NoneMorphSkill.instance)
         {
             player.sendMessage(MessageUtils.prefixes(player, SkillStrings.skillNotAvaliableString()));
 
@@ -230,11 +229,9 @@ public void executeDisguiseSkill(Player player, boolean bypassPermission)
         }
 
         var cdInfo = getCooldownInfo(player.getUniqueId(), state.skillLookupIdentifier());
-        assert cdInfo != null;
-
         //logger.info("Permission is " + CommonPermissions.skillPermissionOf(skillEntry.getKey().getSkillIdentifier().asString(), state.getDisguiseIdentifier()));
 
-        var singleSkillPerm = CommonPermissions.skillPermissionOf(skillEntry.key().getSkillIdentifier().asString(), state.getDisguiseIdentifier());
+        var singleSkillPerm = CommonPermissions.skillPermissionOf(skill.getIdentifier().asString(), state.getDisguiseIdentifier());
         var hasSkillPerm = PermissionUtils.hasPermission(player, singleSkillPerm, true);
 
         if (!bypassPermission && !hasSkillPerm)
@@ -269,28 +266,18 @@ public void executeDisguiseSkill(Player player, boolean bypassPermission)
             return;
         }
 
-        var skill = skillEntry.right();
-        var config = skillEntry.left();
-
-        ISkillOption option;
-
-        try
-        {
-            option = skill.getOptionInstance().fromMap(config.getSkillOptions(skill));
-        }
-        catch (Throwable t)
+        SkillAbilityConfiguration config = state.getSkillAbilityConfiguration();
+        if (config == null)
         {
-            if (t instanceof ClassCastException)
-                logger.error(state.getDisguiseIdentifier() + " -> " + skill.getIdentifier() + " has an invalid setting, please check your skill configurations.");
-            else
-                logger.error("Error occurred while parsing skill configuration");
-
-            t.printStackTrace();
-
+            logger.warn("Disguise have a skill but don't have a skill configuration?!");
             player.sendMessage(MessageUtils.prefixes(player, SkillStrings.exceptionOccurredString()));
+            state.setSkillCooldown(20, true);
+
             return;
         }
 
+        var option = skill.getOptionInstance().fromMap(config.getSkillOptions(skill));
+
         var cd = skill.executeSkillGeneric(player, state, config, option);
         cdInfo.setLastInvoke(plugin.getCurrentTick());