diff --git a/LICENSE b/LICENSE index 315f675..c93f886 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 Coder12a +Copyright (c) 2019 Coder12 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 4ab2c76..d4f7466 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # factions -mod for minetest +modpack for minetest -Mod for handling in game factions. +Mods for handling in game factions. diff --git a/factions.lua b/fac/init.lua similarity index 99% rename from factions.lua rename to fac/init.lua index 570eac8..70734e5 100644 --- a/factions.lua +++ b/fac/init.lua @@ -488,3 +488,5 @@ function factionUpdate() factions.faction_tick() minetest.after(factions_config.tick_time, factionUpdate) end + +minetest.after(factions_config.tick_time, factionUpdate) diff --git a/fac/mod.conf b/fac/mod.conf new file mode 100644 index 0000000..4bec018 --- /dev/null +++ b/fac/mod.conf @@ -0,0 +1,2 @@ +name = fac +depends = fac_config \ No newline at end of file diff --git a/chatcommands.lua b/fac_chat/init.lua similarity index 99% rename from chatcommands.lua rename to fac_chat/init.lua index 6a0cc8c..369dd57 100644 --- a/chatcommands.lua +++ b/fac_chat/init.lua @@ -910,7 +910,7 @@ factions.register_command("show_parcel", { local psc = parcel_size_center local fps = factions_config.parcel_size local ppos = {x = (math.floor(pos.x / fps) * fps) + psc, y = (math.floor(pos.y / fps) * fps) + psc, z = (math.floor(pos.z / fps) * fps) + psc} - minetest.add_entity(ppos, "factions:display") + minetest.add_entity(ppos, "fac_objects:display") return true end }) diff --git a/fac_chat/mod.conf b/fac_chat/mod.conf new file mode 100644 index 0000000..bf9ecb1 --- /dev/null +++ b/fac_chat/mod.conf @@ -0,0 +1 @@ +name = fac_chat diff --git a/config.lua b/fac_config/init.lua similarity index 100% rename from config.lua rename to fac_config/init.lua diff --git a/fac_config/mod.conf b/fac_config/mod.conf new file mode 100644 index 0000000..c8a9c15 --- /dev/null +++ b/fac_config/mod.conf @@ -0,0 +1 @@ +name = fac_config diff --git a/settingtypes.txt b/fac_config/settingtypes.txt similarity index 100% rename from settingtypes.txt rename to fac_config/settingtypes.txt diff --git a/databases.lua b/fac_database/init.lua similarity index 98% rename from databases.lua rename to fac_database/init.lua index ca235d8..7a5d58c 100644 --- a/databases.lua +++ b/fac_database/init.lua @@ -17,6 +17,7 @@ if factions_config.database == "colddb" then factions.players = factions.root.sub_database("players") factions.player_ips = factions.root.sub_database("ips") elseif factions_config.database == "mod_storage" then + dofile (minetest.get_modpath("fac_database") .. "/storagedb.lua") factions.root = storagedb.Storagedb("factions") factions.factions = factions.root.sub_database("factions") factions.parcels = factions.root.sub_database("parcels") diff --git a/fac_database/mod.conf b/fac_database/mod.conf new file mode 100644 index 0000000..9160640 --- /dev/null +++ b/fac_database/mod.conf @@ -0,0 +1,3 @@ +name = fac_database +depends = fac_config +optional_depends = colddb diff --git a/storagedb.lua b/fac_database/storagedb.lua similarity index 100% rename from storagedb.lua rename to fac_database/storagedb.lua diff --git a/claim_events.lua b/fac_events/claim_events.lua similarity index 100% rename from claim_events.lua rename to fac_events/claim_events.lua diff --git a/diplomacy_events.lua b/fac_events/diplomacy_events.lua similarity index 100% rename from diplomacy_events.lua rename to fac_events/diplomacy_events.lua diff --git a/eventcallbacks.lua b/fac_events/eventcallbacks.lua similarity index 100% rename from eventcallbacks.lua rename to fac_events/eventcallbacks.lua diff --git a/fac_events/init.lua b/fac_events/init.lua new file mode 100644 index 0000000..758a06c --- /dev/null +++ b/fac_events/init.lua @@ -0,0 +1,8 @@ +local path = minetest.get_modpath("fac_events") +dofile (path .. "/claim_events.lua") +dofile (path .. "/diplomacy_events.lua") +dofile (path .. "/eventcallbacks.lua") +dofile (path .. "/invite_events.lua") +dofile (path .. "/player_events.lua") +dofile (path .. "/power_events.lua") +dofile (path .. "/rank_events.lua") diff --git a/invite_events.lua b/fac_events/invite_events.lua similarity index 100% rename from invite_events.lua rename to fac_events/invite_events.lua diff --git a/fac_events/mod.conf b/fac_events/mod.conf new file mode 100644 index 0000000..d7c2f81 --- /dev/null +++ b/fac_events/mod.conf @@ -0,0 +1,2 @@ +name = fac_events +depends = fac diff --git a/player_events.lua b/fac_events/player_events.lua similarity index 85% rename from player_events.lua rename to fac_events/player_events.lua index 2aa12f6..bedd553 100644 --- a/player_events.lua +++ b/fac_events/player_events.lua @@ -54,21 +54,20 @@ minetest.register_on_leaveplayer(function(player) end) minetest.register_on_respawnplayer(function(player) - local name = player:get_player_name() - local faction, facname = factions.get_player_faction(name) - if not faction then - return false - else - on_death[name] = nil - if not faction.spawn then - return false - else - player:set_pos(faction.spawn) - return true - end - end - end -) + local name = player:get_player_name() + local faction, facname = factions.get_player_faction(name) + if not faction then + return false + else + on_death[name] = nil + if not faction.spawn then + return false + else + player:set_pos(faction.spawn) + return true + end + end +end) minetest.register_on_dieplayer(function(player) local pname = player:get_player_name() diff --git a/power_events.lua b/fac_events/power_events.lua similarity index 100% rename from power_events.lua rename to fac_events/power_events.lua diff --git a/rank_events.lua b/fac_events/rank_events.lua similarity index 100% rename from rank_events.lua rename to fac_events/rank_events.lua diff --git a/hud.lua b/fac_hud/init.lua similarity index 99% rename from hud.lua rename to fac_hud/init.lua index 0a18a37..c8c9328 100644 --- a/hud.lua +++ b/fac_hud/init.lua @@ -122,3 +122,5 @@ function hudUpdateClaimInfo() end minetest.after(3, hudUpdateClaimInfo) end + +hudUpdateClaimInfo() diff --git a/fac_hud/mod.conf b/fac_hud/mod.conf new file mode 100644 index 0000000..b03d215 --- /dev/null +++ b/fac_hud/mod.conf @@ -0,0 +1 @@ +name = fac_hud diff --git a/nodes.lua b/fac_objects/init.lua similarity index 98% rename from nodes.lua rename to fac_objects/init.lua index addb16e..5b44c39 100644 --- a/nodes.lua +++ b/fac_objects/init.lua @@ -198,7 +198,7 @@ end) local x = math.floor(factions_config.parcel_size / 2.1) -minetest.register_node("factions:display_node", { +minetest.register_node("fac_objects:display_node", { tiles = {"factions_display.png"}, use_texture_alpha = true, walkable = false, @@ -227,12 +227,12 @@ minetest.register_node("factions:display_node", { drop = "", }) -minetest.register_entity("factions:display", { +minetest.register_entity("fac_objects:display", { physical = false, collisionbox = {0, 0, 0, 0, 0, 0}, visual = "wielditem", visual_size = {x = 1.0 / 1.5, y = 1.0 / 1.5}, - textures = {"factions:display_node"}, + textures = {"fac_objects:display_node"}, timer = 0, on_step = function(self, dtime) diff --git a/fac_objects/mod.conf b/fac_objects/mod.conf new file mode 100644 index 0000000..22e9d5d --- /dev/null +++ b/fac_objects/mod.conf @@ -0,0 +1,2 @@ +name = fac_objects +depends = fac diff --git a/textures/factions_display.png b/fac_objects/textures/factions_display.png similarity index 100% rename from textures/factions_display.png rename to fac_objects/textures/factions_display.png diff --git a/textures/license.txt b/fac_objects/textures/license.txt similarity index 100% rename from textures/license.txt rename to fac_objects/textures/license.txt diff --git a/protection_override.lua b/fac_protect/init.lua similarity index 100% rename from protection_override.lua rename to fac_protect/init.lua diff --git a/fac_protect/mod.conf b/fac_protect/mod.conf new file mode 100644 index 0000000..22d222f --- /dev/null +++ b/fac_protect/mod.conf @@ -0,0 +1 @@ +name = fac_protect diff --git a/init.lua b/init.lua deleted file mode 100644 index cb8bc7a..0000000 --- a/init.lua +++ /dev/null @@ -1,19 +0,0 @@ ---!path of mod -factions_modpath = minetest.get_modpath("factions") -dofile (factions_modpath .. "/config.lua") -dofile (factions_modpath .. "/storagedb.lua") -dofile (factions_modpath .. "/databases.lua") -dofile (factions_modpath .. "/eventcallbacks.lua") -dofile (factions_modpath .. "/diplomacy_events.lua") -dofile (factions_modpath .. "/invite_events.lua") -dofile (factions_modpath .. "/player_events.lua") -dofile (factions_modpath .. "/power_events.lua") -dofile (factions_modpath .. "/protection_override.lua") -dofile (factions_modpath .. "/rank_events.lua") -dofile (factions_modpath .. "/hud.lua") -dofile (factions_modpath .. "/claim_events.lua") -dofile (factions_modpath .. "/factions.lua") -dofile (factions_modpath .. "/chatcommands.lua") -dofile (factions_modpath .. "/nodes.lua") -minetest.after(1, hudUpdateClaimInfo) -minetest.after(factions_config.tick_time, factionUpdate) diff --git a/mod.conf b/mod.conf deleted file mode 100644 index 204cf48..0000000 --- a/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = factions -description = Mc style faction system. -optional_depends = colddb diff --git a/modpack.conf b/modpack.conf new file mode 100644 index 0000000..fc2cf80 --- /dev/null +++ b/modpack.conf @@ -0,0 +1 @@ +name = factions