Merge https://codeberg.org/SumianVoice/sum_airship

README.md

@@ -1,19 +1,42 @@
+[![ContentDB](https://content.luanti.org/packages/Sumianvoice/sum_airship/shields/downloads/)]
+
 # sum_airship
-Mod for minetest
 
-[ContentDB](https://content.minetest.net/packages/Sumianvoice/sum_airship/)
+Mod for [Luanti](https://luanti.org). You can download it from the in-game content manager, or [ContentDB](https://content.luanti.org/packages/Sumianvoice/sum_airship/).
 
+This mod adds an airship to Minetest. It should work in most games, but only Minetest Game, MineClone (VoxeLibre) and RePixture are supported for crafting recipes. Games based on those may still have crafting if they use the same items. Other games are not because the mod doesn't know what each game calls each item or node. Although, it shouldn't crash no matter what game you use, this is only for crafting recipes.
 
+**Controls:** Flies like a boat, WASD, jump and aux1 (sprint) for up and down. Shift to dismount. Does not require fuel but will go faster when given any type of coal.
 
-This adds an airship to minetest_game or mcl2. Not tested on any other games. If it uses default:steel_ingot or mcl_core:iron_ingot for example, then it should work. It should not crash no matter what game you use though, this is only for the crafting recipes. The dependency on MTG or MCL2 is only for crafting, otherwise the ship it self can still be used just not crafted (because I don't know what your game calls each item / node etc)
+### Crafting
 
-Flies like a boat, WSAD controls with the addition of jump for up, sneak for down, and aux1 (sprint) to dismount. Does not require fuel but will go faster when given any type of coal.
-### Crafting (mcl)
+#### MineClon\* (VoxeLibre)
 
-Craftable with wool > canvas and boats > hull. All items: wool: 27, string: 4, wood: 15, iron_ingot: 4
+All items: wool: 27, string: 4, wood: 15, iron_ingot: 4
+9 Wool -> Canvas
+3 Boats & 3 Iron Ingots -> Hull
+3 Canvas, 1 Hull, 4 String & 1 Iron ingot -> Airship
+
+![MCL crafting.gif](crafting_mcl.gif)
+
+#### Minetest Game
+
+All items: wool: 27, string: 4, wood: 15, iron_ingot: 4
+9 Wool -> Canvas
+3 Boats & 3 Iron Ingots -> Hull
+3 Canvas, 1 Hull, 4 String & 1 Iron ingot -> Airship
+
+![MTG crafting.gif](crafting_mtg.gif)
+
+#### RePixture
+
+All items: wool: 27, fiber: 8, wood: varies depending on boat type, steel_ingot: 4
+9 group:fuzzy (wool or cotton bale) -> Canvas
+3 Boats & 3 Steel Ingots -> Hull
+3 Canvas, 1 Hull, 8 Fiber, 1 Steel Ingot -> Airship
+
+![RePixture crafting.gif](crafting_rp.gif)
 
-#### Crafting Guide GIF:  
-![airship%20crafting.gif](airship%20crafting.gif)
 ### Air Currents
 
-This optionally uses [sum_air_currents](https://content.minetest.net/packages/Sumianvoice/sum_air_currents/) to apply force based on the weather. Both this mod and the air currents mod are in development so expect changes made regularly.
+This optionally uses [sum_air_currents](https://content.luanti.org/packages/Sumianvoice/sum_air_currents/) to apply force based on the weather.

balloon.lua

@@ -10,15 +10,17 @@ local me = {
 }
 
 local ship = {
+	initial_properties = {
 		physical = true,
 		pointable = true,
-	collisionbox = {-0.6, -0.2, -0.6, 0.6, 0.3, 0.6},
-	selectionbox = {-0.7, -0.35, -0.7, 0.7, 0.3, 0.7},
+		collisionbox = {-0.6, -0.2, -0.6, 0.6, 0.4, 0.6},
+		selectionbox = {-0.7, -0.35, -0.7, 0.7, 0.4, 0.7},
 		hp_max = 3,
 		visual = "mesh",
-    backface_culling = false,
+		backface_culling = true,
 		mesh = "sum_airship.b3d",
 		textures = {"sum_airship_texture.png"},
+	},
 	_animations = {
 		idle = {x=  10, y= 90},
 		fly = {x=  91, y= 170},
@@ -128,14 +130,16 @@ function ship.on_activate(self, staticdata, dtime_s)
 		self._vel = data.v
 		self._itemstring = data.itemstring
 		self._fuel = data.fuel
-        if data._driver then
-            self._driver = minetest.get_player_by_name((data._driver))
-        else
-            self._driver = nil
-        end
 		self._flags = data._flags
-        if self._driver then me.detach(self) end
 	end
+	self.object:set_armor_groups({
+		pierce=100,
+		slash=100,
+		blunt=100,
+		magic=100,
+		poison=100,
+		fleshy=100,
+	})
 	self.object:set_animation(ship._animations.idle, 24)
 	self._sounds = { -- workaround for copy vs reference issue
 		engine = {
@@ -156,8 +160,6 @@ end
 function ship.get_staticdata(self)
 	return minetest.serialize({
 		itemstring = self._itemstring,
-        _driver = ((self._driver and self._driver:is_player())
-            and self._driver:get_player_name()) or nil,
 		_flags = self._flags,
 		v = self._vel,
 		fuel = self._fuel,
@@ -170,7 +172,7 @@ function me.attach(self, player)
 	end
 	self._driver = player
 	self._driver:set_attach(self.object, "",
-		{x = 0, y = -3.0, z = 0}, {x = 0, y = 0, z = 0})
+		{x = 0, y = -0.0, z = -2}, {x = 0, y = 0, z = 0})
 	self._driver:set_look_horizontal(self.object:get_yaw())
 end
 
@@ -260,16 +262,16 @@ function me.get_balloon_collide(self)
 	for _, check in pairs(balloon_nodes) do
 		local n = minetest.get_node(vector.add(check.p, o))
 		if n and minetest.registered_nodes[n.name]
-		and minetest.registered_nodes[n.name].walkable then
+		and (minetest.registered_nodes[n.name] or {}).walkable then
 			force = vector.add(force, check.dir)
 		end
 	end
 	return force
 end
 
-me.chimney_dist = -1.0
+me.chimney_dist = -0.8
 me.chimney_yaw = 0.13
-me.chimney_height = 0.9
+me.chimney_height = 1.5
 function me.get_chimney_pos(self)
 	local p = self.object:get_pos()
 	local yaw = self.object:get_yaw()
@@ -287,7 +289,7 @@ function ship.on_step(self, dtime, moveresult)
 	if self._driver and self._driver:is_player() then
 		local name = self._driver:get_player_name()
 		pi = self._driver:get_player_control()
-        exit = pi.aux1
+		exit = pi.sneak
 	end
 	if exit then
 		me.detach(self)
@@ -300,7 +302,7 @@ function ship.on_step(self, dtime, moveresult)
 	local v = self.object:get_velocity()
 	local p = self.object:get_pos()
 	local node_below = minetest.get_node(vector.offset(p, 0, -0.8, 0)).name
-	local is_on_floor = minetest.registered_nodes[node_below].walkable
+	local is_on_floor = (minetest.registered_nodes[node_below] or {}).walkable
 	local in_water = minetest.get_item_group(minetest.get_node(p).name, "liquid") ~= 0
 	local on_water = (minetest.get_item_group(minetest.get_node(vector.offset(p, 0, -0.2, 0)).name, "liquid") ~= 0 and not in_water)
 
@@ -314,7 +316,7 @@ function ship.on_step(self, dtime, moveresult)
 		if pi.up then forward = 1
 		elseif pi.down then forward = -1 end
 		if pi.jump then climb = 1
-        elseif pi.sneak then climb = -1 end
+		elseif pi.aux1 then climb = -1 end
 		if pi.right then right = 1
 		elseif pi.left then right = -1 end
 
@@ -339,7 +341,7 @@ function ship.on_step(self, dtime, moveresult)
 		v.y = v.y - dtime
 	end
 
-	if sum_air_currents ~= nil then
+	if minetest.get_modpath("sum_air_currents") then
 		if self._driver or not is_on_floor then
 			local wind_vel = sum_air_currents.get_wind(p)
 			wind_vel = vector.multiply(wind_vel, dtime)
@@ -415,11 +417,12 @@ minetest.register_craftitem("sum_airship:boat", {
 		end
 		local node = minetest.get_node(pointed_thing.under)
 		if placer and not placer:get_player_control().sneak then
-            if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
-                return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
+			local def = minetest.registered_nodes[node.name]
+			if def and def.on_rightclick then
+				return def.on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
 			end
 		end
-        local pos = vector.offset(pointed_thing.above, 0, 0.5, 0)
+		local pos = vector.offset(pointed_thing.above, 0, 0, 0)
 		local self = minetest.add_entity(pos, "sum_airship:boat"):get_luaentity()
 		if not minetest.is_creative_enabled(placer:get_player_name()) then
 			itemstack:take_item()

crafting_mcl.lua

@@ -0,0 +1,28 @@
+
+local w = "group:wool"
+local b = "group:boat"
+local m = "mcl_core:iron_ingot"
+local s = "mcl_mobitems:string"
+minetest.register_craft({
+	output = "sum_airship:canvas_roll",
+	recipe = {
+		{w, w, w},
+		{w, w, w},
+		{w, w, w},
+	},
+})
+minetest.register_craft({
+	output = "sum_airship:hull",
+	recipe = {
+		{b, b, b},
+		{m, m, m},
+	},
+})
+minetest.register_craft({
+	output = "sum_airship:boat",
+	recipe = {
+		{"sum_airship:canvas_roll","sum_airship:canvas_roll","sum_airship:canvas_roll",},
+		{s, m, s,},
+		{s, "sum_airship:hull", s,},
+	},
+})

crafting_mtg.lua

@@ -0,0 +1,29 @@
+
+local w = "group:wool"
+if not minetest.get_modpath("farming") then w = "default:paper" end
+local b = "boats:boat"
+local m = "default:steel_ingot"
+local s = "farming:string"
+minetest.register_craft({
+	output = "sum_airship:canvas_roll",
+	recipe = {
+		{w, w, w},
+		{w, w, w},
+		{w, w, w},
+	},
+})
+minetest.register_craft({
+	output = "sum_airship:hull",
+	recipe = {
+		{b, b, b},
+		{m, m, m},
+	},
+})
+minetest.register_craft({
+	output = "sum_airship:boat",
+	recipe = {
+		{"sum_airship:canvas_roll","sum_airship:canvas_roll","sum_airship:canvas_roll",},
+		{s, m, s,},
+		{s, "sum_airship:hull", s,},
+	},
+})

crafting_rp.lua

@@ -0,0 +1,23 @@
+
+crafting.register_craft({
+	output = "sum_airship:canvas_roll",
+	items = {
+		"group:fuzzy 9"
+	}
+})
+crafting.register_craft({
+	output = "sum_airship:hull",
+	items = {
+		"group:boat 3",
+		"rp_default:ingot_steel 3"
+	}
+})
+crafting.register_craft({
+	output = "sum_airship:boat",
+	items = {
+		"sum_airship:canvas_roll 3",
+		"rp_default:ingot_steel 8",
+		"rp_default:ingot_steel",
+		"sum_airship:hull",
+	}
+})

crafts.lua

@@ -1,3 +1,5 @@
+local mod_name = minetest.get_current_modname()
+local mod_path = minetest.get_modpath(mod_name)
 local S = minetest.get_translator(minetest.get_current_modname())
 
 
@@ -16,43 +18,16 @@ minetest.register_craftitem("sum_airship:hull", {
 	groups = { craftitem = 1 },
 })
 
-
-	local w = "group:wool"
-	if not minetest.get_modpath("farming") then w = "default:paper" end
-	local b = "boats:boat"
-	local m = "default:steel_ingot"
-	local s = "farming:string"
 if minetest.get_modpath("mcl_boats")
 and minetest.get_modpath("mcl_wool")
 and minetest.get_modpath("mcl_core")
 and minetest.get_modpath("mcl_mobitems") then
-		w = "group:wool"
-		b = "group:boat"
-		m = "mcl_core:iron_ingot"
-		s = "mcl_mobitems:string"
+    dofile(mod_path .. "/crafting_mcl.lua")
+elseif (minetest.get_modpath("rp_farming")
+or minetest.get_modpath("rp_mobs_mobs"))
+and minetest.get_modpath("rp_default")
+and minetest.get_modpath("rp_crafting") then
+    dofile(mod_path .. "/crafting_rp.lua")
+elseif minetest.get_modpath("default") then
+    dofile(mod_path .. "/crafting_mtg.lua")
 end
-	minetest.register_craft({
-		output = "sum_airship:canvas_roll",
-		recipe = {
-			{w, w, w},
-			{w, w, w},
-			{w, w, w},
-		},
-	})
-	minetest.register_craft({
-		output = "sum_airship:hull",
-		recipe = {
-			{b, b, b},
-			{m, m, m},
-		},
-	})
-
-
-minetest.register_craft({
-    output = "sum_airship:boat",
-    recipe = {
-        {"sum_airship:canvas_roll","sum_airship:canvas_roll","sum_airship:canvas_roll",},
-        {s, m, s,},
-		{s, "sum_airship:hull", s,},
-    },
-})

mod.conf

@@ -1,4 +1,5 @@
 name = sum_airship
+title = Airship (sum)
 author = Sumi
-description = airship
-optional_depends = default, mcl_core, mcl_wool, mcl_mobitems, mcl_player
+description = Adds a simple airship to Minetest Game, MineClone (VoxeLibre) and RePixture.
+optional_depends = default, mcl_core, mcl_wool, mcl_mobitems, mcl_player, rp_crafting, rp_default