From 052ff7287aa028f77866de9de68a600ccb64f3db Mon Sep 17 00:00:00 2001 From: coil <51716565+coil0@users.noreply.github.com> Date: Tue, 2 Jul 2019 01:28:05 -0400 Subject: [PATCH 1/5] Fix duplication with item holder and powered stand The item holder and powered stand could be used to duplicate buckets, cans from technic, and mob eggs from mobs_redo, as these items were added to the nodes without being removed from the player's inventory. --- nodeboxes.lua | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nodeboxes.lua b/nodeboxes.lua index ebaa635..bf06e02 100644 --- a/nodeboxes.lua +++ b/nodeboxes.lua @@ -606,8 +606,11 @@ minetest.register_node("scifi_nodes:powered_stand", { groups = {cracky=1, oddly_breakable_by_hand=1}, on_rightclick = function(pos, node, clicker, item, _) local wield_item = clicker:get_wielded_item():get_name() - item:take_item() - minetest.add_item({x=pos.x, y=pos.y+1, z=pos.z}, wield_item) + local taken = item:take_item() + if taken and not taken:is_empty() then + minetest.add_item({x=pos.x, y=pos.y+1, z=pos.z}, wield_item) + return item + end end, }) @@ -1067,8 +1070,11 @@ minetest.register_node("scifi_nodes:itemholder", { if name == meta:get_string("owner") or minetest.check_player_privs(name, "protection_bypass") then local wield_item = clicker:get_wielded_item():get_name() - item:take_item() - minetest.add_item(pos, wield_item) + local taken = item:take_item() + if taken and not taken:is_empty() then + minetest.add_item(pos, wield_item) + return item + end end end, can_dig = function(pos,player) From 436abd20aa679f34e6c30d24772cd5aab2ee9d6a Mon Sep 17 00:00:00 2001 From: y Date: Sat, 13 Jul 2019 22:11:34 +0100 Subject: [PATCH 2/5] fix slope model --- license.txt | 4 +-- models.lua | 2 +- models/moreblocks_slope.obj | 21 -------------- models/scifi_nodes_slope.obj | 56 ++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 24 deletions(-) delete mode 100644 models/moreblocks_slope.obj create mode 100644 models/scifi_nodes_slope.obj diff --git a/license.txt b/license.txt index 41659ff..6e333aa 100644 --- a/license.txt +++ b/license.txt @@ -45,7 +45,7 @@ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION will the authors be held liable for any damages arising from the use of this content. -For moreblocks_slope.obj: +For scifi_nodes_slope.obj, which is renamed from moreblocks_slope.obj: zlib license ============ @@ -61,4 +61,4 @@ Permission is granted to anyone to use this software for any purpose, including 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. -**Forum topic:** \ No newline at end of file +**Forum topic:** diff --git a/models.lua b/models.lua index bd0d523..96b6856 100644 --- a/models.lua +++ b/models.lua @@ -9,7 +9,7 @@ minetest.register_node("scifi_nodes:slope_"..name, { description = desc.." Slope", sunlight_propagates = false, drawtype = "mesh", - mesh = "moreblocks_slope.obj", + mesh = "scifi_nodes_slope.obj", tiles = texture, selection_box = { type = "fixed", diff --git a/models/moreblocks_slope.obj b/models/moreblocks_slope.obj deleted file mode 100644 index 05c853b..0000000 --- a/models/moreblocks_slope.obj +++ /dev/null @@ -1,21 +0,0 @@ -# Blender v2.69 (sub 0) OBJ File: 'slope_test_slope_onetexture.blend' -# www.blender.org -mtllib slope_test_slope_onetexture.mtl -o Cube_Cube.002 -v 0.500000 0.500000 0.500000 -v -0.500000 0.500000 0.500000 -v -0.500000 -0.500000 0.500000 -v 0.500000 -0.500000 0.500000 -v -0.500000 -0.500000 -0.500000 -v 0.500000 -0.500000 -0.500000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -usemtl None -s off -f 1/1 2/2 3/3 4/4 -f 4/3 3/4 5/1 6/2 -f 2/1 5/3 3/4 -f 1/2 4/3 6/4 -f 2/1 1/2 6/3 5/4 diff --git a/models/scifi_nodes_slope.obj b/models/scifi_nodes_slope.obj new file mode 100644 index 0000000..57298d7 --- /dev/null +++ b/models/scifi_nodes_slope.obj @@ -0,0 +1,56 @@ +g top +v 0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 0.0000 0.7071 -0.7071 +s off +f 2/1/1 1/2/1 4/3/1 3/4/1 +g bottom +v -0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vn 0.0000 -1.0000 -0.0000 +s off +f 6/5/2 5/6/2 7/7/2 8/8/2 +g right +v -0.500000 0.500000 0.500000 +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 -0.500000 +vt 1.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +s off +f 9/9/3 11/10/3 10/11/3 +g left +v 0.500000 0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 -0.500000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +s off +f 12/12/4 13/13/4 14/14/4 +g back +v 0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 -0.500000 0.500000 +v 0.500000 -0.500000 0.500000 +vt 1.0000 1.0000 +vt 0.0000 1.0000 +vt 0.0000 0.0000 +vt 1.0000 0.0000 +vn 0.0000 -0.0000 1.0000 +s off +f 15/15/5 16/16/5 17/17/5 18/18/5 From 398daf5d792e8ad16ccd3b6debc74c51b6b515fa Mon Sep 17 00:00:00 2001 From: coil <51716565+coil0@users.noreply.github.com> Date: Wed, 24 Jul 2019 23:30:02 -0400 Subject: [PATCH 3/5] Allow sunlight under dark glass --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 99f451e..2810e09 100644 --- a/init.lua +++ b/init.lua @@ -822,7 +822,7 @@ minetest.register_node("scifi_nodes:blumetstr", { minetest.register_node("scifi_nodes:glass", { description = "dark glass", drawtype = "glasslike", - sunlight_propagates = false, + sunlight_propagates = true, tiles = { "scifi_nodes_glass.png" }, From 7a38b2476da4245e1d894314cb820573e38ea440 Mon Sep 17 00:00:00 2001 From: OgelGames <> Date: Mon, 12 Aug 2019 20:49:38 +1000 Subject: [PATCH 4/5] Fix incorrect dye in recipe --- crafts.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crafts.lua b/crafts.lua index 2e34836..ebc475d 100644 --- a/crafts.lua +++ b/crafts.lua @@ -645,7 +645,7 @@ minetest.register_craft({ output = "scifi_nodes:doomwall3 6", recipe = { {"scifi_nodes:white", "scifi_nodes:white", "scifi_nodes:white"}, - {"scifi_nodes:black", "dye:red", "scifi_nodes:black"}, + {"scifi_nodes:black", "dye:grey", "scifi_nodes:black"}, {"scifi_nodes:white", "scifi_nodes:white", "scifi_nodes:white"} } }) From 0e5389f57465f08c0f2b65f98f719ae0715463b7 Mon Sep 17 00:00:00 2001 From: D00Med Date: Tue, 13 Aug 2019 07:04:16 +1000 Subject: [PATCH 5/5] Update README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 1d4e12a..6340aed 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,10 @@ Minetest mod that adds scifi themed nodes CC BY-NC 3.0 * scifi_nodes_door_normal.ogg tlwmdbt https://freesound.org/people/tlwmdbt/sounds/165862/ * scifi_nodes_door_mechanic.ogg primeval_polypod https://freesound.org/people/primeval_polypod/sounds/156507/ + +Contributors: +tanmayameher https://github.com/tanmayameher +naturefreshmilk https://github.com/naturefreshmilk +acmgit https://github.com/acmgit +catz85 https://github.com/catz85 +coil0 https://github.com/coil0