From 41bce8d24cdf64ddb0adf138bd182077bf20cffa Mon Sep 17 00:00:00 2001
From: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
Date: Fri, 5 Aug 2022 03:39:23 +0000
Subject: [PATCH] Only add terrain texture if we need it

---
 .github/workflows/conversion-request.yml | 1 -
 converter.sh                             | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/conversion-request.yml b/.github/workflows/conversion-request.yml
index 333e43f..cca210c 100644
--- a/.github/workflows/conversion-request.yml
+++ b/.github/workflows/conversion-request.yml
@@ -95,7 +95,6 @@ jobs:
         with:
           name: Pack Files
           path: |
-            staging/target/packaged/geyser_behaviors.mcpack
             staging/target/packaged/geyser_resources.mcpack
             staging/target/packaged/geyser_addon.mcaddon
             staging/target/geyser_mappings.json
diff --git a/converter.sh b/converter.sh
index 0ba872f..eb011c4 100755
--- a/converter.sh
+++ b/converter.sh
@@ -976,9 +976,10 @@ jq '
 
 status_message process "Compressing output packs"
 mkdir ./target/packaged
-cd ./target/rp > /dev/null && zip -rq8 geyser_resources.mcpack . -x "*/.*" && cd ../.. > /dev/null && mv ./target/rp/geyser_resources.mcpack ./target/packaged/geyser_resources.mcpack
-cd ./target/bp > /dev/null && zip -rq8 geyser_behaviors.mcpack . -x "*/.*" && cd ../.. > /dev/null && mv ./target/bp/geyser_behaviors.mcpack ./target/packaged/geyser_behaviors.mcpack
-cd ./target/packaged > /dev/null && zip -rq8 geyser_addon.mcaddon . -i "*.mcpack" && cd ../.. > /dev/null
+cd ./target/rp > /dev/null && zip -rq8 geyser_resources.mcpack . -x "*/.*" -x "textures/terrain_texture.json" && cd ../.. > /dev/null && mv ./target/rp/geyser_resources.mcpack ./target/packaged/geyser_resources.mcpack
+cd ./target/rp > /dev/null && zip -rq8 geyser_resources_preview.mcpack . -x "*/.*" && cd ../.. > /dev/null && mv ./target/rp/geyser_resources_preview.mcpack ./target/packaged/geyser_resources_preview.mcpack
+cd ./target/bp > /dev/null && zip -rq8 geyser_behaviors_preview.mcpack . -x "*/.*" && cd ../.. > /dev/null && mv ./target/bp/geyser_behaviors_preview.mcpack ./target/packaged/geyser_behaviors_preview.mcpack
+cd ./target/packaged > /dev/null && zip -rq8 geyser_addon.mcaddon . -i "*_preview.mcpack" && cd ../.. > /dev/null
 mkdir ./target/unpackaged
 mv ./target/rp ./target/unpackaged/rp && mv ./target/bp ./target/unpackaged/bp