From 6e52bc628c578aaae022c97b3b10c697468f1a08 Mon Sep 17 00:00:00 2001 From: jp Date: Sun, 2 Aug 2015 11:32:02 +0200 Subject: [PATCH] Cleanup hive formspec --- enchanting.lua | 7 ++++--- hive.lua | 10 ++++++---- init.lua | 2 +- textures/{bg.png => ench_bg.png} | Bin textures/ench_mese_layout.png | Bin 0 -> 140 bytes textures/{xdecor_bee2.png => xdecor_bee.png} | Bin textures/xdecor_bee1.png | Bin 304 -> 0 bytes textures/xdecor_bee3.png | Bin 268 -> 0 bytes worktable.lua | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) rename textures/{bg.png => ench_bg.png} (100%) create mode 100644 textures/ench_mese_layout.png rename textures/{xdecor_bee2.png => xdecor_bee.png} (100%) delete mode 100644 textures/xdecor_bee1.png delete mode 100644 textures/xdecor_bee3.png diff --git a/enchanting.lua b/enchanting.lua index 119c02f..9dd038e 100644 --- a/enchanting.lua +++ b/enchanting.lua @@ -3,11 +3,12 @@ local function enchconstruct(pos) meta:set_string("formspec", "size[8,7;]"..xdecor.fancy_gui.. "label[0.65,-0.15;Enchant]".. "image[0.4,0.2;2,2;default_book.png]".. + "image[1.3,2;1,1;ench_mese_layout.png]".. "list[current_name;tool;0.3,2;1,1;]".. "list[current_name;mese;1.3,2;1,1;]".. - "image_button[2.5,0;5.3,1.1;bg.png;durable;Durable]".. - "image_button[2.5,1;5.3,1.1;bg.png;fast;Fast]".. - "image_button[2.5,2;5.3,1.1;bg.png;luck;Luck]".. + "image_button[2.5,0;5.3,1.1;ench_bg.png;durable;Durable]".. + "image_button[2.5,1;5.3,1.1;ench_bg.png;fast;Fast]".. + "image_button[2.5,2;5.3,1.1;ench_bg.png;luck;Luck]".. "list[current_player;main;0,3.3;8,4;]") meta:set_string("infotext", "Enchantment Table") diff --git a/hive.lua b/hive.lua index b310ef7..03004ab 100644 --- a/hive.lua +++ b/hive.lua @@ -1,10 +1,12 @@ local function hive_construct(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", "size[8,5;]"..xdecor.fancy_gui.. - "label[1.25,0;Bees are making honey\nwith pollen around...]".. - "image[0,0;0.9,0.9;xdecor_bee3.png]".. -- Bees textures by Charles Sanchez and Mark Weyer. - "image[6,0;0.9,0.9;xdecor_bee2.png]".. - "image[7,0.35;0.8,0.8;xdecor_bee1.png]".. + "label[1.35,0;Bees are making honey\nwith pollen around...]".. + "image[-0.1,-0.2;1,1;flowers_tulip.png]".. + "image[0.5,0.2;1,1;flowers_dandelion_yellow.png]".. + "image[6.6,0.1;1,1;flowers_geranium.png]".. + "image[7.2,-0.1;1,1;flowers_rose.png]".. + "image[6,0;0.9,0.9;xdecor_bee.png]".. -- Bee texture by Charles Sanchez and Mark Weyer. "list[current_name;honey;5,0;1,1;]".. "list[current_player;main;0,1.35;8,4;]") meta:set_string("infotext", "Artificial Hive") diff --git a/init.lua b/init.lua index 0dbbf05..fa79559 100644 --- a/init.lua +++ b/init.lua @@ -4,7 +4,7 @@ modpath = minetest.get_modpath("xdecor") dofile(modpath.."/handlers/nodeboxes.lua") dofile(modpath.."/handlers/registration.lua") dofile(modpath.."/crafts.lua") ---dofile(modpath.."/enchanting.lua") -- In development. +dofile(modpath.."/enchanting.lua") -- In development. dofile(modpath.."/hive.lua") dofile(modpath.."/itemframe.lua") dofile(modpath.."/mailbox.lua") diff --git a/textures/bg.png b/textures/ench_bg.png similarity index 100% rename from textures/bg.png rename to textures/ench_bg.png diff --git a/textures/ench_mese_layout.png b/textures/ench_mese_layout.png new file mode 100644 index 0000000000000000000000000000000000000000..830ece18c3eb14f980ad0e730d75a8f04a966e01 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9E07Ki4Hdo{`47lqED7=p zW^j0RBMrzg@pN$v;kcg6z~sipwv3H!8Z(a!7Y~!Lgou@dj*i3>YY7oc2^JO!3sH#( hS&13a4W}9y7@B{w@_jiyWgk#KgQu&X%Q~loCIAab9wh(( literal 0 HcmV?d00001 diff --git a/textures/xdecor_bee2.png b/textures/xdecor_bee.png similarity index 100% rename from textures/xdecor_bee2.png rename to textures/xdecor_bee.png diff --git a/textures/xdecor_bee1.png b/textures/xdecor_bee1.png deleted file mode 100644 index 6b3e4c86146b685d4224640319a2dbc1a5cfffce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w#Q>iWS0L@c!0_UP!`UE#fB*h9 zJ1QgyaLk!A<^Q{;r0!?mngySF_r}R1v5B2yO9Ru?DceU43W4TJHe6bu!4Z= zacK+B%Tv~AEj+lEapCQz38mU8_Z{wV?{s*p7G7}u-j-QfEqooHf7Cy*{t(}CY;q%` z2q%X~2anK2=Y#W7as@vex~m;?a7o6==|?*+Fw9(kq#*spI{x6TPWId6rm}KO`Wp4i zipz1+vTUE+>(@72x#QU=5nHRc+ikPukB&{LtDkCQxi0RVyZf1((%&M!C_l^0NZ-T0 z4o!azY>gCF+KC7YtawyjBzv=rd%5l&^9gGETGz^#MKlRd0(ykO)78&qol`;+0NV?A A;s5{u diff --git a/textures/xdecor_bee3.png b/textures/xdecor_bee3.png deleted file mode 100644 index 0ba599ba66c3241eb78d26a7be83f17bfcbd1b4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@I3?$8F6>iWS0L@c!0_UP!`UE#|L>Zb z9Tool`!{FKlmr2er0!?mnguEp9NdA57)yfuf*Bm1-ADs+W_r3fhDcoY?LWwQ*nr1% zDX+@z%mwDNbp&Sf34CDcJ;|`s^uT}WdE==0ZL>1or|g=dviaOG(Zme#*W1EVpIrSGJ?-5kyWc_{yZEIS-%C2@ zSk81T`<=%QL(8hfEssSe70KOCTyM605@*Sb8Hv}QGS@F$_Vsvk;OF?K!lL_Lznps$ P=tu@nS3j3^P6