Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do an extra sanity check

Browse source
This commit is contained in:
SD 2021-06-13 10:41:11 +05:30
parent b64cf16862
commit e4bd7e00e4
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/org/dimdev/dimdoors/block/door/data/DoorData.java
View file

@ -39,12 +39,16 @@ public final class DoorData implements AutoCloseable {
private boolean closed = false;
public static DoorData fromJson(JsonObject json) {
String id = json.get("id").getAsString();
UnbakedItemSettings itemSettings = UnbakedItemSettings.fromJson(json.getAsJsonObject("itemSettings"));
Optional<String> itemGroup = Optional.ofNullable(json.getAsJsonPrimitive("itemGroup")).map(JsonPrimitive::getAsString);
UnbakedBlockSettings blockSettings = UnbakedBlockSettings.fromJson(json.getAsJsonObject("blockSettings"));
RiftDataList riftDataList = RiftDataList.fromJson(json.getAsJsonArray("riftData"));
return new DoorData(id, itemSettings, itemGroup, blockSettings, riftDataList);
try {
String id = json.get("id").getAsString();
UnbakedItemSettings itemSettings = UnbakedItemSettings.fromJson(json.getAsJsonObject("itemSettings"));
Optional<String> itemGroup = Optional.ofNullable(json.getAsJsonPrimitive("itemGroup")).map(JsonPrimitive::getAsString);
UnbakedBlockSettings blockSettings = UnbakedBlockSettings.fromJson(json.getAsJsonObject("blockSettings"));
RiftDataList riftDataList = RiftDataList.fromJson(json.getAsJsonArray("riftData"));
return new DoorData(id, itemSettings, itemGroup, blockSettings, riftDataList);
} catch (RuntimeException e) {
throw new RuntimeException("Caught exception while deserializing " + json.toString(), e);
}
}
public DoorData(String id, UnbakedItemSettings itemSettings, UnbakedBlockSettings blockSettings, RiftDataList riftDataList) {
@ -156,7 +160,7 @@ public final class DoorData implements AutoCloseable {
private final TriState fireproof;
public static UnbakedItemSettings fromJson(JsonObject json) {
String parent = Optional.ofNullable(json.get("parent")).map(JsonElement::getAsString).get();
String parent = Optional.ofNullable(json.get("parent")).map(JsonElement::getAsString).orElseThrow(() -> new RuntimeException("Missing parent key in " + json.toString()));
OptionalInt maxCount = Optional.ofNullable(json.get("maxCount")).map(JsonElement::getAsInt).map(OptionalInt::of).orElse(OptionalInt.empty());
OptionalInt maxDamage = Optional.ofNullable(json.get("maxDamage")).map(JsonElement::getAsInt).map(OptionalInt::of).orElse(OptionalInt.empty());
Optional<Rarity> rarity = Optional.ofNullable(json.get("rarity")).map(JsonElement::getAsString).map(String::toLowerCase).map(RARITIES::get).map(Objects::requireNonNull);

4
src/main/java/org/dimdev/dimdoors/block/door/data/DoorDataReader.java
View file

@ -147,7 +147,7 @@ public class DoorDataReader {
if (!Files.isDirectory(p) && Files.isRegularFile(p)) {
String jsonStr;
try {
jsonStr = new String(Files.readAllBytes(p), StandardCharsets.UTF_8);
jsonStr = Files.readString(p);
} catch (IOException e) {
LOGGER.error("Error reading " + p, e);
return;
@ -178,7 +178,7 @@ public class DoorDataReader {
}
String json = GSON.toJson(doorData.toJson(new JsonObject()));
try {
Files.write(path, json.getBytes(StandardCharsets.UTF_8));
Files.writeString(path, json);
} catch (IOException e) {
LOGGER.error("Error writing to " + path, e);
}