Compare commits
	
		
			4 Commits
		
	
	
		
			4ef1892dbe
			...
			master
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 4d20404380 | ||
|  | 1011023d6c | ||
|  | f341d63b01 | ||
|  | ef92eceeb6 | 
							
								
								
									
										10
									
								
								.github/workflows/luacheck.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						| @@ -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 | ||||||
							
								
								
									
										9
									
								
								.luacheckrc
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,9 @@ | |||||||
|  | read_globals = { | ||||||
|  | 	"minetest", | ||||||
|  | 	"unifieddyes", | ||||||
|  | 	"default" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | globals = { | ||||||
|  | 	"unifiedbricks" | ||||||
|  | } | ||||||
| @@ -1,4 +0,0 @@ | |||||||
| default |  | ||||||
| bucket |  | ||||||
| unifieddyes |  | ||||||
| vessels |  | ||||||
| @@ -1 +0,0 @@ | |||||||
| This mod allows the user to re-color default bricks using Unified Dyes, and provides some pattern variations as well. |  | ||||||
							
								
								
									
										52
									
								
								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:grey","unifieddyes:grey_paint") | ||||||
| minetest.register_alias("unifieddyes:darkgrey","unifieddyes:darkgrey_paint") | minetest.register_alias("unifieddyes:darkgrey","unifieddyes:darkgrey_paint") | ||||||
|  |  | ||||||
| HUES = { | local HUES = { | ||||||
| 	"red", | 	"red", | ||||||
| 	"orange", | 	"orange", | ||||||
| 	"yellow", | 	"yellow", | ||||||
| @@ -35,25 +35,18 @@ HUES = { | |||||||
| 	"lightgrey", | 	"lightgrey", | ||||||
| 	"white" | 	"white" | ||||||
| } | } | ||||||
| TYPES = { | local SATURATION = { | ||||||
| 	"clayblock_", |  | ||||||
| 	"clay_", |  | ||||||
| 	"brick_", |  | ||||||
| 	"brickblock_", |  | ||||||
| 	"multicolor_" |  | ||||||
| } |  | ||||||
| SATURATION = { |  | ||||||
| 	"_s50", | 	"_s50", | ||||||
| 	"" | 	"" | ||||||
| } | } | ||||||
| DARKNESS = { | local DARKNESS = { | ||||||
| 	"dark_", | 	"dark_", | ||||||
| 	"medium_", | 	"medium_", | ||||||
| 	"", | 	"", | ||||||
| 	"light_" | 	"light_" | ||||||
| } | } | ||||||
| --formal versions | --formal versions | ||||||
| FORMALHUES = { | local FORMALHUES = { | ||||||
| 	"Red", | 	"Red", | ||||||
| 	"Orange", | 	"Orange", | ||||||
| 	"Yellow", | 	"Yellow", | ||||||
| @@ -72,18 +65,11 @@ FORMALHUES = { | |||||||
| 	"Light grey", | 	"Light grey", | ||||||
| 	"White" | 	"White" | ||||||
| } | } | ||||||
| FORMALTYPES = { | local FORMALSATURATION = { | ||||||
| 	" clay", |  | ||||||
| 	" clay lump", |  | ||||||
| 	" brick", |  | ||||||
| 	" bricks", |  | ||||||
| 	" multicolor bricks" |  | ||||||
| } |  | ||||||
| FORMALSATURATION = { |  | ||||||
| 	" (low saturation)", | 	" (low saturation)", | ||||||
| 	"" | 	"" | ||||||
| } | } | ||||||
| FORMALDARKNESS = { | local FORMALDARKNESS = { | ||||||
| 	"Dark ", | 	"Dark ", | ||||||
| 	"Medium ", | 	"Medium ", | ||||||
| 	"Bright ", | 	"Bright ", | ||||||
| @@ -103,10 +89,11 @@ minetest.register_node("unifiedbricks:brickblock", { | |||||||
| 	paramtype = "light", | 	paramtype = "light", | ||||||
| 	paramtype2 = "color", | 	paramtype2 = "color", | ||||||
| 	palette = "unifieddyes_palette_extended.png", | 	palette = "unifieddyes_palette_extended.png", | ||||||
| 	is_ground_content = true, | 	is_ground_content = false, | ||||||
| 	groups = {cracky=3, not_in_creative_inventory=1, ud_param2_colorable = 1}, | 	groups = {cracky=3, not_in_creative_inventory=1, ud_param2_colorable = 1}, | ||||||
| 	sounds = default.node_sound_stone_defaults(), | 	sounds = default.node_sound_stone_defaults(), | ||||||
| 	on_construct = unifieddyes.on_construct, | 	on_construct = unifieddyes.on_construct, | ||||||
|  | 	on_dig = unifieddyes.on_dig, | ||||||
| }) | }) | ||||||
|  |  | ||||||
| minetest.override_item("default:brick", { | minetest.override_item("default:brick", { | ||||||
| @@ -122,12 +109,13 @@ minetest.register_node("unifiedbricks:clayblock", { | |||||||
| 	}, | 	}, | ||||||
| 	paramtype2 = "color", | 	paramtype2 = "color", | ||||||
| 	palette = "unifieddyes_palette_extended.png", | 	palette = "unifieddyes_palette_extended.png", | ||||||
| 	is_ground_content = true, | 	is_ground_content = false, | ||||||
| 	groups = {crumbly=3, not_in_creative_inventory=1, ud_param2_colorable = 1}, | 	groups = {crumbly=3, not_in_creative_inventory=1, ud_param2_colorable = 1}, | ||||||
| 		sounds = default.node_sound_dirt_defaults({ | 		sounds = default.node_sound_dirt_defaults({ | ||||||
| 			footstep = "", | 			footstep = "", | ||||||
| 		}), | 		}), | ||||||
| 	on_construct = unifieddyes.on_construct, | 	on_construct = unifieddyes.on_construct, | ||||||
|  | 	on_dig = unifieddyes.on_dig, | ||||||
| }) | }) | ||||||
|  |  | ||||||
| minetest.override_item("default:clay", { | minetest.override_item("default:clay", { | ||||||
| @@ -142,15 +130,16 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_dark", { | |||||||
| 		"unifiedbricks_brickblock_multicolor_dark.png", | 		"unifiedbricks_brickblock_multicolor_dark.png", | ||||||
| 	}, | 	}, | ||||||
| 	overlay_tiles = { | 	overlay_tiles = { | ||||||
| 		{ name = "unifiedbricks_mortar2.png", color = "white" } | 		{ name = "unifiedbricks_mortar.png", color = "white" } | ||||||
| 	}, | 	}, | ||||||
| 	paramtype = "light", | 	paramtype = "light", | ||||||
| 	paramtype2 = "color", | 	paramtype2 = "color", | ||||||
| 	palette = "unifieddyes_palette_extended.png", | 	palette = "unifieddyes_palette_extended.png", | ||||||
| 	is_ground_content = true, | 	is_ground_content = false, | ||||||
| 	groups = {cracky=3, ud_param2_colorable = 1}, | 	groups = {cracky=3, ud_param2_colorable = 1}, | ||||||
| 	sounds = default.node_sound_stone_defaults(), | 	sounds = default.node_sound_stone_defaults(), | ||||||
| 	on_construct = unifieddyes.on_construct, | 	on_construct = unifieddyes.on_construct, | ||||||
|  | 	on_dig = unifieddyes.on_dig, | ||||||
| }) | }) | ||||||
|  |  | ||||||
| minetest.register_node("unifiedbricks:brickblock_multicolor_medium", { | minetest.register_node("unifiedbricks:brickblock_multicolor_medium", { | ||||||
| @@ -159,15 +148,16 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_medium", { | |||||||
| 		"unifiedbricks_brickblock_multicolor_medium.png" | 		"unifiedbricks_brickblock_multicolor_medium.png" | ||||||
| 	}, | 	}, | ||||||
| 	overlay_tiles = { | 	overlay_tiles = { | ||||||
| 		{ name = "unifiedbricks_mortar3.png", color = "white" } | 		{ name = "unifiedbricks_mortar.png", color = "white" } | ||||||
| 	}, | 	}, | ||||||
| 	paramtype = "light", | 	paramtype = "light", | ||||||
| 	paramtype2 = "color", | 	paramtype2 = "color", | ||||||
| 	palette = "unifieddyes_palette_extended.png", | 	palette = "unifieddyes_palette_extended.png", | ||||||
| 	is_ground_content = true, | 	is_ground_content = false, | ||||||
| 	groups = {cracky=3, ud_param2_colorable = 1}, | 	groups = {cracky=3, ud_param2_colorable = 1}, | ||||||
| 	sounds = default.node_sound_stone_defaults(), | 	sounds = default.node_sound_stone_defaults(), | ||||||
| 	on_construct = unifieddyes.on_construct, | 	on_construct = unifieddyes.on_construct, | ||||||
|  | 	on_dig = unifieddyes.on_dig, | ||||||
| }) | }) | ||||||
|  |  | ||||||
| minetest.register_node("unifiedbricks:brickblock_multicolor_light", { | minetest.register_node("unifiedbricks:brickblock_multicolor_light", { | ||||||
| @@ -176,15 +166,16 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_light", { | |||||||
| 		"unifiedbricks_brickblock_multicolor_light.png" | 		"unifiedbricks_brickblock_multicolor_light.png" | ||||||
| 	}, | 	}, | ||||||
| 	overlay_tiles = { | 	overlay_tiles = { | ||||||
| 		{ name = "unifiedbricks_mortar4.png", color = "white" } | 		{ name = "unifiedbricks_mortar.png", color = "white" } | ||||||
| 	}, | 	}, | ||||||
| 	paramtype = "light", | 	paramtype = "light", | ||||||
| 	paramtype2 = "color", | 	paramtype2 = "color", | ||||||
| 	palette = "unifieddyes_palette_extended.png", | 	palette = "unifieddyes_palette_extended.png", | ||||||
| 	is_ground_content = true, | 	is_ground_content = false, | ||||||
| 	groups = {cracky=3, ud_param2_colorable = 1}, | 	groups = {cracky=3, ud_param2_colorable = 1}, | ||||||
| 	sounds = default.node_sound_stone_defaults(), | 	sounds = default.node_sound_stone_defaults(), | ||||||
| 	on_construct = unifieddyes.on_construct, | 	on_construct = unifieddyes.on_construct, | ||||||
|  | 	on_dig = unifieddyes.on_dig, | ||||||
| }) | }) | ||||||
|  |  | ||||||
| minetest.register_craft( { | minetest.register_craft( { | ||||||
| @@ -296,8 +287,8 @@ table.insert(unifiedbricks.old_static_list, "unifiedbricks:multicolor_lightgrey" | |||||||
| for i = 1,17 do | for i = 1,17 do | ||||||
| 	for j = 1,4 do | 	for j = 1,4 do | ||||||
| 		if i > 12 then | 		if i > 12 then | ||||||
| 			formalname = FORMALHUES[i] | 			local formalname = FORMALHUES[i] | ||||||
| 			name = HUES[i] | 			local name = HUES[i] | ||||||
| 			if j == 1 then | 			if j == 1 then | ||||||
| 				unifiedbricks.register_old_static_block(name, formalname, "clayblock") | 				unifiedbricks.register_old_static_block(name, formalname, "clayblock") | ||||||
| 			elseif j == 4 then | 			elseif j == 4 then | ||||||
| @@ -305,6 +296,7 @@ for i = 1,17 do | |||||||
| 			end | 			end | ||||||
| 		else | 		else | ||||||
| 			for k = 1,4 do | 			for k = 1,4 do | ||||||
|  | 				local formalname, name | ||||||
| 				if k == 4 then | 				if k == 4 then | ||||||
| 					formalname = FORMALDARKNESS[k] .. FORMALHUES[i] | 					formalname = FORMALDARKNESS[k] .. FORMALHUES[i] | ||||||
| 					name = DARKNESS[k] .. HUES[i] | 					name = DARKNESS[k] .. HUES[i] | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								mod.conf
									
									
									
									
									
								
							
							
						
						| @@ -1 +1,3 @@ | |||||||
| name = unifiedbricks | 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 | ||||||
|   | |||||||
| Before Width: | Height: | Size: 118 B After Width: | Height: | Size: 110 B | 
| Before Width: | Height: | Size: 389 B After Width: | Height: | Size: 264 B | 
| Before Width: | Height: | Size: 247 B After Width: | Height: | Size: 170 B | 
| Before Width: | Height: | Size: 247 B | 
| Before Width: | Height: | Size: 247 B | 
| Before Width: | Height: | Size: 247 B |