From eb8479f7f7d38c9ee12c2ef9df5c9b565ead258a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 22 Jan 2020 19:16:56 -0500
Subject: [PATCH] Switched from gdx-packer to arc-packer

---
 build.gradle       | 11 +++++++----
 gradle.properties  |  2 +-
 tools/build.gradle | 17 ++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6dce08fcf3..57fcedcebd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,8 @@
 buildscript{
+    ext{
+        arcExtVersion = "e287fdce0449a87fb15599c67b5167ac0273bcb6"
+    }
+    
     repositories{
         mavenLocal()
         mavenCentral()
@@ -10,8 +14,9 @@ buildscript{
 
     dependencies{
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8'
-        classpath "com.badlogicgames.gdx:gdx-tools:1.9.10"
         classpath "com.github.anuken:packr:-SNAPSHOT"
+        classpath "com.github.Anuken.Arc:packer:$arcExtVersion"
+        classpath "com.github.Anuken.Arc:arc-core:$arcExtVersion"
     }
 }
 
@@ -308,10 +313,8 @@ project(":annotations"){
     apply plugin: "java"
 
     dependencies{
-        def arcVersion = "e287fdce0449a87fb15599c67b5167ac0273bcb6"
-        
         compile 'com.squareup:javapoet:1.11.0'
-        compile "com.github.Anuken.Arc:arc-core:$arcVersion"
+        compile "com.github.Anuken.Arc:arc-core:$arcExtVersion"
         compile files("${System.getProperty('java.home')}/../lib/tools.jar")
     }
 }
diff --git a/gradle.properties b/gradle.properties
index c3930b0bc3..c9fe4624a6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=460d616ccc09942f462108337d0e6bf2bed8ded8
+archash=1bb6b5430668b3c15657c2efbde5ec3d7bc11651
diff --git a/tools/build.gradle b/tools/build.gradle
index fa4c1ca32b..959121fcda 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -3,12 +3,9 @@ apply plugin: "java"
 sourceCompatibility = 1.8
 sourceSets.main.java.srcDirs = ["src/"]
 
-
-import com.badlogic.gdx.graphics.Color
-import com.badlogic.gdx.tools.texturepacker.TexturePacker
-import com.badlogic.gdx.utils.IntArray
-import com.badlogic.gdx.utils.IntIntMap
-import com.badlogic.gdx.utils.IntMap
+import arc.struct.*
+import arc.graphics.*
+import arc.packer.*
 
 import javax.imageio.ImageIO
 import java.awt.*
@@ -16,7 +13,7 @@ import java.awt.image.BufferedImage
 import java.util.List
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeUnit 
 
 def genFolder = "../core/assets-raw/sprites_out/generated/"
 def doAntialias = !project.hasProperty("disableAntialias")
@@ -87,7 +84,8 @@ def antialias = { File file ->
                 suma.a += color.a
             }
 
-            suma.mul(suma.a <= 0.001f ? 0f : (float) (1f / suma.a))
+            float fm = suma.a <= 0.001f ? 0f : (float) (1f / suma.a)
+            suma.mul(fm, fm, fm, fm)
 
             float total = 0
             sum.set(0)
@@ -103,7 +101,8 @@ def antialias = { File file ->
                 total += 1f
             }
 
-            sum.mul((float) (1f / total))
+            fm = (float)(1f / total)
+            sum.mul(fm, fm, fm, fm)
             int result = Color.argb8888(sum)
             out.setRGB(x, y, result)
             sum.set(0)