From 7d333eb100854f6631ad18d1e394ea93bd0e9e1f Mon Sep 17 00:00:00 2001
From: joeflatt <joe.flatt@gmail.com>
Date: Tue, 31 Oct 2017 13:30:39 -0500
Subject: [PATCH] Fixed property losing state after rename. (#4123)

---
 .../common/config/Configuration.java          |  8 +-
 .../test/ConfigurationTest.java               | 79 +++++++++++++++++++
 2 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/net/minecraftforge/test/ConfigurationTest.java

diff --git a/src/main/java/net/minecraftforge/common/config/Configuration.java b/src/main/java/net/minecraftforge/common/config/Configuration.java
index d13155378..e80322d5e 100644
--- a/src/main/java/net/minecraftforge/common/config/Configuration.java
+++ b/src/main/java/net/minecraftforge/common/config/Configuration.java
@@ -1412,10 +1412,12 @@ public class Configuration
     {
         if (hasCategory(category))
         {
-            if (getCategory(category).containsKey(oldPropName) && !oldPropName.equalsIgnoreCase(newPropName))
+            ConfigCategory cat = getCategory(category);
+            if (cat.containsKey(oldPropName) && !oldPropName.equalsIgnoreCase(newPropName))
             {
-                get(category, newPropName, getCategory(category).get(oldPropName).getString(), "");
-                getCategory(category).remove(oldPropName);
+                Property prop = cat.remove(oldPropName);
+                prop.setName(newPropName);
+                cat.put(newPropName, prop);
                 return true;
             }
         }
diff --git a/src/test/java/net/minecraftforge/test/ConfigurationTest.java b/src/test/java/net/minecraftforge/test/ConfigurationTest.java
new file mode 100644
index 000000000..e242a1a6e
--- /dev/null
+++ b/src/test/java/net/minecraftforge/test/ConfigurationTest.java
@@ -0,0 +1,79 @@
+package net.minecraftforge.test;
+
+
+import net.minecraft.init.Bootstrap;
+import net.minecraftforge.common.config.ConfigCategory;
+import net.minecraftforge.common.config.Configuration;
+import net.minecraftforge.common.config.Property;
+import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.fml.common.registry.ForgeTestRunner;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static junit.framework.TestCase.assertNull;
+import static org.junit.Assert.*;
+
+@RunWith(ForgeTestRunner.class)
+public class ConfigurationTest {
+
+    private Configuration config;
+    private ConfigCategory category;
+
+    @BeforeClass
+    public static void setupClass()
+    {
+        Loader.instance();
+        Bootstrap.register();
+    }
+
+    @Before
+    public void setup()
+    {
+        Property enabledProperty = new Property("enabled", "true", Property.Type.BOOLEAN);
+        enabledProperty.setComment("enabled property comment");
+
+        Property backgroundProperty = new Property("background", "0xFFFFFF", Property.Type.COLOR);
+        backgroundProperty.setComment("background property comment");
+
+        config = new Configuration();
+        category = config.getCategory("defaults");
+        category.put(enabledProperty.getName(), enabledProperty);
+        category.put(backgroundProperty.getName(), backgroundProperty);
+    }
+
+    @Test
+    public void testRenameProperty_newNameNotInUse()
+    {
+        boolean propertyRenamed = config.renameProperty("defaults", "enabled", "defaultEnabled");
+
+        Property enabledProperty = category.get("enabled");
+        Property defaultEnabledProperty = category.get("defaultEnabled");
+
+        assertTrue("Property was not renamed", propertyRenamed);
+        assertNull("Old property was not removed", enabledProperty);
+        assertNotNull("New property was not added", defaultEnabledProperty);
+        assertEquals("The property's name was not changed", "defaultEnabled", defaultEnabledProperty.getName());
+        assertEquals("The property's value changed", "true", defaultEnabledProperty.getString());
+        assertEquals("The property's type was changed", Property.Type.BOOLEAN, defaultEnabledProperty.getType());
+        assertEquals("The property's comment was changed", "enabled property comment", defaultEnabledProperty.getComment());
+    }
+
+    @Test
+    public void testRenameProperty_newNameInUse_replaceExistingProperty()
+    {
+        boolean propertyRenamed = config.renameProperty("defaults", "enabled", "background");
+
+        Property enabledProperty = category.get("enabled");
+        Property backgroundProperty = category.get("background");
+
+        assertTrue("Property was not renamed", propertyRenamed);
+        assertNull("Old property was not removed", enabledProperty);
+        assertNotNull("New property was not added", backgroundProperty);
+        assertEquals("The property's name was not changed", "background", backgroundProperty.getName());
+        assertEquals("The property's value changed", "true", backgroundProperty.getString());
+        assertEquals("The property's type was changed", Property.Type.BOOLEAN, backgroundProperty.getType());
+        assertEquals("The property's comment was changed", "enabled property comment", backgroundProperty.getComment());
+    }
+}