Merge branch 'pulls/1195352/8'

(cherry picked from commit c9cccf9eb2)

.gitattributes

@@ -0,0 +1,6 @@
+# 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

.github/workflows/release.yml

@@ -16,8 +16,9 @@ jobs:
       shell: bash
       run: |
         echo "Reading version from file:"
-        cat packaging/ATCS_latest
-        VERSION=$(cat packaging/ATCS_latest | sed 's/^v//' | sed 's/[^0-9.]//g')
+        cat res/ATCS_latest
+        echo ""
+        VERSION=$(tr -d '[:space:]' < "res/ATCS_latest")
         echo "Processed version: $VERSION"
         echo "VERSION=$VERSION" >> $GITHUB_ENV
         echo "Environment variable set to: $VERSION"
@@ -26,10 +27,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         java-version: '11'
-        distribution: 'adopt'
-
-    - name: Install NSIS
-      uses: joncloud/makensis-action@v4
+        distribution: 'temurin'
 
     - name: Build JAR
       shell: bash
@@ -39,35 +37,20 @@ jobs:
         echo "Building JAR and ZIP for version: ${{ env.VERSION }}"
         ./package.sh -windows
         echo "Created artifacts:"
-        ls -la ATCS_${{ env.VERSION }}.zip
         ls -la common/ATCS.jar
+        ls -la ATCS_${{ env.VERSION }}.zip
 
-    - name: Create Installer
-      shell: bash
-      run: |
-        cd packaging/Windows
-        ls -la
-        echo "Building installer for version: ${{ env.VERSION }}"
-        makensis /DVERSION="${{ env.VERSION }}" ATCS_Installer.nsi
-        echo "Created installer:"
-        ls -la ATCS_v${{ env.VERSION }}_Setup.exe
+    - name: Install NSIS
+      uses: joncloud/makensis-action@v4
+      with:
+        script-file: packaging/Windows/ATCS_Installer.nsi
+        arguments: /DVERSION="${{ env.VERSION }}"
 
-    - name: Upload ZIP to Release
-      uses: actions/upload-release-asset@v1
+    - name: Upload Release Assets
+      uses: softprops/action-gh-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./packaging/ATCS_${{ env.VERSION }}.zip
-        asset_name: ATCS_${{ env.VERSION }}.zip
-        asset_content_type: application/zip
-
-    - name: Upload Installer to Release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./packaging/Windows/ATCS_v${{ env.VERSION }}_Setup.exe
-        asset_name: ATCS_v${{ env.VERSION }}_Setup.exe
-        asset_content_type: application/octet-stream
+        files: |
+          ./packaging/ATCS_${{ env.VERSION }}.zip
+          ./packaging/ATCS_${{ env.VERSION }}_Setup.exe

.idea/misc.xml

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

hacked-libtiled/tiled/core/TileSet.java

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

packaging/Linux/.gitignore

@@ -1,2 +0,0 @@
-/ATCS_v*.zip
-/ATCS_v*.zip.rename

packaging/Linux/ATCS/ATCS.cmd

@@ -1,20 +0,0 @@
-@echo off
-
-set "ATCS_DIR=%~dp0"
-set "MAX_MEM=512M"
-set "CP=%ATCS_DIR%lib\*"
-set "JAVA=javaw.exe"
-set "JAVA_OPTS=-DFONT_SCALE=1.0 -Dswing.aatext=true"
-set "ENV_FILE=%ATCS_DIR%ATCS.env.bat"
-set "MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio"
-
-if exist "%ENV_FILE%" (
-  call "%ENV_FILE%"
-) else (
-  echo REM set "MAX_MEM=%MAX_MEM%">"%ENV_FILE%"
-  echo REM set "JAVA=%JAVA%">>"%ENV_FILE%"
-  echo REM set "JAVA_OPTS=%JAVA_OPTS%">>"%ENV_FILE%"
-  echo.>>"%ENV_FILE%"
-)
-
-start "" "%JAVA%" %JAVA_OPTS% -Xmx%MAX_MEM% -cp "%CP%" %MAIN_CLASS%

