aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
index 280a0d3d..cfeecf66 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
@@ -261,11 +261,18 @@ public class ItemResolutionQuery {
String romanLevel = matcher.group(3);
boolean ultimate = (format.contains("§l"));
- return (ultimate ? "ULTIMATE_" : "")
- + enchantmentName.replace(" ", "_").toUpperCase(Locale.ROOT)
+ return ((ultimate && !name.equals("Ultimate Wise")) ? "ULTIMATE_" : "")
+ + turboCheck(enchantmentName).replace(" ", "_").replace("-", "_").toUpperCase(Locale.ROOT)
+ ";" + Utils.parseRomanNumeral(romanLevel);
}
+ private String turboCheck(String text) {
+ if (text.equals("Turbo-Cocoa")) return "Turbo-Coco";
+ if (text.equals("Turbo-Cacti")) return "Turbo-Cactus";
+
+ return text;
+ }
+
private String resolveCrabHatName() {
int crabHatYear = getExtraAttributes().getInteger("party_hat_year");
String color = getExtraAttributes().getString("party_hat_color");