Merge branch '1.18.x' of https://github.com/eerussianguy/firmalife in…

…to 1.18.x

resources/generate_book.py

@@ -127,7 +127,7 @@ def make_book(rm: ResourceManager, i18n: I18n, local_instance: bool = False):
         entry('jar', 'Jars', 'firmalife:empty_jar', pages=(
             text('$(thing)Jars$() are a way of storing certain items. They can be placed on the ground, in groups of up to four. They are most useful as a way of storing $(l:firmalife:firmalife/beekeeping)Honey$() indefinitely.'),
             multimultiblock('Each possible arrangement of jars.', *[block_spotlight('', '', 'firmalife:honey_jar[count=%s]' % i) for i in range(1, 5)]),
-            crafting('firmalife:crafting/empty_jar', text_contents='It all starts with an $(thing)Empty Jar$(). Jars can be emptied, discarding the contents, by sealing them in a $(l:mechanics/barrels)Barrel$() of Water$().'),
+            crafting('firmalife:crafting/empty_jar', text_contents='It all starts with an $(thing)Empty Jar$(). Jars can be emptied, discarding the contents, by sealing them in a $(l:mechanics/barrels)Barrel$() of $(thing)Water$().'),
             text('The recipes to fill and empty jars are typically simple crafting recipes. Some jars cannot have their insides removed without a special recipe.$(br)$(br)One use of jars is making $(thing)Fruit Preserves$(). To do this, boil an $(thing)Empty Jar$(), a $(thing)Sweetener$(), and fresh $(thing)Fruit$().'),
             text('$(li)Fruit Preserves$()$(li)Guano Jar$()$(li)Honey Jar$()$(li)Rotten Compost Jar$()$(li)Compost Jar$()', 'Jar Types'),
             empty_last_page()

src/main/resources/data/firmalife/patchouli_books/field_guide/en_us/entries/firmalife/jar.json

@@ -69,7 +69,7 @@
     {
       "type": "patchouli:crafting",
       "recipe": "firmalife:crafting/empty_jar",
-      "text": "It all starts with an $(thing)Empty Jar$(). Jars can be emptied, discarding the contents, by sealing them in a $(l:mechanics/barrels)Barrel$() of Water$()."
+      "text": "It all starts with an $(thing)Empty Jar$(). Jars can be emptied, discarding the contents, by sealing them in a $(l:mechanics/barrels)Barrel$() of $(thing)Water$()."
     },
     {
       "type": "patchouli:text",

src/main/resources/data/firmalife/patchouli_books/field_guide/zh_cn/categories/firmalife.json

@@ -0,0 +1,7 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "name": "Firmalife扩展模组",
+  "description": "关于Firmalife扩展模组的一切",
+  "icon": "firmalife:cured_oven_top",
+  "sortnum": 0
+}

src/main/resources/data/firmalife/patchouli_books/field_guide/zh_cn/entries/firmalife/beekeeping.json

@@ -0,0 +1,55 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "name": "养蜂",
+  "category": "firmalife:firmalife",
+  "icon": "firmalife:beehive",
+  "pages": [
+    {
+      "type": "patchouli:text",
+      "text": "$(thing)蜂箱$()是养殖蜜蜂的地方. 蜂箱里面需要有至少一个$(thing)巢脾$()让蜜蜂生活. 如果要从一个有蜂居住的蜂箱中拆除巢脾, 最好在夜晚行动, 或者在蜂箱下生一堆$(thing)篝火$(). 否则被拆家的蜜蜂就会袭击你."
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/beehive",
+      "recipe2": "firmalife:crafting/beehive_frame"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "如果蜂箱周围5个方块的半径内, 有至少10朵花. 那么空的巢脾就有可能出现$(thing)蜂王$(). 这可以从蜂箱周围的粒子效果看出来."
+    },
+    {
+      "type": "patchouli:text",
+      "text": "如果一个蜂箱有两个带蜂王的巢脾, 加上一个空的巢脾, 它们就有可能$(thing)配种$()并在空的巢脾上产生一个新的蜂王. 新的蜂王会继承它的祖先的$(thing)能力$(). $(thing)能力$()是蜜蜂拥有的一些不同特点, 这决定了它们如何影响周围的环境. 这些能力有1-10的等级, 其中10是最大的."
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/honey_jar_open",
+      "text": "蜜蜂也会生产$(thing)蜂蜜$(). 手持$(l:firmalife:firmalife/jar)空罐子$()对着有蜂蜜的蜂箱按$(item)$(k:key.use)$()就可以得到$(thing)蜂蜜罐子$(). 打开蜂蜜罐子可以得到$(thing)生蜂蜜$(), 是一种$(thing)糖$()的替代品."
+    },
+    {
+      "type": "patchouli:text",
+      "text": "在物品栏有$(thing)刀$()的情况下, 手持一个满的巢脾按$(item)$(k:key.use)$()可以获得有用的$(thing)蜂蜡$(). 注意, 这个操作会杀死巢脾中的蜂王!"
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/treated_lumber",
+      "text": "蜂蜡最重要的作用是制作$(thing)防腐木材$()."
+    },
+    {
+      "type": "patchouli:text",
+      "text": "$(li)蜜蜂可以帮种植盆提供营养.$()$(li)注意, 用刀刮蜂脾会牺牲蜂王!$()$(li)把身体弄湿可以防止蜜蜂攻击你.$()",
+      "title": "养蜂提示"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "$(li)$(thing)耐寒性$(): 可以让蜜蜂在更低的温度下生产蜂蜜. 10级的耐寒性可以忍受-16°C的低温, 而1级的耐寒性可以忍受2°C的低温.$()$(li)$(thing)生产力$(): 提高蜂蜜生产的速度.$()$(li)$(thing)突变体$(): 提高配种时传给下一代的能力值的标准差.$().",
+      "title": "能力列表"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "$(li)$(thing)生育能力$(): 提高配种的可能性.$()$(li)$(thing)作物亲和力$(): 给农作物传递少量营养物质的可能性.$()$(li)$(thing)自然修复$(): 造成新的花或荷叶在蜂箱附近生成.$()$(li)$(thing)冷静度$(): 降低蜜蜂攻击你的可能性$()."
+    }
+  ],
+  "read_by_default": true,
+  "sortnum": 5
+}

src/main/resources/data/firmalife/patchouli_books/field_guide/zh_cn/entries/firmalife/bread.json

@@ -0,0 +1,19 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "name": "面包",
+  "category": "firmalife:firmalife",
+  "icon": "tfc:food/rye_bread",
+  "pages": [
+    {
+      "type": "patchouli:text",
+      "text": "制作$(thing)面包$()需要$(thing)酵母$(). 要获得第一个酵母, 把$(l:firmalife:firmalife/drying)烘干的水果$()密封在一大桶$(thing)水$()里. 三天后就可以得到$(thing)酵种$().$(br)从现在开始, 你就可以把面粉密封在装有酵种的大桶里喂养你的酵母. 这会让酵母的数量翻倍. 每100mB酵种搭配一份面粉可以得到600mB的酵种."
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/barley_dough",
+      "text": "酵种, 甜味剂, 加上面粉, 就可以合成$(thing)面团$(). 把面团烤熟就可以得到$(thing)面包$()了!"
+    }
+  ],
+  "read_by_default": true,
+  "sortnum": 11
+}

