From 0e5ffbc18dee4b75c7aa4932433948fe68b72027 Mon Sep 17 00:00:00 2001 From: G2-Games Date: Sun, 10 Nov 2024 03:27:52 -0600 Subject: [PATCH] Pack format 42, now strips metadata from files to reduce overall size --- build.sh | 13 ++++++------- src/pack.mcmeta | 2 +- src/pack.png | Bin 6337 -> 254 bytes src/pack_icon.png | Bin 7035 -> 540 bytes 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 8aa435a..86914df 100755 --- a/build.sh +++ b/build.sh @@ -17,7 +17,7 @@ overlay_on() { fi file_basename=${file_basename//"$5"/} - magick "$1" "$file" -gravity center -composite PNG8:"$6/$2${file_basename%.*}_ore$3.png" + magick "$1" "$file" -strip -gravity center -composite PNG8:"$6/$2${file_basename%.*}_ore$3.png" done } @@ -36,7 +36,7 @@ echo "Copying Java metafiles" cp "../src/pack.mcmeta" "./java/pack.mcmeta" cp "../src/pack.png" "./java/pack.png" -echo "Copying Java models" +echo "Copying block models" cp ../src/models/* ./java/assets/minecraft/models/block/ echo "Overlaying textures" @@ -44,8 +44,8 @@ overlay_on "../textures/stones/ore_stone.png" "" "" "coal_deepslate.png" "" "./j overlay_on "../textures/stones/deepslate.png" "deepslate_" "" "coal.png" "_deepslate" "./java/assets/minecraft/textures/block/" overlay_on "../textures/stones/deepslate_top.png" "deepslate_" "_top" "coal.png" "_deepslate" "./java/assets/minecraft/textures/block/" -echo "Packaging" - +echo "Packaging to \"Old.Ores.$version-Java.zip\"" +rm "Old.Ores.$version-Java.zip" 2> /dev/null 7z a -tzip "Old.Ores.$version-Java.zip" -w ./java/* > /dev/null echo -e "\n---\nBuilding Bedrock" @@ -60,10 +60,9 @@ cp "../src/pack_icon.png" "./bedrock/pack_icon.png" echo "Overlaying textures" overlay_on "../textures/stones/ore_stone.png" "" "" "coal_deepslate.png" "" "./bedrock/textures/blocks/" overlay_on "../textures/stones/deepslate.png" "deepslate_" "" "coal.png" "_deepslate" "./bedrock/textures/blocks/deepslate/" -#overlay_on "../textures/stones/deepslate_top.png" "deepslate_" "_top" "coal.png" "_deepslate" "./java/assets/minecraft/textures/block/" - -echo "Packaging" +echo "Packaging to \"Old.Ores.$version-Bedrock.mcpack\"" +rm "Old.Ores.$version-Bedrock.mcpack" 2> /dev/null 7z a -tzip "Old.Ores.$version-Bedrock.mcpack" -w ./bedrock/* > /dev/null cd "$currentdir" || exit 1 diff --git a/src/pack.mcmeta b/src/pack.mcmeta index ee74928..83a4d94 100644 --- a/src/pack.mcmeta +++ b/src/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 34, + "pack_format": 42, "description": "§7The old ore textures\n§6§oCopper made by G2" } } diff --git a/src/pack.png b/src/pack.png index 457805a66e25bc2f93a4d451b199e904abc8e7ae..c160770149c7fa26170271c193eecdde3fa0ec83 100644 GIT binary patch delta 238 zcmVYj4gxU{ z1<>CcbjIP@nGFk$^p|je_5_=NLctA?I8Y=UfCP(K%?Sz5K4%0oin_r&nT-w!)6m<2 zDC)Z#MA3{zqBxM(7kOJoSX^hDdx4Tsycxz1(@R;vZsX%#8&oH+%>eNTUws3VNsjxc ofZLNS&z=9P8_f|=9g>**0IN+GjE`V@+5i9m07*qoM6N<$f@Er8PXGV_ literal 6337 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 NJYD@<);T3K0RVxVwwM3_ literal 7035 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