WiredEffectTeleport now saves as json

This commit is contained in:
Remco 2021-01-04 06:35:58 -05:00
parent 9b6ae05ac3
commit e73625806f

View File

@ -181,28 +181,35 @@ public class WiredEffectTeleport extends InteractionWiredEffect {
@Override @Override
public String getWiredData() { public String getWiredData() {
StringBuilder wiredData = new StringBuilder(this.getDelay() + "\t"); return WiredHandler.getGsonBuilder().create().toJson(new JsonData(
this.delay,
if (this.items != null && !this.items.isEmpty()) { this.items.stream().map(HabboItem::getId).collect(Collectors.toList())
for (HabboItem item : this.items) { ));
wiredData.append(item.getId()).append(";");
}
}
return wiredData.toString();
} }
@Override @Override
public void loadWiredData(ResultSet set, Room room) throws SQLException { public void loadWiredData(ResultSet set, Room room) throws SQLException {
this.items = new ArrayList<>(); this.items = new ArrayList<>();
String[] wiredData = set.getString("wired_data").split("\t"); String wiredData = set.getString("wired_data");
if (wiredData.length >= 1) { if (wiredData.startsWith("{")) {
this.setDelay(Integer.valueOf(wiredData[0])); JsonData data = WiredHandler.getGsonBuilder().create().fromJson(wiredData, JsonData.class);
this.setDelay(data.delay);
for (Integer id: data.itemIds) {
HabboItem item = room.getHabboItem(id);
if (item != null) {
this.items.add(item);
} }
if (wiredData.length == 2) { }
if (wiredData[1].contains(";")) { } else {
for (String s : wiredData[1].split(";")) { String[] wiredDataOld = wiredData.split("\t");
if (wiredDataOld.length >= 1) {
this.setDelay(Integer.valueOf(wiredDataOld[0]));
}
if (wiredDataOld.length == 2) {
if (wiredDataOld[1].contains(";")) {
for (String s : wiredDataOld[1].split(";")) {
HabboItem item = room.getHabboItem(Integer.valueOf(s)); HabboItem item = room.getHabboItem(Integer.valueOf(s));
if (item != null) if (item != null)
@ -211,6 +218,7 @@ public class WiredEffectTeleport extends InteractionWiredEffect {
} }
} }
} }
}
@Override @Override
public void onPickUp() { public void onPickUp() {
@ -232,4 +240,14 @@ public class WiredEffectTeleport extends InteractionWiredEffect {
protected long requiredCooldown() { protected long requiredCooldown() {
return 50L; return 50L;
} }
static class JsonData {
int delay;
List<Integer> itemIds;
public JsonData(int delay, List<Integer> itemIds) {
this.delay = delay;
this.itemIds = itemIds;
}
}
} }