From ff8ba90da3915c19048971ca453e13f25e201003 Mon Sep 17 00:00:00 2001 From: Justin Date: Thu, 18 Jan 2018 13:03:37 -0800 Subject: [PATCH] Fix default GUIConfig displaying child categories twice (#4599) --- .../minecraftforge/common/config/ConfigElement.java | 2 ++ .../java/net/minecraftforge/debug/ConfigTest.java | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/net/minecraftforge/common/config/ConfigElement.java b/src/main/java/net/minecraftforge/common/config/ConfigElement.java index 75f36edb9c..a65d514660 100644 --- a/src/main/java/net/minecraftforge/common/config/ConfigElement.java +++ b/src/main/java/net/minecraftforge/common/config/ConfigElement.java @@ -396,6 +396,8 @@ public class ConfigElement implements IConfigElement if (catName.isEmpty()) continue; ConfigCategory category = config.getCategory(catName); + if (category.isChild()) + continue; DummyCategoryElement element = new DummyCategoryElement(category.getName(), category.getLanguagekey(), new ConfigElement(category).getChildElements()); element.setRequiresMcRestart(category.requiresMcRestart()); element.setRequiresWorldRestart(category.requiresWorldRestart()); diff --git a/src/test/java/net/minecraftforge/debug/ConfigTest.java b/src/test/java/net/minecraftforge/debug/ConfigTest.java index c9fa1f3e1e..d8225a8dd8 100644 --- a/src/test/java/net/minecraftforge/debug/ConfigTest.java +++ b/src/test/java/net/minecraftforge/debug/ConfigTest.java @@ -130,6 +130,8 @@ public class ConfigTest public static SubCat sub1 = new SubCat("Hello"); @Name("test_b") public static SubCat sub2 = new SubCat("Goodbye"); + @Name("test_c") + public static SubCat2 sub3 = new SubCat2("Hi"); public static class SubCat { @@ -141,6 +143,17 @@ public class ConfigTest 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")