diff --git a/Java/pack.mcmeta b/Java/pack.mcmeta index 8aad21b..4201fa6 100644 --- a/Java/pack.mcmeta +++ b/Java/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ - "pack_format": 18, + "pack_format": 34, "description": "§7The old ore textures\n§6§oCopper made by G2" } } diff --git a/Textures/Ores/coal_ore.png b/Textures/Ores/coal_ore.png deleted file mode 100644 index 3759e02..0000000 Binary files a/Textures/Ores/coal_ore.png and /dev/null differ diff --git a/Textures/Ores/diamond_ore.png b/Textures/Ores/diamond_ore.png deleted file mode 100644 index 1f467c6..0000000 Binary files a/Textures/Ores/diamond_ore.png and /dev/null differ diff --git a/Textures/Ores/emerald_ore.png b/Textures/Ores/emerald_ore.png deleted file mode 100644 index aad451a..0000000 Binary files a/Textures/Ores/emerald_ore.png and /dev/null differ diff --git a/Textures/Ores/gold_ore.png b/Textures/Ores/gold_ore.png deleted file mode 100644 index eb31b55..0000000 Binary files a/Textures/Ores/gold_ore.png and /dev/null differ diff --git a/Textures/Ores/iron_ore.png b/Textures/Ores/iron_ore.png deleted file mode 100644 index 7037201..0000000 Binary files a/Textures/Ores/iron_ore.png and /dev/null differ diff --git a/Textures/Ores/lapis_ore.png b/Textures/Ores/lapis_ore.png deleted file mode 100644 index b95e637..0000000 Binary files a/Textures/Ores/lapis_ore.png and /dev/null differ diff --git a/Textures/Ores/redstone_ore.png b/Textures/Ores/redstone_ore.png deleted file mode 100644 index 7e696c1..0000000 Binary files a/Textures/Ores/redstone_ore.png and /dev/null differ diff --git a/build.sh b/build.sh index 898d0c0..265c22c 100755 --- a/build.sh +++ b/build.sh @@ -1,12 +1,48 @@ +#!/bin/bash version="2.1.2" + +# 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 "$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/ + +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/" 7z a -tzip "Old.Ores.$version-Java.zip" ../Java/* 7z a -tzip "Old.Ores.$version-Bedrock.mcpack" ../Bedrock/* diff --git a/src/manifest.json b/src/manifest.json new file mode 100644 index 0000000..3c49ea8 --- /dev/null +++ b/src/manifest.json @@ -0,0 +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] + } + ] +} diff --git a/src/models/deepslate_coal_ore.json b/src/models/deepslate_coal_ore.json new file mode 100644 index 0000000..941e536 --- /dev/null +++ b/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" + } +} diff --git a/src/models/deepslate_copper_ore.json b/src/models/deepslate_copper_ore.json new file mode 100644 index 0000000..6dcde3b --- /dev/null +++ b/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" + } +} diff --git a/src/models/deepslate_diamond_ore.json b/src/models/deepslate_diamond_ore.json new file mode 100644 index 0000000..e2060de --- /dev/null +++ b/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" + } +} diff --git a/src/models/deepslate_emerald_ore.json b/src/models/deepslate_emerald_ore.json new file mode 100644 index 0000000..2c1864a --- /dev/null +++ b/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" + } +} diff --git a/src/models/deepslate_gold_ore.json b/src/models/deepslate_gold_ore.json new file mode 100644 index 0000000..fa1da7d --- /dev/null +++ b/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" + } +} diff --git a/src/models/deepslate_iron_ore.json b/src/models/deepslate_iron_ore.json new file mode 100644 index 0000000..0066c8f --- /dev/null +++ b/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" + } +} diff --git a/src/models/deepslate_lapis_ore.json b/src/models/deepslate_lapis_ore.json new file mode 100644 index 0000000..5645c56 --- /dev/null +++ b/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" + } +} diff --git a/src/models/deepslate_mirrored.json b/src/models/deepslate_mirrored.json new file mode 100644 index 0000000..12a83f2 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/src/models/deepslate_redstone_ore.json b/src/models/deepslate_redstone_ore.json new file mode 100644 index 0000000..22622fe --- /dev/null +++ b/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" + } +} diff --git a/src/pack.mcmeta b/src/pack.mcmeta new file mode 100644 index 0000000..ee74928 --- /dev/null +++ b/src/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 34, + "description": "§7The old ore textures\n§6§oCopper made by G2" + } +} diff --git a/src/pack.png b/src/pack.png new file mode 100644 index 0000000..457805a Binary files /dev/null and b/src/pack.png differ diff --git a/src/pack_icon.png b/src/pack_icon.png new file mode 100644 index 0000000..4c6ab4d Binary files /dev/null and b/src/pack_icon.png differ diff --git a/Textures/Deepslate Ores/deepslate_coal_ore.png b/textures/deepslate/deepslate_coal_ore.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_coal_ore.png rename to textures/deepslate/deepslate_coal_ore.png diff --git a/Textures/Deepslate Ores/deepslate_coal_ore_top.png b/textures/deepslate/deepslate_coal_ore_top.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_coal_ore_top.png rename to textures/deepslate/deepslate_coal_ore_top.png diff --git a/Textures/Deepslate Ores/deepslate_copper_ore.png b/textures/deepslate/deepslate_copper_ore.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_copper_ore.png rename to textures/deepslate/deepslate_copper_ore.png diff --git a/Textures/Deepslate Ores/deepslate_copper_ore_top.png b/textures/deepslate/deepslate_copper_ore_top.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_copper_ore_top.png rename to textures/deepslate/deepslate_copper_ore_top.png diff --git a/Textures/Deepslate Ores/deepslate_diamond_ore.png b/textures/deepslate/deepslate_diamond_ore.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_diamond_ore.png rename to textures/deepslate/deepslate_diamond_ore.png diff --git a/Textures/Deepslate Ores/deepslate_diamond_ore_top.png b/textures/deepslate/deepslate_diamond_ore_top.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_diamond_ore_top.png rename to textures/deepslate/deepslate_diamond_ore_top.png diff --git a/Textures/Deepslate Ores/deepslate_emerald_ore.png b/textures/deepslate/deepslate_emerald_ore.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_emerald_ore.png rename to textures/deepslate/deepslate_emerald_ore.png diff --git a/Textures/Deepslate Ores/deepslate_emerald_ore_top.png b/textures/deepslate/deepslate_emerald_ore_top.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_emerald_ore_top.png rename to textures/deepslate/deepslate_emerald_ore_top.png diff --git a/Textures/Deepslate Ores/deepslate_gold_ore.png b/textures/deepslate/deepslate_gold_ore.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_gold_ore.png rename to textures/deepslate/deepslate_gold_ore.png diff --git a/Textures/Deepslate Ores/deepslate_gold_ore_top.png b/textures/deepslate/deepslate_gold_ore_top.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_gold_ore_top.png rename to textures/deepslate/deepslate_gold_ore_top.png diff --git a/Textures/Deepslate Ores/deepslate_iron_ore.png b/textures/deepslate/deepslate_iron_ore.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_iron_ore.png rename to textures/deepslate/deepslate_iron_ore.png diff --git a/Textures/Deepslate Ores/deepslate_iron_ore_top.png b/textures/deepslate/deepslate_iron_ore_top.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_iron_ore_top.png rename to textures/deepslate/deepslate_iron_ore_top.png diff --git a/Textures/Deepslate Ores/deepslate_lapis_ore.png b/textures/deepslate/deepslate_lapis_ore.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_lapis_ore.png rename to textures/deepslate/deepslate_lapis_ore.png diff --git a/Textures/Deepslate Ores/deepslate_lapis_ore_top.png b/textures/deepslate/deepslate_lapis_ore_top.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_lapis_ore_top.png rename to textures/deepslate/deepslate_lapis_ore_top.png diff --git a/Textures/Deepslate Ores/deepslate_redstone_ore.png b/textures/deepslate/deepslate_redstone_ore.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_redstone_ore.png rename to textures/deepslate/deepslate_redstone_ore.png diff --git a/Textures/Deepslate Ores/deepslate_redstone_ore_top.png b/textures/deepslate/deepslate_redstone_ore_top.png similarity index 100% rename from Textures/Deepslate Ores/deepslate_redstone_ore_top.png rename to textures/deepslate/deepslate_redstone_ore_top.png diff --git a/Textures/Ore_Textures/coal_ore.png b/textures/ore_overlays/coal.png similarity index 100% rename from Textures/Ore_Textures/coal_ore.png rename to textures/ore_overlays/coal.png diff --git a/Textures/Ore_Textures/coal_ore_deepslate.png b/textures/ore_overlays/coal_deepslate.png similarity index 100% rename from Textures/Ore_Textures/coal_ore_deepslate.png rename to textures/ore_overlays/coal_deepslate.png diff --git a/Textures/Ore_Textures/copper_ore.png b/textures/ore_overlays/copper.png similarity index 100% rename from Textures/Ore_Textures/copper_ore.png rename to textures/ore_overlays/copper.png diff --git a/Textures/Ore_Textures/diamond_ore.png b/textures/ore_overlays/diamond.png similarity index 100% rename from Textures/Ore_Textures/diamond_ore.png rename to textures/ore_overlays/diamond.png diff --git a/Textures/Ore_Textures/emerald_ore.png b/textures/ore_overlays/emerald.png similarity index 100% rename from Textures/Ore_Textures/emerald_ore.png rename to textures/ore_overlays/emerald.png diff --git a/Textures/Ore_Textures/gold_ore.png b/textures/ore_overlays/gold.png similarity index 100% rename from Textures/Ore_Textures/gold_ore.png rename to textures/ore_overlays/gold.png diff --git a/Textures/Ore_Textures/iron_ore.png b/textures/ore_overlays/iron.png similarity index 100% rename from Textures/Ore_Textures/iron_ore.png rename to textures/ore_overlays/iron.png diff --git a/Textures/Ore_Textures/lapis_ore.png b/textures/ore_overlays/lapis.png similarity index 100% rename from Textures/Ore_Textures/lapis_ore.png rename to textures/ore_overlays/lapis.png diff --git a/Textures/Ore_Textures/redstone_ore.png b/textures/ore_overlays/redstone.png similarity index 100% rename from Textures/Ore_Textures/redstone_ore.png rename to textures/ore_overlays/redstone.png diff --git a/Textures/Stones/deepslate.png b/textures/stones/deepslate.png similarity index 100% rename from Textures/Stones/deepslate.png rename to textures/stones/deepslate.png diff --git a/Textures/Stones/deepslate_top.png b/textures/stones/deepslate_top.png similarity index 100% rename from Textures/Stones/deepslate_top.png rename to textures/stones/deepslate_top.png diff --git a/textures/stones/ore_stone.png b/textures/stones/ore_stone.png new file mode 100644 index 0000000..2de3ccd Binary files /dev/null and b/textures/stones/ore_stone.png differ diff --git a/Textures/Stones/stone.png b/textures/stones/stone.png similarity index 100% rename from Textures/Stones/stone.png rename to textures/stones/stone.png