Commit Graph

881 Commits

Author SHA1 Message Date
Tim
3c357b4b49 fix formspecs and use the inventory sizes for cardboard box and medicine cabinet, that their formspecs allowed to use before 2015-01-23 12:37:23 -05:00
Tim
cc9a1a9c3c select a formspec automaticly from a table if none is supplied 2015-01-23 12:37:23 -05:00
Tim
0341a00f9f also make the japanese door use the expand function, giving it a proper construction (buildable_to) and prevent crashes when rightclicking onknown nodes with it 2015-01-23 12:37:23 -05:00
Tim
5b35bb571b remove a leftover empty function 2015-01-23 12:37:23 -05:00
Tim
306a6798b3 add an after_unexpand hook to allow beds to properly expand and unexpand, and update beds to use expansion in the process 2015-01-23 12:37:23 -05:00
Tim
e9bfc337d4 abstract fake_fire node registration to reduce code size and make the code more maintainable 2015-01-23 12:37:23 -05:00
Tim
b87ce2d2a7 allow "air" to be set in expand.top/forward/right to allow for better handled multinode meshnodes 2015-01-23 12:37:23 -05:00
Tim
d6ce145f9c use an expand def-field to automaticly expand and unexpand the three available types of expansion and let nearly all decor use this form
example of usage:
	expand = { top="homedecor:newnode", right="homedecor:rightnode", forward="homedecor:forwardnode" }
2015-01-23 12:37:23 -05:00
Tim
9912f72de6 don't assume all locked multinodes to be refrigerators 2015-01-23 12:37:23 -05:00
Tim
cdbdcbef14 make doors use the new expansion functions 2015-01-23 12:37:23 -05:00
Tim
fefb3f9f20 make sure any expansion node is being replaced with air if it's buildable_to and no other second node is being used as replacement 2015-01-23 12:37:23 -05:00
Tim
8f0c7c20c6 make expanded items test for on_rightclick before actually placing 2015-01-23 12:37:23 -05:00
Tim
0a0c558c3a rewrite the node stacking/expansion code, preventing a crash building on unknown nodes, and reduce table lookups and overall code 2015-01-23 12:37:23 -05:00
Tim
b4b281d9ea abstract most inventory handling code into a homedecor registration function
drawtype and param related defaults are being handled as well
for now we still leave the locked-node generation to locked.lua, due to its furnace-like node support

example:
homedecor.register("penbox", {
	<common defs>
	infotext=S("Penbox"),
	inventory = {
		size=8,
		formspec=…
		lockable=true -- will be supported later
	},
})
2015-01-23 12:37:23 -05:00
Diego Martinez
2cdf6667dc Set infotext to the book's title.
Also use `swap_node` to avoid losing metadata on (placed)
book open/close.
2015-01-23 14:25:01 -03:00
Diego Martinez
0c7dfa9ba6 Move register_on_player_receive_fields out of the loop.
Avoids registering one `on_receive_fields` per book color,
which is wasteful.

