Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.20.x' into 1.20.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlayTheNinth
BlayTheNinth committed Dec 7, 2023
2 parents 57edc3f + 9dcd34f commit 00f9cec
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 62 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mod
mod_version = 16.0.1
mod_version = 17.0.0
mod_id = cookingforblockheads
mod_group = net.blay09.mods

Expand Down
148 changes: 91 additions & 57 deletions shared/src/main/resources/assets/cookingforblockheads/lang/zh_cn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"item.cookingforblockheads.heating_unit": "加热单元",
"item.cookingforblockheads.ice_unit": "冷却单元",
"item.cookingforblockheads.preservation_chamber": "保鲜室",

"tooltip.cookingforblockheads:no_filter_edition": "#无过滤版",
"tooltip.cookingforblockheads:no_filter_edition.description": "显示所有的食谱.",
"tooltip.cookingforblockheads:no_filter_edition.description": "显示所有食谱。",
"tooltip.cookingforblockheads:recipe_book": "食谱",
"tooltip.cookingforblockheads:recipe_book.description": "显示你背包食材能够烹饪的食物.",
"tooltip.cookingforblockheads:recipe_book.description": "显示你可以用物品栏中的物品烹饪的食物。",
"tooltip.cookingforblockheads:crafting_book": "合成书",
"tooltip.cookingforblockheads:crafting_book.description": "能够使用背包食材合成食物.",

"tooltip.cookingforblockheads:crafting_book.description": "可以用物品栏中的物品合成食物。",
"block.cookingforblockheads.cooking_table": "烹饪桌",
"block.cookingforblockheads.fridge": "冰箱",
"block.cookingforblockheads.sink": "水槽",
Expand All @@ -23,8 +23,8 @@
"block.cookingforblockheads.oven": "烤箱",
"block.cookingforblockheads.fruit_basket": "水果篮",
"block.cookingforblockheads.tool_rack": "厨具架",
"block.cookingforblockheads.milk_jar": "牛奶罐",
"block.cookingforblockheads.cow_jar": "罐中奶牛",
"block.cookingforblockheads.milk_jar": "奶罐",
"block.cookingforblockheads.cow_jar": "罐中牛",
"block.cookingforblockheads.toaster": "吐司机",
"block.cookingforblockheads.spice_rack": "调料架",
"block.cookingforblockheads.white_kitchen_floor": "厨房地板",
Expand All @@ -33,7 +33,7 @@
"block.cookingforblockheads.light_blue_kitchen_floor": "淡蓝色厨房地板",
"block.cookingforblockheads.yellow_kitchen_floor": "黄色厨房地板",
"block.cookingforblockheads.lime_kitchen_floor": "黄绿色厨房地板",
"block.cookingforblockheads.pink_kitchen_floor": "粉色厨房地板",
"block.cookingforblockheads.pink_kitchen_floor": "粉红色厨房地板",
"block.cookingforblockheads.gray_kitchen_floor": "灰色厨房地板",
"block.cookingforblockheads.light_gray_kitchen_floor": "淡灰色厨房地板",
"block.cookingforblockheads.cyan_kitchen_floor": "青色厨房地板",
Expand All @@ -44,35 +44,35 @@
"block.cookingforblockheads.red_kitchen_floor": "红色厨房地板",
"block.cookingforblockheads.black_kitchen_floor": "黑色厨房地板",
"block.cookingforblockheads.cutting_board": "切菜板",

