fixing tests

Blockception · Nov 9, 2024 · cc763fc · cc763fc
1 parent 2faa4ca
commit cc763fc
Show file tree

Hide file tree

Showing 22 changed files with 203 additions and 131 deletions.
diff --git a/.mcignore b/.mcignore
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,6 +47,7 @@
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.2",
+    "typescript-eslint": "^8.13.0",
     "vscode": "^1.1.37"
   },
   "dependencies": {

diff --git 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
@@ -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/blocks/master.block.json b/test/files/correct/data_bp/blocks/master.block.json
diff --git a/...rrect/data_bp/entities/dragon.entity.json → ...ct/data_bp/entities/dragon.entity.bp.json b/...rrect/data_bp/entities/dragon.entity.json → ...ct/data_bp/entities/dragon.entity.bp.json
diff --git a/.../data_bp/entities/dragon_born.entity.json → ...ta_bp/entities/dragon_born.entity.bp.json b/.../data_bp/entities/dragon_born.entity.json → ...ta_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
@@ -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/...orrect/data_bp/entities/sheep.entity.json → ...ect/data_bp/entities/sheep.entity.bp.json b/...orrect/data_bp/entities/sheep.entity.json → ...ect/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
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
diff --git a/test/files/correct/data_bp/features/conditional_list_feature.json b/test/files/correct/data_bp/features/conditional_list_feature.json
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
diff --git a/test/files/correct/data_bp/features/rect_layout_feature.json b/test/files/correct/data_bp/features/rect_layout_feature.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
       },
       "oneOf": [
         {
+          "type": "string",
           "$ref": "#/definitions/color"
         },
         {
@@ Expand Down @@