fix passthrough because DFU encodes null values to json but doesn't d…

…ecode properly see: Mojang/DataFixerUpper#62
Team-Resourceful · Jan 25, 2023 · 07acf58 · 07acf58
1 parent 5789b43
commit 07acf58
Showing 1 changed file with 25 additions and 1 deletion.
diff --git a/common/src/main/java/com/teamresourceful/resourcefullib/common/codecs/CodecExtras.java b/common/src/main/java/com/teamresourceful/resourcefullib/common/codecs/CodecExtras.java
@@ -1,6 +1,8 @@
 package com.teamresourceful.resourcefullib.common.codecs;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
@@ -54,7 +56,7 @@ public static <T> Codec<T> passthrough(Function<T, JsonElement> encoder, Functio
                 return DataResult.success(decoder.apply(jsonElement));
             }
             return DataResult.error("Value was not an instance of JsonElement");
-        }, input -> new Dynamic<>(JsonOps.INSTANCE, encoder.apply(input)));
+        }, input -> new Dynamic<>(JsonOps.INSTANCE, clearNulls(encoder.apply(input))));
     }
 
     public static <S> Codec<S> eitherRight(Codec<Either<S, S>> eitherCodec) {
@@ -64,4 +66,26 @@ public static <S> Codec<S> eitherRight(Codec<Either<S, S>> eitherCodec) {
     public static <S> Codec<S> eitherLeft(Codec<Either<S, S>> eitherCodec) {
         return eitherCodec.xmap(e -> e.map(p -> p, p -> p), Either::left);
     }
+
+    private static JsonElement clearNulls(JsonElement json) {
+        if (json instanceof JsonObject object) {
+            JsonObject newObject = new JsonObject();
+            for (String key : object.keySet()) {
+                JsonElement element = clearNulls(object.get(key));
+                if (element != null) {
+                    newObject.add(key, element);
+                }
+            }
+        } else if (json instanceof JsonArray array) {
+            JsonArray newArray = new JsonArray();
+            for (JsonElement item : array) {
+                JsonElement element = clearNulls(item);
+                if (element != null) {
+                    newArray.add(element);
+                }
+            }
+            return newArray;
+        }
+        return json.isJsonNull() ? null : json;
+    }
 }