From c9707757460c5eb7721e2f5d5b7dd6de913fd68c Mon Sep 17 00:00:00 2001 From: averyc1876 Date: Tue, 2 Sep 2025 18:49:54 +0100 Subject: [PATCH 1/7] AoG: fix firepit contstruction not being handled (Assumed) due to changes in 1.21 dry grass no longer has thatch at the start of its item code - changed the if statements just to tell if the player is shifting to start the AoG firepit construction. --- ArtOfGrowing/Items/AOGItemDryGrass.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ArtOfGrowing/Items/AOGItemDryGrass.cs b/ArtOfGrowing/Items/AOGItemDryGrass.cs index e5333c2..b87280c 100644 --- a/ArtOfGrowing/Items/AOGItemDryGrass.cs +++ b/ArtOfGrowing/Items/AOGItemDryGrass.cs @@ -12,18 +12,18 @@ public class AOGItemDryGrass : ItemDryGrass { public override void OnHeldInteractStart(ItemSlot itemslot, EntityAgent byEntity, BlockSelection blockSel, EntitySelection entitySel, bool firstEvent, ref EnumHandHandling handHandling) { - if (byEntity.Controls.ShiftKey && byEntity.Controls.CtrlKey) + if (byEntity.Controls.ShiftKey) { - Interact(itemslot, byEntity, blockSel, entitySel, firstEvent, ref handHandling); + if (byEntity.Controls.CtrlKey) + { + Interact(itemslot, byEntity, blockSel, entitySel, firstEvent, ref handHandling); + return; + } + + OnHeldInteractStartThatch(itemslot, byEntity, blockSel, entitySel, firstEvent, ref handHandling); return; } - if (itemslot.Itemstack.Item.Code.FirstCodePart() == "thatch") - { - OnHeldInteractStartThatch(itemslot, byEntity, blockSel, entitySel, firstEvent, ref handHandling); - return; - } - base.OnHeldInteractStart(itemslot, byEntity, blockSel, entitySel, firstEvent, ref handHandling); } From d91de0ad3a62b3c4279a575d151ca088c92574c0 Mon Sep 17 00:00:00 2001 From: averyc1876 Date: Tue, 2 Sep 2025 18:54:10 +0100 Subject: [PATCH 2/7] AoC: fixed crash when making dough from flour Dough behaviour patch missed a dependsOn for butchering causing the game to try to load buthering items whether or not the mod was loaded. --- .../assets/artofcooking/patches/dough.json | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/ArtOfCooking/assets/artofcooking/patches/dough.json b/ArtOfCooking/assets/artofcooking/patches/dough.json index affebda..07ddb4f 100644 --- a/ArtOfCooking/assets/artofcooking/patches/dough.json +++ b/ArtOfCooking/assets/artofcooking/patches/dough.json @@ -76,6 +76,44 @@ "file": "game:itemtypes/food/flour.json", "side": "Server" }, + { + "op": "addmerge", + "path": "/behaviors/-", + "value": { + "name": "COAInLiquidMixing", + "properties": { + "mixingType": "doughkneading", + "inLiquidMixingList": [ + { + "initialCode": "game:flour-{type}", + "sourceSize": 1, + "inputLitres": 1, + "inputStack": { + "type": "item", + "code": "butchering:bloodportion" + }, + "outputStacks": [ + { + "type": "item", + "code": "artofcooking:doughpiece-blooddough-{type}", + "stackSize": 8 + } + ], + "needExactLitres": true, + "canBulk": true, + "mixingTime": 2.5, + "animation": "squeezehoneycomb", + "sound": "sounds/player/squeezehoneycomb" + } + ] + } + }, + "file": "game:itemtypes/food/flour.json", + "dependsOn": [ + { "modid": "butchering" } + ], + "side": "Server" + }, { "op": "addmerge", "path": "/attributes/handbook", From 7bbc1c4e76641a42d40298391148287a0c61f136 Mon Sep 17 00:00:00 2001 From: averyc1876 Date: Wed, 3 Sep 2025 21:09:27 +0100 Subject: [PATCH 3/7] AoG: fixed recipes fixed standard flail using using old leather item code fixed flaxbundle using old ceramic bowl block code --- ArtOfGrowing/assets/artofgrowing/recipes/grid/flail.json | 2 +- .../assets/artofgrowing/recipes/grid/flaxbundle-clear.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ArtOfGrowing/assets/artofgrowing/recipes/grid/flail.json b/ArtOfGrowing/assets/artofgrowing/recipes/grid/flail.json index 2db3a89..dd7e07d 100644 --- a/ArtOfGrowing/assets/artofgrowing/recipes/grid/flail.json +++ b/ArtOfGrowing/assets/artofgrowing/recipes/grid/flail.json @@ -3,7 +3,7 @@ "ingredients": { "L": { "type": "item", - "code": "game:leather-normal-*", + "code": "game:leather-*", "name": "leather" }, "M": { diff --git a/ArtOfGrowing/assets/artofgrowing/recipes/grid/flaxbundle-clear.json b/ArtOfGrowing/assets/artofgrowing/recipes/grid/flaxbundle-clear.json index 7596d29..8fc51f8 100644 --- a/ArtOfGrowing/assets/artofgrowing/recipes/grid/flaxbundle-clear.json +++ b/ArtOfGrowing/assets/artofgrowing/recipes/grid/flaxbundle-clear.json @@ -34,7 +34,7 @@ "ingredients": { "W": { "type": "block", - "code": "game:bowl-fired" + "code": "game:bowl-{color}-fired" }, "F": { "type": "item", From 404602c08d5edc4ef3b224d35aa9b7fc16283170 Mon Sep 17 00:00:00 2001 From: averyc1876 Date: Wed, 3 Sep 2025 21:10:51 +0100 Subject: [PATCH 4/7] AoC: Fixed lang and recipe item codes Lang: en, ru, fixed old ceramic bowl block code Recipe: fixed nutcandy using old ceramic bowl block code --- ArtOfCooking/assets/artofcooking/lang/en.json | 2 +- ArtOfCooking/assets/artofcooking/lang/ru.json | 2 +- ArtOfCooking/assets/artofcooking/recipes/grid/nutcandy.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ArtOfCooking/assets/artofcooking/lang/en.json b/ArtOfCooking/assets/artofcooking/lang/en.json index 6aee2da..eb68ea2 100644 --- a/ArtOfCooking/assets/artofcooking/lang/en.json +++ b/ArtOfCooking/assets/artofcooking/lang/en.json @@ -89,7 +89,7 @@ "artofcooking:blockdesc-copperbowl-*": "It can no longer be used. If you still have such a bowl, you can disassemble it in the crafting grid.", "artofcooking:block-handbooktitle-metalpot": "Use", - "artofcooking:block-handbooktext-metalpot": "See Meal making guide. You cannot eat from a cooking pot directly, you will need a bowl. If you want to empty a bowl or cooking pot without eating the contents, simply toss it in some water!", + "artofcooking:block-handbooktext-metalpot": "See Meal making guide. You cannot eat from a cooking pot directly, you will need a bowl. If you want to empty a bowl or cooking pot without eating the contents, simply toss it in some water!", "artofcooking:block-handbooktext-dirtymetalpot": "A cooking pot used to cook up glue or other non-food recipes becomes caked in residue. A residue-covered cooking pot cannot be used for meal-making with food ingredients, but is still quite handy for other purposes. A copper pot can be washed by soaking in vinegar for a day.", "artofcooking:block-handbooktitle-metalbowl": "Use", diff --git a/ArtOfCooking/assets/artofcooking/lang/ru.json b/ArtOfCooking/assets/artofcooking/lang/ru.json index 86b2314..d29bda8 100644 --- a/ArtOfCooking/assets/artofcooking/lang/ru.json +++ b/ArtOfCooking/assets/artofcooking/lang/ru.json @@ -90,7 +90,7 @@ "artofcooking:blockdesc-copperbowl-*": "Больше нельзя использовать. Если у вас осталась такая миска, вы можете разобрать её в сетке крафта.", "artofcooking:block-handbooktitle-metalpot": "Использование", - "artofcooking:block-handbooktext-metalpot": "Смотрите руководство по приготовлению пищи<\/a>. Вы не можете есть непосредственно из кастрюли, для этого понадобится миска<\/a>. Если вы хотите опустошить миску или кастрюлю, не съедая содержимого, просто бросьте их в воду!", + "artofcooking:block-handbooktext-metalpot": "Смотрите руководство по приготовлению пищи<\/a>. Вы не можете есть непосредственно из кастрюли, для этого понадобится миска<\/a>. Если вы хотите опустошить миску или кастрюлю, не съедая содержимого, просто бросьте их в воду!", "artofcooking:block-handbooktext-dirtymetalpot": "Кастрюля, используемая для приготовления клея<\/a> или других непищевых рецептов, становится покрыта остатками. Покрытая остатками кастрюля не может быть использована для приготовления пищи, но она вполне пригодится для других целей. Медную кастрюлю можно отмыть, замочив в уксусе на сутки.", "artofcooking:block-handbooktitle-metalbowl": "Применение", diff --git a/ArtOfCooking/assets/artofcooking/recipes/grid/nutcandy.json b/ArtOfCooking/assets/artofcooking/recipes/grid/nutcandy.json index 9b34d87..734896d 100644 --- a/ArtOfCooking/assets/artofcooking/recipes/grid/nutcandy.json +++ b/ArtOfCooking/assets/artofcooking/recipes/grid/nutcandy.json @@ -476,7 +476,7 @@ "ingredients": { "K": { "type": "block", - "code": "game:bowl-fired" + "code": "game:bowl-{color}-fired" }, "H": { "type": "item", From 9e1709fb857981c4f75cbf8af7cb6d92a33bf303 Mon Sep 17 00:00:00 2001 From: averyc1876 Date: Wed, 3 Sep 2025 21:12:19 +0100 Subject: [PATCH 5/7] CoA: Changed world interaction itemstack display --- CoreOfArt/CoreOfArt/Blocks/COABlockBucket.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoreOfArt/CoreOfArt/Blocks/COABlockBucket.cs b/CoreOfArt/CoreOfArt/Blocks/COABlockBucket.cs index a7dd90d..78f2f2f 100644 --- a/CoreOfArt/CoreOfArt/Blocks/COABlockBucket.cs +++ b/CoreOfArt/CoreOfArt/Blocks/COABlockBucket.cs @@ -54,7 +54,7 @@ public override WorldInteraction[] GetHeldInteractionHelp(ItemSlot inSlot) MouseButton = EnumMouseButton.Right, HotKeyCode = "ctrl", Itemstacks = stacks.ToArray(), - GetMatchingStacks = (wi, bs, es) => { + GetMatchingStacks = (wi, _, _) => { bool canMixing = false; foreach (var recipe in api.GetLiquidMixingRecipes()) { From 5f74b39e84fe0d0eb51ff5480946fd117d06554f Mon Sep 17 00:00:00 2001 From: averyc1876 Date: Wed, 3 Sep 2025 21:16:00 +0100 Subject: [PATCH 6/7] Revert 3 Commits, meant for new-develpopment This reverts commit 9e1709fb857981c4f75cbf8af7cb6d92a33bf303. Revert "AoG: fixed recipes" This reverts commit 7bbc1c4e76641a42d40298391148287a0c61f136. Revert "AoC: Fixed lang and recipe item codes" This reverts commit 404602c08d5edc4ef3b224d35aa9b7fc16283170. Meant to make these commits in the other branch, not this one --- ArtOfCooking/assets/artofcooking/lang/en.json | 2 +- ArtOfCooking/assets/artofcooking/lang/ru.json | 2 +- ArtOfCooking/assets/artofcooking/recipes/grid/nutcandy.json | 2 +- ArtOfGrowing/assets/artofgrowing/recipes/grid/flail.json | 2 +- .../assets/artofgrowing/recipes/grid/flaxbundle-clear.json | 2 +- CoreOfArt/CoreOfArt/Blocks/COABlockBucket.cs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ArtOfCooking/assets/artofcooking/lang/en.json b/ArtOfCooking/assets/artofcooking/lang/en.json index eb68ea2..6aee2da 100644 --- a/ArtOfCooking/assets/artofcooking/lang/en.json +++ b/ArtOfCooking/assets/artofcooking/lang/en.json @@ -89,7 +89,7 @@ "artofcooking:blockdesc-copperbowl-*": "It can no longer be used. If you still have such a bowl, you can disassemble it in the crafting grid.", "artofcooking:block-handbooktitle-metalpot": "Use", - "artofcooking:block-handbooktext-metalpot": "See Meal making guide. You cannot eat from a cooking pot directly, you will need a bowl. If you want to empty a bowl or cooking pot without eating the contents, simply toss it in some water!", + "artofcooking:block-handbooktext-metalpot": "See Meal making guide. You cannot eat from a cooking pot directly, you will need a bowl. If you want to empty a bowl or cooking pot without eating the contents, simply toss it in some water!", "artofcooking:block-handbooktext-dirtymetalpot": "A cooking pot used to cook up glue or other non-food recipes becomes caked in residue. A residue-covered cooking pot cannot be used for meal-making with food ingredients, but is still quite handy for other purposes. A copper pot can be washed by soaking in vinegar for a day.", "artofcooking:block-handbooktitle-metalbowl": "Use", diff --git a/ArtOfCooking/assets/artofcooking/lang/ru.json b/ArtOfCooking/assets/artofcooking/lang/ru.json index d29bda8..86b2314 100644 --- a/ArtOfCooking/assets/artofcooking/lang/ru.json +++ b/ArtOfCooking/assets/artofcooking/lang/ru.json @@ -90,7 +90,7 @@ "artofcooking:blockdesc-copperbowl-*": "Больше нельзя использовать. Если у вас осталась такая миска, вы можете разобрать её в сетке крафта.", "artofcooking:block-handbooktitle-metalpot": "Использование", - "artofcooking:block-handbooktext-metalpot": "Смотрите руководство по приготовлению пищи<\/a>. Вы не можете есть непосредственно из кастрюли, для этого понадобится миска<\/a>. Если вы хотите опустошить миску или кастрюлю, не съедая содержимого, просто бросьте их в воду!", + "artofcooking:block-handbooktext-metalpot": "Смотрите руководство по приготовлению пищи<\/a>. Вы не можете есть непосредственно из кастрюли, для этого понадобится миска<\/a>. Если вы хотите опустошить миску или кастрюлю, не съедая содержимого, просто бросьте их в воду!", "artofcooking:block-handbooktext-dirtymetalpot": "Кастрюля, используемая для приготовления клея<\/a> или других непищевых рецептов, становится покрыта остатками. Покрытая остатками кастрюля не может быть использована для приготовления пищи, но она вполне пригодится для других целей. Медную кастрюлю можно отмыть, замочив в уксусе на сутки.", "artofcooking:block-handbooktitle-metalbowl": "Применение", diff --git a/ArtOfCooking/assets/artofcooking/recipes/grid/nutcandy.json b/ArtOfCooking/assets/artofcooking/recipes/grid/nutcandy.json index 734896d..9b34d87 100644 --- a/ArtOfCooking/assets/artofcooking/recipes/grid/nutcandy.json +++ b/ArtOfCooking/assets/artofcooking/recipes/grid/nutcandy.json @@ -476,7 +476,7 @@ "ingredients": { "K": { "type": "block", - "code": "game:bowl-{color}-fired" + "code": "game:bowl-fired" }, "H": { "type": "item", diff --git a/ArtOfGrowing/assets/artofgrowing/recipes/grid/flail.json b/ArtOfGrowing/assets/artofgrowing/recipes/grid/flail.json index dd7e07d..2db3a89 100644 --- a/ArtOfGrowing/assets/artofgrowing/recipes/grid/flail.json +++ b/ArtOfGrowing/assets/artofgrowing/recipes/grid/flail.json @@ -3,7 +3,7 @@ "ingredients": { "L": { "type": "item", - "code": "game:leather-*", + "code": "game:leather-normal-*", "name": "leather" }, "M": { diff --git a/ArtOfGrowing/assets/artofgrowing/recipes/grid/flaxbundle-clear.json b/ArtOfGrowing/assets/artofgrowing/recipes/grid/flaxbundle-clear.json index 8fc51f8..7596d29 100644 --- a/ArtOfGrowing/assets/artofgrowing/recipes/grid/flaxbundle-clear.json +++ b/ArtOfGrowing/assets/artofgrowing/recipes/grid/flaxbundle-clear.json @@ -34,7 +34,7 @@ "ingredients": { "W": { "type": "block", - "code": "game:bowl-{color}-fired" + "code": "game:bowl-fired" }, "F": { "type": "item", diff --git a/CoreOfArt/CoreOfArt/Blocks/COABlockBucket.cs b/CoreOfArt/CoreOfArt/Blocks/COABlockBucket.cs index 78f2f2f..a7dd90d 100644 --- a/CoreOfArt/CoreOfArt/Blocks/COABlockBucket.cs +++ b/CoreOfArt/CoreOfArt/Blocks/COABlockBucket.cs @@ -54,7 +54,7 @@ public override WorldInteraction[] GetHeldInteractionHelp(ItemSlot inSlot) MouseButton = EnumMouseButton.Right, HotKeyCode = "ctrl", Itemstacks = stacks.ToArray(), - GetMatchingStacks = (wi, _, _) => { + GetMatchingStacks = (wi, bs, es) => { bool canMixing = false; foreach (var recipe in api.GetLiquidMixingRecipes()) { From f71d5f50419e6e38d0f522df93b1dda8a6683818 Mon Sep 17 00:00:00 2001 From: averyc1876 Date: Thu, 4 Sep 2025 21:22:02 +0100 Subject: [PATCH 7/7] AoG: Fixed claypot cooking not functioning properly Proper fix this time, changed paths in claypot patch to work for 1.21 Revert "AoG: fix firepit contstruction not being handled" This reverts commit 0ca26685fc77db8ef8323df1e75b6aad5bf3a57a. --- ArtOfGrowing/Items/AOGItemDryGrass.cs | 16 ++++++++-------- .../assets/artofgrowing/patches/claypot.json | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ArtOfGrowing/Items/AOGItemDryGrass.cs b/ArtOfGrowing/Items/AOGItemDryGrass.cs index b87280c..e5333c2 100644 --- a/ArtOfGrowing/Items/AOGItemDryGrass.cs +++ b/ArtOfGrowing/Items/AOGItemDryGrass.cs @@ -12,18 +12,18 @@ public class AOGItemDryGrass : ItemDryGrass { public override void OnHeldInteractStart(ItemSlot itemslot, EntityAgent byEntity, BlockSelection blockSel, EntitySelection entitySel, bool firstEvent, ref EnumHandHandling handHandling) { - if (byEntity.Controls.ShiftKey) + if (byEntity.Controls.ShiftKey && byEntity.Controls.CtrlKey) { - if (byEntity.Controls.CtrlKey) - { - Interact(itemslot, byEntity, blockSel, entitySel, firstEvent, ref handHandling); - return; - } - - OnHeldInteractStartThatch(itemslot, byEntity, blockSel, entitySel, firstEvent, ref handHandling); + Interact(itemslot, byEntity, blockSel, entitySel, firstEvent, ref handHandling); return; } + if (itemslot.Itemstack.Item.Code.FirstCodePart() == "thatch") + { + OnHeldInteractStartThatch(itemslot, byEntity, blockSel, entitySel, firstEvent, ref handHandling); + return; + } + base.OnHeldInteractStart(itemslot, byEntity, blockSel, entitySel, firstEvent, ref handHandling); } diff --git a/ArtOfGrowing/assets/artofgrowing/patches/claypot.json b/ArtOfGrowing/assets/artofgrowing/patches/claypot.json index d7eea3f..bbcaf01 100644 --- a/ArtOfGrowing/assets/artofgrowing/patches/claypot.json +++ b/ArtOfGrowing/assets/artofgrowing/patches/claypot.json @@ -1,7 +1,7 @@ [ { "op": "addmerge", - "path": "/attributesByType/claypot-cooked/textureMapping", + "path": "/attributesByType/claypot-blue-cooked/textureMapping", "value": { "vegetable-scallions": [ "vegetable", "scallions" ], @@ -103,16 +103,16 @@ "seeds-gigantic-peanut": [ "vegetable", "group12" ], "pickledlegume-gigantic-soybean": [ "vegetable", "group9" ] }, - "file": "game:blocktypes/clay/pot.json", + "file": "game:blocktypes/clay/fired/pot.json", "side": "Server" }, { "op": "addmerge", - "path": "/texturesByType/*/scallions", + "path": "/textures/scallions", "value": { "base": "block/wood/barrel/raw-scallions" }, - "file": "game:blocktypes/clay/pot.json", + "file": "game:blocktypes/clay/fired/pot.json", "side": "Server" } ] \ No newline at end of file