Artisan Benches: Barrel: change sequence in ricipes. Relates to #1826

lord-server · Dec 12, 2024 · 446db94 · 446db94
1 parent 89ce4f5
commit 446db94
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/mods/lord/Tools/lord_alcohol/src/lord_alcohol/config.lua b/mods/lord/Tools/lord_alcohol/src/lord_alcohol/config.lua
@@ -23,23 +23,23 @@ local config = {
 	},
 	recipes = {
 		{
-			input  = { 'lottfarming:berries 5', 'lord_vessels:drinking_glass_water' },
+			input  = { 'lord_vessels:drinking_glass_water', 'lottfarming:berries 5' },
 			output = 'lord_alcohol:wine'
 		},
 		{
-			input  = { 'farming:wheat0 3', 'lord_vessels:drinking_glass_water' },
+			input  = { 'lord_vessels:drinking_glass_water', 'farming:wheat0 3' },
 			output = 'lord_alcohol:beer'
 		},
 		{
-			input  = { 'bees:bottle_honey 6', 'lord_vessels:drinking_glass_water' },
-			output = 'lord_alcohol:mead'--, 'vessels:glass_bottle 6'
+			input  = { 'lord_vessels:drinking_glass_water', 'bees:bottle_honey 6' },
+			output = 'lord_alcohol:mead'
 		},
 		{
-			input  = { 'default:apple 5', 'lord_vessels:drinking_glass_water' },
+			input  = { 'lord_vessels:drinking_glass_water', 'default:apple 5' },
 			output = 'lord_alcohol:cider'
 		},
 		{
-			input  = { 'lottfarming:barley_seed 6', 'lord_vessels:drinking_glass_water' },
+			input  = { 'lord_vessels:drinking_glass_water', 'lottfarming:barley_seed 6' },
 			output = 'lord_alcohol:ale'
 		},
 	},

diff --git a/mods/lord/Tools/lord_books/brewing.lua → mods/lord/Tools/lord_books/alcohol.lua b/mods/lord/Tools/lord_books/brewing.lua → mods/lord/Tools/lord_books/alcohol.lua
diff --git a/mods/lord/Tools/lord_books/init.lua b/mods/lord/Tools/lord_books/init.lua
@@ -3,7 +3,7 @@ dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/cooking.lua")
 dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/forbidden.lua")
 dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/protection.lua")
 dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/potions.lua")
-dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/brewing.lua")
+dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/alcohol.lua")
 dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/master.lua")
 dofile(minetest.get_modpath(minetest.get_current_modname()) .. "/scroll.lua")
 

diff --git a/mods/lord/Tools/lord_books/master.lua b/mods/lord/Tools/lord_books/master.lua
@@ -259,7 +259,7 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
 
 	-- HACK: обработка кнопок `potions` и `brews` происходит в обработчиках форм книг
 	--       `lord_books:potions_book` и `lord_books:brewing_book` соответственно.
-	--       см. "HACK" в `potions.lua` и `brewing.lua`.
+	--       см. "HACK" в `potions.lua` и `alcohol.lua`.
 
 	local pn = player:get_player_name();
 	if zmc.users[pn] == nil then zmc.users[pn] = {current_item = "", alt = 1, page = 0, history={index=0,list={}}} end