Updated bedrock min engine version to 1.21.44

Changed the top texture of deepslate ores in Java to match the top of regular deepslate blocks

.gitignore

@@ -0,0 +1 @@
+build/

Java/pack.mcmeta

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

README.md

@@ -1,8 +1,11 @@
 # Old Ores
 
 ## Where to download
-Download latest file from the **[Releases](https://github.com/G2-Games/Old-Ores-MC/releases)** \
+### Recommended
-Also available for download from **[Curseforge](https://www.curseforge.com/minecraft/texture-packs/old-ores-copper/)**. The bedrock version is not available from there.
+Download latest file from the **[Releases](https://github.com/G2-Games/Old-Ores-MC/releases)**
+
+### Other
+Also available for download from **[Curseforge](https://www.curseforge.com/minecraft/texture-packs/old-ores-copper/)**, **[Modrinth](https://modrinth.com/resourcepack/old-ores-copper)**, and **[Planet Minecraft](https://www.planetminecraft.com/texture-pack/old-ore-textures-pre-1-17-includes-copper/)**.
 
 ## What is this pack for?
 The changes it makes to the game are:
@@ -11,7 +14,9 @@ The changes it makes to the game are:
 - Changes copper to a custom texture that I think fits with the old ores
 
 ## Texture Showcase
-![Showcase](https://g2games.dev/Assets/hosted_files/mc/showcase.png)
+<p align="center">
+    <img src="https://github.com/user-attachments/assets/50587777-bb85-4442-858a-9a649f2d766e" />
+</p>
 
 ## Compatibility
-This pack is compatible with 1.17.x for now. It will be updated as Minecraft is updated.
+This pack is compatible with 1.17.x and up for now. It will be updated as Minecraft is updated.

build.sh

@@ -0,0 +1,68 @@
+#!/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" -strip -gravity center -composite PNG8:"$6/$2${file_basename%.*}_ore$3.png"
+    done
+}
+
+currentdir=$(pwd)
+
+mkdir -p ./build/
+cd ./build/ || exit 1
+
+echo -e "---\nBuilding Java"
+
+# Create Java directory structure
+mkdir -p ./java/assets/minecraft/models/block/
+mkdir -p ./java/assets/minecraft/textures/block/
+
+echo "Copying Java metafiles"
+cp "../src/pack.mcmeta" "./java/pack.mcmeta"
+cp "../src/pack.png" "./java/pack.png"
+
+echo "Copying block 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 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"
+
+# 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/"
+
+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

src/manifest.json

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

src/models/deepslate_coal_ore.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "minecraft:block/deepslate_coal_ore_top",
+    "side": "minecraft:block/deepslate_coal_ore"
+  }
+}

src/models/deepslate_copper_ore.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "minecraft:block/deepslate_copper_ore_top",
+    "side": "minecraft:block/deepslate_copper_ore"
+  }
+}

src/models/deepslate_diamond_ore.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "minecraft:block/deepslate_diamond_ore_top",
+    "side": "minecraft:block/deepslate_diamond_ore"
+  }
+}

src/models/deepslate_emerald_ore.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "minecraft:block/deepslate_emerald_ore_top",
+    "side": "minecraft:block/deepslate_emerald_ore"
+  }
+}

src/models/deepslate_gold_ore.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "minecraft:block/deepslate_gold_ore_top",
+    "side": "minecraft:block/deepslate_gold_ore"
+  }
+}

src/models/deepslate_iron_ore.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "minecraft:block/deepslate_iron_ore_top",
+    "side": "minecraft:block/deepslate_iron_ore"
+  }
+}

src/models/deepslate_lapis_ore.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "minecraft:block/deepslate_lapis_ore_top",
+    "side": "minecraft:block/deepslate_lapis_ore"
+  }
+}

src/models/deepslate_mirrored.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_mirrored",
+  "textures": {
+    "end": "minecraft:block/deepslate_top",
+    "side": "minecraft:block/deepslate"
+  }
+}

src/models/deepslate_redstone_ore.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "minecraft:block/deepslate_redstone_ore_top",
+    "side": "minecraft:block/deepslate_redstone_ore"
+  }
+}

src/pack.mcmeta

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