diff --git a/mods/dye/depends.txt b/mods/dye/depends.txt index 331d858c..e0585b46 100644 --- a/mods/dye/depends.txt +++ b/mods/dye/depends.txt @@ -1 +1,2 @@ -default \ No newline at end of file +default +vessels \ No newline at end of file diff --git a/mods/dye/init.lua b/mods/dye/init.lua index 663f1eb9..74f6011b 100644 --- a/mods/dye/init.lua +++ b/mods/dye/init.lua @@ -133,33 +133,34 @@ dyelocal = nil -- EOF ---Dye Smelting Recipes +--Dye Base Crafting Recipes + minetest.register_craft({ - type = "cooking", - output = "dye:red 4", - recipe = "default:apple", + type = "shapeless", + output = "dye:black", + recipe = {"vessels:glass_bottle_full", "default:coal_lump"}, }) minetest.register_craft({ - type = "cooking", - output = "dye:black 4", - recipe = "default:coal_lump", + type = "shapeless", + output = "dye:blue", + recipe = {"vessels:glass_bottle_full", "default:cactus"}, }) minetest.register_craft({ - type = "cooking", - output = "dye:blue 8", - recipe = "default:cactus", + type = "shapeless", + output = "dye:red", + recipe = {"vessels:glass_bottle_full", "default:apple"}, }) minetest.register_craft({ - type = "cooking", - output = "dye:yellow 4", - recipe = "default:mese_crystal", + type = "shapeless", + output = "dye:yellow", + recipe = {"vessels:glass_bottle_full", "default:mese_crystal_fragment"}, }) minetest.register_craft({ - type = "cooking", - output = "dye:white 5", - recipe = "default:stone", + type = "shapeless", + output = "dye:white", + recipe = {"vessels:glass_bottle_full", "default:stone"}, }) --Dye Crafting Recipes minetest.register_craft({ diff --git a/mods/dye/textures/dye_black.png b/mods/dye/textures/dye_black.png index ef526e69..a6620b8b 100644 Binary files a/mods/dye/textures/dye_black.png and b/mods/dye/textures/dye_black.png differ diff --git a/mods/dye/textures/dye_blue.png b/mods/dye/textures/dye_blue.png index d3e97919..38bd5302 100644 Binary files a/mods/dye/textures/dye_blue.png and b/mods/dye/textures/dye_blue.png differ diff --git a/mods/dye/textures/dye_brown.png b/mods/dye/textures/dye_brown.png index 5b27085f..99472640 100644 Binary files a/mods/dye/textures/dye_brown.png and b/mods/dye/textures/dye_brown.png differ diff --git a/mods/dye/textures/dye_cyan.png b/mods/dye/textures/dye_cyan.png index 3ae44e26..9c84c187 100644 Binary files a/mods/dye/textures/dye_cyan.png and b/mods/dye/textures/dye_cyan.png differ diff --git a/mods/dye/textures/dye_dark_green.png b/mods/dye/textures/dye_dark_green.png index 784b7853..0c04809b 100644 Binary files a/mods/dye/textures/dye_dark_green.png and b/mods/dye/textures/dye_dark_green.png differ diff --git a/mods/dye/textures/dye_dark_grey.png b/mods/dye/textures/dye_dark_grey.png index adaa014e..82ce8c82 100644 Binary files a/mods/dye/textures/dye_dark_grey.png and b/mods/dye/textures/dye_dark_grey.png differ diff --git a/mods/dye/textures/dye_green.png b/mods/dye/textures/dye_green.png index e88631cb..ea2be9b8 100644 Binary files a/mods/dye/textures/dye_green.png and b/mods/dye/textures/dye_green.png differ diff --git a/mods/dye/textures/dye_grey.png b/mods/dye/textures/dye_grey.png index c4706e7f..9e2a780e 100644 Binary files a/mods/dye/textures/dye_grey.png and b/mods/dye/textures/dye_grey.png differ diff --git a/mods/dye/textures/dye_magenta.png b/mods/dye/textures/dye_magenta.png index 4946c716..51831966 100644 Binary files a/mods/dye/textures/dye_magenta.png and b/mods/dye/textures/dye_magenta.png differ diff --git a/mods/dye/textures/dye_orange.png b/mods/dye/textures/dye_orange.png index 347964db..13588ac5 100644 Binary files a/mods/dye/textures/dye_orange.png and b/mods/dye/textures/dye_orange.png differ diff --git a/mods/dye/textures/dye_pink.png b/mods/dye/textures/dye_pink.png index ec2acf5c..2998ad5a 100644 Binary files a/mods/dye/textures/dye_pink.png and b/mods/dye/textures/dye_pink.png differ diff --git a/mods/dye/textures/dye_red.png b/mods/dye/textures/dye_red.png index 9f8c151e..ae2d1c44 100644 Binary files a/mods/dye/textures/dye_red.png and b/mods/dye/textures/dye_red.png differ diff --git a/mods/dye/textures/dye_violet.png b/mods/dye/textures/dye_violet.png index 0ee216cc..f848b22f 100644 Binary files a/mods/dye/textures/dye_violet.png and b/mods/dye/textures/dye_violet.png differ diff --git a/mods/dye/textures/dye_white.png b/mods/dye/textures/dye_white.png index 508e32fb..5e1f07d3 100644 Binary files a/mods/dye/textures/dye_white.png and b/mods/dye/textures/dye_white.png differ diff --git a/mods/dye/textures/dye_yellow.png b/mods/dye/textures/dye_yellow.png index d00a5b83..c5553767 100644 Binary files a/mods/dye/textures/dye_yellow.png and b/mods/dye/textures/dye_yellow.png differ diff --git a/mods/vessels/init.lua b/mods/vessels/init.lua index 3a441fc2..e26c08e8 100644 --- a/mods/vessels/init.lua +++ b/mods/vessels/init.lua @@ -8,6 +8,13 @@ minetest.register_craftitem("vessels:glass_bottle", { groups = {vessel=1}, }) +minetest.register_craftitem("vessels:glass_bottle_full", { + description = "Glass Bottle Full", + inventory_image = "vessels_water_bottle.png", + wield_image = "vessels_water_bottle.png", + groups = {vessel=1}, +}) + minetest.register_craft( { output = "vessels:glass_bottle 10", recipe = { @@ -48,7 +55,16 @@ minetest.register_craft( { { "", "default:steel_ingot", "" } } }) - +--Fill with water +minetest.register_craft( { + type = "shapeless", + output = "vessels:glass_bottle_full", + recipe = { + "bucket:bucket_water", + "vessels:glass_bottle", + }, + replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, }, +}) -- Make sure we can recycle them diff --git a/mods/vessels/textures/vessels_water_bottle.png b/mods/vessels/textures/vessels_water_bottle.png new file mode 100644 index 00000000..a4b19148 Binary files /dev/null and b/mods/vessels/textures/vessels_water_bottle.png differ diff --git a/nano.save b/nano.save new file mode 100644 index 00000000..c996b573 --- /dev/null +++ b/nano.save @@ -0,0 +1,2 @@ +x^ +