src/main/resources/data/firmalife/patchouli_books/field_guide/zh_cn/entries/firmalife/cellar.json

@@ -0,0 +1,30 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "name": "地窖",
+  "category": "firmalife:firmalife",
+  "icon": "firmalife:sealed_bricks",
+  "pages": [
+    {
+      "type": "patchouli:text",
+      "text": "$(thing)地窖$()是一种被$(l:firmalife:firmalife/climate_station)气象站$()控制的多方块建筑. 建造地窖的唯一要求就是用$(thing)密封砖$()或者$(thing)密封门$()建造一个完全封闭的空间. 气象站必须放在地窖的第一层, 紧靠着墙."
+    },
+    {
+      "type": "patchouli:multiblock",
+      "multiblock_id": "firmalife:cellar",
+      "name": "地窖的一个范例",
+      "text": "这只是你可以建造的无数种地窖的一个例子!",
+      "enable_visualize": true
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/sealed_bricks",
+      "recipe2": "firmalife:crafting/sealed_door"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "$(thing)蜂蜡$()可以通过$(l:firmalife:firmalife/beekeeping)养蜂$()获得.$(br)地窖可以用来$(l:firmalife:firmalife/cheese#aging)老化奶酪$()."
+    }
+  ],
+  "read_by_default": true,
+  "sortnum": 2
+}

