Merge branch 'main' into feature/jest2

Blockception · Nov 8, 2024 · 8ad8b5b · 8ad8b5b
2 parents 7d5ce03 + b788f11
commit 8ad8b5b
Show file tree

Hide file tree

Showing 93 changed files with 1,665 additions and 1,279 deletions.
diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@ JSON validation can give snippets for sub items, as well as description, but thi
 - [Animations](resource/animations/animations.json)
 - [Animation Controllers](resource/animation_controllers/animation_controller.json)
 - [Attachables](resource/attachables/attachables.json)
+- [Biomes](resource/biomes/biomes.json)
 - [Biomes client](resource/biomes_client.json)
 - [Blocks](resource/blocks.json)
 - [Entity](resource/entity/entities.json)

diff --git a/behavior/biomes/biomes.json b/behavior/biomes/biomes.json
diff --git a/behavior/blocks/blocks.json b/behavior/blocks/blocks.json
diff --git a/behavior/entities/entities.json b/behavior/entities/entities.json
diff --git a/behavior/feature_rules/feature_rules.json b/behavior/feature_rules/feature_rules.json
diff --git a/behavior/features/features.json b/behavior/features/features.json
diff --git a/behavior/items/items.json b/behavior/items/items.json
diff --git a/behavior/loot_tables/loot_tables.json b/behavior/loot_tables/loot_tables.json
diff --git a/behavior/recipes/recipes.json b/behavior/recipes/recipes.json
diff --git a/behavior/spawn_rules/spawn_rules.json b/behavior/spawn_rules/spawn_rules.json
diff --git a/behavior/trading/trading.json b/behavior/trading/trading.json
diff --git a/resource/biomes/biomes.json b/resource/biomes/biomes.json
diff --git a/resource/models/entity/model_entity.json b/resource/models/entity/model_entity.json
diff --git a/source/behavior/biomes/biomes.json b/source/behavior/biomes/biomes.json
@@ -19,9 +19,7 @@
       "minecraft:capped_surface": { "$ref": "./components/capped_surface.json" },
       "minecraft:climate": { "$ref": "./components/climate.json" },
       "minecraft:consolidated_features": { "$ref": "./components/consolidated_features.json" },
-      "minecraft:forced_features": { "$ref": "./components/forced_features.json" },
       "minecraft:frozen_ocean_surface": { "$ref": "./components/frozen_ocean_surface.json" },
-      "minecraft:ignore_automatic_features": { "$ref": "./components/ignore_automatic_features.json" },
       "minecraft:legacy_world_generation_rules": {
         "$ref": "./components/legacy_world_generation_rules.json"
       },