Fix some texture conversions, add -p to Texture Converter

This commit is contained in:
Wuzzy 2017-11-18 03:40:29 +01:00
parent a19549d77e
commit a7507482a6
2 changed files with 26 additions and 7 deletions

@ -170,6 +170,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt
/assets/minecraft/textures/blocks,planks_jungle.png,/mods/ITEMS/mcl_core/textures,default_junglewood.png,,,,,,
/assets/minecraft/textures/blocks,ladder.png,/mods/ITEMS/mcl_core/textures,default_ladder.png,,,,,,
/assets/minecraft/textures/blocks,lava_still.png,/mods/ITEMS/mcl_core/textures,default_lava_source_animated.png,,,,,,
/assets/minecraft/textures/blocks,lava_flow.png,/mods/ITEMS/mcl_core/textures,default_lava_flowing_animated.png,,,,,,
/assets/minecraft/textures/blocks,cobblestone_mossy.png,/mods/ITEMS/mcl_core/textures,default_mossycobble.png,,,,,,
/assets/minecraft/textures/blocks,obsidian.png,/mods/ITEMS/mcl_core/textures,default_obsidian.png,,,,,,
/assets/minecraft/textures/items,paper.png,/mods/ITEMS/mcl_core/textures,default_paper.png,,,,,,
@ -184,6 +185,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt
/assets/minecraft/textures/blocks,log_oak.png,/mods/ITEMS/mcl_core/textures,default_tree.png,,,,,,
/assets/minecraft/textures/blocks,log_oak_top.png,/mods/ITEMS/mcl_core/textures,default_tree_top.png,,,,,,
/assets/minecraft/textures/blocks,water_still.png,/mods/ITEMS/mcl_core/textures,default_water_source_animated.png,,,,,,
/assets/minecraft/textures/blocks,water_flow.png,/mods/ITEMS/mcl_core/textures,default_water_flowing_animated.png,,,,,,
/assets/minecraft/textures/blocks,planks_oak.png,/mods/ITEMS/mcl_core/textures,default_wood.png,,,,,,
/assets/minecraft/textures/blocks,stone_andesite.png,/mods/ITEMS/mcl_core/textures,mcl_core_andesite.png,,,,,,
/assets/minecraft/textures/blocks,stone_andesite_smooth.png,/mods/ITEMS/mcl_core/textures,mcl_core_andesite_smooth.png,,,,,,
@ -249,7 +251,6 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt
/assets/minecraft/textures/blocks,stonebrick_cracked.png,/mods/ITEMS/mcl_core/textures,mcl_core_stonebrick_cracked.png,,,,,,
/assets/minecraft/textures/blocks,stonebrick_mossy.png,/mods/ITEMS/mcl_core/textures,mcl_core_stonebrick_mossy.png,,,,,,
/assets/minecraft/textures/items,sugar.png,/mods/ITEMS/mcl_core/textures,mcl_core_sugar.png,,,,,,
/assets/minecraft/textures/blocks,vine.png,/mods/ITEMS/mcl_core/textures,mcl_core_vine.png,,,,,,
/assets/minecraft/textures/blocks,web.png,/mods/ITEMS/mcl_core/textures,mcl_core_web.png,,,,,,
/assets/minecraft/textures/blocks,crafting_table_front.png,/mods/ITEMS/mcl_crafting_table/textures,crafting_workbench_front.png,,,,,,
/assets/minecraft/textures/blocks,crafting_table_side.png,/mods/ITEMS/mcl_crafting_table/textures,crafting_workbench_side.png,,,,,,
@ -826,19 +827,32 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt
/assets/minecraft/textures/blocks,melon_stem_connected.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_melon_stem_connected.png,,,,,,
/assets/minecraft/textures/blocks,pumpkin_stem_disconnected.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_pumpkin_stem_disconnected.png,,,,,,
/assets/minecraft/textures/blocks,melon_stem_disconnected.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_melon_stem_disconnected.png,,,,,,
/assets/minecraft/textures/blocks,planks_acacia.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_acacia.png,,,,,,
/assets/minecraft/textures/blocks,planks_big_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_big_oak.png,,,,,,
/assets/minecraft/textures/blocks,planks_birch.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_birch.png,,,,,,
/assets/minecraft/textures/blocks,planks_jungle.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_jungle.png,,,,,,
/assets/minecraft/textures/blocks,planks_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_oak.png,,,,,,
/assets/minecraft/textures/blocks,planks_spruce.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_spruce.png,,,,,,
/assets/minecraft/textures/blocks,planks_acacia.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_acacia.png,,,,,,
/assets/minecraft/textures/blocks,planks_big_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_big_oak.png,,,,,,
/assets/minecraft/textures/blocks,planks_birch.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_birch.png,,,,,,
/assets/minecraft/textures/blocks,planks_jungle.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_jungle.png,,,,,,
/assets/minecraft/textures/blocks,planks_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_oak.png,,,,,,
/assets/minecraft/textures/blocks,planks_spruce.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_spruce.png,,,,,,
/assets/minecraft/textures/blocks,nether_brick.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_nether_brick.png,,,,,,
/assets/minecraft/textures/blocks,fence_acacia.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_acacia.png,,,,,,
/assets/minecraft/textures/blocks,fence_big_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_big_oak.png,,,,,,
/assets/minecraft/textures/blocks,fence_birch.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_birch.png,,,,,,
/assets/minecraft/textures/blocks,fence_jungle.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_jungle.png,,,,,,
/assets/minecraft/textures/blocks,fence_nether_brick.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_nether_brick.png,,,,,,
/assets/minecraft/textures/blocks,fence_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_oak.png,,,,,,
/assets/minecraft/textures/blocks,fence_spruce.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_spruce.png,,,,,,
/assets/minecraft/textures/blocks,fence_gate_acacia.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_acacia.png,,,,,,
/assets/minecraft/textures/blocks,fence_gate_big_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_big_oak.png,,,,,,
/assets/minecraft/textures/blocks,fence_gate_birch.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_birch.png,,,,,,
/assets/minecraft/textures/blocks,fence_gate_jungle.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_jungle.png,,,,,,
/assets/minecraft/textures/blocks,fence_gate_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_oak.png,,,,,,
/assets/minecraft/textures/blocks,fence_gate_spruce.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_gate_spruce.png,,,,,,
/assets/minecraft/textures/blocks,fence_jungle.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_jungle.png,,,,,,
/assets/minecraft/textures/blocks,fence_nether_brick.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_nether_brick.png,,,,,,
/assets/minecraft/textures/blocks,fence_oak.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_oak.png,,,,,,
/assets/minecraft/textures/blocks,fence_spruce.png,/mods/ITEMS/mcl_fences/textures,mcl_fences_fence_spruce.png,,,,,,
/assets/minecraft/textures/entity,sign.png,/mods/ITEMS/mcl_signs/textures,mcl_signs_sign.png,,,,,,
/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_1.png,0,0,16,16,0,0
/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_2.png,16,0,16,16,0,0

