From b9e8e06c39897bfe8f7339e6aeb490b4490646f7 Mon Sep 17 00:00:00 2001 From: Panquesito7 Date: Wed, 28 Aug 2019 19:39:56 -0500 Subject: [PATCH 1/5] Replace deprecated functions with newer ones --- gate_defs.lua | 131 ++++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 64 deletions(-) diff --git a/gate_defs.lua b/gate_defs.lua index 10aa054..09d95ac 100644 --- a/gate_defs.lua +++ b/gate_defs.lua @@ -1,6 +1,6 @@ function swap_gate_node(pos,name,dir) - local node = core.get_node(pos) - local meta = core.get_meta(pos) + local node = minetest.get_node(pos) + local meta = minetest.get_meta(pos) local meta0 = meta:to_table() node.name = name node.param1=0 @@ -10,7 +10,7 @@ function swap_gate_node(pos,name,dir) end function getDir (player) - local dir=player:get_look_dir() + local dir = player:get_look_dir() if math.abs(dir.x)>math.abs(dir.z) then if dir.x>0 then return 0 end return 1 @@ -19,26 +19,26 @@ function getDir (player) return 3 end -function checkNode (pos) - local node=core.get_node(pos) +function checkNode(pos) + local node = minetest.get_node(pos) if node.name == "air" then return 0 end return 1 end -function addGateNode (gateNodes,i,pos) +function addGateNode(gateNodes,i,pos) gateNodes[i].pos.x=pos.x gateNodes[i].pos.y=pos.y gateNodes[i].pos.z=pos.z end -function placeGate (player,pos) - local player_name=player:get_player_name() - local dir=minetest.dir_to_facedir(player:get_look_dir()) - local pos1=pos - local gateNodes={} +function placeGate(player,pos) + local player_name = player:get_player_name() + local dir = minetest.dir_to_facedir(player:get_look_dir()) + local pos1 = pos + local gateNodes = {} for i=1,9,1 do - gateNodes[i]={} - gateNodes[i].pos={} + gateNodes[i] = {} + gateNodes[i].pos = {} end if dir==1 then addGateNode(gateNodes,1,pos1) @@ -128,58 +128,59 @@ function placeGate (player,pos) local node=core.get_node(gateNodes[i].pos) if node.name ~= "air" then return false end end - core.set_node(gateNodes[1].pos,{name="stargate:gatenode_off", param1=0, param2=dir}) - local meta = core.get_meta(gateNodes[1].pos) - meta:set_string("infotext", "Stargate\nOwned by: "..player_name) - meta:set_string("gateNodes",minetest.serialize(gateNodes)) + + minetest.set_node(gateNodes[1].pos, {name = "stargate:gatenode_off", param1 = 0, param2 = dir}) + local meta = minetest.get_meta(gateNodes[1].pos) + meta:set_string("infotext", "Stargate\nOwned by: " .. player_name) + meta:set_string("gateNodes", minetest.serialize(gateNodes)) meta:set_int("gateActive",0) - meta:set_string("owner",player_name) - meta:set_string("dont_destroy","false") + meta:set_string("owner" ,player_name) + meta:set_string("dont_destroy", "false") stargate.registerGate(player_name,gateNodes[1].pos,dir) return true end -function removeGate (pos) - local meta = core.get_meta(pos) +function removeGate(pos) + local meta = minetest.get_meta(pos) if meta:get_string("dont_destroy") == "true" then return end - local player_name=meta:get_string("owner") - local gateNodes=minetest.deserialize(meta:get_string("gateNodes")) + local player_name = meta:get_string("owner") + local gateNodes = minetest.deserialize(meta:get_string("gateNodes")) if gateNodes ~= nil then - core.remove_node(gateNodes[1].pos) - stargate.unregisterGate(player_name,gateNodes[1].pos) + minetest.remove_node(gateNodes[1].pos) + stargate.unregisterGate(player_name, gateNodes[1].pos) end end -function activateGate (pos) - local node = core.get_node(pos) - local dir=node.param2 - local meta = core.get_meta(pos) - local gateNodes=minetest.deserialize(meta:get_string("gateNodes")) - meta:set_int("gateActive",1) - meta:set_string("dont_destroy","true") - minetest.sound_play("gateOpen", {pos = pos, gain = 1.0,loop = false, max_hear_distance = 72,}) - swap_gate_node(gateNodes[1].pos,"stargate:gatenode_on",dir) - meta:set_string("dont_destroy","false") +function activateGate(pos) + local node = minetest.get_node(pos) + local dir = node.param2 + local meta = minetest.get_meta(pos) + local gateNodes = minetest.deserialize(meta:get_string("gateNodes")) + meta:set_int("gateActive", 1) + meta:set_string("dont_destroy", "true") + minetest.sound_play("gateOpen", {pos = pos, gain = 1.0, loop = false, max_hear_distance = 72}) + swap_gate_node(gateNodes[1].pos, "stargate:gatenode_on", dir) + meta:set_string("dont_destroy", "false") end -function deactivateGate (pos) - local node = core.get_node(pos) - local dir=node.param2 - local meta = core.get_meta(pos) - local gateNodes=minetest.deserialize(meta:get_string("gateNodes")) - meta:set_int("gateActive",0) - meta:set_string("dont_destroy","true") - minetest.sound_play("gateClose", {pos = pos, gain = 1.0,loop = false, max_hear_distance = 72,}) - swap_gate_node(gateNodes[1].pos,"stargate:gatenode_off",dir) - meta:set_string("dont_destroy","false") +function deactivateGate(pos) + local node = minetest.get_node(pos) + local dir = node.param2 + local meta = minetest.get_meta(pos) + local gateNodes = minetest.deserialize(meta:get_string("gateNodes")) + meta:set_int("gateActive", 0) + meta:set_string("dont_destroy", "true") + minetest.sound_play("gateClose", {pos = pos, gain = 1.0, loop = false, max_hear_distance = 72}) + swap_gate_node(gateNodes[1].pos, "stargate:gatenode_off", dir) + meta:set_string("dont_destroy", "false") end gateCanDig = function(pos,player) local player_name = player:get_player_name() - local meta = core.get_meta(pos) + local meta = minetest.get_meta(pos) if meta:get_string("dont_destroy") == "true" then return end - local owner=meta:get_string("owner") - if player_name==owner then return true + local owner = meta:get_string("owner") + if player_name == owner then return true else return false end end @@ -217,17 +218,18 @@ minetest.register_node("stargate:gatenode_on",{ mesh = "stargate.obj", visual_scale = 3.0, groups = sg_groups, - drop="stargate:gatenode_off", + drop = "stargate:gatenode_off", paramtype2 = "facedir", paramtype = "light", light_source = 10, selection_box = sg_selection_box, collision_box = sg_collision_box, can_dig = gateCanDig, - on_destruct = function (pos) + on_destruct = function(pos) removeGate(pos) end, - on_rightclick=stargate.gateFormspecHandler, + + on_rightclick = stargate.gateFormspecHandler, }) minetest.register_node("stargate:gatenode_off",{ @@ -251,7 +253,7 @@ minetest.register_node("stargate:gatenode_off",{ selection_box = sg_selection_box, collision_box = sg_collision_box, can_dig = gateCanDig, - on_destruct = function (pos) + on_destruct = function(pos) removeGate(pos) end, on_place = function(itemstack, placer, pointed_thing) @@ -263,7 +265,8 @@ minetest.register_node("stargate:gatenode_off",{ return end end, - on_rightclick=stargate.gateFormspecHandler, + + on_rightclick = stargate.gateFormspecHandler, }) minetest.register_abm({ @@ -271,26 +274,26 @@ minetest.register_abm({ interval = 1, chance = 1, action = function(pos, node, active_object_count, active_object_count_wider) - local meta = core.get_meta(pos) - for _,object in ipairs(core.get_objects_inside_radius(pos, 1)) do + local meta = minetest.get_meta(pos) + for _,object in ipairs(minetest.get_objects_inside_radius(pos, 1)) do if object:is_player() then local player_name = object:get_player_name() - local owner=meta:get_string("owner") - local gate=stargate.findGate (pos) - if gate==nil then print("Gate is not registered!") return end + local owner = meta:get_string("owner") + local gate = stargate.findGate (pos) + if gate == nil then print("Gate is not registered!") return end local pos1={} pos1.x=gate["destination"].x pos1.y=gate["destination"].y pos1.z=gate["destination"].z - local dest_gate=stargate.findGate (pos1) - if dest_gate==nil then + local dest_gate = stargate.findGate (pos1) + if dest_gate == nil then gate["destination"]=nil deactivateGate(pos) stargate.save_data(owner) return end - if player_name~=owner and gate["type"]=="private" then return end - local dir1=gate["destination_dir"] + if player_name ~= owner and gate["type"] == "private" then return end + local dir1 = gate["destination_dir"] local dest_angle if dir1 == 0 then pos1.z = pos1.z-2 @@ -306,8 +309,8 @@ minetest.register_abm({ dest_angle = -90 end object:moveto(pos1,false) - object:set_look_yaw(math.rad(dest_angle)) - core.sound_play("enterEventHorizon", {pos = pos, gain = 1.0,loop = false, max_hear_distance = 72,}) + object:set_look_horizontal(math.rad(dest_angle)) + minetest.sound_play("enterEventHorizon", {pos = pos, gain = 1.0, loop = false, max_hear_distance = 72}) end end end From 5ca58fa3d743eb908167101fb577314ba93f408d Mon Sep 17 00:00:00 2001 From: Panquesito7 Date: Wed, 28 Aug 2019 19:40:50 -0500 Subject: [PATCH 2/5] Update init.lua --- init.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/init.lua b/init.lua index 3f09cc2..6fd8043 100644 --- a/init.lua +++ b/init.lua @@ -1,9 +1,9 @@ --- Minetest 0.4.5 : stargate +-- Minetest mod for 5.0.0+: stargate ---data tables definitions -stargate={} +-- Data tables definitions +stargate = {} stargate_network = {} -modpath=minetest.get_modpath("stargate") -dofile(modpath.."/stargate_gui.lua") -dofile(modpath.."/gate_defs.lua") +modpath = minetest.get_modpath("stargate") +dofile(modpath .. "/stargate_gui.lua") +dofile(modpath .. "/gate_defs.lua") From 8433fbb0b3741f8f5851132b9cacbfae04743dde Mon Sep 17 00:00:00 2001 From: Panquesito7 Date: Wed, 28 Aug 2019 19:53:07 -0500 Subject: [PATCH 3/5] Replace more deprecated functions with newer ones --- stargate_gui.lua | 278 +++++++++++++++++++++++------------------------ 1 file changed, 139 insertions(+), 139 deletions(-) diff --git a/stargate_gui.lua b/stargate_gui.lua index ec9fda3..a1e77ee 100644 --- a/stargate_gui.lua +++ b/stargate_gui.lua @@ -1,7 +1,7 @@ -- default GUI page stargate.default_page = "main" -stargate_network["players"]={} -stargate.current_page={} +stargate_network["players"] = {} +stargate.current_page = {} local function table_empty(tab) for key in pairs(tab) do return false end @@ -10,11 +10,11 @@ end stargate.save_data = function(table_pointer) if table_empty(stargate_network[table_pointer]) then return end - local data = minetest.serialize( stargate_network[table_pointer] ) - local path = minetest.get_worldpath().."/stargate_"..table_pointer..".data" - local file = io.open( path, "w" ) + local data = minetest.serialize(stargate_network[table_pointer]) + local path = minetest.get_worldpath() .. "/stargate_" .. table_pointer .. ".data" + local file = io.open(path, "w") if( file ) then - file:write( data ) + file:write(data) file:close() return true else return nil @@ -22,11 +22,11 @@ stargate.save_data = function(table_pointer) end stargate.restore_data = function(table_pointer) - local path = minetest.get_worldpath().."/stargate_"..table_pointer..".data" + local path = minetest.get_worldpath().."/stargate_" .. table_pointer .. ".data" local file = io.open( path, "r" ) if( file ) then local data = file:read("*all") - stargate_network[table_pointer] = minetest.deserialize( data ) + stargate_network[table_pointer] = minetest.deserialize(data) file:close() if table_empty(stargate_network[table_pointer]) then os.remove(path) end return true @@ -35,7 +35,7 @@ stargate.restore_data = function(table_pointer) end -- load Stargates network data -if stargate.restore_data("registered_players") ~= nil then +if stargate.restore_data("registered_players") ~=nil then for __,tab in ipairs(stargate_network["registered_players"]) do if stargate.restore_data(tab["player_name"]) == nil then --print ("[stargate] Error loading data!") @@ -43,50 +43,50 @@ if stargate.restore_data("registered_players") ~= nil then end end else - print ("[stargate] Error loading data! Creating new file.") - stargate_network["registered_players"]={} + print("[stargate] Error loading data! Creating new file.") + stargate_network["registered_players"] = {} stargate.save_data("registered_players") end -- register_on_joinplayer minetest.register_on_joinplayer(function(player) local player_name = player:get_player_name() - local registered=nil + local registered = nil for __,tab in ipairs(stargate_network["registered_players"]) do if tab["player_name"] == player_name then registered = true break end end if registered == nil then local new={} - new["player_name"]=player_name - table.insert(stargate_network["registered_players"],new) - stargate_network[player_name]={} + new["player_name"] = player_name + table.insert(stargate_network["registered_players"], new) + stargate_network[player_name] = {} stargate.save_data("registered_players") stargate.save_data(player_name) end - stargate_network["players"][player_name]={} - stargate_network["players"][player_name]["formspec"]="" - stargate_network["players"][player_name]["current_page"]=stargate.default_page - stargate_network["players"][player_name]["own_gates"]={} - stargate_network["players"][player_name]["own_gates_count"]=0 - stargate_network["players"][player_name]["public_gates"]={} - stargate_network["players"][player_name]["public_gates_count"]=0 - stargate_network["players"][player_name]["current_index"]=0 - stargate_network["players"][player_name]["temp_gate"]={} + stargate_network["players"][player_name] = {} + stargate_network["players"][player_name]["formspec"] = "" + stargate_network["players"][player_name]["current_page"] = stargate.default_page + stargate_network["players"][player_name]["own_gates"] = {} + stargate_network["players"][player_name]["own_gates_count"] = 0 + stargate_network["players"][player_name]["public_gates"] = {} + stargate_network["players"][player_name]["public_gates_count"] = 0 + stargate_network["players"][player_name]["current_index"] = 0 + stargate_network["players"][player_name]["temp_gate"] = {} end) stargate.registerGate = function(player_name,pos,dir) - if stargate_network[player_name]==nil then - stargate_network[player_name]={} + if stargate_network[player_name] == nil then + stargate_network[player_name] = {} end local new_gate ={} - new_gate["pos"]=pos - new_gate["type"]="private" - new_gate["description"]="" - new_gate["dir"]=dir - new_gate["owner"]=player_name + new_gate["pos"] = pos + new_gate["type"] = "private" + new_gate["description"] = "" + new_gate["dir"] = dir + new_gate["owner"] = player_name table.insert(stargate_network[player_name],new_gate) - if stargate.save_data(player_name)==nil then - print ("[stargate] Couldnt update network file!") + if stargate.save_data(player_name) ==nil then + print("[stargate] Couldnt update network file!") end end @@ -97,18 +97,18 @@ stargate.unregisterGate = function(player_name,pos) break end end - if stargate.save_data(player_name)==nil then - print ("[stargate] Couldnt update network file!") + if stargate.save_data(player_name) == nil then + print("[stargate] Couldnt update network file!") end end stargate.findGate = function(pos) for __,tab in ipairs(stargate_network["registered_players"]) do - local player_name=tab["player_name"] - if type(stargate_network[player_name])=="table" then + local player_name = tab["player_name"] + if type(stargate_network[player_name]) == "table" then for __,gates in ipairs(stargate_network[player_name]) do if gates then - if gates["pos"].x==pos.x and gates["pos"].y==pos.y and gates["pos"].z==pos.z then + if gates["pos"].x == pos.x and gates["pos"].y == pos.y and gates["pos"].z == pos.z then return gates end end @@ -121,21 +121,21 @@ end --show formspec to player stargate.gateFormspecHandler = function(pos, node, clicker, itemstack) local player_name = clicker:get_player_name() - local meta = minetest.env:get_meta(pos) - local owner=meta:get_string("owner") - if player_name~=owner then return end + local meta = minetest.get_meta(pos) + local owner = meta:get_string("owner") + if player_name ~=owner then return end local current_gate=nil - stargate_network["players"][player_name]["own_gates"]={} - stargate_network["players"][player_name]["public_gates"]={} - local own_gates_count=0 - local public_gates_count=0 + stargate_network["players"][player_name]["own_gates"] = {} + stargate_network["players"][player_name]["public_gates"] = {} + local own_gates_count = 0 + local public_gates_count = 0 for __,gates in ipairs(stargate_network[player_name]) do - if gates["pos"].x==pos.x and gates["pos"].y==pos.y and gates["pos"].z==pos.z then - current_gate=gates + if gates["pos"].x == pos.x and gates["pos"].y == pos.y and gates["pos"].z == pos.z then + current_gate = gates else - own_gates_count=own_gates_count+1 - table.insert(stargate_network["players"][player_name]["own_gates"],gates) + own_gates_count = own_gates_count + 1 + table.insert(stargate_network["players"][player_name]["own_gates"], gates) end end stargate_network["players"][player_name]["own_gates_count"]=own_gates_count @@ -143,42 +143,42 @@ stargate.gateFormspecHandler = function(pos, node, clicker, itemstack) -- get all public gates for __,tab in ipairs(stargate_network["registered_players"]) do local temp=tab["player_name"] - if type(stargate_network[temp])=="table" and temp~=player_name then + if type(stargate_network[temp]) == "table" and temp ~=player_name then for __,gates in ipairs(stargate_network[temp]) do - if gates["type"]=="public" then - public_gates_count=public_gates_count+1 - table.insert(stargate_network["players"][player_name]["public_gates"],gates) + if gates["type"] == "public" then + public_gates_count=public_gates_count + 1 + table.insert(stargate_network["players"][player_name]["public_gates"], gates) end end end end print(dump(stargate_network["players"][player_name]["public_gates"])) - if current_gate==nil then - print ("Gate not registered in network! Please remove it and place once again.") + if current_gate == nil then + print("Gate not registered in network! Please remove it and place once again.") return nil end - stargate_network["players"][player_name]["current_index"]=0 + stargate_network["players"][player_name]["current_index"] = 0 stargate_network["players"][player_name]["temp_gate"]["type"]=current_gate["type"] stargate_network["players"][player_name]["temp_gate"]["description"]=current_gate["description"] - stargate_network["players"][player_name]["temp_gate"]["pos"]={} + stargate_network["players"][player_name]["temp_gate"]["pos"] = {} stargate_network["players"][player_name]["temp_gate"]["pos"].x=current_gate["pos"].x stargate_network["players"][player_name]["temp_gate"]["pos"].y=current_gate["pos"].y stargate_network["players"][player_name]["temp_gate"]["pos"].z=current_gate["pos"].z if current_gate["destination"] then - stargate_network["players"][player_name]["temp_gate"]["destination_description"]=current_gate["destination_description"] - stargate_network["players"][player_name]["temp_gate"]["destination_dir"]=current_gate["destination_dir"] - stargate_network["players"][player_name]["temp_gate"]["destination"]={} + stargate_network["players"][player_name]["temp_gate"]["destination_description"] = current_gate["destination_description"] + stargate_network["players"][player_name]["temp_gate"]["destination_dir"] = current_gate["destination_dir"] + stargate_network["players"][player_name]["temp_gate"]["destination"] = {} stargate_network["players"][player_name]["temp_gate"]["destination"].x=current_gate["destination"].x stargate_network["players"][player_name]["temp_gate"]["destination"].y=current_gate["destination"].y stargate_network["players"][player_name]["temp_gate"]["destination"].z=current_gate["destination"].z else - stargate_network["players"][player_name]["temp_gate"]["destination"]=nil + stargate_network["players"][player_name]["temp_gate"]["destination"] = nil end - stargate_network["players"][player_name]["current_gate"]=current_gate - stargate_network["players"][player_name]["dest_type"]="own" - local formspec=stargate.get_formspec(player_name,"main") - stargate_network["players"][player_name]["formspec"]=formspec + stargate_network["players"][player_name]["current_gate"] = current_gate + stargate_network["players"][player_name]["dest_type"] = "own" + local formspec = stargate.get_formspec(player_name, "main") + stargate_network["players"][player_name]["formspec"] = formspec if formspec ~=nil then minetest.show_formspec(player_name, "stargate_main", formspec) end end @@ -189,33 +189,33 @@ stargate.get_formspec = function(player_name,page) local temp_gate=stargate_network["players"][player_name]["temp_gate"] local formspec = "size[14,10]" --background - formspec = formspec .."background[-0.19,-0.2;14.38,10.55;ui_form_bg.png]" - formspec = formspec.."label[0,0.0;Stargate DHD]" - formspec = formspec.."label[0,.5;Position: ("..temp_gate["pos"].x..","..temp_gate["pos"].y..","..temp_gate["pos"].z..")]" - formspec = formspec.."image_button[3.5,.6;.6,.6;toggle_icon.png;toggle_type;]" - formspec = formspec.."label[4,.5;Type: "..temp_gate["type"].."]" - formspec = formspec.."image_button[6.5,.6;.6,.6;pencil_icon.png;edit_desc;]" - formspec = formspec.."label[0,1.1;Destination: ]" + formspec = formspec .. "background[-0.19,-0.2;14.38,10.55;ui_form_bg.png]" + formspec = formspec .. "label[0,0.0;Stargate DHD]" + formspec = formspec .. "label[0,.5;Position: (" .. temp_gate["pos"].x .. "," .. temp_gate["pos"].y .. ","..temp_gate["pos"].z .. ")]" + formspec = formspec .. "image_button[3.5,.6;.6,.6;toggle_icon.png;toggle_type;]" + formspec = formspec .. "label[4,.5;Type: " .. temp_gate["type"] .. "]" + formspec = formspec .. "image_button[6.5,.6;.6,.6;pencil_icon.png;edit_desc;]" + formspec = formspec .. "label[0,1.1;Destination: ]" if temp_gate["destination"] then - formspec = formspec.."label[2.5,1.1;("..temp_gate["destination"].x.."," - ..temp_gate["destination"].y.."," - ..temp_gate["destination"].z..") " - ..temp_gate["destination_description"].."]" + formspec = formspec .. "label[2.5,1.1;("..temp_gate["destination"].x .. "," + ..temp_gate["destination"].y .. "," + ..temp_gate["destination"].z .. ") " + ..temp_gate["destination_description"] .."]" formspec = formspec.."image_button[2,1.2;.6,.6;cancel_icon.png;remove_dest;]" else formspec = formspec.."label[2,1.1;Not connected]" end - formspec = formspec.."label[0,1.7;Aviable destinations:]" - formspec = formspec.."image_button[3.5,1.8;.6,.6;toggle_icon.png;toggle_dest_type;]" - formspec = formspec.."label[4,1.7;Filter: "..stargate_network["players"][player_name]["dest_type"].."]" + formspec = formspec .. "label[0,1.7;Aviable destinations:]" + formspec = formspec .. "image_button[3.5,1.8;.6,.6;toggle_icon.png;toggle_dest_type;]" + formspec = formspec .. "label[4,1.7;Filter: "..stargate_network["players"][player_name]["dest_type"] .. "]" - if page=="main" then - formspec = formspec.."image_button[6.5,.6;.6,.6;pencil_icon.png;edit_desc;]" - formspec = formspec.."label[7,.5;Description: "..temp_gate["description"].."]" + if page == "main" then + formspec = formspec .. "image_button[6.5,.6;.6,.6;pencil_icon.png;edit_desc;]" + formspec = formspec .. "label[7,.5;Description: "..temp_gate["description"] .. "]" end - if page=="edit_desc" then - formspec = formspec.."image_button[6.5,.6;.6,.6;ok_icon.png;save_desc;]" - formspec = formspec.."field[7.3,.7;5,1;desc_box;Edit gate description:;"..temp_gate["description"].."]" + if page == "edit_desc" then + formspec = formspec .. "image_button[6.5,.6;.6,.6;ok_icon.png;save_desc;]" + formspec = formspec .. "field[7.3,.7;5,1;desc_box;Edit gate description:;" .. temp_gate["description"] .. "]" end local list_index=stargate_network["players"][player_name]["current_index"] @@ -228,9 +228,9 @@ stargate.get_formspec = function(player_name,page) for x=0,2,1 do local gate_temp=stargate_network["players"][player_name]["own_gates"][list_index+1] if gate_temp then - formspec = formspec.."image_button["..(x*4.5)..","..(2.5+y*.87)..";.6,.6;stargate_icon.png;list_button"..list_index..";]" - formspec = formspec.."label["..(x*4.5+.5)..","..(2.3+y*.87)..";("..gate_temp["pos"].x..","..gate_temp["pos"].y..","..gate_temp["pos"].z..") "..gate_temp["type"].."]" - formspec = formspec.."label["..(x*4.5+.5)..","..(2.7+y*.87)..";"..gate_temp["description"].."]" + formspec = formspec .. "image_button[" .. (x*4.5) .. "," .. (2.5+y*.87) .. ";.6,.6;stargate_icon.png;list_button" .. list_index .. ";]" + formspec = formspec .. "label[" .. (x*4.5+.5) .. "," .. (2.3+y*.87)..";(" .. gate_temp["pos"].x .. "," .. gate_temp["pos"].y .. "," .. gate_temp["pos"].z..") " .. gate_temp["type"] .. "]" + formspec = formspec .. "label[" .. (x*4.5+.5) .. "," .. (2.7+y*.87) .. ";" .. gate_temp["description"] .. "]" end list_index=list_index+1 end @@ -240,21 +240,21 @@ stargate.get_formspec = function(player_name,page) local x,y for y=0,7,1 do for x=0,2,1 do - local gate_temp=stargate_network["players"][player_name]["public_gates"][list_index+1] + local gate_temp = stargate_network["players"][player_name]["public_gates"][list_index+1] if gate_temp then - formspec = formspec.."image_button["..(x*4.5)..","..(2.5+y*.87)..";.6,.6;stargate_icon.png;list_button"..list_index..";]" - formspec = formspec.."label["..(x*4.5+.5)..","..(2.3+y*.87)..";("..gate_temp["pos"].x..","..gate_temp["pos"].y..","..gate_temp["pos"].z..") "..gate_temp["owner"].."]" - formspec = formspec.."label["..(x*4.5+.5)..","..(2.7+y*.87)..";"..gate_temp["description"].."]" + formspec = formspec .. "image_button["..(x*4.5)..","..(2.5+y*.87)..";.6,.6;stargate_icon.png;list_button"..list_index..";]" + formspec = formspec .. "label[" .. (x*4.5+.5) .. "," .. (2.3+y*.87) .. ";(" .. gate_temp["pos"].x .. ","..gate_temp["pos"].y .. "," .. gate_temp["pos"].z..") " .. gate_temp["owner"] .. "]" + formspec = formspec .. "label[" .. (x*4.5+.5) .. "," .. (2.7+y*.87) .. ";" .. gate_temp["description"] .. "]" end - list_index=list_index+1 + list_index = list_index+1 end end end - formspec=formspec.."label[7.5,1.7;Page: "..page.." of "..pagemax.."]" - formspec = formspec.."image_button[6.5,1.8;.6,.6;left_icon.png;page_left;]" - formspec = formspec.."image_button[6.9,1.8;.6,.6;right_icon.png;page_right;]" - formspec = formspec.."image_button_exit[6.1,9.3;.8,.8;ok_icon.png;save_changes;]" - formspec = formspec.."image_button_exit[7.1,9.3;.8,.8;cancel_icon.png;discard_changes;]" + formspec= formspec .. "label[7.5,1.7;Page: " .. page .. " of " .. pagemax .."]" + formspec = formspec .. "image_button[6.5,1.8;.6,.6;left_icon.png;page_left;]" + formspec = formspec .. "image_button[6.9,1.8;.6,.6;right_icon.png;page_right;]" + formspec = formspec .. "image_button_exit[6.1,9.3;.8,.8;ok_icon.png;save_changes;]" + formspec = formspec .. "image_button_exit[7.1,9.3;.8,.8;cancel_icon.png;discard_changes;]" return formspec end @@ -262,8 +262,8 @@ end minetest.register_on_player_receive_fields(function(player, formname, fields) if not formname == "stargate_main" then return "" end local player_name = player:get_player_name() - local temp_gate=stargate_network["players"][player_name]["temp_gate"] - local current_gate=stargate_network["players"][player_name]["current_gate"] + local temp_gate = stargate_network["players"][player_name]["temp_gate"] + local current_gate = stargate_network["players"][player_name]["current_gate"] local formspec if fields.toggle_type then @@ -271,7 +271,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) temp_gate["type"] = "public" else temp_gate["type"] = "private" end stargate_network["players"][player_name]["current_index"]=0 - formspec= stargate.get_formspec(player_name,"main") + formspec = stargate.get_formspec(player_name,"main") stargate_network["players"][player_name]["formspec"] = formspec minetest.show_formspec(player_name, "stargate_main", formspec) minetest.sound_play("click", {to_player=player_name, gain = 0.5}) @@ -285,33 +285,33 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) formspec = stargate.get_formspec(player_name,"main") stargate_network["players"][player_name]["formspec"] = formspec minetest.show_formspec(player_name, "stargate_main", formspec) - minetest.sound_play("click", {to_player=player_name, gain = 0.5}) + minetest.sound_play("click", {to_player = player_name, gain = 0.5}) return end if fields.edit_desc then formspec= stargate.get_formspec(player_name,"edit_desc") - stargate_network["players"][player_name]["formspec"]=formspec + stargate_network["players"][player_name]["formspec"] = formspec minetest.show_formspec(player_name, "stargate_main", formspec) - minetest.sound_play("click", {to_player=player_name, gain = 0.5}) + minetest.sound_play("click", {to_player = player_name, gain = 0.5}) return end if fields.save_desc then temp_gate["description"]=fields.desc_box formspec= stargate.get_formspec(player_name,"main") - stargate_network["players"][player_name]["formspec"]=formspec + stargate_network["players"][player_name]["formspec"] = formspec minetest.show_formspec(player_name, "stargate_main", formspec) - minetest.sound_play("click", {to_player=player_name, gain = 0.5}) + minetest.sound_play("click", {to_player = player_name, gain = 0.5}) return end -- page controls - local start=math.floor(stargate_network["players"][player_name]["current_index"]/24 +1 ) - local start_i=start + local start = math.floor(stargate_network["players"][player_name]["current_index"]/24 +1 ) + local start_i = start local pagemax = math.floor(((stargate_network["players"][player_name]["own_gates_count"]-1) / 24) + 1) if fields.page_left then - minetest.sound_play("paperflip2", {to_player=player_name, gain = 1.0}) + minetest.sound_play("paperflip2", {to_player = player_name, gain = 1.0}) start_i = start_i - 1 if start_i < 1 then start_i = 1 end if not (start_i == start) then @@ -322,7 +322,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end end if fields.page_right then - minetest.sound_play("paperflip2", {to_player=player_name, gain = 1.0}) + minetest.sound_play("paperflip2", {to_player = player_name, gain = 1.0}) start_i = start_i + 1 if start_i > pagemax then start_i = pagemax end if not (start_i == start) then @@ -335,62 +335,62 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) if fields.remove_dest then minetest.sound_play("click", {to_player=player_name, gain = 0.5}) - temp_gate["destination"]=nil - temp_gate["destination_description"]=nil - formspec = stargate.get_formspec(player_name,"main") + temp_gate["destination"] = nil + temp_gate["destination_description"] = nil + formspec = stargate.get_formspec(player_name, "main") stargate_network["players"][player_name]["formspec"] = formspec minetest.show_formspec(player_name, "stargate_main", formspec) end if fields.save_changes then - minetest.sound_play("click", {to_player=player_name, gain = 0.5}) - local meta = minetest.env:get_meta(temp_gate["pos"]) - local infotext="" - current_gate["type"]=temp_gate["type"] - current_gate["description"]=temp_gate["description"] - current_gate["pos"]={} + minetest.sound_play("click", {to_player = player_name, gain = 0.5}) + local meta = minetest.get_meta(temp_gate["pos"]) + local infotext = "" + current_gate["type"] = temp_gate["type"] + current_gate["description"] = temp_gate["description"] + current_gate["pos"] = {} current_gate["pos"].x=temp_gate["pos"].x current_gate["pos"].y=temp_gate["pos"].y current_gate["pos"].z=temp_gate["pos"].z current_gate["dest"]=temp_gate["dest"] if temp_gate["destination"] then - current_gate["destination"]={} + current_gate["destination"] = {} current_gate["destination"].x=temp_gate["destination"].x current_gate["destination"].y=temp_gate["destination"].y current_gate["destination"].z=temp_gate["destination"].z - current_gate["destination_description"]=temp_gate["destination_description"] - current_gate["destination_dir"]=temp_gate["destination_dir"] + current_gate["destination_description"] = temp_gate["destination_description"] + current_gate["destination_dir"] = temp_gate["destination_dir"] else - current_gate["destination"]=nil + current_gate["destination"] = nil end if current_gate["destination"] then - activateGate (current_gate["pos"]) + activateGate(current_gate["pos"]) else - deactivateGate (current_gate["pos"]) + deactivateGate(current_gate["pos"]) end - if current_gate["type"]=="private" then infotext="Private" else infotext="Public" end - infotext=infotext.." Gate: "..current_gate["description"].."\n" - infotext=infotext.."Owned by "..player_name.."\n" + if current_gate["type"] == "private" then infotext = "Private" else infotext = "Public" end + infotext = infotext .. " Gate: " .. current_gate["description"] .. "\n" + infotext = infotext .. "Owned by " .. player_name .. "\n" if current_gate["destination"] then - infotext=infotext.."Destination: ("..current_gate["destination"].x..","..current_gate["destination"].y..","..current_gate["destination"].z..") " - infotext=infotext..current_gate["destination_description"] + infotext=infotext .. "Destination: (" .. current_gate["destination"].x .. "," .. current_gate["destination"].y .. "," .. current_gate["destination"].z .. ")" + infotext=infotext .. current_gate["destination_description"] end meta:set_string("infotext",infotext) if stargate.save_data(player_name)==nil then - print ("[stargate] Couldnt update network file!") + print("[stargate] Couldnt update network file!") end end if fields.discard_changes then - minetest.sound_play("click", {to_player=player_name, gain = 0.5}) + minetest.sound_play("click", {to_player = player_name, gain = 0.5}) end local list_index=stargate_network["players"][player_name]["current_index"] local i - for i=0,23,1 do - local button="list_button"..i+list_index + for i = 0,23,1 do + local button = "list_button" .. i + list_index if fields[button] then - minetest.sound_play("click", {to_player=player_name, gain = 1.0}) + minetest.sound_play("click", {to_player = player_name, gain = 1.0}) local gate=stargate_network["players"][player_name]["temp_gate"] local dest_gate if stargate_network["players"][player_name]["dest_type"] == "own" then @@ -398,13 +398,13 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) else dest_gate=stargate_network["players"][player_name]["public_gates"][list_index+i+1] end - gate["destination"]={} + gate["destination"] = {} gate["destination"].x=dest_gate["pos"].x gate["destination"].y=dest_gate["pos"].y gate["destination"].z=dest_gate["pos"].z - gate["destination_description"]=dest_gate["description"] - gate["destination_dir"]=dest_gate["dir"] - formspec = stargate.get_formspec(player_name,"main") + gate["destination_description"] = dest_gate["description"] + gate["destination_dir"] = dest_gate["dir"] + formspec = stargate.get_formspec(player_name, "main") stargate_network["players"][player_name]["formspec"] = formspec minetest.show_formspec(player_name, "stargate_main", formspec) end From 946928d6634fcf707ed6c7b8e5348b0107048181 Mon Sep 17 00:00:00 2001 From: Panquesito7 Date: Wed, 28 Aug 2019 19:53:34 -0500 Subject: [PATCH 4/5] Delete deprecated depends.txt --- depends.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 depends.txt diff --git a/depends.txt b/depends.txt deleted file mode 100644 index 8b13789..0000000 --- a/depends.txt +++ /dev/null @@ -1 +0,0 @@ - From eb151b930ab886afdaf1cf5c0777b3bacd092dae Mon Sep 17 00:00:00 2001 From: Panquesito7 Date: Wed, 28 Aug 2019 19:53:48 -0500 Subject: [PATCH 5/5] Create mod.conf --- mod.conf | 1 + 1 file changed, 1 insertion(+) create mode 100644 mod.conf diff --git a/mod.conf b/mod.conf new file mode 100644 index 0000000..7d8c985 --- /dev/null +++ b/mod.conf @@ -0,0 +1 @@ +name = stargate