ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding support for hjson card definitions, which adds comment support and removes the need for quotes and commas.

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2022-08-05 04:39:35 -05:00
parent feba359b0a
commit 9c21e41d57
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gemp-lotr/gemp-lotr-logic/pom.xml
View File

@@ -43,6 +43,16 @@
<artifactId>commons-lang</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>org.hjson</groupId>
<artifactId>hjson</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.7</version>
</dependency>
</dependencies>
</project>

19
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java
View File

@@ -3,7 +3,9 @@ package com.gempukku.lotro.game;
import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
import com.gempukku.lotro.cards.build.LotroCardBlueprintBuilder;
import com.gempukku.lotro.game.packs.SetDefinition;
import org.apache.commons.io.FilenameUtils;
import org.apache.log4j.Logger;
import org.hjson.JsonValue;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
@@ -84,17 +86,26 @@ public class LotroCardBlueprintLibrary {
}
private void loadCards(File path, boolean initial) {
if (path.isFile())
if (path.isFile()) {
loadCardsFromFile(path, initial);
else if (path.isDirectory())
for (File file : path.listFiles())
}
else if (path.isDirectory()) {
for (File file : path.listFiles()) {
loadCards(file, initial);
}
}
}
private void loadCardsFromFile(File file, boolean validateNew) {
String ext = FilenameUtils.getExtension(file.getName());
if (!ext.equalsIgnoreCase("json") && !ext.equalsIgnoreCase("hjson"))
return;
JSONParser parser = new JSONParser();
try (Reader reader = new InputStreamReader(new FileInputStream(file), "UTF-8")) {
final JSONObject cardsFile = (JSONObject) parser.parse(reader);
//This will read both json and hjson, producing standard json
String json = JsonValue.readHjson(reader).toString();
final JSONObject cardsFile = (JSONObject) parser.parse(json);
final Set<Map.Entry<String, JSONObject>> cardsInFile = cardsFile.entrySet();
for (Map.Entry<String, JSONObject> cardEntry : cardsInFile) {
String blueprint = cardEntry.getKey();