mods update

mod_sources.txt

@@ -72,7 +72,7 @@ origin	https://github.com/minetest-mods/dynamic_liquid (fetch)
 Mod: environment/dynamic_liquid
 
 origin	https://notabug.org/tenplus1/farming (fetch)
-* master 79035d0 [origin/master] added extra compatibility for crops spawning on older v6 maps
+* master 7a99786 [origin/master] remove mobs_animal check for certain recipes to be used with other mods
 Mod: flora/farming
 
 origin	https://repo.or.cz/minetest_hbarmor.git (fetch)
@@ -132,7 +132,7 @@ origin	https://github.com/Skandarella/Animal-World.git (fetch)
 Mod: mobs/mobs_mobs/Animal-World
 
 origin	https://github.com/FreeLikeGNU/goblins.git (fetch)
-* master dd48144 [origin/master] fix #13
+* master a680780 [origin/master] fix issue #14
 Mod: mobs/mobs_mobs/goblins
 
 origin	https://codeberg.org/Hamlet/mobs_ghost_redo (fetch)
@@ -171,8 +171,12 @@ origin	https://github.com/minetest-mods/emote (fetch)
 * master 3c39a8c [origin/master] Default: writable interface used.
 Mod: player/emote
 
+origin	https://github.com/Dumpster-Studios/fire_plus.git (fetch)
+* master 885dc50 [origin/master] Add credits
+Mod: player/fire_plus
+
 origin	https://github.com/minetest-mods/hbsprint/ (fetch)
-* master 1fe580a [origin/master] Don't drain hunger for players with fast privilege (#29)
+* master f566d0f [origin/master] Use inventory_image for nodes without tiles for particles
 Mod: player/hbsprint
 
 origin	https://gitlab.com/4w/hunger_ng.git (fetch)

mods/flora/farming/README.md

@@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
 
 ### Changelog:
 
-- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya and vanilla (thanks Felfa), added tofu
+- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya and vanilla (thanks Felfa), added tofu, added salt crystals (thanks gorlock)
 - 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy
 options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton to savanna
 - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates

mods/flora/farming/food.lua