"tooltip.cookingforblockheads:multiblock_kitchen": "多方块厨房",
"tooltip.cookingforblockheads:dyeable": "可染色",
"tooltip.cookingforblockheads:cooking_table.description": "开启食物合成功能.",
"tooltip.cookingforblockheads:oven.description": "开启食物烤制功能.",
"tooltip.cookingforblockheads:sink.description": "提供烹饪用水.",
"tooltip.cookingforblockheads:fridge.description": "存储烹饪所需原料.",
"tooltip.cookingforblockheads:fruit_basket.description": "存储合成用的水果.",
"tooltip.cookingforblockheads:tool_rack.description": "提供烹饪工具.",
"tooltip.cookingforblockheads:milk_jar.description": "提供烹饪所需的牛奶.",
"tooltip.cookingforblockheads:cow_jar.description": "缓慢产出牛奶.",
"tooltip.cookingforblockheads:toaster.description": "用魔法将面包变成吐司.",
"tooltip.cookingforblockheads:spice_rack.description": "存储调料和原料.",
"tooltip.cookingforblockheads:counter.description": "提供烹饪原料.",
"tooltip.cookingforblockheads:cabinet.description": "可以放在厨房砖块上方的墙上.",
"tooltip.cookingforblockheads:corner.description": "可在转角处连接厨房方块.",
"tooltip.cookingforblockheads:hanging_corner.description": "可在转角处连接厨房方块.",
"tooltip.cookingforblockheads:kitchen_floor.description": "可远距离连接厨房方块.",
"tooltip.cookingforblockheads:heating_unit.description": "允许使用能量加热烤箱.",
"tooltip.cookingforblockheads:ice_unit.description": "提供合成用雪和冰.",
"tooltip.cookingforblockheads:preservation_chamber.description": "阻止格子中最后一个物品被使用.",
"tooltip.cookingforblockheads:cutting_board.description": "提供合成用切肉板.",
"tooltip.cookingforblockheads:requires_pams": "需要潘马斯农场（Pam's Harvestcraft）",
"tooltip.cookingforblockheads:cutting_board_deprecated": "此物品已停用。\n潘马斯中的切肉板可以直接放置了.",
"tooltip.cookingforblockheads:can_be_placed_in_world": "可以放置.",

"tooltip.cookingforblockheads:cooking_table.description": "启用食物合成功能。",
"tooltip.cookingforblockheads:oven.description": "启用食物烤制功能。",
"tooltip.cookingforblockheads:sink.description": "提供合成所需的水。",
"tooltip.cookingforblockheads:fridge.description": "储存合成所需的原料。",
"tooltip.cookingforblockheads:fruit_basket.description": "储存合成用的水果。",
"tooltip.cookingforblockheads:tool_rack.description": "提供合成所需的工具。",
"tooltip.cookingforblockheads:milk_jar.description": "提供合成所需的奶。",
"tooltip.cookingforblockheads:cow_jar.description": "缓慢产出合成所需的奶。",
"tooltip.cookingforblockheads:toaster.description": "用魔法将面包变成吐司。",
"tooltip.cookingforblockheads:spice_rack.description": "储存调料和原料。",
"tooltip.cookingforblockheads:counter.description": "提供合成所需的原料。",
"tooltip.cookingforblockheads:cabinet.description": "可以放在厨房方块上方的墙上。",
"tooltip.cookingforblockheads:corner.description": "可以在转角处连接厨房方块。",
"tooltip.cookingforblockheads:hanging_corner.description": "可以在转角处连接厨房方块。",
"tooltip.cookingforblockheads:kitchen_floor.description": "可以远距离连接厨房方块。",
"tooltip.cookingforblockheads:heating_unit.description": "允许使用能量加热烤箱。",
"tooltip.cookingforblockheads:ice_unit.description": "提供合成所需的雪和冰。",
"tooltip.cookingforblockheads:preservation_chamber.description": "阻止格子中的最后一个物品被使用。",
"tooltip.cookingforblockheads:cutting_board.description": "提供合成所需的切肉板。",
"tooltip.cookingforblockheads:requires_pams": "需要潘马斯农场",
"tooltip.cookingforblockheads:cutting_board_deprecated": "此物品已弃用。\\n潘马斯中的切肉板可以直接放置了。",
"tooltip.cookingforblockheads:can_be_placed_in_world": "可以在世界中放置。",
"gui.cookingforblockheads:no_ingredients": "食材不足",
"gui.cookingforblockheads:no_selection": "在右边选定项目\\n以查看食谱.",