packaging/Linux/ATCS/ATCS.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-ATCS_DIR=$(dirname $(readlink -f "$0" || greadlink -f "$0" || stat -f "$0"))
-MAX_MEM=512M
-CP=$(find ${ATCS_DIR}/lib/ -name '*.jar' | paste -sd: -)
-JAVA=java
-JAVA_OPTS='-DFONT_SCALE=1.0 -Dswing.aatext=true'
-ENV_FILE=${ATCS_DIR}/ATCS.env
-MAIN_CLASS=com.gpl.rpg.atcontentstudio.ATContentStudio
-
-if [ -f ${ENV_FILE} ]
-then
-  source ${ENV_FILE}
-else
-  echo "#MAX_MEM=${MAX_MEM}" > ${ENV_FILE}
-  echo "#JAVA=${JAVA}" >> ${ENV_FILE}
-  echo "#JAVA_OPTS=${JAVA_OPTS}" >> ${ENV_FILE}
-  echo "" >> ${ENV_FILE}
-fi
-
-export ENV_FILE
-
-$JAVA ${JAVA_OPTS} -Xmx${MAX_MEM} -cp ${CP} ${MAIN_CLASS}

packaging/Linux/ATCS/lib/.gitignore

@@ -1 +0,0 @@
-/*.jar

packaging/Windows/ATCS_Installer.nsi

@@ -1,12 +1,12 @@
 !include MUI2.nsh
 
-; Version will be passed as /DVERSION=x.x.x
+; Version will be passed as /DVERSION=vx.x.x
 !define TRAINER_VERSION "0.1.5"
 !define JAVA_BIN "java"
 !define ATCS_SOURCE_DIR "..\..\"
 
-Name "Andor's Trail Content Studio v${VERSION}"
-OutFile "ATCS_v${VERSION}_Setup.exe"
+Name "Andor's Trail Content Studio ${VERSION}"
+OutFile "..\ATCS_${VERSION}_Setup.exe"
 InstallDir "$PROGRAMFILES\ATCS\"
 
 ;SetCompressor /SOLID /FINAL lzma
@@ -14,10 +14,10 @@ InstallDir "$PROGRAMFILES\ATCS\"
 Var StartMenuFolder
 
 !define MUI_WELCOMEPAGE_TITLE "Welcome to Andor's Trail Content Studio installer"
-!define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio v${VERSION}"
-!define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio v${VERSION} - Install completed !"
+!define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio ${VERSION}"
+!define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio ${VERSION} - Install completed !"
 !define MUI_STARTMENUPAGE_DEFAULTFOLDER "Andor's Trail Content Studio"
-!define MUI_PAGE_HEADER_TEXT "Installing Andor's Trail Content Studio v${VERSION}"
+!define MUI_PAGE_HEADER_TEXT "Installing Andor's Trail Content Studio ${VERSION}"
 
 
 ;Start Menu Folder Page Configuration

packaging/common/ATCS.sh

@@ -1,21 +1,26 @@
 #!/bin/bash
-ATCS_DIR=$(dirname $(readlink -f "$0" || greadlink -f "$0" || stat -f "$0"))
+ATCS_DIR="$(dirname "$(readlink -f "$0" || greadlink -f "$0" || stat -f "$0")")"
+echo "ATCS_DIR: '${ATCS_DIR}'"
 
-MAX_MEM=512M
-
-JAVA=java
+MAX_MEM="512M"
+JAVA="java"
 JAVA_OPTS='-DFONT_SCALE=1.0 -Dswing.aatext=true'
-ENV_FILE=${ATCS_DIR}/ATCS.env
 
-if [ -f ${ENV_FILE} ]; then
-	source ${ENV_FILE}
+ENV_FILE="${ATCS_DIR}/ATCS.env"
+
+if [ -f "${ENV_FILE}" ]; then
+	source "${ENV_FILE}"
 else
-	echo "#MAX_MEM=${MAX_MEM}" >${ENV_FILE}
-	echo "#JAVA=${JAVA}" >>${ENV_FILE}
-	echo "#JAVA_OPTS=${JAVA_OPTS}" >>${ENV_FILE}
-	echo "" >>${ENV_FILE}
+  {
+    echo "#MAX_MEM=\"${MAX_MEM}\""
+    echo "#JAVA=\"${JAVA}\""
+    echo "#JAVA_OPTS=\"${JAVA_OPTS}\""
+    echo ""
+  }>"${ENV_FILE}"
 fi
 
 export ENV_FILE
 
-$JAVA ${JAVA_OPTS} -Xmx${MAX_MEM} -jar ${ATCS_DIR}/ATCS.jar
+# 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"

packaging/package.sh

@@ -18,7 +18,7 @@ ATCS_SOURCE_DIR=$(dirname "${PACKAGING_DIR}")
 TEMP_DIR="${PACKAGING_DIR}/tmp"
 JAR_LOCATION="${PACKAGING_DIR}/ATCS.jar" # Output JAR location as per script
 MANIFEST_LOCATION="${PACKAGING_DIR}/Manifest.txt"
-VERSION_FILE="${PACKAGING_DIR}/ATCS_latest"
+VERSION_FILE="${ATCS_SOURCE_DIR}/res/ATCS_latest"
 SOURCE_BASE_DIR="${ATCS_SOURCE_DIR}/src" # Base directory for standard source code
 LIB_BASE_DIR="${ATCS_SOURCE_DIR}/lib"     # Base directory for libraries
 
@@ -29,7 +29,7 @@ EXTRA_SOURCE_DIRS=(
   "siphash-zackehh/src/main/java"
 )
 
-# --- Libraries to include (from IntelliJ artifact definition) ---
+# --- Libraries to include ---
 LIBRARIES=(
   "AndorsTrainer_v0.1.5.jar"
   "bsh-2.0b4.jar"
@@ -44,7 +44,7 @@ LIBRARIES=(
 
 # --- Get version ---
 echo "Getting version"
-VERSION=$(cat "${VERSION_FILE}")
+VERSION=$(tr -d '[:space:]' < "${VERSION_FILE}")
 echo "Got version ${VERSION}"
 
 # --- Prepare temporary directory ---
@@ -62,7 +62,7 @@ done
 
 # --- Set ClassPath ---
 echo "Getting source files"
-# Find all java files in source directories and compile them
+# Find all java files in source directories
 SOURCE_FILES=$(find "${SOURCE_BASE_DIR}" "${EXTRA_SOURCE_DIRS[@]/#/${ATCS_SOURCE_DIR}/}" -name "*.java" -print)
 #echo "SourceFiles: ${SOURCE_FILES}"
 echo ""
@@ -70,6 +70,8 @@ echo ""
 # --- Build Java classes ---
 echo 'Building java classes'
 
+# shellcheck disable=SC2086
+# (we need word splitting here to pass multiple files)
 javac -cp "${TEMP_DIR}" -d "${TEMP_DIR}" ${SOURCE_FILES}
 if [ $? -ne 0 ]; then
     echo "Compilation failed. Please check errors above."
@@ -84,6 +86,7 @@ mkdir -p "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img"
 mkdir -p "${TEMP_DIR}/tiled/io/resources/"
 cp -r "${ATCS_SOURCE_DIR}"/src/com/gpl/rpg/atcontentstudio/img/* "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img/" # some icons
 cp -r "${ATCS_SOURCE_DIR}"/hacked-libtiled/tiled/io/resources/* "${TEMP_DIR}/tiled/io/resources/" # dtd file for tmx maps
+cp "${VERSION_FILE}" "${TEMP_DIR}/" # Copy version file
 
 # --- Create JAR file ---
 echo ""
@@ -114,7 +117,10 @@ else
     # Use zip command on Linux
     zip -r "ATCS_${VERSION}.zip" common/* # archive the 'common' folder which now contains the JAR and libs
 fi
+if [ $? -ne 0 ]; then
+    echo "Archive creation failed."
+    exit 1
+fi
 echo "Created archive at ${PACKAGING_DIR}/ATCS_${VERSION}.zip"
-cd "${PACKAGING_DIR}" || exit
 
 echo "Script finished."

src/com/gpl/rpg/atcontentstudio/ATContentStudio.java

@@ -14,11 +14,7 @@ import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -42,8 +38,7 @@ import com.gpl.rpg.atcontentstudio.ui.WorkspaceSelector;
 public class ATContentStudio {
 
 	public static final String APP_NAME = "Andor's Trail Content Studio";
-	public static final String APP_VERSION = "v0.6.21";
-
+public static final String APP_VERSION = readVersionFromFile();
 	public static final String CHECK_UPDATE_URL = "https://andorstrail.com/static/ATCS_latest";
 	public static final String DOWNLOAD_URL = "https://andorstrail.com/viewtopic.php?f=6&t=4806";
 
@@ -231,4 +226,13 @@ public class ATContentStudio {
 			}
 		}
 	}
+	private static String readVersionFromFile() {
+		try (BufferedReader reader = new BufferedReader(new InputStreamReader(
+                Objects.requireNonNull(ATContentStudio.class.getResourceAsStream("/ATCS_latest"))))) {
+			return reader.readLine();
+		} catch (IOException e) {
+			e.printStackTrace();
+			return "unknown";
+		}
+	}
 }

src/com/gpl/rpg/atcontentstudio/model/gamedata/NPC.java

@@ -333,6 +333,10 @@ 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);
 		}