Fix default GUIConfig displaying child categories twice (#4599)
This commit is contained in:
parent
01f573dbaa
commit
ff8ba90da3
|
@ -396,6 +396,8 @@ public class ConfigElement implements IConfigElement
|
||||||
if (catName.isEmpty())
|
if (catName.isEmpty())
|
||||||
continue;
|
continue;
|
||||||
ConfigCategory category = config.getCategory(catName);
|
ConfigCategory category = config.getCategory(catName);
|
||||||
|
if (category.isChild())
|
||||||
|
continue;
|
||||||
DummyCategoryElement element = new DummyCategoryElement(category.getName(), category.getLanguagekey(), new ConfigElement(category).getChildElements());
|
DummyCategoryElement element = new DummyCategoryElement(category.getName(), category.getLanguagekey(), new ConfigElement(category).getChildElements());
|
||||||
element.setRequiresMcRestart(category.requiresMcRestart());
|
element.setRequiresMcRestart(category.requiresMcRestart());
|
||||||
element.setRequiresWorldRestart(category.requiresWorldRestart());
|
element.setRequiresWorldRestart(category.requiresWorldRestart());
|
||||||
|
|
|
@ -130,6 +130,8 @@ public class ConfigTest
|
||||||
public static SubCat sub1 = new SubCat("Hello");
|
public static SubCat sub1 = new SubCat("Hello");
|
||||||
@Name("test_b")
|
@Name("test_b")
|
||||||
public static SubCat sub2 = new SubCat("Goodbye");
|
public static SubCat sub2 = new SubCat("Goodbye");
|
||||||
|
@Name("test_c")
|
||||||
|
public static SubCat2 sub3 = new SubCat2("Hi");
|
||||||
|
|
||||||
public static class SubCat
|
public static class SubCat
|
||||||
{
|
{
|
||||||
|
@ -141,6 +143,17 @@ public class ConfigTest
|
||||||
this.value = value;
|
this.value = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class SubCat2
|
||||||
|
{
|
||||||
|
@Name("child_cat")
|
||||||
|
public SubCat child;
|
||||||
|
|
||||||
|
public SubCat2(String value)
|
||||||
|
{
|
||||||
|
this.child = new SubCat(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@LangKey("config_test.config.maps")
|
@LangKey("config_test.config.maps")
|
||||||
|
|
Loading…
Reference in New Issue