diff --git a/src/main/java/com/iridium/iridiumfactions/configs/Configuration.java b/src/main/java/com/iridium/iridiumfactions/configs/Configuration.java index 6c5c294..8a991c2 100644 --- a/src/main/java/com/iridium/iridiumfactions/configs/Configuration.java +++ b/src/main/java/com/iridium/iridiumfactions/configs/Configuration.java @@ -59,7 +59,7 @@ public Configuration() { public double maxPower = 10; public double minPower = -10; public double startingPower = 10; - public int powerLossPerDeath = 3; + public double powerLossPerDeath = 3; public int powerRecoveryDelayInSeconds = 600; public double powerRecoveryAmount = 1; diff --git a/src/main/java/com/iridium/iridiumfactions/configs/Inventories.java b/src/main/java/com/iridium/iridiumfactions/configs/Inventories.java index 3b85bc6..61ee5b7 100644 --- a/src/main/java/com/iridium/iridiumfactions/configs/Inventories.java +++ b/src/main/java/com/iridium/iridiumfactions/configs/Inventories.java @@ -7,6 +7,7 @@ import com.iridium.iridiumcore.dependencies.xseries.XMaterial; import com.iridium.iridiumteams.configs.inventories.InventoryConfig; +import java.util.Arrays; import java.util.Collections; public class Inventories extends com.iridium.iridiumteams.configs.Inventories { @@ -43,5 +44,7 @@ public class Inventories extends com.iridium.iridiumteams.configs.Inventories { public Inventories() { super("Faction", "&c"); missionTypeSelectorGUI.weekly.enabled = false; + + membersGUI.item.lore = Arrays.asList("&cJoined: &7%player_join%", "&cRank: &7%player_rank%", "&cPower: &7%player_power%", "", "&c&l[!] &7Right Click to promote", "&c&l[!] &7Left click to demote/kick"); } } diff --git a/src/main/java/com/iridium/iridiumfactions/placeholders/UserPlaceholderBuilder.java b/src/main/java/com/iridium/iridiumfactions/placeholders/UserPlaceholderBuilder.java index 965a9f2..cdfa395 100644 --- a/src/main/java/com/iridium/iridiumfactions/placeholders/UserPlaceholderBuilder.java +++ b/src/main/java/com/iridium/iridiumfactions/placeholders/UserPlaceholderBuilder.java @@ -18,7 +18,8 @@ public class UserPlaceholderBuilder implements PlaceholderBuilder { private final List defaultPlaceholders = Arrays.asList( new Placeholder("player_rank", "N/A"), new Placeholder("player_name", "N/A"), - new Placeholder("player_join", "N/A") + new Placeholder("player_join", "N/A"), + new Placeholder("player_power", "N/A") ); @Override @@ -26,7 +27,8 @@ public List getPlaceholders(User user) { return cache.get(user, Duration.ofSeconds(1), () -> Arrays.asList( new Placeholder("player_rank", IridiumFactions.getInstance().getUserRanks().getOrDefault(user.getUserRank(), new UserRank("N/A", null)).name), new Placeholder("player_name", user.getName()), - new Placeholder("player_join", user.getJoinTime().format(DateTimeFormatter.ofPattern(IridiumFactions.getInstance().getConfiguration().dateTimeFormat))) + new Placeholder("player_join", user.getJoinTime().format(DateTimeFormatter.ofPattern(IridiumFactions.getInstance().getConfiguration().dateTimeFormat))), + new Placeholder("player_power", String.valueOf(user.getPower())) )); }