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 3a1c27643..fa8929c01 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 9d4c8c228..8a01caf71 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 31a4e0aec..5debb5ef8 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 zcmVP)Px#qDe$SR5;7+lCcfMFbGATZv~{343a6lLk6)th2!&& zx#p-4hzB2lzy03avMe1yRRO5Al2UTF0p@t`yNJ+QLqt$jLI^I#*h2{J5^x3q7%b=f zahk_#zzS3q5h2FdhX7{?z`Cvs0jy)K^_GOUNxRIpZIn{nu!Pnc0Mj%v&+~UXu)jEt igJFQ}VBh!4M|uL>^g|Qxubw0T00000oneEP)BZP#xR6M!MJ_VAkTVKe0<(dSiHh%&l$b;^ zEebdT&I#whZ%OL$WKfgoOh#rj5Z(%Bi?hRNaF+a+J|!9NNa_=JvF3$NGK+P^b7O0O s6eyF{lwAX5=RIY|4P`?^*|^}r4U3%v>b=YK9RL6T07*qoM6N<$f_Woz-v9sr diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melon_stem_disconnected.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melon_stem_disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..82cf606d84caf2ed8418edbcbddabd4dfe660f33 GIT binary patch literal 234 zcmVPx#q)9|UR5;7Eld%Z|ArM8s%hh0LA={3HEOsQbO4+SF&@FL;hP|@Qi5=I{5 zn=kOsa?Um9T$|mwRuGan29QKbX$pAFn#P#rGp}DgT_bt@TuRvogb-k@Z2*vS-Uo9Ely#u(wfSKB%0>(g4}zVEgT k5E0drSZh813#%Nw0jw2G&Rp?E7XSbN07*qoM6N<$f@64EWdHyG literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_1.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_1.png deleted file mode 100644 index 50caebdd1ee05e59cbdbad9effd0faaae3d98b2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmZY0ze@sf0EY2LPZ3NdBgmRsY6cTdTN^Qr&ebuEU&==i?#~my;!tP~^0dO3esa5hAnk7XAaawrkD$!GDna1xM}j NEP$?=>fMrk`~%UdOBetE 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 zcmZ9@O(=tL0LSs~+Sb};a$^!MmeTUy3#(@io3^$mHuKm@8SQ;Ji1a92Y;xeF-~Ik#BY_zy-U_sB0OU(62!$iZmfay+&D1DK>%vH$=8 diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_3.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_melontige_3.png deleted file mode 100644 index 98ad6269709274b925b81aeb69f059dc9525fb70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmZ9@&nts*0LSsSHjO>V4LiB`m6q>gV|qAv^eh%z+w9;+tIe|?CTr58aN2O7NJ-j3 z87D3xxo~iF0`Rzf J+WAmq?FUC_UA6!K 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 zcmZ9`Pe@Y%0LSs~+=el+UL$CB2(c1ujNY7~R8ewYUMehQhHhyqatJlXllfJ*vha-wt*GegpOvOp5SB18E5kPE=m^p9TgK z7m^WR>^k`wW|p{^pim}rl{*i}+1U5FyU1vsQiZu?7M@^^akEHao`+RZ8LVk0@?1`# z8R#RFpE6b8(F&O?!#QfT+8OPm7jRf={1Uz2zhvtrbG}bLob$B$fksP-MH;_4_d12Z zo2|z!^;e1o2(V PeDDN-5{b(zXSLhAh3JG+ 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#YvP)Px#qDe$SR5;7+lCcfMFbGATZv~{343a6lLk6)th2!&& zx#p-4hzB2lzy03avMe1yRRO5Al2UTF0p@t`yNJ+QLqt$jLI^I#*h2{J5^x3q7%b=f zahk_#zzS3q5h2FdhX7{?z`Cvs0jy)K^_GOUNxRIpZIn{nu!Pnc0Mj%v&+~UXu)jEt igJFQ}VBh!4M|uL>^g|Qxubw0T00000oneEP)BZP#xR6M!MJ_VAkTVKe0<(dSiHh%&l$b;^ zEebdT&I#whZ%OL$WKfgoOh#rj5Z(%Bi?hRNaF+a+J|!9NNa_=JvF3$NGK+P^b7O0O s6eyF{lwAX5=RIY|4P`?^*|^}r4U3%v>b=YK9RL6T07*qoM6N<$f_Woz-v9sr diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkin_stem_disconnected.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkin_stem_disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..7a3be1f56eb6a7c42d685c40a94ea5e183e04d75 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUFVmTYv*!+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 zcmZ{bKT85}06?FfBA5z>kTgUMwTSRj`+Eg-afcq=9oOX$L~)n@Xb2-Ns3xh1nu4Z; zK0s5@T6dVO?RGou&Lj}<9czV! zx0iZPHkXR3l#Cf)K*ZNgE%GWQq||K2{xpDoT~*5Ir;3{n-?WmCZZJt;n$Y_5!znQ8 zYpZ_M^J{Wtx90gZ@*+2t6@_eWyetZGUdR(O8IhBPXiDw*Kf`vjx>Y~;e;C>rIR?-* KOTArmkA4AT-ASwf diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_2.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_2.png deleted file mode 100644 index 48eca7011ff5b261d1deabf7ff0a7ea70ebad637..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmZ{bPbfoi0D!->t+ma_LH;CMEYbAaMyof6O?z!GHuG$yIK2JOL8PZ}V3PwUC27iG z6gQfKi<@?EbfsKeB)P~Tv6z&02As7w9 z^}hWlWp2bwM2*6R6N)?V4HVyCRlvIjQW@HpPj08jfS&kdLI%_|=61=J@lTOHL@A&h zkldnPug@PRZvca?#%2h-KIR*eo(PAmpHJr>fJIlLvgO6tY-}@s4c0DzUL_Pv3_N7C z4s)$ZoY}>xUHB{3sbS 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 zcmZ{by-Nad06?Fpm|nF+6izLb5y9^?5UvIlkCIYObLfLWJ3mqqBQB^Wt%iaiiV}wg zYikK38fs~5tR-rSS|a)rA}|~q8s6}Dyj?9a*5+_JfVR+hFb4EAv6z8!JbMpVvi`6i zF88IMq_r9K@mLr(`k=H8-$3aTRt0<|K&e94^2u#<6zJC`<0>$_hQ33wNHEGi4O_}`VC(X&-ocX$9%U6M3L!CBKNh7W3 zE9s<>#w}#;knjx2!*StJ+_EBzK_M$b9CX~c{tSg;DwkRRe|U?SjsQYxBzO@>Z2khl C16)!7 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 zcmZ{bJ4hP=06^a*y+%?D4k;BW*dPi;QtlGPath7KoqA|Oj423ONX(}?R7FlqLxodP zY(-E+#UY~DObUWH>7pMNeS*_psd4_@%&M58}KUJ6V-uq zhVf5KuVaMCt}rl6W|V9O&XZkYuE6UdN~Mx`Q~U`CW+c={ z;QMX5EJNL$ntS={MKjENZV_V G&He?p+id6n diff --git a/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_5.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_pumpkintige_5.png deleted file mode 100644 index e24ec3ff8ca5a225592f2ed397e94a6cba9bc462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmZ{eJ!lgF07hS$3z3v+jEd1gia&)K3U`g59tw?INKQ>m&kPl!Tyl5OLjQ;tu|evg zLEA)Vt3f+tC=zs$qPP_4(5VOxI*DUNkkZW#wP-Pt(ZS&x9*+m#R4N(k@E!C49co!-xB;b6SpkIWkwgUEOt)`mJuPX(wFH#9z$wEoz*&Q$2+fgAeU#bK(pCAtA7jtE?Y}prtkZgd<$|HV#=X{uQLRAZ8Z_~es%A3@7v@3 zbL(g8m8wM2r#={Z&~qdx2DD`*?h3cNJgQLlA)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 63df4a2e6..401f0043c 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,,,,,,