diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml index b251ab5..18088bc 100644 --- a/.github/workflows/luacheck.yml +++ b/.github/workflows/luacheck.yml @@ -1,13 +1,10 @@ name: luacheck on: [push, pull_request] jobs: - build: + luacheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@main - - name: apt - run: sudo apt-get install -y luarocks - - name: luacheck install - run: luarocks install --local luacheck - - name: luacheck run - run: $HOME/.luarocks/bin/luacheck ./ + - name: Checkout + uses: actions/checkout@main + - name: Luacheck + uses: lunarmodules/luacheck@master diff --git a/README.md b/README.md index ee0aaee..da9e643 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,14 @@ # Technic Armor [technic_armor] [![luacheck](https://github.com/mt-mods/technic_armor/workflows/luacheck/badge.svg)](https://github.com/mt-mods/technic_armor/actions) +[![ContentDB](https://content.minetest.net/packages/mt-mods/technic_armor/shields/downloads/)](https://content.minetest.net/packages/mt-mods/technic_armor/) Adds armor made from lead, brass, cast iron, carbon steel, stainless steel, tin and silver. ![](screenshot.png?raw=true) -Textures by @poet-nohit and @numberZero +## License + +Code: LGPL v2.1 + +Textures: WTFPL (by poet-nohit and numberZero) diff --git a/init.lua b/init.lua index 6effa5d..a610468 100644 --- a/init.lua +++ b/init.lua @@ -46,14 +46,7 @@ if minetest.get_modpath("technic_worldgen") then } end -local tin_ingot - -if minetest.registered_items["default:tin_ingot"] then - tin_ingot = "default:tin_ingot" -end - if minetest.get_modpath("moreores") then - tin_ingot = "moreores:tin_ingot" materials.silver = { name = S("Silver"), craft_item = "moreores:silver_ingot", @@ -64,10 +57,10 @@ if minetest.get_modpath("moreores") then } end -if tin_ingot then +if minetest.get_modpath("default") then materials.tin = { name = S("Tin"), - craft_item = tin_ingot, + craft_item = "default:tin_ingot", armor = 1.6, heal = 0, use = 750, diff --git a/textures/technic_armor_boots_brass.png b/textures/technic_armor_boots_brass.png index 1bcd6a3..a92a4f2 100644 Binary files a/textures/technic_armor_boots_brass.png and b/textures/technic_armor_boots_brass.png differ diff --git a/textures/technic_armor_boots_carbon_preview.png b/textures/technic_armor_boots_carbon_preview.png index ae5c1f5..aa19004 100644 Binary files a/textures/technic_armor_boots_carbon_preview.png and b/textures/technic_armor_boots_carbon_preview.png differ diff --git a/textures/technic_armor_boots_cast.png b/textures/technic_armor_boots_cast.png index 2fbec9b..bf53898 100644 Binary files a/textures/technic_armor_boots_cast.png and b/textures/technic_armor_boots_cast.png differ diff --git a/textures/technic_armor_boots_silver.png b/textures/technic_armor_boots_silver.png index 4e0e701..5d2b7d0 100644 Binary files a/textures/technic_armor_boots_silver.png and b/textures/technic_armor_boots_silver.png differ diff --git a/textures/technic_armor_boots_stainless.png b/textures/technic_armor_boots_stainless.png index 649a351..a13ef57 100644 Binary files a/textures/technic_armor_boots_stainless.png and b/textures/technic_armor_boots_stainless.png differ diff --git a/textures/technic_armor_boots_tin.png b/textures/technic_armor_boots_tin.png index c797137..026d532 100644 Binary files a/textures/technic_armor_boots_tin.png and b/textures/technic_armor_boots_tin.png differ diff --git a/textures/technic_armor_chestplate_brass.png b/textures/technic_armor_chestplate_brass.png index 66cdd30..91a697d 100644 Binary files a/textures/technic_armor_chestplate_brass.png and b/textures/technic_armor_chestplate_brass.png differ diff --git a/textures/technic_armor_chestplate_carbon.png b/textures/technic_armor_chestplate_carbon.png index 21747ba..4809337 100644 Binary files a/textures/technic_armor_chestplate_carbon.png and b/textures/technic_armor_chestplate_carbon.png differ diff --git a/textures/technic_armor_chestplate_carbon_preview.png b/textures/technic_armor_chestplate_carbon_preview.png index 3e92c0e..272cc78 100644 Binary files a/textures/technic_armor_chestplate_carbon_preview.png and b/textures/technic_armor_chestplate_carbon_preview.png differ diff --git a/textures/technic_armor_chestplate_cast.png b/textures/technic_armor_chestplate_cast.png index 409f239..5f78658 100644 Binary files a/textures/technic_armor_chestplate_cast.png and b/textures/technic_armor_chestplate_cast.png differ diff --git a/textures/technic_armor_chestplate_lead.png b/textures/technic_armor_chestplate_lead.png index 8a13373..63c00d4 100644 Binary files a/textures/technic_armor_chestplate_lead.png and b/textures/technic_armor_chestplate_lead.png differ diff --git a/textures/technic_armor_chestplate_lead_preview.png b/textures/technic_armor_chestplate_lead_preview.png index dade321..cf491c3 100644 Binary files a/textures/technic_armor_chestplate_lead_preview.png and b/textures/technic_armor_chestplate_lead_preview.png differ diff --git a/textures/technic_armor_chestplate_silver.png b/textures/technic_armor_chestplate_silver.png index 0155edb..f2cb81d 100644 Binary files a/textures/technic_armor_chestplate_silver.png and b/textures/technic_armor_chestplate_silver.png differ diff --git a/textures/technic_armor_chestplate_silver_preview.png b/textures/technic_armor_chestplate_silver_preview.png index cf99a60..2021f9c 100644 Binary files a/textures/technic_armor_chestplate_silver_preview.png and b/textures/technic_armor_chestplate_silver_preview.png differ diff --git a/textures/technic_armor_chestplate_stainless.png b/textures/technic_armor_chestplate_stainless.png index dc6899b..d9818f3 100644 Binary files a/textures/technic_armor_chestplate_stainless.png and b/textures/technic_armor_chestplate_stainless.png differ diff --git a/textures/technic_armor_chestplate_tin.png b/textures/technic_armor_chestplate_tin.png index 20f92eb..9abbc90 100644 Binary files a/textures/technic_armor_chestplate_tin.png and b/textures/technic_armor_chestplate_tin.png differ diff --git a/textures/technic_armor_chestplate_tin_preview.png b/textures/technic_armor_chestplate_tin_preview.png index fe41eb2..91efc62 100644 Binary files a/textures/technic_armor_chestplate_tin_preview.png and b/textures/technic_armor_chestplate_tin_preview.png differ diff --git a/textures/technic_armor_helmet_brass.png b/textures/technic_armor_helmet_brass.png index 013455f..83a376b 100644 Binary files a/textures/technic_armor_helmet_brass.png and b/textures/technic_armor_helmet_brass.png differ diff --git a/textures/technic_armor_helmet_carbon.png b/textures/technic_armor_helmet_carbon.png index 217a8b5..f0c950a 100644 Binary files a/textures/technic_armor_helmet_carbon.png and b/textures/technic_armor_helmet_carbon.png differ diff --git a/textures/technic_armor_helmet_cast.png b/textures/technic_armor_helmet_cast.png index 77ac6c6..ffab382 100644 Binary files a/textures/technic_armor_helmet_cast.png and b/textures/technic_armor_helmet_cast.png differ diff --git a/textures/technic_armor_helmet_lead.png b/textures/technic_armor_helmet_lead.png index f2f92cc..7dcdf6e 100644 Binary files a/textures/technic_armor_helmet_lead.png and b/textures/technic_armor_helmet_lead.png differ diff --git a/textures/technic_armor_helmet_silver.png b/textures/technic_armor_helmet_silver.png index 4248dcd..ec2e98c 100644 Binary files a/textures/technic_armor_helmet_silver.png and b/textures/technic_armor_helmet_silver.png differ diff --git a/textures/technic_armor_helmet_silver_preview.png b/textures/technic_armor_helmet_silver_preview.png index d165021..c5a438a 100644 Binary files a/textures/technic_armor_helmet_silver_preview.png and b/textures/technic_armor_helmet_silver_preview.png differ diff --git a/textures/technic_armor_helmet_stainless.png b/textures/technic_armor_helmet_stainless.png index 7bacd46..b5b08f5 100644 Binary files a/textures/technic_armor_helmet_stainless.png and b/textures/technic_armor_helmet_stainless.png differ diff --git a/textures/technic_armor_helmet_tin.png b/textures/technic_armor_helmet_tin.png index b033d69..36b054d 100644 Binary files a/textures/technic_armor_helmet_tin.png and b/textures/technic_armor_helmet_tin.png differ diff --git a/textures/technic_armor_helmet_tin_preview.png b/textures/technic_armor_helmet_tin_preview.png index 29cd5af..9d63950 100644 Binary files a/textures/technic_armor_helmet_tin_preview.png and b/textures/technic_armor_helmet_tin_preview.png differ diff --git a/textures/technic_armor_inv_chestplate_stainless.png b/textures/technic_armor_inv_chestplate_stainless.png index 4d3a95c..d515035 100644 Binary files a/textures/technic_armor_inv_chestplate_stainless.png and b/textures/technic_armor_inv_chestplate_stainless.png differ diff --git a/textures/technic_armor_inv_shield_brass.png b/textures/technic_armor_inv_shield_brass.png index 8f98432..a5bc9a0 100644 Binary files a/textures/technic_armor_inv_shield_brass.png and b/textures/technic_armor_inv_shield_brass.png differ diff --git a/textures/technic_armor_inv_shield_carbon.png b/textures/technic_armor_inv_shield_carbon.png index 2f2fd6d..2842cc8 100644 Binary files a/textures/technic_armor_inv_shield_carbon.png and b/textures/technic_armor_inv_shield_carbon.png differ diff --git a/textures/technic_armor_inv_shield_cast.png b/textures/technic_armor_inv_shield_cast.png index 2e662c1..d5581c7 100644 Binary files a/textures/technic_armor_inv_shield_cast.png and b/textures/technic_armor_inv_shield_cast.png differ diff --git a/textures/technic_armor_inv_shield_lead.png b/textures/technic_armor_inv_shield_lead.png index 9d0ea35..4deb0ba 100644 Binary files a/textures/technic_armor_inv_shield_lead.png and b/textures/technic_armor_inv_shield_lead.png differ diff --git a/textures/technic_armor_inv_shield_silver.png b/textures/technic_armor_inv_shield_silver.png index a497fe6..e530dee 100644 Binary files a/textures/technic_armor_inv_shield_silver.png and b/textures/technic_armor_inv_shield_silver.png differ diff --git a/textures/technic_armor_inv_shield_stainless.png b/textures/technic_armor_inv_shield_stainless.png index 46122ac..fc44de9 100644 Binary files a/textures/technic_armor_inv_shield_stainless.png and b/textures/technic_armor_inv_shield_stainless.png differ diff --git a/textures/technic_armor_inv_shield_tin.png b/textures/technic_armor_inv_shield_tin.png index 03137bb..7925b7b 100644 Binary files a/textures/technic_armor_inv_shield_tin.png and b/textures/technic_armor_inv_shield_tin.png differ diff --git a/textures/technic_armor_leggings_brass.png b/textures/technic_armor_leggings_brass.png index d93c8f6..6a43e9f 100644 Binary files a/textures/technic_armor_leggings_brass.png and b/textures/technic_armor_leggings_brass.png differ diff --git a/textures/technic_armor_leggings_carbon_preview.png b/textures/technic_armor_leggings_carbon_preview.png index 1ca9412..eb3d988 100644 Binary files a/textures/technic_armor_leggings_carbon_preview.png and b/textures/technic_armor_leggings_carbon_preview.png differ diff --git a/textures/technic_armor_leggings_cast.png b/textures/technic_armor_leggings_cast.png index f77e1be..ab2f152 100644 Binary files a/textures/technic_armor_leggings_cast.png and b/textures/technic_armor_leggings_cast.png differ diff --git a/textures/technic_armor_leggings_lead_preview.png b/textures/technic_armor_leggings_lead_preview.png index ed1dd37..9478ae4 100644 Binary files a/textures/technic_armor_leggings_lead_preview.png and b/textures/technic_armor_leggings_lead_preview.png differ diff --git a/textures/technic_armor_leggings_silver.png b/textures/technic_armor_leggings_silver.png index 5ed134d..0da287c 100644 Binary files a/textures/technic_armor_leggings_silver.png and b/textures/technic_armor_leggings_silver.png differ diff --git a/textures/technic_armor_leggings_stainless.png b/textures/technic_armor_leggings_stainless.png index f1e643d..1839175 100644 Binary files a/textures/technic_armor_leggings_stainless.png and b/textures/technic_armor_leggings_stainless.png differ diff --git a/textures/technic_armor_leggings_tin.png b/textures/technic_armor_leggings_tin.png index 6906a62..5063e78 100644 Binary files a/textures/technic_armor_leggings_tin.png and b/textures/technic_armor_leggings_tin.png differ diff --git a/textures/technic_armor_shield_brass.png b/textures/technic_armor_shield_brass.png index d88e7b3..3d53fc9 100644 Binary files a/textures/technic_armor_shield_brass.png and b/textures/technic_armor_shield_brass.png differ diff --git a/textures/technic_armor_shield_brass_preview.png b/textures/technic_armor_shield_brass_preview.png index 4eb2af6..3951fc5 100644 Binary files a/textures/technic_armor_shield_brass_preview.png and b/textures/technic_armor_shield_brass_preview.png differ diff --git a/textures/technic_armor_shield_carbon.png b/textures/technic_armor_shield_carbon.png index 3a5aa08..55153f3 100644 Binary files a/textures/technic_armor_shield_carbon.png and b/textures/technic_armor_shield_carbon.png differ diff --git a/textures/technic_armor_shield_carbon_preview.png b/textures/technic_armor_shield_carbon_preview.png index cd75eed..c073629 100644 Binary files a/textures/technic_armor_shield_carbon_preview.png and b/textures/technic_armor_shield_carbon_preview.png differ diff --git a/textures/technic_armor_shield_cast.png b/textures/technic_armor_shield_cast.png index c2b4fd6..8d09e00 100644 Binary files a/textures/technic_armor_shield_cast.png and b/textures/technic_armor_shield_cast.png differ diff --git a/textures/technic_armor_shield_cast_preview.png b/textures/technic_armor_shield_cast_preview.png index db0aee0..aa8d60f 100644 Binary files a/textures/technic_armor_shield_cast_preview.png and b/textures/technic_armor_shield_cast_preview.png differ diff --git a/textures/technic_armor_shield_silver.png b/textures/technic_armor_shield_silver.png index bdd8038..d7f5e96 100644 Binary files a/textures/technic_armor_shield_silver.png and b/textures/technic_armor_shield_silver.png differ diff --git a/textures/technic_armor_shield_silver_preview.png b/textures/technic_armor_shield_silver_preview.png index 16f725a..094d56e 100644 Binary files a/textures/technic_armor_shield_silver_preview.png and b/textures/technic_armor_shield_silver_preview.png differ diff --git a/textures/technic_armor_shield_stainless.png b/textures/technic_armor_shield_stainless.png index 3dc2dd7..dee4f05 100644 Binary files a/textures/technic_armor_shield_stainless.png and b/textures/technic_armor_shield_stainless.png differ diff --git a/textures/technic_armor_shield_stainless_preview.png b/textures/technic_armor_shield_stainless_preview.png index ced3e9e..d3a6dd3 100644 Binary files a/textures/technic_armor_shield_stainless_preview.png and b/textures/technic_armor_shield_stainless_preview.png differ diff --git a/textures/technic_armor_shield_tin.png b/textures/technic_armor_shield_tin.png index e005ef2..9a17586 100644 Binary files a/textures/technic_armor_shield_tin.png and b/textures/technic_armor_shield_tin.png differ diff --git a/textures/technic_armor_shield_tin_preview.png b/textures/technic_armor_shield_tin_preview.png index e707df2..0b7a2d9 100644 Binary files a/textures/technic_armor_shield_tin_preview.png and b/textures/technic_armor_shield_tin_preview.png differ