Merge pull request #4 from Niklp09/main

Minor cleanup & texture optimization

.luacheckrc

@@ -0,0 +1,9 @@
+unused_args = false
+allow_defined_top = true
+
+read_globals = {
+	"minetest",
+	"airutils",
+	"vector",
+	"DIR_DELIM",
+}

crafts.lua

@@ -20,11 +20,11 @@ minetest.register_craftitem("ju52:ju52", {
 		if pointed_thing.type ~= "node" then
 			return
 		end
-        
+
         local pointed_pos = pointed_thing.under
         --local node_below = minetest.get_node(pointed_pos).name
         --local nodedef = minetest.registered_nodes[node_below]
-        
+
 		pointed_pos.y=pointed_pos.y+3.0
 		local new_ju52 = minetest.add_entity(pointed_pos, "ju52:ju52")
 		if new_ju52 and placer then
@@ -45,7 +45,7 @@ minetest.register_craftitem("ju52:ju52", {
 -- crafting
 --
 if not minetest.settings:get_bool('ju52.disable_craftitems') and minetest.get_modpath("default") then
-	--[[minetest.register_craft({
+	minetest.register_craft({
 		output = "ju52:wings",
 		recipe = {
 			{"wool:white", "farming:string", "wool:white"},
@@ -67,5 +67,5 @@ if not minetest.settings:get_bool('ju52.disable_craftitems') and minetest.get_mo
 			{"ju52:wings",},
 			{"ju52:body",},
 		}
-	})]]--
+	})
 end

entities.lua

@@ -22,17 +22,17 @@ initial_properties = {
             "airutils_metal.png", --roda trem
         },
 	},
-	
+
     on_activate = function(self,std)
 	    self.sdata = minetest.deserialize(std) or {}
 	    if self.sdata.remove then self.object:remove() end
     end,
-	    
+
     get_staticdata=function(self)
       self.sdata.remove=true
       return minetest.serialize(self.sdata)
     end,
-	
+
 })
 
 minetest.register_entity('ju52:cabin_interactor',{
@@ -46,12 +46,12 @@ minetest.register_entity('ju52:cabin_interactor',{
 	},
     dist_moved = 0,
     max_hp = 65535,
-	
+
     on_activate = function(self,std)
 	    self.sdata = minetest.deserialize(std) or {}
 	    if self.sdata.remove then self.object:remove() end
     end,
-	    
+
     get_staticdata=function(self)
       self.sdata.remove=true
       return minetest.serialize(self.sdata)
@@ -73,7 +73,7 @@ minetest.register_entity('ju52:cabin_interactor',{
         if parent_self.co_pilot and parent_self._have_copilot then
             copilot_name = parent_self.co_pilot
         end
-        
+
         if name == parent_self.driver_name then
             local itmstck=clicker:get_wielded_item()
             local item_name = ""

forms.lua

@@ -8,7 +8,7 @@ function ju52.paint_formspec(name)
     basic_form = basic_form.."image_button[0.5,0.5;3,1;ju52_p_lufthansa.png;lufthansa;Lufthansa;false;true;]"
     basic_form = basic_form.."image_button[0.5,1.6;3,1;ju52_p_lufthansa.png;lufthansa2;Lufthansa 2;false;true;]"
     basic_form = basic_form.."image_button[0.5,2.7;3,1;ju52_p_luftwaffe.png;luftwaffe;Luftwaffe;false;true;]"
-    --basic_form = basic_form.."image_button[1,4.3;3,1;ju52_white.png^[multiply:#2b2b2b;black;Black;false;true;]" 
+    --basic_form = basic_form.."image_button[1,4.3;3,1;ju52_white.png^[multiply:#2b2b2b;black;Black;false;true;]"
 
     minetest.show_formspec(name, "ju52:paint", basic_form)
 end
@@ -23,7 +23,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
         end
         local ent = plane_obj:get_luaentity()
         if ent then
-            
+
             if fields.lufthansa then ent._skin = "ju52_skin_lufthansa.png" end
             if fields.lufthansa2 then ent._skin = "ju52_skin_lufthansa2.png" end
             if fields.luftwaffe then ent._skin = "ju52_skin_luftwaffe.png" end

init.lua

@@ -48,8 +48,6 @@ end
 function ju52.destroy_parts_method(self)
     if self.wheels then self.wheels:remove() end
     if self.cabin then self.cabin:remove() end
-
-    local pos = self.object:get_pos()
 end
 
 function ju52.step_additional_function(self)
@@ -69,7 +67,7 @@ function ju52.step_additional_function(self)
 
     local energy_indicator_angle = airutils.get_gauge_angle((self._max_fuel - self._energy)/3) - 90
     self.object:set_bone_position("fuel", {x=0, y=-40.6, z=15.35}, {x=0, y=(energy_indicator_angle+180), z=0})
-    
+
     self.object:set_bone_position("compass", {x=0, y=-40.55, z=18.2}, {x=0, y=(math.deg(self._yaw)), z=0})
     self.object:set_bone_position("compass_plan", {x=0, y=-40.4, z=18.2}, {x=0, y=airutils.get_adf_angle(self, pos), z=0})
 
@@ -274,13 +272,6 @@ dofile(minetest.get_modpath("ju52") .. DIR_DELIM .. "entities.lua")
 -- items
 --
 
-settings = Settings(minetest.get_worldpath() .. "/ju52.conf")
-local function fetch_setting(name)
-    local sname = name
-    return settings and settings:get(sname) or minetest.settings:get(sname)
-end
-
-
 local old_entities = {"ju52:seat_base","ju52:engine"}
 for _,entity_name in ipairs(old_entities) do
     minetest.register_entity(":"..entity_name, {

mod.conf

@@ -1,6 +1,6 @@
 name = ju52
 depends = airutils
-optional_depends = compassgps,climate_api,biofuel
+optional_depends = compassgps,climate_api,biofuel,default
 author = APercy
 description = Adds a Ju52 airplane
 title = Ju52