fix itemframes issue nalc/nalc-server-mods#103

fix deployer issue nalc/nalc-server-mods#104
fix deprecated function
fix bad/Nonexistent collision detection on mobs/players, use collision box for very good detection
add translation client side

CHANGELOG

@@ -1,16 +1,3 @@
-Version 3.0:
-- First attempt to detect collisionboxes
-- Implemented settings through settingtypes.txt, deprecating "spears.conf"
-
-Version 2.4:
-- Functions rewrite, fixed many vector/variable declarations and unknown node handling
-- Added pigiron support
-
-Version 2.3:
-- Updated to Minetest 5.6.0 API
-- Changed receipts to avoid being confused with arrows
-- Various cleansing and fixes
-
 Version 2.2:
 - "Hit detection" based on spearhead position
 - Spears go through buildable_to nodes (snow)

README

@@ -3,28 +3,23 @@
 This mod adds spears to Minetest.
 
 How to download:
-If you have this file, you probably know.
-If you're reading from gitlab.com, you already know.
+If you have this file, you already know
 
 Forum topic:
 https://forum.minetest.net/viewtopic.php?f=11&t=13367
 
 How to install:
-Minetest content DB is the way!
 http://wiki.minetest.com/wiki/Installing_Mods
 
 How to use the mod:
-Craft a spear with 	| 	|	| (material) | 
-			|	| stick |	     | 
-			| stick	|	|	     |,
-works also mirrored.
+Craft a spear with | stick | stick | (material) |, works also mirrored.
 Spears can be thrown using right mouse button, they either hurt someone or stick where they land on; damage depends on speed and material, flight trajectory is ballistic with (unrealistic) drag.
 Spears can be used to fight, but are slower and weaker than swords.
 Spears can be used to dig, but are slower and weaker and pickaxes.
 If you miss the target it's your fault, the spear is fine.
 You can grab a spear on the fly (or maybe wait until it falls?).
 You can stick a spear into a block, but if you remove the block then the spear falls (obviously).
-This mod contains the word "spear" more than 100 times, if you want the exact number you can count them.
+This mod contains the word "spear" more than 100 times, if you want the exact number count them yourself.
 If you feel clever, throw a spear right above you and look at it to see what happens.
 You can even throw a spear from above down to your foes, it's even easier to hit.
 Someone once reported to have hit its own foot but it takes practice to do that.

defaults.lua

@@ -1,30 +1,7 @@
--- Seems like defaults in settingtypes.txt are not taken by default
-if minetest.settings:get("spears_throw_speed") == nil then
-	minetest.settings:set("spears_throw_speed", 13)
-end
-
-if minetest.settings:get("spears_drag_coeff") == nil then
-	minetest.settings:set("spears_drag_coeff", 0.1)
-end
-
-if minetest.settings:get("spears_node_cracky_limit") == nil then
-	minetest.settings:set("spears_node_cracky_limit", 3)
-end
-
-
--- DISABLE_STONE_SPEAR = false
--- DISABLE_STEEL_SPEAR = false
--- DISABLE_COPPER_SPEAR = false
--- DISABLE_BRONZE_SPEAR = false
--- DISABLE_DIAMOND_SPEAR = false
--- DISABLE_OBSIDIAN_SPEAR = false
--- DISABLE_GOLD_SPEAR = false
--- DISABLE_IRON_SPEAR = false
--- SPEARS_THROW_SPEED = 13
-SPEARS_V_ZERO = {x = 0, y = 0, z = 0}
--- SPEARS_DRAG_COEFF = 0.1
-SPEARS_NODE_UNKNOWN = nil
-SPEARS_NODE_THROUGH = 0
-SPEARS_NODE_STICKY = 1
-SPEARS_NODE_CRACKY = 2
--- SPEARS_NODE_CRACKY_LIMIT = 3
+DISABLE_STONE_SPEAR = false
+DISABLE_STEEL_SPEAR = false
+DISABLE_COPPER_SPEAR = false
+DISABLE_BRONZE_SPEAR = false
+DISABLE_DIAMOND_SPEAR = false
+DISABLE_OBSIDIAN_SPEAR = false
+DISABLE_GOLD_SPEAR = false

functions.lua