@@ -33,7 +33,48 @@ minetest.register_node("farming:salt", {
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
-	}
+	},
+	-- special function to make salt crystals form inside water
+	dropped_step = function(self, pos, dtime)
+
+		self.ctimer = (self.ctimer or 0) + dtime
+		if self.ctimer < 15.0 then return end
+		self.ctimer = 0
+
+		local needed
+
+		if self.node_inside
+		and self.node_inside.name == "default:water_source" then
+			needed = 8
+
+		elseif self.node_inside
+		and self.node_inside.name == "default:river_water_source" then
+			needed = 9
+		end
+
+		if not needed then return end
+
+		local objs = core.get_objects_inside_radius(pos, 0.5)
+
+		if not objs or #objs ~= 1 then return end
+
+		local salt, ent = nil, nil
+
+		for k, obj in pairs(objs) do
+
+			ent = obj:get_luaentity()
+
+			if ent and ent.name == "__builtin:item"
+			and ent.itemstring == "farming:salt " .. needed then
+
+				obj:remove()
+
+				core.add_item(pos, "farming:salt_crystal")
+
+				return false -- return with no further action
+			end
+		end
+	end
 })
 
 minetest.register_craft({
@@ -44,6 +85,40 @@ minetest.register_craft({
 	replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
 })
 
+--= Salt Crystal
+
+minetest.register_node("farming:salt_crystal", {
+	description = ("Salt crystal"),
+	inventory_image = "farming_salt_crystal.png",
+	wield_image = "farming_salt_crystal.png",
+	drawtype = "plantlike",
+	visual_scale = 0.8,
+	paramtype = "light",
+	light_source = 1,
+	tiles = {"farming_salt_crystal.png"},
+	groups = { dig_immediate = 3, attached_node = 1},
+	sounds = default.node_sound_defaults(),
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25}
+	},
+})
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:salt 9",
+	recipe = {"farming:salt_crystal", "farming:mortar_pestle"},
+	replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}}
+})
+
+minetest.register_craft({
+	output = "farming:salt_crystal",
+	recipe = {
+		{"farming:salt", "farming:salt", "farming:salt"},
+		{"farming:salt", "farming:salt", "farming:salt"},
+		{"farming:salt", "farming:salt", "farming:salt"}
+	}
+})
+
 --= Rose Water
 
 minetest.register_node("farming:rose_water", {
@@ -273,7 +348,6 @@ minetest.register_craftitem("farming:pasta", {
 	groups = {food_pasta = 1}
 })
 
-if minetest.get_modpath("mobs_animal") or minetest.get_modpath("xanadu")then
 minetest.register_craft({
 	output = "farming:pasta",
 	type = "shapeless",
@@ -283,7 +357,7 @@ minetest.register_craft({
 	},
 	replacements = {{"group:food_mixing_bowl", "farming:mixing_bowl"}}
 })
-else
+
 minetest.register_craft({
 	output = "farming:pasta",
 	type = "shapeless",
@@ -296,7 +370,6 @@ minetest.register_craft({
 		{"group:food_oil", "vessels:glass_bottle"}
 	}
 })
-end
 
 -- Spaghetti
 
@@ -324,7 +397,6 @@ minetest.register_craftitem("farming:bibimbap", {
 	on_use = minetest.item_eat(8, "farming:bowl")
 })
 
-if minetest.get_modpath("mobs_animal") or minetest.get_modpath("xanadu")then
 minetest.register_craft({
 	output = "farming:bibimbap",
 	type = "shapeless",
@@ -335,7 +407,7 @@ minetest.register_craft({
 	},
 	replacements = {{"group:food_skillet", "farming:skillet"}}
 })
-else
+
 minetest.register_craft({
 	output = "farming:bibimbap",
 	type = "shapeless",
@@ -346,7 +418,6 @@ minetest.register_craft({
 	},
 	replacements = {{"group:food_skillet", "farming:skillet"}}
 })
-end
 
 -- Burger
 

mods/flora/farming/license.txt

@@ -145,13 +145,16 @@ Created by mDiyo (Natura), modified by TenPlus1 (License: CC BY-SA 3.0):
   farming_barley.png
 
 Created by OgelGames (CC BY-SA 4.0)
-   farming_berry_smoothie.png
-   farming_cactus_juice.png
-   farming_salad.png
+  farming_berry_smoothie.png
+  farming_cactus_juice.png
+  farming_salad.png
 
 Created by Felfa (CC0)
-   farming_blackberry*.png
-   farming_lettuce*.png
-   farming_burger.png
-   farming_soy*.png
-   farming_vanilla*.png
+  farming_blackberry*.png
+  farming_lettuce*.png
+  farming_burger.png
+  farming_soy*.png
+  farming_vanilla*.png
+
+Created by gorlock (CC0)
+  farming_salt_crystal.png

mods/mobs/mobs_mobs/goblins/behaviors.lua

@@ -669,22 +669,9 @@ function goblins.tunneling(self, type)
 end
 
 function goblins.danger_dig(self,freq,depth)
-	local self_pos = self.object:get_pos()
-	if self_pos ~= nil then
-		local vx = self_pos.x
-		local vy = self_pos.y
-		local vz = self_pos.z
-		local pos = {x = math.floor(vx + 0.5),
-			y = math.floor(vy + 0.5),
-			z = math.floor(vz + 0.5)
-		}
-		--minetest.log("self_pos: "..dump(self_pos))
-	else
-		--minetest.log("self_pos: "..dump(self_pos))
-	end
-
-  --local pos = vector.round(self.object:get_pos())
-  if pos then
+  local gpos = self.object:get_pos()
+  if gpos then
+    pos = vector.round(gpos)
     local lol = minetest.get_node_light(pos) or 0
     local freq = freq or 0.1
     local depth = depth or 1
@@ -828,3 +815,5 @@ function goblins.goblin_dog_behaviors(self)
   --]]
   end
 end
+
+

mods/player/hbsprint/init.lua

@@ -130,8 +130,8 @@ local function is_walkable(ground)
 end
 
 local function create_particles(player, name, ground)
-  local def = minetest.registered_nodes[ground.name]
-  local tile = def.tiles[1] or def.inventory_image
+  local def = minetest.registered_nodes[ground.name] or {}
+  local tile = def.tiles and def.tiles[1] or def.inventory_image
   if type(tile) == "table" then
     tile = tile.name
   end