Also, minor fixes mainly for conciseness' sake.
2015-01-23 14:16:40 -03:00
Diego Martinez
5bae438647 Keep metadata on book place/dig. 2015-01-23 14:05:53 -03:00
jp
365dc1c639 Improved Books 2015-01-22 13:01:04 -05:00
Tim
9a13728492 fix the medicine cabinet deleting inventory on punch 2015-01-21 13:42:20 +01:00
Tim
2cd99d6462 add the flower pots to the potting_group to make bushes_classic bushes regrow berries on them 2015-01-21 04:40:38 +01:00
Tim
be4ed12b6c whitespace cleanup:
* remove all trailing whitespaces
* make inbox and computer use the prevalent indentation rules
* CRLF->LF where found
2015-01-21 00:44:23 +01:00
kilbith
29bf986ea8 Small sounds fix 2015-01-20 19:49:46 +01:00
jp
f136b92018 Cleaning cg72's code 2015-01-20 12:13:45 +01:00
Diego Martínez
3c765e3de7 Merge pull request #160 from t4im/master
various smaller enhancements
2015-01-19 21:37:53 -02:00
Tim
8fc6802730 make fake_fire buildable_to 2015-01-19 22:57:48 +01:00
Tim
3106b62945 update remaining node_box->collision_box for meshnodes 2015-01-19 22:57:48 +01:00
Tim
3aee04287e register adobe and roofing of building_blocks with the circular saw as well 2015-01-19 22:57:48 +01:00
Tim
b88e756627 line ending (CRLF->LF) and whitespace cleanup for building_blocks 2015-01-19 22:57:40 +01:00
Vanessa Ezekowitz
5fb565cbd6 fixed a couple missing faces in wine rack mesh and optimized it a bit 2015-01-18 22:12:55 -05:00
Tim
16756150ac make sure, that itemframes always remove their entities, even when worldediting 2015-01-15 13:23:42 +01:00
Vanessa Ezekowitz
88e5c28d39 use mesh nodes for standing lamp and "3dforniture" table lamp
rewrote the surrounding code a bit to clean it up
all new textures, got rid of related, obsolete files.
2015-01-03 01:52:39 -05:00
Vanessa Ezekowitz
8b14e599a1 fix sel/coll boxes on 4-bottle packs 2015-01-02 05:40:02 -05:00
Vanessa Ezekowitz
f8f595b3b9 add 4-packs of green and brown bottles, and a 4-pack with both colors
add recipe for wine rack using multiple 4-packs of brown bottles + wood
2015-01-02 05:29:42 -05:00
Vanessa Ezekowitz
b3cd8e45fb shorten globe coll/sel box code a bit 2015-01-02 04:41:01 -05:00
Vanessa Ezekowitz
8cf3db8aae better wine rack model
basically stacked the existing model 4x, scaled it down, and added more
bottles to fill the empty spaces.
2015-01-02 04:39:17 -05:00
Vanessa Ezekowitz
0051fe2ec6 delete 3d bookshelf blend file
(redundant, bloats modpack)
2015-01-02 01:27:49 -05:00
Vanessa Ezekowitz
ad79c1b7e4 use mesh node for brown and green bottles 2015-01-02 01:24:07 -05:00
Vanessa Ezekowitz
20ba8beaac fix groups on globe and wine rack 2015-01-02 00:47:08 -05:00
Vanessa Ezekowitz
ca4fa4061d Add wine rack 2015-01-02 00:44:38 -05:00
Vanessa Ezekowitz
05bca18407 get rid of blender model files
they're redundant and only serve to bloat up the repo.
2015-01-02 00:44:38 -05:00
Vanessa Ezekowitz
d41c35a067 Add desk globe, model by jp 2015-01-01 15:28:49 -05:00
Vanessa Ezekowitz
a14151accb new inventory images for small round tables 2014-12-27 15:14:42 -05:00
Vanessa Ezekowitz
619d229157 adjust spacing of text entity on wall signs
(at some orientations at far map coords, the entity z-fights.  Irrlicht
positioning rounding errors?)
2014-12-27 05:00:33 -05:00
Vanessa Ezekowitz
bb8b3eea20 use current intllib API 2014-12-27 01:13:05 -05:00
Vanessa Ezekowitz
6905c363eb reduce small round table model to exactly 1 standard pixel in thickness
also remove some redundant .blend1/.blend2 files
2014-12-26 18:39:39 -05:00
Vanessa Ezekowitz
ca9949daf4 tone down brightness of glass streaks on large table 2014-12-26 18:28:42 -05:00
Vanessa Ezekowitz
6ed5fcb064 pixel tweak to glass table 2014-12-26 18:27:58 -05:00
Vanessa Ezekowitz
0457fc43ee better model for small round tables
better texture for the glass one
2014-12-26 18:19:45 -05:00
cheapie
0a1eb1c83c Added beeswax -> oil + yellow dye crafting recipe, using technic's centrifuge. 2014-12-26 12:48:18 -05:00
Vanessa Ezekowitz
258304569f fix collision boxes on tables 2014-12-25 21:42:12 -05:00