From b319e5f12912fd747681bb0c7422037f21c8b458 Mon Sep 17 00:00:00 2001
From: Netherwhal <netherwhal@simplyvanilla.net>
Date: Sat, 30 Dec 2023 10:48:17 +0100
Subject: [PATCH 1/4] Add short_grass

---
 .gitignore         |  1 +
 scripts/average.sh | 37 +++++++++++++++++++++++++++++++++++--
 src/colors.json    |  1 +
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c9aa89..4284e6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ src/include/fmt/format.h
 src/include/fmt/format-inl.h
 src/include/fmt/color.h
 src/include/fmt/format.cc
+extracted_blocks/
 
 # Tools byproducts
 .gdb_history
diff --git a/scripts/average.sh b/scripts/average.sh
index 5c0ef89..5e6a2ae 100755
--- a/scripts/average.sh
+++ b/scripts/average.sh
@@ -5,6 +5,39 @@
 
 set -eo pipefail
 
+install_imagemagick() {
+  if ! command -v convert &>/dev/null; then
+    if [[ "${UNAME}" == "Darwin" ]] && command -v brew &>/dev/null; then
+      brew install imagemagick
+    fi
+  fi
+}
+
+unpack_minecraft_jar() {
+  if [[ -z "${MINECRAFT_VER}" ]]; then
+    return
+  fi
+
+  if [[ -f "extracted_blocks/${MINECRAFT_VER}/assets/minecraft/textures/block/dirt.png" ]]; then
+    return
+  fi
+
+  if [[ "${UNAME}" == "Darwin" ]]; then
+    jar_file="${HOME}/Library/Application Support/minecraft/versions/${MINECRAFT_VER}/${MINECRAFT_VER}.jar"
+  fi
+
+  if [[ -n "${jar_file}" ]]; then
+    mkdir -p "extracted_blocks/${MINECRAFT_VER}"
+    pushd "extracted_blocks/${MINECRAFT_VER}"
+    jar xf "${jar_file}" assets/minecraft/textures/block
+    popd
+  fi
+}
+
+install_imagemagick
+unpack_minecraft_jar
+
 printf '%s\t%s\n' \
-  "$(basename "${1}")" \
-  "$(convert "${1}" -resize 1x1 txt:- | grep -Po "#[[:xdigit:]]{6}" | tr A-F a-f)"
+  "$(basename "extracted_blocks/${MINECRAFT_VER}/assets/minecraft/textures/block/${1}.png")" \
+  "$(convert "extracted_blocks/${MINECRAFT_VER}/assets/minecraft/textures/block/${1}.png" -resize 1x1 txt:- \
+    | grep -o "#[[:xdigit:]]\{6\}" | tr A-F a-f)"
diff --git a/src/colors.json b/src/colors.json
index ca26e25..56a90d5 100644
--- a/src/colors.json
+++ b/src/colors.json
@@ -812,6 +812,7 @@
   "minecraft:sea_lantern": "#90b8ad",
   "minecraft:sea_pickle": { "color": "#4e531dfe", "type": "Head" },
   "minecraft:seagrass": { "color": "#389306fe", "type": "UnderwaterPlant" },
+  "minecraft:short_grass": { "color": "#426539fe", "type": "Plant" },
   "minecraft:shroomlight": "#f2974c",
   "minecraft:shulker_box": "#8535c3",
   "minecraft:skeleton_skull": { "color": "#969696fe", "type": "Head" },

From 6a874362b48809294ba791e76186828eed33563f Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Skutnik <jb.skutnik@gmail.com>
Date: Fri, 5 Jan 2024 17:53:25 +0100
Subject: [PATCH 2/4] Edited script

---
 scripts/average.sh | 73 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 20 deletions(-)

diff --git a/scripts/average.sh b/scripts/average.sh
index 5e6a2ae..25f69b4 100755
--- a/scripts/average.sh
+++ b/scripts/average.sh
@@ -5,39 +5,72 @@
 
 set -eo pipefail
 
