From 66f19f35be56eedd26a16d953aee3db47262eaf2 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Thu, 20 Aug 2015 17:02:31 +0100 Subject: [PATCH] Fixed the Corporea Index kicking you out of the server if you try requesting an item with control codes in the name (such as brews). Closes #1276 --- .../vazkii/botania/api/corporea/CorporeaHelper.java | 10 +++++++++- .../core/handler/CorporeaAutoCompleteHandler.java | 6 ++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index 28c38172a..5b10a4341 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -15,6 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.WeakHashMap; +import java.util.regex.Pattern; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -31,6 +32,8 @@ public final class CorporeaHelper { private static final WeakHashMap, List> cachedNetworks = new WeakHashMap(); private static final List autoCompleteControllers = new ArrayList(); + private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); + public static final String[] WILDCARD_STRINGS = new String[] { "...", "~", "+", "?" , "*" }; @@ -291,7 +294,7 @@ public final class CorporeaHelper { } - String name = stack.getDisplayName().toLowerCase().trim(); + String name = stripControlCodes(stack.getDisplayName().toLowerCase().trim()); return equalOrContain(name, s, contains) || equalOrContain(name + "s", s, contains) || equalOrContain(name + "es", s, contains) || name.endsWith("y") && equalOrContain(name.substring(0, name.length() - 1) + "ies", s, contains); } @@ -337,4 +340,9 @@ public final class CorporeaHelper { return true; return false; } + + // Copy from StringUtils + public static String stripControlCodes(String str) { + return patternControlCode.matcher(str).replaceAll(""); + } } diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 21e6d8731..b789bb200 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -42,6 +42,8 @@ public class CorporeaAutoCompleteHandler { List completions = new ArrayList(); int position; + private static final String __OBFID = "CL_00001501"; + static TreeSet itemNames = new TreeSet( new Comparator() { @Override @@ -65,7 +67,7 @@ public class CorporeaAutoCompleteHandler { try { item.getSubItems(item, (CreativeTabs) null, curList); for(ItemStack stack : curList) - itemNames.add(stack.getDisplayName().trim()); + itemNames.add(CorporeaHelper.stripControlCodes(stack.getDisplayName().trim())); } catch (Exception e) {} } @@ -166,7 +168,7 @@ public class CorporeaAutoCompleteHandler { } return result; } - + private static class CompletionData implements Comparable { private String string;