From feec4659cbbec8f73ed3fd7ff591e339bf02988e Mon Sep 17 00:00:00 2001 From: mckaygerhard Date: Tue, 23 Nov 2021 23:53:18 -0400 Subject: [PATCH 1/4] minetest 4 game with some backports from 5.2 * taking care .. thi is 5.1 with removed binocular * updated README for our fork minenux * minetest 4 game with some backports from 5.3 --- README.txt | 20 +++++++++----------- game.conf | 4 ++-- minetest.conf.example | 4 ++-- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/README.txt b/README.txt index 04f3d43..ccd3ab3 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,6 @@ -Minetest Game [minetest_game] -============================= +# Minetest4 Game + The main game for the Minetest engine -===================================== To use this game with the Minetest engine, insert this repository as /games/minetest_game @@ -11,16 +10,15 @@ The Minetest engine can be found in: Compatibility -------------- -The Minetest Game github master HEAD is generally compatible with the github -master HEAD of the Minetest engine. -Additionally, when the Minetest engine is tagged to be a certain version (eg. -0.4.10), Minetest Game is tagged with the version too. +This source code and files are only compatible with matched minetest4 engine +from https://codeberg.org/minenux/minetest-engine/src/branch/stable-4.0 +Additionally, when the Minetest4 engine is tagged to be a certain version (e.g. +4.0.18), Minetest Game is tagged with the version 4.0.18 too. -When stable releases are made, Minetest Game is packaged and made available in - http://minetest.net/downloads/ -and in case the repository has grown too much, it may be reset. In that sense, -this is not a "real" git repository. (Package maintainers please note!) +When stable releases are made, Minetest Game and the Minetest engine is packaged +and made available at https://codeberg.org/minenux/minetest-engine/archive/stable-4.0.tar.gz +or generally at https://codeberg.org/minenux/minetest-engine/releases/tag/4.0.18 by example. Licensing --------- diff --git a/game.conf b/game.conf index 255451f..055adc2 100644 --- a/game.conf +++ b/game.conf @@ -1,3 +1,3 @@ -name = Minetest Game +name = Minetest4 author = minetest -description = Bundled by default with Minetest, and aims to be lightweight, moddable, and fairly playable without mods. +description = Bundled by default with Minetest4 diff --git a/minetest.conf.example b/minetest.conf.example index 452251e..85323e0 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -1,5 +1,5 @@ -# This file contains settings of Minetest Game that can be changed in -# minetest.conf. +# This file contains settings of minetest4 Game that can be changed in +# minetest4.conf. # By default, all the settings are commented and not functional. # Uncomment settings by removing the preceding #. From fe915a3c7f50c746482b2b6b1a1b1c529a61c929 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 6 Apr 2020 20:38:17 +0200 Subject: [PATCH 2/4] Fix crash on TNT explosions if tnt is disabled --- mods/tnt/init.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua index 3efc6ec..072bb62 100644 --- a/mods/tnt/init.lua +++ b/mods/tnt/init.lua @@ -283,10 +283,15 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owne local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) local data = vm1:get_data() local count = 0 - local c_tnt = minetest.get_content_id("tnt:tnt") + local c_tnt local c_tnt_burning = minetest.get_content_id("tnt:tnt_burning") local c_tnt_boom = minetest.get_content_id("tnt:boom") local c_air = minetest.get_content_id("air") + if enable_tnt then + c_tnt = minetest.get_content_id("tnt:tnt") + else + c_tnt = c_tnt_burning -- tnt is not registered if disabled + end -- make sure we still have explosion even when centre node isnt tnt related if explode_center then count = 1 From ac8ac98fe28911b2ff7b28c68115a9f99b5ffce5 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 2 Jun 2020 12:48:56 +0200 Subject: [PATCH 3/4] Use node particles for TNT explosions (#2695) --- mods/tnt/init.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua index 072bb62..f5ce8d8 100644 --- a/mods/tnt/init.lua +++ b/mods/tnt/init.lua @@ -229,12 +229,16 @@ local function add_effects(pos, radius, drops) -- we just dropped some items. Look at the items entities and pick -- one of them to use as texture local texture = "tnt_blast.png" --fallback texture + local node local most = 0 for name, stack in pairs(drops) do local count = stack:get_count() if count > most then most = count local def = minetest.registered_nodes[name] + if def then + node = { name = name } + end if def and def.tiles and def.tiles[1] then texture = def.tiles[1] end @@ -252,9 +256,11 @@ local function add_effects(pos, radius, drops) maxacc = {x = 0, y = -10, z = 0}, minexptime = 0.8, maxexptime = 2.0, - minsize = radius * 0.66, - maxsize = radius * 2, + minsize = radius * 0.33, + maxsize = radius, texture = texture, + -- ^ only as fallback for clients without support for `node` parameter + node = node, collisiondetection = true, }) end From 575ecc31250b67430366b6c67b3a17d04fb9cbe1 Mon Sep 17 00:00:00 2001 From: Montandalar Date: Sat, 16 Jan 2021 03:43:19 +1100 Subject: [PATCH 4/4] Do not crash when a skeleton key is used on an unknown node (#2806) --- mods/default/craftitems.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index 6a1b570..62ba8ab 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -214,7 +214,8 @@ minetest.register_craftitem("default:skeleton_key", { return itemstack end - local on_skeleton_key_use = minetest.registered_nodes[node.name].on_skeleton_key_use + local node_reg = minetest.registered_nodes[node.name] + local on_skeleton_key_use = node_reg and node_reg.on_skeleton_key_use if not on_skeleton_key_use then return itemstack end