EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-01 06:36:23 +02:00
Code Issues Projects Releases Wiki Activity

fix potion matching for non-english locales Fixes #5174

Browse Source
This commit is contained in:
nossr50 2025-05-26 13:05:07 -07:00
parent 175526d3da
commit ce7461f459
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -1,3 +1,6 @@
Version 2.2.038
Fix potion match failing for non-english locales
Version 2.2.037 Version 2.2.037
Fixed bug where Alchemy was not matching potions correctly and producing incorrect results (Thanks TheBentoBox) Fixed bug where Alchemy was not matching potions correctly and producing incorrect results (Thanks TheBentoBox)

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gmail.nossr50.mcMMO</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId> <artifactId>mcMMO</artifactId>
<version>2.2.037</version> <version>2.2.038-SNAPSHOT</version>
<name>mcMMO</name> <name>mcMMO</name>
<url>https://github.com/mcMMO-Dev/mcMMO</url> <url>https://github.com/mcMMO-Dev/mcMMO</url>
<scm> <scm>

17
src/main/java/com/gmail/nossr50/util/PotionUtil.java
View File

@ -10,10 +10,7 @@ import org.jetbrains.annotations.Nullable;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Arrays; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class PotionUtil { public class PotionUtil {
// Some of the old potion types got renamed, our configs can still contain these old names // Some of the old potion types got renamed, our configs can still contain these old names
@ -72,15 +69,17 @@ public class PotionUtil {
* @return The potion type * @return The potion type
*/ */
public static PotionType matchPotionType(String partialName, boolean isUpgraded, boolean isExtended) { public static PotionType matchPotionType(String partialName, boolean isUpgraded, boolean isExtended) {
// updatedName = convertUpgradedOrExtended(updatedName, isUpgraded, isExtended);
if (COMPATIBILITY_MODE == PotionCompatibilityType.PRE_1_20_5) { if (COMPATIBILITY_MODE == PotionCompatibilityType.PRE_1_20_5) {
return matchLegacyPotionType(partialName); return matchLegacyPotionType(partialName);
} else { } else {
String updatedName = convertLegacyNames(partialName).toUpperCase(); final String updatedName = convertLegacyNames(partialName).toUpperCase(Locale.ENGLISH);
return Arrays.stream(PotionType.values()) return Arrays.stream(PotionType.values())
.filter(potionType -> getKeyGetKey(potionType).toUpperCase().contains(updatedName)) .filter(potionType -> getKeyGetKey(potionType)
.filter(potionType -> isUpgraded == potionType.name().toUpperCase().startsWith(STRONG + "_")) .toUpperCase(Locale.ENGLISH).contains(updatedName))
.filter(potionType -> isExtended == potionType.name().toUpperCase().startsWith(LONG + "_")) .filter(potionType -> isUpgraded == potionType.name()
.toUpperCase(Locale.ENGLISH).startsWith(STRONG + "_"))
.filter(potionType -> isExtended == potionType.name()
.toUpperCase(Locale.ENGLISH).startsWith(LONG + "_"))
.findAny().orElse(null); .findAny().orElse(null);
} }
} }