Make bedrock package with .mcpack extension

Java/pack.mcmeta

@@ -1,6 +0,0 @@
-{
-"pack":{
-    "pack_format": 18,
-    "description": "§7The old ore textures\n§6§oCopper made by G2"
-    }
-}

README.md

@@ -15,7 +15,7 @@ The changes it makes to the game are:
 
 ## Texture Showcase
 <p align="center">
-    <img src="https://g2games.dev/Assets/hosted_files/mc/showcase.png" />
+    <img src="https://github.com/user-attachments/assets/50587777-bb85-4442-858a-9a649f2d766e" />
 </p>
 
 ## Compatibility

build.sh

@@ -1,14 +1,69 @@
-version="2.1.2"
+#!/bin/bash
+version="2.1.3"
+
+# Inputs:
+#   1: Base layer
+#   2: Output Prefix
+#   3: Output Suffix
+#   4: Skip file match
+#   5: Remove from original name
+#   6: Output Folder
+overlay_on() {
+    for file in ../textures/ore_overlays/*; do
+        file_basename=$(basename "$file")
+
+        if [[ "$4" != "" ]] && [[ $file_basename == *"$4"* ]]; then
+            continue
+        fi
+
+        file_basename=${file_basename//"$5"/}
+        magick "$1" "$file" -gravity center -composite PNG8:"$6/$2${file_basename%.*}_ore$3.png"
+    done
+}
+
 currentdir=$(pwd)
 
-mkdir -p build/
+mkdir -p ./build/
+cd ./build/ || exit 1
 
-cd build/ || exit 1
+echo -e "---\nBuilding Java"
 
-rm *
-exa -lh
+# Create Java directory structure
+mkdir -p ./java/assets/minecraft/models/block/
+mkdir -p ./java/assets/minecraft/textures/block/
 
-7z a -tzip "Old.Ores.$version-Java.zip" ../Java/*
-7z a -tzip "Old.Ores.$version-Bedrock.mcpack" ../Bedrock/*
+echo "Copying Java metafiles"
+cp "../src/pack.mcmeta" "./java/pack.mcmeta"
+cp "../src/pack.png" "./java/pack.png"
+
+echo "Copying Java models"
+cp ../src/models/* ./java/assets/minecraft/models/block/
+
+echo "Overlaying textures"
+overlay_on "../textures/stones/ore_stone.png" "" "" "coal_deepslate.png" "" "./java/assets/minecraft/textures/block/"
+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"
+
+7z a -tzip "Old.Ores.$version-Java.zip" -w ./java/* > /dev/null
+
+echo -e "\n---\nBuilding Bedrock"
+
+# Create Bedrock directory structure
+mkdir -p ./bedrock/textures/blocks/deepslate/
+
+echo "Copying Bedrock metafiles"
+cp "../src/manifest.json" "./bedrock/manifest.json"
+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"
+
+7z a -tzip "Old.Ores.$version-Bedrock.mcpack" -w ./bedrock/* > /dev/null
 
 cd "$currentdir" || exit 1

src/manifest.json

@@ -1,18 +1,18 @@
-{
-    "format_version": 2,
-    "header": {
-        "description": "§7The old ore textures\n§6§oCopper made by G2",
-        "name": "Old Ores",
-        "uuid": "66c6e9a8-3093-462a-9c36-dbb052165822",
-        "version": [2, 1, 2],
-        "min_engine_version": [ 1, 20, 0 ]
-    },
-    "modules": [
-        {
-            "description": "§7The old ore textures\n§6§oCopper made by G2",
-            "type": "resources",
-            "uuid": "743f6949-53be-44b6-b326-398005028819",
-            "version": [2, 1, 2]
-        }
-    ]
-}
+{
+    "format_version": 2,
+    "header": {
+        "description": "§7The old ore textures\n§6§oCopper made by G2",
+        "name": "Old Ores",
+        "uuid": "509d7359-84d8-43bd-9260-43c38b1f0013",
+        "version": [2, 1, 3],
+        "min_engine_version": [ 1, 21, 30 ]
+    },
+    "modules": [
+        {
+            "description": "§7The old ore textures\n§6§oCopper made by G2",
+            "type": "resources",
+            "uuid": "471c09f2-d4cc-4c5b-9d44-cc323b491fef",
+            "version": [2, 1, 3]
+        }
+    ]
+}

src/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "pack_format": 34,
+        "description": "§7The old ore textures\n§6§oCopper made by G2"
+    }
+}