From 8a5b5d9134679265bb315592ff3b294ea5ce23b8 Mon Sep 17 00:00:00 2001 From: wsor4035 <24964441+wsor4035@users.noreply.github.com> Date: Sun, 25 Feb 2024 00:32:05 -0500 Subject: [PATCH] add in xcompat for game agnostic handling dry --- .gitmodules | 3 -- .luacheckrc | 2 +- crafts.lua | 132 +------------------------------------------------ mod.conf | 1 + nodes.lua | 2 +- sound_api_core | 1 - 6 files changed, 4 insertions(+), 137 deletions(-) delete mode 100644 .gitmodules delete mode 160000 sound_api_core diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 55d4b48..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "sound_api_core"] - path = sound_api_core - url = https://github.com/mt-mods/sound_api_core.git diff --git a/.luacheckrc b/.luacheckrc index c1a52ae..1dabf67 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -3,5 +3,5 @@ globals = { } read_globals = { - "default", + "default", "xcompat", } \ No newline at end of file diff --git a/crafts.lua b/crafts.lua index 2a70edb..0f24e11 100644 --- a/crafts.lua +++ b/crafts.lua @@ -1,134 +1,4 @@ -local materials = { - dirt = "default:dirt", - sand = "default:sand", - gravel = "default:gravel", - copper_ingot = "default:copper_ingot", - steel_ingot = "default:steel_ingot", - gold_ingot = "default:gold_ingot", - tin_ingot = "default:tin_ingot", - mese_crystal_fragment = "default:mese_crystal_fragment", - torch = "default:torch", - diamond = "default:diamond", - clay_lump = "default:clay_lump", - water_bucket = "bucket:bucket_water", - empty_bucket = "bucket:bucket_empty", - dye_dark_grey = "dye:dark_grey", -} - -if minetest.get_modpath("moreores") then - materials.silver_ingot = "moreores:silver_ingot" -end - -if minetest.get_modpath("technic") then - materials.lead_ingot = "technic:lead_ingot" - materials.carbon_steel_ingot = "technic:carbon_steel_ingot" - materials.stainless_steel_ingot = "technic:stainless_steel_ingot" -end - -if minetest.get_modpath("aloz") then - materials.aluminum_ingot = "aloz:aluminum_ingot" -end - -if minetest.get_modpath("techage") then - materials.aluminum_ingot = "techage:aluminum" -end - -if minetest.get_modpath("mcl_core") then - materials = { - dirt = "mcl_core:dirt", - sand = "mcl_core:sand", - gravel = "mcl_core:gravel", - steel_ingot = "mcl_core:iron_ingot", - gold_ingot = "mcl_core:gold_ingot", - mese_crystal_fragment = "mesecons:redstone", - torch = "mcl_torches:torch", - diamond = "mcl_core:diamond", - clay_lump = "mcl_core:clay_lump", - water_bucket = "mcl_buckets:bucket_water", - empty_bucket = "mcl_buckets:bucket_empty", - dye_dark_grey = "mcl_dye:dark_grey", - -- Use iron where no equivalent - copper_ingot = "mcl_core:iron_ingot", - tin_ingot = "mcl_core:iron_ingot", - silver_ingot = "mcl_core:iron_ingot", - } - if minetest.get_modpath("mcl_copper") then - materials.copper_ingot = "mcl_copper:copper_ingot" - end -elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then - materials = { - dirt = "fl_topsoil:dirt", - sand = "fl_stone:sand", - gravel = "fl_topsoil:gravel", - steel_ingot = "fl_ores:iron_ingot", - gold_ingot = "fl_ores:gold_ingot", - mese_crystal_fragment = "fl_ores:iron_ingot", - torch = "fl_light_sources:torch", - diamond = "fl_ores:diamond", - clay_lump = "fl_bricks:clay_lump", - water_bucket = "fl_bucket:bucket_water", - empty_bucket = "fl_bucket:bucket", - dye_dark_grey = "fl_dyes:dark_grey_dye", - copper_ingot = "fl_ores:copper_ingot", - tin_ingot = "fl_ores:tin_ingot", - silver_ingot = "fl_ores:iron_ingot", - } -elseif minetest.get_modpath("rp_default") then - materials = { - dirt = "rp_default:dirt", - sand = "rp_default:sand", - gravel = "rp_default:gravel", - steel_ingot = "rp_default:ingot_steel", - gold_ingot = "rp_default:ingot_gold", - mese_crystal_fragment = "rp_default:ingot_steel", - torch = "rp_default:torch", - diamond = "rp_default:pearl", - clay_lump = "rp_default:ingot_steel", - water_bucket = "rp_default:swamp_dirt", - empty_bucket = "rp_default:dirt", - dye_dark_grey = "rp_default:ingot_steel", - copper_ingot = "rp_default:ingot_copper", - tin_ingot = "rp_default:ingot_tin", - silver_ingot = "rp_default:ingot_steel", - } -elseif minetest.get_modpath("hades_core") then - materials = { - dirt = "hades_core:dirt", - sand = "hades_core:fertile_sand", - gravel = "hades_core:gravel", - steel_ingot = "hades_core:steel_ingot", - gold_ingot = "hades_core:gold_ingot", - mese_crystal_fragment = "hades_core:mese_crystal_fragment", - torch = "hades_torches:torch", - diamond = "hades_core:diamond", - clay_lump = "hades_core:clay_lump", - dye_dark_grey = "hades_dye:dark_grey", - copper_ingot = "hades_core:copper_ingot", - tin_ingot = "hades_core:tin_ingot", - --[[ - Since hades doesnt have buckets or water for the user, - using dirt from near water to pull the water out - ]] - water_bucket = "hades_core:dirt", - empty_bucket = "hades_core:fertile_sand", - -- Set this to steel unless hadesextraores is present - silver_ingot = "hades_core:steel_ingot", - } - - if minetest.get_modpath("hades_bucket") then - materials["water_bucket"] = "hades_bucket:bucket_water" - materials["empty_bucket"] = "hades_bucket:bucket_empty" - end - if minetest.get_modpath("hades_extraores") then - materials["silver_ingot"] = "hades_extraores:silver_ingot" - materials["aluminum_ingot"] = "hades_extraores:aluminum_ingot" - end - if minetest.get_modpath("hades_technic") then - materials.lead_ingot = "hades_technic:lead_ingot" - materials.carbon_steel_ingot = "hades_technic:carbon_steel_ingot" - materials.stainless_steel_ingot = "hades_technic:stainless_steel_ingot" - end -end +local materials = xcompat.materials local have_hades_materials = minetest.get_modpath("hades_materials") diff --git a/mod.conf b/mod.conf index 587dc15..d14197b 100644 --- a/mod.conf +++ b/mod.conf @@ -1,3 +1,4 @@ name = basic_materials +depends = xcompat optional_depends = moreores, default, mesecons_materials, dye, bucket, fl_stone, fl_trees, mcl_sounds, hades_core, hades_sounds, hades_materials, hades_dye, hades_bucket, hades_extraores, hades_mesecons_materials, aloz, rp_crafting, mcl_core, mcl_copper min_minetest_version = 5.2.0 diff --git a/nodes.lua b/nodes.lua index ef10f43..c8aeee1 100644 --- a/nodes.lua +++ b/nodes.lua @@ -1,5 +1,5 @@ local S = minetest.get_translator("basic_materials") -local sound_api = dofile(basic_materials.modpath .. "/sound_api_core/init.lua") +local sound_api = xcompat.sounds local chains_sbox = {type = "fixed",fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 }} minetest.register_node("basic_materials:cement_block", { diff --git a/sound_api_core b/sound_api_core deleted file mode 160000 index 6956e49..0000000 --- a/sound_api_core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6956e49e775f325116f8e0c643899c089c691e1e