"gui.cookingforblockheads:no_selection": "在右侧选择物品以查看其食谱。",
"tooltip.cookingforblockheads:click_to_see_recipe": "点击查看食谱",
"tooltip.cookingforblockheads:click_to_craft_one": "点击合成食物",
"tooltip.cookingforblockheads:click_to_smelt_one": "点击烹饪食物",
Expand All @@ -82,39 +82,73 @@
"tooltip.cookingforblockheads:missing_ingredients": "缺少食材",
"tooltip.cookingforblockheads:missing_oven": "缺少烤箱",
"tooltip.cookingforblockheads:sort_by_name": "按名称排列",
"tooltip.cookingforblockheads:sort_by_hunger": "按饱食度排列",
"tooltip.cookingforblockheads:sort_by_saturation": "按饱腹度排列",
"tooltip.cookingforblockheads:sort_by_hunger": "按饥饿值排列",
"tooltip.cookingforblockheads:sort_by_saturation": "按饱和度排列",
"tooltip.cookingforblockheads:click_to_lock": "右击锁定物品",
"tooltip.cookingforblockheads:click_to_unlock": "右击解锁物品",
"tooltip.cookingforblockheads:scroll_to_switch": "滚动选择物品",

"tooltip.cookingforblockheads:energy_stored": "能量存储：%d/%d",
"tooltip.cookingforblockheads:energy_stored": "已储存能量：%d/%d",
"tooltip.cookingforblockheads:oven_upgrade": "烤箱升级",
"tooltip.cookingforblockheads:fridge_upgrade": "冰箱升级",

"_comment": "##",

"tooltip.cookingforblockheads:toasted": "烤制%s",
"tooltip.cookingforblockheads:very_toasted": "烤得非常焦的面包（不可食用）",
"container.cookingforblockheads.oven": "烤箱",
"container.cookingforblockheads.fridge": "冰箱",
"container.cookingforblockheads.spice_rack": "调料架",
"container.cookingforblockheads.counter": "厨柜",
"container.cookingforblockheads.cabinet": "厨房橱柜",
"container.cookingforblockheads.fruit_basket": "水果篮",

"container.cookingforblockheads.cow_jar_compressed": "将牛压缩进罐子里",
"container.cookingforblockheads.cow_jar": "罐中牛",
"container.cookingforblockheads.cow_jar_custom": "罐中%s",

"itemGroup.cookingforblockheads.cookingforblockheads": "傻瓜烹饪",

"waila.cookingforblockheads:milk_stored": "储存牛奶：%d/%d",
"waila.cookingforblockheads:toast_progress": "烘烤中...（%s）",
"waila.cookingforblockheads:heating_unit": "升级：加热原件",
"waila.cookingforblockheads:ice_unit": "升级：冷冻原件",
"waila.cookingforblockheads:preservation_chamber": "升级：保鲜仓",

"cookingforblockheads:subtitle.fridge_open": "冰箱打开",
"cookingforblockheads:subtitle.fridge_close": "冰箱关闭",
"cookingforblockheads:subtitle.oven_open": "烤箱打开",
"cookingforblockheads:subtitle.oven_close": "烤箱关闭",
"cookingforblockheads:subtitle.toaster_start": "吐司机烤制吐司",
"cookingforblockheads:subtitle.toaster_stop": "吐司机完成烤制",

"jei.cookingforblockheads:cow_jar": "罐中奶牛"

"waila.cookingforblockheads:water_stored": "储存水：%d/%d",
"waila.cookingforblockheads:milk_stored": "储存奶：%d/%d",
"waila.cookingforblockheads:toast_progress": "烤制…（%s%%）",
"waila.cookingforblockheads:heating_unit": "升级：加热单元",
"waila.cookingforblockheads:ice_unit": "升级：冷却单元",
"waila.cookingforblockheads:preservation_chamber": "升级：保鲜室",

