From ae83eea8823748e70350b304dda704b8888d4c4d Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 19 Jun 2019 21:21:41 +0200 Subject: [PATCH 1/9] Optimize PNG images losslessly Commands used: - `parallel optipng -o7 -zm1-9 -strip all ::: **/*.png` - `parallel advpng -z4 -i5000 ::: **/*.png` --- textures/fire_basic_flame.png | Bin 794 -> 695 bytes textures/fire_basic_flame_animated.png | Bin 1191 -> 1190 bytes textures/maptools_adminpick.png | Bin 283 -> 279 bytes textures/maptools_adminpick_with_drops.png | Bin 278 -> 276 bytes textures/maptools_grass_side_12.png | Bin 561 -> 549 bytes textures/maptools_grass_side_8.png | Bin 466 -> 442 bytes textures/maptools_infinitefuel.png | Bin 381 -> 380 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/fire_basic_flame.png b/textures/fire_basic_flame.png index e3c52b0d0cc196ab2431174ebc1bcb82725dc035..aa77897f2c32b0bed447be078890e3ff746dde03 100644 GIT binary patch delta 671 zcmV;Q0$}}`2Db%}B!7NML_t(|+F~FEREzO}F`&+I0FESz0^pBr+qUiGY}>YN+qP}n zwr$&1-_C4|u6kx6c?u-U=mtE!ghG@(L#PYQ&K!eO^}$m3*P_ zg~At~>N!fnhn8Ll1_$xJr7K^WIPkE1&azJpeY5=wi3WVEappUVq%KWY33Q%2zKX>B#nbdlw#*x8!pJJO1?Ymvf9y;A`IyzAZ^XWO1*o zAzz32!>K6lR5sv4V>`L{ds-q4iQ#d53%(u>lyl7X;^l5HK92IpS@5Eo0iWgs!GdJI z9Si4aUwhbI8s-$|XB!88jtPS6sc^Cw7pn^RTADYjtbcPBd}(3Fw}wvqIh@FaIePp% zm@XH&T8yu=f_SpY5B8_??RXm8t;NsV_4%+h0`aDmJ=se-y1~Iz9`?)G{Ctly9E|1r z);R7Bcjoi12>8>Md&lGWbS4e)sf!Z~3Xun%H8$hNQornB#(44jcm$`X>2jii;K!C2 zcu+fCHQ+kjSH)E*j`7#ibOsxiG>&S*;C$- z=S?#ZT#Mn%R7W^f4Q>{Lp?-Wnkq+@4VJsThqYg#X-3lT3NZ)>cW{G#?m} zCNWKu<3%Z2=D>4xc+TND&vW2`*Qldm4@bkESK;y>aHkXbKYyaJl!LL9W7S+844HDS zu%K3ei~UG%cZ89@<`uv@eg}XUD7HB|3J|5~3XpHJHKq62YOAiy6l^3TI){^nANO*g-ICElP3`URNv~gLc*vluKFiSKy1G8#0g!kyz~HYl zDq_=#c^hoK{eMgWsK+~llKiEpURF{4+>+W-jbgq^xz@%?^fOM~hn|C{1DpH={OM%=PC5u#qN6TOmC&BK;V-z#DbgwgWp68`TW zDZ6Q~Xme0L(kB2jkEQ`=e6d!1ekYpVB(y#VfISf={(p9Y#^xTh$i<8T$V|-<+v3B! zC&J{XZb_^QEI-MLlN?G>mPML7v}KQGo`sP*t=SCPif_Xyw8J(?JBfX1QHv?$w~s}) zJ6X(S2ycvG1cS)LNAmBD2ZXn;qt#b^L0|?v=;LMDsSXd*_lbVE9<}4TVpv!j3{dD_ zf}BR9(|>00^k*#22GLz{wBn&R1i<_ut2#a%TSv$L#Etgu?+PF{_YlK!(QWfFeQT0- zwF1d*vc*ZXhzHGX*pTCI2|%S%rkR;1c|4~8znEg@y{^~m> z_KxGODRlQIap*DN7{o?PiqR6;lTk6F0oW2p^Lw=D3JOIN)+}^U`LoE@Z}w509wYa& zLP>g9ZvT;G^UyZ%mf=#CXCFjySW&n(1shC|82MWhc$a+8>)_g%o7{ckqT24jPwyde zbGOt_4TxOcC38Qfq&c={RpO5HhUDw8 diff --git a/textures/fire_basic_flame_animated.png b/textures/fire_basic_flame_animated.png index 17b4cebd68157f0146deb4891e3ec3490ab7816a..11383f3857f2540eff693caab31f8bf848360843 100644 GIT binary patch delta 615 zcmV-t0+{`$38o3K6aoQ#lNACye}xhoaMeNEV$K8X15gqPP@NX&oCQ#p&q8ip6qJK^ zQ6fV@v!pW?T!24a5jB&nG`0hwO~)a5j4#Htu$oy6q*ktX#BHw)4qqMlJ>~%Qty4ZT zTr|h-bl#2@k_`>}(U7v&9aj4kUPZ+`34O3U;psMT=Wcbt;SCU9az5?rf3R74@0i4; z*U9x#&%?&qX-03qt+5`KyKP&^BY>d+Z_!lu+u6Y<4h`&3J)F!{4-^kqFt^qR@%iYH z#%pqQ5RX9dAaRHwh|JB6DxjP!)uRju4K4`D8}IUtnVei{ELJ>1#A8tPQ06y1do&MT z9UWz=9+gvZGtfL->-Y5Re=(oX7Y(Fz?}Xhw9Taj1`+ZO{;p;Zw?rv4Z;pO}ZluUp0 zSVBBDG7NkBQ9Mqh+1S9q06x#x06RWK5DK0rV`Qm}%e_?3w?!m?vkN5X@ zy9eH*iz`_3;e}+qQfO$Hs6aYcFqamX<(#MjMWT&G;GDCwH!{Bra>nr2p;gOiyn(NRwp6<>B*v$bL3^ z!5Azrccs}75(5Ki{*Qy)@?*687%e|W%a76W0{|Bff<%o~8EF6j002ovPDHLkV1lEB BA@~3Q delta 616 zcmV-u0+;=!38x9L6aoQ$lNACye+2+G;HrbR#heG&2LM1MKy_N6a~42ZJ`1^ZQBV%v zMTrar&63VoZ~^{wMbu2P(%24!HXVoLF}@hn!fIwQkXpIk5x2cIIDB>F_m~6Jw@&%Y zaM2vQ(|J2uNH#R=M?=b9cUbLHcoh}%B=o`Zgs0oUox9Zmhc`fc$@#Ref5T?!y<-xW zUMJT}Jr5gary0Hdw#Ir`?zU|uj{t@SyhT&pZ)XReI5eTt>4qLf5&`6Uo_&;y%To#bWq44?2AXqgsr9ae4TBAF`j# zUN8pB%Ux+Ugv7u=n*ZY&Qk50%h002ovPDHLkV1hK{D|Y|@ delta 115 zcmV-(0F3{a0-FMmuWVOIL_t(|+HA*z6$3#4K*67EY@E&hOFU~akAp$gL6&D_St3c2 zxTul%br7=kx%_S^8~gLsb6JTUe4R)-{4M!B-tysT%jb9pc%4`rwx0;)v|~i$0|3eS V1LHsMvZnw5002ovPDHLkV1hE!HUR(t diff --git a/textures/maptools_adminpick_with_drops.png b/textures/maptools_adminpick_with_drops.png index 8f7cf7b3c5ed4d5d24b2c473424f0a14cc603453..ed706ce80091fdc9b61a2ca8419bfdedf5b5feba 100644 GIT binary patch delta 111 zcmV-#0FeKd0+a%ftY}k7L_t(|+EvHJ0Rk}qMZp(>J0$43^xxvT{kaVtRW?vrS`-B$ zj-%Wo0`DA4kNxGCu&~-4{y%2c!1Ei*;q}&YzU$%o(X%-L+_p^C`i|9uLDi~^1HqQL RvmgKf002ovPDHLkV1kjUHhBO5 delta 113 zcmV-%0FM8Z0+s@htZG$BL_t&-S7pdW7Jx7iz|i3C?$X}>jO=(!$?gaKX|1)fu2U%` z*S>FeE7#ICjTlv!#m9HpK{QVvI~LUADhypOOBH00000NkvXXu0mjf?P4;1 diff --git a/textures/maptools_grass_side_12.png b/textures/maptools_grass_side_12.png index 6b264356e07ceea319bb32ccfe54f69769a38295..1a2789b5c34628484deaa3411701a44b8ab97b02 100644 GIT binary patch literal 549 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4(FKV0`20;uunKi>I%-(1lUN)nD51 z+P2)=$27L(Mzb!t^mlQ)ch2F+FRhkE{Z?AyQA)SDf})FRY7PIDvNrm%UQA{EDQtR` zU3sm$@K$r>ZSy+5O_yDBGt+4`*Pd>pN$OEX)l466IJ~=}@WxH)wN}qg%U9-UtFE&p z9hWlNE%iv+YmKa6#HY(U+LBIv7yGo_>Xd()RlnGsjhcTn1*QKd$~bFo^cEFd*lTU$ zSK`{aSz*zJ?1l@ASmG1iR-`FcFI)OQT~%?%^j4Mn{CO_%UVk0D%bd@8{Q0wn=aADI z9>Lf&o_Cs2Jl{?-aJ^{Ya8O`qy0G1FooY^kUHa3G1EpmXnq{6Suv?yRR-m0p+pTOHlK_M!Om z70jJKQ?mYTFPQ%Sy};6M^W&!|^J`3d5uWv(_K4vSgO33hgW{WyR{^7+!PC{xWt~$(69Arw=tuwn delta 536 zcmV+z0_Xju1hE8=B!BoxL_t(I%k7XmYg1tWhM(^{m+vG^jwfwXTY81IcCZ~Jf+Aif z5gi}ZfeT45L;^wOC7`s3n9U3Lp)_*Cx2`#A?R3|osSi!Gii+B zQ5SD4PQ4T&91~j$;!0t83LA^46H&}HIXUj4yAggpB&tN%wq$p!iqsNX^^k!v7h4Ea zzk_m3imL@`pDLWr459ig{B9G!)S|vpBxrW2ehU~Lbdm0m!t_Iwlte<4NJt9%bq3FR z(68BC&M`jVpnrV9>hmo&){FFxB}n!uN~H$oVG!y7iAM`1Vee}VTWSvW+6Yh4lF+S% z#8U>>7UzCCFgujPfay#csS6Q(BM$yfi+Tqf!=NV?!y8SKR58p*QrKd|o^F_YR(JF6W|S4wg37i?5G6kV(tp{j1#lrGJH$hv^)feEH~~<>bVQ)H^AeO8Fzm6a{7S~%mOoj z16;qmct&5mHF;$!lfDUD0=Rm6N(&*L2;d$N0$D%<0xXSD=TLLx1LMhihU8uakxmI&GbVD!sBqej{8>BM4y5*LaDU{#M8%2=Wy^M?PaDV` zHIOl&!c)tEaTh#8u!%>>x*G+v7D~2UsNHlUl>QX4Yz_nOQs8eAk-n%Qm97b;JVIKJ zia;TU!cjYzlZ)VzIFL? z#g+%@Eh?hT5`UP2J{9NAv+V@OWb>xud*z%CDR}SW_4`-m60w|41-|s>h*gQWe)mcr z#TxUb9H^ur_S|Q0m@ERr2;BWjiM1!vwI)4scZ6jboqUP-3UOxhq#dCmF3LOa=8+#} zh*E2Kuq?Zqu-g(-iO&(UzxAd6SS0>20SHC_C|`uAs2N5WfC&KXP?)DpiAse40000< KMNUMnLSTY`)yAIy delta 440 zcmV;p0Z0D21JVPKB!8JnL_t(I%k9xUYg1tu#_|9CoR{aso*a{=r?gnxLaQCDgG5lo zm&ri~2WLU3AbtQrba8VN`~V_k=%|C}B#7YD6ch&$UnsE%m3VSalA4#3ljd>hP!#+G z{lNt{7uR;fzI`C4R_0Bb2y>?c+@7Jio#7h8?|6tDbPxs30Dle?EnMHl5n<>UY9Cr0 zDTgQ%jVR4{B(*-BA$XR>ST0B5aGt!*VUHBik3OE~L1u{B1G-xo#iHiR`Y)7G(C=hS z&IY(5=m`%U*fgpU+aFsTD^H_K4#`fBB<|B$YmoMKXn#*RG!>wNX^ov^Xr&m5!S@x> zR)?vR1(-08K7YU79L-I7=tQVK`L_D$UE{_0tWUnAiQ_IR?>M}DzIki)&f2|j%r@!I zE*tC7(^rqb-hWfss9QNp)!w&g*9YKQ)kd5?>o$jsAN6V1dlfEUUogkdgfD>yGfTnB z^7-(#2+P0{-~pFz+&y8=UR}7bSPriM=KwBVTQnl_P%(g;Kn7F*0|;R6`P4j6-@TiA i`odqk|0?X}AAbPCL5{9Mdw8$_0000c diff --git a/textures/maptools_infinitefuel.png b/textures/maptools_infinitefuel.png index de4b43e1bca173d4029262c44b4f35fc4115a9be..3b80ae50f971e07dc80b3f69241d63404f4ce63c 100644 GIT binary patch delta 153 zcmV;K0A~OF0{jAy>wkPnL_t(|+G4;C7{LIYj}QS=Jq|_?13&i`eX}lYlfZPd38V`2B}T;Ds`ts`B0glE8y^Z@==d zejbQmem}2U`I>g5`?pKwkR42pwNtyJ-Ln47Vm_?-RR{qfs1gVHVs~LD00000NkvXX Hu0mjfm^4TZ delta 154 zcmV;L0A>ID0{sGz>wkSoL_t(|+G4;C7{LIYj}QTrJq}0^127bwx3+D2Yu^80wVPp* zPsm>?eQMbYm>ZcUS00A82oCB Date: Mon, 29 Jul 2019 00:49:03 +0200 Subject: [PATCH 2/9] Travis CI: Use the `bionic` distribution --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c4c0d8..211285a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,15 @@ -language: generic +dist: bionic +language: python -addons: - apt: - packages: - - luarocks +python: + - 3.7.1 install: - - pyenv global 3.6.3 - - pip3 install --user pre-commit + - sudo apt-get update -qq + - sudo apt-get install -qqq luarocks + - pip3 install pre-commit - luarocks install --local luacheck script: - - $HOME/.local/bin/pre-commit run --all-files + - pre-commit run --all-files - $HOME/.luarocks/bin/luacheck . From 65cb89a26191e3458ba35a9f9bfcddb3f110840f Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 8 Sep 2019 22:57:15 +0200 Subject: [PATCH 3/9] Document the Minetest 5.0.0 version requirement --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3f89750..64314bd 100644 --- a/README.md +++ b/README.md @@ -63,9 +63,9 @@ on that line. ## Version compatibility -Map Tools is currently primarily tested with Minetest 0.4.17. +Map Tools is currently primarily tested with Minetest 5.0.1. It may or may not work with newer or older versions. Issues arising in older -versions than 0.4.17 will generally not be fixed. +versions than 5.0.0 will generally not be fixed. ## License From fa62966bbe68627b472c556b83594d1728c0766d Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 25 Sep 2019 23:06:20 +0200 Subject: [PATCH 4/9] Update pre-commit hooks to 2.3.0 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9c72498..f9254a4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.1.0 + rev: v2.3.0 hooks: - id: end-of-file-fixer - id: trailing-whitespace From ea85b3e073a6b6fd15a0a2636377319cd2b85e07 Mon Sep 17 00:00:00 2001 From: Ragulan R Date: Thu, 20 Jun 2019 20:04:36 +0100 Subject: [PATCH 5/9] Move maptools.drop_msg above dofiles Maptools tools/items have become droppable again, the function to prevent this is loaded after nodes.lua, leading the on_drop function to be nil. --- init.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index c8d5336..4c969bf 100644 --- a/init.lua +++ b/init.lua @@ -16,14 +16,14 @@ local S, NS = dofile(modpath .. "/intllib.lua") maptools.S = S maptools.NS = NS +maptools.drop_msg = function(itemstack, player) + local name = player:get_player_name() + minetest.chat_send_player(name, S("[maptools] tools/nodes do not drop!")) +end + dofile(modpath .. "/config.lua") dofile(modpath .. "/aliases.lua") dofile(modpath .. "/craftitems.lua") dofile(modpath .. "/default_nodes.lua") dofile(modpath .. "/nodes.lua") dofile(modpath .. "/tools.lua") - -maptools.drop_msg = function(itemstack, player) - local name = player:get_player_name() - minetest.chat_send_player(name, S("[maptools] tools/nodes do not drop!")) -end From f0a3d58a995bbecf1b51761d9c236098cf9a208f Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Fri, 4 Oct 2019 00:23:02 +0200 Subject: [PATCH 6/9] Update changelog to mention nodes/items not being droppable anymore --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 900458e..bc99b70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - The minimum supported Minetest version is now 5.0.0. +- Map Tools nodes/items can no longer be dropped to prevent them from falling + into bad hands. ## [1.1.0] - 2019-03-23 From ccf94fb78bec84485958ab835741a9cbf57b6988 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 13 Oct 2019 14:13:10 +0200 Subject: [PATCH 7/9] Make inventory images use textures available in Minetest Game 5.0.0 This closes #9. --- CHANGELOG.md | 6 ++++++ nodes.lua | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc99b70..25e5664 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Map Tools nodes/items can no longer be dropped to prevent them from falling into bad hands. +### Fixed + +- The inventory images of `no_interact`, `no_build`, `ignore_like_no_clip` + and `ignore_like_no_point` now use textures that are available in + Minetest Game 5.0.0. + ## [1.1.0] - 2019-03-23 ### Changed diff --git a/nodes.lua b/nodes.lua index 200107f..08aa914 100644 --- a/nodes.lua +++ b/nodes.lua @@ -128,7 +128,7 @@ minetest.register_node("maptools:ignore_like_no_clip", { description = S("Ignore-like (no clip)"), range = 12, stack_max = 10000, - inventory_image = "default_steel_block.png^dye_purple.png", + inventory_image = "default_steel_block.png^dye_violet.png", tiles = {"invisible.png"}, paramtype = "light", walkable = false, @@ -143,7 +143,7 @@ minetest.register_node("maptools:ignore_like_no_point", { description = S("Ignore-like (no point)"), range = 12, stack_max = 10000, - inventory_image = "default_steel_block.png^dye_purple.png", + inventory_image = "default_steel_block.png^dye_violet.png", tiles = {"invisible.png"}, paramtype = "light", pointable = false, @@ -283,7 +283,7 @@ minetest.register_node("maptools:nobuild", { description = S("Build Prevention"), range = 12, stack_max = 10000, - inventory_image = "default_steel_block.png^bones_bones.png", + inventory_image = "default_steel_block.png^default_flint.png", drawtype = "airlike", walkable = false, pointable = false, @@ -298,7 +298,7 @@ minetest.register_node("maptools:nointeract", { description = S("Interact Prevention"), range = 12, stack_max = 10000, - inventory_image = "default_steel_block.png^default_scorched_stuff.png", + inventory_image = "default_steel_block.png^default_bush_stem.png", drawtype = "airlike", walkable = false, paramtype = "light", From 0e3035719053f4950e3440144b87417940dcc1e4 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 13 Oct 2019 14:15:25 +0200 Subject: [PATCH 8/9] Link to the WorldEdit mod in NODES_ITEMS.md --- NODES_ITEMS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NODES_ITEMS.md b/NODES_ITEMS.md index 3e0f1f0..f323156 100644 --- a/NODES_ITEMS.md +++ b/NODES_ITEMS.md @@ -9,8 +9,8 @@ use `-1` as the amount. ## Nodes :warning: denotes an unpointable, unbreakable block; be very careful with them, -as they cannot be removed by hand (they can only be removed with WorldEdit or -similar). +as they cannot be removed by hand (they can only be removed with +[WorldEdit](https://github.com/Uberi/Minetest-WorldEdit) or similar). | Item code | Description | | ----------------------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- | From 1b7be039567f23207466f7c36da15c61e29f483d Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 25 Nov 2019 13:51:18 +0100 Subject: [PATCH 9/9] Bump to version 2.0.0 --- CHANGELOG.md | 5 ++++- README.md | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25e5664..3b95df9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [2.0.0] - 2019-11-25 + ### Changed - The minimum supported Minetest version is now 5.0.0. @@ -30,5 +32,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Initial versioned release. -[Unreleased]: https://github.com/minetest-mods/maptools/compare/v1.1.0...HEAD +[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.0.0...HEAD +[2.0.0]: https://github.com/minetest-mods/maptools/compare/v1.1.0...v2.0.0 [1.1.0]: https://github.com/minetest-mods/maptools/compare/v1.0.0...v1.1.0 diff --git a/README.md b/README.md index 64314bd..d639688 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ on that line. ## Version compatibility -Map Tools is currently primarily tested with Minetest 5.0.1. +Map Tools is currently primarily tested with Minetest 5.1.0. It may or may not work with newer or older versions. Issues arising in older versions than 5.0.0 will generally not be fixed.