keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Don't parse category names as regular expressions in FieldWrapper.MapWrapper (#4334)

Browse source
This commit is contained in:
Choonster TheMage 2017-08-31 13:56:15 +10:00 committed by mezz
parent 52702e5cc9
commit cb051f7893
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/net/minecraftforge/common/config/FieldWrapper.java
View file

@ -15,6 +15,7 @@ import com.google.common.collect.Lists;
import net.minecraftforge.common.config.Config.RangeDouble;
import net.minecraftforge.common.config.Config.RangeInt;
import org.apache.commons.lang3.StringUtils;
import static net.minecraftforge.common.config.ConfigManager.*;
@ -131,13 +132,13 @@ public abstract class FieldWrapper implements IFieldWrapper
@Override
public Object getValue(String key)
{
return theMap.get(key.replaceFirst(category + "." + name + ".", ""));
return theMap.get(StringUtils.replaceOnce(key, category + "." + name + ".", ""));
}
@Override
public void setValue(String key, Object value)
{
String suffix = key.replaceFirst(category + "." + name + ".", "");
String suffix = StringUtils.replaceOnce(key, category + "." + name + ".", "");
theMap.put(suffix, value);
}

5
src/test/java/net/minecraftforge/debug/ConfigTest.java
View file

@ -18,6 +18,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.apache.logging.log4j.Logger;
import java.util.HashMap;
import java.util.Map;
@Mod(modid = ConfigTest.MODID, name = "ConfigTest", version = "1.0", acceptableRemoteVersions = "*")
@ -150,6 +151,9 @@ public class ConfigTest
@RequiresMcRestart
public static Map<String, Integer[]> theMap;
@Name("regex(test]")
public static Map<String, String> regexText = new HashMap<>();
static
{
theMap = Maps.newHashMap();
@ -161,6 +165,7 @@ public class ConfigTest
array[x] = i + x;
}
theMap.put("" + i, array);
regexText.put("" + i, "" + i);
}
}
}