Skip to content

Commit

Permalink
refactor: pass ninjadata into the translation strings
Browse files Browse the repository at this point in the history
  • Loading branch information
@sekwah41
sekwah41 committed May 5, 2022
1 parent 7dc6e55 commit f71c906
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions src/main/java/com/sekwah/narutomod/abilities/Ability.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,16 @@ public SoundEvent castingSound() {
return NarutoSounds.JUTSU_CAST.get();
}

public String getTranslationKey() {
return this.getTranslationKey(0);
public String getTranslationKey(INinjaData ninjaData) {
return this.getTranslationKey(ninjaData, 0);
}

/**
* Mostly for channeled abilities. but in case an ability evolves as its channeled.
* @param ticksActive
* @return
*/
public String getTranslationKey(int ticksActive) {
public String getTranslationKey(INinjaData ninjaData, int ticksActive) {
return this.getRegistryName().toString();
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/sekwah/narutomod/abilities/jutsus/FireballJutsuAbility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public long defaultCombo() {
@Override
public boolean handleCost(Player player, INinjaData ninjaData, int chargeAmount) {
if(ninjaData.getChakra() < 30) {
player.displayClientMessage(new TranslatableComponent("jutsu.fail.notenoughchakra", new TranslatableComponent(this.getTranslationKey()).withStyle(ChatFormatting.YELLOW)), true);
player.displayClientMessage(new TranslatableComponent("jutsu.fail.notenoughchakra", new TranslatableComponent(this.getTranslationKey(ninjaData)).withStyle(ChatFormatting.YELLOW)), true);
return false;
}
ninjaData.useChakra(30, 30);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/sekwah/narutomod/abilities/jutsus/SubstitutionJutsuAbility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public boolean handleCost(Player player, INinjaData ninjaData, int chargeAmount)
}

@Override
public String getTranslationKey(int ticksActive) {
public String getTranslationKey(INinjaData ninjaData, int ticksActive) {
if(ticksActive <= 1) {
return this.getRegistryName().toString();
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/sekwah/narutomod/abilities/jutsus/WaterBulletJutsuAbility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public long defaultCombo() {
@Override
public boolean handleCost(Player player, INinjaData ninjaData, int chargeAmount) {
if(ninjaData.getChakra() < 30) {
player.displayClientMessage(new TranslatableComponent("jutsu.fail.notenoughchakra", new TranslatableComponent(this.getTranslationKey()).withStyle(ChatFormatting.YELLOW)), true);
player.displayClientMessage(new TranslatableComponent("jutsu.fail.notenoughchakra", new TranslatableComponent(this.getTranslationKey(ninjaData)).withStyle(ChatFormatting.YELLOW)), true);
return false;
}
ninjaData.useChakra(30, 30);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/sekwah/narutomod/capabilities/NinjaData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,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(1)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
player.sendMessage(new TranslatableComponent("jutsu.charge.start", new TranslatableComponent(ability.getTranslationKey(this, 1)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
} else {
player.sendMessage(new TranslatableComponent("jutsu.channel.start", new TranslatableComponent(ability.getTranslationKey(1)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
player.sendMessage(new TranslatableComponent("jutsu.channel.start", new TranslatableComponent(ability.getTranslationKey(this, 1)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
}
}

Expand All @@ -258,9 +258,9 @@ 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(this.ticksChanneled - 1)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
player.sendMessage(new TranslatableComponent("jutsu.cast", new TranslatableComponent(currentAbility.getTranslationKey(this, 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());
player.sendMessage(new TranslatableComponent("jutsu.channel.stop", new TranslatableComponent(currentAbility.getTranslationKey(this)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.RED), player.getUUID());
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/sekwah/narutomod/capabilities/lingerabilitydata/LingerAbilityData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ public boolean addAbility(ResourceLocation ability) {

public boolean addAbilityStarted(Player player, INinjaData ninjaData, Ability ability) {
if (ability.activationType() == Ability.ActivationType.TOGGLE && ability.logInChat()) {
player.sendMessage(new TranslatableComponent("jutsu.toggle.enabled", new TranslatableComponent(ability.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
player.sendMessage(new TranslatableComponent("jutsu.toggle.enabled", new TranslatableComponent(ability.getTranslationKey(ninjaData)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
}
return this.addAbility(ability.getRegistryName());
}

public boolean removeAbilityEnded(Player player, INinjaData ninjaData, Ability ability) {
if(ability instanceof Ability.HandleEnded endedAbility) endedAbility.handleAbilityEnded(player, ninjaData, 0);
if (ability.activationType() == Ability.ActivationType.TOGGLE && ability.logInChat()) {
player.sendMessage(new TranslatableComponent("jutsu.toggle.disabled", new TranslatableComponent(ability.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.RED), player.getUUID());
player.sendMessage(new TranslatableComponent("jutsu.toggle.disabled", new TranslatableComponent(ability.getTranslationKey(ninjaData)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.RED), player.getUUID());
}
return this.removeAbility(ability.getRegistryName());
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/sekwah/narutomod/capabilities/toggleabilitydata/ToggleAbilityData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ public boolean addAbility(ResourceLocation ability) {

public boolean addAbilityStarted(Player player, INinjaData ninjaData, Ability ability) {
if (ability.activationType() == Ability.ActivationType.TOGGLE && ability.logInChat()) {
player.sendMessage(new TranslatableComponent("jutsu.toggle.enabled", new TranslatableComponent(ability.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
player.sendMessage(new TranslatableComponent("jutsu.toggle.enabled", new TranslatableComponent(ability.getTranslationKey(ninjaData)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
}
return this.addAbility(ability.getRegistryName());
}

public boolean removeAbilityEnded(Player player, INinjaData ninjaData, Ability ability) {
if(ability instanceof Ability.HandleEnded endedAbility) endedAbility.handleAbilityEnded(player, ninjaData, 0);
if (ability.activationType() == Ability.ActivationType.TOGGLE && ability.logInChat()) {
player.sendMessage(new TranslatableComponent("jutsu.toggle.disabled", new TranslatableComponent(ability.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.RED), player.getUUID());
player.sendMessage(new TranslatableComponent("jutsu.toggle.disabled", new TranslatableComponent(ability.getTranslationKey(ninjaData)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.RED), player.getUUID());
}
return this.removeAbility(ability.getRegistryName());
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/sekwah/narutomod/network/c2s/ServerAbilityActivatePacket.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ public static void handle(ServerAbilityActivatePacket msg, Supplier<NetworkEvent

boolean canTriggerJutsu = true;
if (ability instanceof Ability.Cooldown) {
canTriggerJutsu = !((Ability.Cooldown) ability).checkCooldown(player, ninjaData, ability.getTranslationKey());
canTriggerJutsu = !((Ability.Cooldown) ability).checkCooldown(player, ninjaData, ability.getTranslationKey(ninjaData));
}

if(canTriggerJutsu && ability.handleCost(player, ninjaData)) {
if (ability.logInChat()) {
player.sendMessage(new TranslatableComponent("jutsu.cast", new TranslatableComponent(ability.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
player.sendMessage(new TranslatableComponent("jutsu.cast", new TranslatableComponent(ability.getTranslationKey(ninjaData)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
}
if(ability.castingSound() != null) {
player.getLevel().playSound(null,
Expand All @@ -68,7 +68,7 @@ public static void handle(ServerAbilityActivatePacket msg, Supplier<NetworkEvent
ability.performServer(player, ninjaData);

if (ability instanceof Ability.Cooldown) {
((Ability.Cooldown) ability).registerCooldown(ninjaData, ability.getTranslationKey());
((Ability.Cooldown) ability).registerCooldown(ninjaData, ability.getTranslationKey(ninjaData));
}
}
} else if(ability.activationType() == Ability.ActivationType.TOGGLE) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/sekwah/narutomod/network/c2s/ServerAbilityChannelPacket.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ public static void handle(ServerAbilityChannelPacket msg, Supplier<NetworkEvent.
if (ability.castingSound() != null) {
player.getLevel().playSound(null, player, ability.castingSound(), SoundSource.PLAYERS, 0.5f, 1.0f);
}
player.sendMessage(new TranslatableComponent("jutsu.cast", new TranslatableComponent(ability.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
player.sendMessage(new TranslatableComponent("jutsu.cast", new TranslatableComponent(ability.getTranslationKey(ninjaData)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.GREEN), player.getUUID());
ability.performServer(player, ninjaData, 0);
}
} else {
player.sendMessage(new TranslatableComponent("jutsu.channel.needed", new TranslatableComponent(ability.getTranslationKey()).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.RED), player.getUUID());
player.sendMessage(new TranslatableComponent("jutsu.channel.needed", new TranslatableComponent(ability.getTranslationKey(ninjaData)).withStyle(ChatFormatting.YELLOW)).withStyle(ChatFormatting.RED), player.getUUID());
}
}
}
Expand Down

0 comments on commit f71c906

Please sign in to comment.