@@ -7,40 +7,37 @@ function spears_throw (itemstack, player, pointed_thing)
 	local pitch = player:get_look_vertical()
 	local yaw = player:get_look_horizontal()
 	local rotation = vector.new(0, yaw + math.pi/2, pitch + math.pi/6)
-	local wear = itemstack:get_wear()
-	local pointed_a = pointed_thing.above
-	local pointed_b = pointed_thing.under	
-	if pointed_thing.type == "node" and vector.distance(pointed_a, throw_pos) < 1 then -- Stick into node
-		local node = minetest.get_node(pointed_b)
-		local check_node = spears_check_node(node.name)
-		if check_node == SPEARS_NODE_UNKNOWN then
-			return false
-		elseif check_node == SPEARS_NODE_CRACKY then
-			minetest.sound_play("default_metal_footstep", {pos = pointed_a}, true)
-			return false
-		elseif check_node == SPEARS_NODE_STICKY then
-			local spear_object = minetest.add_entity(vector.divide(vector.add(vector.multiply(pointed_a, 2), pointed_b), 3), spear)
+	-- Plant into node
+	if pointed_thing.type == "node" then
+		local node = minetest.get_node(pointed_thing.under)
+		if minetest.registered_nodes[node.name].walkable and vector.distance(pointed_thing.above, throw_pos) < 1 then
+			local spear_object = minetest.add_entity(vector.divide(vector.add(vector.multiply(pointed_thing.above, 2), pointed_thing.under), 3), spear)
 			spear_object:set_rotation(rotation)
-			spear_object:get_luaentity()._wear = wear
-			spear_object:get_luaentity()._stickpos = pointed_b
-			minetest.sound_play("default_place_node", {pos = pointed_a}, true)
-			return false
+			spear_object:get_luaentity()._wear = itemstack:get_wear()
+			spear_object:get_luaentity()._stickpos = pointed_thing.under
+			return
 		end
-	else -- Avoid hitting yourself and throw
-		local throw_speed = tonumber(minetest.settings:get("spears_throw_speed"))
+	end
+	-- Avoid hitting yourself and throw
+	local throw_speed = 12
 	while vector.distance(player_pos, throw_pos) < 1.2 do
 		throw_pos = vector.add(throw_pos, vector.multiply(direction, 0.1))
 	end
-		local player_vel = player:get_velocity()
+	local player_vel
+	if player.is_fake_player then
+		player_vel = {x=0,y=0,z=0}
+	else
+		player_vel = player:get_velocity()
+	end
 	local spear_object = minetest.add_entity(throw_pos, spear)
 	spear_object:set_velocity(vector.add(player_vel, vector.multiply(direction, throw_speed)))
 	spear_object:set_rotation(rotation)
 	minetest.sound_play("spears_throw", {pos = player_pos}, true)
-		spear_object:get_luaentity()._wear = wear
+	spear_object:get_luaentity()._wear = itemstack:get_wear()
+	spear_object:get_luaentity().lastpos = throw_pos
 	spear_object:get_luaentity()._stickpos = nil
 	return true
 end
-end
 
 function spears_set_entity(spear_type, base_damage, toughness)
 	local SPEAR_ENTITY={
@@ -50,6 +47,7 @@ function spears_set_entity(spear_type, base_damage, toughness)
 			visual_size = {x = 0.3, y = 0.3, z = 0.3},
 			wield_item = "spears:spear_" .. spear_type,
 			collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3},
+			lastpos={},
 		},
 
 		on_activate = function (self, staticdata, dtime_s)
@@ -68,156 +66,116 @@ function spears_set_entity(spear_type, base_damage, toughness)
 		end,
 
 		on_step = function(self, dtime)
-			local wear = self._wear
-			if wear == nil then
+			if not self._wear then
 				self.object:remove()
-				return false
+				return
 			end
-			local pos = self.object:get_pos()
 			local velocity = self.object:get_velocity()
 			local speed = vector.length(velocity)
-			if self._stickpos ~= nil then -- Spear is stuck
+			-- Spear is stuck ?
+			if self._stickpos then
 				local node = minetest.get_node(self._stickpos)
-				local check_node = spears_check_node(node.name)
-				if check_node ~= SPEARS_NODE_STICKY then -- Fall when node is removed
+				local node_cracky = minetest.registered_nodes[node.name].groups.cracky
+				local pos = self.object:get_pos()
+				if node_cracky and node_cracky < 3 then
+					minetest.sound_play("default_metal_footstep", {pos = pos}, true)
 					self.object:remove()
