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 00000000..1d9e62a7 Binary files /dev/null and b/minetestforfun_game/mods/bucket/textures/bucket_river_water.png differ diff --git a/minetestforfun_game/mods/xpanes/README.txt b/minetestforfun_game/mods/xpanes/README.txt index 021f8f80..233978c4 100755 --- a/minetestforfun_game/mods/xpanes/README.txt +++ b/minetestforfun_game/mods/xpanes/README.txt @@ -6,6 +6,9 @@ License: Copyright (C) xyz modified by BlockMen (iron bars) +Gambit (WTFPL): + xpanes_bar.png + This program is free software. It comes without any warranty, to the extent permitted by applicable law. You can redistribute it and/or modify it under the terms of the Do What The Fuck You Want diff --git a/minetestforfun_game/mods/xpanes/textures/xpanes_bar.png b/minetestforfun_game/mods/xpanes/textures/xpanes_bar.png old mode 100755 new mode 100644 index 5534a5cb..4d17ceb8 Binary files a/minetestforfun_game/mods/xpanes/textures/xpanes_bar.png and b/minetestforfun_game/mods/xpanes/textures/xpanes_bar.png differ