Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-15 07:05:51 +01:00
Code Issues Projects Releases Wiki Activity

Improve handling of dye color names

Browse Source
This commit is contained in:
PikaMug 2020-01-07 03:09:18 -05:00
parent 024e455698
commit 081e14dc64
5 changed files with 63 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -3057,7 +3057,7 @@ public class Quester {
List<String> colors = questSec.getStringList("sheep-to-shear");
List<Integer> amounts = questSec.getIntegerList("sheep-sheared");
for (String color : colors) {
getQuestData(quest).sheepSheared.put(MiscUtil.getDyeColor(color), amounts.get(colors
getQuestData(quest).sheepSheared.put(MiscUtil.getProperDyeColor(color), amounts.get(colors
.indexOf(color)));
}
}

8
main/src/main/java/me/blackvein/quests/prompts/MobsPrompt.java
View File

@ -815,9 +815,9 @@ public class MobsPrompt extends FixedSetPrompt {
final DyeColor[] colArr = DyeColor.values();
for (int i = 0; i < colArr.length; i++) {
if (i < (colArr.length - 1)) {
cols += MiscUtil.getDyeString(colArr[i]) + ", ";
cols += MiscUtil.snakeCaseToUpperCamelCase(colArr[i].name()) + ", ";
} else {
cols += MiscUtil.getDyeString(colArr[i]) + "\n";
cols += MiscUtil.snakeCaseToUpperCamelCase(colArr[i].name()) + "\n";
}
}
return cols + ChatColor.YELLOW + Lang.get("stageEditorShearColorsPrompt");
@ -829,8 +829,8 @@ public class MobsPrompt extends FixedSetPrompt {
if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false) {
LinkedList<String> colors = new LinkedList<String>();
for (String s : input.split(" ")) {
if (MiscUtil.getDyeColor(s) != null) {
colors.add(MiscUtil.getDyeString(MiscUtil.getDyeColor(s)));
if (MiscUtil.getProperDyeColor(s) != null) {
colors.add(s);
context.setSessionData(pref + CK.S_SHEAR_COLORS, colors);
} else {
player.sendMessage(ChatColor.LIGHT_PURPLE + s + " " + ChatColor.RED

16
main/src/main/java/me/blackvein/quests/util/ItemUtil.java
View File

@ -615,22 +615,6 @@ public class ItemUtil {
return prettyString;
}
/**
* Gets name of enchantment exactly as it appears in lang file
*
* @param e Enchantment to get localized name of
* @return localized name
*/
/*private static String getEnchantmentName(Enchantment e) {
try {
return (Lang.get("ENCHANTMENT_" + e.getName()));
} catch (NullPointerException ne) {
Bukkit.getLogger().warning(e.getName() + " was not found in Lang.yml, please ask the developer to "
+ "update the file or simply add an entry for the enchantment");
return e.getName().toLowerCase().replace("_", " ");
}
}*/
/**
* Gets enchantment from name
*

94
main/src/main/java/me/blackvein/quests/util/MiscUtil.java
View File

@ -21,6 +21,12 @@ import org.bukkit.entity.EntityType;
public class MiscUtil {
/**
* Gets a human-readable date and time from milliseconds
*
* @param milliseconds Total amount of time to convert
* @return Converted time in text
*/
public static String getTime(long milliseconds) {
String message = "";
long days = milliseconds / 86400000;
@ -73,8 +79,8 @@ public class MiscUtil {
/**
* Capitalize first letter of text and set remainder to lowercase
*
* @param input
* @return
* @param input To convert
* @return Converted text
*/
public static String getCapitalized(String input) {
if (input.isEmpty()) {
@ -157,22 +163,42 @@ public class MiscUtil {
return null;
}
/**
* Gets player-friendly name from type. 'LIGHT_BLUE' becomes 'Light Blue'
*
* @param type any dye type, ideally
* @return cleaned-up string
*/
public static String getPrettyDyeColorName(DyeColor color) {
return Lang.get("COLOR_" + color.name());
}
public static DyeColor getDyeColor(String s) {
String col = Lang.getKey(getCapitalized(s));
col = col.replace("COLOR_", "");
DyeColor color = null;
try {
color = DyeColor.valueOf(col);
} catch (IllegalArgumentException e) {
// Do nothing
/**
* Gets DyeColor from name
*
* @param properName Name to get type from
* @return DyeColor or null if invalid
*/
public static DyeColor getProperDyeColor(String properName) {
properName = properName.replace("_", "").replace(" ", "").toUpperCase();
for (DyeColor dc : DyeColor.values()) {
if (dc.name().replace("_", "").equalsIgnoreCase(properName)) {
return dc;
}
if (getDyeColorLegacy(properName) != null) {
return dc;
}
}
return color != null ? color : getDyeColorLegacy(s);
return null;
}
/**
* Gets DyeColor from name as it appears in lang file
*
* @deprecated Use {@link #getProperDyeColor(String)}
* @param s Name to match lang value to
* @return DyeColor or null if invalid
*/
public static DyeColor getDyeColorLegacy(String s) {
if (s.equalsIgnoreCase("Black") || s.equalsIgnoreCase(Lang.get("COLOR_BLACK"))) {
return DyeColor.BLACK;
@ -213,25 +239,18 @@ public class MiscUtil {
}
}
public static String getDyeString(DyeColor dc) {
return Lang.get("COLOR_" + dc.name());
}
/**
* @deprecated Will be removed in a future version of Quests
* Split text into multiple lines
*
* @param input Text to convert
* @param wordDelimiter Character(s) used to split up text
* @param lineLength Maximum number of characters per line
* @param lineColor Color to use at start of each new line
* @return Converted text
*/
public static String concatArgArray(String[] args, int startingIndex, int endingIndex, char delimiter) {
String s = "";
for (int i = startingIndex; i <= endingIndex; i++) {
s += args[i] + delimiter;
}
s = s.substring(0, s.length());
return s.trim().equals("") ? null : s.trim();
}
public static LinkedList<String> makeLines(String s, String wordDelimiter, int lineLength, ChatColor lineColor) {
public static LinkedList<String> makeLines(String input, String wordDelimiter, int lineLength, ChatColor lineColor) {
LinkedList<String> toReturn = new LinkedList<String>();
String[] split = s.split(wordDelimiter);
String[] split = input.split(wordDelimiter);
String line = "";
int currentLength = 0;
for (String piece : split) {
@ -265,16 +284,16 @@ public class MiscUtil {
* @param s string to process
* @return processed string
*/
public static String capitalsToSpaces(String s) {
int max = s.length();
public static String capitalsToSpaces(String input) {
int max = input.length();
for (int i = 1; i < max; i++) {
if (Character.isUpperCase(s.charAt(i))) {
s = s.substring(0, i) + " " + s.substring(i);
if (Character.isUpperCase(input.charAt(i))) {
input = input.substring(0, i) + " " + input.substring(i);
i++;
max++;
}
}
return s;
return input;
}
/**
@ -283,13 +302,14 @@ public class MiscUtil {
* @param s string to process
* @return processed string
*/
public static String spaceToCapital(String s) {
int index = s.indexOf(' ');
public static String spaceToCapital(String input) {
int index = input.indexOf(' ');
if (index == -1) {
return null;
}
s = s.substring(0, (index + 1)) + Character.toUpperCase(s.charAt(index + 1)) + s.substring(index + 2);
s = s.replaceFirst(" ", "");
return s;
input = input.substring(0, (index + 1)) + Character.toUpperCase(input.charAt(index + 1))
+ input.substring(index + 2);
input = input.replaceFirst(" ", "");
return input;
}
}

16
main/src/main/resources/strings.yml
View File

@ -701,22 +701,6 @@ journalAlreadyHave: "You already have your Quest Journal out."
journalNoRoom: "You have no room in your inventory for your Quest Journal!"
journalNoQuests: "You have no accepted quests!"
journalDenied: "You cannot do that with your Quest Journal."
COLOR_BLACK: "Black"
COLOR_BLUE: "Blue"
COLOR_BROWN: "Brown"
COLOR_CYAN: "Cyan"
COLOR_GRAY: "Gray"
COLOR_GREEN: "Green"
COLOR_LIGHT_BLUE: "LightBlue"
COLOR_LIME: "Lime"
COLOR_MAGENTA: "Magenta"
COLOR_ORANGE: "Orange"
COLOR_PINK: "Pink"
COLOR_PURPLE: "Purple"
COLOR_RED: "Red"
COLOR_SILVER: "Silver"
COLOR_WHITE: "White"
COLOR_YELLOW: "Yellow"
timeZone: "Time zone"
timeDay: "Day"
timeDays: "Days"