src/main/resources/data/firmalife/patchouli_books/field_guide/zh_cn/entries/firmalife/cheese.json

@@ -0,0 +1,87 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "name": "奶酪",
+  "category": "firmalife:firmalife",
+  "icon": "firmalife:food/gouda",
+  "pages": [
+    {
+      "type": "patchouli:text",
+      "text": "在Firmalife中制造$(thing)奶酪$()要稍微复杂一点. 一共有两种奶: $(thing)牦牛奶$()和$(thing)山羊奶$(). 给$(l:mechanics/animal_husbandry#yak)牦牛$()和$(l:mechanics/animal_husbandry#goat)山羊$()挤奶可以得到它们. 当然, 给$(l:mechanics/animal_husbandry#cow)奶牛$()挤奶仍然可以获得传统的牛奶."
+    },
+    {
+      "type": "patchouli:text",
+      "text": "牛奶首先要用$(thing)凝乳酶$()制成$(thing)凝固的牛奶$(). 凝乳酶可以从$(thing)反刍$()动物的胃获得. 这些动物包括$(l:mechanics/animal_husbandry#yak)牦牛$(), $(l:mechanics/animal_husbandry#cow)奶牛$(), $(l:mechanics/animal_husbandry#sheep)绵羊$(), $(l:mechanics/animal_husbandry#goat)山羊$(), 和$(l:mechanics/animal_husbandry#musk_ox)麝牛$(). 把牛奶和凝乳酶一起密封在$(l:mechanics/barrels)大桶$()4小时就可以凝固."
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/cheesecloth",
+      "text": "凝固的牛奶和$(thing)奶酪布$()一起密封在大桶中就可以制成$(thing)凝乳$(). 奶酪布是不能重复使用的."
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/cheddar_wheel",
+      "text": "现在你可以制造$(thing)干奶酪$()了. 你可以用$(thing)牦牛奶凝乳$()制作$(thing)Rajya Metok奶酪$(), 可以用$(thing)山羊奶凝乳$()制作$(thing)Chevre奶酪$(), 以及用$(thing)牛奶凝乳$()制造$(thing)Cheddar奶酪$()."
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/chevre_wheel",
+      "recipe2": "firmalife:crafting/cheddar_wheel"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "你也可以选择制作$(thing)湿奶酪$(). 把凝乳密封在装有$(thing)咸水$()的大桶中即可. 你可以用$(thing)牦牛奶凝乳$()制作$(thing)Shosha奶酪$(), 可以用$(thing)山羊奶凝乳$()制作$(thing)Feta奶酪$(), 以及用$(thing)牛奶凝乳$()制造$(thing)Gouda奶酪$()."
+    },
+    {
+      "type": "patchouli:text",
+      "anchor": "aging",
+      "text": "奶酪轮应该以方块形式被放置储存. 为了提高它的风味和保质期, 奶酪轮最好是放在$(l:firmalife:firmalife/cellar)地窖$()里$(thing)老化$(), 正如窖藏白酒那样. 如果要从奶酪轮上获得可食用的奶酪, 手持$(thing)刀$()并且按$(item)$(k:key.use)$()就可以切一片下来. 如果直接打碎这个奶酪轮方块, 那么陈年奶酪的效果就消失了!"
+    },
+    {
+      "type": "tfc:multimultiblock",
+      "text": "Gouda奶酪轮的老化顺序: $(thing)新鲜$(), $(thing)老化$(), 以及$(thing)Vintage$().",
+      "multiblocks": [
+        {
+          "pattern": [
+            [
+              "X"
+            ],
+            [
+              "0"
+            ]
+          ],
+          "mapping": {
+            "X": "firmalife:gouda_wheel[age=fresh]"
+          }
+        },
+        {
+          "pattern": [
+            [
+              "X"
+            ],
+            [
+              "0"
+            ]
+          ],
+          "mapping": {
+            "X": "firmalife:gouda_wheel[age=aged]"
+          }
+        },
+        {
+          "pattern": [
+            [
+              "X"
+            ],
+            [
+              "0"
+            ]
+          ],
+          "mapping": {
+            "X": "firmalife:gouda_wheel[age=vintage]"
+          }
+        }
+      ]
+    }
+  ],
+  "read_by_default": true,
+  "sortnum": 0
+}

