mirror of
https://git.krews.org/morningstar/Arcturus-Community.git
synced 2024-09-28 09:54:18 +02:00
WiredConditionNotFurniHaveFurni now saves as JSON
This commit is contained in:
parent
277464b365
commit
3488c8ad36
@ -16,6 +16,8 @@ import gnu.trove.set.hash.THashSet;
|
|||||||
|
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class WiredConditionNotFurniHaveFurni extends InteractionWiredCondition {
|
public class WiredConditionNotFurniHaveFurni extends InteractionWiredCondition {
|
||||||
public static final WiredConditionType type = WiredConditionType.NOT_FURNI_HAVE_FURNI;
|
public static final WiredConditionType type = WiredConditionType.NOT_FURNI_HAVE_FURNI;
|
||||||
@ -59,32 +61,43 @@ public class WiredConditionNotFurniHaveFurni extends InteractionWiredCondition {
|
|||||||
@Override
|
@Override
|
||||||
public String getWiredData() {
|
public String getWiredData() {
|
||||||
this.refresh();
|
this.refresh();
|
||||||
|
return WiredHandler.getGsonBuilder().create().toJson(new JsonData(
|
||||||
StringBuilder data = new StringBuilder((this.all ? "1" : "0") + ":");
|
this.all,
|
||||||
|
this.items.stream().map(HabboItem::getId).collect(Collectors.toList())
|
||||||
for (HabboItem item : this.items)
|
));
|
||||||
data.append(item.getId()).append(";");
|
|
||||||
|
|
||||||
return data.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[] data = set.getString("wired_data").split(":");
|
if (wiredData.startsWith("{")) {
|
||||||
|
JsonData data = WiredHandler.getGsonBuilder().create().fromJson(wiredData, JsonData.class);
|
||||||
|
this.all = data.all;
|
||||||
|
|
||||||
if (data.length >= 1) {
|
for (int id : data.itemIds) {
|
||||||
this.all = (data[0].equals("1"));
|
HabboItem item = room.getHabboItem(id);
|
||||||
|
|
||||||
if (data.length == 2) {
|
if (item != null) {
|
||||||
String[] items = data[1].split(";");
|
this.items.add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
String[] data = wiredData.split(":");
|
||||||
|
|
||||||
for (String s : items) {
|
if (data.length >= 1) {
|
||||||
HabboItem item = room.getHabboItem(Integer.parseInt(s));
|
this.all = (data[0].equals("1"));
|
||||||
|
|
||||||
if (item != null)
|
if (data.length == 2) {
|
||||||
this.items.add(item);
|
String[] items = data[1].split(";");
|
||||||
|
|
||||||
|
for (String s : items) {
|
||||||
|
HabboItem item = room.getHabboItem(Integer.parseInt(s));
|
||||||
|
|
||||||
|
if (item != null)
|
||||||
|
this.items.add(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -175,4 +188,14 @@ public class WiredConditionNotFurniHaveFurni extends InteractionWiredCondition {
|
|||||||
//return this.all ? WiredConditionOperator.AND : WiredConditionOperator.OR;
|
//return this.all ? WiredConditionOperator.AND : WiredConditionOperator.OR;
|
||||||
return WiredConditionOperator.AND;
|
return WiredConditionOperator.AND;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static class JsonData {
|
||||||
|
boolean all;
|
||||||
|
List<Integer> itemIds;
|
||||||
|
|
||||||
|
public JsonData(boolean all, List<Integer> itemIds) {
|
||||||
|
this.all = all;
|
||||||
|
this.itemIds = itemIds;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user