From b651a1378c2680985741fb62fbe7101c65aec838 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] =?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 | 3 ++- docs/_static/switcher.json | 5 +++++ docs/modules/move.md | 4 ---- 14 files changed, 57 insertions(+), 12 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 464d3f4db..853252b84 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 a488f7ddb..4a534ded6 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 33199266d..6f6790b75 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 370a673d9..371370558 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 000000000..3661171ad --- /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 000000000..0b5dbf730 --- /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 000000000..11fc3fd9b --- /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 2f7d05162..719adf8b1 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 ac8e7cfd4..5cf9eaab7 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 5270652b4..d3fab7077 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 5270652b4..d3fab7077 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 541a6ffc3..8f02e21c1 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -10,7 +10,7 @@ *This release features new modules for random distribution and terrain generation, refinements to existing modules, performance enhancements, and minor bug resolutions. Additionally, this update aims to ensure all functions work seamlessly across all dimensions.* ``` -Bookshelf is now based on **Minecraft 1.21.2**. +Bookshelf is now based on **Minecraft 1.21.3**. ### 🎉 Added modules @@ -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 eb40cfce4..4e9579a3e 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 d37d2638b..ecf42a461 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