From 663b4f003f8e460e51a99c875d4e9f2ff2a09dfd Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Sun, 14 Jun 2015 11:44:56 +0200 Subject: [PATCH] Added river water bucket and new xpanes' bar texture - (part of the global MFF Game update) --- minetestforfun_game/mods/bucket/init.lua | 32 +++++++++++++----- .../bucket/textures/bucket_river_water.png | Bin 0 -> 316 bytes minetestforfun_game/mods/xpanes/README.txt | 3 ++ .../mods/xpanes/textures/xpanes_bar.png | Bin 383 -> 180 bytes 4 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 minetestforfun_game/mods/bucket/textures/bucket_river_water.png mode change 100755 => 100644 minetestforfun_game/mods/xpanes/textures/xpanes_bar.png diff --git a/minetestforfun_game/mods/bucket/init.lua b/minetestforfun_game/mods/bucket/init.lua index 0c70be66..948176f6 100755 --- a/minetestforfun_game/mods/bucket/init.lua +++ b/minetestforfun_game/mods/bucket/init.lua @@ -31,12 +31,14 @@ local function check_protection(pos, name, text) end -- Register a new liquid --- source = name of the source node --- flowing = name of the flowing node --- itemname = name of the new bucket item (or nil if liquid is not takeable) --- inventory_image = texture of the new bucket item (ignored if itemname == nil) +-- source = name of the source node +-- flowing = name of the flowing node +-- itemname = name of the new bucket item (or nil if liquid is not takeable) +-- inventory_image = texture of the new bucket item (ignored if itemname == nil) +-- name = text description of the bucket item +-- groups = (optional) groups of the bucket item, for example {water_bucket = 1} -- This function can be called from any mod (that depends on bucket). -function bucket.register_liquid(source, flowing, itemname, inventory_image, name) +function bucket.register_liquid(source, flowing, itemname, inventory_image, name, groups) bucket.liquids[source] = { source = source, flowing = flowing, @@ -50,7 +52,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name inventory_image = inventory_image, stack_max = 1, liquids_pointable = true, - groups = {not_in_creative_inventory=1}, + groups = groups, on_place = function(itemstack, user, pointed_thing) -- Must be pointing to node if pointed_thing.type ~= "node" then @@ -163,7 +165,17 @@ bucket.register_liquid( "default:water_flowing", "bucket:bucket_water", "bucket_water.png", - "Water Bucket" + "Water Bucket", + {water_bucket = 1, not_in_creative_inventory = 1} +) + +bucket.register_liquid( + "default:river_water_source", + "default:river_water_flowing", + "bucket:bucket_river_water", + "bucket_river_water.png", + "River Water Bucket", + {water_bucket = 1, not_in_creative_inventory = 1} ) bucket.register_liquid( @@ -179,7 +191,8 @@ bucket.register_liquid( "default:acid_flowing", "bucket:bucket_acid", "bucket_acid.png", - "Acid Bucket" + "Acid Bucket", + {not_in_creative_inventory = 1} ) bucket.register_liquid( @@ -187,7 +200,8 @@ bucket.register_liquid( "default:sand_flowing", "bucket:bucket_sand", "bucket_sand.png", - "Sand Bucket" + "Sand Bucket", + {not_in_creative_inventory = 1} ) minetest.register_craft({ diff --git a/minetestforfun_game/mods/bucket/textures/bucket_river_water.png b/minetestforfun_game/mods/bucket/textures/bucket_river_water.png new file mode 100644 index 0000000000000000000000000000000000000000..1d9e62a79eeb0f848d8fddde4760bee10cd3d623 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~8!NK~>!*p|p8|zWdb&7&YuPI^$Wx)dmCR&CJHKF1;H!C~$BwF>s{up5Cu)s|7Tf N!PC{xWt~$(697YmHCq4x delta 368 zcmV-$0gwK)0sjJ!7=H)@0000eEe}%w005a#OjJc!F0KFn|DK+nprD|kp`oIpqNAgu zq@<*!rKP5(rl+T;sHmu^si~@}s;jH3tgNiAuCB1Ku(7eRva+(Xv$M6ewYIjlx3{;s zxw*r`!^FhI$H&LX$;ryf%FD~k&CSiw(9qG*(bLn@)z#J3)_>O5*VozE+1uOO+}zyX z-{0Wi;Njun<>lq)=jZ6?=&jXqIMagfTiG5UOv zmg|i&tq1A-Kxw_-sP_x$d~1vrv?tO!f_hz9u8ovsX5W)-4O0IMGG`)Z(p)Eg$6&NU zdjE7v1k*B+>SgEi>hxzPMWW0rr^`-iuYzsGh7|Gf-+e!jPD^Fm+QA