Compare commits

..

7 Commits

5 changed files with 3 additions and 17 deletions

6
.gitattributes vendored
View File

@@ -1,6 +0,0 @@
# Set default behavior to automatically normalize line endings.
* text=auto
# Force bash scripts to always use LF line endings so that if a repo is accessed
# in Unix via a file share from Windows, the scripts will work.
*.sh text eol=lf

2
.idea/misc.xml generated
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" default="true" />
</project>

View File

@@ -98,11 +98,7 @@ public class TileSet implements Iterable<Tile>
File f = new File(imgFilename);
BufferedImage image;
try {
image = ImageIO.read(f.getCanonicalFile());
} catch (IOException e) { throw new IOException("Failed to load " + imgFilename);
}
BufferedImage image = ImageIO.read(f.getCanonicalFile());
if (image == null) {
throw new IOException("Failed to load " + imgFilename);
}

View File

@@ -20,7 +20,7 @@ else
fi
export ENV_FILE
exit 1
# shellcheck disable=SC2086
# (spellchecker is disabled for this line, because we want it to be split into multiple arguments)
$JAVA ${JAVA_OPTS} -Xmx${MAX_MEM} -jar "${ATCS_DIR}/ATCS.jar"

View File

@@ -333,10 +333,6 @@ public class NPC extends JSONElement {
}
if (this.icon_id != null) {
String spritesheetId = this.icon_id.split(":")[0];
if (proj.getSpritesheet(spritesheetId) == null) {
Notification.addError("Error Spritesheet "+id+". has no backlink.");
return;
}
proj.getSpritesheet(spritesheetId).addBacklink(this);
}