From d3dbedd1991365f9c0f81539469fc5aa7e44edd3 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 21 Jul 2017 19:47:20 +0200 Subject: [PATCH] Update stem images and automatically colorize them --- mods/ITEMS/mcl_farming/melon.lua | 11 ++++++++--- mods/ITEMS/mcl_farming/pumpkin.lua | 10 +++++++--- mods/ITEMS/mcl_farming/shared_functions.lua | 16 ++++++++++++++++ .../mcl_farming_melon_stem_connected.png | Bin 294 -> 232 bytes .../mcl_farming_melon_stem_disconnected.png | Bin 0 -> 234 bytes .../textures/mcl_farming_melontige_1.png | Bin 302 -> 0 bytes .../textures/mcl_farming_melontige_2.png | Bin 333 -> 0 bytes .../textures/mcl_farming_melontige_3.png | Bin 352 -> 0 bytes .../textures/mcl_farming_melontige_4.png | Bin 400 -> 0 bytes .../textures/mcl_farming_melontige_5.png | Bin 458 -> 0 bytes .../textures/mcl_farming_melontige_6.png | Bin 488 -> 0 bytes .../textures/mcl_farming_melontige_7.png | Bin 504 -> 0 bytes .../textures/mcl_farming_melontige_8.png | Bin 524 -> 0 bytes .../mcl_farming_pumpkin_stem_connected.png | Bin 294 -> 232 bytes .../mcl_farming_pumpkin_stem_disconnected.png | Bin 0 -> 179 bytes .../textures/mcl_farming_pumpkintige_1.png | Bin 302 -> 0 bytes .../textures/mcl_farming_pumpkintige_2.png | Bin 333 -> 0 bytes .../textures/mcl_farming_pumpkintige_3.png | Bin 352 -> 0 bytes .../textures/mcl_farming_pumpkintige_4.png | Bin 400 -> 0 bytes .../textures/mcl_farming_pumpkintige_5.png | Bin 458 -> 0 bytes .../textures/mcl_farming_pumpkintige_6.png | Bin 488 -> 0 bytes .../textures/mcl_farming_pumpkintige_7.png | Bin 504 -> 0 bytes .../textures/mcl_farming_pumpkintige_8.png | Bin 524 -> 0 bytes tools/Texture_Conversion_Table.csv | 4 ++++ 24 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melon_stem_disconnected.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_1.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_2.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_3.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_4.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_5.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_6.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_7.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_8.png create mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkin_stem_disconnected.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_1.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_2.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_3.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_4.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_5.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_6.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_7.png delete mode 100644 mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_8.png diff --git a/mods/ITEMS/mcl_farming/melon.lua b/mods/ITEMS/mcl_farming/melon.lua index 3a1c2764..fa8929c0 100644 --- a/mods/ITEMS/mcl_farming/melon.lua +++ b/mods/ITEMS/mcl_farming/melon.lua @@ -60,6 +60,10 @@ local stem_drop = { -- Growing unconnected stems +local startcolor = { r = 0x2E , g = 0x9D, b = 0x2E } +local endcolor = { r = 0xFF , g = 0xA8, b = 0x00 } + + for s=1,7 do local h = s / 8 local doc = s == 1 @@ -68,6 +72,7 @@ for s=1,7 do entry_name = "Premature Melon Stem" longdesc = "Melon stems grow on farmland in 8 stages. On hydrated farmland, the growth is a bit quicker. Mature melon stems are able to grow melons." end + local colorstring = mcl_farming:stem_color(startcolor, endcolor, s, 8) minetest.register_node("mcl_farming:melontige_"..s, { description = string.format("Premature Melon Stem (Stage %d)", s), _doc_items_create_entry = doc, @@ -78,7 +83,7 @@ for s=1,7 do drawtype = "plantlike", sunlight_propagates = true, drop = stem_drop, - tiles = {"mcl_farming_melontige_"..s..".png"}, + tiles = {"([combine:16x16:0,"..((8-s)*2).."=mcl_farming_melon_stem_disconnected.png)^[colorize:"..colorstring..":127"}, selection_box = { type = "fixed", fixed = { @@ -96,14 +101,14 @@ local stem_def = { description = "Mature Melon Stem", _doc_items_create_entry = true, _doc_items_longdesc = "A mature melon stem attempts to grow a melon at one of its four adjacent blocks. A melon can only grow on top of farmland, dirt, or a grass block. When a melon is next to a melon stem, the melon stem immediately bends and connects to the melon. While connected, a melon stem can't grow another melon. As soon all melons around the stem have been removed, it loses the connection and is ready to grow another melon.", - tiles = {"mcl_farming_melontige_8.png"}, + tiles = {"mcl_farming_melon_stem_disconnected.png^[colorize:#FFA800:127"}, } -- Register stem growth mcl_farming:add_plant("plant_melon_stem", "mcl_farming:melontige_unconnect", {"mcl_farming:melontige_1", "mcl_farming:melontige_2", "mcl_farming:melontige_3", "mcl_farming:melontige_4", "mcl_farming:melontige_5", "mcl_farming:melontige_6", "mcl_farming:melontige_7"}, 30, 5) -- Register actual melon, connected stems and stem-to-melon growth -mcl_farming:add_gourd("mcl_farming:melontige_unconnect", "mcl_farming:melontige_linked", "mcl_farming:melontige_unconnect", stem_def, stem_drop, "mcl_farming:melon", melon_base_def, 25, 15, "mcl_farming_melon_stem_connected.png") +mcl_farming:add_gourd("mcl_farming:melontige_unconnect", "mcl_farming:melontige_linked", "mcl_farming:melontige_unconnect", stem_def, stem_drop, "mcl_farming:melon", melon_base_def, 25, 15, "mcl_farming_melon_stem_connected.png^[colorize:#FFA800:127") -- Items and crafting minetest.register_craftitem("mcl_farming:melon_item", { diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua index 9d4c8c22..8a01caf7 100644 --- a/mods/ITEMS/mcl_farming/pumpkin.lua +++ b/mods/ITEMS/mcl_farming/pumpkin.lua @@ -34,6 +34,9 @@ local stem_drop = { -- Unconnected immature stem +local startcolor = { r = 0x2E , g = 0x9D, b = 0x2E } +local endcolor = { r = 0xFF , g = 0xA8, b = 0x00 } + for s=1,7 do local h = s / 8 local doc = s == 1 @@ -42,6 +45,7 @@ for s=1,7 do entry_name = "Premature Pumpkin Stem" longdesc = "Pumpkin stems grow on farmland in 8 stages. On hydrated farmland, the growth is a bit quicker. Mature pumpkin stems are able to grow pumpkins." end + local colorstring = mcl_farming:stem_color(startcolor, endcolor, s, 8) minetest.register_node("mcl_farming:pumpkin_"..s, { description = string.format("Premature Pumpkin Stem (Stage %d)", s), _doc_items_entry_name = entry_name, @@ -52,7 +56,7 @@ for s=1,7 do drawtype = "plantlike", sunlight_propagates = true, drop = stem_drop, - tiles = {"mcl_farming_pumpkintige_"..s..".png"}, + tiles = {"([combine:16x16:0,"..((8-s)*2).."=mcl_farming_pumpkin_stem_disconnected.png)^[colorize:"..colorstring..":127"}, selection_box = { type = "fixed", fixed = { @@ -69,7 +73,7 @@ end local stem_def = { description = "Mature Pumpkin Stem", _doc_items_longdesc = "A mature pumpkin stem attempts to grow a pumpkin at one of its four adjacent blocks. A pumpkin can only grow on top of farmland, dirt or a grass block. When a pumpkin is next to a pumpkin stem, the pumpkin stem immediately bends and connects to the pumpkin. A connected pumpkin stem can't grow another pumpkin. As soon all pumpkins around the stem have been removed, it loses the connection and is ready to grow another pumpkin.", - tiles = {"mcl_farming_pumpkintige_8.png"}, + tiles = {"mcl_farming_pumpkin_stem_disconnected.png^[colorize:#FFA800:127"}, } -- Template for pumpkin @@ -90,7 +94,7 @@ local pumpkin_base_def = { mcl_farming:add_plant("plant_pumpkin_stem", "mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2", "mcl_farming:pumpkin_3", "mcl_farming:pumpkin_4", "mcl_farming:pumpkin_5", "mcl_farming:pumpkin_6", "mcl_farming:pumpkin_7"}, 30, 5) -- Register actual pumpkin, connected stems and stem-to-pumpkin growth -mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin_face", pumpkin_base_def, 30, 15, "mcl_farming_pumpkin_stem_connected.png", +mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin_face", pumpkin_base_def, 30, 15, "mcl_farming_pumpkin_stem_connected.png^[colorize:#FFA800:127", function(pos) -- Attempt to spawn iron golem or snow golem mobs_mc.tools.check_iron_golem_summon(pos) diff --git a/mods/ITEMS/mcl_farming/shared_functions.lua b/mods/ITEMS/mcl_farming/shared_functions.lua index 31a4e0ae..5debb5ef 100644 --- a/mods/ITEMS/mcl_farming/shared_functions.lua +++ b/mods/ITEMS/mcl_farming/shared_functions.lua @@ -363,3 +363,19 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s }) end +-- Used for growing gourd stems. Returns the intermediate color between startcolor and endcolor at a step +-- * startcolor: ColorSpec in table form for the stem in its lowest growing stage +-- * endcolor: ColorSpec in table form for the stem in its final growing stage +-- * step: The nth growth step. Counting starts at 1 +-- * step_count: The number of total growth steps +function mcl_farming:stem_color(startcolor, endcolor, step, step_count) + local color = {} + local function get_component(startt, endd, step, step_count) + return math.floor(math.max(0, math.min(255, (startt + (((step-1)/step_count) * endd))))) + end + color.r = get_component(startcolor.r, endcolor.r, step, step_count) + color.g = get_component(startcolor.g, endcolor.g, step, step_count) + color.b = get_component(startcolor.b, endcolor.b, step, step_count) + local colorstring = string.format("#%02X%02X%02X", color.r, color.g, color.b) + return colorstring +end diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melon_stem_connected.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melon_stem_connected.png index e1ae622db0909eddaece7b9c0d8c9d85987cdd88..7c64ce5d108236dbeb65e4f9d55180b455d3901e 100644 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z_7^E z#WBR<^xH`rd5;)yxX#aKT{4AdlI9*~wv9F&v;A7t`Jc{#bY{`dexF&h+*J&-=J$IkkmOCZr&W4t2QVf?(49|Zqx8AVd mqOUoz;cdeG@2B0XnC^UW7Jk2eo(cm41B0ilpUXO@geCx;qFuNE literal 294 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@hM&rf10vH$=LIQk3T>l^P3NaH+bdb#P zl*#vzEe}?x4OeQ8QE7=)=}c7ZPFCwlR_jYspOCIGHCuCbf%e=Yoi%j^>*@`+x0~$j zG}+Zn33mT985kHCOM?7@862M7NMm4NXz+A#43Ut$ zd+;{jK?jkxi~eu>lKxZ$u)Y63PwM5-8;Lt6c&u^NGuk=9m@A5Db7OyJ*Zav+X1EyX za#=8+<9vP~-}BYSlz_=EecaMa1nzOAcW*wNSupL-bURha_a3i=%Qrr2^)u=&JzAWc x-5{bd`P!6N=G5o5smFO!otk44ofy`glX=O&z_7&A z#WBR<^w!B6Iaw41T=$>8nvkJ*yRTKJ%p`P%)T~qdtjgRUlpa0^xcFF2$W89?Z2b@C zi_V!okC}aUXPCew3$_U^UYT4KXJ;Lo@zi*Iylt#<<=+^uo9rzD32Sp1CKTUe@95|< zY*N{BEk3w*TGZ19l^(;2dG4~_Jc@HXRXT&XTv9AvZn&s=Oyc3*@Y|LzUSE!Syzl)s nUID?YlOwWi|8uXF*~7R-)c0J>M>lZ>1_lOCS3j3^P6!lvVtU& zJ%W507^>757#dm_7=AG@Ff_biU???UV0e|lz+g3lfkC`r&aOZk1_lP60G|+71_p+p z3Wn$ohX4Qnf1LTzjDdlHu_VYZn8D%MjWiG^$=lt9S&+x)69WSSdx@v7EBixcK4t;k z-7n@#GB7X*dAc};NL)@%kYHWWAb2c+Nsxijf`KLW%I-D>1_sp<*NBpo#FA929YQ&VjNLn{LVoA{@^C>nC}Q!>*kF*TS#H8ie>)n{N} OVDNPHb6Mw<&;$U{s!JFE diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_2.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_2.png deleted file mode 100644 index 26a6db6a59320c55542d207371519fb83dc7b8c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8Ea{HEjtmSN`?>!lvVtU& zJ%W507^>757#dm_7=AG@Ff_biU???UV0e|lz+g3lfkC`r&aOZk1_lPX0G|+71_p+p z3Wn$ohLjl$*8U7hQy4tc84@Njgw`|s|NlQ`X6RN11_s8GAirP+hi5m^K%69RcNfl& zHaj5J_7>-gQu&X%Q~loCIFbER!lvVtU& zJ%W507^>757#dm_7=AG@Ff_biU???UV0e|lz+g3lfkC`r&aOZk1_lQ80G|+71_p+x z3WnqkhWr@}P5}%#Qy2m>7_ufY#5OQw_Aum5V~DI``2YX^$_pje85kHCOM?7@862M7 zNCR<_yxm=R8aD?fGcYi)mw5WRvOi?zV;0ce{bIf(0|SGmr;B5V#`)v~3D#x~gGJm1 z3%L!f7jSM+Tfn)&d;zzQgLw+0W8>8TDTe*g%v-0iXU$+>U{Eb_jVMV;EJ?LWE=o-- zNo6oHFf`XSFxE9R2{ACXGPJNVG1fLPv@$U0ee*yHMMG|WN@iLmx&|{V6H|zW#uc&p Q3=9kmp00i_>zopr07qzDwg3PC diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_4.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_4.png deleted file mode 100644 index afb7bbf30d8a7de7d61232b1097dd2e31f357100..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 400 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk zdj$D1FjT2AFf_CDJOdc2rZ7ZjFjP!p$ZTLJ?_sE!#*k9Q&@hLgWdTF$B8J#JhSDyEstFA3 zOBh0v82YkxBPYnldmju$OrHy0SlH=3^Gn z-Th*|Bm)D3qo<2wh{fsT1PRu~2@Z_PimW~@A_kiU0uG#Vb6~V)S7e>jB6HAnCsQ61 zR|SXWgQKe(rZzVA%g<+GbYxRZ3{hmLP-gh5d-&oi1_lPz64!{5l*E!$tK_28#FA77 zBLhQoT?1oXLz55#V=F@oD-#QC14AnVgZ|fB9-wH*%}>cpt3=meW@Tau(a^XeR-b`^ Ofx*+&&t;ucLK6VN?{GH& diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_5.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_5.png deleted file mode 100644 index c4bcc5fb18baae458e8a8969714e7d5bac39541e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk zdj$D1FjT2AFf_C`BV`~w(TrZ6OBFf>nMC~9D6=wWD^#*kaZ&^?Ete*we9MGUEV4E0?MEfW|f zFJXvDVkoI&D5zqHjA2MfVMxwln6iwavV~##I)yU|?V@3GxeO zaCmkj4a7dSM@<2N6ak@Q%N<-? zrts$nbai%r@_JCJ)V)LH0*hvi){<0-9Vru87y|2bP0l+XkKh3JG+ diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_6.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_6.png deleted file mode 100644 index c0946f1085a47516255beb9b747566b3ab88c3f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk zdj$D1FjT2AFf_CQLlA)x%u&RmZ#QQbr!3xnQX9WhS8bz zR@JGB^ICKYqhxE-6i=+NYAaB=xZQSHpWdzg4t42Ddls7YSEygzW!qD#c5$=q>?Z9a zD=hy1|8G3y$_oYt2F8*gzhDN3XE)M7oFs2|7iF!a94iI}2KEw9Usv{r%zVrOy1QS@ zmjpS|)5S5w;`G}K+xZ#{1eh-@ZV{@|U- zh=H+{p@o&HrM7{gm4U%iv;C(~H00)|WTsW3YcR7iF@FVdQ&MBb@ E0H8yu;s5{u diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_7.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_7.png deleted file mode 100644 index a9adf08c9666660a5b5110d1ff6ad2433c6561fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 504 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk zdj$D1FjT2AFf_Cu* zsyaq-UX@N^kZf(7;)!`yZRsi(SK2OX*1NUAp)Ou&&s4MiJoT$1@>=Jg zkC{9#cqG&qr};KKHhQp8@LKf(jt`O?3Om?a1epqzGTR*Htrn*oSz4TXUd!11kL9v&!BiOr1_sp<*NBpo#FA92 z{w0~2inLn{LV<-@xJP&DM`r(~v8qH8d-GBJf{ VXj~Di&%nUI;OXk;vd$@?2>>w5tTF%q diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_8.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_8.png deleted file mode 100644 index 7936e5fe6725bdc3f5bc11003806f90770d4edfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 524 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk zdj$D1FjT2AFf_C*@`6cbm@0(>gT4{PXGcYhPc)I$ztaD0e0sw#Yvk44ofy`glX=O&z_7^E z#WBR<^xH`rd5;)yxX#aKT{4AdlI9*~wv9F&v;A7t`Jc{#bY{`dexF&h+*J&-=J$IkkmOCZr&W4t2QVf?(49|Zqx8AVd mqOUoz;cdeG@2B0XnC^UW7Jk2eo(cm41B0ilpUXO@geCx;qFuNE literal 294 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@hM&rf10vH$=LIQk3T>l^P3NaH+bdb#P zl*#vzEe}?x4OeQ8QE7=)=}c7ZPFCwlR_jYspOCIGHCuCbf%e=Yoi%j^>*@`+x0~$j zG}+Zn33mT985kHCOM?7@862M7NMm4NXz+A#43Ut$ zd+;{jK?jkxi~eu>lKxZ$u)Y63PwM5-8;Lt6c&u^NGuk=9m@A5Db7OyJ*Zav+X1EyX za#=8+<9vP~-}BYSlz_=EecaMa1nzOAcW*wNSupL-bURha_a3i=%Qrr2^)u=&JzAWc x-5{bd`P!6N=G5o5smFO!otQUFVmTYv*!+RF?$#1v5B2yOGAgz+ms`;us=vxwUU2 zFM}ZuQ{#jC^-q>~Fb91pv70G;Kskk3^un*-8V(m2b^OfS*iIjuX0^0(eyrBYr%GSK d=k82k*4AMtoP8th0s{jBgQu&X%Q~loCIFIjHP-+D literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_1.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_1.png deleted file mode 100644 index 0321c5d4b04c6f7c3a84e0ba128f6a24277794f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EEa{HEjtmSN`?>!lvVtU& zJ%W507^>757#dm_7=AG@Ff_biU???UV0e|lz+g3lfkC`r&aOZk1_lP60G|+71_p+p z3Wn$ohX4Qnf1LTzjDdlHu_VYZn8D%MjWiG^$=lt9S&+x)69WSSdx@v7EBixcK4uYX z?SS__3=9lHo-U3d5|@(`Bv@B82p&sd5@cYsU|@;8vb&9efkCyzHKHUXu_V!lvVtU& zJ%W507^>757#dm_7=AG@Ff_biU???UV0e|lz+g3lfkC`r&aOZk1_lPX0G|+71_p+p z3Wn$ohLjl$*8U7hQy4tc84@Njgw`|s|NlQ`X6RN11_s8GAirP+hi5m^K%69RcNfl& zH>+muL1_pUg7sn8d^T`PktcQ6F7I7OabS diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_3.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_3.png deleted file mode 100644 index ba2cba938f7b5c214eb169e55b362f458dad6f86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8Ea{HEjtmSN`?>!lvVtU& zJ%W507^>757#dm_7=AG@Ff_biU???UV0e|lz+g3lfkC`r&aOZk1_lQ80G|+71_p+x z3WnqkhWr@}P5}%#Qy2m>7_ufY#5OQw_Aum5V~DI``2YX^$_pje85kHCOM?7@862M7 zNCR<_yxm=R8aD?fGcYi)mw5WRvOi?zV;1E~o_f!mfq_BO)5S4F<9u?01Zy*g!6I&h zh1>?#3ph8ZE#TZ>zJS}u!90c0vGHnv6vO^#=B?A%vt}?bFsPQeMwFx^mZVxG7o{ea zq%s&87@F%E80#9EgculG85vp`8fY6BS{WEj6yB+Uq9HdwB{QuOw}uCPj8hmG7#KWV L{an^LB{Ts5!2?`U diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_4.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_4.png deleted file mode 100644 index ebb1bba4dbfa53f40a125f746cbb0a06f97ef8a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 400 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk zdj$D1FjT2AFf_CDJOdc2rZ7ZjFjP!p$ZTLJ?_sE!#*k9Q&@hLgWdTF$B8J#JhSDyEstFA3 zOBh0v82YkxBPYnldmju$OrHy0SlH=3^G+ zOZg$C$H2hg=;`7ZVsSb-L4tL0f&-(nBCAh}h{0xofCH!892l+H6`BV`~w(TrZ6OBFf>nMC~9D6=wWD^#*kaZ&^?Ete*we9MGUEV4E0?MEfW|f zFJXvDVkoI&D5zqHjA2MfVMxwln6iwavV~##I)yU|?V@3GxeO zaCmkj4a7Rh}-6Ar_~T6C_xbB@Bdu z4!C$Q8gnzUuE}8$*-$JHbinh3V9XTl2Wkr%+9xo@?cs`$l=$)Eqo#mBih$6ufWJpfkm@MYe}laj+BWk41sk_$#Wim+swegpjzS@QIe8al4_M) zl$uzQ%3x$*Xs&ButZQfzVqk1#WN2k*scm3rWnjS4{pUA|hTQy=%(P0}8cMIZxHB*? OFnGH9xvXQLlA)x%u&RmZ#QQbr!3xnQX9WhS8bz zR@JGB^ICKYqhxE-6i=+NYAaB=xZQSHpWdzg4t42Ddls7YSEygzW!qD#c5$=q>?Z9a zD=hy1|8G3y$_oYt2F8*gzhDN3XE)M7oFs2|7iF!a94iI}2KEw9Usv{r%zVtE;tZ2F zy#qPY)5S5w;`G}K+xZ#{1eh-@ZV{@|U-RdP{kVo554k%6JPu7Ru* zsyaq-UX@N^kZf(7;)!`yZRsi(SK2OX*1NUAp)Ou&&s4MiJoT$k~TwV+e48@)?fvZ-v37_4xQ#wjz zS6rK5Y02LULJh?;)8?Gs^eDzGNa5T+ON(>QYZ<%$v0U~om@31-z@S><8c~vxSdwa$ zT$GwvlFDFYU}&yuV61Cs5@KL%Wn^e&Y@lsmXk}n<*=%1ZiiX_$l+3hB+!_{Tv%O?s PU|{fc^>bP0l+XkK2YahY diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_8.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_8.png deleted file mode 100644 index 2db014d7738f3582a864d3cf4b2132695a937400..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 524 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk zdj$D1FjT2AFf_C*@`6cbm@0(>gT4{P?gSae82`q}QicCye=x;}aA+7fNEiyJd#vY4 ziIlq(ey{6K+@;R4k1HBxbuM$gzPWGN+bqV4zQiY%%Vs{W*vC?Ezn*=*E5qh@eEX6g zve`(-%?W2HqkaPv@$SI hubkzEq9HdwB{QuOw}vnkB~aWkc)I$ztaD0e0syOdvWEZw diff --git a/tools/Texture_Conversion_Table.csv b/tools/Texture_Conversion_Table.csv index 63df4a2e..401f0043 100644 --- a/tools/Texture_Conversion_Table.csv +++ b/tools/Texture_Conversion_Table.csv @@ -813,3 +813,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt /assets/minecraft/textures/blocks,redstone_dust_dot.png,/mods/ITEMS/REDSTONE/mesecons/textures,redstone_redstone_dust_dot.png,,,,,, /assets/minecraft/textures/blocks,redstone_dust_line0.png,/mods/ITEMS/REDSTONE/mesecons/textures,redstone_redstone_dust_line0.png,,,,,, /assets/minecraft/textures/blocks,redstone_dust_line1.png,/mods/ITEMS/REDSTONE/mesecons/textures,redstone_redstone_dust_line1.png,,,,,, +/assets/minecraft/textures/blocks,pumpkin_stem_connected.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_pumpkin_stem_connected.png,,,,,, +/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,,,,,,