From f341d63b0122588f33d271935d444c2b30129169 Mon Sep 17 00:00:00 2001 From: ROllerozxa Date: Sun, 29 May 2022 21:18:31 +0200 Subject: [PATCH 1/2] Remove unused duplicate mortar textures (#9) --- init.lua | 6 +++--- textures/unifiedbricks_brickblock.png | Bin 118 -> 110 bytes textures/unifiedbricks_clayblock.png | Bin 389 -> 264 bytes textures/unifiedbricks_mortar.png | Bin 247 -> 170 bytes textures/unifiedbricks_mortar2.png | Bin 247 -> 0 bytes textures/unifiedbricks_mortar3.png | Bin 247 -> 0 bytes textures/unifiedbricks_mortar4.png | Bin 247 -> 0 bytes 7 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 textures/unifiedbricks_mortar2.png delete mode 100644 textures/unifiedbricks_mortar3.png delete mode 100644 textures/unifiedbricks_mortar4.png diff --git a/init.lua b/init.lua index de71175..cf8b7ff 100644 --- a/init.lua +++ b/init.lua @@ -144,7 +144,7 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_dark", { "unifiedbricks_brickblock_multicolor_dark.png", }, overlay_tiles = { - { name = "unifiedbricks_mortar2.png", color = "white" } + { name = "unifiedbricks_mortar.png", color = "white" } }, paramtype = "light", paramtype2 = "color", @@ -162,7 +162,7 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_medium", { "unifiedbricks_brickblock_multicolor_medium.png" }, overlay_tiles = { - { name = "unifiedbricks_mortar3.png", color = "white" } + { name = "unifiedbricks_mortar.png", color = "white" } }, paramtype = "light", paramtype2 = "color", @@ -180,7 +180,7 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_light", { "unifiedbricks_brickblock_multicolor_light.png" }, overlay_tiles = { - { name = "unifiedbricks_mortar4.png", color = "white" } + { name = "unifiedbricks_mortar.png", color = "white" } }, paramtype = "light", paramtype2 = "color", diff --git a/textures/unifiedbricks_brickblock.png b/textures/unifiedbricks_brickblock.png index 811ed60fd8bd17c214e100f530b20a62bda33bcc..8e9b49b0552128f2efe288d1b3425e78bbc76cfd 100644 GIT binary patch delta 91 zcmXTRn;;R!#LU3JkTh5P6OiHz@Ck8!@#4j|Z{Pm^|9|wi4m(g#!PCVtgd;kcgM*hN tHDbb6g>FX11}8=yhlQ*jNiM6H8NwFvR;Eb^&IhVx@O1TaS?83{1OTa_9fAM= delta 99 zcmc~Rn;;R#!2kqSGZyRxQnsEhjv*44lm8t1(An7E*x1PEwYk8kCMn@T3x`30k%7U! z1P4~1j2gCM`5wO{CF~40D7;Qj_~9}~viXoK!}rVL=`Vd&J_8x(>FVdQ&MBb@02UA> AoB#j- diff --git a/textures/unifiedbricks_clayblock.png b/textures/unifiedbricks_clayblock.png index 918768446c3e83ac2c0a497742fd2df182cd49bf..ee3c7d45f80b7c50db8bcd510c5aabb7f404edc6 100644 GIT binary patch delta 248 zcmVt<8nMp)JR0tgf!A%N+Ko|z#_ZVHEm6vFl zi?%^Ut6&%r*V%x}Fp#-G&@vTkmJ*2HIuP9E&&+q1o(Ezjws8k8G%~fx<;xI)YEuHZZorC$S@vF{}qr`)TQ(bP%BP~!SWw;IZ--}LxrFK0000q*Z@*?-YXe8^0 zm_<)qVc|kH@Vb$uwFY4Cz1F&}3&1%?RnIxsb*U-4LF(@AE+Qi0?zPrA=bY2bQc6#!yOU?BG=RCSC&g0ioaLKG8T+!%w}xMi*t?*93FdhdJhh=_>ZJ2%6GPj~0nKdmlN Um5RqFp8x;=07*qoM6N<$f;Wz|2><{9 diff --git a/textures/unifiedbricks_mortar.png b/textures/unifiedbricks_mortar.png index 6d523356f57e57e548d53e184dd872248f8f4c95..2209987adbc68c91a85a7b3adb8e76c335081cff 100644 GIT binary patch delta 154 zcmey)xQcOtL_G^L0|Ud`yN`l^6n}tEh%1n8Y;0_4Y3bM86k;q1@(X5g zcy=QV$no@aaSY**Wj)9!=w!&lx?xQ<7Xy1dqdV^xv;VU^ZfI!ea5T-^Y5Sbp(NRDn z=kFQI?e|$46An5VEPsFJ-+^Oo3C;m=`(Hjk^M`SV@Dg?hO_5eVps5U=u6{1-oD!M< DVm3D9 delta 231 zcmVo%=3K7_w^#@Y@Nrtt}qF__a;FI;S%eZxeyTmKtvEi zI7R?aRkV3k1pq9|VirV<@v$d8KEQhqlOUyJ5~%902Pq{u=U_lYC#^(u>cc)45sc&b zPV-&wh!8y+~Jdva?a?cX)41oz&UqR h-QT$NN2^~%umL4Xb{z*kLW2MR002ovPDHLkV1lp^WbOa} diff --git a/textures/unifiedbricks_mortar2.png b/textures/unifiedbricks_mortar2.png deleted file mode 100644 index 6d523356f57e57e548d53e184dd872248f8f4c95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmVfRRsVn%VHKpjPbE2JwCvD50fCJWD=cc)45sc&bPV-&wh!8y x+~Jdva?a?cX)41oz&UqR-QT$NN2^~%umL4Xb{z*kLW2MR002ovPDHLkV1lVJWWfLc diff --git a/textures/unifiedbricks_mortar3.png b/textures/unifiedbricks_mortar3.png deleted file mode 100644 index 6d523356f57e57e548d53e184dd872248f8f4c95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmVfRRsVn%VHKpjPbE2JwCvD50fCJWD=cc)45sc&bPV-&wh!8y x+~Jdva?a?cX)41oz&UqR-QT$NN2^~%umL4Xb{z*kLW2MR002ovPDHLkV1lVJWWfLc diff --git a/textures/unifiedbricks_mortar4.png b/textures/unifiedbricks_mortar4.png deleted file mode 100644 index 6d523356f57e57e548d53e184dd872248f8f4c95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmVfRRsVn%VHKpjPbE2JwCvD50fCJWD=cc)45sc&bPV-&wh!8y x+~Jdva?a?cX)41oz&UqR-QT$NN2^~%umL4Xb{z*kLW2MR002ovPDHLkV1lVJWWfLc From 1011023d6cb9f0cdc80bbdd7c9b7b2032a7f16d2 Mon Sep 17 00:00:00 2001 From: Niklp <89982526+Niklp09@users.noreply.github.com> Date: Sun, 1 Oct 2023 11:11:01 +0200 Subject: [PATCH 2/2] Use mod.conf and add luacheck (#10) --- .github/workflows/luacheck.yml | 10 ++++++++++ .luacheckrc | 9 +++++++++ depends.txt | 4 ---- description.txt | 1 - init.lua | 31 +++++++++---------------------- mod.conf | 2 ++ 6 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 .github/workflows/luacheck.yml create mode 100644 .luacheckrc delete mode 100644 depends.txt delete mode 100644 description.txt diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml new file mode 100644 index 0000000..b501650 --- /dev/null +++ b/.github/workflows/luacheck.yml @@ -0,0 +1,10 @@ +name: luacheck +on: [push, pull_request] +jobs: + luacheck: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@master + - name: Luacheck + uses: lunarmodules/luacheck@master \ No newline at end of file diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 0000000..1036838 --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,9 @@ +read_globals = { + "minetest", + "unifieddyes", + "default" +} + +globals = { + "unifiedbricks" +} \ No newline at end of file diff --git a/depends.txt b/depends.txt deleted file mode 100644 index 7274ef6..0000000 --- a/depends.txt +++ /dev/null @@ -1,4 +0,0 @@ -default -bucket -unifieddyes -vessels diff --git a/description.txt b/description.txt deleted file mode 100644 index e6c198a..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -This mod allows the user to re-color default bricks using Unified Dyes, and provides some pattern variations as well. diff --git a/init.lua b/init.lua index cf8b7ff..55c3af1 100644 --- a/init.lua +++ b/init.lua @@ -16,7 +16,7 @@ minetest.register_alias("unifieddyes:lightgrey","unifieddyes:lightgrey_paint") minetest.register_alias("unifieddyes:grey","unifieddyes:grey_paint") minetest.register_alias("unifieddyes:darkgrey","unifieddyes:darkgrey_paint") -HUES = { +local HUES = { "red", "orange", "yellow", @@ -35,25 +35,18 @@ HUES = { "lightgrey", "white" } -TYPES = { - "clayblock_", - "clay_", - "brick_", - "brickblock_", - "multicolor_" -} -SATURATION = { +local SATURATION = { "_s50", "" } -DARKNESS = { +local DARKNESS = { "dark_", "medium_", "", "light_" } --formal versions -FORMALHUES = { +local FORMALHUES = { "Red", "Orange", "Yellow", @@ -72,18 +65,11 @@ FORMALHUES = { "Light grey", "White" } -FORMALTYPES = { - " clay", - " clay lump", - " brick", - " bricks", - " multicolor bricks" -} -FORMALSATURATION = { +local FORMALSATURATION = { " (low saturation)", "" } -FORMALDARKNESS = { +local FORMALDARKNESS = { "Dark ", "Medium ", "Bright ", @@ -301,8 +287,8 @@ table.insert(unifiedbricks.old_static_list, "unifiedbricks:multicolor_lightgrey" for i = 1,17 do for j = 1,4 do if i > 12 then - formalname = FORMALHUES[i] - name = HUES[i] + local formalname = FORMALHUES[i] + local name = HUES[i] if j == 1 then unifiedbricks.register_old_static_block(name, formalname, "clayblock") elseif j == 4 then @@ -310,6 +296,7 @@ for i = 1,17 do end else for k = 1,4 do + local formalname, name if k == 4 then formalname = FORMALDARKNESS[k] .. FORMALHUES[i] name = DARKNESS[k] .. HUES[i] diff --git a/mod.conf b/mod.conf index 266e0dc..a52de5a 100644 --- a/mod.conf +++ b/mod.conf @@ -1 +1,3 @@ name = unifiedbricks +description = This mod allows the user to re-color default bricks using Unified Dyes, and provides some pattern variations as well. +depends = default, bucket, unifieddyes, vessels