From dd9095bfba7483ec697ef54e178bd2b3149da7e6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 15 Dec 2020 15:31:45 -0500
Subject: [PATCH] Cleanup

---
 .gitignore           | 6 +++---
 android/build.gradle | 5 ++---
 desktop/build.gradle | 2 +-
 tools/build.gradle   | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index f69d7837cf..471b909106 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,9 +49,9 @@ version.properties
 
 #sprites
 
-#core/assets/sprites/sprites*
-#core/assets/sprites/fallback/
-#core/assets/sprites/block_colors.png
+core/assets/sprites/sprites*
+core/assets/sprites/fallback/
+core/assets/sprites/block_colors.png
 
 .attach_*
 ## Java
diff --git a/android/build.gradle b/android/build.gradle
index 480c0dfcd3..cf60a2f945 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -154,8 +154,7 @@ task run(type: Exec){
 }
 
 if(!project.ext.hasSprites()){
-    println "Re-packing sprites."
+    println "Scheduling sprite pack."
     run.dependsOn ":tools:pack"
-    assembleRelease.dependsOn ":tools:pack"
-    assembleDebug.dependsOn ":tools:pack"
+    deploy.dependsOn ":tools:pack"
 }
\ No newline at end of file
diff --git a/desktop/build.gradle b/desktop/build.gradle
index ff773cf1ee..4520715f44 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -51,7 +51,7 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
 }
 
 if(!project.ext.hasSprites()){
-    println "Re-packing sprites."
+    println "Scheduling sprite packi."
     run.dependsOn ":tools:pack"
     dist.dependsOn ":tools:pack"
 }
diff --git a/tools/build.gradle b/tools/build.gradle
index 46f1168e33..153656a174 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -383,7 +383,7 @@ task pack(dependsOn: classes){
         println("\n\nPacking normal 4096 sprites...\n\n")
 
         //pack normal sprites
-        TexturePacker.process("core/assets-raw/sprites_out/", "core/assets/sprites/", "sprites.atlas")
+        TexturePacker.process(new File(rootDir, "core/assets-raw/sprites_out/").absolutePath, new File(rootDir, "core/assets/sprites/").absolutePath, "sprites.atlas")
 
         println("\n\nPacking fallback 2048 sprites...\n\n")
 
@@ -393,7 +393,7 @@ task pack(dependsOn: classes){
         }
 
         //pack fallback 2048x2048 sprites
-        TexturePacker.process("core/assets-raw/sprites_out/", "core/assets/sprites/fallback/", "sprites.atlas")
+        TexturePacker.process(new File(rootDir, "core/assets-raw/sprites_out/").absolutePath, new File(rootDir, "core/assets/sprites/fallback/").absolutePath, "sprites.atlas")
     }
 }