From 8f2f2a3efbdd0658fa9b4f4872243840f3c0fe86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=2E=20=E2=80=9CLy=C5=ABke=E2=80=9D=20Monaggem?= Date: Fri, 20 Sep 2024 10:45:09 +0800 Subject: [PATCH 1/2] Lang & recipes --- .../caupona/datagen/CPItemModelProvider.java | 2 + .../resources/assets/caupona/lang/en_us.json | 54 ++++++++++++++++++- .../resources/assets/caupona/lang/zh_cn.json | 51 ++++++++++++++++++ .../caupona/recipe/campfire_cooking/loaf.json | 13 +++++ .../caupona/recipe/crafting/loaf_heap.json | 16 ++++++ .../recipe/crafting/loaf_heap_slab.json | 15 ++++++ .../recipe/crafting/loaf_heap_stairs.json | 17 ++++++ .../recipe/crafting/loaf_heap_wall.json | 16 ++++++ .../recipe/crafting/walnut_hanging_sign.json | 20 +++++++ .../data/caupona/recipe/dolium/black_dye.json | 3 +- .../data/caupona/recipe/dolium/brown_dye.json | 3 +- .../caupona/recipe/dolium/fig_sapling.json | 3 +- .../recipe/dolium/light_gray_concrete.json | 3 +- .../caupona/recipe/dolium/loaf_dough.json | 20 +++++++ .../caupona/recipe/dolium/oak_sapling.json | 3 +- .../caupona/recipe/dolium/orange_dye.json | 3 +- .../caupona/recipe/dolium/snail_bait.json | 3 +- .../caupona/recipe/dolium/walnut_sapling.json | 3 +- .../recipe/dolium/wolfberry_sapling.json | 3 +- .../data/caupona/recipe/smelting/loaf.json | 13 +++++ .../data/caupona/recipe/stonecutter/loaf.json | 10 ++++ .../recipe/stonecutter/loaf_from_slab.json | 10 ++++ .../recipe/stonecutter/loaf_heap_slab.json | 10 ++++ .../recipe/stonecutter/loaf_heap_stairs.json | 10 ++++ .../recipe/stonecutter/loaf_heap_wall.json | 10 ++++ 25 files changed, 303 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/data/caupona/recipe/campfire_cooking/loaf.json create mode 100644 src/main/resources/data/caupona/recipe/crafting/loaf_heap.json create mode 100644 src/main/resources/data/caupona/recipe/crafting/loaf_heap_slab.json create mode 100644 src/main/resources/data/caupona/recipe/crafting/loaf_heap_stairs.json create mode 100644 src/main/resources/data/caupona/recipe/crafting/loaf_heap_wall.json create mode 100644 src/main/resources/data/caupona/recipe/crafting/walnut_hanging_sign.json create mode 100644 src/main/resources/data/caupona/recipe/dolium/loaf_dough.json create mode 100644 src/main/resources/data/caupona/recipe/smelting/loaf.json create mode 100644 src/main/resources/data/caupona/recipe/stonecutter/loaf.json create mode 100644 src/main/resources/data/caupona/recipe/stonecutter/loaf_from_slab.json create mode 100644 src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_slab.json create mode 100644 src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_stairs.json create mode 100644 src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_wall.json diff --git a/src/datagen/java/com/teammoeg/caupona/datagen/CPItemModelProvider.java b/src/datagen/java/com/teammoeg/caupona/datagen/CPItemModelProvider.java index e660bb07..e4d09faf 100644 --- a/src/datagen/java/com/teammoeg/caupona/datagen/CPItemModelProvider.java +++ b/src/datagen/java/com/teammoeg/caupona/datagen/CPItemModelProvider.java @@ -60,6 +60,8 @@ protected void registerModels() { simpleTexture("water", "soups/"); simpleTexture("milk", "soups/"); texture("loaf_bowl", "bread_bowl"); + texture("loaf", "cob_loaf"); + texture("loaf_dough"); for (String s : CPItems.aspics) simpleTexture(s, "aspics/"); simpleTexture("milk_based", "bases/"); diff --git a/src/main/resources/assets/caupona/lang/en_us.json b/src/main/resources/assets/caupona/lang/en_us.json index d5cd7815..18bd8b04 100644 --- a/src/main/resources/assets/caupona/lang/en_us.json +++ b/src/main/resources/assets/caupona/lang/en_us.json @@ -117,6 +117,7 @@ "block.caupona.walnut_stairs": "Walnut Stairs", "block.caupona.walnut_trapdoor": "Walnut Trapdoor", "block.caupona.walnut_wood": "Walnut Wood", + "block.caupona.walnut_hanging_sign": "Walnut Hanging Sign", "block.caupona.stripped_walnut_log": "Stripped Walnut Log", "block.caupona.stripped_walnut_wood": "Stripped Walnut Wood", "block.caupona.copper_frying_pan": "Copper Frying Pan", @@ -245,8 +246,8 @@ "item.caupona.borscht": "Borscht", "item.caupona.borscht_cream": "Borscht with Cream", "item.caupona.congee": "Congee", - "item.caupona.cream_of_meat_soup": "Cream Of Meat Soup", - "item.caupona.cream_of_mushroom_soup": "Cream Of Mushroom Soup", + "item.caupona.cream_of_meat_soup": "Cream of Meat Soup", + "item.caupona.cream_of_mushroom_soup": "Cream of Mushroom Soup", "item.caupona.custard": "Custard", "item.caupona.dilute_soup": "Dilute Soup", "item.caupona.egg_drop_soup": "Egg Drop Soup", @@ -289,6 +290,55 @@ "item.caupona.sauteed_vegetables": "Sautéed Vegetables", "item.caupona.seared_fillet": "Seared Fillet", "item.caupona.seared_poultry": "Seared Poultry", + "item.caupona.acquacotta_loaf": "Acquacotta in Bread Bowl", + "item.caupona.bisque_loaf": "Bisque in Bread Bowl", + "item.caupona.borscht_loaf": "Borscht in Bread Bowl", + "item.caupona.borscht_cream_loaf": "Borscht with Cream in Bread Bowl", + "item.caupona.congee_loaf": "Congee in Bread Bowl", + "item.caupona.cream_of_meat_soup_loaf": "Cream of Meat Soup in Bread Bowl", + "item.caupona.cream_of_mushroom_soup_loaf": "Cream of Mushroom Soup in Bread Bowl", + "item.caupona.custard_loaf": "Custard in Bread Bowl", + "item.caupona.dilute_soup_loaf": "Dilute Soup in Bread Bowl", + "item.caupona.egg_drop_soup_loaf": "Egg Drop Soup in Bread Bowl", + "item.caupona.egg_tongsui_loaf": "Egg Tongsui in Bread Bowl", + "item.caupona.fish_chowder_loaf": "Fish Chowder in Bread Bowl", + "item.caupona.fish_soup_loaf": "Fish Soup in Bread Bowl", + "item.caupona.fricassee_loaf": "Fricassée in Bread Bowl", + "item.caupona.goji_tongsui_loaf": "Goji Tongsui in Bread Bowl", + "item.caupona.goulash_loaf": "Goulash in Bread Bowl", + "item.caupona.gruel_loaf": "Gruel in Bread Bowl", + "item.caupona.hodgepodge_loaf": "Hodge-Podge in Bread Bowl", + "item.caupona.meat_soup_loaf": "Meat Stew in Bread Bowl", + "item.caupona.mushroom_soup_loaf": "Mushroom Soup in Bread Bowl", + "item.caupona.nail_soup_loaf": "Nail Soup in Bread Bowl", + "item.caupona.nettle_soup_loaf": "Nettle Soup in Bread Bowl", + "item.caupona.okroshka_loaf": "Okroshka in Bread Bowl", + "item.caupona.milk_loaf": "Plain Milk in Bread Bowl", + "item.caupona.water_loaf": "Plain Water in Bread Bowl", + "item.caupona.porridge_loaf": "Porridge in Bread Bowl", + "item.caupona.poultry_soup_loaf": "Poultry Soup in Bread Bowl", + "item.caupona.pumpkin_soup_loaf": "Pumpkin Soup in Bread Bowl", + "item.caupona.pumpkin_soup_cream_loaf": "Cream of Pumpkin Soup in Bread Bowl", + "item.caupona.rice_pudding_loaf": "Rice Pudding in Bread Bowl", + "item.caupona.scalded_milk_loaf": "Scalded Milk in Bread Bowl", + "item.caupona.seaweed_soup_loaf": "Seaweed Soup in Bread Bowl", + "item.caupona.stock_loaf": "Stock in Bread Bowl", + "item.caupona.stracciatella_loaf": "Stracciatella in Bread Bowl", + "item.caupona.ukha_loaf": "Ukha in Bread Bowl", + "item.caupona.vegetable_chowder_loaf": "Vegetable Chowder in Bread Bowl", + "item.caupona.vegetable_soup_loaf": "Vegetable Soup in Bread Bowl", + "item.caupona.walnut_soup_loaf": "Walnut Soup in Bread Bowl", + "item.caupona.huevos_pericos_loaf": "Huevos Pericos in Bread Bowl", + "item.caupona.sauteed_beef_loaf": "Sautéed Beef in Bread Bowl", + "item.caupona.sauteed_greens_loaf": "Sautéed Greens in Bread Bowl", + "item.caupona.sauteed_hodgepodge_loaf": "Sautéed Hodge-Podge in Bread Bowl", + "item.caupona.sauteed_meat_loaf": "Sautéed Meat in Bread Bowl", + "item.caupona.sauteed_mushrooms_loaf": "Sautéed Mushrooms in Bread Bowl", + "item.caupona.sauteed_roots_loaf": "Sautéed Roots in Bread Bowl", + "item.caupona.sauteed_seafood_loaf": "Sautéed Seafood in Bread Bowl", + "item.caupona.sauteed_vegetables_loaf": "Sautéed Vegetables in Bread Bowl", + "item.caupona.seared_fillet_loaf": "Seared Fillet in Bread Bowl", + "item.caupona.seared_poultry_loaf": "Seared Poultry in Bread Bowl", "item.caupona.any_based": "No Limit", "item.caupona.milk_based": "Milk", "item.caupona.stock_based": "Stock", diff --git a/src/main/resources/assets/caupona/lang/zh_cn.json b/src/main/resources/assets/caupona/lang/zh_cn.json index 12021cac..8da98cf8 100644 --- a/src/main/resources/assets/caupona/lang/zh_cn.json +++ b/src/main/resources/assets/caupona/lang/zh_cn.json @@ -117,6 +117,7 @@ "block.caupona.walnut_stairs": "核桃木楼梯", "block.caupona.walnut_trapdoor": "核桃木活板门", "block.caupona.walnut_wood": "核桃木", + "block.caupona.walnut_hanging_sign": "悬挂式核桃木告示牌", "block.caupona.stripped_walnut_log": "去皮核桃原木", "block.caupona.stripped_walnut_wood": "去皮核桃木", "block.caupona.copper_frying_pan": "铜制煎锅", @@ -287,6 +288,56 @@ "item.caupona.sauteed_vegetables": "炒蔬菜", "item.caupona.seared_fillet": "嫩煎鱼", "item.caupona.seared_poultry": "嫩煎禽肉", + "item.caupona.acquacotta_loaf": "面包碗盛面包汤", + "item.caupona.bisque_loaf": "面包碗盛海鲜浓汤", + "item.caupona.bone_gelatin_loaf": "面包碗盛骨胶", + "item.caupona.borscht_loaf": "面包碗盛罗宋汤", + "item.caupona.borscht_cream_loaf": "面包碗盛奶油罗宋汤", + "item.caupona.congee_loaf": "面包碗盛米粥", + "item.caupona.cream_of_meat_soup_loaf": "面包碗盛奶油炖肉", + "item.caupona.cream_of_mushroom_soup_loaf": "面包碗盛奶油蘑菇汤", + "item.caupona.custard_loaf": "面包碗盛奶黄", + "item.caupona.dilute_soup_loaf": "面包碗盛稀汤", + "item.caupona.egg_drop_soup_loaf": "面包碗盛蛋花汤", + "item.caupona.egg_tongsui_loaf": "面包碗盛糖水蛋", + "item.caupona.fish_chowder_loaf": "面包碗盛海鲜杂烩汤", + "item.caupona.fish_soup_loaf": "面包碗盛鱼汤", + "item.caupona.fricassee_loaf": "面包碗盛白汁炖肉", + "item.caupona.goji_tongsui_loaf": "面包碗盛枸杞糖水", + "item.caupona.goulash_loaf": "面包碗盛红烩牛肉", + "item.caupona.gruel_loaf": "面包碗盛麦粥", + "item.caupona.hodgepodge_loaf": "面包碗盛杂烩汤", + "item.caupona.meat_soup_loaf": "面包碗盛肉汤", + "item.caupona.mushroom_soup_loaf": "面包碗盛蘑菇汤", + "item.caupona.nail_soup_loaf": "面包碗盛钉子汤", + "item.caupona.nettle_soup_loaf": "面包碗盛荨麻汤", + "item.caupona.okroshka_loaf": "面包碗盛蔬菜冻汤", + "item.caupona.milk_loaf": "面包碗盛牛奶", + "item.caupona.water_loaf": "面包碗盛水", + "item.caupona.porridge_loaf": "面包碗盛牛奶麦片粥", + "item.caupona.poultry_soup_loaf": "面包碗盛禽肉汤", + "item.caupona.pumpkin_soup_loaf": "面包碗盛南瓜汤", + "item.caupona.pumpkin_soup_cream_loaf": "面包碗盛奶油南瓜汤", + "item.caupona.rice_pudding_loaf": "面包碗盛米布丁", + "item.caupona.scalded_milk_loaf": "面包碗盛热牛奶", + "item.caupona.seaweed_soup_loaf": "面包碗盛海带汤", + "item.caupona.stock_loaf": "面包碗盛高汤", + "item.caupona.stracciatella_loaf": "面包碗盛蔬菜蛋花汤", + "item.caupona.ukha_loaf": "面包碗盛乌哈汤", + "item.caupona.vegetable_chowder_loaf": "面包碗盛奶油蔬菜汤", + "item.caupona.vegetable_soup_loaf": "面包碗盛蔬菜汤", + "item.caupona.walnut_soup_loaf": "面包碗盛核桃露", + "item.caupona.huevos_pericos_loaf": "面包碗盛鹦鹉蛋", + "item.caupona.sauteed_beef_loaf": "面包碗盛嫩煎牛肉", + "item.caupona.sauteed_greens_loaf": "面包碗盛炒绿叶蔬菜", + "item.caupona.sauteed_hodgepodge_loaf": "面包碗盛杂烩", + "item.caupona.sauteed_meat_loaf": "面包碗盛嫩煎肉", + "item.caupona.sauteed_mushrooms_loaf": "面包碗盛炒蘑菇", + "item.caupona.sauteed_roots_loaf": "面包碗盛炒根茎", + "item.caupona.sauteed_seafood_loaf": "面包碗盛嫩煎海鲜", + "item.caupona.sauteed_vegetables_loaf": "面包碗盛炒蔬菜", + "item.caupona.seared_fillet_loaf": "面包碗盛嫩煎鱼", + "item.caupona.seared_poultry_loaf": "面包碗盛嫩煎禽肉", "item.caupona.any_based": "无限制", "item.caupona.milk_based": "牛奶", "item.caupona.stock_based": "高汤", diff --git a/src/main/resources/data/caupona/recipe/campfire_cooking/loaf.json b/src/main/resources/data/caupona/recipe/campfire_cooking/loaf.json new file mode 100644 index 00000000..4140405c --- /dev/null +++ b/src/main/resources/data/caupona/recipe/campfire_cooking/loaf.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:campfire_cooking", + "category": "food", + "cookingtime": 200, + "experience": 0.35, + "ingredient": { + "item": "caupona:loaf_dough" + }, + "result": { + "id": "caupona:loaf", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/crafting/loaf_heap.json b/src/main/resources/data/caupona/recipe/crafting/loaf_heap.json new file mode 100644 index 00000000..a3140c84 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/crafting/loaf_heap.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "LL", + "LL" + ], + "key": { + "L": { + "item": "caupona:loaf" + } + }, + "result": { + "id": "caupona:loaf_heap", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/crafting/loaf_heap_slab.json b/src/main/resources/data/caupona/recipe/crafting/loaf_heap_slab.json new file mode 100644 index 00000000..7e335c44 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/crafting/loaf_heap_slab.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "BBB" + ], + "key": { + "B": { + "item": "caupona:loaf_heap" + } + }, + "result": { + "id": "caupona:loaf_heap_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/crafting/loaf_heap_stairs.json b/src/main/resources/data/caupona/recipe/crafting/loaf_heap_stairs.json new file mode 100644 index 00000000..a8aa7d92 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/crafting/loaf_heap_stairs.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "B ", + "BB ", + "BBB" + ], + "key": { + "B": { + "item": "caupona:loaf_heap" + } + }, + "result": { + "id": "caupona:loaf_heap_stairs", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/crafting/loaf_heap_wall.json b/src/main/resources/data/caupona/recipe/crafting/loaf_heap_wall.json new file mode 100644 index 00000000..f63cd6c5 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/crafting/loaf_heap_wall.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "BBB", + "BBB" + ], + "key": { + "B": { + "item": "caupona:loaf_heap" + } + }, + "result": { + "id": "caupona:loaf_heap_wall", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/crafting/walnut_hanging_sign.json b/src/main/resources/data/caupona/recipe/crafting/walnut_hanging_sign.json new file mode 100644 index 00000000..17e3c749 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/crafting/walnut_hanging_sign.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "C C", + "LLL", + "LLL" + ], + "key": { + "C": { + "item": "minecraft:chain" + }, + "L": { + "item": "caupona:stripped_walnut_log" + } + }, + "result": { + "id": "caupona:walnut_hanging_sign", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/black_dye.json b/src/main/resources/data/caupona/recipe/dolium/black_dye.json index 09b22c61..808a5960 100644 --- a/src/main/resources/data/caupona/recipe/dolium/black_dye.json +++ b/src/main/resources/data/caupona/recipe/dolium/black_dye.json @@ -15,5 +15,6 @@ "output": { "id": "minecraft:black_dye", "count": 2 - } + }, + "time": 1200 } \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/brown_dye.json b/src/main/resources/data/caupona/recipe/dolium/brown_dye.json index e5e2b1ba..c2025528 100644 --- a/src/main/resources/data/caupona/recipe/dolium/brown_dye.json +++ b/src/main/resources/data/caupona/recipe/dolium/brown_dye.json @@ -15,5 +15,6 @@ "output": { "id": "minecraft:brown_dye", "count": 4 - } + }, + "time": 1200 } \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/fig_sapling.json b/src/main/resources/data/caupona/recipe/dolium/fig_sapling.json index 9537f646..912645bb 100644 --- a/src/main/resources/data/caupona/recipe/dolium/fig_sapling.json +++ b/src/main/resources/data/caupona/recipe/dolium/fig_sapling.json @@ -19,5 +19,6 @@ "output": { "id": "caupona:fig_sapling", "count": 1 - } + }, + "time": 12000 } \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/light_gray_concrete.json b/src/main/resources/data/caupona/recipe/dolium/light_gray_concrete.json index 23f35dbb..5fc27e9a 100644 --- a/src/main/resources/data/caupona/recipe/dolium/light_gray_concrete.json +++ b/src/main/resources/data/caupona/recipe/dolium/light_gray_concrete.json @@ -39,5 +39,6 @@ "output": { "id": "minecraft:light_gray_concrete", "count": 16 - } + }, + "time": 1200 } \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/loaf_dough.json b/src/main/resources/data/caupona/recipe/dolium/loaf_dough.json new file mode 100644 index 00000000..a898be41 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/dolium/loaf_dough.json @@ -0,0 +1,20 @@ +{ + "type": "caupona:dolium", + "items": [ + { + "item": "minecraft:wheat", + "count": 5 + } + ], + "fluid": { + "amount": 1000, + "fluid": "minecraft:water" + }, + "density": 0.0, + "keepInfo": false, + "output": { + "id": "caupona:loaf_dough", + "count": 1 + }, + "time": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/oak_sapling.json b/src/main/resources/data/caupona/recipe/dolium/oak_sapling.json index a265d464..c6b9cd00 100644 --- a/src/main/resources/data/caupona/recipe/dolium/oak_sapling.json +++ b/src/main/resources/data/caupona/recipe/dolium/oak_sapling.json @@ -19,5 +19,6 @@ "output": { "id": "minecraft:oak_sapling", "count": 1 - } + }, + "time": 12000 } \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/orange_dye.json b/src/main/resources/data/caupona/recipe/dolium/orange_dye.json index 727ebba3..43d55986 100644 --- a/src/main/resources/data/caupona/recipe/dolium/orange_dye.json +++ b/src/main/resources/data/caupona/recipe/dolium/orange_dye.json @@ -15,5 +15,6 @@ "output": { "id": "minecraft:orange_dye", "count": 6 - } + }, + "time": 1200 } \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/snail_bait.json b/src/main/resources/data/caupona/recipe/dolium/snail_bait.json index c27a6116..a9a06f11 100644 --- a/src/main/resources/data/caupona/recipe/dolium/snail_bait.json +++ b/src/main/resources/data/caupona/recipe/dolium/snail_bait.json @@ -31,5 +31,6 @@ "output": { "id": "caupona:snail_bait", "count": 1 - } + }, + "time": 200 } \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/walnut_sapling.json b/src/main/resources/data/caupona/recipe/dolium/walnut_sapling.json index e9ad178d..c3bb45fe 100644 --- a/src/main/resources/data/caupona/recipe/dolium/walnut_sapling.json +++ b/src/main/resources/data/caupona/recipe/dolium/walnut_sapling.json @@ -19,5 +19,6 @@ "output": { "id": "caupona:walnut_sapling", "count": 1 - } + }, + "time": 12000 } \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/wolfberry_sapling.json b/src/main/resources/data/caupona/recipe/dolium/wolfberry_sapling.json index bf92e0d0..d8e24987 100644 --- a/src/main/resources/data/caupona/recipe/dolium/wolfberry_sapling.json +++ b/src/main/resources/data/caupona/recipe/dolium/wolfberry_sapling.json @@ -19,5 +19,6 @@ "output": { "id": "caupona:wolfberry_sapling", "count": 1 - } + }, + "time": 12000 } \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/smelting/loaf.json b/src/main/resources/data/caupona/recipe/smelting/loaf.json new file mode 100644 index 00000000..3f8cc398 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/smelting/loaf.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 400, + "experience": 0.35, + "ingredient": { + "item": "caupona:loaf_dough" + }, + "result": { + "id": "caupona:loaf", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/stonecutter/loaf.json b/src/main/resources/data/caupona/recipe/stonecutter/loaf.json new file mode 100644 index 00000000..91cf1d41 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/stonecutter/loaf.json @@ -0,0 +1,10 @@ +{ + "type": "stonecutting", + "ingredient": { + "item": "caupona:loaf_heap" + }, + "result": { + "id": "caupona:loaf" + }, + "count": 4 +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/stonecutter/loaf_from_slab.json b/src/main/resources/data/caupona/recipe/stonecutter/loaf_from_slab.json new file mode 100644 index 00000000..0b1cdfa4 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/stonecutter/loaf_from_slab.json @@ -0,0 +1,10 @@ +{ + "type": "stonecutting", + "ingredient": { + "item": "caupona:loaf_heap_slab" + }, + "result": { + "id": "caupona:loaf" + }, + "count": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_slab.json b/src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_slab.json new file mode 100644 index 00000000..719eb992 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_slab.json @@ -0,0 +1,10 @@ +{ + "type": "stonecutting", + "ingredient": { + "item": "caupona:loaf_heap" + }, + "result": { + "id": "caupona:loaf_heap_slab" + }, + "count": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_stairs.json b/src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_stairs.json new file mode 100644 index 00000000..5c617192 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_stairs.json @@ -0,0 +1,10 @@ +{ + "type": "stonecutting", + "ingredient": { + "item": "caupona:loaf_heap" + }, + "result": { + "id": "caupona:loaf_heap_stairs" + }, + "count":1 +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_wall.json b/src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_wall.json new file mode 100644 index 00000000..3e48e28e --- /dev/null +++ b/src/main/resources/data/caupona/recipe/stonecutter/loaf_heap_wall.json @@ -0,0 +1,10 @@ +{ + "type": "stonecutting", + "ingredient": { + "item": "caupona:loaf_heap" + }, + "result": { + "id": "caupona:loaf_heap_wall" + }, + "count":1 +} \ No newline at end of file From d2b8a4fa592db9521d3b1337a8f90570b103a332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=2E=20=E2=80=9CLy=C5=ABke=E2=80=9D=20Monaggem?= Date: Fri, 20 Sep 2024 15:06:38 +0800 Subject: [PATCH 2/2] Lang & recipes --- .../resources/assets/caupona/lang/en_us.json | 6 ++++- .../resources/assets/caupona/lang/zh_cn.json | 6 ++++- .../recipe/crafting/asses_recycle.json | 3 ++- .../recipe/crafting/bread_from_loaf.json | 10 ++++++++ .../caupona/recipe/crafting/kitchen_rail.json | 23 +++++++++++++++++++ .../caupona/recipe/dolium/loaf_dough.json | 2 +- 6 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/data/caupona/recipe/crafting/bread_from_loaf.json create mode 100644 src/main/resources/data/caupona/recipe/crafting/kitchen_rail.json diff --git a/src/main/resources/assets/caupona/lang/en_us.json b/src/main/resources/assets/caupona/lang/en_us.json index 18bd8b04..eb850dfa 100644 --- a/src/main/resources/assets/caupona/lang/en_us.json +++ b/src/main/resources/assets/caupona/lang/en_us.json @@ -171,9 +171,12 @@ "item.caupona.clay_cistern": "Clay Pot", "block.caupona.fumarole_boulder": "Fumarole Boulder", "block.caupona.fumarole_vent": "Fumarole Vent", + "block.caupona.litharge_fumarole_boulder": "Plumbiferous Fumarole Boulder", + "block.caupona.litharge_fumarole_vent": "Plumbiferous Fumarole Vent", "block.caupona.gravy_boat": "Gravy Boat", "block.caupona.pumice": "Pumice", "block.caupona.pumice_bloom": "Pumice Bloom", + "block.caupona.litharge_bloom": "Litharge Bloom", "block.caupona.stew_pot": "Earthen Stew Pot", "block.caupona.stone_griddle": "Stone Griddle", "block.caupona.wolf_statue": "Wolf Statue", @@ -203,7 +206,8 @@ "block.caupona.tessellation_workbench": "Tesselation Workbench", "block.caupona.loaf": "Cob Loaf", "block.caupona.loaf_dough": "Loaf Dough", - "block_caupona.loaf_bowl": "Bread Bowl", + "block.caupona.loaf_bowl": "Bread Bowl", + "block.caupona.kitchen_rail": "Kitchen Rail", "item.caupona.book": "Vade Mecum for Innkeepers", "item.caupona.bone_gelatin": "Bone Gelatin", "item.caupona.chives_spice_jar": "Spice Jar of Chives", diff --git a/src/main/resources/assets/caupona/lang/zh_cn.json b/src/main/resources/assets/caupona/lang/zh_cn.json index 8da98cf8..5577a9df 100644 --- a/src/main/resources/assets/caupona/lang/zh_cn.json +++ b/src/main/resources/assets/caupona/lang/zh_cn.json @@ -171,9 +171,12 @@ "item.caupona.clay_cistern": "黏土缸", "block.caupona.fumarole_boulder": "火山喷气孔石块", "block.caupona.fumarole_vent": "火山喷气孔", + "block.caupona.litharge_fumarole_boulder": "富铅火山喷气孔石块", + "block.caupona.litharge_fumarole_vent": "富铅火山喷气孔", "block.caupona.gravy_boat": "油舟", "block.caupona.pumice": "浮岩", "block.caupona.pumice_bloom": "浮岩华", + "block.caupona.litharge_bloom": "密陀僧华", "block.caupona.stew_pot": "陶制汤锅", "block.caupona.stone_griddle": "石鏊", "block.caupona.wolf_statue": "狼雕像", @@ -203,7 +206,8 @@ "block.caupona.tessellation_workbench": "马赛克工作台", "block.caupona.loaf": "面包轮", "block.caupona.loaf_dough": "大面团", - "block_caupona.loaf_bowl": "面包碗", + "block.caupona.loaf_bowl": "面包碗", + "block.caupona.kitchen_rail": "厨具架", "item.caupona.book": "分茶清供", "item.caupona.acquacotta": "面包汤", "item.caupona.bisque": "海鲜浓汤", diff --git a/src/main/resources/data/caupona/recipe/crafting/asses_recycle.json b/src/main/resources/data/caupona/recipe/crafting/asses_recycle.json index 059f3428..dae3bb46 100644 --- a/src/main/resources/data/caupona/recipe/crafting/asses_recycle.json +++ b/src/main/resources/data/caupona/recipe/crafting/asses_recycle.json @@ -10,6 +10,7 @@ } }, "result": { - "id": "minecraft:raw_copper" + "id": "minecraft:raw_copper", + "count": 3 } } \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/crafting/bread_from_loaf.json b/src/main/resources/data/caupona/recipe/crafting/bread_from_loaf.json new file mode 100644 index 00000000..78368aab --- /dev/null +++ b/src/main/resources/data/caupona/recipe/crafting/bread_from_loaf.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + {"item": "caupona:loaf"} + ], + "result": { + "id": "minecraft:bread", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/crafting/kitchen_rail.json b/src/main/resources/data/caupona/recipe/crafting/kitchen_rail.json new file mode 100644 index 00000000..317b88b0 --- /dev/null +++ b/src/main/resources/data/caupona/recipe/crafting/kitchen_rail.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SIS", + "S S", + "P P" + ], + "key": { + "S": { + "item": "minecraft:stick" + }, + "I": { + "item": "minecraft:iron_bars" + }, + "P": { + "tag": "minecraft:planks" + } + }, + "result": { + "id": "caupona:kitchen_rail", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/caupona/recipe/dolium/loaf_dough.json b/src/main/resources/data/caupona/recipe/dolium/loaf_dough.json index a898be41..58c21562 100644 --- a/src/main/resources/data/caupona/recipe/dolium/loaf_dough.json +++ b/src/main/resources/data/caupona/recipe/dolium/loaf_dough.json @@ -3,7 +3,7 @@ "items": [ { "item": "minecraft:wheat", - "count": 5 + "count": 3 } ], "fluid": {