1 Source path Source file Target path Target file xs ys xl yl xt yt
170 /assets/minecraft/textures/blocks planks_jungle.png /mods/ITEMS/mcl_core/textures default_junglewood.png
171 /assets/minecraft/textures/blocks ladder.png /mods/ITEMS/mcl_core/textures default_ladder.png
172 /assets/minecraft/textures/blocks lava_still.png /mods/ITEMS/mcl_core/textures default_lava_source_animated.png
173 /assets/minecraft/textures/blocks lava_flow.png /mods/ITEMS/mcl_core/textures default_lava_flowing_animated.png
174 /assets/minecraft/textures/blocks cobblestone_mossy.png /mods/ITEMS/mcl_core/textures default_mossycobble.png
175 /assets/minecraft/textures/blocks obsidian.png /mods/ITEMS/mcl_core/textures default_obsidian.png
176 /assets/minecraft/textures/items paper.png /mods/ITEMS/mcl_core/textures default_paper.png
185 /assets/minecraft/textures/blocks log_oak.png /mods/ITEMS/mcl_core/textures default_tree.png
186 /assets/minecraft/textures/blocks log_oak_top.png /mods/ITEMS/mcl_core/textures default_tree_top.png
187 /assets/minecraft/textures/blocks water_still.png /mods/ITEMS/mcl_core/textures default_water_source_animated.png
188 /assets/minecraft/textures/blocks water_flow.png /mods/ITEMS/mcl_core/textures default_water_flowing_animated.png
189 /assets/minecraft/textures/blocks planks_oak.png /mods/ITEMS/mcl_core/textures default_wood.png
190 /assets/minecraft/textures/blocks stone_andesite.png /mods/ITEMS/mcl_core/textures mcl_core_andesite.png
191 /assets/minecraft/textures/blocks stone_andesite_smooth.png /mods/ITEMS/mcl_core/textures mcl_core_andesite_smooth.png
251 /assets/minecraft/textures/blocks stonebrick_cracked.png /mods/ITEMS/mcl_core/textures mcl_core_stonebrick_cracked.png
252 /assets/minecraft/textures/blocks stonebrick_mossy.png /mods/ITEMS/mcl_core/textures mcl_core_stonebrick_mossy.png
253 /assets/minecraft/textures/items sugar.png /mods/ITEMS/mcl_core/textures mcl_core_sugar.png
/assets/minecraft/textures/blocks vine.png /mods/ITEMS/mcl_core/textures mcl_core_vine.png
254 /assets/minecraft/textures/blocks web.png /mods/ITEMS/mcl_core/textures mcl_core_web.png
255 /assets/minecraft/textures/blocks crafting_table_front.png /mods/ITEMS/mcl_crafting_table/textures crafting_workbench_front.png
256 /assets/minecraft/textures/blocks crafting_table_side.png /mods/ITEMS/mcl_crafting_table/textures crafting_workbench_side.png
827 /assets/minecraft/textures/blocks melon_stem_connected.png /mods/ITEMS/mcl_farming/textures mcl_farming_melon_stem_connected.png
828 /assets/minecraft/textures/blocks pumpkin_stem_disconnected.png /mods/ITEMS/mcl_farming/textures mcl_farming_pumpkin_stem_disconnected.png
829 /assets/minecraft/textures/blocks melon_stem_disconnected.png /mods/ITEMS/mcl_farming/textures mcl_farming_melon_stem_disconnected.png
830 /assets/minecraft/textures/blocks planks_acacia.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_acacia.png
831 /assets/minecraft/textures/blocks planks_big_oak.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_big_oak.png
832 /assets/minecraft/textures/blocks planks_birch.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_birch.png
833 /assets/minecraft/textures/blocks planks_jungle.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_jungle.png
834 /assets/minecraft/textures/blocks planks_oak.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_oak.png
835 /assets/minecraft/textures/blocks planks_spruce.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_spruce.png
836 /assets/minecraft/textures/blocks planks_acacia.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_acacia.png
837 /assets/minecraft/textures/blocks planks_big_oak.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_big_oak.png
838 /assets/minecraft/textures/blocks planks_birch.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_birch.png
839 /assets/minecraft/textures/blocks planks_jungle.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_jungle.png
840 /assets/minecraft/textures/blocks planks_oak.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_oak.png
841 /assets/minecraft/textures/blocks planks_spruce.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_spruce.png
842 /assets/minecraft/textures/blocks nether_brick.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_nether_brick.png
843 /assets/minecraft/textures/blocks fence_acacia.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_acacia.png
844 /assets/minecraft/textures/blocks fence_big_oak.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_big_oak.png
845 /assets/minecraft/textures/blocks fence_birch.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_birch.png
846 /assets/minecraft/textures/blocks fence_jungle.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_jungle.png
847 /assets/minecraft/textures/blocks fence_nether_brick.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_nether_brick.png
848 /assets/minecraft/textures/blocks fence_oak.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_oak.png
849 /assets/minecraft/textures/blocks fence_spruce.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_spruce.png
850 /assets/minecraft/textures/blocks fence_gate_acacia.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_acacia.png
851 /assets/minecraft/textures/blocks fence_gate_big_oak.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_big_oak.png
852 /assets/minecraft/textures/blocks fence_gate_birch.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_birch.png
853 /assets/minecraft/textures/blocks fence_gate_jungle.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_jungle.png
854 /assets/minecraft/textures/blocks fence_gate_oak.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_oak.png
855 /assets/minecraft/textures/blocks fence_gate_spruce.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_gate_spruce.png
/assets/minecraft/textures/blocks fence_jungle.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_jungle.png
/assets/minecraft/textures/blocks fence_nether_brick.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_nether_brick.png
/assets/minecraft/textures/blocks fence_oak.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_oak.png
/assets/minecraft/textures/blocks fence_spruce.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_spruce.png
856 /assets/minecraft/textures/entity sign.png /mods/ITEMS/mcl_signs/textures mcl_signs_sign.png
857 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_1.png 0 0 16 16 0 0
858 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_2.png 16 0 16 16 0 0

