diff --git a/src/main/java/xiamomc/morph/skills/DefaultConfigGenerator.java b/src/main/java/xiamomc/morph/skills/DefaultConfigGenerator.java index 408eefda..3175c02f 100644 --- a/src/main/java/xiamomc/morph/skills/DefaultConfigGenerator.java +++ b/src/main/java/xiamomc/morph/skills/DefaultConfigGenerator.java @@ -167,7 +167,7 @@ public static void addSkillConfigurations(List skills addSkillConfiguration(skills, EntityType.WITHER, 10, SkillType.LAUNCH_PROJECTIVE, c -> c.addOption(SkillType.LAUNCH_PROJECTIVE, new ProjectiveConfiguration(EntityType.WITHER_SKULL, 1, "entity.wither.shoot", 24))); - addSkillConfiguration(skills, EntityType.GHAST, DisguiseUtils.GHAST_EXECUTE_DELAY + 40, SkillType.GHAST, c -> + addSkillConfiguration(skills, EntityType.GHAST, DisguiseUtils.GHAST_EXECUTE_DELAY + 40, SkillType.LAUNCH_PROJECTIVE, c -> c.addOption(SkillType.LAUNCH_PROJECTIVE, new ProjectiveConfiguration(EntityType.FIREBALL, 1, "entity.ghast.shoot", 35) .withDelay(DisguiseUtils.GHAST_EXECUTE_DELAY) .withWarningSound("entity.ghast.warn"))); diff --git a/src/main/java/xiamomc/morph/skills/MorphSkillHandler.java b/src/main/java/xiamomc/morph/skills/MorphSkillHandler.java index 4607f251..da605fcd 100644 --- a/src/main/java/xiamomc/morph/skills/MorphSkillHandler.java +++ b/src/main/java/xiamomc/morph/skills/MorphSkillHandler.java @@ -78,7 +78,6 @@ private void load() new SonicBoomMorphSkill(), new SplashPotionSkill(), - new GhastMorphSkill(), NoneMorphSkill.instance )); diff --git a/src/main/java/xiamomc/morph/skills/SkillType.java b/src/main/java/xiamomc/morph/skills/SkillType.java index 8aa9a0ac..b76b9476 100644 --- a/src/main/java/xiamomc/morph/skills/SkillType.java +++ b/src/main/java/xiamomc/morph/skills/SkillType.java @@ -13,7 +13,10 @@ public class SkillType public static final NamespacedKey TELEPORT = new NamespacedKey(nameSpace, "teleport"); public static final NamespacedKey EVOKER = new NamespacedKey(nameSpace, "evoker"); public static final NamespacedKey SONIC_BOOM = new NamespacedKey(nameSpace, "sonic_boom"); + + @Deprecated(forRemoval = true) public static final NamespacedKey GHAST = new NamespacedKey(nameSpace, "launch_projective_ghast"); + public static final NamespacedKey WITCH = new NamespacedKey(nameSpace, "witch"); public static final NamespacedKey UNKNOWN = new NamespacedKey(nameSpace, "unknown"); diff --git a/src/main/java/xiamomc/morph/skills/impl/GhastMorphSkill.java b/src/main/java/xiamomc/morph/skills/impl/GhastMorphSkill.java deleted file mode 100644 index 3dfef105..00000000 --- a/src/main/java/xiamomc/morph/skills/impl/GhastMorphSkill.java +++ /dev/null @@ -1,15 +0,0 @@ -package xiamomc.morph.skills.impl; - -import org.bukkit.NamespacedKey; -import org.jetbrains.annotations.NotNull; -import xiamomc.morph.skills.SkillType; - -@Deprecated -public class GhastMorphSkill extends LaunchProjectiveMorphSkill -{ - @Override - public @NotNull NamespacedKey getIdentifier() - { - return SkillType.GHAST; - } -} diff --git a/src/main/java/xiamomc/morph/storage/skill/SkillAbilityConfigurationStore.java b/src/main/java/xiamomc/morph/storage/skill/SkillAbilityConfigurationStore.java index 7b7f89c8..630b4d4d 100644 --- a/src/main/java/xiamomc/morph/storage/skill/SkillAbilityConfigurationStore.java +++ b/src/main/java/xiamomc/morph/storage/skill/SkillAbilityConfigurationStore.java @@ -230,24 +230,6 @@ private boolean migrate(SkillAbilityConfigurationContainer config) } - //恶魂的技能变成延迟释放 - if (version < 12) - { - var targetConfig = getConfigFor(EntityType.GHAST, config); - - if (targetConfig != null) - { - if (targetConfig.getSkillIdentifier().equals(SkillType.LAUNCH_PROJECTIVE)) - { - if (targetConfig.getCooldown() == 40) - targetConfig.setCooldown(DisguiseUtils.GHAST_EXECUTE_DELAY + 40); - - targetConfig.setSkillIdentifier(SkillType.GHAST); - targetConfig.moveOption(SkillType.LAUNCH_PROJECTIVE, SkillType.GHAST); - } - } - } - //马匹被动改成更改属性 if (version < 13) { @@ -267,6 +249,7 @@ private boolean migrate(SkillAbilityConfigurationContainer config) if (ghastConfig != null) { + //noinspection removal ghastConfig.moveOption(SkillType.GHAST, SkillType.LAUNCH_PROJECTIVE); ghastConfig.setSkillIdentifier(SkillType.LAUNCH_PROJECTIVE);