diff --git a/mods/dye/depends.txt b/mods/dye/depends.txt index e0585b46..4ad96d51 100644 --- a/mods/dye/depends.txt +++ b/mods/dye/depends.txt @@ -1,2 +1 @@ default -vessels \ No newline at end of file diff --git a/mods/dye/init.lua b/mods/dye/init.lua index 74f6011b..a71da05f 100644 --- a/mods/dye/init.lua +++ b/mods/dye/init.lua @@ -133,34 +133,33 @@ dyelocal = nil -- EOF ---Dye Base Crafting Recipes - +--Dye Smelting Recipes minetest.register_craft({ - type = "shapeless", - output = "dye:black", - recipe = {"vessels:glass_bottle_full", "default:coal_lump"}, + type = "cooking", + output = "dye:red 4", + recipe = "default:apple", }) minetest.register_craft({ - type = "shapeless", - output = "dye:blue", - recipe = {"vessels:glass_bottle_full", "default:cactus"}, + type = "cooking", + output = "dye:black 4", + recipe = "default:coal_lump", }) minetest.register_craft({ - type = "shapeless", - output = "dye:red", - recipe = {"vessels:glass_bottle_full", "default:apple"}, + type = "cooking", + output = "dye:blue 8", + recipe = "default:cactus", }) minetest.register_craft({ - type = "shapeless", - output = "dye:yellow", - recipe = {"vessels:glass_bottle_full", "default:mese_crystal_fragment"}, + type = "cooking", + output = "dye:yellow 4", + recipe = "default:mese_crystal_fragment", }) minetest.register_craft({ - type = "shapeless", - output = "dye:white", - recipe = {"vessels:glass_bottle_full", "default:stone"}, + type = "cooking", + output = "dye:white 5", + recipe = "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 a6620b8b..ef526e69 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 38bd5302..d3e97919 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 99472640..5b27085f 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 9c84c187..3ae44e26 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 0c04809b..784b7853 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 82ce8c82..adaa014e 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 ea2be9b8..e88631cb 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 9e2a780e..c4706e7f 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 51831966..4946c716 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 13588ac5..347964db 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 2998ad5a..ec2acf5c 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 ae2d1c44..9f8c151e 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 f848b22f..0ee216cc 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 5e1f07d3..508e32fb 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 c5553767..d00a5b83 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 e26c08e8..3a441fc2 100644 --- a/mods/vessels/init.lua +++ b/mods/vessels/init.lua @@ -8,13 +8,6 @@ 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 = { @@ -55,16 +48,7 @@ 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