mirror of
https://github.com/OMGeeky/ATCS.git
synced 2025-12-26 23:57:25 +01:00
Compare commits
7 Commits
v0.6.21-pr
...
v0.6.21-pr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ea4fab6f09 | ||
|
|
26aec7cef4 | ||
|
|
0425a0f79e | ||
|
|
5ff45746d8 | ||
|
|
f14d21e322 | ||
|
|
c9cccf9eb2 | ||
|
|
5191f56a01 |
6
.gitattributes
vendored
6
.gitattributes
vendored
@@ -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
2
.idea/misc.xml
generated
@@ -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>
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user