From 3960ee53f5acddbd19b3a604aa7917e366c6d407 Mon Sep 17 00:00:00 2001
From: Remco <habboilany@gmail.com>
Date: Mon, 4 Jan 2021 21:36:42 +0100
Subject: [PATCH] WiredConditionFurniHaveFurni now saves as JSON

---
 .../WiredConditionFurniHaveFurni.java         | 57 +++++++++++++------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveFurni.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveFurni.java
index d83921c4..ddce19a5 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveFurni.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/conditions/WiredConditionFurniHaveFurni.java
@@ -15,6 +15,8 @@ import gnu.trove.set.hash.THashSet;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class WiredConditionFurniHaveFurni extends InteractionWiredCondition {
     public static final WiredConditionType type = WiredConditionType.FURNI_HAS_FURNI;
@@ -58,30 +60,43 @@ public class WiredConditionFurniHaveFurni extends InteractionWiredCondition {
     @Override
     public String getWiredData() {
         this.refresh();
-
-        StringBuilder data = new StringBuilder((this.all ? "1" : "0") + ":");
-
-        for (HabboItem item : this.items)
-            data.append(item.getId()).append(";");
-
-        return data.toString();
+        return WiredHandler.getGsonBuilder().create().toJson(new JsonData(
+                this.all,
+                this.items.stream().map(HabboItem::getId).collect(Collectors.toList())
+        ));
     }
 
     @Override
     public void loadWiredData(ResultSet set, Room room) throws SQLException {
-        String[] data = set.getString("wired_data").split(":");
+        String wiredData = set.getString("wired_data");
 
-        if (data.length >= 1) {
-            this.all = (data[0].equals("1"));
+        if (wiredData.startsWith("{")) {
+            JsonData data = WiredHandler.getGsonBuilder().create().fromJson(wiredData, JsonData.class);
+            this.all = data.all;
 
-            if (data.length == 2) {
-                String[] items = data[1].split(";");
+            for(int id : data.itemIds) {
+                HabboItem item = room.getHabboItem(id);
 
-                for (String s : items) {
-                    HabboItem item = room.getHabboItem(Integer.valueOf(s));
+                if (item != null) {
+                    this.items.add(item);
+                }
+            }
 
-                    if (item != null)
-                        this.items.add(item);
+        } else {
+            String[] data = wiredData.split(":");
+
+            if (data.length >= 1) {
+                this.all = (data[0].equals("1"));
+
+                if (data.length == 2) {
+                    String[] items = data[1].split(";");
+
+                    for (String s : items) {
+                        HabboItem item = room.getHabboItem(Integer.parseInt(s));
+
+                        if (item != null)
+                            this.items.add(item);
+                    }
                 }
             }
         }
@@ -166,4 +181,14 @@ public class WiredConditionFurniHaveFurni extends InteractionWiredCondition {
             this.items.remove(item);
         }
     }
+
+    static class JsonData {
+        boolean all;
+        List<Integer> itemIds;
+
+        public JsonData(boolean all, List<Integer> itemIds) {
+            this.all = all;
+            this.itemIds = itemIds;
+        }
+    }
 }