From 3ef1d6919c6dba2cda97f8c3ae752feb4bfaeffe Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Thu, 5 Sep 2019 15:38:14 -0700
Subject: [PATCH] Fix REGISTER packet encode/decode issues. Changed ForgeConfig
 values to return the default value if the config is not loaded, and exposed
 the value objects as a internal config.

---
 .../common/ForgeConfigSpec.java               | 30 +++++++++++++++----
 .../network/FMLMCRegisterPacketHandler.java   |  7 +++--
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java b/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java
index 135ae0ec4..f4a02db08 100644
--- a/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java
+++ b/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java
@@ -51,6 +51,7 @@ import com.electronwill.nightconfig.core.EnumGetMethod;
 import com.electronwill.nightconfig.core.ConfigSpec.CorrectionAction;
 import com.electronwill.nightconfig.core.ConfigSpec.CorrectionListener;
 import com.electronwill.nightconfig.core.InMemoryFormat;
+import com.electronwill.nightconfig.core.UnmodifiableConfig;
 import com.electronwill.nightconfig.core.file.FileConfig;
 import com.electronwill.nightconfig.core.utils.UnmodifiableConfigWrapper;
 import com.google.common.base.Joiner;
@@ -63,17 +64,18 @@ import com.google.common.collect.ObjectArrays;
  * Like {@link com.electronwill.nightconfig.core.ConfigSpec} except in builder format, and extended to accept comments, language keys,
  * and other things Forge configs would find useful.
  */
-
-public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
+public class ForgeConfigSpec extends UnmodifiableConfigWrapper<UnmodifiableConfig> //TODO: Remove extends and pipe everything through getSpec/getValues?
 {
     private Map<List<String>, String> levelComments = new HashMap<>();
 
+    private UnmodifiableConfig values;
     private Config childConfig;
 
     private boolean isCorrecting = false;
 
-    private ForgeConfigSpec(Config storage, Map<List<String>, String> levelComments) {
+    private ForgeConfigSpec(UnmodifiableConfig storage, UnmodifiableConfig values, Map<List<String>, String> levelComments) {
         super(storage);
+        this.values = values;
         this.levelComments = levelComments;
     }
 
@@ -94,6 +96,18 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
         return isCorrecting;
     }
 
+    public boolean isLoaded() {
+        return childConfig != null;
+    }
+
+    public UnmodifiableConfig getSpec() {
+        return this.config;
+    }
+
+    public UnmodifiableConfig getValues() {
+        return this.values;
+    }
+
     public void save()
     {
         Preconditions.checkNotNull(childConfig, "Cannot save config value without assigned Config object present");
@@ -123,7 +137,7 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
         return ret;
     }
 
-    private int correct(Config spec, CommentedConfig config, LinkedList<String> parentPath, List<String> parentPathUnmodifiable, CorrectionListener listener, boolean dryRun)
+    private int correct(UnmodifiableConfig spec, CommentedConfig config, LinkedList<String> parentPath, List<String> parentPathUnmodifiable, CorrectionListener listener, boolean dryRun)
     {
         int count = 0;
 
@@ -511,7 +525,10 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
         public ForgeConfigSpec build()
         {
             context.ensureEmpty();
-            ForgeConfigSpec ret = new ForgeConfigSpec(storage, levelComments);
+            Config valueCfg = Config.of(InMemoryFormat.withSupport(ConfigValue.class::isAssignableFrom));
+            values.forEach(v -> valueCfg.set(v.getPath(), v));
+
+            ForgeConfigSpec ret = new ForgeConfigSpec(storage, valueCfg, levelComments);
             values.forEach(v -> v.spec = ret);
             return ret;
         }
@@ -695,7 +712,8 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<Config>
         public T get()
         {
             Preconditions.checkNotNull(spec, "Cannot get config value before spec is built");
-            Preconditions.checkNotNull(spec.childConfig, "Cannot get config value without assigned Config object present");
+            if (spec.childConfig == null)
+                return defaultSupplier.get();
             return getRaw(spec.childConfig, path, defaultSupplier);
         }
 
diff --git a/src/main/java/net/minecraftforge/fml/network/FMLMCRegisterPacketHandler.java b/src/main/java/net/minecraftforge/fml/network/FMLMCRegisterPacketHandler.java
index 6f2b0aa7a..5cbdadfb0 100644
--- a/src/main/java/net/minecraftforge/fml/network/FMLMCRegisterPacketHandler.java
+++ b/src/main/java/net/minecraftforge/fml/network/FMLMCRegisterPacketHandler.java
@@ -6,6 +6,7 @@ import net.minecraft.network.IPacket;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ResourceLocation;
+
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.ByteArrayOutputStream;
@@ -21,7 +22,9 @@ public class FMLMCRegisterPacketHandler {
         private Set<ResourceLocation> locations = new HashSet<>();
 
         public void updateFrom(PacketBuffer buffer) {
-            locations = bytesToResLocation(buffer.readByteArray());
+            byte[] data = new byte[buffer.readableBytes() < 0 ? 0 : buffer.readableBytes()];
+            buffer.readBytes(data);
+            locations = bytesToResLocation(data);
         }
 
         byte[] toByteArray() {
@@ -82,7 +85,7 @@ public class FMLMCRegisterPacketHandler {
 
     public void sendRegistry(NetworkManager manager, final NetworkDirection dir) {
         PacketBuffer pb = new PacketBuffer(Unpooled.buffer());
-        pb.writeByteArray(getFrom(manager).toByteArray());
+        pb.writeBytes(getFrom(manager).toByteArray());
         final ICustomPacket<IPacket<?>> iPacketICustomPacket = dir.buildPacket(Pair.of(pb, 0), FMLNetworkConstants.MC_REGISTER_RESOURCE);
         manager.sendPacket(iPacketICustomPacket.getThis());
     }