From 31facbd902eed5cd0deeec586a6c016ad417cbc7 Mon Sep 17 00:00:00 2001 From: Doods Date: Mon, 29 Apr 2024 15:50:32 +0000 Subject: [PATCH] Texture converter add signs (#4238) Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4238 Reviewed-by: the-real-herowl Co-authored-by: Doods Co-committed-by: Doods --- tools/Conversion_Table.csv | 19 ++++++++-- tools/libtextureconverter/convert.py | 3 ++ tools/override.txt | 57 ++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 tools/override.txt diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index 2b5fd282a..8c338c3c7 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -1151,15 +1151,28 @@ Source path,Source file,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/block,redstone_dust_line1.png,redstone_redstone_dust_line1.png,,,,,,, /assets/minecraft/textures/block,attached_melon_stem.png,mcl_farming_melon_stem_connected.png,,,,,,, /assets/minecraft/textures/block,melon_stem.png,mcl_farming_melon_stem_disconnected.png,,,,,,, -/assets/minecraft/textures/entity/signs,acacia.png,mcl_signs_sign_acacia.png,,,,,,, +/assets/minecraft/textures/entity/signs,acacia.png,mcl_signs_acacia_sign.png,,,,,,, /assets/minecraft/textures/entity/signs,bamboo.png,mcl_bamboo_bamboo_sign.png,,,,,,, +/assets/minecraft/textures/entity/signs,birch.png,mcl_signs_birch_sign.png,,,,,,, /assets/minecraft/textures/entity/signs,cherry.png,mcl_cherry_blossom_sign.png,,,,,,, +/assets/minecraft/textures/entity/signs,crimson.png,mcl_signs_crimson_sign.png,,,,,,, /assets/minecraft/textures/entity/signs,dark_oak.png,mcl_signs_sign_dark.png,,,,,,, +/assets/minecraft/textures/entity/signs,jungle.png,mcl_signs_jungle_sign.png,,,,,,, +/assets/minecraft/textures/entity/signs,mangrove.png,mcl_signs_mangrove_sign.png,,,,,,, /assets/minecraft/textures/entity/signs,oak.png,mcl_signs_sign.png,,,,,,, +/assets/minecraft/textures/entity/signs,spruce.png,mcl_signs_spruce_sign.png,,,,,,, +/assets/minecraft/textures/entity/signs,warped.png,mcl_signs_warped_sign.png,,,,,,, +/assets/minecraft/textures/item,acacia_sign.png,mcl_signs_acacia_sign_inv.png,,,,,,, /assets/minecraft/textures/item,bamboo_sign.png,mcl_bamboo_bamboo_sign_wield.png,,,,,,, -/assets/minecraft/textures/item,cherry_sign.png,mcl_cherry_blossom_sign_inv.png,,,,,,, -/assets/minecraft/textures/item,dark_oak_sign.png,mcl_signs_default_sign_dark.png,,,,,,, +/assets/minecraft/textures/item,birch_sign.png,mcl_signs_birch_sign_inv.png,,,,,,, +/assets/minecraft/textures/item,cherry_sign.png,mcl_cherry_blossom_inv.png,,,,,,, +/assets/minecraft/textures/item,crimson_sign.png,mcl_signs_crimson_sign_inv.png,,,,,,, +/assets/minecraft/textures/item,dark_oak_sign.png,mcl_signs_default_dark.png,,,,,,, +/assets/minecraft/textures/item,jungle_sign.png,mcl_signs_jungle_sign_inv.png,,,,,,, +/assets/minecraft/textures/item,mangrove_sign.png,mcl_signs_mangrove_sign_inv.png,,,,,,, /assets/minecraft/textures/item,oak_sign.png,mcl_signs_default_sign.png,,,,,,, +/assets/minecraft/textures/item,spruce_sign.png,mcl_signs_spruce_sign_inv.png,,,,,,, +/assets/minecraft/textures/item,warped_sign.png,mcl_signs_warped_sign_inv.png,,,,,,, /assets/minecraft/textures/entity,banner_base.png,mcl_banners_banner_base.png,,,,,,, /assets/minecraft/textures/entity/banner,base.png,mcl_banners_base.png,,,,,,, /assets/minecraft/textures/block,nether_portal.png,mcl_portals_portal.png,,,,,,, diff --git a/tools/libtextureconverter/convert.py b/tools/libtextureconverter/convert.py index 289cb6d56..a5d4af947 100644 --- a/tools/libtextureconverter/convert.py +++ b/tools/libtextureconverter/convert.py @@ -122,6 +122,9 @@ def convert_textures(make_texture_pack, dry_run, verbose, base_dir, tex_dir, tem description_file.write(description) description_file.close() + # Create override file + shutil.copyfile("override.txt", target_dir("/", make_texture_pack, output_dir, output_dir_name, mineclone2_path) + "/override.txt") + # Create preview image (screenshot.png) os.system("convert -size 300x200 canvas:transparent "+target_dir("/", make_texture_pack, output_dir, output_dir_name, mineclone2_path) + "/screenshot.png") os.system("composite "+base_dir+"/pack.png "+target_dir("/", make_texture_pack, output_dir, output_dir_name, mineclone2_path) + "/screenshot.png -gravity center "+target_dir("/", make_texture_pack, output_dir, output_dir_name, mineclone2_path) + "/screenshot.png") diff --git a/tools/override.txt b/tools/override.txt new file mode 100644 index 000000000..db246e5f5 --- /dev/null +++ b/tools/override.txt @@ -0,0 +1,57 @@ +Signs: + +mcl_signs:wall_sign_warped_hyphae_wood inventory mcl_signs_warped_sign_inv.png +mcl_signs:wall_sign_warped_hyphae_wood wield mcl_signs_warped_sign_inv.png +mcl_signs:wall_sign_warped_hyphae_wood all mcl_signs_warped_sign.png +mcl_signs:standing_sign_warped_hyphae_wood all mcl_signs_warped_sign.png +mcl_signs:standing_sign22_5_warped_hyphae_wood all mcl_signs_warped_sign.png +mcl_signs:standing_sign45_warped_hyphae_wood all mcl_signs_warped_sign.png +mcl_signs:standing_sign67_5_warped_hyphae_wood all mcl_signs_warped_sign.png + +mcl_signs:wall_sign_c rimson_hyphae_wood inventory mcl_signs_crimson_sign_inv.png +mcl_signs:wall_sign_crimson_hyphae_wood wield mcl_signs_crimson_sign_inv.png +mcl_signs:wall_sign_crimson_hyphae_wood all mcl_signs_crimson_sign.png +mcl_signs:standing_sign_crimson_hyphae_wood all mcl_signs_crimson_sign.png +mcl_signs:standing_sign22_5_crimson_hyphae_wood all mcl_signs_crimson_sign.png +mcl_signs:standing_sign45_crimson_hyphae_wood all mcl_signs_crimson_sign.png +mcl_signs:standing_sign67_5_crimson_hyphae_wood all mcl_signs_crimson_sign.png + +mcl_signs:wall_sign_acaciawood inventory mcl_signs_acacia_sign_inv.png +mcl_signs:wall_sign_acaciawood wield mcl_signs_acacia_sign_inv.png +mcl_signs:wall_sign_acaciawood all mcl_signs_acacia_sign.png +mcl_signs:standing_sign_acaciawood all mcl_signs_acacia_sign.png +mcl_signs:standing_sign22_5_acaciawood all mcl_signs_acacia_sign.png +mcl_signs:standing_sign45_acaciawood all mcl_signs_acacia_sign.png +mcl_signs:standing_sign67_5_acaciawood all mcl_signs_acacia_sign.png + +mcl_signs:wall_sign_birchwood inventory mcl_signs_birch_sign_inv.png +mcl_signs:wall_sign_birchwood wield mcl_signs_birch_sign_inv.png +mcl_signs:wall_sign_birchwood all mcl_signs_birch_sign.png +mcl_signs:standing_sign_birchwood all mcl_signs_birch_sign.png +mcl_signs:standing_sign22_5_birchwood all mcl_signs_birch_sign.png +mcl_signs:standing_sign45_birchwood all mcl_signs_birch_sign.png +mcl_signs:standing_sign67_5_birchwood all mcl_signs_birch_sign.png + +mcl_signs:wall_sign_junglewood inventory mcl_signs_jungle_sign_inv.png +mcl_signs:wall_sign_junglewood wield mcl_signs_jungle_sign_inv.png +mcl_signs:wall_sign_junglewood all mcl_signs_jungle_sign.png +mcl_signs:standing_sign_junglewood all mcl_signs_jungle_sign.png +mcl_signs:standing_sign22_5_junglewood all mcl_signs_jungle_sign.png +mcl_signs:standing_sign45_junglewood all mcl_signs_jungle_sign.png +mcl_signs:standing_sign67_5_junglewood all mcl_signs_jungle_sign.png + +mcl_signs:wall_sign_mangrove_wood inventory mcl_signs_mangrove_sign_inv.png +mcl_signs:wall_sign_mangrove_wood wield mcl_signs_mangrove_sign_inv.png +mcl_signs:wall_sign_mangrove_wood all mcl_signs_mangrove_sign.png +mcl_signs:standing_sign_mangrove_wood all mcl_signs_mangrove_sign.png +mcl_signs:standing_sign22_5_mangrove_wood all mcl_signs_mangrove_sign.png +mcl_signs:standing_sign45_mangrove_wood all mcl_signs_mangrove_sign.png +mcl_signs:standing_sign67_5_mangrove_wood all mcl_signs_mangrove_sign.png + +mcl_signs:wall_sign_sprucewood inventory mcl_signs_spruce_sign_inv.png +mcl_signs:wall_sign_sprucewood wield mcl_signs_spruce_sign_inv.png +mcl_signs:wall_sign_sprucewood all mcl_signs_spruce_sign.png +mcl_signs:standing_sign_sprucewood all mcl_signs_spruce_sign.png +mcl_signs:standing_sign22_5_sprucewood all mcl_signs_spruce_sign.png +mcl_signs:standing_sign45_sprucewood all mcl_signs_spruce_sign.png +mcl_signs:standing_sign67_5_sprucewood all mcl_signs_spruce_sign.png