OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2025-12-26 15:57:22 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

make project file to json

Browse Source 
same as with .workspace the .project file now saves as .project.json and falls back to .project
This commit is contained in:
OMGeeky
2025-06-25 01:24:41 +02:00
parent aef6429dbc
commit 397d1ded8c
4 changed files with 107 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/gpl/rpg/atcontentstudio/model/GameSource.java
View File

@@ -1,5 +1,6 @@
package com.gpl.rpg.atcontentstudio.model;
import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
import com.gpl.rpg.atcontentstudio.model.Project.ResourceSet;
import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
@@ -24,7 +25,7 @@ import java.io.*;
import java.util.List;
import java.util.*;
public class GameSource implements ProjectTreeNode, Serializable {
public class GameSource implements ProjectTreeNode, Serializable, JsonSerializable {
private static final long serialVersionUID = -1512979360971918158L;
@@ -38,6 +39,22 @@ public class GameSource implements ProjectTreeNode, Serializable {
public transient WriterModeDataSet writerModeDataSet;
private transient SavedSlotCollection v;
@Override
public Map toMap() {
Map map = new HashMap();
map.put("type", type.toString());
map.put("baseFolder", baseFolder.getPath());
return map;
}
@Override
public void fromMap(Map map) {
if(map==null)return;
type = Enum.valueOf(Type.class, (String)map.get("type"));
baseFolder = new File((String) map.get("baseFolder"));
}
public static enum Type {
source,
referenced,
@@ -52,6 +69,10 @@ public class GameSource implements ProjectTreeNode, Serializable {
public transient Map<String, List<String>> referencedSourceFiles = null;
public GameSource(Map json, Project parent) {
fromMap(json);
refreshTransients(parent);
}
public GameSource(File folder, Project parent) {
this.parent = parent;
this.baseFolder = folder;

111
src/com/gpl/rpg/atcontentstudio/model/Project.java
View File

@@ -2,7 +2,7 @@ package com.gpl.rpg.atcontentstudio.model;
import com.gpl.rpg.atcontentstudio.ATContentStudio;
import com.gpl.rpg.atcontentstudio.Notification;
import com.gpl.rpg.atcontentstudio.io.JsonPrettyWriter;
import com.gpl.rpg.atcontentstudio.io.JsonSerializable;
import com.gpl.rpg.atcontentstudio.io.SettingsSave;
import com.gpl.rpg.atcontentstudio.model.GameSource.Type;
import com.gpl.rpg.atcontentstudio.model.bookmarks.BookmarksRoot;
@@ -11,13 +11,11 @@ import com.gpl.rpg.atcontentstudio.model.maps.TMXMap;
import com.gpl.rpg.atcontentstudio.model.maps.TMXMapSet;
import com.gpl.rpg.atcontentstudio.model.maps.Worldmap;
import com.gpl.rpg.atcontentstudio.model.maps.WorldmapSegment;
import com.gpl.rpg.atcontentstudio.model.saves.SavedGamesSet;
import com.gpl.rpg.atcontentstudio.model.sprites.Spritesheet;
import com.gpl.rpg.atcontentstudio.model.tools.writermode.WriterModeData;
import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
import com.gpl.rpg.atcontentstudio.ui.WorkerDialog;
import com.gpl.rpg.atcontentstudio.utils.FileUtils;
import org.json.simple.JSONArray;
import org.w3c.dom.Comment;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -42,7 +40,7 @@ import java.nio.file.Paths;
import java.util.List;
import java.util.*;
public class Project implements ProjectTreeNode, Serializable {
public class Project implements ProjectTreeNode, Serializable, JsonSerializable {
private static final long serialVersionUID = 4807454973303366758L;
private static final String drawablePath = TMXMapSet.DEFAULT_REL_PATH_TO_DRAWABLE.replace("\\", "/");
@@ -50,6 +48,7 @@ public class Project implements ProjectTreeNode, Serializable {
//Every instance field that is not transient will be saved in this file.
public static final String SETTINGS_FILE = ".project";
public static final String SETTINGS_FILE_JSON = ".project.json";
public String name;
@@ -58,7 +57,6 @@ public class Project implements ProjectTreeNode, Serializable {
public GameSource baseContent; //A.k.a library
public GameSource referencedContent; //Pointers to base content
public transient GameSource alteredContent; //Copied from base content (does not overwrite yet)
public transient GameSource createdContent; //Stand-alone.
public transient BookmarksRoot bookmarks;
@@ -72,6 +70,29 @@ public class Project implements ProjectTreeNode, Serializable {
public Properties knownSpritesheetsProperties;
@Override
public Map toMap() {
Map map = new HashMap();
map.put("name", name.toString());
map.put("baseFolder", baseFolder.getPath());
map.put("open", open);
map.put("baseContent", baseContent.toMap());
map.put("sourceSetToUse", sourceSetToUse.toString());
return map;
}
@Override
public void fromMap(Map map) {
if(map==null)return;
name = (String) map.get("name");
baseFolder = new File((String) map.get("baseFolder"));
open = (boolean) map.get("open");
baseContent = new GameSource((Map) map.get("baseContent"), this);
sourceSetToUse = Enum.valueOf(ResourceSet.class, (String)map.get("sourceSetToUse"));
}
public static enum ResourceSet {
gameData,
debugData,
@@ -80,7 +101,17 @@ public class Project implements ProjectTreeNode, Serializable {
public ResourceSet sourceSetToUse;
public Project(Workspace w, String name, File source, ResourceSet sourceSet) {
public Project(Workspace w, File projectFile) {
this.parent = w;
loadSpritesheetProperties();
Map json = FileUtils.mapFromJsonFile(projectFile);
this.fromMap(json);
initializeData();
linkAll();
save();
}
public Project(Workspace w, String name, File source, ResourceSet sourceSet){
this.parent = w;
this.name = name;
this.sourceSetToUse = sourceSet;
@@ -93,24 +124,20 @@ public class Project implements ProjectTreeNode, Serializable {
Notification.addError("Eror creating project root folder: " + e.getMessage());
e.printStackTrace();
}
loadSpritesheetProperties();
baseContent = new GameSource(source, this);
open = true;
initializeData();
linkAll();
save();
}
private void initializeData() {
v = new SavedSlotCollection();
knownSpritesheetsProperties = new Properties();
try {
knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
} catch (IOException e) {
Notification.addWarn("Unable to load default spritesheets properties.");
e.printStackTrace();
}
baseContent = new GameSource(source, this);
// referencedContent = new GameSource(this, GameSource.Type.referenced);
alteredContent = new GameSource(this, GameSource.Type.altered);
createdContent = new GameSource(this, GameSource.Type.created);
alteredContent = new GameSource(this, Type.altered);
createdContent = new GameSource(this, Type.created);
bookmarks = new BookmarksRoot(this);
// saves = new SavedGamesSet(this);
@@ -121,10 +148,6 @@ public class Project implements ProjectTreeNode, Serializable {
v.add(baseContent);
// v.add(saves);
v.add(bookmarks);
linkAll();
save();
}
@@ -207,12 +230,20 @@ public class Project implements ProjectTreeNode, Serializable {
public static Project fromFolder(Workspace w, File projRoot) {
Project p;
File f = new File(projRoot, Project.SETTINGS_FILE);
if (!f.exists()) {
Notification.addError("Unable to find " + SETTINGS_FILE + " for project " + projRoot.getName());
return null;
File fJson = new File(projRoot, Project.SETTINGS_FILE_JSON);
if (fJson.exists()) {
p = new Project(w, fJson);
} else {
p = (Project) SettingsSave.loadInstance(f, "Project");
File f = new File(projRoot, Project.SETTINGS_FILE);
if (!f.exists()) {
Notification.addError("Unable to find " + SETTINGS_FILE + " for project " + projRoot.getName());
return null;
} else {
p = (Project) SettingsSave.loadInstance(f, "Project");
}
p.save();
}
p.refreshTransients(w);
return p;
@@ -223,13 +254,7 @@ public class Project implements ProjectTreeNode, Serializable {
projectElementListeners = new HashMap<Class<? extends GameDataElement>, List<ProjectElementListener>>();
try {
knownSpritesheetsProperties = new Properties();
knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
} catch (IOException e) {
Notification.addWarn("Unable to load default spritesheets properties.");
e.printStackTrace();
}
loadSpritesheetProperties();
if (sourceSetToUse == null) {
sourceSetToUse = ResourceSet.allFiles;
@@ -259,6 +284,16 @@ public class Project implements ProjectTreeNode, Serializable {
}
private void loadSpritesheetProperties() {
knownSpritesheetsProperties = new Properties();
try {
knownSpritesheetsProperties.load(Project.class.getResourceAsStream("/spritesheets.properties"));
} catch (IOException e) {
Notification.addWarn("Unable to load default spritesheets properties.");
e.printStackTrace();
}
}
public void linkAll() {
for (ProjectTreeNode node : baseContent.gameData.v.getNonEmptyIterable()) {
if (node instanceof GameDataCategory<?>) {
@@ -303,7 +338,7 @@ public class Project implements ProjectTreeNode, Serializable {
}
public void save() {
SettingsSave.saveInstance(this, new File(baseFolder, Project.SETTINGS_FILE), "Project " + this.name);
FileUtils.writeStringToFile(FileUtils.toJsonString(toMap()),new File(baseFolder, Project.SETTINGS_FILE_JSON), "Project " + this.name);
}

9
src/com/gpl/rpg/atcontentstudio/model/Workspace.java
View File

@@ -111,7 +111,7 @@ public class Workspace implements ProjectTreeNode, Serializable, JsonSerializabl
public static void setActive(File workspaceRoot) {
Workspace w;
File f2 = new File(workspaceRoot, WS_SETTINGS_FILE_JSON);
if (workspaceRoot.exists() && f2.exists()) {
if (f2.exists()) {
w = loadWorkspaceFromJson(workspaceRoot, f2);
w.refreshTransients();
} else {
@@ -134,12 +134,9 @@ public class Workspace implements ProjectTreeNode, Serializable, JsonSerializabl
private static Workspace loadWorkspaceFromJson(File workspaceRoot, File settingsFile) {
Workspace w = w = new Workspace(workspaceRoot);
String json = FileUtils.readFileToString(settingsFile);
Map json = FileUtils.mapFromJsonFile(settingsFile);
if (json!= null) {
Map map = (Map)FileUtils.fromJsonString(json);
if(map!= null){
w.fromMap(map);
}
w.fromMap(json);
}
return w;
}

9
src/com/gpl/rpg/atcontentstudio/utils/FileUtils.java
View File

@@ -53,6 +53,15 @@ public class FileUtils {
return o;
}
public static Map mapFromJsonFile(File file){
String json = readFileToString(file);
if (json == null) {
return null;
}
Map map = (Map)FileUtils.fromJsonString(json);
return map;
}
public static boolean writeStringToFile(String toWrite, File file, String type) {
return writeStringToFile(toWrite, file, type, true);
}