diff --git a/Bedrock/manifest.json b/Bedrock/manifest.json deleted file mode 100644 index 1319f31..0000000 --- a/Bedrock/manifest.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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] - } - ] -} diff --git a/Bedrock/pack_icon.png b/Bedrock/pack_icon.png deleted file mode 100644 index 4c6ab4d..0000000 Binary files a/Bedrock/pack_icon.png and /dev/null differ diff --git a/Bedrock/textures/blocks/coal_ore.png b/Bedrock/textures/blocks/coal_ore.png deleted file mode 100644 index 3759e02..0000000 Binary files a/Bedrock/textures/blocks/coal_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/copper_ore.png b/Bedrock/textures/blocks/copper_ore.png deleted file mode 100644 index 97752fa..0000000 Binary files a/Bedrock/textures/blocks/copper_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/deepslate/deepslate_coal_ore.png b/Bedrock/textures/blocks/deepslate/deepslate_coal_ore.png deleted file mode 100644 index afc216c..0000000 Binary files a/Bedrock/textures/blocks/deepslate/deepslate_coal_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/deepslate/deepslate_copper_ore.png b/Bedrock/textures/blocks/deepslate/deepslate_copper_ore.png deleted file mode 100644 index 457805a..0000000 Binary files a/Bedrock/textures/blocks/deepslate/deepslate_copper_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/deepslate/deepslate_diamond_ore.png b/Bedrock/textures/blocks/deepslate/deepslate_diamond_ore.png deleted file mode 100644 index c15717a..0000000 Binary files a/Bedrock/textures/blocks/deepslate/deepslate_diamond_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/deepslate/deepslate_emerald_ore.png b/Bedrock/textures/blocks/deepslate/deepslate_emerald_ore.png deleted file mode 100644 index 4f7a1ec..0000000 Binary files a/Bedrock/textures/blocks/deepslate/deepslate_emerald_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/deepslate/deepslate_gold_ore.png b/Bedrock/textures/blocks/deepslate/deepslate_gold_ore.png deleted file mode 100644 index d8701fe..0000000 Binary files a/Bedrock/textures/blocks/deepslate/deepslate_gold_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/deepslate/deepslate_iron_ore.png b/Bedrock/textures/blocks/deepslate/deepslate_iron_ore.png deleted file mode 100644 index eb4792d..0000000 Binary files a/Bedrock/textures/blocks/deepslate/deepslate_iron_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/deepslate/deepslate_lapis_ore.png b/Bedrock/textures/blocks/deepslate/deepslate_lapis_ore.png deleted file mode 100644 index 2e1368b..0000000 Binary files a/Bedrock/textures/blocks/deepslate/deepslate_lapis_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/deepslate/deepslate_redstone_ore.png b/Bedrock/textures/blocks/deepslate/deepslate_redstone_ore.png deleted file mode 100644 index b29954a..0000000 Binary files a/Bedrock/textures/blocks/deepslate/deepslate_redstone_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/diamond_ore.png b/Bedrock/textures/blocks/diamond_ore.png deleted file mode 100644 index 1f467c6..0000000 Binary files a/Bedrock/textures/blocks/diamond_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/emerald_ore.png b/Bedrock/textures/blocks/emerald_ore.png deleted file mode 100644 index aad451a..0000000 Binary files a/Bedrock/textures/blocks/emerald_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/gold_ore.png b/Bedrock/textures/blocks/gold_ore.png deleted file mode 100644 index eb31b55..0000000 Binary files a/Bedrock/textures/blocks/gold_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/iron_ore.png b/Bedrock/textures/blocks/iron_ore.png deleted file mode 100644 index 7037201..0000000 Binary files a/Bedrock/textures/blocks/iron_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/lapis_ore.png b/Bedrock/textures/blocks/lapis_ore.png deleted file mode 100644 index b95e637..0000000 Binary files a/Bedrock/textures/blocks/lapis_ore.png and /dev/null differ diff --git a/Bedrock/textures/blocks/redstone_ore.png b/Bedrock/textures/blocks/redstone_ore.png deleted file mode 100644 index 7e696c1..0000000 Binary files a/Bedrock/textures/blocks/redstone_ore.png and /dev/null differ diff --git a/build.sh b/build.sh index ce6dc94..8aa0dee 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -version="2.1.2" +version="2.1.3" # Inputs: # 1: Base layer @@ -47,6 +47,21 @@ overlay_on "../textures/stones/deepslate_top.png" "deepslate_" "_top" "coal.png" echo "Packaging" 7z a -tzip "Old.Ores.$version-Java.zip" -w ./java/* > /dev/null -#7z a -tzip "Old.Ores.$version-Bedrock.mcpack" ../Bedrock/* + +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/" + +7z a -tzip "Old.Ores.$version-Bedrock.zip" -w ./bedrock/* > /dev/null cd "$currentdir" || exit 1