src/main/resources/data/firmalife/patchouli_books/field_guide/zh_cn/entries/firmalife/climate_station.json

@@ -0,0 +1,56 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "name": "气象站",
+  "category": "firmalife:firmalife",
+  "icon": "firmalife:climate_station",
+  "pages": [
+    {
+      "type": "patchouli:text",
+      "text": "$(thing)气象站$()是用来管理$(l:firmalife:firmalife/greenhouse)温室$()和$(l:firmalife:firmalife/cellar)地窖$()的方块. 如果温室或地窖的多方块结构被正确的建造完成, 它就会在方块侧面显示水. 如果建造的不正确, 就会显示冰. 气象站必须放在多方块结构的第一层, 并且紧靠着墙."
+    },
+    {
+      "type": "tfc:multimultiblock",
+      "text": "处于有效和无效状态的气象站.",
+      "multiblocks": [
+        {
+          "pattern": [
+            [
+              "X"
+            ],
+            [
+              "0"
+            ]
+          ],
+          "mapping": {
+            "X": "firmalife:climate_station[stasis=true]"
+          }
+        },
+        {
+          "pattern": [
+            [
+              "X"
+            ],
+            [
+              "0"
+            ]
+          ],
+          "mapping": {
+            "X": "firmalife:climate_station[stasis=false]"
+          }
+        }
+      ]
+    },
+    {
+      "type": "patchouli:text",
+      "text": "$(li)它每间隔一段时间都会自动更新.$()$(li)当气象站更新时, 它会触发结构中的所有其他方块发生更新. 例如, 它会让$(l:firmalife:firmalife/cheese)奶酪$()开始老化.$()$(li)按$(item)$(k:key.use)$()就可以手动触发一次更新.",
+      "title": "气象站提示"
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/climate_station",
+      "text": "气象站的合成方法."
+    }
+  ],
+  "read_by_default": true,
+  "sortnum": 1
+}

src/main/resources/data/firmalife/patchouli_books/field_guide/zh_cn/entries/firmalife/drying.json

@@ -0,0 +1,38 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "name": "烘干",
+  "category": "firmalife:firmalife",
+  "icon": "firmalife:drying_mat",
+  "pages": [
+    {
+      "type": "patchouli:text",
+      "text": "$(thing)干燥垫$()是用来烘干物品的. 它使用$(thing)果树叶子$()制成. 果树叶子可以打碎$(thing)果树$()的叶子得到."
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/drying_mat",
+      "text": "干燥垫的合成配方."
+    },
+    {
+      "type": "patchouli:text",
+      "text": "要使用干燥垫, 把它放置在阳光下, 然后按$(item)$(k:key.use)$()来放置一个物品. 在半天之后, 物品就会被烘干. 如果下雨了, 这个烘干过程就需要重新开始."
+    },
+    {
+      "type": "firmalife:drying_recipe",
+      "recipe": "firmalife:drying/drying_fruit",
+      "text": "干燥垫一般用来烘干水果. 烘干的水果有更长的保质期, 并且在某些配方中会用到."
+    },
+    {
+      "type": "firmalife:drying_recipe",
+      "recipe": "firmalife:drying/tofu",
+      "text": "豆腐需要用干燥垫制作."
+    },
+    {
+      "type": "firmalife:drying_recipe",
+      "recipe": "firmalife:drying/cinnamon",
+      "text": "肉桂需要用干燥垫制作."
+    }
+  ],
+  "read_by_default": true,
+  "sortnum": 8
+}

