Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Adds overload to BLK file and updates BuildingBlock #6206

Closed
wants to merge 4 commits into from
Closed

feat: Adds overload to BLK file and updates BuildingBlock #6206

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89be5d3
feaat: Adds overload to BLK file and updates BuildingBlock
Scoppio Nov 17, 2024
5790f31
Merge branch 'master' into feat/blkfile-and-buildingblock
Scoppio Nov 17, 2024
8d3dc69
Update BuildingBlock.java
Scoppio Nov 17, 2024
b5e561a
fix: removed a duplicated function
Scoppio Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions megamek/src/megamek/common/loaders/BLKFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,11 @@ public static void encode(File file, Entity t) throws EntitySavingException {
blk.writeBlockFile(file);
}

public static void encode(File file, Entity t) throws EntitySavingException {
BuildingBlock blk = BLKFile.getBlock(t);
blk.writeBlockFile(file);
}

protected void addTransports(Entity e) throws EntityLoadingException {
if (dataFile.containsData("transporters")) {
String[] transporters = dataFile.getDataAsString("transporters");
Expand Down
14 changes: 13 additions & 1 deletion megamek/src/megamek/common/util/BuildingBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,18 @@
return true;
}


/**
* Writes the buildingBlock data to a file.
*
* @param file File to write. Overwrites existing files.
github-advanced-security[bot] marked this conversation as resolved.
Fixed Show resolved Hide resolved
* @return true on success.
*/
public boolean writeBlockFile(String fileName) {
File file = new File(fileName);
return writeBlockFile(file);
}

/**
* Writes the buildingBlock data to a file.
*
Expand All @@ -501,7 +513,7 @@

if (file.exists()) {
if (!file.delete()) {
logger.error("Unable to delete file with name " + file);
logger.error("Unable to delete file with name " + file.getName());
return false;
}
}
Expand Down
Loading