lanxu/MineClone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update texture conversion, add paintings, fix bugs

Browse Source
This commit is contained in:
Wuzzy 2017-07-26 23:34:06 +02:00
parent f8d86c4f1a
commit 54c1f6875f
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tools/Texture_Conversion_Table.csv
View File

@ -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

1 Source path Source file Target path Target file xs ys xl yl xt yt
605 /assets/minecraft/textures/blocks piston_top_normal.png /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_pusher_right.png
606 /assets/minecraft/textures/blocks piston_top_normal.png /mods/ITEMS/REDSTONE/mesecons_pistons/textures mesecons_piston_pusher_top.png
607 /assets/minecraft/textures/blocks redstone_block.png /mods/ITEMS/REDSTONE/mesecons_torch/textures redstone_redstone_block.png
608 /assets/minecraft/textures/items sign.png /mods/ITEMS/signs/textures /mods/ITEMS/mcl_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
609 /assets/minecraft/textures/blocks iron_bars.png /mods/ITEMS/xpanes/textures xpanes_pane_iron.png
610 /assets/minecraft/textures/blocks glass_pane_top_black.png /mods/ITEMS/xpanes/textures xpanes_top_glass_black.png
611 /assets/minecraft/textures/blocks glass_pane_top_blue.png /mods/ITEMS/xpanes/textures xpanes_top_glass_blue.png
751 /assets/minecraft/textures/blocks bed_feet_end.png /mods/ITEMS/mcl_beds/textures mcl_beds_bed_side_bottom_red.png
752 /assets/minecraft/textures/blocks bed_feet_side.png /mods/ITEMS/mcl_beds/textures mcl_beds_bed_side_bottom_r_red.png
753 /assets/minecraft/textures/blocks bed_feet_top.png /mods/ITEMS/mcl_beds/textures mcl_beds_bed_top_bottom_red.png
754 /assets/minecraft/textures/blocks bed_head_end.png /mods/ITEMS/mcl_beds/textures mcl_beds_bed_top_bottom_r_red.png mcl_beds_bed_side_bottom_red.png
755 /assets/minecraft/textures/blocks bed_head_end_tall.png bed_head_end_tail.png /mods/ITEMS/mcl_beds/textures mcl_beds_bed_side_top_red.png
756 /assets/minecraft/textures/blocks bed_head_side.png /mods/ITEMS/mcl_beds/textures mcl_beds_bed_side_top_r_red.png
757 /assets/minecraft/textures/blocks bed_head_top.png /mods/ITEMS/mcl_beds/textures mcl_beds_bed_top_top_red.png
758 /assets/minecraft/textures/items compass_00.png /mods/ITEMS/mcl_compass/textures mcl_compass_compass_00.png
816 /assets/minecraft/textures/blocks fence_oak.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_oak.png
817 /assets/minecraft/textures/blocks fence_spruce.png /mods/ITEMS/mcl_fences/textures mcl_fences_fence_spruce.png
818 /assets/minecraft/textures/entity sign.png /mods/ITEMS/mcl_signs/textures mcl_signs_sign.png
819 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_1.png 0 0 16 16 0 0
820 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_2.png 16 0 16 16 0 0
821 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_3.png 32 0 16 16 0 0
822 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_4.png 48 0 16 16 0 0
823 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_5.png 64 0 16 16 0 0
824 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_6.png 80 0 16 16 0 0
825 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_7.png 96 0 16 16 0 0
826 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_8.png 0 32 32 16 0 0
827 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_9.png 32 32 32 16 0 0
828 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_10.png 64 32 32 16 0 0
829 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_11.png 96 32 32 16 0 0
830 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_12.png 128 32 32 16 0 0
831 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_13.png 0 64 16 32 0 0
832 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_14.png 16 64 16 32 0 0
833 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_15.png 0 128 32 32 0 0
834 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_16.png 32 128 32 32 0 0
835 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_17.png 64 128 32 32 0 0
836 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_18.png 96 128 32 32 0 0
837 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_19.png 128 128 32 32 0 0
838 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_20.png 160 128 32 32 0 0
839 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_21.png 0 96 64 32 0 0
840 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_22.png 0 192 64 64 0 0
841 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_23.png 64 192 64 64 0 0
842 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_24.png 128 192 64 64 0 0
843 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_25.png 192 64 64 48 0 0
844 /assets/minecraft/textures/painting paintings_kristoffer_zetterstrand.png /mods/ITEMS/gemalde/textures gemalde_26.png 192 112 64 48 0 0

5
tools/Texture_Converter.py
View File

@ -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"