From e3e887ee134f93c55680973fce9b4b4e0279c236 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Sun, 3 Apr 2022 20:39:52 +0100 Subject: [PATCH] feat: add messages for substitution --- .../com/sekwah/narutomod/abilities/Ability.java | 9 +++++++++ .../jutsus/SubstitutionJutsuAbility.java | 16 ++++++++++++++-- .../sekwah/narutomod/capabilities/NinjaData.java | 9 +++++---- .../network/c2s/ServerAbilityChannelPacket.java | 1 + .../resources/assets/narutomod/lang/en_us.json | 4 +++- 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sekwah/narutomod/abilities/Ability.java b/src/main/java/com/sekwah/narutomod/abilities/Ability.java index ffc9ced1..dbefde27 100644 --- a/src/main/java/com/sekwah/narutomod/abilities/Ability.java +++ b/src/main/java/com/sekwah/narutomod/abilities/Ability.java @@ -83,6 +83,15 @@ public SoundEvent castingSound() { } public String getTranslationKey() { + return this.getTranslationKey(0); + } + + /** + * Mostly for channeled abilities. but in case an ability evolves as its channeled. + * @param ticksActive + * @return + */ + public String getTranslationKey(int ticksActive) { return this.getRegistryName().toString(); } diff --git a/src/main/java/com/sekwah/narutomod/abilities/jutsus/SubstitutionJutsuAbility.java b/src/main/java/com/sekwah/narutomod/abilities/jutsus/SubstitutionJutsuAbility.java index 3b4da2ac..5644cbed 100644 --- a/src/main/java/com/sekwah/narutomod/abilities/jutsus/SubstitutionJutsuAbility.java +++ b/src/main/java/com/sekwah/narutomod/abilities/jutsus/SubstitutionJutsuAbility.java @@ -25,13 +25,21 @@ public boolean handleCost(Player player, INinjaData ninjaData, int chargeAmount) return true; } + @Override + public String getTranslationKey(int ticksActive) { + if(ticksActive <= 1) { + return this.getRegistryName().toString(); + } else { + return this.getRegistryName().toString() + ".mark"; + } + } + /** * Due to the nature of this ability all costs and other things will be handled here. */ @Override public void performServer(Player player, INinjaData ninjaData, int ticksActive) { if(ticksActive == 0) { - player.displayClientMessage(new TranslatableComponent("jutsu.cast.substitution"), false); // Activate ninjaData.useSubstitution(1); Vec3 loc = ninjaData.getSubstitutionLoc(); @@ -54,7 +62,6 @@ public void performServer(Player player, INinjaData ninjaData, int ticksActive) } } } else { - player.displayClientMessage(new TranslatableComponent("jutsu.cast.substitution_mark"), false); ninjaData.setSubstitutionLoc(player.position(), player.level.dimension().location()); // Mark } @@ -62,6 +69,11 @@ public void performServer(Player player, INinjaData ninjaData, int ticksActive) @Override public boolean hideChannelMessages() { + return false; + } + + @Override + public boolean useChargedMessages() { return true; } } diff --git a/src/main/java/com/sekwah/narutomod/capabilities/NinjaData.java b/src/main/java/com/sekwah/narutomod/capabilities/NinjaData.java index dce9d77e..36e8b645 100644 --- a/src/main/java/com/sekwah/narutomod/capabilities/NinjaData.java +++ b/src/main/java/com/sekwah/narutomod/capabilities/NinjaData.java @@ -225,9 +225,9 @@ public void setCurrentlyChanneledAbility(Player player, Ability ability) { if(!(ability instanceof Ability.Channeled channeled && channeled.hideChannelMessages())) { if (ability instanceof Ability.Channeled channeled && channeled.useChargedMessages()) { - player.sendMessage(new TranslatableComponent("jutsu.charge.start", new TranslatableComponent(ability.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID()); + player.sendMessage(new TranslatableComponent("jutsu.charge.start", new TranslatableComponent(ability.getTranslationKey(1)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID()); } else { - player.sendMessage(new TranslatableComponent("jutsu.channel.start", new TranslatableComponent(ability.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID()); + player.sendMessage(new TranslatableComponent("jutsu.channel.start", new TranslatableComponent(ability.getTranslationKey(1)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID()); } } @@ -238,7 +238,7 @@ public void setCurrentlyChanneledAbility(Player player, Ability ability) { if( currentAbility != null) { if(!(currentAbility instanceof Ability.Channeled channeled && channeled.hideChannelMessages())) { if (currentAbility instanceof Ability.Channeled channeled && channeled.useChargedMessages()) { - player.sendMessage(new TranslatableComponent("jutsu.cast", new TranslatableComponent(currentAbility.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID()); + player.sendMessage(new TranslatableComponent("jutsu.cast", new TranslatableComponent(currentAbility.getTranslationKey(this.ticksChanneled - 1)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID()); } else { player.sendMessage(new TranslatableComponent("jutsu.channel.stop", new TranslatableComponent(currentAbility.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.RED), player.getUUID()); } @@ -299,7 +299,8 @@ public void updateDataServer(Player player) { } } else { if (this.ticksChanneled > 0) { - ability.performServer(player, this, this.ticksChanneled - 1); + int finalTicksChanneled = this.ticksChanneled - 1; + ability.performServer(player, this, finalTicksChanneled); this.setCurrentlyChanneledAbility(player, null); } } diff --git a/src/main/java/com/sekwah/narutomod/network/c2s/ServerAbilityChannelPacket.java b/src/main/java/com/sekwah/narutomod/network/c2s/ServerAbilityChannelPacket.java index 6e088083..334e2981 100644 --- a/src/main/java/com/sekwah/narutomod/network/c2s/ServerAbilityChannelPacket.java +++ b/src/main/java/com/sekwah/narutomod/network/c2s/ServerAbilityChannelPacket.java @@ -70,6 +70,7 @@ public static void handle(ServerAbilityChannelPacket msg, Supplier