aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
diff options
context:
space:
mode:
authorRoman / Linnea Gräf <roman.graef@gmail.com>2023-06-19 18:37:26 +0200
committerGitHub <noreply@github.com>2023-06-19 18:37:26 +0200
commit7fd26d14e742c974ec50686c375ccdfd9c968faf (patch)
tree0ceb5fbb46d6619b912f8136f3ff7fb4f8848d25 /src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
parentf7168033b41ee84a58adbd005b6ba8898b38cb5a (diff)
downloadnotenoughupdates-7fd26d14e742c974ec50686c375ccdfd9c968faf.tar.gz
notenoughupdates-7fd26d14e742c974ec50686c375ccdfd9c968faf.tar.bz2
notenoughupdates-7fd26d14e742c974ec50686c375ccdfd9c968faf.zip
Fix hot potato book being parsed as potato (#722)
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java16
1 files changed, 15 insertions, 1 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 5dacf7ef..cf508a33 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemResolutionQuery.java
@@ -37,6 +37,7 @@ import net.minecraft.nbt.NBTTagCompound;
import javax.annotation.Nullable;
import java.util.Arrays;
+import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
@@ -202,10 +203,23 @@ public class ItemResolutionQuery {
*/
public static String findInternalNameByDisplayName(String displayName, boolean mayBeMangled) {
var cleanDisplayName = StringUtils.cleanColour(displayName);
+ return filterInternalNameCandidates(
+ findInternalNameCandidatesForDisplayName(cleanDisplayName),
+ displayName,
+ mayBeMangled
+ );
+ }
+
+ public static String filterInternalNameCandidates(
+ Collection<String> candidateInternalNames,
+ String displayName,
+ boolean mayBeMangled
+ ) {
+ var cleanDisplayName = StringUtils.cleanColour(displayName);
var manager = NotEnoughUpdates.INSTANCE.manager;
String bestMatch = null;
int bestMatchLength = -1;
- for (String internalName : findInternalNameCandidatesForDisplayName(cleanDisplayName)) {
+ for (String internalName : candidateInternalNames) {
var cleanItemDisplayName = StringUtils.cleanColour(manager.getDisplayName(internalName));
if (cleanItemDisplayName.length() == 0) continue;
if (mayBeMangled