@ -44,12 +44,16 @@ make_texture_pack = True
# If True, prints all copying actions
verbose = False
PXSIZE = 16
syntax_help = """TextureConverter.py -i <input dir> [-o <output dir>] [-d] [-v|-q] [-h]
Mandatory argument:
-i <input directory>
Directory of Minecraft resource pack to convert
Optional arguments:
-p <size>
Specify the size of the original textures (default: 16)
-o <output directory>
Directory in which to put the resulting MineClone 2 texture pack
(default: working directory)
@ -61,7 +65,7 @@ Optional arguments:
-h
Shows this help an exits"""
try:
opts, args = getopt.getopt(sys.argv[1:],"hi:o:dv")
opts, args = getopt.getopt(sys.argv[1:],"hi:o:p:dv")
except getopt.GetoptError:
print(
"""ERROR! The options you gave me make no sense!
@ -89,6 +93,8 @@ Syntax:""")
base_dir = arg
elif opt == "-o":
output_dir = arg
elif opt == "-p":
PXSIZE = int(arg)
if base_dir == None:
print(
@ -173,7 +179,6 @@ def convert_textures():
print(src_file + "" + dst_file)
# Convert chest textures (requires ImageMagick)
PXSIZE = 16
chest_file = tex_dir + "/entity/chest/normal.png"
if os.path.isfile(chest_file):