From 8e98e8a035d9db816de0c38a6df08b6287bdf132 Mon Sep 17 00:00:00 2001
From: Auke Kok <sofar@foo-projects.org>
Date: Mon, 4 Apr 2016 16:36:44 -0700
Subject: [PATCH] Proper Cacti conversion (not ideal, but works)

---
 mcresconvert.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mcresconvert.sh b/mcresconvert.sh
index 372f883..a18e030 100755
--- a/mcresconvert.sh
+++ b/mcresconvert.sh
@@ -71,8 +71,6 @@ bucket_empty.png bucket.png
 bucket_lava.png bucket_lava.png
 bucket_water.png bucket_water.png
 bucket_water.png bucket_river_water.png
-cactus_top.png default_cactus_top.png
-cactus_side.png default_cactus_side.png
 ../_z/assets/minecraft/textures/items/brick.png default_clay_brick.png
 ../_z/assets/minecraft/textures/blocks/brick.png default_brick.png
 clay_ball.png default_clay_lump.png
@@ -480,6 +478,14 @@ RENAMES
 			echo -e "." >> _n/_counter
 		fi
 
+		# cactus needs manual cropping
+		if [ -f _n/cactus_top.png ]; then
+			convert _n/cactus_top.png -crop +$((PXSIZE/16))+$((PXSIZE/16))x$(((PXSIZE/16)*14))x$(((PXSIZE/16)*14)) -gravity center -extent $(((PXSIZE/16)*14))x$(((PXSIZE/16)*14)) default_cactus_top.png
+			convert _n/cactus_side.png -crop +$((PXSIZE/16))+$((PXSIZE/16))x$(((PXSIZE/16)*14))x$(((PXSIZE/16)*14)) -gravity center -extent $(((PXSIZE/16)*14))x$(((PXSIZE/16)*14)) default_cactus_side.png
+			echo -e ".." >> _n/_tot
+			echo -e ".." >> _n/_counter
+		fi
+
 		# logo
 		if [ -f _n/pack.png ]; then
 			# fix aspect ratio