From 54c1f6875fa08fcb461b7fad2cf9d79f697e4c57 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 26 Jul 2017 23:34:06 +0200 Subject: [PATCH] Update texture conversion, add paintings, fix bugs --- tools/Texture_Conversion_Table.csv | 50 +++++++++++++++++------------- tools/Texture_Converter.py | 5 +-- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/tools/Texture_Conversion_Table.csv b/tools/Texture_Conversion_Table.csv index 44caa71e26..4c97a8dd04 100644 --- a/tools/Texture_Conversion_Table.csv +++ b/tools/Texture_Conversion_Table.csv @@ -605,25 +605,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt /assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_pusher_right.png,,,,,, /assets/minecraft/textures/blocks,piston_top_normal.png,/mods/ITEMS/REDSTONE/mesecons_pistons/textures,mesecons_piston_pusher_top.png,,,,,, /assets/minecraft/textures/blocks,redstone_block.png,/mods/ITEMS/REDSTONE/mesecons_torch/textures,redstone_redstone_block.png,,,,,, -/assets/minecraft/textures/items,sign.png,/mods/ITEMS/signs/textures,default_sign.png,,,,,, -/assets/minecraft/textures/blocks,glass_black.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_black.png,,,,,, -/assets/minecraft/textures/blocks,glass_blue.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_blue.png,,,,,, -/assets/minecraft/textures/blocks,glass_brown.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_brown.png,,,,,, -/assets/minecraft/textures/blocks,glass_cyan.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_cyan.png,,,,,, -/assets/minecraft/textures/blocks,glass_gray.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_gray.png,,,,,, -/assets/minecraft/textures/blocks,glass_green.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_green.png,,,,,, -/assets/minecraft/textures/blocks,glass_light_blue.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_light_blue.png,,,,,, -/assets/minecraft/textures/blocks,glass_lime.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_lime.png,,,,,, -/assets/minecraft/textures/blocks,glass_magenta.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_magenta.png,,,,,, -/assets/minecraft/textures/blocks,glass.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_natural.png,,,,,, -/assets/minecraft/textures/blocks,glass_orange.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_orange.png,,,,,, -/assets/minecraft/textures/blocks,glass_pink.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_pink.png,,,,,, -/assets/minecraft/textures/blocks,glass_purple.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_purple.png,,,,,, -/assets/minecraft/textures/blocks,glass_red.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_red.png,,,,,, -/assets/minecraft/textures/blocks,glass_silver.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_silver.png,,,,,, -/assets/minecraft/textures/blocks,glass_white.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_white.png,,,,,, -/assets/minecraft/textures/blocks,glass_yellow.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_glass_yellow.png,,,,,, -/assets/minecraft/textures/blocks,iron_bars.png,/mods/ITEMS/xpanes/textures,xpanes_pane_half_iron.png,,,,,, +/assets/minecraft/textures/items,sign.png,/mods/ITEMS/mcl_signs/textures,default_sign.png,,,,,, /assets/minecraft/textures/blocks,iron_bars.png,/mods/ITEMS/xpanes/textures,xpanes_pane_iron.png,,,,,, /assets/minecraft/textures/blocks,glass_pane_top_black.png,/mods/ITEMS/xpanes/textures,xpanes_top_glass_black.png,,,,,, /assets/minecraft/textures/blocks,glass_pane_top_blue.png,/mods/ITEMS/xpanes/textures,xpanes_top_glass_blue.png,,,,,, @@ -769,8 +751,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt /assets/minecraft/textures/blocks,bed_feet_end.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_bottom_red.png,,,,,, /assets/minecraft/textures/blocks,bed_feet_side.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_bottom_r_red.png,,,,,, /assets/minecraft/textures/blocks,bed_feet_top.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_top_bottom_red.png,,,,,, -/assets/minecraft/textures/blocks,bed_head_end.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_top_bottom_r_red.png,,,,,, -/assets/minecraft/textures/blocks,bed_head_end_tall.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_top_red.png,,,,,, +/assets/minecraft/textures/blocks,bed_head_end.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_bottom_red.png,,,,,, +/assets/minecraft/textures/blocks,bed_head_end_tail.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_top_red.png,,,,,, /assets/minecraft/textures/blocks,bed_head_side.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_side_top_r_red.png,,,,,, /assets/minecraft/textures/blocks,bed_head_top.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_top_top_red.png,,,,,, /assets/minecraft/textures/items,compass_00.png,/mods/ITEMS/mcl_compass/textures,mcl_compass_compass_00.png,,,,,, @@ -834,3 +816,29 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt /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 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_3.png,32,0,16,16,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_4.png,48,0,16,16,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_5.png,64,0,16,16,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_6.png,80,0,16,16,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_7.png,96,0,16,16,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_8.png,0,32,32,16,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_9.png,32,32,32,16,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_10.png,64,32,32,16,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_11.png,96,32,32,16,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_12.png,128,32,32,16,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_13.png,0,64,16,32,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_14.png,16,64,16,32,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_15.png,0,128,32,32,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_16.png,32,128,32,32,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_17.png,64,128,32,32,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_18.png,96,128,32,32,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_19.png,128,128,32,32,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_20.png,160,128,32,32,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_21.png,0,96,64,32,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_22.png,0,192,64,64,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_23.png,64,192,64,64,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_24.png,128,192,64,64,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_25.png,192,64,64,48,0,0 +/assets/minecraft/textures/painting,paintings_kristoffer_zetterstrand.png,/mods/ITEMS/gemalde/textures,gemalde_26.png,192,112,64,48,0,0 diff --git a/tools/Texture_Converter.py b/tools/Texture_Converter.py index 5874083177..356b5b03c7 100755 --- a/tools/Texture_Converter.py +++ b/tools/Texture_Converter.py @@ -112,10 +112,7 @@ def convert_textures(): \( -clone 0 -crop "+str(CHPX)+"x"+str((PXSIZE/16)*10)+"+"+str(CHPX)+"+"+str((2*CHPX) + ((PXSIZE/16)*5))+" \) -geometry +0+"+str((PXSIZE/16)*5)+" -composite \ -extent "+str(CHPX)+"x"+str(CHPX)+" "+target_dir("/mods/ITEMS/mcl_chests/textures")+"/default_chest_front.png") - os.system("convert " + chest_file + " \ -\( -clone 0 -crop "+str(CHPX)+"x"+str((PXSIZE/16)*5)+"+"+str(2*CHPX)+"+"+str(CHPX)+" \) -geometry +0+0 -composite \ -\( -clone 0 -crop "+str(CHPX)+"x"+str((PXSIZE/16)*10)+"+"+str(2*CHPX)+"+"+str((2*CHPX) + ((PXSIZE/16)*5))+" \) -geometry +0+"+str((PXSIZE/16)*5)+" -composite \ --extent "+str(CHPX)+"x"+str(CHPX)+" "+target_dir("/mods/ITEMS/mcl_chests/textures")+"/default_chest_side.png") + # TODO: Convert other chest sides # Convert grass grass_file = tex_dir + "/blocks/grass_top.png"