src/main/resources/data/firmalife/patchouli_books/field_guide/zh_cn/entries/firmalife/greenhouse.json

@@ -0,0 +1,55 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "name": "温室",
+  "category": "firmalife:firmalife",
+  "icon": "firmalife:sealed_bricks",
+  "pages": [
+    {
+      "type": "patchouli:text",
+      "text": "$(thing)温室$()是一种被$(l:firmalife:firmalife/climate_station)气象站$()控制的多方块建筑. 它全年都能种植农作物. 有很多种温室和温室方块可供选择, 建造一个温室是很简单的. 就像$(l:firmalife:firmalife/cellar)地窖$()一样, 温室需要用属于同种$(thing)温室类型$()的建筑方块建造一个封闭的空间. 温室的地板可以是任意固体方块."
+    },
+    {
+      "type": "patchouli:text",
+      "text": "属于同一种$(thing)温室类型$()的建筑方块可以互相替换使用. 大多数的温室方块都会$(thing)老化$(). 例如, $(thing)防腐木$()材质的温室方块会慢慢变成$(thing)风化的防腐木$(). 由于这两种方块都属于同一种温室类型, 所以这种情况下温室还是能继续正常工作."
+    },
+    {
+      "type": "patchouli:text",
+      "text": "以下是所有的$(thing)温室类型$(), 并且它们可能老化变成:$(br)$(br)$(li)防腐木: 风化的 $()$(li)铜: 斑驳的, 风化的, 氧化的$()$(li)铁: 生锈的$() $(li)不锈钢 (不会老化)$()",
+      "title": "温室类型"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "一共有四种$(thing)温室方块$(): 墙壁, 门, 屋檐, 屋顶. 屋檐和屋顶看起来像是楼梯和台阶. 你可以任意组合这四种方块用于建造你的温室."
+    },
+    {
+      "type": "tfc:multimultiblock",
+      "text": "每种类型的温室的一个范例",
+      "multiblocks": [
+        "firmalife:treated_wood_greenhouse",
+        "firmalife:copper_greenhouse",
+        "firmalife:iron_greenhouse",
+        "firmalife:stainless_steel_greenhouse"
+      ]
+    },
+    {
+      "type": "patchouli:text",
+      "text": "下面两页介绍了四种温室方块的配方. 这里仅介绍了铁质温室, 其中的铁棒可以替换成$(thing)防腐木材$(),$(thing)铜棒$(),或者$(thing)不锈钢棒$(). 关于不锈钢的信息, 请看$(l:firmalife:firmalife/stainless_steel)此页$()."
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/greenhouse/iron_greenhouse_wall",
+      "recipe2": "firmalife:crafting/greenhouse/iron_greenhouse_roof"
+    },
+    {
+      "type": "patchouli:crafting",
+      "recipe": "firmalife:crafting/greenhouse/iron_greenhouse_door",
+      "recipe2": "firmalife:crafting/greenhouse/iron_greenhouse_roof_top"
+    },
+    {
+      "type": "patchouli:text",
+      "text": "有一些方块可以在温室中工作:$(br)$(li)$(l:firmalife:firmalife/planters)种植盆$(), 用来种植农作物$()"
+    }
+  ],
+  "read_by_default": true,
+  "sortnum": 3
+}