-					minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
-					return false
+					minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = self._wear})
+				elseif not self._node_walkable then
+					minetest.sound_play("default_place_node", {pos = self._stickpos}, true)
+				end
+				self._node_walkable = minetest.registered_nodes[node.name].walkable			
+				if not node or not self._node_walkable then -- Fall when node is removed
+					self.object:remove()
+					minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = self._wear})
+					return
 				end
 			else -- Spear is flying
+				local newpos = self.object:get_pos()
+				for _, pos in pairs(spears_get_trajectoire(self, newpos)) do
 					local direction = vector.normalize(velocity)
 					local yaw = minetest.dir_to_yaw(direction)
 					local pitch = math.acos(velocity.y/speed) - math.pi/3
 					local spearhead_pos = vector.add(pos, vector.multiply(direction, 0.5))
+					local node = minetest.get_node(spearhead_pos)
 					self.object:set_rotation({x = 0, y = yaw + math.pi/2, z = pitch})
-				-- Hit a target?
-				local objects_in_radius = minetest.get_objects_inside_radius(spearhead_pos, 1)
+					-- Hit someone?
+					local objects_in_radius = minetest.get_objects_inside_radius(spearhead_pos, 2.5)
 					for _,object in ipairs(objects_in_radius) do
-					if spears_check_target(self, object, spearhead_pos) and object:get_armor_groups().fleshy then
+						if object:get_luaentity() ~= self and object:get_armor_groups().fleshy then
+							local objpos = object:get_pos()
+							local collisionbox = object:get_properties().collisionbox or {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
+							if spears_touch(spearhead_pos, objpos, collisionbox) then
 								local damage = (speed + base_damage)^1.15 - 20
 								object:punch(self.object, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy=damage},}, direction)
 								self.object:remove()
 								minetest.sound_play("spears_hit", {pos = pos}, true)
-						wear = spears_wear(wear, toughness)
-						minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
-						return true
+								minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = self._wear + 65535/toughness})
+								return
+							end
 						end
 					end
 					-- Hit a node?	
-				local node = minetest.get_node(spearhead_pos)
-				local check_node = spears_check_node(node.name)
-				if check_node == SPEARS_NODE_UNKNOWN then
-					self.object:remove()
-					minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
-				elseif check_node ~= SPEARS_NODE_THROUGH then
-					wear = spears_wear(wear, toughness)
-					if wear >= 65535 then
+					if node and minetest.registered_nodes[node.name].walkable
+					and not minetest.registered_nodes[node.name].buildable_to
+					and not (minetest.registered_nodes[node.name].groups.slab and spearhead_pos.y % 1 < 0.5)
+					then -- Stick
+						self.object:set_acceleration({x = 0, y = 0, z = 0})
+						self.object:set_velocity({x = 0, y = 0, z = 0})
+						self._wear = self._wear + 65535/toughness
+						if self._wear >= 65535 then
 							minetest.sound_play("default_tool_breaks", {pos = pos}, true)
 							self.object:remove()
-						minetest.add_item(pos, {name='defaut:stick'})
-						return false
-					elseif check_node == SPEARS_NODE_CRACKY then
-						minetest.sound_play("default_metal_footstep", {pos = pos}, true)
-						self.object:remove()
-						minetest.add_item(pos, {name='spears:spear_' .. spear_type, wear = wear})
-						return false
-					elseif check_node == SPEARS_NODE_STICKY then
-						self.object:set_acceleration(SPEARS_V_ZERO)
-						self.object:set_velocity(SPEARS_V_ZERO)
-						minetest.sound_play("default_place_node", {pos = pos}, true)
-						self._stickpos = spearhead_pos
-						self._wear = wear
+							return
 						end
+						self._stickpos = spearhead_pos
+						self.lastpos = pos
+						return
 					else  -- Get drag
-					local viscosity = minetest.registered_nodes[node.name].liquid_viscosity
-					local drag_coeff = tonumber(minetest.settings:get("spears_drag_coeff"))
-					local drag = math.max(viscosity, drag_coeff)
+						local drag = math.max(minetest.registered_nodes[node.name].liquid_viscosity, 0.1)
 						local acceleration = vector.multiply(velocity, -drag)
 						acceleration.y = acceleration.y - 10 * ((7 - drag) / 7)
 						self.object:set_acceleration(acceleration)
 					end
 				end
