diff options
| -rw-r--r-- | advtrains/init.lua | 4 | ||||
| -rw-r--r-- | advtrains/misc_nodes.lua | 6 | ||||
| -rw-r--r-- | advtrains/mod.conf | 4 | ||||
| -rw-r--r-- | advtrains/wagons.lua | 1 | ||||
| -rw-r--r-- | advtrains_interlocking/init.lua | 2 | ||||
| -rw-r--r-- | advtrains_line_automation/init.lua | 2 | ||||
| -rw-r--r-- | advtrains_line_automation/line_editor.lua | 4 | ||||
| -rw-r--r-- | advtrains_line_automation/line_functions.lua | 2 | ||||
| -rw-r--r-- | advtrains_line_automation/station_announcement.lua | 2 | ||||
| -rw-r--r-- | advtrains_line_automation/station_editor.lua | 4 | ||||
| -rw-r--r-- | advtrains_signals_ks/init.lua | 2 | ||||
| -rw-r--r-- | advtrains_train_track/init.lua | 3 | ||||
| -rw-r--r-- | serialize_lib/init.lua | 3 | ||||
| -rw-r--r-- | serialize_lib/mod.conf | 1 |
14 files changed, 8 insertions, 32 deletions
diff --git a/advtrains/init.lua b/advtrains/init.lua index 82c3bbb..9019571 100644 --- a/advtrains/init.lua +++ b/advtrains/init.lua @@ -1,4 +1,3 @@ -ch_base.open_mod(minetest.get_current_modname()) --[[ Advanced Trains - Minetest Mod @@ -156,7 +155,6 @@ end atwarn=function(t, ...) local text=advtrains.print_concat_table({t, ...}) minetest.log("warning", "[advtrains]"..text) - ch_core.systemovy_kanal("Administrace", "[advtrains] -!- "..text) end sid=function(id) if id then return string.sub(id, -6) end end @@ -165,7 +163,6 @@ sid=function(id) if id then return string.sub(id, -6) end end atdebug=function(t, ...) local text=advtrains.print_concat_table({t, ...}) minetest.log("action", "[advtrains]"..text) - ch_core.systemovy_kanal("Administrace", "[advtrains] "..text) end if minetest.settings:get_bool("advtrains_enable_debugging") then @@ -825,4 +822,3 @@ end local tot=(os.clock()-lot)*1000 minetest.log("action", "[advtrains] Loaded in "..tot.."ms") -ch_base.close_mod(minetest.get_current_modname()) diff --git a/advtrains/misc_nodes.lua b/advtrains/misc_nodes.lua index ea54873..6f4f452 100644 --- a/advtrains/misc_nodes.lua +++ b/advtrains/misc_nodes.lua @@ -148,12 +148,6 @@ function advtrains.register_platform(modprefix, preset, use_full_nodename) end end -for _, material in ipairs(ch_core.get_materials_from_shapes_db("advtrains")) do - if minetest.registered_nodes[material] then - advtrains.register_platform("advtrains", material) - end -end - -- advtrains.register_platform("advtrains", "default:stonebrick") -- advtrains.register_platform("advtrains", "default:sandstonebrick") diff --git a/advtrains/mod.conf b/advtrains/mod.conf index 1a16161..7e15c1c 100644 --- a/advtrains/mod.conf +++ b/advtrains/mod.conf @@ -3,5 +3,5 @@ title=Advanced Trains Core description=Core system for realistic trains in Minetest author=orwell96 -depends=ch_core,serialize_lib -optional_depends=mesecons,mesecons_switch,digtron,moretrees,ebony,cherrytree,chestnuttree,plumtree,willow,darkage,basic_materials,building_blocks,technic_worldgen,wielded_light +depends=serialize_lib +optional_depends=mesecons,mesecons_switch,digtron,moretrees,wielded_light diff --git a/advtrains/wagons.lua b/advtrains/wagons.lua index 79a314f..15e0c61 100644 --- a/advtrains/wagons.lua +++ b/advtrains/wagons.lua @@ -1400,7 +1400,6 @@ function advtrains.register_wagon(sysname_p, prototype, desc, inv_img, nincreati if not string.match(sysname, ":") then sysname = "advtrains:"..sysname_p end - ch_core.upgrade_entity_properties(prototype, {keep_fields = false, base_properties = wagon_base_initial_properties}) if prototype.initial_properties ~= nil then local ip = prototype.initial_properties if ip.selectionbox == nil or ip.selectionbox.rotate == nil then diff --git a/advtrains_interlocking/init.lua b/advtrains_interlocking/init.lua index 596641e..e11ffa2 100644 --- a/advtrains_interlocking/init.lua +++ b/advtrains_interlocking/init.lua @@ -1,4 +1,3 @@ -ch_base.open_mod(minetest.get_current_modname()) -- Advtrains interlocking system -- See database.lua for a detailed explanation @@ -32,4 +31,3 @@ dofile(modpath.."tsr_rail.lua") minetest.register_privilege("interlocking", {description = "Can set up track sections, routes and signals.", give_to_singleplayer = true}) -ch_base.close_mod(minetest.get_current_modname()) diff --git a/advtrains_line_automation/init.lua b/advtrains_line_automation/init.lua index 65631a9..9de25fb 100644 --- a/advtrains_line_automation/init.lua +++ b/advtrains_line_automation/init.lua @@ -1,4 +1,3 @@ -ch_base.open_mod(minetest.get_current_modname()) -- Advtrains line automation system advtrains.lines = { @@ -50,4 +49,3 @@ function advtrains.lines.step(dtime) advtrains.lines.rwt.step(dtime) advtrains.lines.sched.run() end -ch_base.close_mod(minetest.get_current_modname()) diff --git a/advtrains_line_automation/line_editor.lua b/advtrains_line_automation/line_editor.lua index 54f683d..33686d1 100644 --- a/advtrains_line_automation/line_editor.lua +++ b/advtrains_line_automation/line_editor.lua @@ -1,6 +1,6 @@ local def local F = minetest.formspec_escape -local ifthenelse = ch_core.ifthenelse +local ifthenelse = function(cond, a, b) if cond then return a else return b end end local max_stations = 60 @@ -850,7 +850,7 @@ end def = { -- params = "", description = "Otevře editor variant linek", - privs = {ch_registered_player = true, railway_operator = true}, + privs = {railway_operator = true}, func = function(player_name, param) show_editor_formspec(minetest.get_player_by_name(player_name)) end, } core.register_chatcommand("linky", def) diff --git a/advtrains_line_automation/line_functions.lua b/advtrains_line_automation/line_functions.lua index ce24ab4..ee8f238 100644 --- a/advtrains_line_automation/line_functions.lua +++ b/advtrains_line_automation/line_functions.lua @@ -1323,7 +1323,7 @@ core.register_chatcommand("vlaky", def) def = { params = "[linka]", description = "Vypíše všechny linkové vlaky na zadané lince (resp. na všech linkách) a ty, které nedávno jízdu na lince ukončily", - privs = {ch_registered_player = true}, + privs = {}, func = function(player_name, param) local result = vlaky(param, true) if #result == 0 then diff --git a/advtrains_line_automation/station_announcement.lua b/advtrains_line_automation/station_announcement.lua index c4ee162..3f9956c 100644 --- a/advtrains_line_automation/station_announcement.lua +++ b/advtrains_line_automation/station_announcement.lua @@ -1,6 +1,6 @@ local al = advtrains.lines local F = core.formspec_escape -local ifthenelse = assert(ch_core.ifthenelse) +local ifthenelse = function(cond, a, b) if cond then return a else return b end end local rwt = assert(advtrains.lines.rwt) local def local function CF(s) diff --git a/advtrains_line_automation/station_editor.lua b/advtrains_line_automation/station_editor.lua index 37afa92..ceeeffe 100644 --- a/advtrains_line_automation/station_editor.lua +++ b/advtrains_line_automation/station_editor.lua @@ -1,6 +1,6 @@ local def local F = minetest.formspec_escape -local ifthenelse = ch_core.ifthenelse +local ifthenelse = function(cond, a, b) if cond then return a else return b end end local rwt = assert(advtrains.lines.rwt) local function load_stations() @@ -468,7 +468,7 @@ advtrains.lines.open_station_editor = show_formspec def = { -- params = "", description = "Otevře editor dopraven (stanic, zastávek a odboček)", - privs = {ch_registered_player = true}, + privs = {}, func = function(player_name, param) show_formspec(minetest.get_player_by_name(player_name)) end, } core.register_chatcommand("zastavky", def) diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua index 3c11770..1f89da9 100644 --- a/advtrains_signals_ks/init.lua +++ b/advtrains_signals_ks/init.lua @@ -1,4 +1,3 @@ -ch_base.open_mod(minetest.get_current_modname()) -- Ks signals -- Can display main aspects (no Zs) + Sht @@ -769,4 +768,3 @@ minetest.register_craft{ output = "advtrains_signals_ks:sign_lf7_8_0 1", recipe = {{"advtrains_signals_ks:sign_lf_8_0"}} } -ch_base.close_mod(minetest.get_current_modname()) diff --git a/advtrains_train_track/init.lua b/advtrains_train_track/init.lua index 3b93fdb..608a8eb 100644 --- a/advtrains_train_track/init.lua +++ b/advtrains_train_track/init.lua @@ -1,4 +1,3 @@ -ch_base.open_mod(minetest.get_current_modname()) -- Default tracks for advtrains -- (c) orwell96 and contributors @@ -1279,5 +1278,3 @@ minetest.register_lbm({ action = function(pos, node, active_object_count, active_object_count_wider) minetest.set_node(pos, {name="advtrains:dtrack_st_45", param2=node.param2}) end, }) end - -ch_base.close_mod(minetest.get_current_modname()) diff --git a/serialize_lib/init.lua b/serialize_lib/init.lua index ac80151..3a65414 100644 --- a/serialize_lib/init.lua +++ b/serialize_lib/init.lua @@ -1,4 +1,3 @@ -ch_base.open_mod(minetest.get_current_modname()) -- serialize_lib --[[ Copyright (C) 2020 Moritz Blei (orwell96) and contributors @@ -74,5 +73,3 @@ function serialize_lib.write_table_to_file(root_table, filename) end return true end - -ch_base.close_mod(minetest.get_current_modname()) diff --git a/serialize_lib/mod.conf b/serialize_lib/mod.conf index afc9b37..a2fd6bb 100644 --- a/serialize_lib/mod.conf +++ b/serialize_lib/mod.conf @@ -2,4 +2,3 @@ name=serialize_lib title=Lua Serialization Library description=A library to efficiently write and read Lua tables to/from a file, with support for atomic operations author=orwell96 -depends = ch_base |