WiredTriggerHabboWalkOnFurni now saves as JSON

This commit is contained in:
Remco 2021-01-04 21:23:59 +01:00
parent c6af5baa70
commit 069bffb907

View File

@ -16,12 +16,12 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
public class WiredTriggerHabboWalkOnFurni extends InteractionWiredTrigger { public class WiredTriggerHabboWalkOnFurni extends InteractionWiredTrigger {
public static final WiredTriggerType type = WiredTriggerType.WALKS_ON_FURNI; public static final WiredTriggerType type = WiredTriggerType.WALKS_ON_FURNI;
private THashSet<HabboItem> items; private THashSet<HabboItem> items;
private String message = "";
public WiredTriggerHabboWalkOnFurni(ResultSet set, Item baseItem) throws SQLException { public WiredTriggerHabboWalkOnFurni(ResultSet set, Item baseItem) throws SQLException {
super(set, baseItem); super(set, baseItem);
@ -73,7 +73,7 @@ public class WiredTriggerHabboWalkOnFurni extends InteractionWiredTrigger {
} }
message.appendInt(this.getBaseItem().getSpriteId()); message.appendInt(this.getBaseItem().getSpriteId());
message.appendInt(this.getId()); message.appendInt(this.getId());
message.appendString(this.message); message.appendString("");
message.appendInt(0); message.appendInt(0);
message.appendInt(0); message.appendInt(0);
message.appendInt(this.getType().code); message.appendInt(this.getType().code);
@ -99,44 +99,40 @@ public class WiredTriggerHabboWalkOnFurni extends InteractionWiredTrigger {
@Override @Override
public String getWiredData() { public String getWiredData() {
StringBuilder wiredData = new StringBuilder(super.getDelay() + ":\t:"); return WiredHandler.getGsonBuilder().create().toJson(new JsonData(
this.items.stream().map(HabboItem::getId).collect(Collectors.toList())
if (!this.items.isEmpty()) { ));
List<HabboItem> toRemove = new ArrayList<>(0);
for (HabboItem item : this.items) {
if (item.getRoomId() == this.getRoomId()) {
wiredData.append(item.getId()).append(";");
} else {
toRemove.add(item);
}
}
this.items.removeAll(toRemove);
} else
wiredData.append("\t");
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.clear(); this.items.clear();
String wiredData = set.getString("wired_data"); String wiredData = set.getString("wired_data");
if (wiredData.split(":").length >= 3) {
super.setDelay(Integer.valueOf(wiredData.split(":")[0]));
this.message = wiredData.split(":")[1];
if (!wiredData.split(":")[2].equals("\t")) { if (wiredData.startsWith("{")) {
for (String s : wiredData.split(":")[2].split(";")) { JsonData data = WiredHandler.getGsonBuilder().create().fromJson(wiredData, JsonData.class);
if (s.isEmpty()) for (Integer id: data.itemIds) {
continue; HabboItem item = room.getHabboItem(id);
if (item != null) {
this.items.add(item);
}
}
} else {
if (wiredData.split(":").length >= 3) {
super.setDelay(Integer.parseInt(wiredData.split(":")[0]));
try { if (!wiredData.split(":")[2].equals("\t")) {
HabboItem item = room.getHabboItem(Integer.valueOf(s)); for (String s : wiredData.split(":")[2].split(";")) {
if (s.isEmpty())
continue;
if (item != null) try {
this.items.add(item); HabboItem item = room.getHabboItem(Integer.parseInt(s));
} catch (Exception e) {
if (item != null)
this.items.add(item);
} catch (Exception e) {
}
} }
} }
} }
@ -146,11 +142,18 @@ public class WiredTriggerHabboWalkOnFurni extends InteractionWiredTrigger {
@Override @Override
public void onPickUp() { public void onPickUp() {
this.items.clear(); this.items.clear();
this.message = "";
} }
@Override @Override
public boolean isTriggeredByRoomUnit() { public boolean isTriggeredByRoomUnit() {
return true; return true;
} }
static class JsonData {
List<Integer> itemIds;
public JsonData(List<Integer> itemIds) {
this.itemIds = itemIds;
}
}
} }