TotalFreedomMC/OpenInv
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/OpenInv.git synced 2024-12-23 00:15:08 +00:00
Code Issues Projects Releases Wiki Activity

Correct lang + replacement mistake with inventory names

Browse source
This commit is contained in:
Jikoo 2020-04-19 18:04:10 -04:00
parent a1b2df74cc
commit 34e7252d77
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
internal/v1_14_R1/src/main/java/com/lishid/openinv/internal/v1_14_R1/PlayerDataManager.java
View file

@ -190,19 +190,16 @@ public class PlayerDataManager implements IPlayerDataManager {
String title; String title;
if (inventory instanceof SpecialEnderChest) { if (inventory instanceof SpecialEnderChest) {
HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner(); HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.enderchest"); title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.enderchest", "%player%", owner.getName());
if (title == null) { if (title == null) {
title = "%player%'s Ender Chest"; title = owner.getName() + "'s Ender Chest";
} }
//noinspection ConstantConditions - owner name can be null if loaded by UUID
title = title.replace("%player%", owner.getName() != null ? owner.getName() : owner.getUniqueId().toString());
} else if (inventory instanceof SpecialPlayerInventory) { } else if (inventory instanceof SpecialPlayerInventory) {
EntityHuman owner = ((PlayerInventory) inventory).player; EntityHuman owner = ((PlayerInventory) inventory).player;
title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.player"); title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.player", "%player%", owner.getName());
if (title == null) { if (title == null) {
title = "%player%'s Inventory"; title = owner.getName() + "'s Inventory";
} }
title = title.replace("%player%", owner.getName() != null ? owner.getName() : owner.getUniqueID().toString());
} else { } else {
return player.openInventory(inventory.getBukkitInventory()); return player.openInventory(inventory.getBukkitInventory());
} }

9
internal/v1_15_R1/src/main/java/com/lishid/openinv/internal/v1_15_R1/PlayerDataManager.java
View file

@ -192,17 +192,16 @@ public class PlayerDataManager implements IPlayerDataManager {
String title; String title;
if (inventory instanceof SpecialEnderChest) { if (inventory instanceof SpecialEnderChest) {
HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner(); HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.enderchest"); title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.enderchest", "%player%", owner.getName());
if (title == null) { if (title == null) {
title = "%player%'s Ender Chest"; title = owner.getName() + "'s Ender Chest";
} }
} else if (inventory instanceof SpecialPlayerInventory) { } else if (inventory instanceof SpecialPlayerInventory) {
EntityHuman owner = ((PlayerInventory) inventory).player; EntityHuman owner = ((PlayerInventory) inventory).player;
title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.player"); title = OpenInv.getPlugin(OpenInv.class).getLocalizedMessage(player, "container.player", "%player%", owner.getName());
if (title == null) { if (title == null) {
title = "%player%'s Inventory"; title = owner.getName() + "'s Inventory";
} }
title = title.replace("%player%", owner.getName() != null ? owner.getName() : owner.getUniqueID().toString());
} else { } else {
return player.openInventory(inventory.getBukkitInventory()); return player.openInventory(inventory.getBukkitInventory());
} }

4
plugin/src/main/java/com/lishid/openinv/OpenInv.java
View file

@ -313,6 +313,10 @@ public class OpenInv extends JavaPlugin implements IOpenInv {
return this.languageManager.getValue(key, getLocale(sender)); return this.languageManager.getValue(key, getLocale(sender));
} }
public @Nullable String getLocalizedMessage(@NotNull CommandSender sender, @NotNull String key, String... replacements) {
return this.languageManager.getValue(key, getLocale(sender), replacements);
}
@Nullable @Nullable
private String getLocale(@NotNull CommandSender sender) { private String getLocale(@NotNull CommandSender sender) {
if (sender instanceof Player) { if (sender instanceof Player) {

2
plugin/src/main/resources/en_us.yml
View file

@ -25,4 +25,4 @@ messages:
off: 'off' off: 'off'
container: container:
player: '%player%''s Inventory' player: '%player%''s Inventory'
enderchest: '%Player''s Ender Chest' enderchest: '%player%''s Ender Chest'