Merge remote-tracking branch 'upstream/master'

And optimize textures with optipng

.github/workflows/mtinfo.yml

@@ -1,21 +0,0 @@
-name: mtinfo
-
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: generate
-      run: ./generate-mtinfo.sh
-
-    - name: deploy
-      if: github.ref == 'refs/heads/master'
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./output

.gitignore

@@ -45,6 +45,3 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
-
-# generated sources
-output

digicode.lua

@@ -122,7 +122,7 @@ minetest.register_node("scifi_nodes:digicode_on", {
 	paramtype2 = "wallmounted",
 	light_source = 5,
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
-	drop = {items = {"scifi_nodes:digicode_off"}},
+	drop = "scifi_nodes:digicode_off",
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)

generate-mtinfo.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# prepare config
-CONFIG=/tmp/scifi_nodes_minetest.conf
-echo "mtinfo.autoshutdown = true" > ${CONFIG}
-echo "moreblocks.stairsplus_in_creative_inventory = false" >> ${CONFIG}
-
-# prepare dependent mods
-WORLDMODS_DIR=/tmp/scifi_nodes_worldmods
-git clone --depth=1 https://gitlab.com/VanessaE/unifieddyes.git ${WORLDMODS_DIR}/unifieddyes
-git clone --depth=1 https://gitlab.com/VanessaE/basic_materials.git ${WORLDMODS_DIR}/basic_materials
-git clone --depth=1 https://github.com/minetest-mods/mesecons.git ${WORLDMODS_DIR}/mesecons
-git clone --depth=1 https://github.com/minetest-mods/moreblocks.git ${WORLDMODS_DIR}/moreblocks
-git clone --depth=1 https://github.com/BuckarooBanzay/mtinfo.git ${WORLDMODS_DIR}/mtinfo
-cp . ${WORLDMODS_DIR}/scifi_nodes -R
-
-# start container with mtinfo
-docker run --rm -i \
-	--user root \
-	-v ${CONFIG}:/etc/minetest/minetest.conf:ro \
-	-v ${WORLDMODS_DIR}/:/root/.minetest/worlds/world/worldmods \
-	-v $(pwd)/output:/root/.minetest/worlds/world/mtinfo \
-	registry.gitlab.com/minetest/minetest/server:5.4.0
-
-test -f $(pwd)/output/index.html || exit 1
-test -f $(pwd)/output/data/items.js || exit 1
-test -d $(pwd)/output/textures || exit 1

init.lua

@@ -22,3 +22,4 @@ dofile(MP.."/digicode.lua")
 dofile(MP.."/models.lua")
 dofile(MP.."/octagon_panes.lua")
 dofile(MP.."/crafts.lua")
+minetest.log("action", "[scifi_nodes] loaded.")

palm_scanner.lua

@@ -22,6 +22,8 @@ local function activate_palm_scanner(pos, node, player)
 
 	-- check protection
 	minetest.after(2, function()
+		if minetest.get_node(pos).name ~= node.name then return end
+
 		if minetest.is_protected(pos, name or "") then
 			-- clicker has no access to area
 			minetest.chat_send_player(name, "Access denied !")
@@ -36,6 +38,7 @@ local function activate_palm_scanner(pos, node, player)
 
 		-- reset state
 		minetest.after(1, function()
+			if minetest.get_node(pos).name ~= node.name then return end
 			node.name = "scifi_nodes:palm_scanner_off"
 			minetest.swap_node(pos, node)
 			mesecon.receptor_off(pos, scifi_nodes.get_switch_rules(node.param2))