From 6a8cf24100d3cb93b2afc01343a3771b703c11c3 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 18 Nov 2017 20:30:21 +0100 Subject: [PATCH] Converter: Add mcl_supplemental support --- tools/Conversion_Table.csv | 4 ++++ tools/Texture_Converter.py | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index 55d18d018..9daa11898 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -898,3 +898,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/blocks,endframe_side.png,/mods/ITEMS/mcl_portals/textures,mcl_portals_endframe_side.png,,,,,,, /assets/minecraft/textures/blocks,endframe_eye.png,/mods/ITEMS/mcl_portals/textures,mcl_portals_endframe_eye.png,,,,,,, /assets/minecraft/textures/blocks,end_stone.png,/mods/ITEMS/mcl_portals/textures,mcl_portals_endframe_bottom.png,,,,,,, +/assets/minecraft/textures/blocks,red_nether_brick.png,,mcl_supplemental_fence_red_nether_brick.png,,,,,,, +/assets/minecraft/textures/blocks,red_nether_brick.png,,mcl_supplemental_fence_gate_red_nether_brick.png,,,,,,, +/assets/minecraft/textures/blocks,nether_brick.png,,mcl_supplemental_fence_gate_nether_brick.png,,,,,,, +/assets/minecraft/textures/blocks,stonebrick_carved.png,,mcl_supplemental_stonebrick_carved_slab.png,,,,,,, diff --git a/tools/Texture_Converter.py b/tools/Texture_Converter.py index 1fcf6054f..addebf5cd 100755 --- a/tools/Texture_Converter.py +++ b/tools/Texture_Converter.py @@ -160,6 +160,13 @@ def convert_textures(): # Skip blacklisted files continue + if make_texture_pack == False and dst_dir == "": + # If destination dir is empty, this texture is not supposed to be used in MCL2 + # (but maybe an external mod). It should only be used in texture packs. + # Otherwise, it must be ignored. + # Example: textures for mcl_supplemental + continue + src_file = base_dir + src_dir + "/" + src_filename # source file src_file_exists = os.path.isfile(src_file) dst_file = target_dir(dst_dir) + "/" + dst_filename # destination file