TotalFreedomMC/TF-Marriage
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-Marriage.git synced 2024-06-24 06:50:52 +00:00
Code Issues Projects Releases Wiki Activity

Add option to show gender color in marry list

Browse source
This commit is contained in:
Lennart ten Wolde 2016-06-12 18:38:01 +02:00
parent c312bb2862
commit 2acfcacb52
2 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/lenis0012/bukkit/marriage2/config/Settings.java
View file

@ -18,6 +18,12 @@ public class Settings {
*/
public static final ConfigOption<Integer> COOLDOWN_KISS = new ConfigOption<>("cooldown.kiss", 2);
/**
* Features
*/
@ConfigHeader("Show gender colors in marry list command.")
public static final ConfigOption<Boolean> GENDER_IN_LIST = new ConfigOption<>("features.genders-in-list", true);
/**
* Chat
*/

34
src/main/java/com/lenis0012/bukkit/marriage2/misc/ListQuery.java
View file

@ -4,7 +4,9 @@ import com.google.common.collect.Maps;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.lenis0012.bukkit.marriage2.Gender;
import com.lenis0012.bukkit.marriage2.MData;
import com.lenis0012.bukkit.marriage2.config.Settings;
import com.lenis0012.bukkit.marriage2.internal.MarriagePlugin;
import com.lenis0012.bukkit.marriage2.internal.data.DataManager;
import com.lenis0012.bukkit.marriage2.internal.data.MarriagePlayer;
@ -35,8 +37,8 @@ public class ListQuery {
this.page = page;
this.marriages = marriages;
for(MData marriage : marriages) {
names.put(marriage.getPlayer1Id(), getName(db, marriage.getPlayer1Id()));
names.put(marriage.getPllayer2Id(), getName(db, marriage.getPllayer2Id()));
names.put(marriage.getPlayer1Id(), getNameFormat(db, marriage.getPlayer1Id()));
names.put(marriage.getPllayer2Id(), getNameFormat(db, marriage.getPllayer2Id()));
}
}
@ -47,7 +49,7 @@ public class ListQuery {
to.sendMessage(ChatColor.GOLD + ChatColor.BOLD.toString() + "Married players:");
to.sendMessage(ChatColor.GOLD + "Page " + (page + 1) + "/" + pages);
for(MData data : marriages) {
to.sendMessage(ChatColor.GREEN + names.get(data.getPlayer1Id()) + " + " + names.get(data.getPllayer2Id()));
to.sendMessage(names.get(data.getPlayer1Id()) + ChatColor.WHITE + " + " + names.get(data.getPllayer2Id()));
}
}
}.runTask(MarriagePlugin.getCore().getPlugin());
@ -65,6 +67,32 @@ public class ListQuery {
return marriages;
}
public static String getNameFormat(DataManager db, UUID userId) {
String name = getName(db, userId);
if(name == null) {
return ChatColor.GREEN + "???";
}
ChatColor color = ChatColor.GREEN;
if(Settings.GENDER_IN_LIST.value()) {
MarriagePlayer mp = db.loadPlayer(userId);
Gender gender = mp == null ? Gender.UNKNOWN : mp.getGender();
switch(gender) {
case MALE:
color = ChatColor.AQUA;
break;
case FEMALE:
color = ChatColor.LIGHT_PURPLE;
break;
case UNKNOWN:
color = ChatColor.GRAY;
break;
}
}
return color + getName(db, userId);
}
public static String getName(DataManager db, UUID userId) {
// local uuid cache
OfflinePlayer op = Bukkit.getOfflinePlayer(userId);