-install_imagemagick() {
+SYSTEM=$(uname)
+EXTRACTDIR=/tmp/extracted_blocks
+
+macos::install_deps() {
+  # Script requires imagemagick
   if ! command -v convert &>/dev/null; then
-    if [[ "${UNAME}" == "Darwin" ]] && command -v brew &>/dev/null; then
+    if [[ "$SYSTEM" == "Darwin" ]] && command -v brew &>/dev/null; then
       brew install imagemagick
     fi
   fi
 }
 
-unpack_minecraft_jar() {
-  if [[ -z "${MINECRAFT_VER}" ]]; then
-    return
-  fi
+macos::mc_home() {
+  echo "$HOME/Library/Application Support/minecraft/versions"
+}
 
-  if [[ -f "extracted_blocks/${MINECRAFT_VER}/assets/minecraft/textures/block/dirt.png" ]]; then
+linux::mc_home() {
+  echo "$HOME/.minecraft/versions"
+}
+
+unpack_assets() {
+  case "$SYSTEM" in
+      Darwin)
+          MC_HOME="$(macos::mc_home)"
+          ;;
+      Linux)
+          MC_HOME="$(linux::mc_home)"
+          ;;
+  esac
+
+  if [[ -z "$MINECRAFT_VER" ]]; then
     return
   fi
 
-  if [[ "${UNAME}" == "Darwin" ]]; then
-    jar_file="${HOME}/Library/Application Support/minecraft/versions/${MINECRAFT_VER}/${MINECRAFT_VER}.jar"
-  fi
+  JAR="$MC_HOME/$MINECRAFT_VER/$MINECRAFT_VER.jar"
 
-  if [[ -n "${jar_file}" ]]; then
-    mkdir -p "extracted_blocks/${MINECRAFT_VER}"
-    pushd "extracted_blocks/${MINECRAFT_VER}"
-    jar xf "${jar_file}" assets/minecraft/textures/block
+  if [[ -n "$JAR" ]]; then
+    mkdir -p "$EXTRACTDIR/$MINECRAFT_VER"
+    pushd "$EXTRACTDIR/$MINECRAFT_VER"
+    jar xf "$JAR" assets/minecraft/textures/block
     popd
   fi
 }
 
-install_imagemagick
-unpack_minecraft_jar
+average() {
+  FILE=$1
+  EXTRACTED="$EXTRACTDIR/$MINECRAFT_VER/assets/minecraft/textures/block/$1.png"
+  if [[ -f "$EXTRACTED" ]] ; then
+      FILE="$EXTRACTED"
+  fi
+
+  COLOR="$(convert "$FILE" -resize 1x1 txt:-     \
+      | grep -o "#[[:xdigit:]]\{6\}"            \
+      | tr A-F a-f)"
+
+  printf '%s\t%s\n' \
+    "$(basename "$FILE")" \
+    "$COLOR"
+}
+
+if [[ "$SYSTEM" == Darwin ]] ; then
+  macos::install_deps
+
+  if [[ ! -d "$EXTRACTDIR/assets/minecraft/textures/" ]] ; then
+    unpack_assets
+  fi
+fi
 
-printf '%s\t%s\n' \
-  "$(basename "extracted_blocks/${MINECRAFT_VER}/assets/minecraft/textures/block/${1}.png")" \
-  "$(convert "extracted_blocks/${MINECRAFT_VER}/assets/minecraft/textures/block/${1}.png" -resize 1x1 txt:- \
-    | grep -o "#[[:xdigit:]]\{6\}" | tr A-F a-f)"
+average $1

From 3f147a5282a50da3c42d91787130745a0a1c8e9d Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Skutnik <jb.skutnik@gmail.com>
Date: Fri, 5 Jan 2024 17:54:12 +0100
Subject: [PATCH 3/4] Moved textures to /tmp

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4284e6a..4c9aa89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ src/include/fmt/format.h
 src/include/fmt/format-inl.h
 src/include/fmt/color.h
 src/include/fmt/format.cc
-extracted_blocks/
 
 # Tools byproducts
 .gdb_history

From 7160fbd734dfee6077faec5f10702bd3c3f30d41 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Skutnik <jb.skutnik@gmail.com>
Date: Fri, 5 Jan 2024 17:56:01 +0100
Subject: [PATCH 4/4] Quoted variables

---
 scripts/average.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/average.sh b/scripts/average.sh
index 25f69b4..e692b38 100755
--- a/scripts/average.sh
+++ b/scripts/average.sh
@@ -5,7 +5,7 @@
 
 set -eo pipefail
 
-SYSTEM=$(uname)
+SYSTEM="$(uname)"
 EXTRACTDIR=/tmp/extracted_blocks
 
 macos::install_deps() {
@@ -18,11 +18,11 @@ macos::install_deps() {
 }
 
 macos::mc_home() {
-  echo "$HOME/Library/Application Support/minecraft/versions"
+  echo $HOME/Library/Application Support/minecraft/versions
 }
 
 linux::mc_home() {
-  echo "$HOME/.minecraft/versions"
+  echo $HOME/.minecraft/versions
 }
 
 unpack_assets() {
@@ -50,7 +50,7 @@ unpack_assets() {
 }
 
 average() {
-  FILE=$1
+  FILE="$1"
   EXTRACTED="$EXTRACTDIR/$MINECRAFT_VER/assets/minecraft/textures/block/$1.png"
   if [[ -f "$EXTRACTED" ]] ; then
       FILE="$EXTRACTED"
@@ -73,4 +73,4 @@ if [[ "$SYSTEM" == Darwin ]] ; then
   fi
 fi
 
-average $1
+average "$1"