+				self.lastpos = newpos
+			end
 		end,
 	}
 	return SPEAR_ENTITY
 end
 
-function spears_check_node(node_name)
-	local node = minetest.registered_nodes[node_name]
-	local cracky_limit = tonumber(minetest.settings:get("spears_node_cracky_limit"))
-	if node == nil then
-		return SPEARS_NODE_UNKNOWN
-	elseif node.groups.cracky ~= nil and node.groups.cracky < cracky_limit then
-		return SPEARS_NODE_CRACKY
-	elseif node.walkable and not node.buildable_to then
-		return SPEARS_NODE_STICKY
-	else
-		return SPEARS_NODE_THROUGH
+
+function spears_get_trajectoire(self, newpos)
+	if self.lastpos.x == nil then
+		return {newpos}
 	end
+	local coord = {}
+	local dx = vector.distance({x=newpos["x"], y=0, z=0}, {x=self.lastpos["x"], y=0, z=0} )/2
+	local dy = vector.distance({x=0, y=newpos["y"], z=0}, {x=0, y=self.lastpos["y"], z=0} )/2
+	local dz = vector.distance({x=0, y=0, z=newpos["z"]}, {x=0, y=0, z=self.lastpos["z"]} )/2
+
+	if newpos["x"] < self.lastpos["x"] then
+		dx = -dx
+	end
+	if newpos["y"] < self.lastpos["y"] then
+		dy = -dy
+	end
+	if newpos["z"] < self.lastpos["z"] then
+		dz = -dz
+	end
+	table.insert(coord, {x=self.lastpos["x"]+dx, y=self.lastpos["y"]+dy ,z=self.lastpos["z"]+dz })
+	table.insert(coord, newpos)
+	return coord
 end
 
-function spears_wear(initial_wear, toughness)
-	if not minetest.settings:get_bool("creative_mode") then
-		local wear = initial_wear + 65535/toughness
-		return wear
-	else
-		local wear = initial_wear
-		return wear
-	end
-end
 
-function spears_check_target(self, object, spearhead_pos)
-	if object:get_luaentity() == self then
-		return false
-	elseif isPointInsideEntity(object, spearhead_pos) then
-		-- print(self.name .. " hit " .. object:get_luaentity().name)
+function spears_touch(pos, objpos, cbox)
+	--colbox format {x1, y1, z1, x2, y2, z2}
+	if (pos.x < objpos.x + math.max(cbox[1], cbox[4]) and pos.x > objpos.x + math.min(cbox[1], cbox[4])) 
+		and (pos.y < objpos.y + math.max(cbox[2], cbox[5]) and pos.y > objpos.y + math.min(cbox[2], cbox[5])) 
+		and (pos.z < objpos.z + math.max(cbox[3], cbox[6]) and pos.z > objpos.z + math.min(cbox[3], cbox[6])) then
 		return true
-	else
-		-- print(self.name .. " missed " .. object:get_luaentity().name)
+	end
 	return false
 end
-end
-
--- Function to check if a point is inside an entity
-function isPointInsideEntity(object, point)
-    local pos = object:get_pos()
-    local collisionbox = object:get_properties().collisionbox
-    local yaw = object:get_yaw()
-
-    -- Adjust position for the center of the collision box
-    local center = {
-        x = pos.x + (collisionbox[1] + collisionbox[4]) / 2,
-        y = pos.y + (collisionbox[2] + collisionbox[5]) / 2,
-        z = pos.z + (collisionbox[3] + collisionbox[6]) / 2
-    }
-
-    -- Rotate the point around the entity's center
-    local rotatedPoint = rotatePoint(point, center, yaw)
-
-    -- Check if the rotated point is inside the collision box
-    return rotatedPoint.x >= pos.x + collisionbox[1] and
-           rotatedPoint.x <= pos.x + collisionbox[4] and
-           rotatedPoint.y >= pos.y + collisionbox[2] and
-           rotatedPoint.y <= pos.y + collisionbox[5] and
-           rotatedPoint.z >= pos.z + collisionbox[3] and
-           rotatedPoint.z <= pos.z + collisionbox[6]
-end
-
--- Function to rotate a point around a center and yaw angle
-function rotatePoint(point, center, yaw)
-    local cosYaw = math.cos(yaw)
-    local sinYaw = math.sin(yaw)
-
-    local translatedX = point.x - center.x
-    local translatedZ = point.z - center.z
-
-    local rotatedX = translatedX * cosYaw - translatedZ * sinYaw
-    local rotatedZ = translatedX * sinYaw + translatedZ * cosYaw
-
-    return {
-        x = rotatedX + center.x,
-        y = point.y,
-        z = rotatedZ + center.z
-    }
-end
-

