From 69266040d2970263575d8de5c1ea119943f281bb Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Fri, 30 Aug 2024 17:03:09 +0100 Subject: [PATCH] ProgWidgetLegacyConv: can't use JsonObject#isEmpty for now It's in NeoForge, but not when the vanilla launcher is used... yay #1338 --- .../common/util/legacyconv/ProgWidgetLegacyConv.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/desht/pneumaticcraft/common/util/legacyconv/ProgWidgetLegacyConv.java b/src/main/java/me/desht/pneumaticcraft/common/util/legacyconv/ProgWidgetLegacyConv.java index d98493a25..364fed25f 100644 --- a/src/main/java/me/desht/pneumaticcraft/common/util/legacyconv/ProgWidgetLegacyConv.java +++ b/src/main/java/me/desht/pneumaticcraft/common/util/legacyconv/ProgWidgetLegacyConv.java @@ -262,10 +262,11 @@ private static void convertV2toV3(JsonObject json) { // add all the sub-objects newEntry.add("pos", pos); - if (!digPlace.isEmpty()) newEntry.add("dig_place", digPlace); - if (!inv.isEmpty()) newEntry.add("inv", inv); - if (!cond.isEmpty()) newEntry.add("cond", cond); - if (!droneCond.isEmpty()) newEntry.add("drone_cond", cond); + // TODO: .isEmpty() can't be used right now: https://github.com/neoforged/NeoForge/issues/1380 + if (digPlace.size() > 0) newEntry.add("dig_place", digPlace); + if (inv.size() > 0) newEntry.add("inv", inv); + if (cond.size() > 0) newEntry.add("cond", cond); + if (droneCond.size() > 0) newEntry.add("drone_cond", cond); // phew, done newDoc.add(newEntry);