From ea32b3b542c55f9610a25759c0a41b9f491f1f48 Mon Sep 17 00:00:00 2001 From: Aksiome <54895777+aksiome@users.noreply.github.com> Date: Tue, 26 Nov 2024 19:28:56 +0100 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=8F=B7=EF=B8=8F=20Dump=20to=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.yml | 2 +- .../function/get_entity/registry/17.mcfunction | 1 + .../function/get_entity/registry/46.mcfunction | 2 ++ .../function/get_entity/registry/56.mcfunction | 1 + .../function/get_entity/registry/72.mcfunction | 17 +++++++++++++++++ .../data/bs.hitbox/predicate/salmon/large.json | 10 ++++++++++ .../data/bs.hitbox/predicate/salmon/small.json | 10 ++++++++++ .../tags/entity_type/size/group_64.json | 4 +++- .../tags/entity_type/size/group_8.json | 4 +++- .../bs.move/tags/block/can_pass_through.json | 3 +-- .../bs.view/tags/block/can_see_through.json | 3 +-- docs/CHANGELOG.md | 1 + docs/_static/switcher.json | 5 +++++ docs/modules/move.md | 4 ---- 14 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/72.mcfunction create mode 100644 datapacks/Bookshelf/data/bs.hitbox/predicate/salmon/large.json create mode 100644 datapacks/Bookshelf/data/bs.hitbox/predicate/salmon/small.json diff --git a/.env.yml b/.env.yml index 464d3f4dbc..853252b841 100644 --- a/.env.yml +++ b/.env.yml @@ -1,4 +1,4 @@ -mc_version: "1.21.2" +mc_version: "1.21.3" documentation_url: "https://bookshelf.docs.gunivers.net/" diff --git a/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/17.mcfunction b/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/17.mcfunction index a488f7ddb2..4a534ded66 100644 --- a/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/17.mcfunction +++ b/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/17.mcfunction @@ -14,4 +14,5 @@ # ------------------------------------------------------------------------------------------------------------ # dolphin group +execute unless predicate bs.hitbox:is_baby run return run data modify storage bs:out hitbox set value {width:0.585,height:0.39} data modify storage bs:out hitbox set value {width:0.9,height:0.6} diff --git a/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/46.mcfunction b/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/46.mcfunction index 33199266d3..6f6790b755 100644 --- a/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/46.mcfunction +++ b/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/46.mcfunction @@ -14,4 +14,6 @@ # ------------------------------------------------------------------------------------------------------------ # salmon group +execute unless predicate bs.hitbox:salmon/large run return run data modify storage bs:out hitbox set value {width:1.05,height:0.6} +execute unless predicate bs.hitbox:salmon/small run return run data modify storage bs:out hitbox set value {width:0.35,height:0.2} data modify storage bs:out hitbox set value {width:0.7,height:0.4} diff --git a/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/56.mcfunction b/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/56.mcfunction index 370a673d91..3713705586 100644 --- a/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/56.mcfunction +++ b/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/56.mcfunction @@ -14,4 +14,5 @@ # ------------------------------------------------------------------------------------------------------------ # squid group +execute unless predicate bs.hitbox:is_baby run return run data modify storage bs:out hitbox set value {width:0.4,height:0.4} data modify storage bs:out hitbox set value {width:0.8,height:0.8} diff --git a/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/72.mcfunction b/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/72.mcfunction new file mode 100644 index 0000000000..3661171ad3 --- /dev/null +++ b/datapacks/Bookshelf/data/bs.hitbox/function/get_entity/registry/72.mcfunction @@ -0,0 +1,17 @@ +# ------------------------------------------------------------------------------------------------------------ +# Copyright (c) 2024 Gunivers +# +# This file is part of the Bookshelf project (https://github.com/Gunivers/Bookshelf). +# +# This source code is subject to the terms of the Mozilla Public License, v. 2.0. +# If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# Conditions: +# - You may use this file in compliance with the MPL v2.0 +# - Any modifications must be documented and disclosed under the same license +# +# For more details, refer to the MPL v2.0. +# ------------------------------------------------------------------------------------------------------------ + +# creaking group +data modify storage bs:out hitbox set value {width:0.9,height:2.7} diff --git a/datapacks/Bookshelf/data/bs.hitbox/predicate/salmon/large.json b/datapacks/Bookshelf/data/bs.hitbox/predicate/salmon/large.json new file mode 100644 index 0000000000..0b5dbf7305 --- /dev/null +++ b/datapacks/Bookshelf/data/bs.hitbox/predicate/salmon/large.json @@ -0,0 +1,10 @@ +{ + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "type_specific": { + "type": "minecraft:salmon", + "variant": "large" + } + } +} diff --git a/datapacks/Bookshelf/data/bs.hitbox/predicate/salmon/small.json b/datapacks/Bookshelf/data/bs.hitbox/predicate/salmon/small.json new file mode 100644 index 0000000000..11fc3fd9be --- /dev/null +++ b/datapacks/Bookshelf/data/bs.hitbox/predicate/salmon/small.json @@ -0,0 +1,10 @@ +{ + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "type_specific": { + "type": "minecraft:salmon", + "variant": "small" + } + } +} diff --git a/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_64.json b/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_64.json index 2f7d051626..719adf8b1f 100644 --- a/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_64.json +++ b/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_64.json @@ -7,6 +7,8 @@ "minecraft:player", "minecraft:goat", "minecraft:villager", - "minecraft:armadillo" + "minecraft:armadillo", + "minecraft:creaking", + "minecraft:creaking_transient" ] } diff --git a/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_8.json b/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_8.json index ac8e7cfd46..5cf9eaab74 100644 --- a/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_8.json +++ b/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_8.json @@ -31,6 +31,8 @@ "minecraft:turtle", "minecraft:vex", "minecraft:warden", - "minecraft:wither" + "minecraft:wither", + "minecraft:creaking", + "minecraft:creaking_transient" ] } diff --git a/datapacks/Bookshelf/data/bs.move/tags/block/can_pass_through.json b/datapacks/Bookshelf/data/bs.move/tags/block/can_pass_through.json index 5270652b4c..d3fab70779 100644 --- a/datapacks/Bookshelf/data/bs.move/tags/block/can_pass_through.json +++ b/datapacks/Bookshelf/data/bs.move/tags/block/can_pass_through.json @@ -10,8 +10,7 @@ "#minecraft:rails", "#minecraft:saplings", "#minecraft:signs", - "#minecraft:small_flowers", - "#minecraft:tall_flowers", + "#minecraft:flowers", "minecraft:big_dripleaf_stem", "minecraft:brain_coral_fan", "minecraft:brain_coral_wall_fan", diff --git a/datapacks/Bookshelf/data/bs.view/tags/block/can_see_through.json b/datapacks/Bookshelf/data/bs.view/tags/block/can_see_through.json index 5270652b4c..d3fab70779 100644 --- a/datapacks/Bookshelf/data/bs.view/tags/block/can_see_through.json +++ b/datapacks/Bookshelf/data/bs.view/tags/block/can_see_through.json @@ -10,8 +10,7 @@ "#minecraft:rails", "#minecraft:saplings", "#minecraft:signs", - "#minecraft:small_flowers", - "#minecraft:tall_flowers", + "#minecraft:flowers", "minecraft:big_dripleaf_stem", "minecraft:brain_coral_fan", "minecraft:brain_coral_wall_fan", diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 541a6ffc32..1d5c368c75 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -40,6 +40,7 @@ Bookshelf is now based on **Minecraft 1.21.2**. - **[#265](https://github.com/Gunivers/Bookshelf/pull/265)** Optimized `bs.schedule` module for improved performance. - **[#265](https://github.com/Gunivers/Bookshelf/pull/265)** Enabled `bs.move` module to function effectively at higher coordinate ranges. Collision detection has also been improved and should be more robust. - **[#265](https://github.com/Gunivers/Bookshelf/pull/265)** Load tags do not load modules in isolation anymore. This can now be done using the `exclusive_load` tag. +- **[#276](https://github.com/Gunivers/Bookshelf/pull/276)** Add new hitboxes (new babies and salmon variants). ### 🐛 Fixes diff --git a/docs/_static/switcher.json b/docs/_static/switcher.json index eb40cfce46..4e9579a3e9 100644 --- a/docs/_static/switcher.json +++ b/docs/_static/switcher.json @@ -10,6 +10,11 @@ "url": "https://bookshelf.docs.gunivers.net/en/latest/", "preferred": true }, + { + "name": "2.2.0", + "version": "v2.2.0", + "url": "https://bookshelf.docs.gunivers.net/en/v2.2.0/" + }, { "name": "2.1.1", "version": "v2.1.1", diff --git a/docs/modules/move.md b/docs/modules/move.md index d37d2638b2..ecf42a461b 100644 --- a/docs/modules/move.md +++ b/docs/modules/move.md @@ -15,10 +15,6 @@ Make your entity move exactly the way you want them to! -- Heraclitus ``` -```{important} -This module limits the world size to 2,147,480 to prevent scoreboard overflow. -``` - --- ## 🔧 Functions From 2c4b62e64ffbc394abe242dc312092597c59f328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Giraudet?= Date: Mon, 23 Dec 2024 16:26:51 +0100 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B=20Fix=20bs.hitbox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/bs.hitbox/tags/entity_type/size/group_64.json | 5 ++++- .../data/bs.hitbox/tags/entity_type/size/group_8.json | 5 ++++- docs/CHANGELOG.md | 10 ++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_64.json b/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_64.json index 719adf8b1f..e50db9c222 100644 --- a/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_64.json +++ b/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_64.json @@ -9,6 +9,9 @@ "minecraft:villager", "minecraft:armadillo", "minecraft:creaking", - "minecraft:creaking_transient" + { + "id": "minecraft:creaking_transient", + "required": false + } ] } diff --git a/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_8.json b/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_8.json index 5cf9eaab74..b7faef1ede 100644 --- a/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_8.json +++ b/datapacks/Bookshelf/data/bs.hitbox/tags/entity_type/size/group_8.json @@ -33,6 +33,9 @@ "minecraft:warden", "minecraft:wither", "minecraft:creaking", - "minecraft:creaking_transient" + { + "id": "minecraft:creaking_transient", + "required": false + } ] } diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c3d1f15513..98f78978a0 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,6 +2,14 @@ --- +## 📦 Bookshelf - 2.2.2 + +### 🐛 Fixes + +- **[#293](https://github.com/Gunivers/Bookshelf/issues/293)** Entity `creaking_transient` was removed from Minecraft 1.21.4, causing `bs.hitbox` to stop working. + +--- + ## 📦 Bookshelf - 2.2.1 Bookshelf is now based on **Minecraft 1.21.4**. @@ -10,6 +18,8 @@ Bookshelf is now based on **Minecraft 1.21.4**. - **[#288](https://github.com/Gunivers/Bookshelf/issues/288)** Fix `bs.move` collisions. - **[#290](https://github.com/Gunivers/Bookshelf/issues/290)** Add missing blocks in `bs.block` registries. +--- + ## 📦 Bookshelf - 2.2.0 ```{epigraph} From e037d6f87dd9b06da0de038098003cedba57683b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Giraudet?= Date: Mon, 23 Dec 2024 16:30:04 +0100 Subject: [PATCH 3/4] Complet changelog --- docs/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 98f78978a0..1a1922419f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -6,7 +6,7 @@ ### 🐛 Fixes -- **[#293](https://github.com/Gunivers/Bookshelf/issues/293)** Entity `creaking_transient` was removed from Minecraft 1.21.4, causing `bs.hitbox` to stop working. +- **[#293](https://github.com/Gunivers/Bookshelf/issues/293)** Entity `creaking_transient` was removed from Minecraft 1.21.4, causing `bs.hitbox` to stop working for entities. --- From b2beeffc72201e8d4b4c438d25d8051283c6bbd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Giraudet?= Date: Mon, 23 Dec 2024 16:32:58 +0100 Subject: [PATCH 4/4] Add fix to use packtest beta version --- scripts/src/packtest/assets.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/src/packtest/assets.py b/scripts/src/packtest/assets.py index ec3b541bb9..80aca244e0 100644 --- a/scripts/src/packtest/assets.py +++ b/scripts/src/packtest/assets.py @@ -41,6 +41,10 @@ def get_modrinth_url(project_id: str, mc_version: str) -> str: response = requests.get(f"https://api.modrinth.com/v2/project/{project_id}/version") response.raise_for_status() versions = response.json() - if versions := [version for version in versions if mc_version in version["game_versions"]]: + if versions := [ + version + for version in versions + if any(v.startswith(mc_version) for v in version["game_versions"]) + ]: return versions[0]["files"][0]["url"] raise RuntimeError(f"Could not find a version for {project_id} that matches the MC version: {mc_version}")