From c74a0f65920fa459f529dae73e3c16f47ee43ce0 Mon Sep 17 00:00:00 2001 From: BuckarooBanzay Date: Tue, 7 May 2024 19:14:32 +0200 Subject: [PATCH 1/2] reduce delay-time between async operations --- create_catalog.lua | 2 +- get_catalog.lua | 2 +- readme.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/create_catalog.lua b/create_catalog.lua index 5cff333..8267068 100644 --- a/create_catalog.lua +++ b/create_catalog.lua @@ -25,7 +25,7 @@ function mapblock_lib.create_catalog(filename, pos1, pos2, options) -- default to async serialization options = options or {} - options.delay = options.delay or 0.2 + options.delay = options.delay or 0.1 options.callback = options.callback or function() end options.progress_callback = options.progress_callback or function() end diff --git a/get_catalog.lua b/get_catalog.lua index 224b713..81d41fb 100644 --- a/get_catalog.lua +++ b/get_catalog.lua @@ -136,7 +136,7 @@ function Catalog:deserialize_all(target_mapblock_pos, options) local count = 0 options = options or {} - options.delay = options.delay or 0.2 + options.delay = options.delay or 0.1 options.rotate_y = options.rotate_y or 0 options.callback = options.callback or function() end options.progress_callback = options.progress_callback or function() end diff --git a/readme.md b/readme.md index 6245300..e237627 100644 --- a/readme.md +++ b/readme.md @@ -64,7 +64,7 @@ local mb_pos1 = { x=0, y=0, z=0 } local mb_pos2 = { x=1, y=1, z=1 } local options = { -- optional: delay between operations - delay = 0.2, + delay = 0.1, -- optional: called when done callback = function() print("done!") From 9fefe90736e93ba16bc437ea7e472ae1147603d9 Mon Sep 17 00:00:00 2001 From: BuckarooBanzay Date: Tue, 7 May 2024 21:33:20 +0200 Subject: [PATCH 2/2] metadata marker block --- init.lua | 1 + metadata.lua | 41 +++++++++++++++++++++++++++++ textures/mapblock_lib_metadata.png | Bin 0 -> 5575 bytes 3 files changed, 42 insertions(+) create mode 100644 metadata.lua create mode 100644 textures/mapblock_lib_metadata.png diff --git a/init.lua b/init.lua index 6b0c59f..4d00370 100644 --- a/init.lua +++ b/init.lua @@ -23,6 +23,7 @@ dofile(MP .. "/util.lua") dofile(MP .. "/pointed.lua") dofile(MP .. "/pos.lua") dofile(MP .. "/data.lua") +dofile(MP .. "/metadata.lua") dofile(MP .. "/mapblock.lua") diff --git a/metadata.lua b/metadata.lua new file mode 100644 index 0000000..da057a1 --- /dev/null +++ b/metadata.lua @@ -0,0 +1,41 @@ + +local function update_formspec(meta) + local group = meta:get_string("group") + -- TODO + + meta:set_string("formspec", [[ + size[10,8.3] + real_coordinates[true] + field[0.1,0.4;8.8,0.8;group;Group;]] .. group .. [[] + button_exit[9,0.4;0.9,0.8;set;Set] + list[context;main;0.1,1.4;8,1;] + list[current_player;main;0.1,3;8,4;] + listring[] + ]]) +end + +minetest.register_node("mapblock_lib:metadata", { + description = "Mapblock-lib metadata marker", + tiles = {"mapblock_lib_metadata.png^[colorize:#23c1cc"}, + drawtype = "allfaces", + use_texture_alpha = "blend", + paramtype = "light", + paramtype2 = "facedir", + sunlight_propagates = true, + groups = { + oddly_breakable_by_hand = 3 + }, + + on_construct = function(pos) + local meta = minetest.get_meta(pos) + update_formspec(meta) + end, + + on_receive_fields = function(pos, _, fields) + if fields.set then + local meta = minetest.get_meta(pos) + meta:set_string("group", fields.group) + update_formspec(meta) + end + end +}) diff --git a/textures/mapblock_lib_metadata.png b/textures/mapblock_lib_metadata.png new file mode 100644 index 0000000000000000000000000000000000000000..7beae93e1946831d0b1f1f2814af9b92dbd59896 GIT binary patch literal 5575 zcmeHLdt4J&79OMsA{35txjepAxa)50fH12K~z)_ z&{}--p%kmGRza(Pt|C5GrJ}A11re+d+PZ4BTB!xyn}CYD{m0$5f0^HJl9_wY`R@6? zd(OSNvrI8{lDq3LR|taKWf7s#;Mdc3^>GB>s*Qv1Ly+UjdCGW8G?~USnha`fGQ+Z@ z8yOa3)v6)L+Vo9aRME9@Ze8u(8E^PHc%7)3we6R_8J+2kjWXhgZI+^vgc#kf36TYl zd?((%^z_N?JEMH2yuIJ^V)WFL*IaO#6aR5*0W-1KqdEP94r(ry*6yAwLr%{xNpFg4 z++CKwQR78)7DzQ^i((I49>+ATP5h1LSf1&Q4RE<#lDXcaPI~06sK&2ug|06D;hRg- zHJ(e10O8^Xp;9=d?- zWIj?dMlALUFI*Vqo2NUP5z)^@x=yp{yJ@_yDl3f-zPVTTwSUor6!FZhspD5QKNiP5 zSef}z&DM2aq=)F4hd*o>)ii!&R{n6)&8xTS-m9+@{nB*CyLhu-WrpF>J~=gbjIXiq zW?BA@WWNqL``GQRIiCmM${i#cejJ(kVVGPn^PIN-rIH~{X|5N(RBTCE?-wg|J5a7t z@62cT!$MEZV7zO`4k?Z$a*3^mGhu5s>SL0G}!2fbZ{=tF| z*!NRSPBZ+g-Wum0^aQPO&r^I_dVFOY^`RtpXCJ3);T2@|F|OWYcW9OO+T`H=KBI3Q zyd`UPgYs4pecYz|t(xXr=;b-S!YeBxTk3T7T-E`pLtf!D-ca*&41j-}p!M zP(v&RH(|?y*H3U#E%uBG9OfoaZaV5oO^Mok%qOx4Be-Ma*B;JLVo4WDx820%pu1)PIM|w_m-VI6YCFd*d|Z7d)!00dFwF4 zWcNvu*zDMcE?MVB4hYiaMs@dgr zV(OOE82rQyeign~E}9>Qi%K)1D>GU~ZoPCoZj(OmwoV-JaM7LGu8Xe2eIA<(^V~O4gkJ5cjK+ZMz<>c2nT*^m8ws~ZG4EY^mEC}bfa z&k7Tia{JWlA@>>;^h)IU~i`gl=$N7a&ouhQmzawGFj{kbjI<$XKe_-<&~@Im*8 zdl$;SFkgA+&5EK@&rjbv;a0`EH@bmY+bSMB;+LQ6b`{F%2P|2(ST+2#u5NPfWPh1Y zta9c3u7tG%&m?ZRXj&tcmZoj; zoL~J?W<4%`Fg2l4 zM{V(t=2lH^ft;5dPAV*K@W0a1a;5o@W?feoRJ_`>XW&?uY6$YE)q<5WUOt7O3_1=; z8&nL(sxyL>6oUK%twxfX!&q13R!k zh4tpqHi&MFP{vG|v_^~8pl8`INtGeRB4M*ZKkHe1I-^|v9A0nkQ32?|wUS0I%0aj~ z9k;iK*%FotKzaiDT@SMoY&hI##%xG2QA}7WqqmIi4M9`S{f#N6WIG+2;xfsM4w#z3 zsOU>WPLjzL&pm7sXtX+`-3y5QlBGqfej(ONvDtd;bb1E@+@IsVWc`f0-56NO-sKlv*7VVQek1?4+ zCfYDjgv0N~wM`2F$N*tUTb=>{y9eMxgqRr8VlXKUhGYrb781+mX-{vKfA^$BXwASP z-Inn^IUmE!?SASmfn=?{i^a01EkRPeQH2>3rz5A5w)m$ zDfnY3VoDSxFpLo3FH`jA+P0r(rRmT8uj1`C=(S&g1n+JG`ykj>xzG32p3DdF{+XYi zMdQyLg2j40$SdjlTCUe}y^;d2Wc)h2Ud#1L3cQl>>+Jf&eeLa2pR1h~H2i!SWqNm0{(wmLo1t{d8ikuV*Ep-|Z0Ur7pBNEII z#2Ib79IRgirh-Oii%cHo+}?LczX=nk7ne^1O+zhV@s<#S&UOHV?B^1OW~FH@Ni5sB zBrfaC!N6#cEHp^z(m)}7`{X*hc^;lJ;FcSBIg7aWi~fFD-U?s=$-<_F?hKx_=-+6* B`4IpB literal 0 HcmV?d00001