From bd2e0710c3756d0ee65e8c8632e7e21fb7a1b0af Mon Sep 17 00:00:00 2001
From: fgnm <fgnm.dev@gmail.com>
Date: Sun, 5 Feb 2023 11:56:41 +0100
Subject: [PATCH] [editor only] Fix project conflicting atlas names during
 import

---
 .../rednblack/editor/utils/asset/impl/AtlasAsset.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/games/rednblack/editor/utils/asset/impl/AtlasAsset.java b/src/main/java/games/rednblack/editor/utils/asset/impl/AtlasAsset.java
index 6c557ef3..5355f8ed 100644
--- a/src/main/java/games/rednblack/editor/utils/asset/impl/AtlasAsset.java
+++ b/src/main/java/games/rednblack/editor/utils/asset/impl/AtlasAsset.java
@@ -50,10 +50,13 @@ public class AtlasAsset extends Asset {
                 projectManager.copyImageFilesForAllResolutionsIntoProject(images, true, progressHandler);
                 FileUtils.forceDelete(tmpDir.file());
 
-                TexturePackVO texturePackVO = projectManager.getCurrentProjectInfoVO().imagesPacks.get(fileHandle.nameWithoutExtension());
+                String name = fileHandle.nameWithoutExtension();
+                if (name.equals("pack")) name = name + "Import";
+
+                TexturePackVO texturePackVO = projectManager.getCurrentProjectInfoVO().imagesPacks.get(name);
                 if (texturePackVO == null) {
                     texturePackVO = new TexturePackVO();
-                    texturePackVO.name = fileHandle.nameWithoutExtension();
+                    texturePackVO.name = name;
 
                     projectManager.getCurrentProjectInfoVO().imagesPacks.put(texturePackVO.name, texturePackVO);
                 }