From 4052114460886531fa94c403c017687e00277725 Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Mon, 17 Dec 2018 18:43:13 +0200 Subject: [PATCH] formspec changes: bucket and lump icons, tooltips --- metal_melter/caster.lua | 11 +++++++---- metal_melter/melter.lua | 10 +++++++--- metal_melter/textures/metal_melter_gui_bucket.png | Bin 0 -> 203 bytes metal_melter/textures/metal_melter_gui_lump.png | Bin 0 -> 174 bytes 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 metal_melter/textures/metal_melter_gui_bucket.png create mode 100644 metal_melter/textures/metal_melter_gui_lump.png diff --git a/metal_melter/caster.lua b/metal_melter/caster.lua index 7325b4c..93fd121 100644 --- a/metal_melter/caster.lua +++ b/metal_melter/caster.lua @@ -17,10 +17,10 @@ metal_caster.casts = { local metal_cache = {} function metal_caster.get_metal_caster_formspec(water, metal) - local metal_formspec = "label[0.08,3.75;No Molten Metal]" + local metal_formspec = "tooltip[6.68,0;0.8,2.45;No Molten Metal]" if metal ~= nil then - metal_formspec = "label[0.08,3.75;Metal: "..fluid_lib.buffer_to_string(metal).."]" + metal_formspec = "tooltip[6.68,0;0.8,2.45;"..fluid_lib.buffer_to_string(metal).."]" end return "size[8,8.5]".. @@ -30,11 +30,14 @@ function metal_caster.get_metal_caster_formspec(water, metal) "list[context;cast;2.7,0.2;1,1;]".. "image[2.7,1.35;1,1;gui_furnace_arrow_bg.png^[transformFY]".. "list[context;output;2.7,2.5;1,1;]".. - "list[context;coolant;0.25,2.5;1,1;]".. + "image[0.08,2.5;1,1;metal_melter_gui_bucket.png]".. + "list[context;coolant;0.08,2.5;1,1;]".. metal_melter.fluid_bar(0.08, 0, water).. - "label[0.08,3.4;Water: ".. fluid_lib.buffer_to_string(water) .."]".. + "tooltip[0.08,0;0.8,2.45;".. fluid_lib.buffer_to_string(water) .."]".. metal_melter.fluid_bar(6.68, 0, metal).. metal_formspec.. + "image[4.7,0.2;1,1;metal_melter_gui_bucket.png]".. + "image[4.7,1.4;1,1;metal_melter_gui_bucket.png]".. "list[context;bucket_in;4.7,0.2;1,1;]".. "list[context;bucket_out;4.7,1.4;1,1;]".. "image[5.7,0.2;1,1;gui_furnace_arrow_bg.png^[transformR270]".. diff --git a/metal_melter/melter.lua b/metal_melter/melter.lua index 726dc52..80a4366 100644 --- a/metal_melter/melter.lua +++ b/metal_melter/melter.lua @@ -50,23 +50,27 @@ function metal_melter.get_metal_from_stack(stack) end function metal_melter.get_metal_melter_formspec(lava, metal) - local metal_formspec = "label[0.08,3.75;No Molten Metal]" + local metal_formspec = "tooltip[6.68,0;0.8,2.45;No Molten Metal]" if metal ~= nil then - metal_formspec = "label[0.08,3.75;Metal: "..fluid_lib.buffer_to_string(metal).."]" + metal_formspec = "tooltip[6.68,0;0.8,2.45;"..fluid_lib.buffer_to_string(metal).."]" end return "size[8,8.5]".. default.gui_bg.. default.gui_bg_img.. default.gui_slots.. + "image[2.25,0.2;1,1;metal_melter_gui_lump.png]".. "list[context;input;2.25,0.2;1,1;]".. + "image[2.25,1.4;1,1;metal_melter_gui_bucket.png]".. "list[context;heat;2.25,1.4;1,1;]".. "image[1.3,1.4;1,1;gui_furnace_arrow_bg.png^[transformR90]".. metal_melter.fluid_bar(0.08, 0, lava).. - "label[0.08,3.4;Lava: ".. fluid_lib.buffer_to_string(lava) .."]".. + "tooltip[0.08,0;0.8,2.45;".. fluid_lib.buffer_to_string(lava) .."]".. metal_melter.fluid_bar(6.68, 0, metal).. metal_formspec.. + "image[4.7,0.2;1,1;metal_melter_gui_bucket.png]".. + "image[4.7,1.4;1,1;metal_melter_gui_bucket.png]".. "list[context;bucket_in;4.7,0.2;1,1;]".. "list[context;bucket_out;4.7,1.4;1,1;]".. "image[5.7,0.2;1,1;gui_furnace_arrow_bg.png^[transformR270]".. diff --git a/metal_melter/textures/metal_melter_gui_bucket.png b/metal_melter/textures/metal_melter_gui_bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..cd35a921a322660027a262aabf741ec1b947d743 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4!a7K8GGlIK8*v%n*= zn1Ml08H5=tmfDvA1=&kHeO=if@dyg2$eJ8|d>1Gb;pyTSVsSb-K_cTohi`!A-3Rt& zAFIvv4IY{Lf;f6-S)P8(JhFTm>ueUii^zw07w0hwU pR-X|6SuH|BS7ROS?s4E_U?_U5cASG%<}J_;22WQ%mvv4FO#rlMJq7>( literal 0 HcmV?d00001 diff --git a/metal_melter/textures/metal_melter_gui_lump.png b/metal_melter/textures/metal_melter_gui_lump.png new file mode 100644 index 0000000000000000000000000000000000000000..5ef6e71294b68aa2891d56d4a49bbfdbeb1f0a3d GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4!a7K8GGlIK8*v%n*= zn1Ml08H5=tmfDvA1=&kHeO=if@dyg2a+9_d%8G=Se#BykYE*IcFSq