From 7d5ce03cb26091b8bdcd4a84c9bb7ddbcaed7fa7 Mon Sep 17 00:00:00 2001 From: DaanV2 Date: Fri, 8 Nov 2024 13:11:27 +0100 Subject: [PATCH] fixing more tests --- .../format/components/hover_text_color.json | 1 + .../behavior/items/format/minecraft.item.json | 7 +++---- ...entity.json => dragon_born.entity.bp.json} | 0 .../correct/data_bp/entities/equippable.json | 6 +----- ...sheep.entity.json => sheep.entity.bp.json} | 0 .../aggregate_feature_planks_placement.json | 9 -------- .../features/beards_and_shavers_feature.json | 19 ----------------- .../features/conditional_list_feature.json | 17 --------------- .../features/hell_cave_carver_feature.json | 11 ---------- .../data_bp/features/rect_layout_feature.json | 21 ------------------- .../features/scan_surface_feature.json | 11 ---------- .../scan_surface_feature_obsidian.json | 20 +++++++++--------- .../correct/data_bp/items/test1.item.json | 4 +++- 13 files changed, 18 insertions(+), 108 deletions(-) rename test/files/correct/data_bp/entities/{dragon_born.entity.json => dragon_born.entity.bp.json} (100%) rename test/files/correct/data_bp/entities/{sheep.entity.json => sheep.entity.bp.json} (100%) delete mode 100644 test/files/correct/data_bp/features/aggregate_feature_planks_placement.json delete mode 100644 test/files/correct/data_bp/features/beards_and_shavers_feature.json delete mode 100644 test/files/correct/data_bp/features/conditional_list_feature.json delete mode 100644 test/files/correct/data_bp/features/hell_cave_carver_feature.json delete mode 100644 test/files/correct/data_bp/features/rect_layout_feature.json delete mode 100644 test/files/correct/data_bp/features/scan_surface_feature.json diff --git a/source/behavior/items/format/components/hover_text_color.json b/source/behavior/items/format/components/hover_text_color.json index 4e983b609..e0530da56 100644 --- a/source/behavior/items/format/components/hover_text_color.json +++ b/source/behavior/items/format/components/hover_text_color.json @@ -10,6 +10,7 @@ }, "oneOf": [ { + "type": "string", "$ref": "#/definitions/color" }, { diff --git a/source/behavior/items/format/minecraft.item.json b/source/behavior/items/format/minecraft.item.json index 382f57aad..8591fbb72 100644 --- a/source/behavior/items/format/minecraft.item.json +++ b/source/behavior/items/format/minecraft.item.json @@ -49,16 +49,15 @@ } }, "components": { - "additionalProperties": { "type": "object" }, "type": "object", "description": "The components of this item.", "properties": { - "minecraft:allow_off_hand": {"$ref": "./components/allow_off_hand.json"}, + "minecraft:allow_off_hand": { "$ref": "./components/allow_off_hand.json" }, "minecraft:block_placer": { "$ref": "./components/block_placer.json" }, - "minecraft:can_destroy_in_creative": {"$ref": "./components/can_destroy_in_creative.json"}, + "minecraft:can_destroy_in_creative": { "$ref": "./components/can_destroy_in_creative.json" }, "minecraft:cooldown": { "$ref": "./components/cooldown.json" }, "minecraft:custom_components": { "$ref": "./components/custom_components.json" }, - "minecraft:damage": {"$ref": "./components/damage.json"}, + "minecraft:damage": { "$ref": "./components/damage.json" }, "minecraft:digger": { "$ref": "./components/digger.json" }, "minecraft:display_name": { "$ref": "./components/display_name.json" }, "minecraft:durability": { "$ref": "./components/durability.json" }, diff --git a/test/files/correct/data_bp/entities/dragon_born.entity.json b/test/files/correct/data_bp/entities/dragon_born.entity.bp.json similarity index 100% rename from test/files/correct/data_bp/entities/dragon_born.entity.json rename to test/files/correct/data_bp/entities/dragon_born.entity.bp.json diff --git a/test/files/correct/data_bp/entities/equippable.json b/test/files/correct/data_bp/entities/equippable.json index 6eac1864c..99ad2a539 100644 --- a/test/files/correct/data_bp/entities/equippable.json +++ b/test/files/correct/data_bp/entities/equippable.json @@ -11,11 +11,7 @@ "minecraft:equippable": { "slots": [ { - "accepted_items": [ - { - "tags": "query.any_tag('minecraft:is_tool')" - } - ], + "accepted_items": ["minecraft:tool"], "item": { "tags": "query.any_tag('minecraft:is_tool')" }, diff --git a/test/files/correct/data_bp/entities/sheep.entity.json b/test/files/correct/data_bp/entities/sheep.entity.bp.json similarity index 100% rename from test/files/correct/data_bp/entities/sheep.entity.json rename to test/files/correct/data_bp/entities/sheep.entity.bp.json diff --git a/test/files/correct/data_bp/features/aggregate_feature_planks_placement.json b/test/files/correct/data_bp/features/aggregate_feature_planks_placement.json deleted file mode 100644 index bdfc3d053..000000000 --- a/test/files/correct/data_bp/features/aggregate_feature_planks_placement.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "format_version": "1.13.0", - - "minecraft:scatter_feature": { - "description": { - "identifier": "namespace:entity_name" - } - } -} \ No newline at end of file diff --git a/test/files/correct/data_bp/features/beards_and_shavers_feature.json b/test/files/correct/data_bp/features/beards_and_shavers_feature.json deleted file mode 100644 index d51c73600..000000000 --- a/test/files/correct/data_bp/features/beards_and_shavers_feature.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "format_version": "1.13.0", - "minecraft:beards_and_shavers": { - "description": { - "identifier": "beards_and_shavers_features:beards_and_shavers_feature" - }, - - "places_feature": "beards_and_shavers_features:beards_and_shavers_feature_obsidian", - "y_delta": 0, - - "bounding_box_min": [-4, 0, -4], - "bounding_box_max": [5, 12, 5], - "beard_raggedness_min": 0.25, - "beard_raggedness_max": 0.5, - - "surface_block_type": "minecraft:grass", - "subsurface_block_type": "minecraft:dirt" - } -} \ No newline at end of file diff --git a/test/files/correct/data_bp/features/conditional_list_feature.json b/test/files/correct/data_bp/features/conditional_list_feature.json deleted file mode 100644 index 2985f9ce6..000000000 --- a/test/files/correct/data_bp/features/conditional_list_feature.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "format_version": "1.13.0", - - "minecraft:conditional_list": { - "description": { - "identifier": "conditional_list_features:conditional_list_feature" - }, - - "conditional_features": [ - { - "places_feature": "conditional_list_features:conditional_list_feature_obsidian", - "condition": "query.noise(v.originx, v.originz) < 0" - } - ], - "early_out_scheme": "placement_success" - } -} diff --git a/test/files/correct/data_bp/features/hell_cave_carver_feature.json b/test/files/correct/data_bp/features/hell_cave_carver_feature.json deleted file mode 100644 index e15114eec..000000000 --- a/test/files/correct/data_bp/features/hell_cave_carver_feature.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "format_version": "1.13.0", - "minecraft:hell_cave_carver_feature": { - "description": { - "identifier": "hell_cave_carver_features:hell_cave_carver_feature" - }, - - "fill_with": "minecraft:planks", - "width_modifier": 1 - } -} \ No newline at end of file diff --git a/test/files/correct/data_bp/features/rect_layout_feature.json b/test/files/correct/data_bp/features/rect_layout_feature.json deleted file mode 100644 index bbdd6bec3..000000000 --- a/test/files/correct/data_bp/features/rect_layout_feature.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "format_version": "1.13.0", - - "minecraft:rect_layout": { - "description": { - "identifier": "rect_layout_features:rect_layout_feature" - }, - - "ratio_of_empty_space": 0.5, - "feature_areas":[ - { - "feature": "rect_layout_features:rect_layout_feature_obsidian", - "area_dimensions": [1, 1] - }, - { - "feature": "rect_layout_features:rect_layout_feature_planks", - "area_dimensions": [1, 1] - } - ] - } -} \ No newline at end of file diff --git a/test/files/correct/data_bp/features/scan_surface_feature.json b/test/files/correct/data_bp/features/scan_surface_feature.json deleted file mode 100644 index 86fcff168..000000000 --- a/test/files/correct/data_bp/features/scan_surface_feature.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "format_version": "1.13.0", - - "minecraft:scan_surface": { - "description": { - "identifier": "scan_surface_features:scan_surface_feature" - }, - - "scan_surface_feature": "scan_surface_features:scan_surface_feature_obsidian" - } -} \ No newline at end of file diff --git a/test/files/correct/data_bp/features/scan_surface_feature_obsidian.json b/test/files/correct/data_bp/features/scan_surface_feature_obsidian.json index fabdb3bb5..59dddf3f9 100644 --- a/test/files/correct/data_bp/features/scan_surface_feature_obsidian.json +++ b/test/files/correct/data_bp/features/scan_surface_feature_obsidian.json @@ -1,14 +1,14 @@ { - "format_version": "1.13.0", + "format_version": "1.13.0", - "minecraft:single_block_feature": { - "description": { - "identifier": "scan_surface_features:scan_surface_feature_obsidian" - }, + "minecraft:single_block_feature": { + "description": { + "identifier": "scan_surface_features:scan_surface_feature_obsidian" + }, - "places_block": "minecraft:obsidian", + "places_block": "minecraft:obsidian", - "enforce_placement_rules": false, - "enforce_survivability_rules": false - } -} \ No newline at end of file + "enforce_placement_rules": false, + "enforce_survivability_rules": false + } +} diff --git a/test/files/correct/data_bp/items/test1.item.json b/test/files/correct/data_bp/items/test1.item.json index d2c45af2e..254e4344f 100644 --- a/test/files/correct/data_bp/items/test1.item.json +++ b/test/files/correct/data_bp/items/test1.item.json @@ -15,7 +15,9 @@ "minecraft:damage": 2, "minecraft:stacked_by_data": true, "minecraft:should_despawn": true, - "minecraft:hover_text_color": "aqua", + "minecraft:hover_text_color": { + + }, "minecraft:use_animation": "brush", "minecraft:use_modifiers": { "use_duration": 2