From dc82798bc6cc54e8cfd833cf103478acab6d0531 Mon Sep 17 00:00:00 2001 From: MisileLab Date: Sun, 5 Nov 2023 23:26:43 +0900 Subject: [PATCH 1/2] new patch --- .../0002-a-furnace-recipe-overcooker.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 projects/bdsxs/patches/overcooker/0002-a-furnace-recipe-overcooker.patch diff --git a/projects/bdsxs/patches/overcooker/0002-a-furnace-recipe-overcooker.patch b/projects/bdsxs/patches/overcooker/0002-a-furnace-recipe-overcooker.patch new file mode 100644 index 000000000..c5c1dedeb --- /dev/null +++ b/projects/bdsxs/patches/overcooker/0002-a-furnace-recipe-overcooker.patch @@ -0,0 +1,45 @@ +From d3b7efd81d099cabb5626532852bef835b19a116 Mon Sep 17 00:00:00 2001 +From: MisileLab +Date: Sun, 5 Nov 2023 23:25:54 +0900 +Subject: [PATCH] a furnace recipe - overcooker + +--- + scripts/overcooker/main.ts | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/scripts/overcooker/main.ts b/scripts/overcooker/main.ts +index 6dcd1a0d..287f33ec 100644 +--- a/scripts/overcooker/main.ts ++++ b/scripts/overcooker/main.ts +@@ -2,6 +2,13 @@ import { GameType } from "bdsx/bds/player"; + import { MobEffectIds, MobEffectInstance } from "../../bdsx/bds/effects"; + import { CANCEL } from "../../bdsx/common"; + import { events } from "../../bdsx/event"; ++import { ItemStack } from "bdsx/bds/inventory"; ++ ++const Recipes = { ++ "furnace": { ++ "minecraft:chicken": "minecraft:cooked_chicken" ++ } ++} + + events.playerJoin.on((e)=>{ + // this is debug +@@ -14,7 +21,13 @@ events.blockInteractedWith.on((e)=>{ + } + const block = e.player.getRegion().getBlock(e.blockPos); + if (block.blockLegacy.getCommandName() == "minecraft:furnace") { +- ++ let item = e.player.getInventory().getContainer().getSlots().get(0); ++ let name = item.getName(); ++ if (item == null || Recipes.furnace[name] == undefined) { ++ return CANCEL; ++ } ++ e.player.getInventory().getContainer().getItem(0).load(ItemStack.constructWith(Recipes.furnace[name], 1).save()) ++ e.player.sendInventory() + } else { + return CANCEL; + } +-- +2.42.0.windows.2 + From a87dfdfae216e8862a02ccd4b3ae1518afba33ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 07:10:20 +0000 Subject: [PATCH 2/2] Update dependency uvicorn to v0.24.0.post1 --- archives/sntapi/poetry.lock | 8 ++++---- archives/sntapi/pyproject.toml | 2 +- projects/dsb/iusearchbtw-backend/poetry.lock | 8 ++++---- projects/dsb/iusearchbtw-backend/pyproject.toml | 2 +- projects/dsb/mcs/xms/poetry.lock | 8 ++++---- projects/dsb/mcs/xms/pyproject.toml | 2 +- projects/xobusy/sunrint-decon/poetry.lock | 8 ++++---- projects/xobusy/sunrint-decon/pyproject.toml | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/archives/sntapi/poetry.lock b/archives/sntapi/poetry.lock index 9b134cdee..3a7504106 100644 --- a/archives/sntapi/poetry.lock +++ b/archives/sntapi/poetry.lock @@ -623,13 +623,13 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "uvicorn" -version = "0.24.0" +version = "0.24.0.post1" description = "The lightning-fast ASGI server." optional = false python-versions = ">=3.8" files = [ - {file = "uvicorn-0.24.0-py3-none-any.whl", hash = "sha256:3d19f13dfd2c2af1bfe34dd0f7155118ce689425fdf931177abe832ca44b8a04"}, - {file = "uvicorn-0.24.0.tar.gz", hash = "sha256:368d5d81520a51be96431845169c225d771c9dd22a58613e1a181e6c4512ac33"}, + {file = "uvicorn-0.24.0.post1-py3-none-any.whl", hash = "sha256:7c84fea70c619d4a710153482c0d230929af7bcf76c7bfa6de151f0a3a80121e"}, + {file = "uvicorn-0.24.0.post1.tar.gz", hash = "sha256:09c8e5a79dc466bdf28dead50093957db184de356fcdc48697bad3bde4c2588e"}, ] [package.dependencies] @@ -656,4 +656,4 @@ h11 = ">=0.9.0,<1" [metadata] lock-version = "2.0" python-versions = "3.12.0" -content-hash = "7d45c095334d352896ab03a75a12c6f453510bfe8d9dee890882365dc64c36d4" +content-hash = "3fa64fa61a0ae886ba2b6b033873deaee49fab88a6f98bf5e1d07388056e628b" diff --git a/archives/sntapi/pyproject.toml b/archives/sntapi/pyproject.toml index c40735cf6..543f8278c 100644 --- a/archives/sntapi/pyproject.toml +++ b/archives/sntapi/pyproject.toml @@ -9,7 +9,7 @@ readme = "README.md" [tool.poetry.dependencies] python = "3.12.0" fastapi = "0.104.1" -uvicorn = "0.24.0" +uvicorn = "0.24.0.post1" pymongo = "4.6.0" python-dotenv = "1.0.0" selenium = "4.15.2" diff --git a/projects/dsb/iusearchbtw-backend/poetry.lock b/projects/dsb/iusearchbtw-backend/poetry.lock index e948469f5..476e856f6 100644 --- a/projects/dsb/iusearchbtw-backend/poetry.lock +++ b/projects/dsb/iusearchbtw-backend/poetry.lock @@ -397,13 +397,13 @@ files = [ [[package]] name = "uvicorn" -version = "0.24.0" +version = "0.24.0.post1" description = "The lightning-fast ASGI server." optional = false python-versions = ">=3.8" files = [ - {file = "uvicorn-0.24.0-py3-none-any.whl", hash = "sha256:3d19f13dfd2c2af1bfe34dd0f7155118ce689425fdf931177abe832ca44b8a04"}, - {file = "uvicorn-0.24.0.tar.gz", hash = "sha256:368d5d81520a51be96431845169c225d771c9dd22a58613e1a181e6c4512ac33"}, + {file = "uvicorn-0.24.0.post1-py3-none-any.whl", hash = "sha256:7c84fea70c619d4a710153482c0d230929af7bcf76c7bfa6de151f0a3a80121e"}, + {file = "uvicorn-0.24.0.post1.tar.gz", hash = "sha256:09c8e5a79dc466bdf28dead50093957db184de356fcdc48697bad3bde4c2588e"}, ] [package.dependencies] @@ -416,4 +416,4 @@ standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)", [metadata] lock-version = "2.0" python-versions = "3.12.0" -content-hash = "de15f822fb1295b17eb8b8f0f2e32edf17109e71f5b77520b2eeb6acb32f5d3d" +content-hash = "95245f1f7213065d9525e50c0759b4751a9f24bd5d69c6e908aadeabf7238934" diff --git a/projects/dsb/iusearchbtw-backend/pyproject.toml b/projects/dsb/iusearchbtw-backend/pyproject.toml index 4ee791fd6..06fe6cda2 100644 --- a/projects/dsb/iusearchbtw-backend/pyproject.toml +++ b/projects/dsb/iusearchbtw-backend/pyproject.toml @@ -10,7 +10,7 @@ readme = "README.md" python = "3.12.0" pymongo = "4.6.0" fastapi = "0.104.1" -uvicorn = "0.24.0" +uvicorn = "0.24.0.post1" [build-system] requires = ["poetry-core"] diff --git a/projects/dsb/mcs/xms/poetry.lock b/projects/dsb/mcs/xms/poetry.lock index b419c98af..d58c828e5 100644 --- a/projects/dsb/mcs/xms/poetry.lock +++ b/projects/dsb/mcs/xms/poetry.lock @@ -406,13 +406,13 @@ files = [ [[package]] name = "uvicorn" -version = "0.24.0" +version = "0.24.0.post1" description = "The lightning-fast ASGI server." optional = false python-versions = ">=3.8" files = [ - {file = "uvicorn-0.24.0-py3-none-any.whl", hash = "sha256:3d19f13dfd2c2af1bfe34dd0f7155118ce689425fdf931177abe832ca44b8a04"}, - {file = "uvicorn-0.24.0.tar.gz", hash = "sha256:368d5d81520a51be96431845169c225d771c9dd22a58613e1a181e6c4512ac33"}, + {file = "uvicorn-0.24.0.post1-py3-none-any.whl", hash = "sha256:7c84fea70c619d4a710153482c0d230929af7bcf76c7bfa6de151f0a3a80121e"}, + {file = "uvicorn-0.24.0.post1.tar.gz", hash = "sha256:09c8e5a79dc466bdf28dead50093957db184de356fcdc48697bad3bde4c2588e"}, ] [package.dependencies] @@ -506,4 +506,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "3.12.0" -content-hash = "112a2f2ddcefdbeff05f4d67265d7d0cf3f170fd104b38e5db5153970a12fb2e" +content-hash = "023e2a40a215c546a6c28455b35b5d381cfb61e5003f5009d46d5e424e0f16d8" diff --git a/projects/dsb/mcs/xms/pyproject.toml b/projects/dsb/mcs/xms/pyproject.toml index 6d2f5d694..2cd7557bf 100644 --- a/projects/dsb/mcs/xms/pyproject.toml +++ b/projects/dsb/mcs/xms/pyproject.toml @@ -11,7 +11,7 @@ python = "3.12.0" pymongo = "4.6.0" fastapi = "0.104.1" websockets = "12.0" -uvicorn = "0.24.0" +uvicorn = "0.24.0.post1" python-dotenv = "1.0.0" [build-system] diff --git a/projects/xobusy/sunrint-decon/poetry.lock b/projects/xobusy/sunrint-decon/poetry.lock index 4141037f1..d7928aebe 100644 --- a/projects/xobusy/sunrint-decon/poetry.lock +++ b/projects/xobusy/sunrint-decon/poetry.lock @@ -556,13 +556,13 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "uvicorn" -version = "0.24.0" +version = "0.24.0.post1" description = "The lightning-fast ASGI server." optional = false python-versions = ">=3.8" files = [ - {file = "uvicorn-0.24.0-py3-none-any.whl", hash = "sha256:3d19f13dfd2c2af1bfe34dd0f7155118ce689425fdf931177abe832ca44b8a04"}, - {file = "uvicorn-0.24.0.tar.gz", hash = "sha256:368d5d81520a51be96431845169c225d771c9dd22a58613e1a181e6c4512ac33"}, + {file = "uvicorn-0.24.0.post1-py3-none-any.whl", hash = "sha256:7c84fea70c619d4a710153482c0d230929af7bcf76c7bfa6de151f0a3a80121e"}, + {file = "uvicorn-0.24.0.post1.tar.gz", hash = "sha256:09c8e5a79dc466bdf28dead50093957db184de356fcdc48697bad3bde4c2588e"}, ] [package.dependencies] @@ -575,4 +575,4 @@ standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)", [metadata] lock-version = "2.0" python-versions = "3.12.0" -content-hash = "083ec46709ef6ee8bd42be91d8db0754c0dc39aeab4338431c42f23d230466c3" +content-hash = "4214f6d3843e27ee7166f3aa0af7a539ad6d8a2df9ab2a9188cbc905f07c9f2b" diff --git a/projects/xobusy/sunrint-decon/pyproject.toml b/projects/xobusy/sunrint-decon/pyproject.toml index c67efbb06..f5d5c4683 100644 --- a/projects/xobusy/sunrint-decon/pyproject.toml +++ b/projects/xobusy/sunrint-decon/pyproject.toml @@ -10,7 +10,7 @@ readme = "README.md" python = "3.12.0" pymongo = "4.6.0" fastapi = "0.104.1" -uvicorn = "0.24.0" +uvicorn = "0.24.0.post1" tomli = "2.0.1" requests = "2.31.0"