From f9be361846dd6920e0ee6f3ad821f058341520c6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 9 May 2022 15:01:49 -0400
Subject: [PATCH] Cropped sprite packing

---
 core/assets-raw/sprites/blocks/environment/pack.json          | 3 ++-
 core/assets-raw/sprites/editor/pack.json                      | 3 ++-
 core/assets-raw/sprites/pack.json                             | 3 ++-
 core/assets-raw/sprites/rubble/pack.json                      | 3 ++-
 core/assets-raw/sprites/ui/pack.json                          | 3 ++-
 core/src/mindustry/content/Blocks.java                        | 2 +-
 .../mindustry/entities/bullet/ContinuousLaserBulletType.java  | 4 ++--
 core/src/mindustry/ui/dialogs/SettingsMenuDialog.java         | 2 +-
 gradle.properties                                             | 2 +-
 9 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/environment/pack.json b/core/assets-raw/sprites/blocks/environment/pack.json
index fcd452dd9f..465ad29513 100644
--- a/core/assets-raw/sprites/blocks/environment/pack.json
+++ b/core/assets-raw/sprites/blocks/environment/pack.json
@@ -4,5 +4,6 @@
   flattenPaths: true,
   maxWidth: 4096,
   maxHeight: 4096,
-  fast: true
+  fast: true,
+  stripWhitespaceCenter: false
 }
diff --git a/core/assets-raw/sprites/editor/pack.json b/core/assets-raw/sprites/editor/pack.json
index fcd452dd9f..252a508081 100644
--- a/core/assets-raw/sprites/editor/pack.json
+++ b/core/assets-raw/sprites/editor/pack.json
@@ -4,5 +4,6 @@
   flattenPaths: true,
   maxWidth: 4096,
   maxHeight: 4096,
-  fast: true
+  fast: true,
+  stripWhitespaceCenter: true
 }
diff --git a/core/assets-raw/sprites/pack.json b/core/assets-raw/sprites/pack.json
index fcd452dd9f..252a508081 100644
--- a/core/assets-raw/sprites/pack.json
+++ b/core/assets-raw/sprites/pack.json
@@ -4,5 +4,6 @@
   flattenPaths: true,
   maxWidth: 4096,
   maxHeight: 4096,
-  fast: true
+  fast: true,
+  stripWhitespaceCenter: true
 }
diff --git a/core/assets-raw/sprites/rubble/pack.json b/core/assets-raw/sprites/rubble/pack.json
index fcd452dd9f..252a508081 100644
--- a/core/assets-raw/sprites/rubble/pack.json
+++ b/core/assets-raw/sprites/rubble/pack.json
@@ -4,5 +4,6 @@
   flattenPaths: true,
   maxWidth: 4096,
   maxHeight: 4096,
-  fast: true
+  fast: true,
+  stripWhitespaceCenter: true
 }
diff --git a/core/assets-raw/sprites/ui/pack.json b/core/assets-raw/sprites/ui/pack.json
index fcd452dd9f..252a508081 100644
--- a/core/assets-raw/sprites/ui/pack.json
+++ b/core/assets-raw/sprites/ui/pack.json
@@ -4,5 +4,6 @@
   flattenPaths: true,
   maxWidth: 4096,
   maxHeight: 4096,
-  fast: true
+  fast: true,
+  stripWhitespaceCenter: true
 }
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 8a0dbfa31e..b8955f6162 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -3986,7 +3986,7 @@ public class Blocks{
             shootCone = 30f;
             consumeAmmoOnce = true;
 
-            coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f));
+            coolant = consumeCoolant(30f / 60f);
 
             drawer = new DrawTurret("reinforced-"){{
                 parts.add(new RegionPart("-side"){{
diff --git a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
index e6fd3fa2c5..2b16fe2eaf 100644
--- a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
+++ b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
@@ -55,13 +55,13 @@ public class ContinuousLaserBulletType extends ContinuousBulletType{
             float ellipseLenScl = Mathf.lerp(1 - i / (float)(colors.length), 1f, pointyScaling);
 
             Lines.stroke(stroke);
-            Lines.lineAngle(b.x, b.y, rot, length - frontLength, false);
+            Lines.lineAngle(b.x, b.y, rot, baseLen - frontLength, false);
 
             //back ellipse
             Drawf.flameFront(b.x, b.y, divisions, rot + 180f, backLength, stroke / 2f);
 
             //front ellipse
-            Tmp.v1.trnsExact(rot, length - frontLength);
+            Tmp.v1.trnsExact(rot, baseLen - frontLength);
             Drawf.flameFront(b.x + Tmp.v1.x, b.y + Tmp.v1.y, divisions, rot, frontLength * ellipseLenScl, stroke / 2f);
         }
 
diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
index e979002419..2796d2c9a9 100644
--- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -315,7 +315,7 @@ public class SettingsMenuDialog extends BaseDialog{
         }
 
         game.checkPref("doubletapmine", false);
-        game.checkPref("commandmodehold", false);
+        game.checkPref("commandmodehold", true);
       
         if(!ios){
             game.checkPref("modcrashdisable", true);
diff --git a/gradle.properties b/gradle.properties
index b95e2c700b..7b9f383456 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=401f4edcce
+archash=91ad25c9f9