init.lua

@@ -1,14 +1,15 @@
 dofile(minetest.get_modpath("spears").."/defaults.lua")
 
--- local input = io.open(minetest.get_modpath("spears").."/spears.conf", "r")
--- if input then
---	dofile(minetest.get_modpath("spears").."/spears.conf")
---	input:close()
---	input = nil
--- end
+local input = io.open(minetest.get_modpath("spears").."/spears.conf", "r")
+if input then
+	dofile(minetest.get_modpath("spears").."/spears.conf")
+	input:close()
+	input = nil
+end
 
 dofile(minetest.get_modpath("spears").."/functions.lua")
 
 dofile(minetest.get_modpath("spears").."/tools.lua")
 
-minetest.log("action", "[MOD] Spears loaded with throwing speed " .. minetest.settings:get("spears_throw_speed") .. " and drag coeff. " .. minetest.settings:get("spears_drag_coeff"))
+
+minetest.log("action", "[spears] loaded.")

locale/spears.fr.tr

@@ -0,0 +1,9 @@
+# textdomain: spears
+
+Stone spear=Lance en pierre
+Steel spear=Lance en acier
+Copper spear=Lance en cuivre
+Bronze spear=Lance en bronze
+Obsidian spear=Lance en obsidienne
+Diamond spear=Lance en diamant
+Golden spear=Lance en or

locale/template.txt

@@ -0,0 +1,11 @@
+# textdomain: spears
+
+Stone spear=
+Steel spear=
+Copper spear=
+Bronze spear=
+Obsidian spear= 
+Diamond spear=
+Golden spear=
+ 
+ 

mod.conf

@@ -1,8 +1,4 @@
 name = spears
+title = Separs
+description = Add spears to Minetest
 depends = default
-optional_depends = pigiron
-description = Add spears to Minetest, versatile weapons that can be thrown
-author = Echoes91
-title = Spears
-min_minetest_version = 5.4
-

settingtypes.txt