"cookingforblockheads:subtitle.fridge_open": "冰箱：打开",
"cookingforblockheads:subtitle.fridge_close": "冰箱：关闭",
"cookingforblockheads:subtitle.oven_open": "烤箱：打开",
"cookingforblockheads:subtitle.oven_close": "烤箱：关闭",
"cookingforblockheads:subtitle.toaster_start": "吐司机：烤制吐司",
"cookingforblockheads:subtitle.toaster_stop": "吐司机：完成烤制",

"jei.cookingforblockheads:cow_jar": "罐中牛",

"config.jade.plugin_cookingforblockheads.oven": "烤箱",
"config.jade.plugin_cookingforblockheads.milk_jar": "奶罐",
"config.jade.plugin_cookingforblockheads.toaster": "吐司机",
"config.jade.plugin_cookingforblockheads.fridge": "冰箱",
"config.jade.plugin_cookingforblockheads.sink": "水槽",

"config.cookingforblockheads": "懒人厨房",
"config.cookingforblockheads.cowJarEnabled": "启用罐中牛",
"config.cookingforblockheads.cowJarEnabled.tooltip": "设为true时，在上面扔下铁砧就能把牛砸进奶罐里。",
"config.cookingforblockheads.cowJarMilkPerTick": "每游戏刻的产奶量",
"config.cookingforblockheads.cowJarMilkPerTick.tooltip": "罐中牛的每游戏刻产奶量。",
"config.cookingforblockheads.compressedCowJarMilkMultiplier": "压缩罐中牛的产奶乘数",
"config.cookingforblockheads.compressedCowJarMilkMultiplier.tooltip": "压缩工具兼容。为罐中牛的每游戏刻产奶量附加乘数。",
"config.cookingforblockheads.sinkRequiresWater": "水槽需要水",
"config.cookingforblockheads.sinkRequiresWater.tooltip": "如果你希望水槽需要用管道供水，而不是提供无限水，可以将其设为true。",
"config.cookingforblockheads.largeCounters": "大型厨柜",
"config.cookingforblockheads.largeCounters.tooltip": "启用此功能后，厨柜的物品栏空间将增加一倍。",
"config.cookingforblockheads.disallowOvenAutomation": "禁用烤箱自动化",
"config.cookingforblockheads.disallowOvenAutomation.tooltip": "如果你想禁用烤箱自动化（管道等将无法输入/输出），可以将其设为true。",
"config.cookingforblockheads.ovenFuelTimeMultiplier": "烤箱燃料时间乘数",
"config.cookingforblockheads.ovenFuelTimeMultiplier.tooltip": "烤箱的燃料乘数。数值越大，燃料燃烧时间越长，熔炉的默认值为1.0。",
"config.cookingforblockheads.ovenCookTimeMultiplier": "烤箱烹饪时间乘数",
"config.cookingforblockheads.ovenCookTimeMultiplier.tooltip": "烤箱的烹饪时间乘数。数值越大，烹饪时间越长。",
"config.cookingforblockheads.ovenRequiresCookingOil": "烤箱需要食油",
"config.cookingforblockheads.ovenRequiresCookingOil.tooltip": "如果希望烤箱只接受食油作为燃料，可以将其设为true（需要潘马斯农场）",
"config.cookingforblockheads.showIngredientIcon": "显示食材图标",
"config.cookingforblockheads.showIngredientIcon.tooltip": "如果不想在烹饪手册中用特殊图标标记食材，可以将其设为false。",
"config.cookingforblockheads.allowVeryToastedBread": "允许烤得非常焦的面包",
"config.cookingforblockheads.allowVeryToastedBread.tooltip": "再次烤制烤过的面包会变成木炭（仅当没有其他添加吐司的模组时）。设为false以禁用。"
}
11 changes: 7 additions & 4 deletions shared/src/main/resources/data/cookingforblockheads/recipes/spice_rack.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
"result": {
"item": "cookingforblockheads:spice_rack"
},
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"type": "minecraft:crafting_shaped",
"pattern": [
"SS"
],
"key": {
"S": {
"tag": "minecraft:wooden_slabs"
}
]
}
}

0 comments on commit 00f9cec

Please sign in to comment.