From 97299d360dfb4c33d2f6ce67676e6ed00c5bc08f Mon Sep 17 00:00:00 2001
From: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
Date: Tue, 20 Dec 2022 23:37:31 -0800
Subject: [PATCH] Update converter.sh

---
 converter.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/converter.sh b/converter.sh
index 339b886..b67755d 100755
--- a/converter.sh
+++ b/converter.sh
@@ -152,12 +152,12 @@ then
   exit 1
 fi
 
-# ensure the directories that would contain predicate definitions exist
-if test -d "./assets/minecraft/models/item"; then item_folder="./assets/minecraft/models/item/*.json"; fi
-if test -d "./assets/minecraft/models/block"; then block_folder="./assets/minecraft/models/block/*.json"; fi
-if [[ -z ${item_folder} ]] && [[ -z ${block_folder} ]]
-then
-	status_message error "Invalid resource pack! No item or block folders exist. No predicate definitions be found."
+# ensure the directory that would contain predicate definitions exists
+if test -d "./assets/minecraft/models/item"
+then 
+  status_message completion "Minecraft namespace item folder found."
+else
+  status_message error "Invalid resource pack! No item or block folders exist. No predicate definitions be found."
   exit 1
 fi
 
@@ -218,7 +218,7 @@ if contains(":") then sub("\\:(.+)"; "") else "minecraft" end
 | to_entries | map( ((.value.geyserID = "gmdl_\(1+.key)") | .value))
 | INDEX(.geyserID)
 
-' ${item_folder} ${block_folder} > config.json || { status_message error "Invalid JSON exists in block or item folder! See above log."; exit 1; }
+' "./assets/minecraft/models/item" > config.json || { status_message error "Invalid JSON exists in block or item folder! See above log."; exit 1; }
 status_message completion "Initial predicate config generated"
 
 # get a bash array of all model json files in our resource pack