@@ -1,17 +0,0 @@
-# Initial speed
-spears_throw_speed (Spear's speed when throwing) float 13
-
-# Drag and fluid viscosity slows down the spear
-spears_drag_coeff (Drag coefficient for spears in air) float 0.1
-
-# Crackyness limit to stick a spear into a node instead of bouncing
-spears_node_cracky_limit (Cracky node level limit to stick a spear) int 3
-
-spears_enable_stone_spear (Stone spear enabled) bool true
-spears_enable_iron_spear (Iron spear enabled, requires pigiron mod) bool false
-spears_enable_steel_spear (Steel spear enabled) bool true
-spears_enable_copper_spear (Copper spear enabled) bool true
-spears_enable_bronze_spear (Bronze spear enabled) bool true
-spears_enable_obsidian_spear (Obsidian spear enabled) bool true
-spears_enable_diamond_spear (Diamond spear enabled) bool true
-spears_enable_gold_spear (Gold spear enabled) bool true

spears.conf.example

@@ -0,0 +1,6 @@
+DISABLE_STONE_SPEAR = true
+DISABLE_STEEL_SPEAR = true
+DISABLE_COPPER_SPEAR = true
+DISABLE_BRONZE_SPEAR = true
+DISABLE_DIAMOND_SPEAR = true
+DISABLE_OBSIDIAN_SPEAR = true

tools.lua

@@ -1,7 +1,10 @@
+
+local S = minetest.get_translator("spears")
+
 function spears_register_spear(spear_type, desc, base_damage, toughness, material)
 
 	minetest.register_tool("spears:spear_" .. spear_type, {
-		description = desc .. " spear",
+		description = S(desc .. " spear"),
                 wield_image = "spears_spear_" .. spear_type .. ".png^[transform4",
 		inventory_image = "spears_spear_" .. spear_type .. ".png",
 		wield_scale= {x = 1.5, y = 1.5, z = 1.5},
@@ -13,6 +16,13 @@ function spears_register_spear(spear_type, desc, base_damage, toughness, materia
 			return itemstack
 		end,
 		on_place = function(itemstack, user, pointed_thing)
+			if pointed_thing.type == "node" then
+				local node = minetest.get_node(pointed_thing.under)
+				if minetest.registered_nodes[node.name] and (node.name == "itemframes:pedestal" or node.name == "itemframes:frame") then
+				    minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, user, itemstack)
+				    return itemstack
+				end
+			end
 			spears_throw(itemstack, user, pointed_thing)
 			if not minetest.settings:get_bool("creative_mode") then
 				itemstack:take_item()
@@ -38,60 +48,46 @@ function spears_register_spear(spear_type, desc, base_damage, toughness, materia
 	minetest.register_craft({
 		output = 'spears:spear_' .. spear_type,
 		recipe = {
-			{"", "", material},
-			{"", "group:stick", ""},
-			{"group:stick", "", ""}
+			{'', '', material},
+			{'', 'group:stick', ''},
+			{'group:stick', '', ''},
 		}
 	})
 	
 	minetest.register_craft({
 		output = 'spears:spear_' .. spear_type,
 		recipe = {
-			{material, "", ""},
-			{"", "group:stick", ""},
-			{"", "", "group:stick"}
+			{material, '', ''},
+			{'', 'group:stick', ''},
+			{'', '', 'group:stick'},
 		}
 	})
 end
 
-if minetest.settings:get_bool('spears_enable_stone_spear') then
+if not DISABLE_STONE_SPEAR then
 	spears_register_spear('stone', 'Stone', 4, 20, 'group:stone')
-	minetest.log("info", "[MOD] Stone spear enabled")
 end
 
-if minetest.get_modpath("pigiron") then
-	if minetest.settings:get_bool('spears_enable_iron_spear') then
-		spears_register_spear('iron', 'Iron', 5.5, 30, 'pigiron:iron_ingot')
-	end
-	if minetest.settings:get_bool('spears_enable_steel_spear') then
-		spears_register_spear('steel', 'Steel', 6, 35, 'default:steel_ingot')
-	end
-	if minetest.settings:get_bool('spears_enable_copper_spear') then
-		spears_register_spear('copper', 'Copper', 4.8, 30, 'default:copper_ingot')
-	end
-	if minetest.settings:get_bool('spears_enable_bronze_spear') then
-		spears_register_spear('bronze', 'Bronze', 5.5, 35, 'default:bronze_ingot')
-	end
-else
-	if minetest.settings:get_bool('spears_enable_steel_spear') then
+if not DISABLE_STEEL_SPEAR then
 	spears_register_spear('steel', 'Steel', 6, 30, 'default:steel_ingot')
 end
-	if minetest.settings:get_bool('spears_enable_copper_spear') then
-		spears_register_spear('copper', 'Copper', 5, 30, 'default:copper_ingot')
-	end
-	if minetest.settings:get_bool('spears_enable_bronze_spear') then
-		spears_register_spear('bronze', 'Bronze', 6, 35, 'default:bronze_ingot')
-	end
+
+if not DISABLE_COPPER_SPEAR then
+	spears_register_spear('copper', 'Copper', 5, 35, 'default:copper_ingot')
 end
 
-if minetest.settings:get_bool('spears_enable_obsidian_spear') then
+if not DISABLE_BRONZE_SPEAR then
+	spears_register_spear('bronze', 'Bronze', 6, 35, 'default:bronze_ingot')
+end
+
+if not DISABLE_OBSIDIAN_SPEAR then
 	spears_register_spear('obsidian', 'Obsidian', 8, 30, 'default:obsidian')
 end
 
-if minetest.settings:get_bool('spears_enable_diamond_spear') then
+if not DISABLE_DIAMOND_SPEAR then
 	spears_register_spear('diamond', 'Diamond', 8, 40, 'default:diamond')
 end
 
-if minetest.settings:get_bool('spears_enable_gold_spear') then
+if not DISABLE_GOLD_SPEAR then
 	spears_register_spear('gold', 'Golden', 5, 40, 'default:gold_ingot')
 end