diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 0000000..eec3dad --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,141 @@ +read_globals = { + "DIR_DELIM", "INIT", + + "minetest", "core", + "dump", "dump2", + + "Raycast", + "Settings", + "PseudoRandom", + "PerlinNoise", + "VoxelManip", + "SecureRandom", + "VoxelArea", + "PerlinNoiseMap", + "PcgRandom", + "ItemStack", + "AreaStore", + + "vector", + + table = { + fields = { + "copy", + "indexof", + "insert_all", + "key_value_swap", + "shuffle", + } + }, + + string = { + fields = { + "split", + "trim", + } + }, + + math = { + fields = { + "hypot", + "sign", + "factorial" + } + }, + + -- external mods + "default", + "armor", + "player_ui", + "sfinv", + "player_api", + "tubelib", + + fluid_tanks = { + fields = { + "register_tank" + }, + }, + + bucket = { + fields = { + "register_liquid", + "liquids", + "get_liquid_for_bucket", + } + }, + + fluid_lib = { + fields = { + "unit", + "transfer_timer_tick", + "refresh_node", + "register_transfer_node", + "register_extractor_node", + "register_node", + "get_buffer_data", + "get_node_buffers", + "insert_into_buffer", + "can_take_from_buffer", + "take_from_buffer", + "can_insert_into_buffer", + "buffer_accepts_fluid", + "cleanse_node_description", + "buffer_to_string", + "comma_value", + "cleanse_node_name" + }, + }, +} +globals = { + ele = { + fields = { + external = { + fields = { + "ref", + "ing", + "tools", + "armor", + "sounds", + "graphic", + "conduit_dirt_with_grass", + "conduit_dirt_with_dry_grass", + "conduit_stone_block", + "conduit_stone_block_desert", + } + }, + "graphcache", + "clear_networks", + "modpath", + "unit", + "unit_description", + "formspec", + "helpers", + "default", + "tools", + "gases", + "capacity_text", + "get_gas_for_container", + "register_conduit", + "register_gas", + "register_base_device", + "register_machine", + "register_fluid_generator", + "register_wind_generator", + "register_tool" + } + }, + + -- elepower components + "elepd", + "elefarm", + "elepower_lighting", + "elepm", + "elemining", + "elenuclear", + "elesolar", + "elethermal", + "eletome", + "eletool", + "elewi" +} diff --git a/elepower_dynamics/compat/basic_materials.lua b/elepower_compat/basic_materials.lua similarity index 86% rename from elepower_dynamics/compat/basic_materials.lua rename to elepower_compat/basic_materials.lua index c8aee6e..b880b7c 100644 --- a/elepower_dynamics/compat/basic_materials.lua +++ b/elepower_compat/basic_materials.lua @@ -27,29 +27,28 @@ if minetest.get_modpath("basic_materials") == nil then minetest.register_alias("homedecor:empty_spool", "basic_materials:empty_spool") minetest.register_craftitem(":basic_materials:plastic_sheet", { - description = "Plastic Sheet", - inventory_image = "elepower_bm_plastic_sheet.png", + description = "Plastic Sheet", + inventory_image = "elepower_bm_plastic_sheet.png", }) - + minetest.register_craftitem(":basic_materials:plastic_strip", { description = "Plastic Strips", groups = { strip = 1 }, inventory_image = "elepower_bm_strip.png^[colorize:#ffffff:200", }) - + minetest.register_craftitem(":basic_materials:empty_spool", { description = "Empty wire spool", inventory_image = "elepower_bm_empty_spool.png" }) - minetest.register_craft( { output = "basic_materials:plastic_strip 9", recipe = { { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) - + minetest.register_craft( { output = "basic_materials:empty_spool 3", recipe = { @@ -73,33 +72,33 @@ if minetest.get_modpath("basic_materials") == nil then }) minetest.register_craft({ - type = "cooking", - output = "basic_materials:paraffin", - recipe = "basic_materials:oil_extract", + type = "cooking", + output = "basic_materials:paraffin", + recipe = "basic_materials:oil_extract", }) minetest.register_craft({ - type = "cooking", - output = "basic_materials:plastic_sheet", - recipe = "basic_materials:paraffin", + type = "cooking", + output = "basic_materials:plastic_sheet", + recipe = "basic_materials:paraffin", }) minetest.register_craft({ - type = "fuel", - recipe = "basic_materials:oil_extract", - burntime = 30, + type = "fuel", + recipe = "basic_materials:oil_extract", + burntime = 30, }) minetest.register_craft({ - type = "fuel", - recipe = "basic_materials:paraffin", - burntime = 30, + type = "fuel", + recipe = "basic_materials:paraffin", + burntime = 30, }) minetest.register_craft({ - type = "fuel", - recipe = "basic_materials:plastic_sheet", - burntime = 30, + type = "fuel", + recipe = "basic_materials:plastic_sheet", + burntime = 30, }) ---------- @@ -121,8 +120,8 @@ if minetest.get_modpath("basic_materials") == nil then "basic_materials:empty_spool", }, }) - - minetest.register_craftitem(":basic_materials:silver_wire", { + + minetest.register_craftitem(":basic_materials:silver_wire", { description = "Silver Wire", inventory_image = "elepower_bm_silver_wire.png", groups = {copper = 1, wire = 1, component = 1} @@ -137,13 +136,13 @@ if minetest.get_modpath("basic_materials") == nil then "basic_materials:empty_spool", }, }) - + --------------------- -- Heating Element -- - --------------------- + --------------------- minetest.register_craftitem(":basic_materials:heating_element", { - description = "Heating element", - inventory_image = "elepower_bm_heating_element.png", + description = "Heating element", + inventory_image = "elepower_bm_heating_element.png", }) minetest.register_craft( { @@ -195,19 +194,19 @@ if minetest.get_modpath("basic_materials") == nil then ----------- -- STEEL -- ----------- - + minetest.register_craftitem(":basic_materials:steel_strip", { description = "Steel Strip", groups = { strip = 1 }, inventory_image = "elepower_bm_strip.png^[multiply:#ffffff" }) - + minetest.register_craftitem(":basic_materials:steel_wire", { description = "Spool of steel wire", groups = { wire = 1 }, inventory_image = "elepower_bm_steel_wire.png" }) - + minetest.register_craft( { output = "basic_materials:steel_wire 2", type = "shapeless", @@ -225,20 +224,18 @@ if minetest.get_modpath("basic_materials") == nil then { epi.steel_ingot, "", "" }, }, }) - else - minetest.clear_craft({output = "basic_materials:brass_ingot"}) - - local steel_strip_def = table.copy(minetest.registered_items["basic_materials:steel_strip"]) + minetest.clear_craft({output = "basic_materials:brass_ingot"}) + + local steel_strip_def = table.copy(minetest.registered_items["basic_materials:steel_strip"]) steel_strip_def.inventory_image = "elepower_bm_strip.png^[multiply:#ffffff" minetest.register_craftitem(":basic_materials:steel_strip", steel_strip_def) - - local copper_strip_def = table.copy(minetest.registered_items["basic_materials:copper_strip"]) + + local copper_strip_def = table.copy(minetest.registered_items["basic_materials:copper_strip"]) copper_strip_def.inventory_image = "elepower_bm_strip.png^[multiply:#fcb15f" minetest.register_craftitem(":basic_materials:copper_strip", copper_strip_def) - - local plastic_strip_def = table.copy(minetest.registered_items["basic_materials:plastic_strip"]) + + local plastic_strip_def = table.copy(minetest.registered_items["basic_materials:plastic_strip"]) plastic_strip_def.inventory_image = "elepower_bm_strip.png^[colorize:#ffffff:200" minetest.register_craftitem(":basic_materials:plastic_strip", plastic_strip_def) - end diff --git a/elepower_compat/init.lua b/elepower_compat/init.lua new file mode 100644 index 0000000..9449799 --- /dev/null +++ b/elepower_compat/init.lua @@ -0,0 +1,3 @@ +local modpath = minetest.get_modpath(minetest.get_current_modname()) + +dofile(modpath.."/basic_materials.lua") diff --git a/elepower_compat/mod.conf b/elepower_compat/mod.conf new file mode 100644 index 0000000..edc7678 --- /dev/null +++ b/elepower_compat/mod.conf @@ -0,0 +1,4 @@ +name = elepower_compat +description = Elepower Built-in Compatibility Service +depends = elepower_papi +optional_depends = default,moreores,basic_materials,dye diff --git a/elepower_dynamics/textures/elepower_bm_copper_wire.png b/elepower_compat/textures/elepower_bm_copper_wire.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_copper_wire.png rename to elepower_compat/textures/elepower_bm_copper_wire.png diff --git a/elepower_dynamics/textures/elepower_bm_empty_spool.png b/elepower_compat/textures/elepower_bm_empty_spool.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_empty_spool.png rename to elepower_compat/textures/elepower_bm_empty_spool.png diff --git a/elepower_dynamics/textures/elepower_bm_heating_element.png b/elepower_compat/textures/elepower_bm_heating_element.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_heating_element.png rename to elepower_compat/textures/elepower_bm_heating_element.png diff --git a/elepower_dynamics/textures/elepower_bm_motor.png b/elepower_compat/textures/elepower_bm_motor.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_motor.png rename to elepower_compat/textures/elepower_bm_motor.png diff --git a/elepower_dynamics/textures/elepower_bm_oil_extract.png b/elepower_compat/textures/elepower_bm_oil_extract.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_oil_extract.png rename to elepower_compat/textures/elepower_bm_oil_extract.png diff --git a/elepower_dynamics/textures/elepower_bm_paraffin.png b/elepower_compat/textures/elepower_bm_paraffin.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_paraffin.png rename to elepower_compat/textures/elepower_bm_paraffin.png diff --git a/elepower_dynamics/textures/elepower_bm_plastic_sheet.png b/elepower_compat/textures/elepower_bm_plastic_sheet.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_plastic_sheet.png rename to elepower_compat/textures/elepower_bm_plastic_sheet.png diff --git a/elepower_dynamics/textures/elepower_bm_silicon.png b/elepower_compat/textures/elepower_bm_silicon.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_silicon.png rename to elepower_compat/textures/elepower_bm_silicon.png diff --git a/elepower_dynamics/textures/elepower_bm_silver_wire.png b/elepower_compat/textures/elepower_bm_silver_wire.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_silver_wire.png rename to elepower_compat/textures/elepower_bm_silver_wire.png diff --git a/elepower_dynamics/textures/elepower_bm_steel_wire.png b/elepower_compat/textures/elepower_bm_steel_wire.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_steel_wire.png rename to elepower_compat/textures/elepower_bm_steel_wire.png diff --git a/elepower_dynamics/textures/elepower_bm_strip.png b/elepower_compat/textures/elepower_bm_strip.png similarity index 100% rename from elepower_dynamics/textures/elepower_bm_strip.png rename to elepower_compat/textures/elepower_bm_strip.png diff --git a/elepower_dynamics/compat/init.lua b/elepower_dynamics/compat/init.lua deleted file mode 100644 index 4cd1b4d..0000000 --- a/elepower_dynamics/compat/init.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Elepower Compatibility registrations - -dofile(elepd.modpath.."/compat/basic_materials.lua") diff --git a/elepower_dynamics/init.lua b/elepower_dynamics/init.lua index 350ea26..f3ceeb1 100644 --- a/elepower_dynamics/init.lua +++ b/elepower_dynamics/init.lua @@ -8,7 +8,6 @@ elepd.modpath = modpath dofile(modpath.."/conduits.lua") dofile(modpath.."/craftitems.lua") -dofile(modpath.."/compat/init.lua") dofile(modpath.."/tools.lua") dofile(modpath.."/nodes.lua") dofile(modpath.."/fluids.lua") diff --git a/elepower_dynamics/mod.conf b/elepower_dynamics/mod.conf index 3c36625..894f38e 100644 --- a/elepower_dynamics/mod.conf +++ b/elepower_dynamics/mod.conf @@ -1,4 +1,4 @@ name = elepower_dynamics description = Elepower Dynamics. Conduits and materials! -depends = elepower_papi,default,fluid_tanks -optional_depends = moreores,basic_materials,dye +depends = elepower_papi,default,fluid_tanks,fluid_transfer +optional_depends = moreores,basic_materials,dye,elepower_compat diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua index 127c592..fa03887 100644 --- a/elepower_machines/crafting.lua +++ b/elepower_machines/crafting.lua @@ -178,7 +178,7 @@ for mat, ingot in pairs(ingot_map) do elepm.register_craft({ type = "grind", recipe = { plate.item }, - output = dust.item.." 2", + output = dust.item, time = 6, }) end