From 17073c12b18379f2dc5fcb8617c85890b8b8a33b Mon Sep 17 00:00:00 2001 From: Xterionix Date: Mon, 3 Mar 2025 05:29:27 +0500 Subject: [PATCH] v1.21.70.25 --- behavior_pack/entities/axolotl.json | 6 +- behavior_pack/entities/bee.json | 18 +- behavior_pack/entities/chicken.json | 147 +- behavior_pack/entities/cow.json | 59 +- behavior_pack/entities/dolphin.json | 4 +- behavior_pack/entities/egg.json | 67 +- behavior_pack/entities/elder_guardian.json | 5 +- behavior_pack/entities/fish.json | 4 +- behavior_pack/entities/glow_squid.json | 4 +- behavior_pack/entities/guardian.json | 5 +- behavior_pack/entities/minecart.json | 2 +- behavior_pack/entities/pig.json | 67 +- behavior_pack/entities/pufferfish.json | 235 +- behavior_pack/entities/ravager.json | 6 +- behavior_pack/entities/salmon.json | 4 +- behavior_pack/entities/sheep.json | 254 +- behavior_pack/entities/squid.json | 4 +- behavior_pack/entities/tadpole.json | 4 +- behavior_pack/entities/tropicalfish.json | 4 +- behavior_pack/entities/turtle.json | 8 +- behavior_pack/entities/wolf.json | 67 +- ...fter_surface_tall_grass_feature_rules.json | 2 +- ...er_surface_firefly_bush_water_cluster.json | 2 +- ...er_surface_firefly_bush_water_cluster.json | 2 +- .../features/azalea_tree_feature.json | 4 +- .../features/birch_tree_feature.json | 5 +- .../features/cherry_tree_feature.json | 5 +- .../features/fallen_birch_tree_feature.json | 5 +- .../features/fallen_jungle_tree_feature.json | 89 +- .../features/fallen_oak_tree_feature.json | 5 +- .../features/fallen_spruce_tree_feature.json | 5 +- .../fallen_super_birch_tree_feature.json | 5 +- .../features/fancy_oak_tree_feature.json | 5 +- .../features/jungle_bush_feature.json | 5 +- .../features/jungle_tree_feature.json | 5 +- .../features/mangrove_tree_feature.json | 5 +- .../features/mega_jungle_tree_feature.json | 5 +- .../features/mega_pine_tree_feature.json | 5 +- .../features/mega_spruce_tree_feature.json | 5 +- .../features/mountain_pine_tree_feature.json | 5 +- .../mountain_spruce_tree_feature.json | 5 +- behavior_pack/features/oak_tree_feature.json | 5 +- .../features/oak_tree_with_vines_feature.json | 92 +- .../features/pale_oak_tree_feature.json | 5 +- behavior_pack/features/pine_tree_feature.json | 5 +- .../features/roofed_tree_feature.json | 5 +- .../features/savanna_tree_feature.json | 5 +- .../features/spruce_tree_feature.json | 5 +- .../features/super_birch_tree_feature.json | 5 +- .../features/swamp_tree_feature.json | 5 +- .../features/tall_mangrove_tree_feature.json | 5 +- .../undecorated_jungle_tree_feature.json | 5 +- .../item_catalog/crafting_item_catalog.json | 4509 +++++++++-------- .../loot_tables/chests/ruined_portal.json | 23 + .../chests/village/village_bundle.json | 18 + .../chests/village/village_cartographer.json | 9 + .../chests/village/village_desert_house.json | 9 + .../chests/village/village_plains_house.json | 9 + .../chests/village/village_savanna_house.json | 9 + .../chests/village/village_snowy_house.json | 9 + .../chests/village/village_taiga_house.json | 9 + .../chests/village/village_tannery.json | 9 + .../chests/village/village_weaponsmith.json | 9 + behavior_pack/recipes/cake.json | 4 +- behavior_pack/recipes/lodestone.json | 6 +- behavior_pack/recipes/pumpkin_pie.json | 2 +- behavior_pack/spawn_rules/camel.json | 35 + behavior_pack/spawn_rules/rabbit.json | 50 +- .../economy_trades/cartographer_trades.json | 1095 +++- .../wandering_trader_trades.json | 1211 ++++- .../biomes/mangrove_swamp.client_biome.json | 5 +- .../biomes/pale_garden.client_biome.json | 5 +- .../biomes/roofed_forest.client_biome.json | 5 +- .../roofed_forest_mutated.client_biome.json | 5 +- .../biomes/swampland.client_biome.json | 5 +- .../swampland_mutated.client_biome.json | 5 +- resource_pack/blocks.json | 150 +- resource_pack/entity/agent.entity.json | 3 +- resource_pack/entity/allay.entity.json | 45 +- resource_pack/entity/armadillo.entity.json | 3 +- resource_pack/entity/axolotl.entity.json | 3 +- resource_pack/entity/bat.entity.json | 11 + resource_pack/entity/bee.entity.json | 3 +- resource_pack/entity/blaze.entity.json | 3 +- resource_pack/entity/bogged.entity.json | 3 +- resource_pack/entity/breeze.entity.json | 3 +- resource_pack/entity/camel.entity.json | 3 +- resource_pack/entity/cat.entity.json | 3 +- resource_pack/entity/cave_spider.entity.json | 3 +- resource_pack/entity/chicken.entity.json | 19 +- resource_pack/entity/cod.entity.json | 3 +- resource_pack/entity/cow.entity.json | 23 +- resource_pack/entity/creaking.entity.json | 3 +- resource_pack/entity/creeper.entity.json | 3 +- resource_pack/entity/dolphin.entity.json | 3 +- resource_pack/entity/donkey_v3.entity.json | 3 +- resource_pack/entity/drowned.entity.json | 3 +- resource_pack/entity/egg.entity.json | 10 +- .../entity/elder_guardian.entity.json | 3 +- resource_pack/entity/ender_dragon.entity.json | 268 +- resource_pack/entity/enderman.entity.json | 3 +- resource_pack/entity/endermite.entity.json | 3 +- .../entity/evocation_illager.entity.json | 9 +- resource_pack/entity/fox.entity.json | 3 +- resource_pack/entity/frog.entity.json | 3 +- resource_pack/entity/ghast.entity.json | 3 +- resource_pack/entity/glow_squid.entity.json | 3 +- resource_pack/entity/goat.entity.json | 3 +- resource_pack/entity/guardian.entity.json | 3 +- resource_pack/entity/hoglin.entity.json | 3 +- resource_pack/entity/horse_v3.entity.json | 3 +- resource_pack/entity/husk.entity.json | 3 +- resource_pack/entity/iron_golem.entity.json | 41 +- resource_pack/entity/llama.entity.json | 3 +- resource_pack/entity/magma_cube.entity.json | 3 +- resource_pack/entity/mooshroom.entity.json | 9 +- resource_pack/entity/mule_v3.entity.json | 3 +- resource_pack/entity/ocelot.entity.json | 3 +- resource_pack/entity/panda.entity.json | 3 +- resource_pack/entity/parrot.entity.json | 3 +- resource_pack/entity/phantom.entity.json | 3 +- resource_pack/entity/pig.entity.json | 24 +- resource_pack/entity/piglin.entity.json | 3 +- resource_pack/entity/piglin_brute.entity.json | 3 +- resource_pack/entity/pillager.entity.json | 3 +- resource_pack/entity/polar_bear.entity.json | 32 +- resource_pack/entity/pufferfish.entity.json | 3 +- resource_pack/entity/rabbit.entity.json | 3 +- resource_pack/entity/ravager.entity.json | 3 +- resource_pack/entity/salmon.entity.json | 3 +- resource_pack/entity/sheep.entity.json | 3 +- resource_pack/entity/shulker.entity.json | 3 +- resource_pack/entity/silverfish.entity.json | 3 +- resource_pack/entity/skeleton.entity.json | 3 +- .../entity/skeleton_horse_v3.entity.json | 3 +- resource_pack/entity/slime.entity.json | 3 +- resource_pack/entity/sniffer.entity.json | 3 +- resource_pack/entity/snow_golem.entity.json | 23 +- resource_pack/entity/spider.entity.json | 3 +- resource_pack/entity/squid.entity.json | 3 +- resource_pack/entity/stray.entity.json | 3 +- resource_pack/entity/strider.entity.json | 3 +- resource_pack/entity/tadpole.entity.json | 3 +- resource_pack/entity/trader_llama.entity.json | 3 +- resource_pack/entity/tropicalfish.entity.json | 3 +- resource_pack/entity/turtle.entity.json | 3 +- resource_pack/entity/vex.entity.json | 5 +- resource_pack/entity/villager_v2.entity.json | 3 +- resource_pack/entity/vindicator.entity.json | 3 +- resource_pack/entity/warden.entity.json | 3 +- resource_pack/entity/witch.entity.json | 3 +- resource_pack/entity/wither.entity.json | 43 +- .../entity/wither_skeleton.entity.json | 3 +- resource_pack/entity/wolf.entity.json | 3 +- resource_pack/entity/zoglin.entity.json | 3 +- resource_pack/entity/zombie.entity.json | 3 +- .../entity/zombie_horse_v3.entity.json | 3 +- .../entity/zombie_pigman.entity.json | 3 +- .../entity/zombie_villager.entity.json | 52 +- .../models/entity/chicken.cold.geo.json | 39 +- resource_pack/models/entity/cow.cold.geo.json | 11 +- resource_pack/models/entity/cow.v2.geo.json | 7 +- resource_pack/models/entity/cow.warm.geo.json | 9 +- .../models/entity/mooshroom.v2.geo.json | 72 + resource_pack/models/entity/pig.v3.geo.json | 5 +- .../biome_tinted_leaves_particle.json | 4 +- .../saddle.render_controllers.json | 7 +- resource_pack/sounds.json | 249 +- resource_pack/sounds/sound_definitions.json | 719 ++- resource_pack/textures/flipbook_textures.json | 46 +- resource_pack/textures/item_texture.json | 292 +- resource_pack/textures/terrain_texture.json | 49 +- resource_pack/ui/_global_variables.json | 1 + .../csb_sections/csb_subscription_panel.json | 80 +- resource_pack/ui/edu_servers_screen.json | 573 +++ resource_pack/ui/edu_worlds_screen.json | 16 +- resource_pack/ui/gathering_info_screen.json | 3 +- resource_pack/ui/panorama_screen.json | 4 +- resource_pack/ui/pdp_screen.json | 422 +- resource_pack/ui/persona_sdl.json | 14 +- resource_pack/ui/server_form.json | 6 +- .../settings_sections/controls_section.json | 9 + .../ui/settings_sections/general_section.json | 134 +- .../ui/settings_sections/settings_common.json | 18 + resource_pack/ui/start_screen.json | 9 +- resource_pack/ui/ui_art_assets_common.json | 4 +- resource_pack/ui/ui_edu_common.json | 9 + resource_pack/ui/ui_iconbutton.json | 21 +- 188 files changed, 8238 insertions(+), 3904 deletions(-) create mode 100644 behavior_pack/loot_tables/chests/village/village_bundle.json create mode 100644 behavior_pack/spawn_rules/camel.json create mode 100644 resource_pack/models/entity/mooshroom.v2.geo.json create mode 100644 resource_pack/ui/edu_servers_screen.json diff --git a/behavior_pack/entities/axolotl.json b/behavior_pack/entities/axolotl.json index 0a4295e..894ce7e 100644 --- a/behavior_pack/entities/axolotl.json +++ b/behavior_pack/entities/axolotl.json @@ -1,5 +1,5 @@ { - "format_version": "1.16.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:axolotl", @@ -133,7 +133,7 @@ "minecraft:is_hidden_when_invisible": { }, "minecraft:type_family": { - "family": [ "axolotl", "mob" ] + "family": [ "aquatic", "axolotl", "mob" ] }, "minecraft:collision_box": { "width": 0.75, @@ -154,7 +154,7 @@ "minecraft:damage_sensor": { "triggers": { "cause": "lightning", - "deals_damage": true, + "deals_damage": "yes", "damage_multiplier": 2000.0 } }, diff --git a/behavior_pack/entities/bee.json b/behavior_pack/entities/bee.json index ef4cb1d..8b4db14 100644 --- a/behavior_pack/entities/bee.json +++ b/behavior_pack/entities/bee.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.50", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:bee", @@ -47,7 +47,9 @@ "minecraft:pitcher_plant", "minecraft:torchflower", "minecraft:cherry_leaves", - "minecraft:pink_petals" + "minecraft:pink_petals", + "minecraft:wildflowers", + "minecraft:cactus_flower" ], "grow_up": { "event": "minecraft:ageable_grow_up", @@ -102,7 +104,9 @@ "minecraft:pitcher_plant", "minecraft:torchflower", "minecraft:cherry_leaves", - "minecraft:pink_petals" + "minecraft:pink_petals", + "minecraft:wildflowers", + "minecraft:cactus_flower" ] } }, @@ -244,7 +248,9 @@ "minecraft:torchflower", "minecraft:cherry_leaves", "minecraft:pink_petals", - "minecraft:open_eyeblossom" + "minecraft:open_eyeblossom", + "minecraft:wildflowers", + "minecraft:cactus_flower" ], "on_stay_completed": [ { @@ -510,7 +516,9 @@ "minecraft:torchflower", "minecraft:cherry_leaves", "minecraft:pink_petals", - "minecraft:open_eyeblossom" + "minecraft:open_eyeblossom", + "minecraft:wildflowers", + "minecraft:cactus_flower" ] }, "minecraft:behavior.move_towards_home_restriction": { diff --git a/behavior_pack/entities/chicken.json b/behavior_pack/entities/chicken.json index 3701cb2..1995126 100644 --- a/behavior_pack/entities/chicken.json +++ b/behavior_pack/entities/chicken.json @@ -1,11 +1,19 @@ { - "format_version": "1.21.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:chicken", "spawn_category": "creature", "is_spawnable": true, - "is_summonable": true + "is_summonable": true, + "properties": { + "minecraft:climate_variant": { + "type": "enum", + "values": [ "temperate", "warm", "cold" ], + "default": "temperate", + "client_sync": true + } + } }, "component_groups": { @@ -61,7 +69,10 @@ "pumpkin_seeds", "pitcher_pod", "torchflower_seeds" - ] + ], + "property_inheritance": { + "minecraft:climate_variant": {} + } }, "minecraft:behavior.breed": { "priority": 3, @@ -77,15 +88,68 @@ } }, "minecraft:spawn_entity": { - "entities": { - "min_wait_time": 300, - "max_wait_time": 600, - "spawn_sound": "plop", - "spawn_item": "egg", - "filters": { - "test": "rider_count", "subject": "self", "operator": "==", "value": 0 + "entities": [ + { + "min_wait_time": 300, + "max_wait_time": 600, + "spawn_sound": "plop", + "spawn_item": "egg", + "filters": [ + { + "test": "rider_count", + "subject": "self", + "operator": "==", + "value": 0 + }, + { + "test": "enum_property", + "subject": "self", + "domain": "minecraft:climate_variant", + "value": "temperate" + } + ] + }, + { + "min_wait_time": 300, + "max_wait_time": 600, + "spawn_sound": "plop", + "spawn_item": "brown_egg", + "filters": [ + { + "test": "rider_count", + "subject": "self", + "operator": "==", + "value": 0 + }, + { + "test": "enum_property", + "subject": "self", + "domain": "minecraft:climate_variant", + "value": "warm" + } + ] + }, + { + "min_wait_time": 300, + "max_wait_time": 600, + "spawn_sound": "plop", + "spawn_item": "blue_egg", + "filters": [ + { + "test": "rider_count", + "subject": "self", + "operator": "==", + "value": 0 + }, + { + "test": "enum_property", + "subject": "self", + "domain": "minecraft:climate_variant", + "value": "cold" + } + ] } - } + ] } } }, @@ -125,7 +189,7 @@ "minecraft:damage_sensor": { "triggers": { "cause": "fall", - "deals_damage": false + "deals_damage": "no" } }, "minecraft:leashable": { @@ -200,23 +264,45 @@ }, "events": { - "from_egg": { - "add": { "component_groups": [ "minecraft:chicken_baby" ] } - }, - "minecraft:entity_spawned": { - "randomize": [ + "sequence": [ { - "weight": 95, - "trigger": "minecraft:spawn_adult" + "randomize": [ + { + "weight": 95, + "trigger": "minecraft:spawn_adult" + }, + { + "weight": 5, + "add": { + "component_groups": [ + "minecraft:chicken_baby" + ] + } + } + ] }, { - "weight": 5, - "add": { - "component_groups": [ - "minecraft:chicken_baby" - ] - } + "first_valid": [ + { + "filters": { + "test": "has_biome_tag", + "value": "spawns_warm_variant_farm_animals" + }, + "set_property": { + "minecraft:climate_variant": "warm" + } + }, + { + "filters": { + "test": "has_biome_tag", + "value": "spawns_cold_variant_farm_animals" + }, + "set_property": { + "minecraft:climate_variant": "cold" + } + } + ] } ] }, @@ -250,6 +336,17 @@ "minecraft:chicken_adult" ] } + }, + + "minecraft:hatch_warm": { + "set_property": { + "minecraft:climate_variant": "warm" + } + }, + "minecraft:hatch_cold": { + "set_property": { + "minecraft:climate_variant": "cold" + } } } } diff --git a/behavior_pack/entities/cow.json b/behavior_pack/entities/cow.json index 62fdf1c..9333d6f 100644 --- a/behavior_pack/entities/cow.json +++ b/behavior_pack/entities/cow.json @@ -1,11 +1,19 @@ { - "format_version": "1.21.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:cow", "spawn_category": "creature", "is_spawnable": true, - "is_summonable": true + "is_summonable": true, + "properties": { + "minecraft:climate_variant": { + "type": "enum", + "values": [ "temperate", "warm", "cold" ], + "default": "temperate", + "client_sync": true + } + } }, "component_groups": { @@ -50,6 +58,9 @@ "event": "minecraft:entity_born", "target": "baby" } + }, + "property_inheritance": { + "minecraft:climate_variant": {} } }, "minecraft:interact": { @@ -192,18 +203,44 @@ "events": { "minecraft:entity_spawned": { - "randomize": [ + "sequence": [ { - "weight": 95, - "trigger": "minecraft:spawn_adult" + "randomize": [ + { + "weight": 95, + "trigger": "minecraft:spawn_adult" + }, + { + "weight": 5, + "add": { + "component_groups": [ + "minecraft:cow_baby" + ] + } + } + ] }, { - "weight": 5, - "add": { - "component_groups": [ - "minecraft:cow_baby" - ] - } + "first_valid": [ + { + "filters": { + "test": "has_biome_tag", + "value": "spawns_warm_variant_farm_animals" + }, + "set_property": { + "minecraft:climate_variant": "warm" + } + }, + { + "filters": { + "test": "has_biome_tag", + "value": "spawns_cold_variant_farm_animals" + }, + "set_property": { + "minecraft:climate_variant": "cold" + } + } + ] } ] }, diff --git a/behavior_pack/entities/dolphin.json b/behavior_pack/entities/dolphin.json index 50b1c1d..0c66cf0 100644 --- a/behavior_pack/entities/dolphin.json +++ b/behavior_pack/entities/dolphin.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:dolphin", @@ -149,7 +149,7 @@ "minecraft:nameable": { }, "minecraft:type_family": { - "family": [ "dolphin", "mob" ] + "family": [ "aquatic", "dolphin", "mob" ] }, "minecraft:collision_box": { "width": 0.9, diff --git a/behavior_pack/entities/egg.json b/behavior_pack/entities/egg.json index 5506e21..cdb23c0 100644 --- a/behavior_pack/entities/egg.json +++ b/behavior_pack/entities/egg.json @@ -1,11 +1,19 @@ { - "format_version": "1.12.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:egg", "is_spawnable": false, "is_summonable": true, - "is_experimental": false + "is_experimental": false, + "properties": { + "minecraft:climate_variant": { + "type": "enum", + "values": [ "temperate", "warm", "cold" ], + "default": "temperate", + "client_sync": true + } + } }, "components": { "minecraft:collision_box": { @@ -25,21 +33,53 @@ "first_spawn_count": 1, "second_spawn_count": 4, "spawn_definition": "minecraft:chicken", - "spawn_baby": true + "spawn_baby": true, + "on_spawn": [ + { + "filters": { + "test": "enum_property", + "subject": "other", + "domain": "minecraft:climate_variant", + "value": "warm" + }, + "event": "minecraft:hatch_warm" + }, + { + "filters": { + "test": "enum_property", + "subject": "other", + "domain": "minecraft:climate_variant", + "value": "cold" + }, + "event": "minecraft:hatch_cold" + } + ] }, "remove_on_hit": {}, "particle_on_hit": { "particle_type": "iconcrack", "num_particles": 6, "on_entity_hit": true, - "on_other_hit": true + "on_other_hit": true, + "particle_item_name": { + "brown_egg": { + "test": "enum_property", + "domain": "minecraft:climate_variant", + "value": "warm" + }, + "blue_egg": { + "test": "enum_property", + "domain": "minecraft:climate_variant", + "value": "cold" + } + } } }, "power": 1.5, "gravity": 0.03, "angle_offset": 0.0 }, - "minecraft:physics": { + "minecraft:physics": { }, "minecraft:pushable": { "is_pushable": true, @@ -52,6 +92,23 @@ "use_motion_prediction_hints": true } } + }, + "events": { + "minecraft:spawn_temperate": { + "set_property": { + "minecraft:climate_variant": "temperate" + } + }, + "minecraft:spawn_cold": { + "set_property": { + "minecraft:climate_variant": "cold" + } + }, + "minecraft:spawn_warm": { + "set_property": { + "minecraft:climate_variant": "warm" + } + } } } } diff --git a/behavior_pack/entities/elder_guardian.json b/behavior_pack/entities/elder_guardian.json index c45adfb..2b78632 100644 --- a/behavior_pack/entities/elder_guardian.json +++ b/behavior_pack/entities/elder_guardian.json @@ -1,5 +1,5 @@ { - "format_version": "1.16.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:elder_guardian", @@ -64,6 +64,7 @@ "breathes_water": true }, "minecraft:home": { + "restriction_type": "random_movement", "restriction_radius": 16 }, "minecraft:behavior.nearest_attackable_target": { @@ -104,7 +105,7 @@ "priority": 9 }, "minecraft:type_family": { - "family": [ "guardian_elder", "monster", "mob" ] + "family": [ "aquatic", "guardian_elder", "monster", "mob" ] }, "minecraft:physics": { }, diff --git a/behavior_pack/entities/fish.json b/behavior_pack/entities/fish.json index dd0d0d2..5cd53c5 100644 --- a/behavior_pack/entities/fish.json +++ b/behavior_pack/entities/fish.json @@ -1,5 +1,5 @@ { - "format_version": "1.16.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:cod", @@ -15,7 +15,7 @@ "on_death": "query.last_hit_by_player ? Math.Random(1,3) : 0" }, "minecraft:type_family": { - "family": [ "cod", "fish" ] + "family": [ "aquatic", "cod", "fish" ] }, "minecraft:collision_box": { "width": 0.6, diff --git a/behavior_pack/entities/glow_squid.json b/behavior_pack/entities/glow_squid.json index 73cd8d2..b19853d 100644 --- a/behavior_pack/entities/glow_squid.json +++ b/behavior_pack/entities/glow_squid.json @@ -1,5 +1,5 @@ { - "format_version": "1.18.10", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:glow_squid", @@ -28,7 +28,7 @@ "minecraft:nameable": { }, "minecraft:type_family": { - "family": [ "squid", "mob" ] + "family": [ "aquatic", "squid", "mob" ] }, "minecraft:collision_box": { "width": 0.95, diff --git a/behavior_pack/entities/guardian.json b/behavior_pack/entities/guardian.json index 291eeed..5963885 100644 --- a/behavior_pack/entities/guardian.json +++ b/behavior_pack/entities/guardian.json @@ -1,5 +1,5 @@ { - "format_version": "1.16.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:guardian", @@ -123,6 +123,7 @@ "despawn_from_distance": {} }, "minecraft:home": { + "restriction_type": "random_movement", "restriction_radius": 16 }, "minecraft:behavior.nearest_attackable_target": { @@ -172,7 +173,7 @@ "priority": 9 }, "minecraft:type_family": { - "family": [ "guardian", "monster", "mob" ] + "family": [ "aquatic", "guardian", "monster", "mob" ] }, "minecraft:physics": { }, diff --git a/behavior_pack/entities/minecart.json b/behavior_pack/entities/minecart.json index 9cd1b17..3012b49 100644 --- a/behavior_pack/entities/minecart.json +++ b/behavior_pack/entities/minecart.json @@ -1,5 +1,5 @@ { - "format_version": "1.12.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:minecart", diff --git a/behavior_pack/entities/pig.json b/behavior_pack/entities/pig.json index 339fab9..edf9750 100644 --- a/behavior_pack/entities/pig.json +++ b/behavior_pack/entities/pig.json @@ -1,11 +1,19 @@ { - "format_version": "1.21.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:pig", "spawn_category": "creature", "is_spawnable": true, - "is_summonable": true + "is_summonable": true, + "properties": { + "minecraft:climate_variant": { + "type": "enum", + "values": [ "temperate", "warm", "cold" ], + "default": "temperate", + "client_sync": true + } + } }, "component_groups": { "minecraft:pig_baby": { @@ -59,7 +67,10 @@ "target": "baby" } }, - "breed_items": [ "carrot", "beetroot", "potato" ] + "breed_items": [ "carrot", "beetroot", "potato" ], + "property_inheritance": { + "minecraft:climate_variant": {} + } } }, @@ -73,6 +84,7 @@ }, "use_item": true, "play_sounds": "saddle", + "equip_item_slot": "slot.armor.body", "interact_text": "action.interact.saddle" } ] @@ -144,7 +156,7 @@ ], "event": "become_zombie" }, - "deals_damage": false + "deals_damage": "no" } }, "minecraft:type_family": { @@ -255,21 +267,44 @@ } }, "minecraft:entity_spawned": { - "randomize": [ + "sequence": [ { - "weight": 95, - "trigger": "minecraft:spawn_adult" + "randomize": [ + { + "weight": 95, + "trigger": "minecraft:spawn_adult" + }, + { + "weight": 5, + "add": { + "component_groups": [ + "minecraft:pig_baby" + ] + } + } + ] }, { - "weight": 5, - "remove": { - }, - "add": { - "component_groups": [ - "minecraft:pig_baby" - ] - - } + "first_valid": [ + { + "filters": { + "test": "has_biome_tag", + "value": "spawns_warm_variant_farm_animals" + }, + "set_property": { + "minecraft:climate_variant": "warm" + } + }, + { + "filters": { + "test": "has_biome_tag", + "value": "spawns_cold_variant_farm_animals" + }, + "set_property": { + "minecraft:climate_variant": "cold" + } + } + ] } ] }, diff --git a/behavior_pack/entities/pufferfish.json b/behavior_pack/entities/pufferfish.json index 00aacfe..7c909b4 100644 --- a/behavior_pack/entities/pufferfish.json +++ b/behavior_pack/entities/pufferfish.json @@ -1,5 +1,5 @@ { - "format_version": "1.20.60", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:pufferfish", @@ -7,7 +7,6 @@ "is_spawnable": true, "is_summonable": true }, - "component_groups": { "minecraft:normal_puff": { "minecraft:variant": { @@ -15,20 +14,29 @@ }, "minecraft:entity_sensor": { "relative_range": false, - "subsensors": [{ - "range": 2.5, - "minimum_count": 1, - "event_filters": { - "any_of": [ - { "test": "is_family", "subject": "other", "value": "mob" }, - { "all_of": [ - { "test": "is_family", "subject": "other", "value": "player" }, - { "test": "has_ability", "subject": "other", "operator": "not", "value": "instabuild" } - ]} - ] - }, - "event": "minecraft:start_half_puff" - }] + "subsensors": [ + { + "range": [ 2.5, 2.5 ], + "minimum_count": 1, + "event_filters": { + "any_of": [ + { + "all_of": [ + { "test": "is_family", "subject": "other", "value": "mob" }, + { + "any_of": [ + { "test": "is_family", "subject": "other", "value": "axolotl" }, + { "test": "is_family", "subject": "other", "operator": "not", "value": "aquatic" } + ] + } + ] + }, + { "test": "is_family", "subject": "other", "value": "player" } + ] + }, + "event": "minecraft:start_half_puff" + } + ] } }, "minecraft:half_puff_primary": { @@ -50,20 +58,29 @@ }, "minecraft:entity_sensor": { "relative_range": false, - "subsensors": [{ - "range": 2.5, - "minimum_count": 1, - "event_filters": { - "any_of": [ - { "test": "is_family", "subject": "other", "value": "mob" }, - { "all_of": [ - { "test": "is_family", "subject": "other", "value": "player" }, - { "test": "has_ability", "subject": "other", "operator": "not", "value": "instabuild" } - ]} - ] - }, - "event": "minecraft:start_full_puff" - }] + "subsensors": [ + { + "range": [ 2.5, 2.5 ], + "minimum_count": 1, + "event_filters": { + "any_of": [ + { + "all_of": [ + { "test": "is_family", "subject": "other", "value": "mob" }, + { + "any_of": [ + { "test": "is_family", "subject": "other", "value": "axolotl" }, + { "test": "is_family", "subject": "other", "operator": "not", "value": "aquatic" } + ] + } + ] + }, + { "test": "is_family", "subject": "other", "value": "player" } + ] + }, + "event": "minecraft:start_full_puff" + } + ] }, "minecraft:timer": { "looping": false, @@ -85,8 +102,23 @@ "cause": "contact", "entity_filter": { "any_of": [ - { "test": "is_family", "subject": "other", "value": "player" }, - { "test": "is_family", "subject": "other", "value": "monster" } + { + "all_of": [ + { "test": "is_family", "subject": "other", "value": "mob" }, + { + "any_of": [ + { "test": "is_family", "subject": "other", "value": "axolotl" }, + { "test": "is_family", "subject": "other", "operator": "not", "value": "aquatic" } + ] + } + ] + }, + { + "all_of": [ + { "test": "is_family", "subject": "other", "value": "player" }, + { "test": "has_ability", "subject": "other", "operator": "not", "value": "instabuild" } + ] + } ] } }, @@ -96,8 +128,28 @@ "effect_time": 10, "entity_filter": { "any_of": [ - { "test": "is_family", "subject": "other", "value": "player" }, - { "test": "is_family", "subject": "other", "value": "monster" } + { + "all_of": [ + { "test": "is_family", "subject": "other", "value": "mob" }, + { + "any_of": [ + { "test": "is_family", "subject": "other", "value": "axolotl" }, + { + "all_of": [ + { "test": "is_family", "subject": "other", "operator": "not", "value": "aquatic" }, + { "test": "is_family", "subject": "other", "operator": "not", "value": "undead" } + ] + } + ] + } + ] + }, + { + "all_of": [ + { "test": "is_family", "subject": "other", "value": "player"}, + { "test": "has_ability", "subject": "other", "operator": "not", "value": "instabuild" } + ] + } ] } } @@ -115,21 +167,30 @@ "minecraft:deflate_sensor": { "minecraft:entity_sensor": { "relative_range": false, - "subsensors": [{ - "range": 2.9, - "minimum_count": 0, - "maximum_count": 0, - "event_filters": { - "any_of": [ - { "test": "is_family", "subject": "other", "value": "mob" }, - { "all_of": [ - { "test": "is_family", "subject": "other", "value": "player" }, - { "test": "has_ability", "subject": "other", "operator": "not", "value": "instabuild" } - ]} - ] - }, - "event": "minecraft:from_full_puff" - }] + "subsensors": [ + { + "range": [ 2.9, 2.9 ], + "minimum_count": 0, + "maximum_count": 0, + "event_filters": { + "any_of": [ + { + "all_of": [ + { "test": "is_family", "subject": "other", "value": "mob" }, + { + "any_of": [ + { "test": "is_family", "subject": "other", "value": "axolotl" }, + { "test": "is_family", "subject": "other", "operator": "not", "value": "aquatic" } + ] + } + ] + }, + { "test": "is_family", "subject": "other", "value": "player" } + ] + }, + "event": "minecraft:from_full_puff" + } + ] } }, "minecraft:start_deflate": { @@ -143,7 +204,6 @@ } } }, - "components": { "minecraft:is_hidden_when_invisible": { }, @@ -151,7 +211,7 @@ "on_death": "query.last_hit_by_player ? Math.Random(1,3) : 0" }, "minecraft:type_family": { - "family": [ "pufferfish", "fish" ] + "family": [ "aquatic", "pufferfish", "fish" ] }, "minecraft:collision_box": { "width": 0.8, @@ -267,52 +327,75 @@ "minecraft:conditional_bandwidth_optimization": { } }, - "events": { "minecraft:entity_spawned": { "add": { "component_groups": [ "minecraft:normal_puff" ] } }, - "minecraft:to_full_puff": { - "add": { "component_groups": [ "minecraft:full_puff", "minecraft:deflate_sensor_buffer" ] }, - "remove": { "component_groups": [ "minecraft:normal_puff" ] } + "add": { + "component_groups": [ "minecraft:full_puff", "minecraft:deflate_sensor_buffer" ] + }, + "remove": { + "component_groups": [ "minecraft:normal_puff" ] + } }, - "minecraft:start_half_puff": { - "add": { "component_groups": [ "minecraft:half_puff_primary" ] }, - "remove": { "component_groups": [ "minecraft:normal_puff" ] } + "add": { + "component_groups": [ "minecraft:half_puff_primary" ] + }, + "remove": { + "component_groups": [ "minecraft:normal_puff" ] + } }, - "minecraft:on_half_puff": { - "add": { "component_groups": [ "minecraft:half_puff_secondary" ] }, - "remove": { "component_groups": [ "minecraft:half_puff_primary" ] } + "add": { + "component_groups": [ "minecraft:half_puff_secondary" ] + }, + "remove": { + "component_groups": [ "minecraft:half_puff_primary" ] + } }, - "minecraft:start_full_puff": { - "add": { "component_groups": [ "minecraft:full_puff", "minecraft:deflate_sensor_buffer" ] }, - "remove": { "component_groups": [ "minecraft:half_puff_secondary" ] } + "add": { + "component_groups": [ "minecraft:full_puff", "minecraft:deflate_sensor_buffer" ] + }, + "remove": { + "component_groups": [ "minecraft:half_puff_secondary" ] + } }, - "minecraft:on_full_puff": { - "add": { "component_groups": [ "minecraft:deflate_sensor" ] }, - "remove": { "component_groups": [ "minecraft:deflate_sensor_buffer" ] } + "add": { + "component_groups": [ "minecraft:deflate_sensor" ] + }, + "remove": { + "component_groups": [ "minecraft:deflate_sensor_buffer" ] + } }, - "minecraft:from_full_puff": { - "add": { "component_groups": [ "minecraft:start_deflate" ] }, - "remove": { "component_groups": [ "minecraft:deflate_sensor" ] } + "add": { + "component_groups": [ "minecraft:start_deflate" ] + }, + "remove": { + "component_groups": [ "minecraft:deflate_sensor" ] + } }, - "minecraft:on_deflate": { - "add": { "component_groups": [ "minecraft:half_puff_secondary" ] }, - "remove": { "component_groups": [ "minecraft:full_puff", "minecraft:start_deflate" ] } + "add": { + "component_groups": [ "minecraft:half_puff_secondary" ] + }, + "remove": { + "component_groups": [ "minecraft:full_puff", "minecraft:start_deflate" ] + } }, - "minecraft:on_normal_puff": { - "add": { "component_groups": [ "minecraft:normal_puff" ] }, - "remove": { "component_groups": [ "minecraft:half_puff_secondary" ] } + "add": { + "component_groups": [ "minecraft:normal_puff" ] + }, + "remove": { + "component_groups": [ "minecraft:half_puff_secondary" ] + } } } } diff --git a/behavior_pack/entities/ravager.json b/behavior_pack/entities/ravager.json index 8aa1623..dbe3faa 100644 --- a/behavior_pack/entities/ravager.json +++ b/behavior_pack/entities/ravager.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.50", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:ravager", @@ -329,7 +329,9 @@ "mangrove_leaves", "pale_hanging_moss", "cherry_leaves", - "pale_oak_leaves" + "pale_oak_leaves", + "firefly_bush", + "bush" ] }, "minecraft:follow_range": { diff --git a/behavior_pack/entities/salmon.json b/behavior_pack/entities/salmon.json index bef91d6..23b350e 100644 --- a/behavior_pack/entities/salmon.json +++ b/behavior_pack/entities/salmon.json @@ -1,5 +1,5 @@ { - "format_version": "1.16.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:salmon", @@ -44,7 +44,7 @@ "on_death": "query.last_hit_by_player ? Math.Random(1,3) : 0" }, "minecraft:type_family": { - "family": [ "salmon", "fish" ] + "family": [ "aquatic", "salmon", "fish" ] }, "minecraft:collision_box": { "width": 0.5, diff --git a/behavior_pack/entities/sheep.json b/behavior_pack/entities/sheep.json index c935c8b..229e403 100644 --- a/behavior_pack/entities/sheep.json +++ b/behavior_pack/entities/sheep.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:sheep", @@ -105,12 +105,12 @@ }, "minecraft:sheep_gray": { "minecraft:color": { - "value": 8 + "value": 7 } }, "minecraft:sheep_light_gray": { "minecraft:color": { - "value": 7 + "value": 8 } }, "minecraft:sheep_pink": { @@ -122,6 +122,31 @@ "minecraft:color": { "value": 14 } + }, + "minecraft:sheep_blue": { + "minecraft:color": { + "value": 11 + } + }, + "minecraft:sheep_light_blue": { + "minecraft:color": { + "value": 3 + } + }, + "minecraft:sheep_cyan": { + "minecraft:color": { + "value": 9 + } + }, + "minecraft:sheep_orange": { + "minecraft:color": { + "value": 1 + } + }, + "minecraft:sheep_yellow": { + "minecraft:color": { + "value": 4 + } } }, @@ -246,6 +271,14 @@ { "eat_block": "tallgrass", "replace_block": "air" + }, + { + "eat_block": "short_dry_grass", + "replace_block": "air" + }, + { + "eat_block": "tall_dry_grass", + "replace_block": "air" } ], "on_eat": { @@ -294,54 +327,23 @@ ] }, { - "randomize": [ - { - "weight": 81836, - "add": { - "component_groups": [ - "minecraft:sheep_white" - ] - } - }, + "first_valid": [ { - "weight": 5000, - "add": { - "component_groups": [ - "minecraft:sheep_black" - ] - } - }, - { - "weight": 5000, - "add": { - "component_groups": [ - "minecraft:sheep_light_gray" - ] - } - }, - { - "weight": 5000, - "add": { - "component_groups": [ - "minecraft:sheep_gray" - ] - } + "filters": { + "test": "has_biome_tag", + "value": "spawns_cold_variant_farm_animals" + }, + "trigger": "minecraft:cold_color" }, { - "weight": 3000, - "add": { - "component_groups": [ - "minecraft:sheep_brown" - ] - } + "filters": { + "test": "has_biome_tag", + "value": "spawns_warm_variant_farm_animals" + }, + "trigger": "minecraft:warm_color" }, { - "weight": 164, - "add": { - "component_groups": [ - "minecraft:sheep_pink" - ] - } + "trigger": "minecraft:temperate_color" } ] } @@ -424,7 +426,9 @@ { "filters": { "subject": "self", - "test": "has_component", "operator": "!=", "value": "minecraft:is_baby" + "test": "has_component", + "operator": "!=", + "value": "minecraft:is_baby" }, "add": { "component_groups": [ @@ -446,6 +450,162 @@ "minecraft:sheep_red" ] } + }, + "minecraft:temperate_color": { + "randomize": [ + { + "weight": 81836, + "add": { + "component_groups": [ + "minecraft:sheep_white" + ] + } + }, + { + "weight": 5000, + "add": { + "component_groups": [ + "minecraft:sheep_black" + ] + } + }, + { + "weight": 5000, + "add": { + "component_groups": [ + "minecraft:sheep_light_gray" + ] + } + }, + { + "weight": 5000, + "add": { + "component_groups": [ + "minecraft:sheep_gray" + ] + } + }, + { + "weight": 3000, + "add": { + "component_groups": [ + "minecraft:sheep_brown" + ] + } + }, + { + "weight": 164, + "add": { + "component_groups": [ + "minecraft:sheep_pink" + ] + } + } + ] + }, + "minecraft:cold_color": { + "randomize": [ + { + "weight": 81836, + "add": { + "component_groups": [ + "minecraft:sheep_black" + ] + } + }, + { + "weight": 5000, + "add": { + "component_groups": [ + "minecraft:sheep_light_gray" + ] + } + }, + { + "weight": 5000, + "add": { + "component_groups": [ + "minecraft:sheep_gray" + ] + } + }, + { + "weight": 5000, + "add": { + "component_groups": [ + "minecraft:sheep_white" + ] + } + }, + { + "weight": 3000, + "add": { + "component_groups": [ + "minecraft:sheep_brown" + ] + } + }, + { + "weight": 164, + "add": { + "component_groups": [ + "minecraft:sheep_pink" + ] + } + } + ] + }, + "minecraft:warm_color": { + "randomize": [ + { + "weight": 81836, + "add": { + "component_groups": [ + "minecraft:sheep_brown" + ] + } + }, + { + "weight": 5000, + "add": { + "component_groups": [ + "minecraft:sheep_gray" + ] + } + }, + { + "weight": 5000, + "add": { + "component_groups": [ + "minecraft:sheep_light_gray" + ] + } + }, + { + "weight": 5000, + "add": { + "component_groups": [ + "minecraft:sheep_white" + ] + } + }, + { + "weight": 3000, + "add": { + "component_groups": [ + "minecraft:sheep_black" + ] + } + }, + { + "weight": 164, + "add": { + "component_groups": [ + "minecraft:sheep_pink" + ] + } + } + ] } } } diff --git a/behavior_pack/entities/squid.json b/behavior_pack/entities/squid.json index 9a4abee..5100219 100644 --- a/behavior_pack/entities/squid.json +++ b/behavior_pack/entities/squid.json @@ -1,5 +1,5 @@ { - "format_version": "1.18.10", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:squid", @@ -28,7 +28,7 @@ "minecraft:nameable": { }, "minecraft:type_family": { - "family":["squid", "mob"] + "family":[ "aquatic", "squid", "mob" ] }, "minecraft:collision_box": { "width": 0.95, diff --git a/behavior_pack/entities/tadpole.json b/behavior_pack/entities/tadpole.json index 0e8933c..1fb4353 100644 --- a/behavior_pack/entities/tadpole.json +++ b/behavior_pack/entities/tadpole.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:tadpole", @@ -19,7 +19,7 @@ "minecraft:is_hidden_when_invisible": { }, "minecraft:type_family": { - "family": [ "tadpole", "mob" ] + "family": [ "aquatic", "tadpole", "mob" ] }, "minecraft:collision_box": { "width": 0.8, diff --git a/behavior_pack/entities/tropicalfish.json b/behavior_pack/entities/tropicalfish.json index 52cc616..bdd419b 100644 --- a/behavior_pack/entities/tropicalfish.json +++ b/behavior_pack/entities/tropicalfish.json @@ -1,5 +1,5 @@ { - "format_version": "1.16.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:tropicalfish", @@ -525,7 +525,7 @@ "on_death": "query.last_hit_by_player ? Math.Random(1,3) : 0" }, "minecraft:type_family": { - "family": [ "tropicalfish", "fish" ] + "family": [ "aquatic", "tropicalfish", "fish" ] }, "minecraft:collision_box": { "width": 0.4, diff --git a/behavior_pack/entities/turtle.json b/behavior_pack/entities/turtle.json index e0f9fa8..7a50734 100644 --- a/behavior_pack/entities/turtle.json +++ b/behavior_pack/entities/turtle.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.0", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:turtle", @@ -11,7 +11,7 @@ "component_groups": { "minecraft:baby": { "minecraft:type_family": { - "family": [ "turtle", "baby_turtle", "mob" ] + "family": [ "aquatic", "turtle", "baby_turtle", "mob" ] }, "minecraft:collision_box": { "width": 0.6, @@ -52,7 +52,7 @@ "on_death": "query.last_hit_by_player ? Math.Random(1,3) : 0" }, "minecraft:type_family": { - "family": [ "turtle", "mob" ] + "family": [ "aquatic", "turtle", "mob" ] }, "minecraft:collision_box": { "width": 1.2, @@ -143,7 +143,7 @@ "minecraft:damage_sensor": { "triggers": { "cause": "lightning", - "deals_damage": true, + "deals_damage": "yes", "damage_multiplier": 2000.0 } }, diff --git a/behavior_pack/entities/wolf.json b/behavior_pack/entities/wolf.json index 15b8706..a6f33e1 100644 --- a/behavior_pack/entities/wolf.json +++ b/behavior_pack/entities/wolf.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.40", + "format_version": "1.21.70", "minecraft:entity": { "description": { "identifier": "minecraft:wolf", @@ -16,6 +16,12 @@ "type": "bool", "client_sync": false, "default": false + }, + "minecraft:sound_variant": { + "type": "enum", + "values": [ "default", "big", "cute", "grumpy", "mad", "puglin", "sad" ], + "default": "default", + "client_sync": true } } }, @@ -1067,7 +1073,8 @@ "minecraft:wolf_baby", "minecraft:wolf_wild" ] - } + }, + "trigger": "minecraft:randomize_sound_variant" }, "minecraft:spawn_wild_adult": { @@ -1076,7 +1083,8 @@ "minecraft:wolf_adult", "minecraft:wolf_wild" ] - } + }, + "trigger": "minecraft:randomize_sound_variant" }, "minecraft:spawn_tame_baby": { @@ -1085,7 +1093,8 @@ "minecraft:wolf_baby", "minecraft:wolf_tame" ] - } + }, + "trigger": "minecraft:randomize_sound_variant" }, "minecraft:spawn_tame_adult": { @@ -1094,7 +1103,8 @@ "minecraft:wolf_adult", "minecraft:wolf_tame" ] - } + }, + "trigger": "minecraft:randomize_sound_variant" }, "minecraft:ageable_grow_up": { @@ -1183,6 +1193,53 @@ "set_property": { "minecraft:is_armorable": true } + }, + + "minecraft:randomize_sound_variant": { + "randomize": [ + { + "weight": 1, + "set_property": { + "minecraft:sound_variant": "default" + } + }, + { + "weight": 1, + "set_property": { + "minecraft:sound_variant": "big" + } + }, + { + "weight": 1, + "set_property": { + "minecraft:sound_variant": "cute" + } + }, + { + "weight": 1, + "set_property": { + "minecraft:sound_variant": "grumpy" + } + }, + { + "weight": 1, + "set_property": { + "minecraft:sound_variant": "mad" + } + }, + { + "weight": 1, + "set_property": { + "minecraft:sound_variant": "puglin" + } + }, + { + "weight": 1, + "set_property": { + "minecraft:sound_variant": "sad" + } + } + ] } } } diff --git a/behavior_pack/feature_rules/meadow_after_surface_tall_grass_feature_rules.json b/behavior_pack/feature_rules/meadow_after_surface_tall_grass_feature_rules.json index df5cd33..ffa71c9 100644 --- a/behavior_pack/feature_rules/meadow_after_surface_tall_grass_feature_rules.json +++ b/behavior_pack/feature_rules/meadow_after_surface_tall_grass_feature_rules.json @@ -3,7 +3,7 @@ "minecraft:feature_rules": { "description": { "identifier": "minecraft:meadow_after_surface_tall_grass_feature_rules", - "places_feature": "minecraft:scatter_tall_grass_feature" + "places_feature": "minecraft:scatter_meadow_tall_grass_feature" }, "conditions": { "placement_pass": "after_surface_pass", diff --git a/behavior_pack/feature_rules/overworld_after_surface_firefly_bush_water_cluster.json b/behavior_pack/feature_rules/overworld_after_surface_firefly_bush_water_cluster.json index 82e933b..48d9a04 100644 --- a/behavior_pack/feature_rules/overworld_after_surface_firefly_bush_water_cluster.json +++ b/behavior_pack/feature_rules/overworld_after_surface_firefly_bush_water_cluster.json @@ -23,7 +23,7 @@ "iterations": 1, "scatter_chance": { "numerator": 1, - "denominator": 4 + "denominator": 8 }, "x": 0, "y": "query.heightmap(variable.worldx, variable.worldz)", diff --git a/behavior_pack/feature_rules/swamp_after_surface_firefly_bush_water_cluster.json b/behavior_pack/feature_rules/swamp_after_surface_firefly_bush_water_cluster.json index f42ca68..f5f9996 100644 --- a/behavior_pack/feature_rules/swamp_after_surface_firefly_bush_water_cluster.json +++ b/behavior_pack/feature_rules/swamp_after_surface_firefly_bush_water_cluster.json @@ -15,7 +15,7 @@ "iterations": 1, "scatter_chance": { "numerator": 1, - "denominator": 2 + "denominator": 4 }, "x": 0, "y": "query.heightmap(variable.worldx, variable.worldz)", diff --git a/behavior_pack/features/azalea_tree_feature.json b/behavior_pack/features/azalea_tree_feature.json index c2f11fa..7b185a1 100644 --- a/behavior_pack/features/azalea_tree_feature.json +++ b/behavior_pack/features/azalea_tree_feature.json @@ -85,7 +85,9 @@ "minecraft:tall_grass", "minecraft:large_fern", "minecraft:rose_bush", - "minecraft:peony" + "minecraft:peony", + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/birch_tree_feature.json b/behavior_pack/features/birch_tree_feature.json index e09c857..11b6e1c 100644 --- a/behavior_pack/features/birch_tree_feature.json +++ b/behavior_pack/features/birch_tree_feature.json @@ -68,7 +68,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/cherry_tree_feature.json b/behavior_pack/features/cherry_tree_feature.json index dc0f8de..6cb1c7b 100644 --- a/behavior_pack/features/cherry_tree_feature.json +++ b/behavior_pack/features/cherry_tree_feature.json @@ -78,7 +78,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/fallen_birch_tree_feature.json b/behavior_pack/features/fallen_birch_tree_feature.json index aecb7cf..c1a0c48 100644 --- a/behavior_pack/features/fallen_birch_tree_feature.json +++ b/behavior_pack/features/fallen_birch_tree_feature.json @@ -42,7 +42,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/fallen_jungle_tree_feature.json b/behavior_pack/features/fallen_jungle_tree_feature.json index 42c215f..ac1570c 100644 --- a/behavior_pack/features/fallen_jungle_tree_feature.json +++ b/behavior_pack/features/fallen_jungle_tree_feature.json @@ -18,81 +18,38 @@ "decoration_chance": 75.0 } }, + // Blocks the tree can be placed on. + "may_grow_on": [ + { "tags": "query.any_tag('dirt')" } + ], + // Any "may_grow_on" block that is not specified here will be replaced with the first block in this list. "base_block": [ "minecraft:dirt", "minecraft:coarse_dirt" ], - "may_grow_on": [ - "minecraft:dirt", - "minecraft:grass_block", - "minecraft:podzol", - "minecraft:dirt_with_roots", - "minecraft:moss_block", - "minecraft:coarse_dirt", - // Block aliases sure would be sweet - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 0 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 1 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 2 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 3 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 4 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 5 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 6 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 7 - } - } + // Blocks to ignore when checking for clearance around the tree. Already includes all blocks specified in "may_replace". + "may_grow_through": [ + { "tags": "query.any_tag('dirt')" } ], + // Blocks that can be replaced by the tree's trunk and canopy. "may_replace": [ "minecraft:air", - "minecraft:oak_leaves", - "minecraft:spruce_leaves", + "minecraft:snow_layer", + // All leaves + "minecraft:acacia_leaves", + "minecraft:azalea_leaves", + "minecraft:azalea_leaves_flowered", "minecraft:birch_leaves", + "minecraft:cherry_leaves", + "minecraft:dark_oak_leaves", "minecraft:jungle_leaves", - "minecraft:acacia_leaves", - "minecraft:dark_oak_leaves" - ], - "may_grow_through": [ - "minecraft:dirt", - "minecraft:grass_block", - "minecraft:coarse_dirt" + "minecraft:mangrove_leaves", + "minecraft:oak_leaves", + "minecraft:pale_oak_leaves", + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] - } } \ No newline at end of file diff --git a/behavior_pack/features/fallen_oak_tree_feature.json b/behavior_pack/features/fallen_oak_tree_feature.json index 618f651..be919d8 100644 --- a/behavior_pack/features/fallen_oak_tree_feature.json +++ b/behavior_pack/features/fallen_oak_tree_feature.json @@ -46,7 +46,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/fallen_spruce_tree_feature.json b/behavior_pack/features/fallen_spruce_tree_feature.json index f979b3f..86b1456 100644 --- a/behavior_pack/features/fallen_spruce_tree_feature.json +++ b/behavior_pack/features/fallen_spruce_tree_feature.json @@ -42,7 +42,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/fallen_super_birch_tree_feature.json b/behavior_pack/features/fallen_super_birch_tree_feature.json index af39ee1..2e282c9 100644 --- a/behavior_pack/features/fallen_super_birch_tree_feature.json +++ b/behavior_pack/features/fallen_super_birch_tree_feature.json @@ -46,7 +46,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/fancy_oak_tree_feature.json b/behavior_pack/features/fancy_oak_tree_feature.json index 5173afe..e82b726 100644 --- a/behavior_pack/features/fancy_oak_tree_feature.json +++ b/behavior_pack/features/fancy_oak_tree_feature.json @@ -57,7 +57,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/jungle_bush_feature.json b/behavior_pack/features/jungle_bush_feature.json index 7e90e76..8098451 100644 --- a/behavior_pack/features/jungle_bush_feature.json +++ b/behavior_pack/features/jungle_bush_feature.json @@ -57,7 +57,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/jungle_tree_feature.json b/behavior_pack/features/jungle_tree_feature.json index ae069c5..f8ca8c1 100644 --- a/behavior_pack/features/jungle_tree_feature.json +++ b/behavior_pack/features/jungle_tree_feature.json @@ -82,7 +82,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/mangrove_tree_feature.json b/behavior_pack/features/mangrove_tree_feature.json index 3526076..cbbe81d 100644 --- a/behavior_pack/features/mangrove_tree_feature.json +++ b/behavior_pack/features/mangrove_tree_feature.json @@ -128,7 +128,10 @@ // Blocks used to decorate the tree "minecraft:vine", "minecraft:moss_carpet", - "minecraft:mangrove_propagule" + "minecraft:mangrove_propagule", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/mega_jungle_tree_feature.json b/behavior_pack/features/mega_jungle_tree_feature.json index 1345a38..2e56ca1 100644 --- a/behavior_pack/features/mega_jungle_tree_feature.json +++ b/behavior_pack/features/mega_jungle_tree_feature.json @@ -83,7 +83,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/mega_pine_tree_feature.json b/behavior_pack/features/mega_pine_tree_feature.json index 5536768..d1379e0 100644 --- a/behavior_pack/features/mega_pine_tree_feature.json +++ b/behavior_pack/features/mega_pine_tree_feature.json @@ -60,7 +60,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/mega_spruce_tree_feature.json b/behavior_pack/features/mega_spruce_tree_feature.json index 4504fd7..74afb3f 100644 --- a/behavior_pack/features/mega_spruce_tree_feature.json +++ b/behavior_pack/features/mega_spruce_tree_feature.json @@ -60,7 +60,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/mountain_pine_tree_feature.json b/behavior_pack/features/mountain_pine_tree_feature.json index b1be7c0..fc74ae5 100644 --- a/behavior_pack/features/mountain_pine_tree_feature.json +++ b/behavior_pack/features/mountain_pine_tree_feature.json @@ -53,7 +53,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/mountain_spruce_tree_feature.json b/behavior_pack/features/mountain_spruce_tree_feature.json index 2cab530..d8886cd 100644 --- a/behavior_pack/features/mountain_spruce_tree_feature.json +++ b/behavior_pack/features/mountain_spruce_tree_feature.json @@ -64,7 +64,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/oak_tree_feature.json b/behavior_pack/features/oak_tree_feature.json index 0267179..4e3551f 100644 --- a/behavior_pack/features/oak_tree_feature.json +++ b/behavior_pack/features/oak_tree_feature.json @@ -68,7 +68,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/oak_tree_with_vines_feature.json b/behavior_pack/features/oak_tree_with_vines_feature.json index 933406d..02082c6 100644 --- a/behavior_pack/features/oak_tree_with_vines_feature.json +++ b/behavior_pack/features/oak_tree_with_vines_feature.json @@ -43,87 +43,39 @@ "leaf_block": { "name": "minecraft:oak_leaves" } - }, + }, + // Blocks the tree can be placed on. + "may_grow_on": [ + { "tags": "query.any_tag('dirt')" } + ], + // Any "may_grow_on" block that is not specified here will be replaced with the first block in this list. "base_block": [ "minecraft:dirt", "minecraft:coarse_dirt" ], - "may_grow_on": [ - "minecraft:dirt", - "minecraft:grass_block", - "minecraft:podzol", - "minecraft:dirt_with_roots", - "minecraft:moss_block", - "minecraft:mycelium", - "minecraft:mud", - "minecraft:muddy_mangrove_roots", - "minecraft:coarse_dirt", - // Block aliases sure would be sweet - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 0 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 1 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 2 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 3 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 4 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 5 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 6 - } - }, - { - "name": "minecraft:farmland", - "states": { - "moisturized_amount": 7 - } - } + // Blocks to ignore when checking for clearance around the tree. Already includes all blocks specified in "may_replace". + "may_grow_through": [ + { "tags": "query.any_tag('dirt')" } ], + // Blocks that can be replaced by the tree's trunk and canopy. "may_replace": [ "minecraft:air", - "minecraft:mangrove_leaves", + "minecraft:snow_layer", + // All leaves + "minecraft:acacia_leaves", "minecraft:azalea_leaves", "minecraft:azalea_leaves_flowered", - "minecraft:oak_leaves", - "minecraft:spruce_leaves", "minecraft:birch_leaves", + "minecraft:cherry_leaves", + "minecraft:dark_oak_leaves", "minecraft:jungle_leaves", - "minecraft:acacia_leaves", - "minecraft:dark_oak_leaves" - ], - "may_grow_through": [ - "minecraft:dirt", - "minecraft:grass_block", - "minecraft:coarse_dirt" + "minecraft:mangrove_leaves", + "minecraft:oak_leaves", + "minecraft:pale_oak_leaves", + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/pale_oak_tree_feature.json b/behavior_pack/features/pale_oak_tree_feature.json index 0520889..31c9862 100644 --- a/behavior_pack/features/pale_oak_tree_feature.json +++ b/behavior_pack/features/pale_oak_tree_feature.json @@ -82,7 +82,10 @@ // Blocks that are naturally occuring in the Biome "minecraft:closed_eyeblossom", "minecraft:open_eyeblossom", - "minecraft:pale_moss_carpet" + "minecraft:pale_moss_carpet", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/pine_tree_feature.json b/behavior_pack/features/pine_tree_feature.json index f6dbd3c..ae829d4 100644 --- a/behavior_pack/features/pine_tree_feature.json +++ b/behavior_pack/features/pine_tree_feature.json @@ -51,7 +51,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/roofed_tree_feature.json b/behavior_pack/features/roofed_tree_feature.json index 221d302..c7cc35a 100644 --- a/behavior_pack/features/roofed_tree_feature.json +++ b/behavior_pack/features/roofed_tree_feature.json @@ -82,7 +82,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/savanna_tree_feature.json b/behavior_pack/features/savanna_tree_feature.json index b7d8ebd..a56a244 100644 --- a/behavior_pack/features/savanna_tree_feature.json +++ b/behavior_pack/features/savanna_tree_feature.json @@ -79,7 +79,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/spruce_tree_feature.json b/behavior_pack/features/spruce_tree_feature.json index 3e13221..6fa50b6 100644 --- a/behavior_pack/features/spruce_tree_feature.json +++ b/behavior_pack/features/spruce_tree_feature.json @@ -62,7 +62,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/super_birch_tree_feature.json b/behavior_pack/features/super_birch_tree_feature.json index 53863ee..9f57701 100644 --- a/behavior_pack/features/super_birch_tree_feature.json +++ b/behavior_pack/features/super_birch_tree_feature.json @@ -72,7 +72,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/swamp_tree_feature.json b/behavior_pack/features/swamp_tree_feature.json index 763988d..783789c 100644 --- a/behavior_pack/features/swamp_tree_feature.json +++ b/behavior_pack/features/swamp_tree_feature.json @@ -79,7 +79,10 @@ "minecraft:spruce_leaves", // Water "minecraft:water", - "minecraft:flowing_water" + "minecraft:flowing_water", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/tall_mangrove_tree_feature.json b/behavior_pack/features/tall_mangrove_tree_feature.json index 5db0271..1dc247a 100644 --- a/behavior_pack/features/tall_mangrove_tree_feature.json +++ b/behavior_pack/features/tall_mangrove_tree_feature.json @@ -128,7 +128,10 @@ // Blocks used to decorate the tree "minecraft:vine", "minecraft:moss_carpet", - "minecraft:mangrove_propagule" + "minecraft:mangrove_propagule", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/features/undecorated_jungle_tree_feature.json b/behavior_pack/features/undecorated_jungle_tree_feature.json index 7054de7..b536a01 100644 --- a/behavior_pack/features/undecorated_jungle_tree_feature.json +++ b/behavior_pack/features/undecorated_jungle_tree_feature.json @@ -68,7 +68,10 @@ "minecraft:mangrove_leaves", "minecraft:oak_leaves", "minecraft:pale_oak_leaves", - "minecraft:spruce_leaves" + "minecraft:spruce_leaves", + // Plants + "minecraft:wildflowers", + "minecraft:leaf_litter" ] } } diff --git a/behavior_pack/item_catalog/crafting_item_catalog.json b/behavior_pack/item_catalog/crafting_item_catalog.json index bab488e..cd513a3 100644 --- a/behavior_pack/item_catalog/crafting_item_catalog.json +++ b/behavior_pack/item_catalog/crafting_item_catalog.json @@ -1,2252 +1,2261 @@ { - "format_version" : "1.21.60", - "minecraft:crafting_items_catalog" : { - "categories" : [ - { - "category_name" : "construction", - "groups" : [ - { - "group_identifier" : { - "icon" : "minecraft:oak_planks", - "name" : "minecraft:itemGroup.name.planks" - }, - "items" : [ - "minecraft:oak_planks", - "minecraft:spruce_planks", - "minecraft:birch_planks", - "minecraft:jungle_planks", - "minecraft:acacia_planks", - "minecraft:dark_oak_planks", - "minecraft:mangrove_planks", - "minecraft:cherry_planks", - "minecraft:pale_oak_planks", - "minecraft:bamboo_planks", - "minecraft:bamboo_mosaic", - "minecraft:crimson_planks", - "minecraft:warped_planks" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:cobblestone_wall", - "name" : "minecraft:itemGroup.name.walls" - }, - "items" : [ - "minecraft:cobblestone_wall", - "minecraft:mossy_cobblestone_wall", - "minecraft:granite_wall", - "minecraft:diorite_wall", - "minecraft:andesite_wall", - "minecraft:sandstone_wall", - "minecraft:red_sandstone_wall", - "minecraft:stone_brick_wall", - "minecraft:mossy_stone_brick_wall", - "minecraft:brick_wall", - "minecraft:nether_brick_wall", - "minecraft:red_nether_brick_wall", - "minecraft:end_stone_brick_wall", - "minecraft:prismarine_wall", - "minecraft:blackstone_wall", - "minecraft:polished_blackstone_wall", - "minecraft:polished_blackstone_brick_wall", - "minecraft:cobbled_deepslate_wall", - "minecraft:deepslate_tile_wall", - "minecraft:polished_deepslate_wall", - "minecraft:deepslate_brick_wall", - "minecraft:tuff_wall", - "minecraft:tuff_brick_wall", - "minecraft:polished_tuff_wall", - "minecraft:mud_brick_wall", - "minecraft:resin_brick_wall" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:oak_fence", - "name" : "minecraft:itemGroup.name.fence" - }, - "items" : [ - "minecraft:oak_fence", - "minecraft:spruce_fence", - "minecraft:birch_fence", - "minecraft:jungle_fence", - "minecraft:acacia_fence", - "minecraft:dark_oak_fence", - "minecraft:mangrove_fence", - "minecraft:cherry_fence", - "minecraft:pale_oak_fence", - "minecraft:bamboo_fence", - "minecraft:nether_brick_fence", - "minecraft:crimson_fence", - "minecraft:warped_fence" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:fence_gate", - "name" : "minecraft:itemGroup.name.fenceGate" - }, - "items" : [ - "minecraft:fence_gate", - "minecraft:spruce_fence_gate", - "minecraft:birch_fence_gate", - "minecraft:jungle_fence_gate", - "minecraft:acacia_fence_gate", - "minecraft:dark_oak_fence_gate", - "minecraft:mangrove_fence_gate", - "minecraft:cherry_fence_gate", - "minecraft:pale_oak_fence_gate", - "minecraft:bamboo_fence_gate", - "minecraft:crimson_fence_gate", - "minecraft:warped_fence_gate" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:stone_stairs", - "name" : "minecraft:itemGroup.name.stairs" - }, - "items" : [ - "minecraft:normal_stone_stairs", - "minecraft:stone_stairs", - "minecraft:mossy_cobblestone_stairs", - "minecraft:oak_stairs", - "minecraft:spruce_stairs", - "minecraft:birch_stairs", - "minecraft:jungle_stairs", - "minecraft:acacia_stairs", - "minecraft:dark_oak_stairs", - "minecraft:mangrove_stairs", - "minecraft:cherry_stairs", - "minecraft:pale_oak_stairs", - "minecraft:bamboo_stairs", - "minecraft:bamboo_mosaic_stairs", - "minecraft:stone_brick_stairs", - "minecraft:mossy_stone_brick_stairs", - "minecraft:sandstone_stairs", - "minecraft:smooth_sandstone_stairs", - "minecraft:red_sandstone_stairs", - "minecraft:smooth_red_sandstone_stairs", - "minecraft:granite_stairs", - "minecraft:polished_granite_stairs", - "minecraft:diorite_stairs", - "minecraft:polished_diorite_stairs", - "minecraft:andesite_stairs", - "minecraft:polished_andesite_stairs", - "minecraft:brick_stairs", - "minecraft:nether_brick_stairs", - "minecraft:red_nether_brick_stairs", - "minecraft:end_brick_stairs", - "minecraft:quartz_stairs", - "minecraft:smooth_quartz_stairs", - "minecraft:purpur_stairs", - "minecraft:prismarine_stairs", - "minecraft:dark_prismarine_stairs", - "minecraft:prismarine_bricks_stairs", - "minecraft:crimson_stairs", - "minecraft:warped_stairs", - "minecraft:blackstone_stairs", - "minecraft:polished_blackstone_stairs", - "minecraft:polished_blackstone_brick_stairs", - "minecraft:cobbled_deepslate_stairs", - "minecraft:deepslate_tile_stairs", - "minecraft:polished_deepslate_stairs", - "minecraft:deepslate_brick_stairs", - "minecraft:tuff_stairs", - "minecraft:polished_tuff_stairs", - "minecraft:tuff_brick_stairs", - "minecraft:mud_brick_stairs", - "minecraft:cut_copper_stairs", - "minecraft:exposed_cut_copper_stairs", - "minecraft:weathered_cut_copper_stairs", - "minecraft:oxidized_cut_copper_stairs", - "minecraft:waxed_cut_copper_stairs", - "minecraft:waxed_exposed_cut_copper_stairs", - "minecraft:waxed_weathered_cut_copper_stairs", - "minecraft:waxed_oxidized_cut_copper_stairs", - "minecraft:resin_brick_stairs" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:wooden_door", - "name" : "minecraft:itemGroup.name.door" - }, - "items" : [ - "minecraft:wooden_door", - "minecraft:spruce_door", - "minecraft:birch_door", - "minecraft:jungle_door", - "minecraft:acacia_door", - "minecraft:dark_oak_door", - "minecraft:mangrove_door", - "minecraft:cherry_door", - "minecraft:pale_oak_door", - "minecraft:bamboo_door", - "minecraft:iron_door", - "minecraft:crimson_door", - "minecraft:warped_door", - "minecraft:copper_door", - "minecraft:exposed_copper_door", - "minecraft:weathered_copper_door", - "minecraft:oxidized_copper_door", - "minecraft:waxed_copper_door", - "minecraft:waxed_exposed_copper_door", - "minecraft:waxed_weathered_copper_door", - "minecraft:waxed_oxidized_copper_door" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:trapdoor", - "name" : "minecraft:itemGroup.name.trapdoor" - }, - "items" : [ - "minecraft:trapdoor", - "minecraft:spruce_trapdoor", - "minecraft:birch_trapdoor", - "minecraft:jungle_trapdoor", - "minecraft:acacia_trapdoor", - "minecraft:dark_oak_trapdoor", - "minecraft:mangrove_trapdoor", - "minecraft:cherry_trapdoor", - "minecraft:pale_oak_trapdoor", - "minecraft:bamboo_trapdoor", - "minecraft:iron_trapdoor", - "minecraft:crimson_trapdoor", - "minecraft:warped_trapdoor", - "minecraft:copper_trapdoor", - "minecraft:exposed_copper_trapdoor", - "minecraft:weathered_copper_trapdoor", - "minecraft:oxidized_copper_trapdoor", - "minecraft:waxed_copper_trapdoor", - "minecraft:waxed_exposed_copper_trapdoor", - "minecraft:waxed_weathered_copper_trapdoor", - "minecraft:waxed_oxidized_copper_trapdoor" - ] - }, - { - "items" : [ "minecraft:iron_bars" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:glass", - "name" : "minecraft:itemGroup.name.glass" - }, - "items" : [ - "minecraft:glass", - "minecraft:white_stained_glass", - "minecraft:light_gray_stained_glass", - "minecraft:gray_stained_glass", - "minecraft:black_stained_glass", - "minecraft:brown_stained_glass", - "minecraft:red_stained_glass", - "minecraft:orange_stained_glass", - "minecraft:yellow_stained_glass", - "minecraft:lime_stained_glass", - "minecraft:green_stained_glass", - "minecraft:cyan_stained_glass", - "minecraft:light_blue_stained_glass", - "minecraft:blue_stained_glass", - "minecraft:purple_stained_glass", - "minecraft:magenta_stained_glass", - "minecraft:pink_stained_glass", - "minecraft:tinted_glass" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:glass_pane", - "name" : "minecraft:itemGroup.name.glassPane" - }, - "items" : [ - "minecraft:glass_pane", - "minecraft:white_stained_glass_pane", - "minecraft:light_gray_stained_glass_pane", - "minecraft:gray_stained_glass_pane", - "minecraft:black_stained_glass_pane", - "minecraft:brown_stained_glass_pane", - "minecraft:red_stained_glass_pane", - "minecraft:orange_stained_glass_pane", - "minecraft:yellow_stained_glass_pane", - "minecraft:lime_stained_glass_pane", - "minecraft:green_stained_glass_pane", - "minecraft:cyan_stained_glass_pane", - "minecraft:light_blue_stained_glass_pane", - "minecraft:blue_stained_glass_pane", - "minecraft:purple_stained_glass_pane", - "minecraft:magenta_stained_glass_pane", - "minecraft:pink_stained_glass_pane" - ] - }, - { - "items" : [ "minecraft:ladder", "minecraft:scaffolding", "minecraft:brick_block" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:smooth_stone_slab", - "name" : "minecraft:itemGroup.name.slab" - }, - "items" : [ - "minecraft:smooth_stone_slab", - "minecraft:normal_stone_slab", - "minecraft:cobblestone_slab", - "minecraft:mossy_cobblestone_slab", - "minecraft:oak_slab", - "minecraft:spruce_slab", - "minecraft:birch_slab", - "minecraft:jungle_slab", - "minecraft:acacia_slab", - "minecraft:dark_oak_slab", - "minecraft:mangrove_slab", - "minecraft:cherry_slab", - "minecraft:pale_oak_slab", - "minecraft:bamboo_slab", - "minecraft:bamboo_mosaic_slab", - "minecraft:stone_brick_slab", - "minecraft:mossy_stone_brick_slab", - "minecraft:sandstone_slab", - "minecraft:cut_sandstone_slab", - "minecraft:smooth_sandstone_slab", - "minecraft:red_sandstone_slab", - "minecraft:cut_red_sandstone_slab", - "minecraft:smooth_red_sandstone_slab", - "minecraft:granite_slab", - "minecraft:polished_granite_slab", - "minecraft:diorite_slab", - "minecraft:polished_diorite_slab", - "minecraft:andesite_slab", - "minecraft:polished_andesite_slab", - "minecraft:brick_slab", - "minecraft:nether_brick_slab", - "minecraft:red_nether_brick_slab", - "minecraft:end_stone_brick_slab", - "minecraft:quartz_slab", - "minecraft:smooth_quartz_slab", - "minecraft:purpur_slab", - "minecraft:prismarine_slab", - "minecraft:dark_prismarine_slab", - "minecraft:prismarine_brick_slab", - "minecraft:crimson_slab", - "minecraft:warped_slab", - "minecraft:blackstone_slab", - "minecraft:polished_blackstone_slab", - "minecraft:polished_blackstone_brick_slab", - "minecraft:cobbled_deepslate_slab", - "minecraft:polished_deepslate_slab", - "minecraft:deepslate_tile_slab", - "minecraft:deepslate_brick_slab", - "minecraft:tuff_slab", - "minecraft:polished_tuff_slab", - "minecraft:tuff_brick_slab", - "minecraft:mud_brick_slab", - "minecraft:cut_copper_slab", - "minecraft:exposed_cut_copper_slab", - "minecraft:weathered_cut_copper_slab", - "minecraft:oxidized_cut_copper_slab", - "minecraft:waxed_cut_copper_slab", - "minecraft:waxed_exposed_cut_copper_slab", - "minecraft:waxed_weathered_cut_copper_slab", - "minecraft:waxed_oxidized_cut_copper_slab", - "minecraft:resin_brick_slab" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:stone_bricks", - "name" : "minecraft:itemGroup.name.stoneBrick" - }, - "items" : [ - "minecraft:stone_bricks", - "minecraft:mossy_stone_bricks", - "minecraft:cracked_stone_bricks", - "minecraft:chiseled_stone_bricks", - "minecraft:smooth_stone", - "minecraft:end_bricks", - "minecraft:polished_blackstone_bricks", - "minecraft:cracked_polished_blackstone_bricks", - "minecraft:gilded_blackstone", - "minecraft:chiseled_polished_blackstone", - "minecraft:deepslate_tiles", - "minecraft:cracked_deepslate_tiles", - "minecraft:deepslate_bricks", - "minecraft:tuff_bricks", - "minecraft:cracked_deepslate_bricks", - "minecraft:chiseled_deepslate", - "minecraft:chiseled_tuff", - "minecraft:chiseled_tuff_bricks" - ] - }, - { - "items" : [ - "minecraft:cobblestone", - "minecraft:mossy_cobblestone", - "minecraft:cobbled_deepslate" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:sandstone", - "name" : "minecraft:itemGroup.name.sandstone" - }, - "items" : [ - "minecraft:sandstone", - "minecraft:chiseled_sandstone", - "minecraft:cut_sandstone", - "minecraft:smooth_sandstone", - "minecraft:red_sandstone", - "minecraft:chiseled_red_sandstone", - "minecraft:cut_red_sandstone", - "minecraft:smooth_red_sandstone" - ] - }, - { - "items" : [ "minecraft:coal_block", "minecraft:dried_kelp_block" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:copper_block", - "name" : "minecraft:itemGroup.name.copper" - }, - "items" : [ - "minecraft:copper_block", - "minecraft:weathered_copper", - "minecraft:exposed_copper", - "minecraft:oxidized_copper", - "minecraft:waxed_copper", - "minecraft:waxed_exposed_copper", - "minecraft:waxed_weathered_copper", - "minecraft:waxed_oxidized_copper", - "minecraft:copper_grate", - "minecraft:exposed_copper_grate", - "minecraft:weathered_copper_grate", - "minecraft:oxidized_copper_grate", - "minecraft:waxed_copper_grate", - "minecraft:waxed_exposed_copper_grate", - "minecraft:waxed_weathered_copper_grate", - "minecraft:waxed_oxidized_copper_grate", - "minecraft:cut_copper", - "minecraft:exposed_cut_copper", - "minecraft:weathered_cut_copper", - "minecraft:oxidized_cut_copper", - "minecraft:waxed_cut_copper", - "minecraft:waxed_exposed_cut_copper", - "minecraft:waxed_weathered_cut_copper", - "minecraft:waxed_oxidized_cut_copper", - "minecraft:chiseled_copper", - "minecraft:exposed_chiseled_copper", - "minecraft:weathered_chiseled_copper", - "minecraft:oxidized_chiseled_copper", - "minecraft:waxed_chiseled_copper", - "minecraft:waxed_exposed_chiseled_copper", - "minecraft:waxed_oxidized_chiseled_copper", - "minecraft:waxed_weathered_chiseled_copper", - "minecraft:copper_bulb", - "minecraft:exposed_copper_bulb", - "minecraft:weathered_copper_bulb", - "minecraft:oxidized_copper_bulb", - "minecraft:waxed_copper_bulb", - "minecraft:waxed_exposed_copper_bulb", - "minecraft:waxed_weathered_copper_bulb", - "minecraft:waxed_oxidized_copper_bulb" - ] - }, - { - "items" : [ - "minecraft:iron_block", - "minecraft:gold_block", - "minecraft:emerald_block", - "minecraft:diamond_block", - "minecraft:lapis_block", - "minecraft:raw_copper_block", - "minecraft:raw_iron_block", - "minecraft:raw_gold_block", - "minecraft:quartz_block", - "minecraft:quartz_bricks", - "minecraft:quartz_pillar", - "minecraft:chiseled_quartz_block", - "minecraft:smooth_quartz", - "minecraft:prismarine", - "minecraft:prismarine_bricks", - "minecraft:dark_prismarine", - "minecraft:slime", - "minecraft:honey_block", - "minecraft:honeycomb_block", - "minecraft:resin_block", - "minecraft:hay_block", - "minecraft:bone_block", - "minecraft:resin_bricks", - "minecraft:chiseled_resin_bricks", - "minecraft:nether_brick", - "minecraft:red_nether_brick", - "minecraft:chiseled_nether_bricks", - "minecraft:cracked_nether_bricks", - "minecraft:netherite_block", - "minecraft:lodestone" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:white_wool", - "name" : "minecraft:itemGroup.name.wool" - }, - "items" : [ - "minecraft:white_wool", - "minecraft:light_gray_wool", - "minecraft:gray_wool", - "minecraft:black_wool", - "minecraft:brown_wool", - "minecraft:red_wool", - "minecraft:orange_wool", - "minecraft:yellow_wool", - "minecraft:lime_wool", - "minecraft:green_wool", - "minecraft:cyan_wool", - "minecraft:light_blue_wool", - "minecraft:blue_wool", - "minecraft:purple_wool", - "minecraft:magenta_wool", - "minecraft:pink_wool" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:white_carpet", - "name" : "minecraft:itemGroup.name.woolCarpet" - }, - "items" : [ - "minecraft:white_carpet", - "minecraft:light_gray_carpet", - "minecraft:gray_carpet", - "minecraft:black_carpet", - "minecraft:brown_carpet", - "minecraft:red_carpet", - "minecraft:orange_carpet", - "minecraft:yellow_carpet", - "minecraft:lime_carpet", - "minecraft:green_carpet", - "minecraft:cyan_carpet", - "minecraft:light_blue_carpet", - "minecraft:blue_carpet", - "minecraft:purple_carpet", - "minecraft:magenta_carpet", - "minecraft:pink_carpet" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:white_concrete_powder", - "name" : "minecraft:itemGroup.name.concretePowder" - }, - "items" : [ - "minecraft:white_concrete_powder", - "minecraft:light_gray_concrete_powder", - "minecraft:gray_concrete_powder", - "minecraft:black_concrete_powder", - "minecraft:brown_concrete_powder", - "minecraft:red_concrete_powder", - "minecraft:orange_concrete_powder", - "minecraft:yellow_concrete_powder", - "minecraft:lime_concrete_powder", - "minecraft:green_concrete_powder", - "minecraft:cyan_concrete_powder", - "minecraft:light_blue_concrete_powder", - "minecraft:blue_concrete_powder", - "minecraft:purple_concrete_powder", - "minecraft:magenta_concrete_powder", - "minecraft:pink_concrete_powder" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:white_concrete", - "name" : "minecraft:itemGroup.name.concrete" - }, - "items" : [ - "minecraft:white_concrete", - "minecraft:light_gray_concrete", - "minecraft:gray_concrete", - "minecraft:black_concrete", - "minecraft:brown_concrete", - "minecraft:red_concrete", - "minecraft:orange_concrete", - "minecraft:yellow_concrete", - "minecraft:lime_concrete", - "minecraft:green_concrete", - "minecraft:cyan_concrete", - "minecraft:light_blue_concrete", - "minecraft:blue_concrete", - "minecraft:purple_concrete", - "minecraft:magenta_concrete", - "minecraft:pink_concrete" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:hardened_clay", - "name" : "minecraft:itemGroup.name.stainedClay" - }, - "items" : [ - "minecraft:hardened_clay", - "minecraft:white_terracotta", - "minecraft:light_gray_terracotta", - "minecraft:gray_terracotta", - "minecraft:black_terracotta", - "minecraft:brown_terracotta", - "minecraft:red_terracotta", - "minecraft:orange_terracotta", - "minecraft:yellow_terracotta", - "minecraft:lime_terracotta", - "minecraft:green_terracotta", - "minecraft:cyan_terracotta", - "minecraft:light_blue_terracotta", - "minecraft:blue_terracotta", - "minecraft:purple_terracotta", - "minecraft:magenta_terracotta", - "minecraft:pink_terracotta" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:white_glazed_terracotta", - "name" : "minecraft:itemGroup.name.glazedTerracotta" - }, - "items" : [ - "minecraft:white_glazed_terracotta", - "minecraft:silver_glazed_terracotta", - "minecraft:gray_glazed_terracotta", - "minecraft:black_glazed_terracotta", - "minecraft:brown_glazed_terracotta", - "minecraft:red_glazed_terracotta", - "minecraft:orange_glazed_terracotta", - "minecraft:yellow_glazed_terracotta", - "minecraft:lime_glazed_terracotta", - "minecraft:green_glazed_terracotta", - "minecraft:cyan_glazed_terracotta", - "minecraft:light_blue_glazed_terracotta", - "minecraft:blue_glazed_terracotta", - "minecraft:purple_glazed_terracotta", - "minecraft:magenta_glazed_terracotta", - "minecraft:pink_glazed_terracotta" - ] - }, - { - "items" : [ - "minecraft:purpur_block", - "minecraft:purpur_pillar", - "minecraft:packed_mud", - "minecraft:mud_bricks" - ] - } - ] - }, - { - "category_name" : "nature", - "groups" : [ - { - "items" : [ - "minecraft:nether_wart_block", - "minecraft:warped_wart_block", - "minecraft:shroomlight", - "minecraft:crimson_nylium", - "minecraft:warped_nylium", - "minecraft:netherrack", - "minecraft:soul_soil", - "minecraft:grass_block", - "minecraft:podzol", - "minecraft:mycelium", - "minecraft:grass_path", - "minecraft:dirt", - "minecraft:coarse_dirt", - "minecraft:dirt_with_roots", - "minecraft:farmland", - "minecraft:mud", - "minecraft:clay" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:iron_ore", - "name" : "minecraft:itemGroup.name.ore" - }, - "items" : [ - "minecraft:iron_ore", - "minecraft:gold_ore", - "minecraft:diamond_ore", - "minecraft:lapis_ore", - "minecraft:redstone_ore", - "minecraft:coal_ore", - "minecraft:copper_ore", - "minecraft:emerald_ore", - "minecraft:quartz_ore", - "minecraft:nether_gold_ore", - "minecraft:ancient_debris", - "minecraft:deepslate_iron_ore", - "minecraft:deepslate_gold_ore", - "minecraft:deepslate_diamond_ore", - "minecraft:deepslate_lapis_ore", - "minecraft:deepslate_redstone_ore", - "minecraft:deepslate_emerald_ore", - "minecraft:deepslate_coal_ore", - "minecraft:deepslate_copper_ore" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:stone", - "name" : "minecraft:itemGroup.name.stone" - }, - "items" : [ - "minecraft:stone", - "minecraft:granite", - "minecraft:diorite", - "minecraft:andesite", - "minecraft:blackstone", - "minecraft:deepslate", - "minecraft:tuff", - "minecraft:basalt", - "minecraft:polished_granite", - "minecraft:polished_diorite", - "minecraft:polished_andesite", - "minecraft:polished_blackstone", - "minecraft:polished_deepslate", - "minecraft:polished_tuff", - "minecraft:polished_basalt", - "minecraft:smooth_basalt" - ] - }, - { - "items" : [ - "minecraft:gravel", - "minecraft:sand", - "minecraft:red_sand", - "minecraft:cactus" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:oak_log", - "name" : "minecraft:itemGroup.name.log" - }, - "items" : [ - "minecraft:oak_log", - "minecraft:stripped_oak_log", - "minecraft:spruce_log", - "minecraft:stripped_spruce_log", - "minecraft:birch_log", - "minecraft:stripped_birch_log", - "minecraft:jungle_log", - "minecraft:stripped_jungle_log", - "minecraft:acacia_log", - "minecraft:stripped_acacia_log", - "minecraft:dark_oak_log", - "minecraft:stripped_dark_oak_log", - "minecraft:mangrove_log", - "minecraft:stripped_mangrove_log", - "minecraft:cherry_log", - "minecraft:stripped_cherry_log", - "minecraft:pale_oak_log", - "minecraft:stripped_pale_oak_log", - "minecraft:crimson_stem", - "minecraft:stripped_crimson_stem", - "minecraft:warped_stem", - "minecraft:stripped_warped_stem" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:oak_wood", - "name" : "minecraft:itemGroup.name.wood" - }, - "items" : [ - "minecraft:oak_wood", - "minecraft:stripped_oak_wood", - "minecraft:spruce_wood", - "minecraft:stripped_spruce_wood", - "minecraft:birch_wood", - "minecraft:stripped_birch_wood", - "minecraft:jungle_wood", - "minecraft:stripped_jungle_wood", - "minecraft:acacia_wood", - "minecraft:stripped_acacia_wood", - "minecraft:dark_oak_wood", - "minecraft:stripped_dark_oak_wood", - "minecraft:mangrove_wood", - "minecraft:stripped_mangrove_wood", - "minecraft:cherry_wood", - "minecraft:stripped_cherry_wood", - "minecraft:pale_oak_wood", - "minecraft:stripped_pale_oak_wood", - "minecraft:crimson_hyphae", - "minecraft:stripped_crimson_hyphae", - "minecraft:warped_hyphae", - "minecraft:stripped_warped_hyphae", - "minecraft:bamboo_block", - "minecraft:stripped_bamboo_block" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:oak_leaves", - "name" : "minecraft:itemGroup.name.leaves" - }, - "items" : [ - "minecraft:oak_leaves", - "minecraft:spruce_leaves", - "minecraft:birch_leaves", - "minecraft:jungle_leaves", - "minecraft:acacia_leaves", - "minecraft:dark_oak_leaves", - "minecraft:mangrove_leaves", - "minecraft:cherry_leaves", - "minecraft:pale_oak_leaves", - "minecraft:azalea_leaves", - "minecraft:azalea_leaves_flowered" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:oak_sapling", - "name" : "minecraft:itemGroup.name.sapling" - }, - "items" : [ - "minecraft:oak_sapling", - "minecraft:spruce_sapling", - "minecraft:birch_sapling", - "minecraft:jungle_sapling", - "minecraft:acacia_sapling", - "minecraft:dark_oak_sapling", - "minecraft:mangrove_propagule", - "minecraft:cherry_sapling", - "minecraft:pale_oak_sapling" - ] - }, - { - "items" : [ "minecraft:bee_nest" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:wheat_seeds", - "name" : "minecraft:itemGroup.name.seed" - }, - "items" : [ - "minecraft:wheat_seeds", - "minecraft:pumpkin_seeds", - "minecraft:melon_seeds", - "minecraft:beetroot_seeds", - "minecraft:torchflower_seeds", - "minecraft:pitcher_pod" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:wheat", - "name" : "minecraft:itemGroup.name.crop" - }, - "items" : [ - "minecraft:wheat", - "minecraft:beetroot", - "minecraft:potato", - "minecraft:poisonous_potato", - "minecraft:carrot", - "minecraft:golden_carrot", - "minecraft:apple", - "minecraft:golden_apple", - "minecraft:enchanted_golden_apple", - "minecraft:melon_block", - "minecraft:melon_slice", - "minecraft:glistering_melon_slice", - "minecraft:sweet_berries", - "minecraft:glow_berries", - "minecraft:pumpkin" - ] - }, - { - "items" : [ - "minecraft:carved_pumpkin", - "minecraft:lit_pumpkin", - "minecraft:honeycomb", - "minecraft:resin_clump" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:fern", - "name" : "minecraft:itemGroup.name.grass" - }, - "items" : [ - "minecraft:fern", - "minecraft:large_fern", - "minecraft:short_grass", - "minecraft:tall_grass", - "minecraft:nether_sprouts" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:fire_coral", - "name" : "minecraft:itemGroup.name.coral_decorations" - }, - "items" : [ - "minecraft:fire_coral", - "minecraft:brain_coral", - "minecraft:bubble_coral", - "minecraft:tube_coral", - "minecraft:horn_coral", - "minecraft:dead_fire_coral", - "minecraft:dead_brain_coral", - "minecraft:dead_bubble_coral", - "minecraft:dead_tube_coral", - "minecraft:dead_horn_coral", - "minecraft:fire_coral_fan", - "minecraft:brain_coral_fan", - "minecraft:bubble_coral_fan", - "minecraft:tube_coral_fan", - "minecraft:horn_coral_fan", - "minecraft:dead_fire_coral_fan", - "minecraft:dead_brain_coral_fan", - "minecraft:dead_bubble_coral_fan", - "minecraft:dead_tube_coral_fan", - "minecraft:dead_horn_coral_fan" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:dandelion", - "name" : "minecraft:itemGroup.name.flower" - }, - "items" : [ - "minecraft:crimson_roots", - "minecraft:warped_roots", - "minecraft:dandelion", - "minecraft:poppy", - "minecraft:blue_orchid", - "minecraft:allium", - "minecraft:azure_bluet", - "minecraft:red_tulip", - "minecraft:orange_tulip", - "minecraft:white_tulip", - "minecraft:pink_tulip", - "minecraft:oxeye_daisy", - "minecraft:cornflower", - "minecraft:lily_of_the_valley", - "minecraft:sunflower", - "minecraft:lilac", - "minecraft:rose_bush", - "minecraft:peony", - "minecraft:pitcher_plant", - "minecraft:pink_petals", - "minecraft:wither_rose", - "minecraft:torchflower", - "minecraft:closed_eyeblossom", - "minecraft:open_eyeblossom" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:yellow_dye", - "name" : "minecraft:itemGroup.name.dye" - }, - "items" : [ - "minecraft:white_dye", - "minecraft:light_gray_dye", - "minecraft:gray_dye", - "minecraft:black_dye", - "minecraft:brown_dye", - "minecraft:red_dye", - "minecraft:orange_dye", - "minecraft:yellow_dye", - "minecraft:lime_dye", - "minecraft:green_dye", - "minecraft:cyan_dye", - "minecraft:light_blue_dye", - "minecraft:blue_dye", - "minecraft:purple_dye", - "minecraft:magenta_dye", - "minecraft:pink_dye" - ] - }, - { - "items" : [ - "minecraft:ink_sac", - "minecraft:glow_ink_sac", - "minecraft:cocoa_beans", - "minecraft:lapis_lazuli", - "minecraft:bone_meal", - "minecraft:vine", - "minecraft:weeping_vines", - "minecraft:twisting_vines", - "minecraft:waterlily", - "minecraft:seagrass", - "minecraft:kelp", - "minecraft:deadbush", - "minecraft:bamboo", - "minecraft:snow", - "minecraft:ice", - "minecraft:packed_ice", - "minecraft:blue_ice", - "minecraft:snow_layer", - "minecraft:pointed_dripstone", - "minecraft:dripstone_block", - "minecraft:moss_carpet", - "minecraft:moss_block", - "minecraft:pale_moss_carpet", - "minecraft:pale_moss_block", - "minecraft:pale_hanging_moss", - "minecraft:hanging_roots", - "minecraft:mangrove_roots", - "minecraft:muddy_mangrove_roots", - "minecraft:big_dripleaf", - "minecraft:small_dripleaf_block", - "minecraft:spore_blossom", - "minecraft:azalea", - "minecraft:flowering_azalea", - "minecraft:glow_lichen", - "minecraft:amethyst_block", - "minecraft:budding_amethyst", - "minecraft:amethyst_cluster", - "minecraft:large_amethyst_bud", - "minecraft:medium_amethyst_bud", - "minecraft:small_amethyst_bud", - "minecraft:calcite" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:chicken", - "name" : "minecraft:itemGroup.name.rawFood" - }, - "items" : [ - "minecraft:chicken", - "minecraft:porkchop", - "minecraft:beef", - "minecraft:mutton", - "minecraft:rabbit", - "minecraft:cod", - "minecraft:salmon", - "minecraft:tropical_fish", - "minecraft:pufferfish" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:brown_mushroom", - "name" : "minecraft:itemGroup.name.mushroom" - }, - "items" : [ - "minecraft:brown_mushroom", - "minecraft:red_mushroom", - "minecraft:crimson_fungus", - "minecraft:warped_fungus", - "minecraft:brown_mushroom_block:14", - "minecraft:red_mushroom_block:14", - "minecraft:mushroom_stem" - ] - }, - { - "items" : [ - "minecraft:egg", - "minecraft:sugar_cane", - "minecraft:sugar", - "minecraft:rotten_flesh", - "minecraft:bone", - "minecraft:web", - "minecraft:spider_eye", - "minecraft:mob_spawner", - "minecraft:trial_spawner", - "minecraft:vault", - "minecraft:creaking_heart", - "minecraft:end_portal_frame" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:infested_stone", - "name" : "minecraft:itemGroup.name.monsterStoneEgg" - }, - "items" : [ - "minecraft:infested_stone", - "minecraft:infested_cobblestone", - "minecraft:infested_stone_bricks", - "minecraft:infested_mossy_stone_bricks", - "minecraft:infested_cracked_stone_bricks", - "minecraft:infested_chiseled_stone_bricks", - "minecraft:infested_deepslate" - ] - }, - { - "items" : [ - "minecraft:dragon_egg", - "minecraft:turtle_egg", - "minecraft:sniffer_egg", - "minecraft:frog_spawn", - "minecraft:pearlescent_froglight", - "minecraft:verdant_froglight", - "minecraft:ochre_froglight" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:chicken_spawn_egg", - "name" : "minecraft:itemGroup.name.mobEgg" - }, - "items" : [ - "minecraft:chicken_spawn_egg", - "minecraft:bee_spawn_egg", - "minecraft:cow_spawn_egg", - "minecraft:pig_spawn_egg", - "minecraft:sheep_spawn_egg", - "minecraft:wolf_spawn_egg", - "minecraft:polar_bear_spawn_egg", - "minecraft:ocelot_spawn_egg", - "minecraft:cat_spawn_egg", - "minecraft:mooshroom_spawn_egg", - "minecraft:bat_spawn_egg", - "minecraft:parrot_spawn_egg", - "minecraft:rabbit_spawn_egg", - "minecraft:llama_spawn_egg", - "minecraft:horse_spawn_egg", - "minecraft:donkey_spawn_egg", - "minecraft:mule_spawn_egg", - "minecraft:skeleton_horse_spawn_egg", - "minecraft:zombie_horse_spawn_egg", - "minecraft:tropical_fish_spawn_egg", - "minecraft:cod_spawn_egg", - "minecraft:pufferfish_spawn_egg", - "minecraft:salmon_spawn_egg", - "minecraft:dolphin_spawn_egg", - "minecraft:turtle_spawn_egg", - "minecraft:panda_spawn_egg", - "minecraft:fox_spawn_egg", - "minecraft:creeper_spawn_egg", - "minecraft:enderman_spawn_egg", - "minecraft:silverfish_spawn_egg", - "minecraft:skeleton_spawn_egg", - "minecraft:wither_skeleton_spawn_egg", - "minecraft:stray_spawn_egg", - "minecraft:slime_spawn_egg", - "minecraft:spider_spawn_egg", - "minecraft:zombie_spawn_egg", - "minecraft:zombie_pigman_spawn_egg", - "minecraft:husk_spawn_egg", - "minecraft:drowned_spawn_egg", - "minecraft:squid_spawn_egg", - "minecraft:glow_squid_spawn_egg", - "minecraft:cave_spider_spawn_egg", - "minecraft:witch_spawn_egg", - "minecraft:guardian_spawn_egg", - "minecraft:elder_guardian_spawn_egg", - "minecraft:endermite_spawn_egg", - "minecraft:magma_cube_spawn_egg", - "minecraft:strider_spawn_egg", - "minecraft:hoglin_spawn_egg", - "minecraft:piglin_spawn_egg", - "minecraft:zoglin_spawn_egg", - "minecraft:piglin_brute_spawn_egg", - "minecraft:goat_spawn_egg", - "minecraft:axolotl_spawn_egg", - "minecraft:warden_spawn_egg", - "minecraft:allay_spawn_egg", - "minecraft:frog_spawn_egg", - "minecraft:tadpole_spawn_egg", - "minecraft:trader_llama_spawn_egg", - "minecraft:camel_spawn_egg", - "minecraft:ghast_spawn_egg", - "minecraft:blaze_spawn_egg", - "minecraft:shulker_spawn_egg", - "minecraft:vindicator_spawn_egg", - "minecraft:evoker_spawn_egg", - "minecraft:vex_spawn_egg", - "minecraft:villager_spawn_egg", - "minecraft:wandering_trader_spawn_egg", - "minecraft:zombie_villager_spawn_egg", - "minecraft:phantom_spawn_egg", - "minecraft:pillager_spawn_egg", - "minecraft:ravager_spawn_egg", - "minecraft:iron_golem_spawn_egg", - "minecraft:snow_golem_spawn_egg", - "minecraft:sniffer_spawn_egg", - "minecraft:breeze_spawn_egg", - "minecraft:armadillo_spawn_egg", - "minecraft:bogged_spawn_egg", - "minecraft:creaking_spawn_egg" - ] - }, - { - "items" : [ - "minecraft:obsidian", - "minecraft:crying_obsidian", - "minecraft:bedrock", - "minecraft:soul_sand", - "minecraft:magma", - "minecraft:nether_wart", - "minecraft:end_stone", - "minecraft:chorus_flower", - "minecraft:chorus_plant", - "minecraft:chorus_fruit", - "minecraft:popped_chorus_fruit", - "minecraft:sponge", - "minecraft:wet_sponge" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:tube_coral_block", - "name" : "minecraft:itemGroup.name.coral" - }, - "items" : [ - "minecraft:tube_coral_block", - "minecraft:brain_coral_block", - "minecraft:bubble_coral_block", - "minecraft:fire_coral_block", - "minecraft:horn_coral_block", - "minecraft:dead_tube_coral_block", - "minecraft:dead_brain_coral_block", - "minecraft:dead_bubble_coral_block", - "minecraft:dead_fire_coral_block", - "minecraft:dead_horn_coral_block" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:sculk", - "name" : "minecraft:itemGroup.name.sculk" - }, - "items" : [ - "minecraft:sculk", - "minecraft:sculk_vein", - "minecraft:sculk_catalyst", - "minecraft:sculk_shrieker", - "minecraft:sculk_sensor", - "minecraft:calibrated_sculk_sensor" - ] - }, - { - "items" : [ "minecraft:reinforced_deepslate" ] - } - ] - }, - { - "category_name" : "equipment", - "groups" : [ - { - "group_identifier" : { - "icon" : "minecraft:leather_helmet", - "name" : "minecraft:itemGroup.name.helmet" - }, - "items" : [ - "minecraft:leather_helmet", - "minecraft:chainmail_helmet", - "minecraft:iron_helmet", - "minecraft:golden_helmet", - "minecraft:diamond_helmet", - "minecraft:netherite_helmet" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:leather_chestplate", - "name" : "minecraft:itemGroup.name.chestplate" - }, - "items" : [ - "minecraft:leather_chestplate", - "minecraft:chainmail_chestplate", - "minecraft:iron_chestplate", - "minecraft:golden_chestplate", - "minecraft:diamond_chestplate", - "minecraft:netherite_chestplate" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:leather_leggings", - "name" : "minecraft:itemGroup.name.leggings" - }, - "items" : [ - "minecraft:leather_leggings", - "minecraft:chainmail_leggings", - "minecraft:iron_leggings", - "minecraft:golden_leggings", - "minecraft:diamond_leggings", - "minecraft:netherite_leggings" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:leather_boots", - "name" : "minecraft:itemGroup.name.boots" - }, - "items" : [ - "minecraft:leather_boots", - "minecraft:chainmail_boots", - "minecraft:iron_boots", - "minecraft:golden_boots", - "minecraft:diamond_boots", - "minecraft:netherite_boots" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:wooden_sword", - "name" : "minecraft:itemGroup.name.sword" - }, - "items" : [ - "minecraft:wooden_sword", - "minecraft:stone_sword", - "minecraft:iron_sword", - "minecraft:golden_sword", - "minecraft:diamond_sword", - "minecraft:netherite_sword" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:wooden_axe", - "name" : "minecraft:itemGroup.name.axe" - }, - "items" : [ - "minecraft:wooden_axe", - "minecraft:stone_axe", - "minecraft:iron_axe", - "minecraft:golden_axe", - "minecraft:diamond_axe", - "minecraft:netherite_axe" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:wooden_pickaxe", - "name" : "minecraft:itemGroup.name.pickaxe" - }, - "items" : [ - "minecraft:wooden_pickaxe", - "minecraft:stone_pickaxe", - "minecraft:iron_pickaxe", - "minecraft:golden_pickaxe", - "minecraft:diamond_pickaxe", - "minecraft:netherite_pickaxe" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:wooden_shovel", - "name" : "minecraft:itemGroup.name.shovel" - }, - "items" : [ - "minecraft:wooden_shovel", - "minecraft:stone_shovel", - "minecraft:iron_shovel", - "minecraft:golden_shovel", - "minecraft:diamond_shovel", - "minecraft:netherite_shovel" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:wooden_hoe", - "name" : "minecraft:itemGroup.name.hoe" - }, - "items" : [ - "minecraft:wooden_hoe", - "minecraft:stone_hoe", - "minecraft:iron_hoe", - "minecraft:golden_hoe", - "minecraft:diamond_hoe", - "minecraft:netherite_hoe" - ] - }, - { - "items" : [ "minecraft:bow", "minecraft:crossbow", "minecraft:mace" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:arrow", - "name" : "minecraft:itemGroup.name.arrow" - }, - "items" : [ - "minecraft:arrow", - "minecraft:arrow:6", - "minecraft:arrow:7", - "minecraft:arrow:8", - "minecraft:arrow:9", - "minecraft:arrow:10", - "minecraft:arrow:11", - "minecraft:arrow:12", - "minecraft:arrow:13", - "minecraft:arrow:14", - "minecraft:arrow:15", - "minecraft:arrow:16", - "minecraft:arrow:17", - "minecraft:arrow:18", - "minecraft:arrow:19", - "minecraft:arrow:20", - "minecraft:arrow:21", - "minecraft:arrow:22", - "minecraft:arrow:23", - "minecraft:arrow:24", - "minecraft:arrow:25", - "minecraft:arrow:26", - "minecraft:arrow:27", - "minecraft:arrow:28", - "minecraft:arrow:29", - "minecraft:arrow:30", - "minecraft:arrow:31", - "minecraft:arrow:32", - "minecraft:arrow:33", - "minecraft:arrow:34", - "minecraft:arrow:35", - "minecraft:arrow:36", - "minecraft:arrow:37", - "minecraft:arrow:38", - "minecraft:arrow:39", - "minecraft:arrow:40", - "minecraft:arrow:41", - "minecraft:arrow:42", - "minecraft:arrow:43", - "minecraft:arrow:44", - "minecraft:arrow:45", - "minecraft:arrow:46", - "minecraft:arrow:47" - ] - }, - { - "items" : [ "minecraft:shield" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:cooked_chicken", - "name" : "minecraft:itemGroup.name.cookedFood" - }, - "items" : [ - "minecraft:cooked_chicken", - "minecraft:cooked_porkchop", - "minecraft:cooked_beef", - "minecraft:cooked_mutton", - "minecraft:cooked_rabbit", - "minecraft:cooked_cod", - "minecraft:cooked_salmon" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:bread", - "name" : "minecraft:itemGroup.name.miscFood" - }, - "items" : [ - "minecraft:bread", - "minecraft:mushroom_stew", - "minecraft:beetroot_soup", - "minecraft:rabbit_stew", - "minecraft:baked_potato", - "minecraft:cookie", - "minecraft:pumpkin_pie", - "minecraft:cake", - "minecraft:dried_kelp" - ] - }, - { - "items" : [ - "minecraft:fishing_rod", - "minecraft:carrot_on_a_stick", - "minecraft:warped_fungus_on_a_stick", - "minecraft:snowball", - "minecraft:wind_charge", - "minecraft:shears", - "minecraft:flint_and_steel", - "minecraft:lead", - "minecraft:clock", - "minecraft:compass", - "minecraft:recovery_compass" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:goat_horn", - "name" : "minecraft:itemGroup.name.goatHorn" - }, - "items" : [ - "minecraft:goat_horn", - "minecraft:goat_horn:1", - "minecraft:goat_horn:2", - "minecraft:goat_horn:3", - "minecraft:goat_horn:4", - "minecraft:goat_horn:5", - "minecraft:goat_horn:6", - "minecraft:goat_horn:7" - ] - }, - { - "items" : [ "minecraft:empty_map", "minecraft:empty_map:2", "minecraft:saddle" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:bundle", - "name" : "minecraft:itemGroup.name.bundles" - }, - "items" : [ - "minecraft:bundle", - "minecraft:white_bundle", - "minecraft:light_gray_bundle", - "minecraft:gray_bundle", - "minecraft:black_bundle", - "minecraft:brown_bundle", - "minecraft:red_bundle", - "minecraft:orange_bundle", - "minecraft:yellow_bundle", - "minecraft:lime_bundle", - "minecraft:green_bundle", - "minecraft:cyan_bundle", - "minecraft:light_blue_bundle", - "minecraft:blue_bundle", - "minecraft:purple_bundle", - "minecraft:magenta_bundle", - "minecraft:pink_bundle" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:leather_horse_armor", - "name" : "minecraft:itemGroup.name.horseArmor" - }, - "items" : [ - "minecraft:leather_horse_armor", - "minecraft:iron_horse_armor", - "minecraft:golden_horse_armor", - "minecraft:diamond_horse_armor" - ] - }, - { - "items" : [ - "minecraft:wolf_armor", - "minecraft:trident", - "minecraft:turtle_helmet", - "minecraft:elytra", - "minecraft:totem_of_undying", - "minecraft:glass_bottle", - "minecraft:experience_bottle" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:potion", - "name" : "minecraft:itemGroup.name.potion" - }, - "items" : [ - "minecraft:potion", - "minecraft:potion:1", - "minecraft:potion:2", - "minecraft:potion:3", - "minecraft:potion:4", - "minecraft:potion:5", - "minecraft:potion:6", - "minecraft:potion:7", - "minecraft:potion:8", - "minecraft:potion:9", - "minecraft:potion:10", - "minecraft:potion:11", - "minecraft:potion:12", - "minecraft:potion:13", - "minecraft:potion:14", - "minecraft:potion:15", - "minecraft:potion:16", - "minecraft:potion:17", - "minecraft:potion:18", - "minecraft:potion:19", - "minecraft:potion:20", - "minecraft:potion:21", - "minecraft:potion:22", - "minecraft:potion:23", - "minecraft:potion:24", - "minecraft:potion:25", - "minecraft:potion:26", - "minecraft:potion:27", - "minecraft:potion:28", - "minecraft:potion:29", - "minecraft:potion:30", - "minecraft:potion:31", - "minecraft:potion:32", - "minecraft:potion:33", - "minecraft:potion:34", - "minecraft:potion:35", - "minecraft:potion:36", - "minecraft:potion:37", - "minecraft:potion:38", - "minecraft:potion:39", - "minecraft:potion:40", - "minecraft:potion:41", - "minecraft:potion:42", - "minecraft:potion:43", - "minecraft:potion:44", - "minecraft:potion:45", - "minecraft:potion:46" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:splash_potion", - "name" : "minecraft:itemGroup.name.splashPotion" - }, - "items" : [ - "minecraft:splash_potion", - "minecraft:splash_potion:1", - "minecraft:splash_potion:2", - "minecraft:splash_potion:3", - "minecraft:splash_potion:4", - "minecraft:splash_potion:5", - "minecraft:splash_potion:6", - "minecraft:splash_potion:7", - "minecraft:splash_potion:8", - "minecraft:splash_potion:9", - "minecraft:splash_potion:10", - "minecraft:splash_potion:11", - "minecraft:splash_potion:12", - "minecraft:splash_potion:13", - "minecraft:splash_potion:14", - "minecraft:splash_potion:15", - "minecraft:splash_potion:16", - "minecraft:splash_potion:17", - "minecraft:splash_potion:18", - "minecraft:splash_potion:19", - "minecraft:splash_potion:20", - "minecraft:splash_potion:21", - "minecraft:splash_potion:22", - "minecraft:splash_potion:23", - "minecraft:splash_potion:24", - "minecraft:splash_potion:25", - "minecraft:splash_potion:26", - "minecraft:splash_potion:27", - "minecraft:splash_potion:28", - "minecraft:splash_potion:29", - "minecraft:splash_potion:30", - "minecraft:splash_potion:31", - "minecraft:splash_potion:32", - "minecraft:splash_potion:33", - "minecraft:splash_potion:34", - "minecraft:splash_potion:35", - "minecraft:splash_potion:36", - "minecraft:splash_potion:37", - "minecraft:splash_potion:38", - "minecraft:splash_potion:39", - "minecraft:splash_potion:40", - "minecraft:splash_potion:41", - "minecraft:splash_potion:42", - "minecraft:splash_potion:43", - "minecraft:splash_potion:44", - "minecraft:splash_potion:45", - "minecraft:splash_potion:46" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:lingering_potion", - "name" : "minecraft:itemGroup.name.lingeringPotion" - }, - "items" : [ - "minecraft:lingering_potion", - "minecraft:lingering_potion:1", - "minecraft:lingering_potion:2", - "minecraft:lingering_potion:3", - "minecraft:lingering_potion:4", - "minecraft:lingering_potion:5", - "minecraft:lingering_potion:6", - "minecraft:lingering_potion:7", - "minecraft:lingering_potion:8", - "minecraft:lingering_potion:9", - "minecraft:lingering_potion:10", - "minecraft:lingering_potion:11", - "minecraft:lingering_potion:12", - "minecraft:lingering_potion:13", - "minecraft:lingering_potion:14", - "minecraft:lingering_potion:15", - "minecraft:lingering_potion:16", - "minecraft:lingering_potion:17", - "minecraft:lingering_potion:18", - "minecraft:lingering_potion:19", - "minecraft:lingering_potion:20", - "minecraft:lingering_potion:21", - "minecraft:lingering_potion:22", - "minecraft:lingering_potion:23", - "minecraft:lingering_potion:24", - "minecraft:lingering_potion:25", - "minecraft:lingering_potion:26", - "minecraft:lingering_potion:27", - "minecraft:lingering_potion:28", - "minecraft:lingering_potion:29", - "minecraft:lingering_potion:30", - "minecraft:lingering_potion:31", - "minecraft:lingering_potion:32", - "minecraft:lingering_potion:33", - "minecraft:lingering_potion:34", - "minecraft:lingering_potion:35", - "minecraft:lingering_potion:36", - "minecraft:lingering_potion:37", - "minecraft:lingering_potion:38", - "minecraft:lingering_potion:39", - "minecraft:lingering_potion:40", - "minecraft:lingering_potion:41", - "minecraft:lingering_potion:42", - "minecraft:lingering_potion:43", - "minecraft:lingering_potion:44", - "minecraft:lingering_potion:45", - "minecraft:lingering_potion:46" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:ominous_bottle", - "name" : "minecraft:itemGroup.name.ominousBottle" - }, - "items" : [ - "minecraft:ominous_bottle", - "minecraft:ominous_bottle:1", - "minecraft:ominous_bottle:2", - "minecraft:ominous_bottle:3", - "minecraft:ominous_bottle:4" - ] - }, - { - "items" : [ "minecraft:spyglass", "minecraft:brush" ] - } - ] - }, - { - "category_name" : "items", - "groups" : [ - { - "items" : [ "minecraft:stick" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:bed", - "name" : "minecraft:itemGroup.name.bed" - }, - "items" : [ - "minecraft:bed", - "minecraft:bed:8", - "minecraft:bed:7", - "minecraft:bed:15", - "minecraft:bed:12", - "minecraft:bed:14", - "minecraft:bed:1", - "minecraft:bed:4", - "minecraft:bed:5", - "minecraft:bed:13", - "minecraft:bed:9", - "minecraft:bed:3", - "minecraft:bed:11", - "minecraft:bed:10", - "minecraft:bed:2", - "minecraft:bed:6" - ] - }, - { - "items" : [ - "minecraft:torch", - "minecraft:soul_torch", - "minecraft:sea_pickle", - "minecraft:lantern", - "minecraft:soul_lantern" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:candle", - "name" : "minecraft:itemGroup.name.candles" - }, - "items" : [ - "minecraft:candle", - "minecraft:white_candle", - "minecraft:orange_candle", - "minecraft:magenta_candle", - "minecraft:light_blue_candle", - "minecraft:yellow_candle", - "minecraft:lime_candle", - "minecraft:pink_candle", - "minecraft:gray_candle", - "minecraft:light_gray_candle", - "minecraft:cyan_candle", - "minecraft:purple_candle", - "minecraft:blue_candle", - "minecraft:brown_candle", - "minecraft:green_candle", - "minecraft:red_candle", - "minecraft:black_candle" - ] - }, - { - "items" : [ - "minecraft:crafting_table", - "minecraft:cartography_table", - "minecraft:fletching_table", - "minecraft:smithing_table", - "minecraft:beehive", - "minecraft:suspicious_sand", - "minecraft:suspicious_gravel", - "minecraft:campfire", - "minecraft:soul_campfire", - "minecraft:furnace", - "minecraft:blast_furnace", - "minecraft:smoker", - "minecraft:respawn_anchor", - "minecraft:brewing_stand" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:anvil", - "name" : "minecraft:itemGroup.name.anvil" - }, - "items" : [ - "minecraft:anvil", - "minecraft:chipped_anvil", - "minecraft:damaged_anvil" - ] - }, - { - "items" : [ - "minecraft:grindstone", - "minecraft:enchanting_table", - "minecraft:bookshelf", - "minecraft:chiseled_bookshelf", - "minecraft:lectern", - "minecraft:cauldron", - "minecraft:composter" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:chest", - "name" : "minecraft:itemGroup.name.chest" - }, - "items" : [ "minecraft:chest", "minecraft:trapped_chest", "minecraft:ender_chest" ] - }, - { - "items" : [ "minecraft:barrel" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:undyed_shulker_box", - "name" : "minecraft:itemGroup.name.shulkerBox" - }, - "items" : [ - "minecraft:undyed_shulker_box", - "minecraft:white_shulker_box", - "minecraft:light_gray_shulker_box", - "minecraft:gray_shulker_box", - "minecraft:black_shulker_box", - "minecraft:brown_shulker_box", - "minecraft:red_shulker_box", - "minecraft:orange_shulker_box", - "minecraft:yellow_shulker_box", - "minecraft:lime_shulker_box", - "minecraft:green_shulker_box", - "minecraft:cyan_shulker_box", - "minecraft:light_blue_shulker_box", - "minecraft:blue_shulker_box", - "minecraft:purple_shulker_box", - "minecraft:magenta_shulker_box", - "minecraft:pink_shulker_box" - ] - }, - { - "items" : [ "minecraft:armor_stand", "minecraft:noteblock", "minecraft:jukebox" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:music_disc_13", - "name" : "minecraft:itemGroup.name.record" - }, - "items" : [ - "minecraft:music_disc_13", - "minecraft:music_disc_cat", - "minecraft:music_disc_blocks", - "minecraft:music_disc_chirp", - "minecraft:music_disc_far", - "minecraft:music_disc_mall", - "minecraft:music_disc_mellohi", - "minecraft:music_disc_stal", - "minecraft:music_disc_strad", - "minecraft:music_disc_ward", - "minecraft:music_disc_11", - "minecraft:music_disc_wait", - "minecraft:music_disc_otherside", - "minecraft:music_disc_5", - "minecraft:music_disc_pigstep", - "minecraft:music_disc_relic", - "minecraft:music_disc_creator", - "minecraft:music_disc_creator_music_box", - "minecraft:music_disc_precipice" - ] - }, - { - "items" : [ - "minecraft:disc_fragment_5", - "minecraft:glowstone_dust", - "minecraft:glowstone", - "minecraft:redstone_lamp", - "minecraft:sea_lantern" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:oak_sign", - "name" : "minecraft:itemGroup.name.sign" - }, - "items" : [ - "minecraft:oak_sign", - "minecraft:spruce_sign", - "minecraft:birch_sign", - "minecraft:jungle_sign", - "minecraft:acacia_sign", - "minecraft:dark_oak_sign", - "minecraft:mangrove_sign", - "minecraft:cherry_sign", - "minecraft:pale_oak_sign", - "minecraft:bamboo_sign", - "minecraft:crimson_sign", - "minecraft:warped_sign" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:oak_hanging_sign", - "name" : "minecraft:itemGroup.name.hanging_sign" - }, - "items" : [ - "minecraft:oak_hanging_sign", - "minecraft:spruce_hanging_sign", - "minecraft:birch_hanging_sign", - "minecraft:jungle_hanging_sign", - "minecraft:acacia_hanging_sign", - "minecraft:dark_oak_hanging_sign", - "minecraft:mangrove_hanging_sign", - "minecraft:cherry_hanging_sign", - "minecraft:pale_oak_hanging_sign", - "minecraft:bamboo_hanging_sign", - "minecraft:crimson_hanging_sign", - "minecraft:warped_hanging_sign" - ] - }, - { - "items" : [ - "minecraft:painting", - "minecraft:frame", - "minecraft:glow_frame", - "minecraft:honey_bottle", - "minecraft:flower_pot", - "minecraft:bowl", - "minecraft:bucket", - "minecraft:milk_bucket", - "minecraft:water_bucket", - "minecraft:lava_bucket", - "minecraft:cod_bucket", - "minecraft:salmon_bucket", - "minecraft:tropical_fish_bucket", - "minecraft:pufferfish_bucket", - "minecraft:powder_snow_bucket", - "minecraft:axolotl_bucket", - "minecraft:tadpole_bucket" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:creeper_head", - "name" : "minecraft:itemGroup.name.skull" - }, - "items" : [ - "minecraft:player_head", - "minecraft:zombie_head", - "minecraft:creeper_head", - "minecraft:dragon_head", - "minecraft:skeleton_skull", - "minecraft:wither_skeleton_skull", - "minecraft:piglin_head" - ] - }, - { - "items" : [ - "minecraft:beacon", - "minecraft:bell", - "minecraft:conduit", - "minecraft:stonecutter_block", - "minecraft:coal", - "minecraft:charcoal", - "minecraft:diamond", - "minecraft:iron_nugget", - "minecraft:raw_iron", - "minecraft:raw_gold", - "minecraft:raw_copper", - "minecraft:copper_ingot", - "minecraft:iron_ingot", - "minecraft:netherite_scrap", - "minecraft:netherite_ingot", - "minecraft:gold_nugget", - "minecraft:gold_ingot", - "minecraft:emerald", - "minecraft:quartz", - "minecraft:clay_ball", - "minecraft:brick", - "minecraft:netherbrick", - "minecraft:resin_brick", - "minecraft:prismarine_shard", - "minecraft:amethyst_shard", - "minecraft:prismarine_crystals", - "minecraft:nautilus_shell", - "minecraft:heart_of_the_sea", - "minecraft:turtle_scute", - "minecraft:armadillo_scute", - "minecraft:phantom_membrane", - "minecraft:string", - "minecraft:feather", - "minecraft:flint", - "minecraft:gunpowder", - "minecraft:leather", - "minecraft:rabbit_hide", - "minecraft:rabbit_foot", - "minecraft:fire_charge", - "minecraft:blaze_rod", - "minecraft:breeze_rod", - "minecraft:heavy_core", - "minecraft:blaze_powder", - "minecraft:magma_cream", - "minecraft:fermented_spider_eye", - "minecraft:echo_shard", - "minecraft:dragon_breath", - "minecraft:shulker_shell", - "minecraft:ghast_tear", - "minecraft:slime_ball", - "minecraft:ender_pearl", - "minecraft:ender_eye", - "minecraft:nether_star", - "minecraft:end_rod", - "minecraft:lightning_rod", - "minecraft:end_crystal", - "minecraft:paper", - "minecraft:book", - "minecraft:writable_book" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:oak_boat", - "name" : "minecraft:itemGroup.name.boat" - }, - "items" : [ - "minecraft:oak_boat", - "minecraft:spruce_boat", - "minecraft:birch_boat", - "minecraft:jungle_boat", - "minecraft:acacia_boat", - "minecraft:dark_oak_boat", - "minecraft:mangrove_boat", - "minecraft:cherry_boat", - "minecraft:pale_oak_boat", - "minecraft:bamboo_raft" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:oak_chest_boat", - "name" : "minecraft:itemGroup.name.chestboat" - }, - "items" : [ - "minecraft:oak_chest_boat", - "minecraft:spruce_chest_boat", - "minecraft:birch_chest_boat", - "minecraft:jungle_chest_boat", - "minecraft:acacia_chest_boat", - "minecraft:dark_oak_chest_boat", - "minecraft:mangrove_chest_boat", - "minecraft:cherry_chest_boat", - "minecraft:pale_oak_chest_boat", - "minecraft:bamboo_chest_raft" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:rail", - "name" : "minecraft:itemGroup.name.rail" - }, - "items" : [ - "minecraft:rail", - "minecraft:golden_rail", - "minecraft:detector_rail", - "minecraft:activator_rail" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:minecart", - "name" : "minecraft:itemGroup.name.minecart" - }, - "items" : [ - "minecraft:minecart", - "minecraft:chest_minecart", - "minecraft:hopper_minecart", - "minecraft:tnt_minecart" - ] - }, - { - "items" : [ - "minecraft:redstone", - "minecraft:redstone_block", - "minecraft:redstone_torch", - "minecraft:lever" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:wooden_button", - "name" : "minecraft:itemGroup.name.buttons" - }, - "items" : [ - "minecraft:wooden_button", - "minecraft:spruce_button", - "minecraft:birch_button", - "minecraft:jungle_button", - "minecraft:acacia_button", - "minecraft:dark_oak_button", - "minecraft:mangrove_button", - "minecraft:cherry_button", - "minecraft:pale_oak_button", - "minecraft:bamboo_button", - "minecraft:stone_button", - "minecraft:crimson_button", - "minecraft:warped_button", - "minecraft:polished_blackstone_button" - ] - }, - { - "items" : [ "minecraft:tripwire_hook" ] - }, - { - "group_identifier" : { - "icon" : "minecraft:wooden_pressure_plate", - "name" : "minecraft:itemGroup.name.pressurePlate" - }, - "items" : [ - "minecraft:wooden_pressure_plate", - "minecraft:spruce_pressure_plate", - "minecraft:birch_pressure_plate", - "minecraft:jungle_pressure_plate", - "minecraft:acacia_pressure_plate", - "minecraft:dark_oak_pressure_plate", - "minecraft:mangrove_pressure_plate", - "minecraft:cherry_pressure_plate", - "minecraft:pale_oak_pressure_plate", - "minecraft:bamboo_pressure_plate", - "minecraft:crimson_pressure_plate", - "minecraft:warped_pressure_plate", - "minecraft:stone_pressure_plate", - "minecraft:light_weighted_pressure_plate", - "minecraft:heavy_weighted_pressure_plate", - "minecraft:polished_blackstone_pressure_plate" - ] - }, - { - "items" : [ - "minecraft:observer", - "minecraft:daylight_detector", - "minecraft:repeater", - "minecraft:comparator", - "minecraft:hopper", - "minecraft:dropper:3", - "minecraft:dispenser:3", - "minecraft:crafter", - "minecraft:piston:1", - "minecraft:sticky_piston:1", - "minecraft:tnt", - "minecraft:name_tag", - "minecraft:loom" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:creeper_banner_pattern", - "name" : "minecraft:itemGroup.name.banner_pattern" - }, - "items" : [ - "minecraft:creeper_banner_pattern", - "minecraft:skull_banner_pattern", - "minecraft:flower_banner_pattern", - "minecraft:mojang_banner_pattern", - "minecraft:field_masoned_banner_pattern", - "minecraft:bordure_indented_banner_pattern", - "minecraft:piglin_banner_pattern", - "minecraft:globe_banner_pattern", - "minecraft:flow_banner_pattern", - "minecraft:guster_banner_pattern" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:archer_pottery_sherd", - "name" : "minecraft:itemGroup.name.potterySherds" - }, - "items" : [ - "minecraft:angler_pottery_sherd", - "minecraft:archer_pottery_sherd", - "minecraft:arms_up_pottery_sherd", - "minecraft:blade_pottery_sherd", - "minecraft:brewer_pottery_sherd", - "minecraft:burn_pottery_sherd", - "minecraft:danger_pottery_sherd", - "minecraft:explorer_pottery_sherd", - "minecraft:flow_pottery_sherd", - "minecraft:friend_pottery_sherd", - "minecraft:guster_pottery_sherd", - "minecraft:heart_pottery_sherd", - "minecraft:heartbreak_pottery_sherd", - "minecraft:howl_pottery_sherd", - "minecraft:miner_pottery_sherd", - "minecraft:mourner_pottery_sherd", - "minecraft:plenty_pottery_sherd", - "minecraft:prize_pottery_sherd", - "minecraft:scrape_pottery_sherd", - "minecraft:sheaf_pottery_sherd", - "minecraft:shelter_pottery_sherd", - "minecraft:skull_pottery_sherd", - "minecraft:snort_pottery_sherd" - ] - }, - { - "group_identifier" : { - "icon" : "minecraft:netherite_upgrade_smithing_template", - "name" : "minecraft:itemGroup.name.smithing_templates" - }, - "items" : [ - "minecraft:netherite_upgrade_smithing_template", - "minecraft:sentry_armor_trim_smithing_template", - "minecraft:vex_armor_trim_smithing_template", - "minecraft:wild_armor_trim_smithing_template", - "minecraft:coast_armor_trim_smithing_template", - "minecraft:dune_armor_trim_smithing_template", - "minecraft:wayfinder_armor_trim_smithing_template", - "minecraft:shaper_armor_trim_smithing_template", - "minecraft:raiser_armor_trim_smithing_template", - "minecraft:host_armor_trim_smithing_template", - "minecraft:ward_armor_trim_smithing_template", - "minecraft:silence_armor_trim_smithing_template", - "minecraft:tide_armor_trim_smithing_template", - "minecraft:snout_armor_trim_smithing_template", - "minecraft:rib_armor_trim_smithing_template", - "minecraft:eye_armor_trim_smithing_template", - "minecraft:spire_armor_trim_smithing_template", - "minecraft:flow_armor_trim_smithing_template", - "minecraft:bolt_armor_trim_smithing_template" - ] - }, - { - "items" : [ - "minecraft:chain", - "minecraft:target", - "minecraft:decorated_pot", - "minecraft:trial_key", - "minecraft:ominous_trial_key" - ] - } - ] - } - ] - } + "format_version" : "1.21.70", + "minecraft:crafting_items_catalog" : { + "categories" : [ + { + "category_name" : "construction", + "groups" : [ + { + "group_identifier" : { + "icon" : "minecraft:oak_planks", + "name" : "minecraft:itemGroup.name.planks" + }, + "items" : [ + "minecraft:oak_planks", + "minecraft:spruce_planks", + "minecraft:birch_planks", + "minecraft:jungle_planks", + "minecraft:acacia_planks", + "minecraft:dark_oak_planks", + "minecraft:mangrove_planks", + "minecraft:cherry_planks", + "minecraft:pale_oak_planks", + "minecraft:bamboo_planks", + "minecraft:bamboo_mosaic", + "minecraft:crimson_planks", + "minecraft:warped_planks" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:cobblestone_wall", + "name" : "minecraft:itemGroup.name.walls" + }, + "items" : [ + "minecraft:cobblestone_wall", + "minecraft:mossy_cobblestone_wall", + "minecraft:granite_wall", + "minecraft:diorite_wall", + "minecraft:andesite_wall", + "minecraft:sandstone_wall", + "minecraft:red_sandstone_wall", + "minecraft:stone_brick_wall", + "minecraft:mossy_stone_brick_wall", + "minecraft:brick_wall", + "minecraft:nether_brick_wall", + "minecraft:red_nether_brick_wall", + "minecraft:end_stone_brick_wall", + "minecraft:prismarine_wall", + "minecraft:blackstone_wall", + "minecraft:polished_blackstone_wall", + "minecraft:polished_blackstone_brick_wall", + "minecraft:cobbled_deepslate_wall", + "minecraft:deepslate_tile_wall", + "minecraft:polished_deepslate_wall", + "minecraft:deepslate_brick_wall", + "minecraft:tuff_wall", + "minecraft:tuff_brick_wall", + "minecraft:polished_tuff_wall", + "minecraft:mud_brick_wall", + "minecraft:resin_brick_wall" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:oak_fence", + "name" : "minecraft:itemGroup.name.fence" + }, + "items" : [ + "minecraft:oak_fence", + "minecraft:spruce_fence", + "minecraft:birch_fence", + "minecraft:jungle_fence", + "minecraft:acacia_fence", + "minecraft:dark_oak_fence", + "minecraft:mangrove_fence", + "minecraft:cherry_fence", + "minecraft:pale_oak_fence", + "minecraft:bamboo_fence", + "minecraft:nether_brick_fence", + "minecraft:crimson_fence", + "minecraft:warped_fence" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:fence_gate", + "name" : "minecraft:itemGroup.name.fenceGate" + }, + "items" : [ + "minecraft:fence_gate", + "minecraft:spruce_fence_gate", + "minecraft:birch_fence_gate", + "minecraft:jungle_fence_gate", + "minecraft:acacia_fence_gate", + "minecraft:dark_oak_fence_gate", + "minecraft:mangrove_fence_gate", + "minecraft:cherry_fence_gate", + "minecraft:pale_oak_fence_gate", + "minecraft:bamboo_fence_gate", + "minecraft:crimson_fence_gate", + "minecraft:warped_fence_gate" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:stone_stairs", + "name" : "minecraft:itemGroup.name.stairs" + }, + "items" : [ + "minecraft:normal_stone_stairs", + "minecraft:stone_stairs", + "minecraft:mossy_cobblestone_stairs", + "minecraft:oak_stairs", + "minecraft:spruce_stairs", + "minecraft:birch_stairs", + "minecraft:jungle_stairs", + "minecraft:acacia_stairs", + "minecraft:dark_oak_stairs", + "minecraft:mangrove_stairs", + "minecraft:cherry_stairs", + "minecraft:pale_oak_stairs", + "minecraft:bamboo_stairs", + "minecraft:bamboo_mosaic_stairs", + "minecraft:stone_brick_stairs", + "minecraft:mossy_stone_brick_stairs", + "minecraft:sandstone_stairs", + "minecraft:smooth_sandstone_stairs", + "minecraft:red_sandstone_stairs", + "minecraft:smooth_red_sandstone_stairs", + "minecraft:granite_stairs", + "minecraft:polished_granite_stairs", + "minecraft:diorite_stairs", + "minecraft:polished_diorite_stairs", + "minecraft:andesite_stairs", + "minecraft:polished_andesite_stairs", + "minecraft:brick_stairs", + "minecraft:nether_brick_stairs", + "minecraft:red_nether_brick_stairs", + "minecraft:end_brick_stairs", + "minecraft:quartz_stairs", + "minecraft:smooth_quartz_stairs", + "minecraft:purpur_stairs", + "minecraft:prismarine_stairs", + "minecraft:dark_prismarine_stairs", + "minecraft:prismarine_bricks_stairs", + "minecraft:crimson_stairs", + "minecraft:warped_stairs", + "minecraft:blackstone_stairs", + "minecraft:polished_blackstone_stairs", + "minecraft:polished_blackstone_brick_stairs", + "minecraft:cobbled_deepslate_stairs", + "minecraft:deepslate_tile_stairs", + "minecraft:polished_deepslate_stairs", + "minecraft:deepslate_brick_stairs", + "minecraft:tuff_stairs", + "minecraft:polished_tuff_stairs", + "minecraft:tuff_brick_stairs", + "minecraft:mud_brick_stairs", + "minecraft:cut_copper_stairs", + "minecraft:exposed_cut_copper_stairs", + "minecraft:weathered_cut_copper_stairs", + "minecraft:oxidized_cut_copper_stairs", + "minecraft:waxed_cut_copper_stairs", + "minecraft:waxed_exposed_cut_copper_stairs", + "minecraft:waxed_weathered_cut_copper_stairs", + "minecraft:waxed_oxidized_cut_copper_stairs", + "minecraft:resin_brick_stairs" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:wooden_door", + "name" : "minecraft:itemGroup.name.door" + }, + "items" : [ + "minecraft:wooden_door", + "minecraft:spruce_door", + "minecraft:birch_door", + "minecraft:jungle_door", + "minecraft:acacia_door", + "minecraft:dark_oak_door", + "minecraft:mangrove_door", + "minecraft:cherry_door", + "minecraft:pale_oak_door", + "minecraft:bamboo_door", + "minecraft:iron_door", + "minecraft:crimson_door", + "minecraft:warped_door", + "minecraft:copper_door", + "minecraft:exposed_copper_door", + "minecraft:weathered_copper_door", + "minecraft:oxidized_copper_door", + "minecraft:waxed_copper_door", + "minecraft:waxed_exposed_copper_door", + "minecraft:waxed_weathered_copper_door", + "minecraft:waxed_oxidized_copper_door" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:trapdoor", + "name" : "minecraft:itemGroup.name.trapdoor" + }, + "items" : [ + "minecraft:trapdoor", + "minecraft:spruce_trapdoor", + "minecraft:birch_trapdoor", + "minecraft:jungle_trapdoor", + "minecraft:acacia_trapdoor", + "minecraft:dark_oak_trapdoor", + "minecraft:mangrove_trapdoor", + "minecraft:cherry_trapdoor", + "minecraft:pale_oak_trapdoor", + "minecraft:bamboo_trapdoor", + "minecraft:iron_trapdoor", + "minecraft:crimson_trapdoor", + "minecraft:warped_trapdoor", + "minecraft:copper_trapdoor", + "minecraft:exposed_copper_trapdoor", + "minecraft:weathered_copper_trapdoor", + "minecraft:oxidized_copper_trapdoor", + "minecraft:waxed_copper_trapdoor", + "minecraft:waxed_exposed_copper_trapdoor", + "minecraft:waxed_weathered_copper_trapdoor", + "minecraft:waxed_oxidized_copper_trapdoor" + ] + }, + { + "items" : [ "minecraft:iron_bars" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:glass", + "name" : "minecraft:itemGroup.name.glass" + }, + "items" : [ + "minecraft:glass", + "minecraft:white_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:black_stained_glass", + "minecraft:brown_stained_glass", + "minecraft:red_stained_glass", + "minecraft:orange_stained_glass", + "minecraft:yellow_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:green_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:blue_stained_glass", + "minecraft:purple_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:tinted_glass" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:glass_pane", + "name" : "minecraft:itemGroup.name.glassPane" + }, + "items" : [ + "minecraft:glass_pane", + "minecraft:white_stained_glass_pane", + "minecraft:light_gray_stained_glass_pane", + "minecraft:gray_stained_glass_pane", + "minecraft:black_stained_glass_pane", + "minecraft:brown_stained_glass_pane", + "minecraft:red_stained_glass_pane", + "minecraft:orange_stained_glass_pane", + "minecraft:yellow_stained_glass_pane", + "minecraft:lime_stained_glass_pane", + "minecraft:green_stained_glass_pane", + "minecraft:cyan_stained_glass_pane", + "minecraft:light_blue_stained_glass_pane", + "minecraft:blue_stained_glass_pane", + "minecraft:purple_stained_glass_pane", + "minecraft:magenta_stained_glass_pane", + "minecraft:pink_stained_glass_pane" + ] + }, + { + "items" : [ "minecraft:ladder", "minecraft:scaffolding", "minecraft:brick_block" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:smooth_stone_slab", + "name" : "minecraft:itemGroup.name.slab" + }, + "items" : [ + "minecraft:smooth_stone_slab", + "minecraft:normal_stone_slab", + "minecraft:cobblestone_slab", + "minecraft:mossy_cobblestone_slab", + "minecraft:oak_slab", + "minecraft:spruce_slab", + "minecraft:birch_slab", + "minecraft:jungle_slab", + "minecraft:acacia_slab", + "minecraft:dark_oak_slab", + "minecraft:mangrove_slab", + "minecraft:cherry_slab", + "minecraft:pale_oak_slab", + "minecraft:bamboo_slab", + "minecraft:bamboo_mosaic_slab", + "minecraft:stone_brick_slab", + "minecraft:mossy_stone_brick_slab", + "minecraft:sandstone_slab", + "minecraft:cut_sandstone_slab", + "minecraft:smooth_sandstone_slab", + "minecraft:red_sandstone_slab", + "minecraft:cut_red_sandstone_slab", + "minecraft:smooth_red_sandstone_slab", + "minecraft:granite_slab", + "minecraft:polished_granite_slab", + "minecraft:diorite_slab", + "minecraft:polished_diorite_slab", + "minecraft:andesite_slab", + "minecraft:polished_andesite_slab", + "minecraft:brick_slab", + "minecraft:nether_brick_slab", + "minecraft:red_nether_brick_slab", + "minecraft:end_stone_brick_slab", + "minecraft:quartz_slab", + "minecraft:smooth_quartz_slab", + "minecraft:purpur_slab", + "minecraft:prismarine_slab", + "minecraft:dark_prismarine_slab", + "minecraft:prismarine_brick_slab", + "minecraft:crimson_slab", + "minecraft:warped_slab", + "minecraft:blackstone_slab", + "minecraft:polished_blackstone_slab", + "minecraft:polished_blackstone_brick_slab", + "minecraft:cobbled_deepslate_slab", + "minecraft:polished_deepslate_slab", + "minecraft:deepslate_tile_slab", + "minecraft:deepslate_brick_slab", + "minecraft:tuff_slab", + "minecraft:polished_tuff_slab", + "minecraft:tuff_brick_slab", + "minecraft:mud_brick_slab", + "minecraft:cut_copper_slab", + "minecraft:exposed_cut_copper_slab", + "minecraft:weathered_cut_copper_slab", + "minecraft:oxidized_cut_copper_slab", + "minecraft:waxed_cut_copper_slab", + "minecraft:waxed_exposed_cut_copper_slab", + "minecraft:waxed_weathered_cut_copper_slab", + "minecraft:waxed_oxidized_cut_copper_slab", + "minecraft:resin_brick_slab" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:stone_bricks", + "name" : "minecraft:itemGroup.name.stoneBrick" + }, + "items" : [ + "minecraft:stone_bricks", + "minecraft:mossy_stone_bricks", + "minecraft:cracked_stone_bricks", + "minecraft:chiseled_stone_bricks", + "minecraft:smooth_stone", + "minecraft:end_bricks", + "minecraft:polished_blackstone_bricks", + "minecraft:cracked_polished_blackstone_bricks", + "minecraft:gilded_blackstone", + "minecraft:chiseled_polished_blackstone", + "minecraft:deepslate_tiles", + "minecraft:cracked_deepslate_tiles", + "minecraft:deepslate_bricks", + "minecraft:tuff_bricks", + "minecraft:cracked_deepslate_bricks", + "minecraft:chiseled_deepslate", + "minecraft:chiseled_tuff", + "minecraft:chiseled_tuff_bricks" + ] + }, + { + "items" : [ + "minecraft:cobblestone", + "minecraft:mossy_cobblestone", + "minecraft:cobbled_deepslate" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:sandstone", + "name" : "minecraft:itemGroup.name.sandstone" + }, + "items" : [ + "minecraft:sandstone", + "minecraft:chiseled_sandstone", + "minecraft:cut_sandstone", + "minecraft:smooth_sandstone", + "minecraft:red_sandstone", + "minecraft:chiseled_red_sandstone", + "minecraft:cut_red_sandstone", + "minecraft:smooth_red_sandstone" + ] + }, + { + "items" : [ "minecraft:coal_block", "minecraft:dried_kelp_block" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:copper_block", + "name" : "minecraft:itemGroup.name.copper" + }, + "items" : [ + "minecraft:copper_block", + "minecraft:weathered_copper", + "minecraft:exposed_copper", + "minecraft:oxidized_copper", + "minecraft:waxed_copper", + "minecraft:waxed_exposed_copper", + "minecraft:waxed_weathered_copper", + "minecraft:waxed_oxidized_copper", + "minecraft:copper_grate", + "minecraft:exposed_copper_grate", + "minecraft:weathered_copper_grate", + "minecraft:oxidized_copper_grate", + "minecraft:waxed_copper_grate", + "minecraft:waxed_exposed_copper_grate", + "minecraft:waxed_weathered_copper_grate", + "minecraft:waxed_oxidized_copper_grate", + "minecraft:cut_copper", + "minecraft:exposed_cut_copper", + "minecraft:weathered_cut_copper", + "minecraft:oxidized_cut_copper", + "minecraft:waxed_cut_copper", + "minecraft:waxed_exposed_cut_copper", + "minecraft:waxed_weathered_cut_copper", + "minecraft:waxed_oxidized_cut_copper", + "minecraft:chiseled_copper", + "minecraft:exposed_chiseled_copper", + "minecraft:weathered_chiseled_copper", + "minecraft:oxidized_chiseled_copper", + "minecraft:waxed_chiseled_copper", + "minecraft:waxed_exposed_chiseled_copper", + "minecraft:waxed_oxidized_chiseled_copper", + "minecraft:waxed_weathered_chiseled_copper", + "minecraft:copper_bulb", + "minecraft:exposed_copper_bulb", + "minecraft:weathered_copper_bulb", + "minecraft:oxidized_copper_bulb", + "minecraft:waxed_copper_bulb", + "minecraft:waxed_exposed_copper_bulb", + "minecraft:waxed_weathered_copper_bulb", + "minecraft:waxed_oxidized_copper_bulb" + ] + }, + { + "items" : [ + "minecraft:iron_block", + "minecraft:gold_block", + "minecraft:emerald_block", + "minecraft:diamond_block", + "minecraft:lapis_block", + "minecraft:raw_copper_block", + "minecraft:raw_iron_block", + "minecraft:raw_gold_block", + "minecraft:quartz_block", + "minecraft:quartz_bricks", + "minecraft:quartz_pillar", + "minecraft:chiseled_quartz_block", + "minecraft:smooth_quartz", + "minecraft:prismarine", + "minecraft:prismarine_bricks", + "minecraft:dark_prismarine", + "minecraft:slime", + "minecraft:honey_block", + "minecraft:honeycomb_block", + "minecraft:resin_block", + "minecraft:hay_block", + "minecraft:bone_block", + "minecraft:resin_bricks", + "minecraft:chiseled_resin_bricks", + "minecraft:nether_brick", + "minecraft:red_nether_brick", + "minecraft:chiseled_nether_bricks", + "minecraft:cracked_nether_bricks", + "minecraft:netherite_block", + "minecraft:lodestone" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:white_wool", + "name" : "minecraft:itemGroup.name.wool" + }, + "items" : [ + "minecraft:white_wool", + "minecraft:light_gray_wool", + "minecraft:gray_wool", + "minecraft:black_wool", + "minecraft:brown_wool", + "minecraft:red_wool", + "minecraft:orange_wool", + "minecraft:yellow_wool", + "minecraft:lime_wool", + "minecraft:green_wool", + "minecraft:cyan_wool", + "minecraft:light_blue_wool", + "minecraft:blue_wool", + "minecraft:purple_wool", + "minecraft:magenta_wool", + "minecraft:pink_wool" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:white_carpet", + "name" : "minecraft:itemGroup.name.woolCarpet" + }, + "items" : [ + "minecraft:white_carpet", + "minecraft:light_gray_carpet", + "minecraft:gray_carpet", + "minecraft:black_carpet", + "minecraft:brown_carpet", + "minecraft:red_carpet", + "minecraft:orange_carpet", + "minecraft:yellow_carpet", + "minecraft:lime_carpet", + "minecraft:green_carpet", + "minecraft:cyan_carpet", + "minecraft:light_blue_carpet", + "minecraft:blue_carpet", + "minecraft:purple_carpet", + "minecraft:magenta_carpet", + "minecraft:pink_carpet" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:white_concrete_powder", + "name" : "minecraft:itemGroup.name.concretePowder" + }, + "items" : [ + "minecraft:white_concrete_powder", + "minecraft:light_gray_concrete_powder", + "minecraft:gray_concrete_powder", + "minecraft:black_concrete_powder", + "minecraft:brown_concrete_powder", + "minecraft:red_concrete_powder", + "minecraft:orange_concrete_powder", + "minecraft:yellow_concrete_powder", + "minecraft:lime_concrete_powder", + "minecraft:green_concrete_powder", + "minecraft:cyan_concrete_powder", + "minecraft:light_blue_concrete_powder", + "minecraft:blue_concrete_powder", + "minecraft:purple_concrete_powder", + "minecraft:magenta_concrete_powder", + "minecraft:pink_concrete_powder" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:white_concrete", + "name" : "minecraft:itemGroup.name.concrete" + }, + "items" : [ + "minecraft:white_concrete", + "minecraft:light_gray_concrete", + "minecraft:gray_concrete", + "minecraft:black_concrete", + "minecraft:brown_concrete", + "minecraft:red_concrete", + "minecraft:orange_concrete", + "minecraft:yellow_concrete", + "minecraft:lime_concrete", + "minecraft:green_concrete", + "minecraft:cyan_concrete", + "minecraft:light_blue_concrete", + "minecraft:blue_concrete", + "minecraft:purple_concrete", + "minecraft:magenta_concrete", + "minecraft:pink_concrete" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:hardened_clay", + "name" : "minecraft:itemGroup.name.stainedClay" + }, + "items" : [ + "minecraft:hardened_clay", + "minecraft:white_terracotta", + "minecraft:light_gray_terracotta", + "minecraft:gray_terracotta", + "minecraft:black_terracotta", + "minecraft:brown_terracotta", + "minecraft:red_terracotta", + "minecraft:orange_terracotta", + "minecraft:yellow_terracotta", + "minecraft:lime_terracotta", + "minecraft:green_terracotta", + "minecraft:cyan_terracotta", + "minecraft:light_blue_terracotta", + "minecraft:blue_terracotta", + "minecraft:purple_terracotta", + "minecraft:magenta_terracotta", + "minecraft:pink_terracotta" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:white_glazed_terracotta", + "name" : "minecraft:itemGroup.name.glazedTerracotta" + }, + "items" : [ + "minecraft:white_glazed_terracotta", + "minecraft:silver_glazed_terracotta", + "minecraft:gray_glazed_terracotta", + "minecraft:black_glazed_terracotta", + "minecraft:brown_glazed_terracotta", + "minecraft:red_glazed_terracotta", + "minecraft:orange_glazed_terracotta", + "minecraft:yellow_glazed_terracotta", + "minecraft:lime_glazed_terracotta", + "minecraft:green_glazed_terracotta", + "minecraft:cyan_glazed_terracotta", + "minecraft:light_blue_glazed_terracotta", + "minecraft:blue_glazed_terracotta", + "minecraft:purple_glazed_terracotta", + "minecraft:magenta_glazed_terracotta", + "minecraft:pink_glazed_terracotta" + ] + }, + { + "items" : [ + "minecraft:purpur_block", + "minecraft:purpur_pillar", + "minecraft:packed_mud", + "minecraft:mud_bricks" + ] + } + ] + }, + { + "category_name" : "nature", + "groups" : [ + { + "items" : [ + "minecraft:nether_wart_block", + "minecraft:warped_wart_block", + "minecraft:shroomlight", + "minecraft:crimson_nylium", + "minecraft:warped_nylium", + "minecraft:netherrack", + "minecraft:soul_soil", + "minecraft:grass_block", + "minecraft:podzol", + "minecraft:mycelium", + "minecraft:grass_path", + "minecraft:dirt", + "minecraft:coarse_dirt", + "minecraft:dirt_with_roots", + "minecraft:farmland", + "minecraft:mud", + "minecraft:clay" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:iron_ore", + "name" : "minecraft:itemGroup.name.ore" + }, + "items" : [ + "minecraft:iron_ore", + "minecraft:gold_ore", + "minecraft:diamond_ore", + "minecraft:lapis_ore", + "minecraft:redstone_ore", + "minecraft:coal_ore", + "minecraft:copper_ore", + "minecraft:emerald_ore", + "minecraft:quartz_ore", + "minecraft:nether_gold_ore", + "minecraft:ancient_debris", + "minecraft:deepslate_iron_ore", + "minecraft:deepslate_gold_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:deepslate_redstone_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:deepslate_coal_ore", + "minecraft:deepslate_copper_ore" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:stone", + "name" : "minecraft:itemGroup.name.stone" + }, + "items" : [ + "minecraft:stone", + "minecraft:granite", + "minecraft:diorite", + "minecraft:andesite", + "minecraft:blackstone", + "minecraft:deepslate", + "minecraft:tuff", + "minecraft:basalt", + "minecraft:polished_granite", + "minecraft:polished_diorite", + "minecraft:polished_andesite", + "minecraft:polished_blackstone", + "minecraft:polished_deepslate", + "minecraft:polished_tuff", + "minecraft:polished_basalt", + "minecraft:smooth_basalt" + ] + }, + { + "items" : [ + "minecraft:gravel", + "minecraft:sand", + "minecraft:red_sand", + "minecraft:cactus" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:oak_log", + "name" : "minecraft:itemGroup.name.log" + }, + "items" : [ + "minecraft:oak_log", + "minecraft:stripped_oak_log", + "minecraft:spruce_log", + "minecraft:stripped_spruce_log", + "minecraft:birch_log", + "minecraft:stripped_birch_log", + "minecraft:jungle_log", + "minecraft:stripped_jungle_log", + "minecraft:acacia_log", + "minecraft:stripped_acacia_log", + "minecraft:dark_oak_log", + "minecraft:stripped_dark_oak_log", + "minecraft:mangrove_log", + "minecraft:stripped_mangrove_log", + "minecraft:cherry_log", + "minecraft:stripped_cherry_log", + "minecraft:pale_oak_log", + "minecraft:stripped_pale_oak_log", + "minecraft:crimson_stem", + "minecraft:stripped_crimson_stem", + "minecraft:warped_stem", + "minecraft:stripped_warped_stem" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:oak_wood", + "name" : "minecraft:itemGroup.name.wood" + }, + "items" : [ + "minecraft:oak_wood", + "minecraft:stripped_oak_wood", + "minecraft:spruce_wood", + "minecraft:stripped_spruce_wood", + "minecraft:birch_wood", + "minecraft:stripped_birch_wood", + "minecraft:jungle_wood", + "minecraft:stripped_jungle_wood", + "minecraft:acacia_wood", + "minecraft:stripped_acacia_wood", + "minecraft:dark_oak_wood", + "minecraft:stripped_dark_oak_wood", + "minecraft:mangrove_wood", + "minecraft:stripped_mangrove_wood", + "minecraft:cherry_wood", + "minecraft:stripped_cherry_wood", + "minecraft:pale_oak_wood", + "minecraft:stripped_pale_oak_wood", + "minecraft:crimson_hyphae", + "minecraft:stripped_crimson_hyphae", + "minecraft:warped_hyphae", + "minecraft:stripped_warped_hyphae", + "minecraft:bamboo_block", + "minecraft:stripped_bamboo_block" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:oak_leaves", + "name" : "minecraft:itemGroup.name.leaves" + }, + "items" : [ + "minecraft:oak_leaves", + "minecraft:spruce_leaves", + "minecraft:birch_leaves", + "minecraft:jungle_leaves", + "minecraft:acacia_leaves", + "minecraft:dark_oak_leaves", + "minecraft:mangrove_leaves", + "minecraft:cherry_leaves", + "minecraft:pale_oak_leaves", + "minecraft:azalea_leaves", + "minecraft:azalea_leaves_flowered" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:oak_sapling", + "name" : "minecraft:itemGroup.name.sapling" + }, + "items" : [ + "minecraft:oak_sapling", + "minecraft:spruce_sapling", + "minecraft:birch_sapling", + "minecraft:jungle_sapling", + "minecraft:acacia_sapling", + "minecraft:dark_oak_sapling", + "minecraft:mangrove_propagule", + "minecraft:cherry_sapling", + "minecraft:pale_oak_sapling" + ] + }, + { + "items" : [ "minecraft:bee_nest" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:wheat_seeds", + "name" : "minecraft:itemGroup.name.seed" + }, + "items" : [ + "minecraft:wheat_seeds", + "minecraft:pumpkin_seeds", + "minecraft:melon_seeds", + "minecraft:beetroot_seeds", + "minecraft:torchflower_seeds", + "minecraft:pitcher_pod" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:wheat", + "name" : "minecraft:itemGroup.name.crop" + }, + "items" : [ + "minecraft:wheat", + "minecraft:beetroot", + "minecraft:potato", + "minecraft:poisonous_potato", + "minecraft:carrot", + "minecraft:golden_carrot", + "minecraft:apple", + "minecraft:golden_apple", + "minecraft:enchanted_golden_apple", + "minecraft:melon_block", + "minecraft:melon_slice", + "minecraft:glistering_melon_slice", + "minecraft:sweet_berries", + "minecraft:glow_berries", + "minecraft:pumpkin" + ] + }, + { + "items" : [ + "minecraft:carved_pumpkin", + "minecraft:lit_pumpkin", + "minecraft:honeycomb", + "minecraft:resin_clump" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:fern", + "name" : "minecraft:itemGroup.name.grass" + }, + "items" : [ + "minecraft:fern", + "minecraft:large_fern", + "minecraft:short_grass", + "minecraft:tall_grass", + "minecraft:short_dry_grass", + "minecraft:tall_dry_grass", + "minecraft:bush", + "minecraft:nether_sprouts" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:fire_coral", + "name" : "minecraft:itemGroup.name.coral_decorations" + }, + "items" : [ + "minecraft:fire_coral", + "minecraft:brain_coral", + "minecraft:bubble_coral", + "minecraft:tube_coral", + "minecraft:horn_coral", + "minecraft:dead_fire_coral", + "minecraft:dead_brain_coral", + "minecraft:dead_bubble_coral", + "minecraft:dead_tube_coral", + "minecraft:dead_horn_coral", + "minecraft:fire_coral_fan", + "minecraft:brain_coral_fan", + "minecraft:bubble_coral_fan", + "minecraft:tube_coral_fan", + "minecraft:horn_coral_fan", + "minecraft:dead_fire_coral_fan", + "minecraft:dead_brain_coral_fan", + "minecraft:dead_bubble_coral_fan", + "minecraft:dead_tube_coral_fan", + "minecraft:dead_horn_coral_fan" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:dandelion", + "name" : "minecraft:itemGroup.name.flower" + }, + "items" : [ + "minecraft:crimson_roots", + "minecraft:warped_roots", + "minecraft:dandelion", + "minecraft:poppy", + "minecraft:blue_orchid", + "minecraft:allium", + "minecraft:azure_bluet", + "minecraft:red_tulip", + "minecraft:orange_tulip", + "minecraft:white_tulip", + "minecraft:pink_tulip", + "minecraft:oxeye_daisy", + "minecraft:cornflower", + "minecraft:lily_of_the_valley", + "minecraft:sunflower", + "minecraft:lilac", + "minecraft:rose_bush", + "minecraft:peony", + "minecraft:pitcher_plant", + "minecraft:pink_petals", + "minecraft:wildflowers", + "minecraft:wither_rose", + "minecraft:torchflower", + "minecraft:cactus_flower", + "minecraft:closed_eyeblossom", + "minecraft:open_eyeblossom" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:yellow_dye", + "name" : "minecraft:itemGroup.name.dye" + }, + "items" : [ + "minecraft:white_dye", + "minecraft:light_gray_dye", + "minecraft:gray_dye", + "minecraft:black_dye", + "minecraft:brown_dye", + "minecraft:red_dye", + "minecraft:orange_dye", + "minecraft:yellow_dye", + "minecraft:lime_dye", + "minecraft:green_dye", + "minecraft:cyan_dye", + "minecraft:light_blue_dye", + "minecraft:blue_dye", + "minecraft:purple_dye", + "minecraft:magenta_dye", + "minecraft:pink_dye" + ] + }, + { + "items" : [ + "minecraft:ink_sac", + "minecraft:glow_ink_sac", + "minecraft:cocoa_beans", + "minecraft:lapis_lazuli", + "minecraft:bone_meal", + "minecraft:vine", + "minecraft:weeping_vines", + "minecraft:twisting_vines", + "minecraft:waterlily", + "minecraft:seagrass", + "minecraft:kelp", + "minecraft:deadbush", + "minecraft:bamboo", + "minecraft:snow", + "minecraft:ice", + "minecraft:packed_ice", + "minecraft:blue_ice", + "minecraft:snow_layer", + "minecraft:pointed_dripstone", + "minecraft:dripstone_block", + "minecraft:leaf_litter", + "minecraft:moss_carpet", + "minecraft:moss_block", + "minecraft:pale_moss_carpet", + "minecraft:pale_moss_block", + "minecraft:pale_hanging_moss", + "minecraft:hanging_roots", + "minecraft:mangrove_roots", + "minecraft:muddy_mangrove_roots", + "minecraft:big_dripleaf", + "minecraft:small_dripleaf_block", + "minecraft:spore_blossom", + "minecraft:firefly_bush", + "minecraft:azalea", + "minecraft:flowering_azalea", + "minecraft:glow_lichen", + "minecraft:amethyst_block", + "minecraft:budding_amethyst", + "minecraft:amethyst_cluster", + "minecraft:large_amethyst_bud", + "minecraft:medium_amethyst_bud", + "minecraft:small_amethyst_bud", + "minecraft:calcite" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:chicken", + "name" : "minecraft:itemGroup.name.rawFood" + }, + "items" : [ + "minecraft:chicken", + "minecraft:porkchop", + "minecraft:beef", + "minecraft:mutton", + "minecraft:rabbit", + "minecraft:cod", + "minecraft:salmon", + "minecraft:tropical_fish", + "minecraft:pufferfish" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:brown_mushroom", + "name" : "minecraft:itemGroup.name.mushroom" + }, + "items" : [ + "minecraft:brown_mushroom", + "minecraft:red_mushroom", + "minecraft:crimson_fungus", + "minecraft:warped_fungus", + "minecraft:brown_mushroom_block:14", + "minecraft:red_mushroom_block:14", + "minecraft:mushroom_stem" + ] + }, + { + "items" : [ + "minecraft:egg", + "minecraft:brown_egg", + "minecraft:blue_egg", + "minecraft:sugar_cane", + "minecraft:sugar", + "minecraft:rotten_flesh", + "minecraft:bone", + "minecraft:web", + "minecraft:spider_eye", + "minecraft:mob_spawner", + "minecraft:trial_spawner", + "minecraft:vault", + "minecraft:creaking_heart", + "minecraft:end_portal_frame" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:infested_stone", + "name" : "minecraft:itemGroup.name.monsterStoneEgg" + }, + "items" : [ + "minecraft:infested_stone", + "minecraft:infested_cobblestone", + "minecraft:infested_stone_bricks", + "minecraft:infested_mossy_stone_bricks", + "minecraft:infested_cracked_stone_bricks", + "minecraft:infested_chiseled_stone_bricks", + "minecraft:infested_deepslate" + ] + }, + { + "items" : [ + "minecraft:dragon_egg", + "minecraft:turtle_egg", + "minecraft:sniffer_egg", + "minecraft:frog_spawn", + "minecraft:pearlescent_froglight", + "minecraft:verdant_froglight", + "minecraft:ochre_froglight" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:chicken_spawn_egg", + "name" : "minecraft:itemGroup.name.mobEgg" + }, + "items" : [ + "minecraft:chicken_spawn_egg", + "minecraft:bee_spawn_egg", + "minecraft:cow_spawn_egg", + "minecraft:pig_spawn_egg", + "minecraft:sheep_spawn_egg", + "minecraft:wolf_spawn_egg", + "minecraft:polar_bear_spawn_egg", + "minecraft:ocelot_spawn_egg", + "minecraft:cat_spawn_egg", + "minecraft:mooshroom_spawn_egg", + "minecraft:bat_spawn_egg", + "minecraft:parrot_spawn_egg", + "minecraft:rabbit_spawn_egg", + "minecraft:llama_spawn_egg", + "minecraft:horse_spawn_egg", + "minecraft:donkey_spawn_egg", + "minecraft:mule_spawn_egg", + "minecraft:skeleton_horse_spawn_egg", + "minecraft:zombie_horse_spawn_egg", + "minecraft:tropical_fish_spawn_egg", + "minecraft:cod_spawn_egg", + "minecraft:pufferfish_spawn_egg", + "minecraft:salmon_spawn_egg", + "minecraft:dolphin_spawn_egg", + "minecraft:turtle_spawn_egg", + "minecraft:panda_spawn_egg", + "minecraft:fox_spawn_egg", + "minecraft:creeper_spawn_egg", + "minecraft:enderman_spawn_egg", + "minecraft:silverfish_spawn_egg", + "minecraft:skeleton_spawn_egg", + "minecraft:wither_skeleton_spawn_egg", + "minecraft:stray_spawn_egg", + "minecraft:slime_spawn_egg", + "minecraft:spider_spawn_egg", + "minecraft:zombie_spawn_egg", + "minecraft:zombie_pigman_spawn_egg", + "minecraft:husk_spawn_egg", + "minecraft:drowned_spawn_egg", + "minecraft:squid_spawn_egg", + "minecraft:glow_squid_spawn_egg", + "minecraft:cave_spider_spawn_egg", + "minecraft:witch_spawn_egg", + "minecraft:guardian_spawn_egg", + "minecraft:elder_guardian_spawn_egg", + "minecraft:endermite_spawn_egg", + "minecraft:magma_cube_spawn_egg", + "minecraft:strider_spawn_egg", + "minecraft:hoglin_spawn_egg", + "minecraft:piglin_spawn_egg", + "minecraft:zoglin_spawn_egg", + "minecraft:piglin_brute_spawn_egg", + "minecraft:goat_spawn_egg", + "minecraft:axolotl_spawn_egg", + "minecraft:warden_spawn_egg", + "minecraft:allay_spawn_egg", + "minecraft:frog_spawn_egg", + "minecraft:tadpole_spawn_egg", + "minecraft:trader_llama_spawn_egg", + "minecraft:camel_spawn_egg", + "minecraft:ghast_spawn_egg", + "minecraft:blaze_spawn_egg", + "minecraft:shulker_spawn_egg", + "minecraft:vindicator_spawn_egg", + "minecraft:evoker_spawn_egg", + "minecraft:vex_spawn_egg", + "minecraft:villager_spawn_egg", + "minecraft:wandering_trader_spawn_egg", + "minecraft:zombie_villager_spawn_egg", + "minecraft:phantom_spawn_egg", + "minecraft:pillager_spawn_egg", + "minecraft:ravager_spawn_egg", + "minecraft:iron_golem_spawn_egg", + "minecraft:snow_golem_spawn_egg", + "minecraft:sniffer_spawn_egg", + "minecraft:breeze_spawn_egg", + "minecraft:armadillo_spawn_egg", + "minecraft:bogged_spawn_egg", + "minecraft:creaking_spawn_egg" + ] + }, + { + "items" : [ + "minecraft:obsidian", + "minecraft:crying_obsidian", + "minecraft:bedrock", + "minecraft:soul_sand", + "minecraft:magma", + "minecraft:nether_wart", + "minecraft:end_stone", + "minecraft:chorus_flower", + "minecraft:chorus_plant", + "minecraft:chorus_fruit", + "minecraft:popped_chorus_fruit", + "minecraft:sponge", + "minecraft:wet_sponge" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:tube_coral_block", + "name" : "minecraft:itemGroup.name.coral" + }, + "items" : [ + "minecraft:tube_coral_block", + "minecraft:brain_coral_block", + "minecraft:bubble_coral_block", + "minecraft:fire_coral_block", + "minecraft:horn_coral_block", + "minecraft:dead_tube_coral_block", + "minecraft:dead_brain_coral_block", + "minecraft:dead_bubble_coral_block", + "minecraft:dead_fire_coral_block", + "minecraft:dead_horn_coral_block" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:sculk", + "name" : "minecraft:itemGroup.name.sculk" + }, + "items" : [ + "minecraft:sculk", + "minecraft:sculk_vein", + "minecraft:sculk_catalyst", + "minecraft:sculk_shrieker", + "minecraft:sculk_sensor", + "minecraft:calibrated_sculk_sensor" + ] + }, + { + "items" : [ "minecraft:reinforced_deepslate" ] + } + ] + }, + { + "category_name" : "equipment", + "groups" : [ + { + "group_identifier" : { + "icon" : "minecraft:leather_helmet", + "name" : "minecraft:itemGroup.name.helmet" + }, + "items" : [ + "minecraft:leather_helmet", + "minecraft:chainmail_helmet", + "minecraft:iron_helmet", + "minecraft:golden_helmet", + "minecraft:diamond_helmet", + "minecraft:netherite_helmet" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:leather_chestplate", + "name" : "minecraft:itemGroup.name.chestplate" + }, + "items" : [ + "minecraft:leather_chestplate", + "minecraft:chainmail_chestplate", + "minecraft:iron_chestplate", + "minecraft:golden_chestplate", + "minecraft:diamond_chestplate", + "minecraft:netherite_chestplate" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:leather_leggings", + "name" : "minecraft:itemGroup.name.leggings" + }, + "items" : [ + "minecraft:leather_leggings", + "minecraft:chainmail_leggings", + "minecraft:iron_leggings", + "minecraft:golden_leggings", + "minecraft:diamond_leggings", + "minecraft:netherite_leggings" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:leather_boots", + "name" : "minecraft:itemGroup.name.boots" + }, + "items" : [ + "minecraft:leather_boots", + "minecraft:chainmail_boots", + "minecraft:iron_boots", + "minecraft:golden_boots", + "minecraft:diamond_boots", + "minecraft:netherite_boots" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:wooden_sword", + "name" : "minecraft:itemGroup.name.sword" + }, + "items" : [ + "minecraft:wooden_sword", + "minecraft:stone_sword", + "minecraft:iron_sword", + "minecraft:golden_sword", + "minecraft:diamond_sword", + "minecraft:netherite_sword" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:wooden_axe", + "name" : "minecraft:itemGroup.name.axe" + }, + "items" : [ + "minecraft:wooden_axe", + "minecraft:stone_axe", + "minecraft:iron_axe", + "minecraft:golden_axe", + "minecraft:diamond_axe", + "minecraft:netherite_axe" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:wooden_pickaxe", + "name" : "minecraft:itemGroup.name.pickaxe" + }, + "items" : [ + "minecraft:wooden_pickaxe", + "minecraft:stone_pickaxe", + "minecraft:iron_pickaxe", + "minecraft:golden_pickaxe", + "minecraft:diamond_pickaxe", + "minecraft:netherite_pickaxe" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:wooden_shovel", + "name" : "minecraft:itemGroup.name.shovel" + }, + "items" : [ + "minecraft:wooden_shovel", + "minecraft:stone_shovel", + "minecraft:iron_shovel", + "minecraft:golden_shovel", + "minecraft:diamond_shovel", + "minecraft:netherite_shovel" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:wooden_hoe", + "name" : "minecraft:itemGroup.name.hoe" + }, + "items" : [ + "minecraft:wooden_hoe", + "minecraft:stone_hoe", + "minecraft:iron_hoe", + "minecraft:golden_hoe", + "minecraft:diamond_hoe", + "minecraft:netherite_hoe" + ] + }, + { + "items" : [ "minecraft:bow", "minecraft:crossbow", "minecraft:mace" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:arrow", + "name" : "minecraft:itemGroup.name.arrow" + }, + "items" : [ + "minecraft:arrow", + "minecraft:arrow:6", + "minecraft:arrow:7", + "minecraft:arrow:8", + "minecraft:arrow:9", + "minecraft:arrow:10", + "minecraft:arrow:11", + "minecraft:arrow:12", + "minecraft:arrow:13", + "minecraft:arrow:14", + "minecraft:arrow:15", + "minecraft:arrow:16", + "minecraft:arrow:17", + "minecraft:arrow:18", + "minecraft:arrow:19", + "minecraft:arrow:20", + "minecraft:arrow:21", + "minecraft:arrow:22", + "minecraft:arrow:23", + "minecraft:arrow:24", + "minecraft:arrow:25", + "minecraft:arrow:26", + "minecraft:arrow:27", + "minecraft:arrow:28", + "minecraft:arrow:29", + "minecraft:arrow:30", + "minecraft:arrow:31", + "minecraft:arrow:32", + "minecraft:arrow:33", + "minecraft:arrow:34", + "minecraft:arrow:35", + "minecraft:arrow:36", + "minecraft:arrow:37", + "minecraft:arrow:38", + "minecraft:arrow:39", + "minecraft:arrow:40", + "minecraft:arrow:41", + "minecraft:arrow:42", + "minecraft:arrow:43", + "minecraft:arrow:44", + "minecraft:arrow:45", + "minecraft:arrow:46", + "minecraft:arrow:47" + ] + }, + { + "items" : [ "minecraft:shield" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:cooked_chicken", + "name" : "minecraft:itemGroup.name.cookedFood" + }, + "items" : [ + "minecraft:cooked_chicken", + "minecraft:cooked_porkchop", + "minecraft:cooked_beef", + "minecraft:cooked_mutton", + "minecraft:cooked_rabbit", + "minecraft:cooked_cod", + "minecraft:cooked_salmon" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:bread", + "name" : "minecraft:itemGroup.name.miscFood" + }, + "items" : [ + "minecraft:bread", + "minecraft:mushroom_stew", + "minecraft:beetroot_soup", + "minecraft:rabbit_stew", + "minecraft:baked_potato", + "minecraft:cookie", + "minecraft:pumpkin_pie", + "minecraft:cake", + "minecraft:dried_kelp" + ] + }, + { + "items" : [ + "minecraft:fishing_rod", + "minecraft:carrot_on_a_stick", + "minecraft:warped_fungus_on_a_stick", + "minecraft:snowball", + "minecraft:wind_charge", + "minecraft:shears", + "minecraft:flint_and_steel", + "minecraft:lead", + "minecraft:clock", + "minecraft:compass", + "minecraft:recovery_compass" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:goat_horn", + "name" : "minecraft:itemGroup.name.goatHorn" + }, + "items" : [ + "minecraft:goat_horn", + "minecraft:goat_horn:1", + "minecraft:goat_horn:2", + "minecraft:goat_horn:3", + "minecraft:goat_horn:4", + "minecraft:goat_horn:5", + "minecraft:goat_horn:6", + "minecraft:goat_horn:7" + ] + }, + { + "items" : [ "minecraft:empty_map", "minecraft:empty_map:2", "minecraft:saddle" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:bundle", + "name" : "minecraft:itemGroup.name.bundles" + }, + "items" : [ + "minecraft:bundle", + "minecraft:white_bundle", + "minecraft:light_gray_bundle", + "minecraft:gray_bundle", + "minecraft:black_bundle", + "minecraft:brown_bundle", + "minecraft:red_bundle", + "minecraft:orange_bundle", + "minecraft:yellow_bundle", + "minecraft:lime_bundle", + "minecraft:green_bundle", + "minecraft:cyan_bundle", + "minecraft:light_blue_bundle", + "minecraft:blue_bundle", + "minecraft:purple_bundle", + "minecraft:magenta_bundle", + "minecraft:pink_bundle" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:leather_horse_armor", + "name" : "minecraft:itemGroup.name.horseArmor" + }, + "items" : [ + "minecraft:leather_horse_armor", + "minecraft:iron_horse_armor", + "minecraft:golden_horse_armor", + "minecraft:diamond_horse_armor" + ] + }, + { + "items" : [ + "minecraft:wolf_armor", + "minecraft:trident", + "minecraft:turtle_helmet", + "minecraft:elytra", + "minecraft:totem_of_undying", + "minecraft:glass_bottle", + "minecraft:experience_bottle" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:potion", + "name" : "minecraft:itemGroup.name.potion" + }, + "items" : [ + "minecraft:potion", + "minecraft:potion:1", + "minecraft:potion:2", + "minecraft:potion:3", + "minecraft:potion:4", + "minecraft:potion:5", + "minecraft:potion:6", + "minecraft:potion:7", + "minecraft:potion:8", + "minecraft:potion:9", + "minecraft:potion:10", + "minecraft:potion:11", + "minecraft:potion:12", + "minecraft:potion:13", + "minecraft:potion:14", + "minecraft:potion:15", + "minecraft:potion:16", + "minecraft:potion:17", + "minecraft:potion:18", + "minecraft:potion:19", + "minecraft:potion:20", + "minecraft:potion:21", + "minecraft:potion:22", + "minecraft:potion:23", + "minecraft:potion:24", + "minecraft:potion:25", + "minecraft:potion:26", + "minecraft:potion:27", + "minecraft:potion:28", + "minecraft:potion:29", + "minecraft:potion:30", + "minecraft:potion:31", + "minecraft:potion:32", + "minecraft:potion:33", + "minecraft:potion:34", + "minecraft:potion:35", + "minecraft:potion:36", + "minecraft:potion:37", + "minecraft:potion:38", + "minecraft:potion:39", + "minecraft:potion:40", + "minecraft:potion:41", + "minecraft:potion:42", + "minecraft:potion:43", + "minecraft:potion:44", + "minecraft:potion:45", + "minecraft:potion:46" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:splash_potion", + "name" : "minecraft:itemGroup.name.splashPotion" + }, + "items" : [ + "minecraft:splash_potion", + "minecraft:splash_potion:1", + "minecraft:splash_potion:2", + "minecraft:splash_potion:3", + "minecraft:splash_potion:4", + "minecraft:splash_potion:5", + "minecraft:splash_potion:6", + "minecraft:splash_potion:7", + "minecraft:splash_potion:8", + "minecraft:splash_potion:9", + "minecraft:splash_potion:10", + "minecraft:splash_potion:11", + "minecraft:splash_potion:12", + "minecraft:splash_potion:13", + "minecraft:splash_potion:14", + "minecraft:splash_potion:15", + "minecraft:splash_potion:16", + "minecraft:splash_potion:17", + "minecraft:splash_potion:18", + "minecraft:splash_potion:19", + "minecraft:splash_potion:20", + "minecraft:splash_potion:21", + "minecraft:splash_potion:22", + "minecraft:splash_potion:23", + "minecraft:splash_potion:24", + "minecraft:splash_potion:25", + "minecraft:splash_potion:26", + "minecraft:splash_potion:27", + "minecraft:splash_potion:28", + "minecraft:splash_potion:29", + "minecraft:splash_potion:30", + "minecraft:splash_potion:31", + "minecraft:splash_potion:32", + "minecraft:splash_potion:33", + "minecraft:splash_potion:34", + "minecraft:splash_potion:35", + "minecraft:splash_potion:36", + "minecraft:splash_potion:37", + "minecraft:splash_potion:38", + "minecraft:splash_potion:39", + "minecraft:splash_potion:40", + "minecraft:splash_potion:41", + "minecraft:splash_potion:42", + "minecraft:splash_potion:43", + "minecraft:splash_potion:44", + "minecraft:splash_potion:45", + "minecraft:splash_potion:46" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:lingering_potion", + "name" : "minecraft:itemGroup.name.lingeringPotion" + }, + "items" : [ + "minecraft:lingering_potion", + "minecraft:lingering_potion:1", + "minecraft:lingering_potion:2", + "minecraft:lingering_potion:3", + "minecraft:lingering_potion:4", + "minecraft:lingering_potion:5", + "minecraft:lingering_potion:6", + "minecraft:lingering_potion:7", + "minecraft:lingering_potion:8", + "minecraft:lingering_potion:9", + "minecraft:lingering_potion:10", + "minecraft:lingering_potion:11", + "minecraft:lingering_potion:12", + "minecraft:lingering_potion:13", + "minecraft:lingering_potion:14", + "minecraft:lingering_potion:15", + "minecraft:lingering_potion:16", + "minecraft:lingering_potion:17", + "minecraft:lingering_potion:18", + "minecraft:lingering_potion:19", + "minecraft:lingering_potion:20", + "minecraft:lingering_potion:21", + "minecraft:lingering_potion:22", + "minecraft:lingering_potion:23", + "minecraft:lingering_potion:24", + "minecraft:lingering_potion:25", + "minecraft:lingering_potion:26", + "minecraft:lingering_potion:27", + "minecraft:lingering_potion:28", + "minecraft:lingering_potion:29", + "minecraft:lingering_potion:30", + "minecraft:lingering_potion:31", + "minecraft:lingering_potion:32", + "minecraft:lingering_potion:33", + "minecraft:lingering_potion:34", + "minecraft:lingering_potion:35", + "minecraft:lingering_potion:36", + "minecraft:lingering_potion:37", + "minecraft:lingering_potion:38", + "minecraft:lingering_potion:39", + "minecraft:lingering_potion:40", + "minecraft:lingering_potion:41", + "minecraft:lingering_potion:42", + "minecraft:lingering_potion:43", + "minecraft:lingering_potion:44", + "minecraft:lingering_potion:45", + "minecraft:lingering_potion:46" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:ominous_bottle", + "name" : "minecraft:itemGroup.name.ominousBottle" + }, + "items" : [ + "minecraft:ominous_bottle", + "minecraft:ominous_bottle:1", + "minecraft:ominous_bottle:2", + "minecraft:ominous_bottle:3", + "minecraft:ominous_bottle:4" + ] + }, + { + "items" : [ "minecraft:spyglass", "minecraft:brush" ] + } + ] + }, + { + "category_name" : "items", + "groups" : [ + { + "items" : [ "minecraft:stick" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:bed", + "name" : "minecraft:itemGroup.name.bed" + }, + "items" : [ + "minecraft:bed", + "minecraft:bed:8", + "minecraft:bed:7", + "minecraft:bed:15", + "minecraft:bed:12", + "minecraft:bed:14", + "minecraft:bed:1", + "minecraft:bed:4", + "minecraft:bed:5", + "minecraft:bed:13", + "minecraft:bed:9", + "minecraft:bed:3", + "minecraft:bed:11", + "minecraft:bed:10", + "minecraft:bed:2", + "minecraft:bed:6" + ] + }, + { + "items" : [ + "minecraft:torch", + "minecraft:soul_torch", + "minecraft:sea_pickle", + "minecraft:lantern", + "minecraft:soul_lantern" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:candle", + "name" : "minecraft:itemGroup.name.candles" + }, + "items" : [ + "minecraft:candle", + "minecraft:white_candle", + "minecraft:orange_candle", + "minecraft:magenta_candle", + "minecraft:light_blue_candle", + "minecraft:yellow_candle", + "minecraft:lime_candle", + "minecraft:pink_candle", + "minecraft:gray_candle", + "minecraft:light_gray_candle", + "minecraft:cyan_candle", + "minecraft:purple_candle", + "minecraft:blue_candle", + "minecraft:brown_candle", + "minecraft:green_candle", + "minecraft:red_candle", + "minecraft:black_candle" + ] + }, + { + "items" : [ + "minecraft:crafting_table", + "minecraft:cartography_table", + "minecraft:fletching_table", + "minecraft:smithing_table", + "minecraft:beehive", + "minecraft:suspicious_sand", + "minecraft:suspicious_gravel", + "minecraft:campfire", + "minecraft:soul_campfire", + "minecraft:furnace", + "minecraft:blast_furnace", + "minecraft:smoker", + "minecraft:respawn_anchor", + "minecraft:brewing_stand" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:anvil", + "name" : "minecraft:itemGroup.name.anvil" + }, + "items" : [ + "minecraft:anvil", + "minecraft:chipped_anvil", + "minecraft:damaged_anvil" + ] + }, + { + "items" : [ + "minecraft:grindstone", + "minecraft:enchanting_table", + "minecraft:bookshelf", + "minecraft:chiseled_bookshelf", + "minecraft:lectern", + "minecraft:cauldron", + "minecraft:composter" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:chest", + "name" : "minecraft:itemGroup.name.chest" + }, + "items" : [ "minecraft:chest", "minecraft:trapped_chest", "minecraft:ender_chest" ] + }, + { + "items" : [ "minecraft:barrel" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:undyed_shulker_box", + "name" : "minecraft:itemGroup.name.shulkerBox" + }, + "items" : [ + "minecraft:undyed_shulker_box", + "minecraft:white_shulker_box", + "minecraft:light_gray_shulker_box", + "minecraft:gray_shulker_box", + "minecraft:black_shulker_box", + "minecraft:brown_shulker_box", + "minecraft:red_shulker_box", + "minecraft:orange_shulker_box", + "minecraft:yellow_shulker_box", + "minecraft:lime_shulker_box", + "minecraft:green_shulker_box", + "minecraft:cyan_shulker_box", + "minecraft:light_blue_shulker_box", + "minecraft:blue_shulker_box", + "minecraft:purple_shulker_box", + "minecraft:magenta_shulker_box", + "minecraft:pink_shulker_box" + ] + }, + { + "items" : [ "minecraft:armor_stand", "minecraft:noteblock", "minecraft:jukebox" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:music_disc_13", + "name" : "minecraft:itemGroup.name.record" + }, + "items" : [ + "minecraft:music_disc_13", + "minecraft:music_disc_cat", + "minecraft:music_disc_blocks", + "minecraft:music_disc_chirp", + "minecraft:music_disc_far", + "minecraft:music_disc_mall", + "minecraft:music_disc_mellohi", + "minecraft:music_disc_stal", + "minecraft:music_disc_strad", + "minecraft:music_disc_ward", + "minecraft:music_disc_11", + "minecraft:music_disc_wait", + "minecraft:music_disc_otherside", + "minecraft:music_disc_5", + "minecraft:music_disc_pigstep", + "minecraft:music_disc_relic", + "minecraft:music_disc_creator", + "minecraft:music_disc_creator_music_box", + "minecraft:music_disc_precipice" + ] + }, + { + "items" : [ + "minecraft:disc_fragment_5", + "minecraft:glowstone_dust", + "minecraft:glowstone", + "minecraft:redstone_lamp", + "minecraft:sea_lantern" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:oak_sign", + "name" : "minecraft:itemGroup.name.sign" + }, + "items" : [ + "minecraft:oak_sign", + "minecraft:spruce_sign", + "minecraft:birch_sign", + "minecraft:jungle_sign", + "minecraft:acacia_sign", + "minecraft:dark_oak_sign", + "minecraft:mangrove_sign", + "minecraft:cherry_sign", + "minecraft:pale_oak_sign", + "minecraft:bamboo_sign", + "minecraft:crimson_sign", + "minecraft:warped_sign" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:oak_hanging_sign", + "name" : "minecraft:itemGroup.name.hanging_sign" + }, + "items" : [ + "minecraft:oak_hanging_sign", + "minecraft:spruce_hanging_sign", + "minecraft:birch_hanging_sign", + "minecraft:jungle_hanging_sign", + "minecraft:acacia_hanging_sign", + "minecraft:dark_oak_hanging_sign", + "minecraft:mangrove_hanging_sign", + "minecraft:cherry_hanging_sign", + "minecraft:pale_oak_hanging_sign", + "minecraft:bamboo_hanging_sign", + "minecraft:crimson_hanging_sign", + "minecraft:warped_hanging_sign" + ] + }, + { + "items" : [ + "minecraft:painting", + "minecraft:frame", + "minecraft:glow_frame", + "minecraft:honey_bottle", + "minecraft:flower_pot", + "minecraft:bowl", + "minecraft:bucket", + "minecraft:milk_bucket", + "minecraft:water_bucket", + "minecraft:lava_bucket", + "minecraft:cod_bucket", + "minecraft:salmon_bucket", + "minecraft:tropical_fish_bucket", + "minecraft:pufferfish_bucket", + "minecraft:powder_snow_bucket", + "minecraft:axolotl_bucket", + "minecraft:tadpole_bucket" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:creeper_head", + "name" : "minecraft:itemGroup.name.skull" + }, + "items" : [ + "minecraft:player_head", + "minecraft:zombie_head", + "minecraft:creeper_head", + "minecraft:dragon_head", + "minecraft:skeleton_skull", + "minecraft:wither_skeleton_skull", + "minecraft:piglin_head" + ] + }, + { + "items" : [ + "minecraft:beacon", + "minecraft:bell", + "minecraft:conduit", + "minecraft:stonecutter_block", + "minecraft:coal", + "minecraft:charcoal", + "minecraft:diamond", + "minecraft:iron_nugget", + "minecraft:raw_iron", + "minecraft:raw_gold", + "minecraft:raw_copper", + "minecraft:copper_ingot", + "minecraft:iron_ingot", + "minecraft:netherite_scrap", + "minecraft:netherite_ingot", + "minecraft:gold_nugget", + "minecraft:gold_ingot", + "minecraft:emerald", + "minecraft:quartz", + "minecraft:clay_ball", + "minecraft:brick", + "minecraft:netherbrick", + "minecraft:resin_brick", + "minecraft:prismarine_shard", + "minecraft:amethyst_shard", + "minecraft:prismarine_crystals", + "minecraft:nautilus_shell", + "minecraft:heart_of_the_sea", + "minecraft:turtle_scute", + "minecraft:armadillo_scute", + "minecraft:phantom_membrane", + "minecraft:string", + "minecraft:feather", + "minecraft:flint", + "minecraft:gunpowder", + "minecraft:leather", + "minecraft:rabbit_hide", + "minecraft:rabbit_foot", + "minecraft:fire_charge", + "minecraft:blaze_rod", + "minecraft:breeze_rod", + "minecraft:heavy_core", + "minecraft:blaze_powder", + "minecraft:magma_cream", + "minecraft:fermented_spider_eye", + "minecraft:echo_shard", + "minecraft:dragon_breath", + "minecraft:shulker_shell", + "minecraft:ghast_tear", + "minecraft:slime_ball", + "minecraft:ender_pearl", + "minecraft:ender_eye", + "minecraft:nether_star", + "minecraft:end_rod", + "minecraft:lightning_rod", + "minecraft:end_crystal", + "minecraft:paper", + "minecraft:book", + "minecraft:writable_book" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:oak_boat", + "name" : "minecraft:itemGroup.name.boat" + }, + "items" : [ + "minecraft:oak_boat", + "minecraft:spruce_boat", + "minecraft:birch_boat", + "minecraft:jungle_boat", + "minecraft:acacia_boat", + "minecraft:dark_oak_boat", + "minecraft:mangrove_boat", + "minecraft:cherry_boat", + "minecraft:pale_oak_boat", + "minecraft:bamboo_raft" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:oak_chest_boat", + "name" : "minecraft:itemGroup.name.chestboat" + }, + "items" : [ + "minecraft:oak_chest_boat", + "minecraft:spruce_chest_boat", + "minecraft:birch_chest_boat", + "minecraft:jungle_chest_boat", + "minecraft:acacia_chest_boat", + "minecraft:dark_oak_chest_boat", + "minecraft:mangrove_chest_boat", + "minecraft:cherry_chest_boat", + "minecraft:pale_oak_chest_boat", + "minecraft:bamboo_chest_raft" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:rail", + "name" : "minecraft:itemGroup.name.rail" + }, + "items" : [ + "minecraft:rail", + "minecraft:golden_rail", + "minecraft:detector_rail", + "minecraft:activator_rail" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:minecart", + "name" : "minecraft:itemGroup.name.minecart" + }, + "items" : [ + "minecraft:minecart", + "minecraft:chest_minecart", + "minecraft:hopper_minecart", + "minecraft:tnt_minecart" + ] + }, + { + "items" : [ + "minecraft:redstone", + "minecraft:redstone_block", + "minecraft:redstone_torch", + "minecraft:lever" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:wooden_button", + "name" : "minecraft:itemGroup.name.buttons" + }, + "items" : [ + "minecraft:wooden_button", + "minecraft:spruce_button", + "minecraft:birch_button", + "minecraft:jungle_button", + "minecraft:acacia_button", + "minecraft:dark_oak_button", + "minecraft:mangrove_button", + "minecraft:cherry_button", + "minecraft:pale_oak_button", + "minecraft:bamboo_button", + "minecraft:stone_button", + "minecraft:crimson_button", + "minecraft:warped_button", + "minecraft:polished_blackstone_button" + ] + }, + { + "items" : [ "minecraft:tripwire_hook" ] + }, + { + "group_identifier" : { + "icon" : "minecraft:wooden_pressure_plate", + "name" : "minecraft:itemGroup.name.pressurePlate" + }, + "items" : [ + "minecraft:wooden_pressure_plate", + "minecraft:spruce_pressure_plate", + "minecraft:birch_pressure_plate", + "minecraft:jungle_pressure_plate", + "minecraft:acacia_pressure_plate", + "minecraft:dark_oak_pressure_plate", + "minecraft:mangrove_pressure_plate", + "minecraft:cherry_pressure_plate", + "minecraft:pale_oak_pressure_plate", + "minecraft:bamboo_pressure_plate", + "minecraft:crimson_pressure_plate", + "minecraft:warped_pressure_plate", + "minecraft:stone_pressure_plate", + "minecraft:light_weighted_pressure_plate", + "minecraft:heavy_weighted_pressure_plate", + "minecraft:polished_blackstone_pressure_plate" + ] + }, + { + "items" : [ + "minecraft:observer", + "minecraft:daylight_detector", + "minecraft:repeater", + "minecraft:comparator", + "minecraft:hopper", + "minecraft:dropper:3", + "minecraft:dispenser:3", + "minecraft:crafter", + "minecraft:piston:1", + "minecraft:sticky_piston:1", + "minecraft:tnt", + "minecraft:name_tag", + "minecraft:loom" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:creeper_banner_pattern", + "name" : "minecraft:itemGroup.name.banner_pattern" + }, + "items" : [ + "minecraft:creeper_banner_pattern", + "minecraft:skull_banner_pattern", + "minecraft:flower_banner_pattern", + "minecraft:mojang_banner_pattern", + "minecraft:field_masoned_banner_pattern", + "minecraft:bordure_indented_banner_pattern", + "minecraft:piglin_banner_pattern", + "minecraft:globe_banner_pattern", + "minecraft:flow_banner_pattern", + "minecraft:guster_banner_pattern" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:archer_pottery_sherd", + "name" : "minecraft:itemGroup.name.potterySherds" + }, + "items" : [ + "minecraft:angler_pottery_sherd", + "minecraft:archer_pottery_sherd", + "minecraft:arms_up_pottery_sherd", + "minecraft:blade_pottery_sherd", + "minecraft:brewer_pottery_sherd", + "minecraft:burn_pottery_sherd", + "minecraft:danger_pottery_sherd", + "minecraft:explorer_pottery_sherd", + "minecraft:flow_pottery_sherd", + "minecraft:friend_pottery_sherd", + "minecraft:guster_pottery_sherd", + "minecraft:heart_pottery_sherd", + "minecraft:heartbreak_pottery_sherd", + "minecraft:howl_pottery_sherd", + "minecraft:miner_pottery_sherd", + "minecraft:mourner_pottery_sherd", + "minecraft:plenty_pottery_sherd", + "minecraft:prize_pottery_sherd", + "minecraft:scrape_pottery_sherd", + "minecraft:sheaf_pottery_sherd", + "minecraft:shelter_pottery_sherd", + "minecraft:skull_pottery_sherd", + "minecraft:snort_pottery_sherd" + ] + }, + { + "group_identifier" : { + "icon" : "minecraft:netherite_upgrade_smithing_template", + "name" : "minecraft:itemGroup.name.smithing_templates" + }, + "items" : [ + "minecraft:netherite_upgrade_smithing_template", + "minecraft:sentry_armor_trim_smithing_template", + "minecraft:vex_armor_trim_smithing_template", + "minecraft:wild_armor_trim_smithing_template", + "minecraft:coast_armor_trim_smithing_template", + "minecraft:dune_armor_trim_smithing_template", + "minecraft:wayfinder_armor_trim_smithing_template", + "minecraft:shaper_armor_trim_smithing_template", + "minecraft:raiser_armor_trim_smithing_template", + "minecraft:host_armor_trim_smithing_template", + "minecraft:ward_armor_trim_smithing_template", + "minecraft:silence_armor_trim_smithing_template", + "minecraft:tide_armor_trim_smithing_template", + "minecraft:snout_armor_trim_smithing_template", + "minecraft:rib_armor_trim_smithing_template", + "minecraft:eye_armor_trim_smithing_template", + "minecraft:spire_armor_trim_smithing_template", + "minecraft:flow_armor_trim_smithing_template", + "minecraft:bolt_armor_trim_smithing_template" + ] + }, + { + "items" : [ + "minecraft:chain", + "minecraft:target", + "minecraft:decorated_pot", + "minecraft:trial_key", + "minecraft:ominous_trial_key" + ] + } + ] + } + ] + } } diff --git a/behavior_pack/loot_tables/chests/ruined_portal.json b/behavior_pack/loot_tables/chests/ruined_portal.json index a5764c7..09cf2e7 100644 --- a/behavior_pack/loot_tables/chests/ruined_portal.json +++ b/behavior_pack/loot_tables/chests/ruined_portal.json @@ -249,6 +249,29 @@ "weight": 1 } ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "empty", + "weight": 1 + }, + { + "type": "item", + "name": "minecraft:lodestone", + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 2 + } + } + ], + "weight": 2 + } + ] } ] } \ No newline at end of file diff --git a/behavior_pack/loot_tables/chests/village/village_bundle.json b/behavior_pack/loot_tables/chests/village/village_bundle.json new file mode 100644 index 0000000..8f5363b --- /dev/null +++ b/behavior_pack/loot_tables/chests/village/village_bundle.json @@ -0,0 +1,18 @@ +{ + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "empty", + "weight": 2 + }, + { + "type": "item", + "name": "minecraft:bundle", + "weight": 1 + } + ] + } + ] +} \ No newline at end of file diff --git a/behavior_pack/loot_tables/chests/village/village_cartographer.json b/behavior_pack/loot_tables/chests/village/village_cartographer.json index 73c14fe..a247421 100644 --- a/behavior_pack/loot_tables/chests/village/village_cartographer.json +++ b/behavior_pack/loot_tables/chests/village/village_cartographer.json @@ -68,6 +68,15 @@ "name": "minecraft:oak_sapling" } ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "loot_table", + "name": "loot_tables/chests/village/village_bundle.json" + } + ] } ] } \ No newline at end of file diff --git a/behavior_pack/loot_tables/chests/village/village_desert_house.json b/behavior_pack/loot_tables/chests/village/village_desert_house.json index 0f3bfaf..d3c2294 100644 --- a/behavior_pack/loot_tables/chests/village/village_desert_house.json +++ b/behavior_pack/loot_tables/chests/village/village_desert_house.json @@ -94,6 +94,15 @@ "name": "minecraft:emerald" } ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "loot_table", + "name": "loot_tables/chests/village/village_bundle.json" + } + ] } ] } \ No newline at end of file diff --git a/behavior_pack/loot_tables/chests/village/village_plains_house.json b/behavior_pack/loot_tables/chests/village/village_plains_house.json index a2d3b50..cb40995 100644 --- a/behavior_pack/loot_tables/chests/village/village_plains_house.json +++ b/behavior_pack/loot_tables/chests/village/village_plains_house.json @@ -108,6 +108,15 @@ "name": "minecraft:oak_sapling" } ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "loot_table", + "name": "loot_tables/chests/village/village_bundle.json" + } + ] } ] } \ No newline at end of file diff --git a/behavior_pack/loot_tables/chests/village/village_savanna_house.json b/behavior_pack/loot_tables/chests/village/village_savanna_house.json index 4fa4d9b..b92653c 100644 --- a/behavior_pack/loot_tables/chests/village/village_savanna_house.json +++ b/behavior_pack/loot_tables/chests/village/village_savanna_house.json @@ -108,6 +108,15 @@ "name": "minecraft:bucket" } ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "loot_table", + "name": "loot_tables/chests/village/village_bundle.json" + } + ] } ] } \ No newline at end of file diff --git a/behavior_pack/loot_tables/chests/village/village_snowy_house.json b/behavior_pack/loot_tables/chests/village/village_snowy_house.json index 6fa1e7a..261a854 100644 --- a/behavior_pack/loot_tables/chests/village/village_snowy_house.json +++ b/behavior_pack/loot_tables/chests/village/village_snowy_house.json @@ -108,6 +108,15 @@ "name": "minecraft:coal" } ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "loot_table", + "name": "loot_tables/chests/village/village_bundle.json" + } + ] } ] } \ No newline at end of file diff --git a/behavior_pack/loot_tables/chests/village/village_taiga_house.json b/behavior_pack/loot_tables/chests/village/village_taiga_house.json index c3441c6..b5da9be 100644 --- a/behavior_pack/loot_tables/chests/village/village_taiga_house.json +++ b/behavior_pack/loot_tables/chests/village/village_taiga_house.json @@ -128,6 +128,15 @@ "name": "minecraft:spruce_log" } ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "loot_table", + "name": "loot_tables/chests/village/village_bundle.json" + } + ] } ] } \ No newline at end of file diff --git a/behavior_pack/loot_tables/chests/village/village_tannery.json b/behavior_pack/loot_tables/chests/village/village_tannery.json index bfc0bf1..ecedb4f 100644 --- a/behavior_pack/loot_tables/chests/village/village_tannery.json +++ b/behavior_pack/loot_tables/chests/village/village_tannery.json @@ -71,6 +71,15 @@ "name": "minecraft:emerald" } ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "loot_table", + "name": "loot_tables/chests/village/village_bundle.json" + } + ] } ] } \ No newline at end of file diff --git a/behavior_pack/loot_tables/chests/village/village_weaponsmith.json b/behavior_pack/loot_tables/chests/village/village_weaponsmith.json index 4010c55..66b0a93 100644 --- a/behavior_pack/loot_tables/chests/village/village_weaponsmith.json +++ b/behavior_pack/loot_tables/chests/village/village_weaponsmith.json @@ -152,6 +152,15 @@ "name": "minecraft:horsearmordiamond" } ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "loot_table", + "name": "loot_tables/chests/village/village_bundle.json" + } + ] } ] } \ No newline at end of file diff --git a/behavior_pack/recipes/cake.json b/behavior_pack/recipes/cake.json index a492272..83ac43c 100644 --- a/behavior_pack/recipes/cake.json +++ b/behavior_pack/recipes/cake.json @@ -24,12 +24,12 @@ "item": "minecraft:wheat" }, "E": { - "item": "minecraft:egg" + "tag": "minecraft:egg" } }, "unlock": [ { - "item": "minecraft:egg" + "tag": "minecraft:egg" } ], "result": [ diff --git a/behavior_pack/recipes/lodestone.json b/behavior_pack/recipes/lodestone.json index 208464d..664b4b6 100644 --- a/behavior_pack/recipes/lodestone.json +++ b/behavior_pack/recipes/lodestone.json @@ -1,5 +1,5 @@ { - "format_version": "1.20.10", + "format_version": "1.21.60", "minecraft:recipe_shaped": { "description": { "identifier": "minecraft:lodestone" @@ -17,12 +17,12 @@ "item": "minecraft:chiseled_stone_bricks" }, "#": { - "item": "minecraft:netherite_ingot" + "item": "minecraft:iron_ingot" } }, "unlock": [ { - "item": "minecraft:netherite_ingot" + "item": "minecraft:iron_ingot" } ], "result": { diff --git a/behavior_pack/recipes/pumpkin_pie.json b/behavior_pack/recipes/pumpkin_pie.json index 28045d8..facdc77 100644 --- a/behavior_pack/recipes/pumpkin_pie.json +++ b/behavior_pack/recipes/pumpkin_pie.json @@ -15,7 +15,7 @@ "item": "minecraft:sugar" }, { - "item": "minecraft:egg" + "tag": "minecraft:egg" } ], "unlock": [ diff --git a/behavior_pack/spawn_rules/camel.json b/behavior_pack/spawn_rules/camel.json new file mode 100644 index 0000000..4481e6a --- /dev/null +++ b/behavior_pack/spawn_rules/camel.json @@ -0,0 +1,35 @@ +{ + "format_version": "1.8.0", + "minecraft:spawn_rules": { + "description": { + "identifier": "minecraft:camel", + "population_control": "animal" + }, + "conditions": [ + { + "minecraft:spawns_on_surface": {}, + "minecraft:spawns_on_block_filter": [ + "minecraft:sand", + "minecraft:red_sand", + "minecraft:sandstone" + ], + "minecraft:brightness_filter": { + "min": 7, + "max": 15, + "adjust_for_weather": false + }, + "minecraft:weight": { + "default": 1 + }, + "minecraft:herd": { + "min_size": 1, + "max_size": 1 + }, + "minecraft:biome_filter": { + "test": "has_biome_tag", + "value": "desert" + } + } + ] + } +} diff --git a/behavior_pack/spawn_rules/rabbit.json b/behavior_pack/spawn_rules/rabbit.json index 6116f25..e333a65 100644 --- a/behavior_pack/spawn_rules/rabbit.json +++ b/behavior_pack/spawn_rules/rabbit.json @@ -34,11 +34,34 @@ { "test": "has_biome_tag", "operator": "not", "value": "mega" } ] }, - { "test": "is_snow_covered" }, - { "test": "has_biome_tag", "value": "desert" } + { "test": "is_snow_covered" } ] } }, + { + "minecraft:spawns_on_surface": {}, + "minecraft:spawns_on_block_filter": [ + "minecraft:sand", + "minecraft:red_sand", + "minecraft:sandstone" + ], + "minecraft:brightness_filter": { + "min": 7, + "max": 15, + "adjust_for_weather": false + }, + "minecraft:weight": { + "default": 12 + }, + "minecraft:herd": { + "min_size": 2, + "max_size": 3 + }, + "minecraft:biome_filter": { + "test": "has_biome_tag", + "value": "desert" + } + }, { "minecraft:spawns_on_surface": {}, "minecraft:spawns_on_block_filter": [ @@ -61,8 +84,14 @@ }, "minecraft:biome_filter": { "any_of": [ - { "test": "has_biome_tag", "value": "flower_forest" }, - { "test": "has_biome_tag", "value": "snowy_slopes" } + { + "test": "has_biome_tag", + "value": "flower_forest" + }, + { + "test": "has_biome_tag", + "value": "snowy_slopes" + } ] } }, @@ -87,7 +116,8 @@ "max_size": 3 }, "minecraft:biome_filter": { - "test": "has_biome_tag", "value": "grove" + "test": "has_biome_tag", + "value": "grove" } }, { @@ -112,8 +142,14 @@ }, "minecraft:biome_filter": { "any_of": [ - { "test": "has_biome_tag", "value": "meadow" }, - { "test": "has_biome_tag", "value": "cherry_grove" } + { + "test": "has_biome_tag", + "value": "meadow" + }, + { + "test": "has_biome_tag", + "value": "cherry_grove" + } ] } } diff --git a/behavior_pack/trading/economy_trades/cartographer_trades.json b/behavior_pack/trading/economy_trades/cartographer_trades.json index e8abc02..994a0e9 100644 --- a/behavior_pack/trading/economy_trades/cartographer_trades.json +++ b/behavior_pack/trading/economy_trades/cartographer_trades.json @@ -4,7 +4,7 @@ "total_exp_required": 0, "groups": [ { - "num_to_select": 1, + "num_to_select": 2, "trades": [ { "wants": [ @@ -21,14 +21,9 @@ } ], "trader_exp": 2, - "max_uses": 16, + "max_uses": 12, "reward_exp": true - } - ] - }, - { - "num_to_select": 1, - "trades": [ + }, { "wants": [ { @@ -39,7 +34,7 @@ ], "gives": [ { - "item": "minecraft:emptymap:0", + "item": "minecraft:empty_map", "quantity": 1 } ], @@ -55,7 +50,7 @@ "total_exp_required": 10, "groups": [ { - "num_to_select": 1, + "num_to_select": 2, "trades": [ { "wants": [ @@ -72,35 +67,443 @@ } ], "trader_exp": 10, - "max_uses": 16, + "max_uses": 12, "reward_exp": true - } - ] - }, - { - "num_to_select": 1, - "trades": [ + }, { "wants": [ { "item": "minecraft:emerald", - "quantity": 13, - "price_multiplier": 0.2 + "quantity": 8, + "price_multiplier": 0.05 }, { "item": "minecraft:compass", - "quantity": 1, - "price_multiplier": 0.2 + "quantity": 1 } ], "gives": [ { - "item": "minecraft:map", - "filters": { "test": "in_overworld", "subject": "self", "value": true, "operator": "="}, - "functions": [ + "choice": [ { - "function": "exploration_map", - "destination": "monument" + "item": "minecraft:map", + "quantity": 1, + "functions": [ + { + "function": "exploration_map", + "destination": "village_taiga" + } + ], + "filters": { + "all_of": [ + { + "test": "in_overworld", + "subject": "self", + "value": true, + "operator": "=" + }, + { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 0, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 4, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 5, + "operator": "=" + } + ] + } + ] + } + } + ] + } + ], + "trader_exp": 5, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 8, + "price_multiplier": 0.05 + }, + { + "item": "minecraft:compass", + "quantity": 1 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:map", + "quantity": 1, + "functions": [ + { + "function": "exploration_map", + "destination": "swamp_hut" + } + ], + "filters": { + "all_of": [ + { + "test": "in_overworld", + "subject": "self", + "value": true, + "operator": "=" + }, + { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 2, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 4, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 6, + "operator": "=" + } + ] + } + ] + } + } + ] + } + ], + "trader_exp": 5, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 8, + "price_multiplier": 0.05 + }, + { + "item": "minecraft:compass", + "quantity": 1 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:map", + "quantity": 1, + "functions": [ + { + "function": "exploration_map", + "destination": "village_snowy" + } + ], + "filters": { + "all_of": [ + { + "test": "in_overworld", + "subject": "self", + "value": true, + "operator": "=" + }, + { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 5, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 6, + "operator": "=" + } + ] + } + ] + } + } + ] + } + ], + "trader_exp": 5, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 8, + "price_multiplier": 0.05 + }, + { + "item": "minecraft:compass", + "quantity": 1 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:map", + "quantity": 1, + "functions": [ + { + "function": "exploration_map", + "destination": "village_savanna" + } + ], + "filters": { + "all_of": [ + { + "test": "in_overworld", + "subject": "self", + "value": true, + "operator": "=" + }, + { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 0, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 1, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 2, + "operator": "=" + } + ] + } + ] + } + } + ] + } + ], + "trader_exp": 5, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 8, + "price_multiplier": 0.05 + }, + { + "item": "minecraft:compass", + "quantity": 1 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:map", + "quantity": 1, + "functions": [ + { + "function": "exploration_map", + "destination": "village_plains" + } + ], + "filters": { + "all_of": [ + { + "test": "in_overworld", + "subject": "self", + "value": true, + "operator": "=" + }, + { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 1, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 3, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 4, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 6, + "operator": "=" + } + ] + } + ] + } + } + ] + } + ], + "trader_exp": 5, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 8, + "price_multiplier": 0.05 + }, + { + "item": "minecraft:compass", + "quantity": 1 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:map", + "quantity": 1, + "functions": [ + { + "function": "exploration_map", + "destination": "jungle_temple" + } + ], + "filters": { + "all_of": [ + { + "test": "in_overworld", + "subject": "self", + "value": true, + "operator": "=" + }, + { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 1, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 3, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 5, + "operator": "=" + } + ] + } + ] + } + } + ] + } + ], + "trader_exp": 5, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 8, + "price_multiplier": 0.05 + }, + { + "item": "minecraft:compass", + "quantity": 1 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:map", + "quantity": 1, + "functions": [ + { + "function": "exploration_map", + "destination": "village_desert" + } + ], + "filters": { + "all_of": [ + { + "test": "in_overworld", + "subject": "self", + "value": true, + "operator": "=" + }, + { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 2, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 3, + "operator": "=" + } + ] + } + ] + } } ] } @@ -117,7 +520,7 @@ "total_exp_required": 70, "groups": [ { - "num_to_select": 1, + "num_to_select": 2, "trades": [ { "wants": [ @@ -136,74 +539,69 @@ "trader_exp": 20, "max_uses": 12, "reward_exp": true - } - ] - }, - { - "num_to_select": 1, - "trades": [ + }, { "wants": [ { "item": "minecraft:emerald", - "quantity": 14, - "price_multiplier": 0.2 + "quantity": 13, + "price_multiplier": 0.05 }, { "item": "minecraft:compass", - "quantity": 1, - "price_multiplier": 0.2 + "quantity": 1 } ], "gives": [ { "item": "minecraft:map", - "filters": { "test": "in_overworld", "subject": "self", "value": true, "operator": "="}, + "quantity": 1, "functions": [ { "function": "exploration_map", - "destination": "mansion" + "destination": "monument" } - ] + ], + "filters": { + "test": "in_overworld", + "subject": "self", + "value": true, + "operator": "=" + } } ], "trader_exp": 10, "max_uses": 12, "reward_exp": true - } - ] - }, - { - "num_to_select": 1, - "trades": [ + }, { "wants": [ { "item": "minecraft:emerald", "quantity": 12, - "price_multiplier": 0.2 + "price_multiplier": 0.05 }, { "item": "minecraft:compass", - "quantity": 1, - "price_multiplier": 0.2 + "quantity": 1 } ], "gives": [ { "item": "minecraft:map", - "filters": { - "test": "in_overworld", - "subject": "self", - "value": true, - "operator": "=" - }, + "quantity": 1, "functions": [ { "function": "exploration_map", "destination": "trial_chambers" } - ] + ], + "filters": { + "test": "in_overworld", + "subject": "self", + "value": true, + "operator": "=" + } } ], "trader_exp": 10, @@ -218,7 +616,7 @@ "total_exp_required": 150, "groups": [ { - "num_to_select": 1, + "num_to_select": 2, "trades": [ { "wants": [ @@ -237,30 +635,544 @@ "trader_exp": 15, "max_uses": 12, "reward_exp": true - } - ] - }, - { - "num_to_select": 1, - "trades": [ + }, { "wants": [ { "item": "minecraft:emerald", - "quantity": 3, + "quantity": 2, "price_multiplier": 0.05 } ], "gives": [ { - "item": "minecraft:banner", - "quantity": 1, - "functions": [ + "choice": [ + { + "item": "minecraft:banner:4", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 4, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 6, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:15", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 0, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 4, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:1", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 3, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 4, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:2", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 1, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 2, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 3, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:10", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 1, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 6, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:5", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 5, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 6, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:6", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 1, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 4, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:11", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 0, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 2, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:14", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 1, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 3, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ { - "function": "random_aux_value", - "values": { - "min": 0, - "max": 15 + "item": "minecraft:banner:3", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 0, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 2, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:13", + "quantity": 1, + "filters": { + "test": "is_mark_variant", + "subject": "self", + "value": 3, + "operator": "=" + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:12", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 4, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 5, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:9", + "quantity": 1, + "filters": { + "any_of": [ + { + "test": "is_mark_variant", + "subject": "self", + "value": 0, + "operator": "=" + }, + { + "test": "is_mark_variant", + "subject": "self", + "value": 6, + "operator": "=" + } + ] + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner:8", + "quantity": 1, + "filters": { + "test": "is_mark_variant", + "subject": "self", + "value": 1, + "operator": "=" + } + } + ] + } + ], + "trader_exp": 15, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2, + "price_multiplier": 0.05 + } + ], + "gives": [ + { + "choice": [ + { + "item": "minecraft:banner", + "quantity": 1, + "filters": { + "test": "is_mark_variant", + "subject": "self", + "value": 5, + "operator": "=" } } ] @@ -278,7 +1190,7 @@ "total_exp_required": 250, "groups": [ { - "num_to_select": 1, + "num_to_select": 2, "trades": [ { "wants": [ @@ -290,10 +1202,44 @@ ], "gives": [ { - "item": "minecraft:banner_pattern:7", + "item": "minecraft:globe_banner_pattern", + "quantity": 1 + } + ], + "trader_exp": 30, + "max_uses": 12, + "reward_exp": true + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 14, + "price_multiplier": 0.05 + }, + { + "item": "minecraft:compass", "quantity": 1 } ], + "gives": [ + { + "item": "minecraft:map", + "quantity": 1, + "functions": [ + { + "function": "exploration_map", + "destination": "mansion" + } + ], + "filters": { + "test": "in_overworld", + "subject": "self", + "value": true, + "operator": "=" + } + } + ], "trader_exp": 30, "max_uses": 12, "reward_exp": true @@ -303,5 +1249,4 @@ ] } ] - } - \ No newline at end of file + } \ No newline at end of file diff --git a/behavior_pack/trading/economy_trades/wandering_trader_trades.json b/behavior_pack/trading/economy_trades/wandering_trader_trades.json index 9db519f..410e5dc 100644 --- a/behavior_pack/trading/economy_trades/wandering_trader_trades.json +++ b/behavior_pack/trading/economy_trades/wandering_trader_trades.json @@ -3,66 +3,797 @@ { "groups": [ { - "num_to_select": 5, + "num_to_select": 2, + "trades": [ + { + "wants": [ + { + "item": "minecraft:potion:0", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "max_uses": 2 + }, + { + "wants": [ + { + "item": "minecraft:water_bucket", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:emerald", + "quantity": 2 + } + ], + "max_uses": 2 + }, + { + "wants": [ + { + "item": "minecraft:milk_bucket", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:emerald", + "quantity": 2 + } + ], + "max_uses": 2 + }, + { + "wants": [ + { + "item": "minecraft:fermented_spider_eye", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:emerald", + "quantity": 3 + } + ], + "max_uses": 2 + }, + { + "wants": [ + { + "item": "minecraft:baked_potato", + "quantity": 4 + } + ], + "gives": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "max_uses": 2 + }, + { + "wants": [ + { + "item": "minecraft:hay_block", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "max_uses": 2 + } + ] + }, + { + "num_to_select": 2, "trades": [ { - "max_uses": 5, "wants": [ { "item": "minecraft:emerald", - "quantity": 2 + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:packed_ice", + "quantity": 1 + } + ], + "max_uses": 6 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 6 + } + ], + "gives": [ + { + "item": "minecraft:blue_ice", + "quantity": 1 + } + ], + "max_uses": 6 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:gunpowder", + "quantity": 4 + } + ], + "max_uses": 2 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 3 + } + ], + "gives": [ + { + "item": "minecraft:podzol", + "quantity": 3 + } + ], + "max_uses": 6 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:acacia_log", + "quantity": 8 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:birch_log:2", + "quantity": 8 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:dark_oak_log:1", + "quantity": 8 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:jungle_log:3", + "quantity": 8 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:oak_log", + "quantity": 8 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:spruce_log:1", + "quantity": 8 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:cherry_log", + "quantity": 8 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:pale_oak_log", + "quantity": 8 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:mangrove_log", + "quantity": 8 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1, + "price_multiplier": 0.2 + } + ], + "gives": [ + { + "item": "minecraft:iron_pickaxe", + "quantity": 1, + "functions": [ + { + "function": "enchant_with_levels", + "treasure": false, + "levels": { + "min": 5, + "max": 19 + } + } + ] + } + ], + "trader_exp": 1, + "max_uses": 1, + "reward_exp": true + }, + { + "max_uses": 1, + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 5 + } + ], + "gives": [ + { + "item": "minecraft:potion:8", + "quantity": 1 + } + ] + } + ] + }, + { + "num_to_select": 5, + "trades": [ + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 3 + } + ], + "gives": [ + { + "item": "minecraft:tropical_fish_bucket", + "quantity": 1 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 3 + } + ], + "gives": [ + { + "item": "minecraft:pufferfish_bucket", + "quantity": 1 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2 + } + ], + "gives": [ + { + "item": "minecraft:sea_pickle", + "quantity": 1 + } + ], + "max_uses": 5 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 4 + } + ], + "gives": [ + { + "item": "minecraft:slime_ball", + "quantity": 1 + } + ], + "max_uses": 5 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 2 + } + ], + "gives": [ + { + "item": "minecraft:glowstone", + "quantity": 1 + } + ], + "max_uses": 5 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 5 + } + ], + "gives": [ + { + "item": "minecraft:nautilus_shell", + "quantity": 1 + } + ], + "max_uses": 5 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:fern", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:tall_dry_grass", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:sugar_cane", + "quantity": 1 + } + ], + "max_uses": 8 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:pumpkin", + "quantity": 1 + } + ], + "max_uses": 4 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 3 + } + ], + "gives": [ + { + "item": "minecraft:kelp", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 3 + } + ], + "gives": [ + { + "item": "minecraft:cactus", + "quantity": 1 + } + ], + "max_uses": 8 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:dandelion", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:poppy", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:blue_orchid", + "quantity": 1 + } + ], + "max_uses": 8 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:allium", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:azure_bluet", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:red_tulip", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:orange_tulip", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:white_tulip", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:pink_tulip", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:oxeye_daisy", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:cornflower", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:wildflowers", + "quantity": 1 + } + ], + "max_uses": 12 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 3 + } + ], + "gives": [ + { + "item": "minecraft:firefly_bush", + "quantity": 1 + } + ], + "max_uses": 8 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 + } + ], + "gives": [ + { + "item": "minecraft:lily_of_the_valley", + "quantity": 1 + } + ], + "max_uses": 7 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 1 } ], "gives": [ { - "item": "minecraft:sea_pickle" + "item": "minecraft:open_eyeblossom", + "quantity": 1 } - ] + ], + "max_uses": 7 }, { - "max_uses": 5, "wants": [ { "item": "minecraft:emerald", - "quantity": 4 + "quantity": 1 } ], "gives": [ { - "item": "minecraft:slime_ball" + "item": "minecraft:wheat_seeds", + "quantity": 1 } - ] + ], + "max_uses": 12 }, { - "max_uses": 5, "wants": [ { "item": "minecraft:emerald", - "quantity": 2 + "quantity": 1 } ], "gives": [ { - "item": "minecraft:glowstone" + "item": "minecraft:beetroot_seeds", + "quantity": 1 } - ] + ], + "max_uses": 12 }, { - "max_uses": 5, "wants": [ { "item": "minecraft:emerald", - "quantity": 5 + "quantity": 1 } ], "gives": [ { - "item": "minecraft:nautilus_shell" + "item": "minecraft:pumpkin_seeds", + "quantity": 1 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -71,110 +802,148 @@ ], "gives": [ { - "item": "minecraft:fern" + "item": "minecraft:melon_seeds", + "quantity": 1 } - ] + ], + "max_uses": 12 }, { - "max_uses": 8, "wants": [ { "item": "minecraft:emerald", - "quantity": 1 + "quantity": 5 } ], "gives": [ { - "item": "minecraft:reeds" + "item": "minecraft:acacia_sapling", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 4, "wants": [ { "item": "minecraft:emerald", - "quantity": 1 + "quantity": 5 } ], "gives": [ { - "item": "minecraft:pumpkin" + "item": "minecraft:birch_sapling", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", - "quantity": 3 + "quantity": 5 } ], "gives": [ { - "item": "minecraft:kelp" + "item": "minecraft:dark_oak_sapling", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 8, "wants": [ { "item": "minecraft:emerald", - "quantity": 3 + "quantity": 5 } ], "gives": [ { - "item": "minecraft:cactus" + "item": "minecraft:jungle_sapling", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", - "quantity": 1 + "quantity": 5 } ], "gives": [ { - "item": "minecraft:dandelion" + "item": "minecraft:oak_sapling", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", + "quantity": 5 + } + ], + "gives": [ + { + "item": "minecraft:spruce_sapling", "quantity": 1 } ], + "max_uses": 8 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 5 + } + ], "gives": [ { - "item": "minecraft:poppy" + "item": "minecraft:cherry_sapling", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 8, "wants": [ { "item": "minecraft:emerald", + "quantity": 5 + } + ], + "gives": [ + { + "item": "minecraft:pale_oak_sapling", "quantity": 1 } ], + "max_uses": 8 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 5 + } + ], "gives": [ { - "item": "minecraft:blue_orchid" + "item": "minecraft:mangrove_propagule", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -183,12 +952,13 @@ ], "gives": [ { - "item": "minecraft:allium" + "item": "minecraft:red_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -197,12 +967,13 @@ ], "gives": [ { - "item": "minecraft:azure_bluet" + "item": "minecraft:white_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -211,12 +982,13 @@ ], "gives": [ { - "item": "minecraft:red_tulip" + "item": "minecraft:blue_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -225,12 +997,13 @@ ], "gives": [ { - "item": "minecraft:orange_tulip" + "item": "minecraft:pink_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -239,12 +1012,13 @@ ], "gives": [ { - "item": "minecraft:white_tulip" + "item": "minecraft:black_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -253,12 +1027,13 @@ ], "gives": [ { - "item": "minecraft:pink_tulip" + "item": "minecraft:green_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -267,12 +1042,13 @@ ], "gives": [ { - "item": "minecraft:oxeye_daisy" + "item": "minecraft:light_gray_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -281,12 +1057,13 @@ ], "gives": [ { - "item": "minecraft:cornflower" + "item": "minecraft:magenta_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 7, "wants": [ { "item": "minecraft:emerald", @@ -295,12 +1072,13 @@ ], "gives": [ { - "item": "minecraft:lily_of_the_valley" + "item": "minecraft:yellow_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 7, "wants": [ { "item": "minecraft:emerald", @@ -309,12 +1087,13 @@ ], "gives": [ { - "item": "minecraft:open_eyeblossom" + "item": "minecraft:gray_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -323,12 +1102,13 @@ ], "gives": [ { - "item": "minecraft:wheat_seeds" + "item": "minecraft:purple_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -337,12 +1117,13 @@ ], "gives": [ { - "item": "minecraft:beetroot_seeds" + "item": "minecraft:light_blue_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -351,12 +1132,13 @@ ], "gives": [ { - "item": "minecraft:pumpkin_seeds" + "item": "minecraft:lime_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", @@ -365,56 +1147,28 @@ ], "gives": [ { - "item": "minecraft:melon_seeds" + "item": "minecraft:orange_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 8, - "weight":6, "wants": [ { "item": "minecraft:emerald", - "quantity": 5 + "quantity": 1 } ], "gives": [ { - "choice": [ - { - "item": "minecraft:oak_sapling" - }, - { - "item": "minecraft:spruce_sapling" - }, - { - "item": "minecraft:birch_sapling" - }, - { - "item": "minecraft:jungle_sapling" - }, - { - "item": "minecraft:acacia_sapling" - }, - { - "item": "minecraft:dark_oak_sapling" - }, - { - "item": "minecraft:cherry_sapling" - }, - { - "item": "minecraft:mangrove_propagule" - }, - { - "item": "minecraft:pale_oak_sapling" - } - ] + "item": "minecraft:brown_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 12, - "weight":16, "wants": [ { "item": "minecraft:emerald", @@ -423,30 +1177,13 @@ ], "gives": [ { - "choice": [ - {"item": "minecraft:red_dye", "quantity": 3}, - {"item": "minecraft:white_dye", "quantity": 3}, - {"item": "minecraft:blue_dye", "quantity": 3}, - {"item": "minecraft:pink_dye", "quantity": 3}, - {"item": "minecraft:black_dye", "quantity": 3}, - {"item": "minecraft:green_dye", "quantity": 3}, - {"item": "minecraft:light_gray_dye", "quantity": 3}, - {"item": "minecraft:magenta_dye", "quantity": 3}, - {"item": "minecraft:yellow_dye", "quantity": 3}, - {"item": "minecraft:gray_dye", "quantity": 3}, - {"item": "minecraft:purple_dye", "quantity": 3}, - {"item": "minecraft:light_blue_dye", "quantity": 3}, - {"item": "minecraft:lime_dye", "quantity": 3}, - {"item": "minecraft:orange_dye", "quantity": 3}, - {"item": "minecraft:brown_dye", "quantity": 3}, - {"item": "minecraft:cyan_dye", "quantity": 3} - ] + "item": "minecraft:cyan_dye", + "quantity": 3 } - ] + ], + "max_uses": 12 }, { - "max_uses": 8, - "weight":5, "wants": [ { "item": "minecraft:emerald", @@ -455,82 +1192,73 @@ ], "gives": [ { - "choice": [ - { - "item": "minecraft:tube_coral_block" - }, - { - "item": "minecraft:brain_coral_block" - }, - { - "item": "minecraft:bubble_coral_block" - }, - { - "item": "minecraft:fire_coral_block" - }, - { - "item": "minecraft:horn_coral_block" - } - ] + "item": "minecraft:brain_coral_block", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 12, "wants": [ { "item": "minecraft:emerald", - "quantity": 1 + "quantity": 3 } ], "gives": [ { - "choice": [ - { "item": "minecraft:vine" }, - { "item": "minecraft:pale_hanging_moss" } - ] + "item": "minecraft:bubble_coral_block", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 12, - "weight":2, "wants": [ { "item": "minecraft:emerald", - "quantity": 1 + "quantity": 3 } ], "gives": [ { - "choice": [ - { - "item": "minecraft:brown_mushroom" - }, - { - "item": "minecraft:red_mushroom" - } - ] + "item": "minecraft:fire_coral_block", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 5, "wants": [ { "item": "minecraft:emerald", + "quantity": 3 + } + ], + "gives": [ + { + "item": "minecraft:horn_coral_block", "quantity": 1 } ], + "max_uses": 8 + }, + { + "wants": [ + { + "item": "minecraft:emerald", + "quantity": 3 + } + ], "gives": [ { - "item": "minecraft:waterlily", - "quantity": 2 + "item": "minecraft:tube_coral_block", + "quantity": 1 } - ] + ], + "max_uses": 8 }, { - "max_uses": 5, "wants": [ { "item": "minecraft:emerald", @@ -539,13 +1267,13 @@ ], "gives": [ { - "item": "minecraft:small_dripleaf_block", - "quantity": 2 + "item": "minecraft:vine", + "quantity": 3 } - ] + ], + "max_uses": 4 }, { - "max_uses": 8, "wants": [ { "item": "minecraft:emerald", @@ -554,13 +1282,13 @@ ], "gives": [ { - "item": "minecraft:sand", - "quantity": 8 + "item": "minecraft:pale_hanging_moss", + "quantity": 3 } - ] + ], + "max_uses": 4 }, { - "max_uses": 6, "wants": [ { "item": "minecraft:emerald", @@ -569,13 +1297,13 @@ ], "gives": [ { - "item": "minecraft:red_sand", - "quantity": 4 + "item": "minecraft:brown_mushroom", + "quantity": 3 } - ] + ], + "max_uses": 4 }, { - "max_uses": 5, "wants": [ { "item": "minecraft:emerald", @@ -584,13 +1312,13 @@ ], "gives": [ { - "item": "minecraft:pointed_dripstone", - "quantity": 2 + "item": "minecraft:red_mushroom", + "quantity": 3 } - ] + ], + "max_uses": 4 }, { - "max_uses": 5, "wants": [ { "item": "minecraft:emerald", @@ -599,13 +1327,13 @@ ], "gives": [ { - "item": "minecraft:dirt_with_roots", - "quantity": 2 + "item": "minecraft:waterlily", + "quantity": 5 } - ] + ], + "max_uses": 2 }, { - "max_uses": 5, "wants": [ { "item": "minecraft:emerald", @@ -614,76 +1342,73 @@ ], "gives": [ { - "choice": [ - { "item": "minecraft:moss_block", "quantity": 2 }, - { "item": "minecraft:pale_moss_block", "quantity": 2 } - ] + "item": "minecraft:small_dripleaf_block", + "quantity": 2 } - ] - } - ] - }, - { - "num_to_select": 1, - "trades": [ + ], + "max_uses": 5 + }, { - "max_uses": 4, "wants": [ { "item": "minecraft:emerald", - "quantity": 5 + "quantity": 1 } ], "gives": [ { - "item": "minecraft:bucket:4" + "item": "minecraft:sand", + "quantity": 8 } - ] + ], + "max_uses": 8 }, { - "max_uses": 4, "wants": [ { "item": "minecraft:emerald", - "quantity": 5 + "quantity": 1 } ], "gives": [ { - "item": "minecraft:bucket:5" + "item": "minecraft:red_sand", + "quantity": 4 } - ] + ], + "max_uses": 6 }, { - "max_uses": 6, "wants": [ { "item": "minecraft:emerald", - "quantity": 3 + "quantity": 1 } ], "gives": [ { - "item": "minecraft:packed_ice" + "item": "minecraft:pointed_dripstone", + "quantity": 2 } - ] + ], + "max_uses": 5 }, { - "max_uses": 6, "wants": [ { "item": "minecraft:emerald", - "quantity": 6 + "quantity": 1 } ], "gives": [ { - "item": "minecraft:blue_ice" + "item": "minecraft:dirt_with_roots", + "quantity": 2 } - ] + ], + "max_uses": 5 }, { - "max_uses": 8, "wants": [ { "item": "minecraft:emerald", @@ -692,28 +1417,30 @@ ], "gives": [ { - "item": "minecraft:gunpowder" + "item": "minecraft:moss_block", + "quantity": 2 } - ] + ], + "max_uses": 5 }, { - "max_uses": 6, "wants": [ { "item": "minecraft:emerald", - "quantity": 3 + "quantity": 1 } ], "gives": [ { - "item": "minecraft:podzol", - "quantity": 3 + "item": "minecraft:pale_moss_block", + "quantity": 2 } - ] + ], + "max_uses": 5 } ] } ] } ] -} +} \ No newline at end of file diff --git a/resource_pack/biomes/mangrove_swamp.client_biome.json b/resource_pack/biomes/mangrove_swamp.client_biome.json index cb6a564..843a815 100644 --- a/resource_pack/biomes/mangrove_swamp.client_biome.json +++ b/resource_pack/biomes/mangrove_swamp.client_biome.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.60", + "format_version": "1.21.70", "minecraft:client_biome": { "description": { "identifier": "mangrove_swamp" @@ -20,6 +20,9 @@ "color": { "color_map": "swamp_grass" } + }, + "minecraft:dry_foliage_color": { + "color": "#7B5334" } } } diff --git a/resource_pack/biomes/pale_garden.client_biome.json b/resource_pack/biomes/pale_garden.client_biome.json index 309bdd7..4624382 100644 --- a/resource_pack/biomes/pale_garden.client_biome.json +++ b/resource_pack/biomes/pale_garden.client_biome.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.60", + "format_version": "1.21.70", "minecraft:client_biome": { "description": { "identifier": "pale_garden" @@ -22,6 +22,9 @@ }, "minecraft:grass_appearance": { "color": "#778272" + }, + "minecraft:dry_foliage_color": { + "color": "#A0A69C" } } } diff --git a/resource_pack/biomes/roofed_forest.client_biome.json b/resource_pack/biomes/roofed_forest.client_biome.json index 19ae584..522da91 100644 --- a/resource_pack/biomes/roofed_forest.client_biome.json +++ b/resource_pack/biomes/roofed_forest.client_biome.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.40", + "format_version": "1.21.70", "minecraft:client_biome": { "description": { "identifier": "roofed_forest" @@ -10,6 +10,9 @@ }, "minecraft:water_appearance": { "surface_color": "#3B6CD1" + }, + "minecraft:dry_foliage_color": { + "color": "#7B5334" } } } diff --git a/resource_pack/biomes/roofed_forest_mutated.client_biome.json b/resource_pack/biomes/roofed_forest_mutated.client_biome.json index e7db983..103ffe4 100644 --- a/resource_pack/biomes/roofed_forest_mutated.client_biome.json +++ b/resource_pack/biomes/roofed_forest_mutated.client_biome.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.40", + "format_version": "1.21.70", "minecraft:client_biome": { "description": { "identifier": "roofed_forest_mutated" @@ -10,6 +10,9 @@ }, "minecraft:water_appearance": { "surface_color": "#44AFF5" + }, + "minecraft:dry_foliage_color": { + "color": "#7B5334" } } } diff --git a/resource_pack/biomes/swampland.client_biome.json b/resource_pack/biomes/swampland.client_biome.json index cceda84..3fff5e2 100644 --- a/resource_pack/biomes/swampland.client_biome.json +++ b/resource_pack/biomes/swampland.client_biome.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.60", + "format_version": "1.21.70", "minecraft:client_biome": { "description": { "identifier": "swampland" @@ -21,6 +21,9 @@ "color": { "color_map": "swamp_grass" } + }, + "minecraft:dry_foliage_color": { + "color": "#7B5334" } } } diff --git a/resource_pack/biomes/swampland_mutated.client_biome.json b/resource_pack/biomes/swampland_mutated.client_biome.json index 355e5c1..ad29454 100644 --- a/resource_pack/biomes/swampland_mutated.client_biome.json +++ b/resource_pack/biomes/swampland_mutated.client_biome.json @@ -1,5 +1,5 @@ { - "format_version": "1.21.60", + "format_version": "1.21.70", "minecraft:client_biome": { "description": { "identifier": "swampland_mutated" @@ -21,6 +21,9 @@ "color": { "color_map": "swamp_grass" } + }, + "minecraft:dry_foliage_color": { + "color": "#7B5334" } } } diff --git a/resource_pack/blocks.json b/resource_pack/blocks.json index 69fa677..13afbc8 100644 --- a/resource_pack/blocks.json +++ b/resource_pack/blocks.json @@ -1,85 +1,89 @@ { "format_version": "1.21.40", - "chiseled_nether_bricks": { - "sound": "nether_brick", - "textures": "chiseled_nether_bricks" + "wildflowers": { + "textures": "wildflowers", + "carried_textures": "wildflowers_carried", + "sound": "pink_petals" }, - "cracked_nether_bricks": { - "sound": "nether_brick", - "textures": "cracked_nether_bricks" + "firefly_bush": { + "textures": "firefly_bush", + "carried_textures": "firefly_bush_carried", + "sound": "firefly_bush" }, - "nether_brick_slab": { - "sound": "nether_brick", - "textures": "nether_brick_slab" + "bush": { + "textures": "bush", + "carried_textures": "bush_carried", + "sound": "grass" + }, + "leaf_litter": { + "textures": "leaf_litter", + "carried_textures": "leaf_litter_carried", + "sound": "leaf_litter" + }, + "hardened_clay": { + "sound": "terracotta" + }, + "white_terracotta": { + "sound": "terracotta" + }, + "orange_terracotta": { + "sound": "terracotta" + }, + "magenta_terracotta": { + "sound": "terracotta" + }, + "light_blue_terracotta": { + "sound": "terracotta" + }, + "yellow_terracotta": { + "sound": "terracotta" + }, + "lime_terracotta": { + "sound": "terracotta" + }, + "pink_terracotta": { + "sound": "terracotta" }, - "nether_brick_wall": { - "sound": "nether_brick", - "textures": "nether_brick_wall" + "gray_terracotta": { + "sound": "terracotta" }, - "red_nether_brick_slab": { - "sound": "nether_brick", - "textures": "red_nether_brick_slab" + "light_gray_terracotta": { + "sound": "terracotta" }, - "red_nether_brick_wall": { - "sound": "nether_brick", - "textures": "red_nether_brick_wall" + "cyan_terracotta": { + "sound": "terracotta" }, - "pale_oak_leaves": { - "textures": "pale_oak_leaves", - "ambient_occlusion_exponent": 1.0, + "purple_terracotta": { + "sound": "terracotta" + }, + "blue_terracotta": { + "sound": "terracotta" + }, + "brown_terracotta": { + "sound": "terracotta" + }, + "green_terracotta": { + "sound": "terracotta" + }, + "red_terracotta": { + "sound": "terracotta" + }, + "black_terracotta": { + "sound": "terracotta" + }, + "deadbush": { + "sound": "deadbush" + }, + "cactus_flower": { + "textures": "cactus_flower", + "sound": "cactus_flower" + }, + "short_dry_grass": { + "textures": "short_dry_grass", "sound": "grass" }, - "weeping_vines": { - "textures": { - "down": "weeping_vines_bottom", - "up": "weeping_vines_base", - "north": "weeping_vines_base", - "south": "weeping_vines_base", - "west": "weeping_vines_base", - "east": "weeping_vines_base" - }, - "sound": "weeping_vines" - }, - "twisting_vines": { - "textures": { - "down": "twisting_vines_bottom", - "up": "twisting_vines_base", - "north": "twisting_vines_base", - "south": "twisting_vines_base", - "west": "twisting_vines_base", - "east": "twisting_vines_base" - }, - "sound": "weeping_vines" - }, - "iron_bars": { - "textures": { - "up": "iron_bars", - "down": "iron_bars", - "north": "iron_bars", - "south": "iron_bars", - "west": "iron_bars", - "east": "iron_bars_edge" - }, - "sound": "iron" - }, - "iron_door": { - "textures": { - "up": "door_lower", - "down": "door_lower", - "side": "door_upper" - }, - "sound": "iron" - }, - "iron_trapdoor": { - "textures": "iron_trapdoor", - "sound": "iron" - }, - "heavy_weighted_pressure_plate": { - "textures": "iron_block", - "sound": "iron" - }, - "iron_block": { - "textures": "iron_block", - "sound": "iron" + "tall_dry_grass": { + "textures": "tall_dry_grass", + "sound": "grass" } } diff --git a/resource_pack/entity/agent.entity.json b/resource_pack/entity/agent.entity.json index de167ca..5a6d2eb 100644 --- a/resource_pack/entity/agent.entity.json +++ b/resource_pack/entity/agent.entity.json @@ -30,8 +30,7 @@ }, "render_controllers": [ "controller.render.agent" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 52 + "texture": "spawn_egg_agent" } } } diff --git a/resource_pack/entity/allay.entity.json b/resource_pack/entity/allay.entity.json index b8aee30..649f7b2 100644 --- a/resource_pack/entity/allay.entity.json +++ b/resource_pack/entity/allay.entity.json @@ -12,15 +12,14 @@ "geometry": { "default": "geometry.allay" }, - "spawn_egg": { - "base_color": "#00daff", - "overlay_color": "#00adff" - }, - "scripts": { - "pre_animation": [ - "variable.holding_trident = query.is_item_name_any('slot.weapon.mainhand', 'minecraft:trident');" - ] - }, + "spawn_egg": { + "texture": "spawn_egg_allay" + }, + "scripts": { + "pre_animation": [ + "variable.holding_trident = query.is_item_name_any('slot.weapon.mainhand', 'minecraft:trident');" + ] + }, "animations": { "idle": "animation.allay.idle", "fly": "animation.allay.fly", @@ -30,14 +29,24 @@ "dance": "animation.allay.dance" }, "animation_controllers": [ - { "general": "controller.animation.allay.general" }, - { "look_at_target": "controller.animation.allay.look_at_target" }, - { "holding": "controller.animation.allay.holding" }, - { "dancing": "controller.animation.allay.dancing" } + { + "general": "controller.animation.allay.general" + }, + { + "look_at_target": "controller.animation.allay.look_at_target" + }, + { + "holding": "controller.animation.allay.holding" + }, + { + "dancing": "controller.animation.allay.dancing" + } + ], + "render_controllers": [ + "controller.render.allay" ], - "render_controllers": [ "controller.render.allay" ], - "enable_attachables": true, - "held_item_ignores_lighting": true - } + "enable_attachables": true, + "held_item_ignores_lighting": true + } } -} +} \ No newline at end of file diff --git a/resource_pack/entity/armadillo.entity.json b/resource_pack/entity/armadillo.entity.json index 8d25a07..9b537a7 100644 --- a/resource_pack/entity/armadillo.entity.json +++ b/resource_pack/entity/armadillo.entity.json @@ -55,8 +55,7 @@ "unroll_finish": "mob.armadillo.unroll_finish" }, "spawn_egg": { - "base_color": "#ad716d", - "overlay_color": "#824848" + "texture": "spawn_egg_armadillo" } } } diff --git a/resource_pack/entity/axolotl.entity.json b/resource_pack/entity/axolotl.entity.json index 66d7124..253b3ce 100644 --- a/resource_pack/entity/axolotl.entity.json +++ b/resource_pack/entity/axolotl.entity.json @@ -40,8 +40,7 @@ ], "render_controllers": [ "controller.render.axolotl" ], "spawn_egg": { - "base_color": "#0xfbc1e3", - "overlay_color": "#0xa62d74" + "texture": "spawn_egg_axolotl" } } } diff --git a/resource_pack/entity/bat.entity.json b/resource_pack/entity/bat.entity.json index 3dfade7..393333f 100644 --- a/resource_pack/entity/bat.entity.json +++ b/resource_pack/entity/bat.entity.json @@ -14,6 +14,17 @@ }, "scripts": { "scale": "1.0" + }, + "animations": { + "resting": "animation.bat.resting", + "flying": "animation.bat.flying" + }, + "animation_controllers": [ + { "move": "controller.animation.bat.move" } + ], + "render_controllers": [ "controller.render.bat" ], + "spawn_egg": { + "texture": "spawn_egg_bat" } } } diff --git a/resource_pack/entity/bee.entity.json b/resource_pack/entity/bee.entity.json index 1de7d64..cecb4de 100644 --- a/resource_pack/entity/bee.entity.json +++ b/resource_pack/entity/bee.entity.json @@ -33,8 +33,7 @@ }, "render_controllers": [ "controller.render.bee" ], "spawn_egg": { - "texture": "egg_bee", - "texture_index": 0 + "texture": "spawn_egg_bee" } } } diff --git a/resource_pack/entity/blaze.entity.json b/resource_pack/entity/blaze.entity.json index b2a0dc3..219a4d5 100644 --- a/resource_pack/entity/blaze.entity.json +++ b/resource_pack/entity/blaze.entity.json @@ -27,8 +27,7 @@ ], "render_controllers": [ "controller.render.blaze" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 21 + "texture": "spawn_egg_blaze" } } } diff --git a/resource_pack/entity/bogged.entity.json b/resource_pack/entity/bogged.entity.json index 3fc55cd..fc4a156 100644 --- a/resource_pack/entity/bogged.entity.json +++ b/resource_pack/entity/bogged.entity.json @@ -16,8 +16,7 @@ "overlay": "geometry.bogged.armor" }, "spawn_egg": { - "base_color": "#8A9C72", - "overlay_color": "#314D1B" + "texture": "spawn_egg_bogged" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/breeze.entity.json b/resource_pack/entity/breeze.entity.json index d5d1a32..37b7257 100644 --- a/resource_pack/entity/breeze.entity.json +++ b/resource_pack/entity/breeze.entity.json @@ -21,8 +21,7 @@ "breeze_wind_bottom": "geometry.breeze_wind_bottom" }, "spawn_egg": { - "base_color": "#af94df", - "overlay_color": "#9166df" + "texture": "spawn_egg_breeze" }, "scripts": { "animate": [ diff --git a/resource_pack/entity/camel.entity.json b/resource_pack/entity/camel.entity.json index 362b06d..4598aa5 100644 --- a/resource_pack/entity/camel.entity.json +++ b/resource_pack/entity/camel.entity.json @@ -13,8 +13,7 @@ "default": "geometry.camel" }, "spawn_egg": { - "base_color": "#fcc369", - "overlay_color": "#cb9337" + "texture": "spawn_egg_camel" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/cat.entity.json b/resource_pack/entity/cat.entity.json index 063ad98..bd82208 100644 --- a/resource_pack/entity/cat.entity.json +++ b/resource_pack/entity/cat.entity.json @@ -47,8 +47,7 @@ ], "render_controllers": [ "controller.render.cat" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 53 + "texture": "spawn_egg_cat" } } } diff --git a/resource_pack/entity/cave_spider.entity.json b/resource_pack/entity/cave_spider.entity.json index 66965c6..ceea9f7 100644 --- a/resource_pack/entity/cave_spider.entity.json +++ b/resource_pack/entity/cave_spider.entity.json @@ -27,8 +27,7 @@ ], "render_controllers": [ "controller.render.spider" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 22 + "texture": "spawn_egg_cave_spider" } } } diff --git a/resource_pack/entity/chicken.entity.json b/resource_pack/entity/chicken.entity.json index 2aa53f8..1dc2109 100644 --- a/resource_pack/entity/chicken.entity.json +++ b/resource_pack/entity/chicken.entity.json @@ -6,13 +6,18 @@ "min_engine_version": "1.12.0", "materials": { "default": "chicken", + "cold": "chicken_cold", "legs": "chicken_legs" }, "textures": { - "default": "textures/entity/chicken" + "default": "textures/entity/chicken/chicken", + "warm": "textures/entity/chicken/chicken_warm", + "cold": "textures/entity/chicken/chicken_cold" }, "geometry": { - "default": "geometry.chicken.v1.12" + "default": "geometry.chicken.v1.12", + "warm": "geometry.chicken.v1.12", + "cold": "geometry.chicken.cold" }, "animations": { "move": "animation.chicken.move", @@ -21,6 +26,11 @@ "baby_transform": "animation.chicken.baby_transform" }, "scripts": { + "pre_animation": [ + "t.variant = query.property('minecraft:climate_variant');", + "v.index = (t.variant == 'temperate') ? 0 : ((t.variant == 'warm') ? 1 : 2);", + "v.is_cold = t.variant == 'cold';" + ], "animate": [ "general", { "move": "query.modified_move_speed" }, @@ -28,10 +38,9 @@ { "baby_transform": "query.is_baby" } ] }, - "render_controllers": [ "controller.render.chicken" ], + "render_controllers": [ "controller.render.chicken.v2" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 0 + "texture": "spawn_egg_chicken" } } } diff --git a/resource_pack/entity/cod.entity.json b/resource_pack/entity/cod.entity.json index ff159d5..62c52eb 100644 --- a/resource_pack/entity/cod.entity.json +++ b/resource_pack/entity/cod.entity.json @@ -27,8 +27,7 @@ ], "render_controllers": [ "controller.render.cod" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 45 + "texture": "spawn_egg_cod" } } } diff --git a/resource_pack/entity/cow.entity.json b/resource_pack/entity/cow.entity.json index 88ac931..f9660cb 100644 --- a/resource_pack/entity/cow.entity.json +++ b/resource_pack/entity/cow.entity.json @@ -4,12 +4,19 @@ "description": { "identifier": "minecraft:cow", "min_engine_version": "1.8.0", - "materials": { "default": "cow" }, + "materials": { + "default": "cow", + "cold": "cow_cold" + }, "textures": { - "default": "textures/entity/cow/cow" + "default": "textures/entity/cow/cow_v2", + "warm": "textures/entity/cow/cow_warm", + "cold": "textures/entity/cow/cow_cold" }, "geometry": { - "default": "geometry.cow.v1.8" + "default": "geometry.cow.v2", + "warm": "geometry.cow.warm", + "cold": "geometry.cow.cold" }, "animations": { "setup": "animation.cow.setup", @@ -18,6 +25,11 @@ "baby_transform": "animation.cow.baby_transform" }, "scripts": { + "pre_animation": [ + "t.variant = query.property('minecraft:climate_variant');", + "v.index = (t.variant == 'temperate') ? 0 : ((t.variant == 'warm') ? 1 : 2);", + "v.is_cold = t.variant == 'cold';" + ], "animate": [ "setup", { "walk": "query.modified_move_speed" }, @@ -25,10 +37,9 @@ { "baby_transform": "query.is_baby" } ] }, - "render_controllers": [ "controller.render.cow" ], + "render_controllers": [ "controller.render.cow.v2" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 1 + "texture": "spawn_egg_cow" } } } diff --git a/resource_pack/entity/creaking.entity.json b/resource_pack/entity/creaking.entity.json index d15de5e..69cff24 100644 --- a/resource_pack/entity/creaking.entity.json +++ b/resource_pack/entity/creaking.entity.json @@ -63,8 +63,7 @@ "twitch": "mob.creaking.twitch" }, "spawn_egg": { - "base_color": "#5f5f5f", - "overlay_color": "#fc7812" + "texture": "spawn_egg_creaking" } } } diff --git a/resource_pack/entity/creeper.entity.json b/resource_pack/entity/creeper.entity.json index 9a18344..4af52be 100644 --- a/resource_pack/entity/creeper.entity.json +++ b/resource_pack/entity/creeper.entity.json @@ -17,8 +17,7 @@ "charged": "geometry.creeper.charged.v1.8" }, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 6 + "texture": "spawn_egg_creeper" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/dolphin.entity.json b/resource_pack/entity/dolphin.entity.json index 0834642..1972175 100644 --- a/resource_pack/entity/dolphin.entity.json +++ b/resource_pack/entity/dolphin.entity.json @@ -18,8 +18,7 @@ ], "render_controllers": [ "controller.render.dolphin" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 49 + "texture": "spawn_egg_dolphin" } } } diff --git a/resource_pack/entity/donkey_v3.entity.json b/resource_pack/entity/donkey_v3.entity.json index 88b4676..1e0a878 100644 --- a/resource_pack/entity/donkey_v3.entity.json +++ b/resource_pack/entity/donkey_v3.entity.json @@ -46,8 +46,7 @@ }, "render_controllers": [ "controller.render.donkey.v3" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 30 + "texture": "spawn_egg_donkey" } } } diff --git a/resource_pack/entity/drowned.entity.json b/resource_pack/entity/drowned.entity.json index 35c1dc8..6c46aba 100644 --- a/resource_pack/entity/drowned.entity.json +++ b/resource_pack/entity/drowned.entity.json @@ -56,8 +56,7 @@ "render_controllers": [ "controller.render.drowned" ], "enable_attachables": true, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 48 + "texture": "spawn_egg_drowned" } } } diff --git a/resource_pack/entity/egg.entity.json b/resource_pack/entity/egg.entity.json index e1104b3..a97ea66 100644 --- a/resource_pack/entity/egg.entity.json +++ b/resource_pack/entity/egg.entity.json @@ -7,16 +7,22 @@ "default": "egg" }, "textures": { - "default": "textures/items/egg" + "default": "textures/items/egg", + "warm": "textures/items/brown_egg", + "cold": "textures/items/blue_egg" }, "geometry": { "default": "geometry.item_sprite" }, - "render_controllers": [ "controller.render.item_sprite" ], + "render_controllers": [ "controller.render.egg" ], "animations": { "flying": "animation.actor.billboard" }, "scripts": { + "pre_animation": [ + "t.variant = query.property('minecraft:climate_variant');", + "v.index = (t.variant == 'temperate') ? 0 : ((t.variant == 'warm') ? 1 : 2);" + ], "animate": [ "flying" ] diff --git a/resource_pack/entity/elder_guardian.entity.json b/resource_pack/entity/elder_guardian.entity.json index e8d7856..35ba949 100644 --- a/resource_pack/entity/elder_guardian.entity.json +++ b/resource_pack/entity/elder_guardian.entity.json @@ -49,8 +49,7 @@ }, "render_controllers": [ "controller.render.guardian" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 36 + "texture": "spawn_egg_elder_guardian" } } } diff --git a/resource_pack/entity/ender_dragon.entity.json b/resource_pack/entity/ender_dragon.entity.json index f351a74..61401ec 100644 --- a/resource_pack/entity/ender_dragon.entity.json +++ b/resource_pack/entity/ender_dragon.entity.json @@ -3,10 +3,272 @@ "minecraft:client_entity": { "description": { "identifier": "minecraft:ender_dragon", + "materials": { + "default": "ender_dragon", + "beam_material": "entity_beam", + "death_material": "entity_beam_additive", + "dissolve_0": "entity_dissolve_layer0.skinning", + "dissolve_1": "entity_dissolve_layer1.skinning" + }, + "textures": { + "default": "textures/entity/dragon/dragon", + "exploding": "textures/entity/dragon/dragon_exploding", + "beam": "textures/entity/endercrystal/endercrystal_beam" + }, + "geometry": { + "default": "geometry.dragon" + }, + "scripts": { + "pre_animation": [ + "variable.flap_time = query.wing_flap_position * 360.0;", + "variable.base_rotation = Math.sin(variable.flap_time - 57.3) + 57.3;", + "variable.rotation_factor = (variable.base_rotation * variable.base_rotation + variable.base_rotation * 114.6) * 2.87;", + "variable.base_rotation_translate = Math.sin(variable.flap_time - 57.3) + 1.0;", + "variable.rotation_factor_translate = (variable.base_rotation_translate * variable.base_rotation_translate + variable.base_rotation_translate * 2.0) * 0.05;", + "variable.pre_rotation_raw = Math.mod(v.historical_frame_5.rot_y - v.historical_frame_10.rot_y + 180.0, 360.0);", + "variable.pre_rotation = variable.pre_rotation_raw < 0.0 ? variable.pre_rotation_raw + 180.0 : variable.pre_rotation_raw - 180.0;", + "variable.piece_rotation_raw = Math.mod(v.historical_frame_5.rot_y + (variable.pre_rotation / 2.0) + 180.0, 360.0);", + "variable.piece_rotation = variable.piece_rotation_raw < 0.0 ? variable.piece_rotation_raw + 180.0 : variable.piece_rotation_raw - 180.0;", + "variable.rotationScale = 1.5;", + "variable.death_effect_duration = 200.0;", + "variable.death_alpha = (1.0 - (query.death_ticks + query.frame_alpha) / variable.death_effect_duration) * 2.0 + 0.3;", + + "variable.pitch = -(math.min_angle(v.historical_frame_5.pos_y - v.historical_frame_10.pos_y)) * 10.0;", + "variable.roll = math.min_angle(v.historical_frame_5.rot_y - v.historical_frame_10.rot_y) * variable.rotationScale;", + "variable.clamped_pitch = math.clamp(variable.pitch, -30, 30);", + "variable.clamped_roll = math.clamp(variable.roll, -45, 45);", + + "variable.neck_distance = 10.0;", + "variable.neck_1_rotation_x = Math.cos(variable.flap_time) * 8.6 + (query.is_sitting ? 0.0 : (v.historical_frame_5.pos_y - v.historical_frame_6.pos_y)) * variable.rotationScale * 5.0;", + "variable.neck_1_rotation_y_raw = Math.mod((v.historical_frame_5.rot_y - v.historical_frame_6.rot_y) + 180.0, 360.0);", + "variable.neck_1_rotation_y = (variable.neck_1_rotation_y_raw < 0.0 ? (variable.neck_1_rotation_y_raw + 180.0) : (variable.neck_1_rotation_y_raw - 180.0)) * variable.rotationScale;", + "variable.neck_1_rotation_z_raw = Math.mod((v.historical_frame_5.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.neck_1_rotation_z = -(variable.neck_1_rotation_z_raw < 0.0 ? (variable.neck_1_rotation_z_raw + 180.0) : (variable.neck_1_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.neck_1_position_x = 0.0;", + "variable.neck_1_position_y = -20.0;", + "variable.neck_1_position_z = -12.0;", + + "variable.neck_2_rotation_x = Math.cos(25.79 + variable.flap_time) * 8.6 + (query.is_sitting ? 1.0 : (v.historical_frame_4.pos_y - v.historical_frame_6.pos_y)) * variable.rotationScale * 5.0;", + "variable.neck_2_rotation_y_raw = Math.mod((v.historical_frame_4.rot_y - v.historical_frame_6.rot_y) + 180.0, 360.0);", + "variable.neck_2_rotation_y = (variable.neck_2_rotation_y_raw < 0.0 ? (variable.neck_2_rotation_y_raw + 180.0) : (variable.neck_2_rotation_y_raw - 180.0)) * variable.rotationScale;", + "variable.neck_2_rotation_z_raw = Math.mod((v.historical_frame_4.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.neck_2_rotation_z = -(variable.neck_2_rotation_z_raw < 0.0 ? (variable.neck_2_rotation_z_raw + 180.0) : (variable.neck_2_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.neck_2_position_x = variable.neck_1_position_x - Math.sin(variable.neck_1_rotation_y) * Math.cos(variable.neck_1_rotation_x) * variable.neck_distance;", + "variable.neck_2_position_y = variable.neck_1_position_y - Math.sin(variable.neck_1_rotation_x) * variable.neck_distance;", + "variable.neck_2_position_z = variable.neck_1_position_z - Math.cos(variable.neck_1_rotation_y) * Math.cos(variable.neck_1_rotation_x) * variable.neck_distance;", + + "variable.neck_3_rotation_x = Math.cos(51.57 + variable.flap_time) * 8.6 + (query.is_sitting ? 2.0 : (v.historical_frame_3.pos_y - v.historical_frame_6.pos_y)) * variable.rotationScale * 5.0;", + "variable.neck_3_rotation_y_raw = Math.mod((v.historical_frame_3.rot_y - v.historical_frame_6.rot_y + 180.0), 360.0);", + "variable.neck_3_rotation_y = (variable.neck_3_rotation_y_raw < 0.0 ? (variable.neck_3_rotation_y_raw + 180.0) : (variable.neck_3_rotation_y_raw - 180.0)) * variable.rotationScale;", + "variable.neck_3_rotation_z_raw = Math.mod((v.historical_frame_3.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.neck_3_rotation_z = -(variable.neck_3_rotation_z_raw < 0.0 ? (variable.neck_3_rotation_z_raw + 180.0) : (variable.neck_3_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.neck_3_position_x = variable.neck_2_position_x - Math.sin(variable.neck_2_rotation_y) * Math.cos(variable.neck_2_rotation_x) * variable.neck_distance;", + "variable.neck_3_position_y = variable.neck_2_position_y - Math.sin(variable.neck_2_rotation_x) * variable.neck_distance;", + "variable.neck_3_position_z = variable.neck_2_position_z - Math.cos(variable.neck_2_rotation_y) * Math.cos(variable.neck_2_rotation_x) * variable.neck_distance;", + + "variable.neck_4_rotation_x = Math.cos(77.36 + variable.flap_time) * 8.6 + (query.is_sitting ? 3.0 : (v.historical_frame_2.pos_y - v.historical_frame_6.pos_y)) * variable.rotationScale * 5.0;", + "variable.neck_4_rotation_y_raw = Math.mod((v.historical_frame_2.rot_y - v.historical_frame_6.rot_y + 180.0), 360.0);", + "variable.neck_4_rotation_y = (variable.neck_4_rotation_y_raw < 0.0 ? (variable.neck_4_rotation_y_raw + 180.0) : (variable.neck_4_rotation_y_raw - 180.0)) * variable.rotationScale;", + "variable.neck_4_rotation_z_raw = Math.mod((v.historical_frame_2.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.neck_4_rotation_z = -(variable.neck_4_rotation_z_raw < 0.0 ? (variable.neck_4_rotation_z_raw + 180.0) : (variable.neck_4_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.neck_4_position_x = variable.neck_3_position_x - Math.sin(variable.neck_3_rotation_y) * Math.cos(variable.neck_3_rotation_x) * variable.neck_distance;", + "variable.neck_4_position_y = variable.neck_3_position_y - Math.sin(variable.neck_3_rotation_x) * variable.neck_distance;", + "variable.neck_4_position_z = variable.neck_3_position_z - Math.cos(variable.neck_3_rotation_y) * Math.cos(variable.neck_3_rotation_x) * variable.neck_distance;", + + "variable.neck_5_rotation_x = Math.cos(103.14 + variable.flap_time) * 8.6 + (query.is_sitting ? 4.0 : (v.historical_frame_1.pos_y - v.historical_frame_6.pos_y)) * variable.rotationScale * 5.0;", + "variable.neck_5_rotation_y_raw = Math.mod((v.historical_frame_1.rot_y - v.historical_frame_6.rot_y) + 180.0, 360.0);", + "variable.neck_5_rotation_y = (variable.neck_5_rotation_y_raw < 0.0 ? (variable.neck_5_rotation_y_raw + 180.0) : (variable.neck_5_rotation_y_raw - 180.0)) * variable.rotationScale;", + "variable.neck_5_rotation_z_raw = Math.mod((v.historical_frame_1.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.neck_5_rotation_z = -(variable.neck_5_rotation_z_raw < 0.0 ? (variable.neck_5_rotation_z_raw + 180.0) : (variable.neck_5_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.neck_5_position_x = variable.neck_4_position_x - Math.sin(variable.neck_4_rotation_y) * Math.cos(variable.neck_4_rotation_x) * variable.neck_distance;", + "variable.neck_5_position_y = variable.neck_4_position_y - Math.sin(variable.neck_4_rotation_x) * variable.neck_distance;", + "variable.neck_5_position_z = variable.neck_4_position_z - Math.cos(variable.neck_4_rotation_y) * Math.cos(variable.neck_4_rotation_x) * variable.neck_distance;", + + "variable.head_rotation_x_raw = Math.mod((query.is_sitting ? 6.0 : 0.0) + 180.0, 360.0);", + "variable.head_rotation_x = (variable.head_rotation_x_raw < 0.0 ? (variable.head_rotation_x_raw + 180.0) : (variable.head_rotation_x_raw - 180.0)) * variable.rotationScale * 5.0;", + "variable.head_rotation_y_raw = Math.mod((v.historical_frame_0.rot_y - v.historical_frame_6.rot_y) + 180.0, 360.0);", + "variable.head_rotation_y = (variable.head_rotation_y_raw < 0.0 ? (variable.head_rotation_y_raw + 180.0) : (variable.head_rotation_y_raw - 180.0));", + "variable.head_rotation_z_raw = Math.mod((v.historical_frame_0.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.head_rotation_z = -(variable.head_rotation_z_raw < 0.0 ? (variable.head_rotation_z_raw + 180.0) : (variable.head_rotation_z_raw - 180.0));", + + "variable.head_position_x = variable.neck_5_position_x - Math.sin(variable.neck_5_rotation_y) * Math.cos(variable.neck_5_rotation_x) * variable.neck_distance;", + "variable.head_position_y = variable.neck_5_position_y - Math.sin(variable.neck_5_rotation_x) * variable.neck_distance;", + "variable.head_position_z = variable.neck_5_position_z - Math.cos(variable.neck_5_rotation_y) * Math.cos(variable.neck_5_rotation_x) * variable.neck_distance;", + + "variable.tail_distance = 10.0;", + "variable.tail_rotation_y = 180.0;", + "variable.tail_rotation_x = Math.sin(variable.flap_time) * 2.86;", + + "variable.tail_1_rotation_x = variable.tail_rotation_x + (v.historical_frame_12.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_1_rotation_y_raw = Math.mod((v.historical_frame_12.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_1_rotation_y = (variable.tail_1_rotation_y_raw < 0.0 ? (variable.tail_1_rotation_y_raw + 180.0) : (variable.tail_1_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_1_rotation_z_raw = Math.mod((v.historical_frame_12.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_1_rotation_z = -(variable.tail_1_rotation_z_raw < 0.0 ? (variable.tail_1_rotation_z_raw + 180.0) : (variable.tail_1_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_1_position_x = 0.0;", + "variable.tail_1_position_y = -10.0;", + "variable.tail_1_position_z = 60.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(25.78 + variable.flap_time) * 2.86;", + + "variable.tail_2_rotation_x = variable.tail_rotation_x + (v.historical_frame_13.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_2_rotation_y_raw = Math.mod((v.historical_frame_13.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_2_rotation_y = (variable.tail_2_rotation_y_raw < 0.0 ? (variable.tail_2_rotation_y_raw + 180.0) : (variable.tail_2_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_2_rotation_z_raw = Math.mod((v.historical_frame_13.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_2_rotation_z = -(variable.tail_2_rotation_z_raw < 0.0 ? (variable.tail_2_rotation_z_raw + 180.0) : (variable.tail_2_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_2_position_x = variable.tail_1_position_x - Math.sin(variable.tail_1_rotation_y) * Math.cos(variable.tail_1_rotation_x) * 10.0;", + "variable.tail_2_position_y = variable.tail_1_position_y - Math.sin(variable.tail_1_rotation_x) * variable.tail_distance;", + "variable.tail_2_position_z = variable.tail_1_position_z - Math.cos(variable.tail_1_rotation_y) * Math.cos(variable.tail_1_rotation_x) * 10.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(51.56 + variable.flap_time) * 2.86;", + + "variable.tail_3_rotation_x = variable.tail_rotation_x + (v.historical_frame_14.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_3_rotation_y_raw = Math.mod((v.historical_frame_14.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_3_rotation_y = (variable.tail_3_rotation_y_raw < 0.0 ? (variable.tail_3_rotation_y_raw + 180.0) : (variable.tail_3_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_3_rotation_z_raw = Math.mod((v.historical_frame_14.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_3_rotation_z = -(variable.tail_3_rotation_z_raw < 0.0 ? (variable.tail_3_rotation_z_raw + 180.0) : (variable.tail_3_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_3_position_x = variable.tail_2_position_x - Math.sin(variable.tail_2_rotation_y) * Math.cos(variable.tail_2_rotation_x) * 10.0;", + "variable.tail_3_position_y = variable.tail_2_position_y - Math.sin(variable.tail_2_rotation_x) * variable.tail_distance;", + "variable.tail_3_position_z = variable.tail_2_position_z - Math.cos(variable.tail_2_rotation_y) * Math.cos(variable.tail_2_rotation_x) * 10.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(77.35 + variable.flap_time) * 2.86;", + + "variable.tail_4_rotation_x = variable.tail_rotation_x + (v.historical_frame_15.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_4_rotation_y_raw = Math.mod((v.historical_frame_15.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_4_rotation_y = (variable.tail_4_rotation_y_raw < 0.0 ? (variable.tail_4_rotation_y_raw + 180.0) : (variable.tail_4_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_4_rotation_z_raw = Math.mod((v.historical_frame_15.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_4_rotation_z = -(variable.tail_4_rotation_z_raw < 0.0 ? (variable.tail_4_rotation_z_raw + 180.0) : (variable.tail_4_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_4_position_x = variable.tail_3_position_x - Math.sin(variable.tail_3_rotation_y) * Math.cos(variable.tail_3_rotation_x) * 10.0;", + "variable.tail_4_position_y = variable.tail_3_position_y - Math.sin(variable.tail_3_rotation_x) * variable.tail_distance;", + "variable.tail_4_position_z = variable.tail_3_position_z - Math.cos(variable.tail_3_rotation_y) * Math.cos(variable.tail_3_rotation_x) * 10.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(103.13 + variable.flap_time) * 2.86;", + + "variable.tail_5_rotation_x = variable.tail_rotation_x + (v.historical_frame_16.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_5_rotation_y_raw = Math.mod((v.historical_frame_16.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_5_rotation_y = (variable.tail_5_rotation_y_raw < 0.0 ? (variable.tail_5_rotation_y_raw + 180.0) : (variable.tail_5_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_5_rotation_z_raw = Math.mod((v.historical_frame_16.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_5_rotation_z = -(variable.tail_5_rotation_z_raw < 0.0 ? (variable.tail_5_rotation_z_raw + 180.0) : (variable.tail_5_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_5_position_x = variable.tail_4_position_x - Math.sin(variable.tail_4_rotation_y) * Math.cos(variable.tail_4_rotation_x) * 10.0;", + "variable.tail_5_position_y = variable.tail_4_position_y - Math.sin(variable.tail_4_rotation_x) * variable.tail_distance;", + "variable.tail_5_position_z = variable.tail_4_position_z - Math.cos(variable.tail_4_rotation_y) * Math.cos(variable.tail_4_rotation_x) * 10.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(128.92 + variable.flap_time) * 2.86;", + + "variable.tail_6_rotation_x = variable.tail_rotation_x + (v.historical_frame_17.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_6_rotation_y_raw = Math.mod((v.historical_frame_17.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_6_rotation_y = (variable.tail_6_rotation_y_raw < 0.0 ? (variable.tail_6_rotation_y_raw + 180.0) : (variable.tail_6_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_6_rotation_z_raw = Math.mod((v.historical_frame_17.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_6_rotation_z = -(variable.tail_6_rotation_z_raw < 0.0 ? (variable.tail_6_rotation_z_raw + 180.0) : (variable.tail_6_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_6_position_x = variable.tail_5_position_x - Math.sin(variable.tail_5_rotation_y) * Math.cos(variable.tail_5_rotation_x) * 10.0;", + "variable.tail_6_position_y = variable.tail_5_position_y - Math.sin(variable.tail_5_rotation_x) * variable.tail_distance;", + "variable.tail_6_position_z = variable.tail_5_position_z - Math.cos(variable.tail_5_rotation_y) * Math.cos(variable.tail_5_rotation_x) * 10.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(154.70 + variable.flap_time) * 2.86;", + + "variable.tail_7_rotation_x = variable.tail_rotation_x + (v.historical_frame_18.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_7_rotation_y_raw = Math.mod((v.historical_frame_18.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_7_rotation_y = (variable.tail_7_rotation_y_raw < 0.0 ? (variable.tail_7_rotation_y_raw + 180.0) : (variable.tail_7_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_7_rotation_z_raw = Math.mod((v.historical_frame_18.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_7_rotation_z = -(variable.tail_7_rotation_z_raw < 0.0 ? (variable.tail_7_rotation_z_raw + 180.0) : (variable.tail_7_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_7_position_x = variable.tail_6_position_x - Math.sin(variable.tail_6_rotation_y) * Math.cos(variable.tail_6_rotation_x) * 10.0;", + "variable.tail_7_position_y = variable.tail_6_position_y - Math.sin(variable.tail_6_rotation_x) * variable.tail_distance;", + "variable.tail_7_position_z = variable.tail_6_position_z - Math.cos(variable.tail_6_rotation_y) * Math.cos(variable.tail_6_rotation_x) * 10.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(180.48 + variable.flap_time) * 2.86;", + + "variable.tail_8_rotation_x = variable.tail_rotation_x + (v.historical_frame_19.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_8_rotation_y_raw = Math.mod((v.historical_frame_19.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_8_rotation_y = (variable.tail_8_rotation_y_raw < 0.0 ? (variable.tail_8_rotation_y_raw + 180.0) : (variable.tail_8_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_8_rotation_z_raw = Math.mod((v.historical_frame_19.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_8_rotation_z = -(variable.tail_8_rotation_z_raw < 0.0 ? (variable.tail_8_rotation_z_raw + 180.0) : (variable.tail_8_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_8_position_x = variable.tail_7_position_x - Math.sin(variable.tail_7_rotation_y) * Math.cos(variable.tail_7_rotation_x) * 10.0;", + "variable.tail_8_position_y = variable.tail_7_position_y - Math.sin(variable.tail_7_rotation_x) * variable.tail_distance;", + "variable.tail_8_position_z = variable.tail_7_position_z - Math.cos(variable.tail_7_rotation_y) * Math.cos(variable.tail_7_rotation_x) * 10.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(206.26 + variable.flap_time) * 2.86;", + + "variable.tail_9_rotation_x = variable.tail_rotation_x + (v.historical_frame_20.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_9_rotation_y_raw = Math.mod((v.historical_frame_20.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_9_rotation_y = (variable.tail_9_rotation_y_raw < 0.0 ? (variable.tail_9_rotation_y_raw + 180.0) : (variable.tail_9_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_9_rotation_z_raw = Math.mod((v.historical_frame_20.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_9_rotation_z = -(variable.tail_9_rotation_z_raw < 0.0 ? (variable.tail_9_rotation_z_raw + 180.0) : (variable.tail_9_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_9_position_x = variable.tail_8_position_x - Math.sin(variable.tail_8_rotation_y) * Math.cos(variable.tail_8_rotation_x) * 10.0;", + "variable.tail_9_position_y = variable.tail_8_position_y - Math.sin(variable.tail_8_rotation_x) * variable.tail_distance;", + "variable.tail_9_position_z = variable.tail_8_position_z - Math.cos(variable.tail_8_rotation_y) * Math.cos(variable.tail_8_rotation_x) * 10.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(232.05 + variable.flap_time) * 2.86;", + + "variable.tail_10_rotation_x = variable.tail_rotation_x + (v.historical_frame_21.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_10_rotation_y_raw = Math.mod((v.historical_frame_21.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_10_rotation_y = (variable.tail_10_rotation_y_raw < 0.0 ? (variable.tail_10_rotation_y_raw + 180.0) : (variable.tail_10_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_10_rotation_z_raw = Math.mod((v.historical_frame_21.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_10_rotation_z = -(variable.tail_10_rotation_z_raw < 0.0 ? (variable.tail_10_rotation_z_raw + 180.0) : (variable.tail_10_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_10_position_x = variable.tail_9_position_x - Math.sin(variable.tail_9_rotation_y) * Math.cos(variable.tail_9_rotation_x) * 10.0;", + "variable.tail_10_position_y = variable.tail_9_position_y - Math.sin(variable.tail_9_rotation_x) * variable.tail_distance;", + "variable.tail_10_position_z = variable.tail_9_position_z - Math.cos(variable.tail_9_rotation_y) * Math.cos(variable.tail_9_rotation_x) * 10.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(257.83 + variable.flap_time) * 2.86;", + + "variable.tail_11_rotation_x = variable.tail_rotation_x + (v.historical_frame_22.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_11_rotation_y_raw = Math.mod((v.historical_frame_22.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_11_rotation_y = (variable.tail_11_rotation_y_raw < 0.0 ? (variable.tail_11_rotation_y_raw + 180.0) : (variable.tail_11_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_11_rotation_z_raw = Math.mod((v.historical_frame_22.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_11_rotation_z = -(variable.tail_11_rotation_z_raw < 0.0 ? (variable.tail_11_rotation_z_raw + 180.0) : (variable.tail_11_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_11_position_x = variable.tail_10_position_x - Math.sin(variable.tail_10_rotation_y) * Math.cos(variable.tail_10_rotation_x) * 10.0;", + "variable.tail_11_position_y = variable.tail_10_position_y - Math.sin(variable.tail_10_rotation_x) * variable.tail_distance;", + "variable.tail_11_position_z = variable.tail_10_position_z - Math.cos(variable.tail_10_rotation_y) * Math.cos(variable.tail_10_rotation_x) * 10.0;", + + "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(283.61 + variable.flap_time) * 2.86;", + + "variable.tail_12_rotation_x = variable.tail_rotation_x + (v.historical_frame_23.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", + "variable.tail_12_rotation_y_raw = Math.mod((v.historical_frame_23.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", + "variable.tail_12_rotation_y = (variable.tail_12_rotation_y_raw < 0.0 ? (variable.tail_12_rotation_y_raw + 180.0) : (variable.tail_12_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", + "variable.tail_12_rotation_z_raw = Math.mod((v.historical_frame_23.rot_y - variable.piece_rotation) + 180.0, 360.0);", + "variable.tail_12_rotation_z = -(variable.tail_12_rotation_z_raw < 0.0 ? (variable.tail_12_rotation_z_raw + 180.0) : (variable.tail_12_rotation_z_raw - 180.0)) * variable.rotationScale;", + + "variable.tail_12_position_x = variable.tail_11_position_x - Math.sin(variable.tail_11_rotation_y) * Math.cos(variable.tail_11_rotation_x) * 10.0;", + "variable.tail_12_position_y = variable.tail_11_position_y - Math.sin(variable.tail_11_rotation_x) * variable.tail_distance;", + "variable.tail_12_position_z = variable.tail_11_position_z - Math.cos(variable.tail_11_rotation_y) * Math.cos(variable.tail_11_rotation_x) * 10.0;" + ], + "animate": [ + "setup", + "jaw_movement", + "neck_head_movement", + "wings_limbs_movement", + "tail_movement" + ] + }, + "animations": { + "setup": "animation.ender_dragon.setup", + "jaw_movement": "animation.ender_dragon.jaw_movement", + "neck_head_movement": "animation.ender_dragon.neck_head_movement", + "wings_limbs_movement": "animation.ender_dragon.wings_limbs_movement", + "tail_movement": "animation.ender_dragon.tail_movement" + }, + "render_controllers": [ + { "controller.render.ender_dragon_death_pre_pass": "query.death_ticks > 1.0" }, + { "controller.render.ender_dragon_death_main_pass": "query.death_ticks > 1.0" }, + { "controller.render.ender_dragon_default": "query.death_ticks <= 1.0" } + ], "spawn_egg": { - "base_color": "#1c1c1c", - "overlay_color": "#e079fa" + "texture": "spawn_egg_ender_dragon" } } } -} \ No newline at end of file +} diff --git a/resource_pack/entity/enderman.entity.json b/resource_pack/entity/enderman.entity.json index 380b1ea..b225a15 100644 --- a/resource_pack/entity/enderman.entity.json +++ b/resource_pack/entity/enderman.entity.json @@ -42,8 +42,7 @@ ], "render_controllers": [ "controller.render.enderman" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 7 + "texture": "spawn_egg_enderman" } } } diff --git a/resource_pack/entity/endermite.entity.json b/resource_pack/entity/endermite.entity.json index 93a0d93..3208b75 100644 --- a/resource_pack/entity/endermite.entity.json +++ b/resource_pack/entity/endermite.entity.json @@ -18,8 +18,7 @@ ], "render_controllers": [ "controller.render.endermite" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 25 + "texture": "spawn_egg_endermite" } } } diff --git a/resource_pack/entity/evocation_illager.entity.json b/resource_pack/entity/evocation_illager.entity.json index 6a89a2b..ee2dbbe 100644 --- a/resource_pack/entity/evocation_illager.entity.json +++ b/resource_pack/entity/evocation_illager.entity.json @@ -24,20 +24,17 @@ "general": "animation.evoker.general", "casting": "animation.evoker.casting", "look_at_target": "animation.common.look_at_target", - "move": "animation.evoker.move", - "riding.legs": "animation.humanoid.riding.legs", + "move": "animation.villager.move", "celebrating": "animation.humanoid.celebrating", "controller_general": "controller.animation.evoker.general", - "controller_move": "controller.animation.villager.move", - "controller_riding": "controller.animation.humanoid.riding_legs_only" + "controller_move": "controller.animation.villager.move" }, "particle_effects": { "spell": "minecraft:evoker_spell" }, "render_controllers": [ "controller.render.evoker" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 40 + "texture": "spawn_egg_evoker" } } } diff --git a/resource_pack/entity/fox.entity.json b/resource_pack/entity/fox.entity.json index 31ad1ef..a0b53e6 100644 --- a/resource_pack/entity/fox.entity.json +++ b/resource_pack/entity/fox.entity.json @@ -33,8 +33,7 @@ }, "render_controllers": [ "controller.render.fox" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 55 + "texture": "spawn_egg_fox" } } } diff --git a/resource_pack/entity/frog.entity.json b/resource_pack/entity/frog.entity.json index 0d9b869..259d593 100644 --- a/resource_pack/entity/frog.entity.json +++ b/resource_pack/entity/frog.entity.json @@ -13,8 +13,7 @@ "default": "geometry.frog" }, "spawn_egg": { - "base_color": "#d07444", - "overlay_color": "#ffc77c" + "texture": "spawn_egg_frog" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/ghast.entity.json b/resource_pack/entity/ghast.entity.json index cd40d3d..636b608 100644 --- a/resource_pack/entity/ghast.entity.json +++ b/resource_pack/entity/ghast.entity.json @@ -12,8 +12,7 @@ "default": "geometry.ghast" }, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 19 + "texture": "spawn_egg_ghast" }, "animations": { "move": "animation.ghast.move", diff --git a/resource_pack/entity/glow_squid.entity.json b/resource_pack/entity/glow_squid.entity.json index b9b435e..5c7b73f 100644 --- a/resource_pack/entity/glow_squid.entity.json +++ b/resource_pack/entity/glow_squid.entity.json @@ -22,8 +22,7 @@ }, "render_controllers": [ "controller.render.glow_squid" ], "spawn_egg": { - "base_color": "#0x095656", - "overlay_color": "#0x85f1bc" + "texture": "spawn_egg_glow_squid" } } } diff --git a/resource_pack/entity/goat.entity.json b/resource_pack/entity/goat.entity.json index f197286..e035fcf 100644 --- a/resource_pack/entity/goat.entity.json +++ b/resource_pack/entity/goat.entity.json @@ -11,8 +11,7 @@ "default": "geometry.goat" }, "spawn_egg": { - "base_color": "#c0ac90", - "overlay_color": "#857261" + "texture": "spawn_egg_goat" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/guardian.entity.json b/resource_pack/entity/guardian.entity.json index 8a25d7a..b064eba 100644 --- a/resource_pack/entity/guardian.entity.json +++ b/resource_pack/entity/guardian.entity.json @@ -48,8 +48,7 @@ }, "render_controllers": [ "controller.render.guardian" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 26 + "texture": "spawn_egg_guardian" } } } diff --git a/resource_pack/entity/hoglin.entity.json b/resource_pack/entity/hoglin.entity.json index b185405..7aa6bd9 100644 --- a/resource_pack/entity/hoglin.entity.json +++ b/resource_pack/entity/hoglin.entity.json @@ -11,8 +11,7 @@ "default": "geometry.hoglin" }, "spawn_egg": { - "base_color": "#C66E55", - "overlay_color": "#5f6464" + "texture": "spawn_egg_hoglin" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/horse_v3.entity.json b/resource_pack/entity/horse_v3.entity.json index 61ad1a9..abd6712 100644 --- a/resource_pack/entity/horse_v3.entity.json +++ b/resource_pack/entity/horse_v3.entity.json @@ -60,8 +60,7 @@ }, "render_controllers": [ "controller.render.horse.v3" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 23 + "texture": "spawn_egg_horse" } } } diff --git a/resource_pack/entity/husk.entity.json b/resource_pack/entity/husk.entity.json index 3977ab6..85ee8e4 100644 --- a/resource_pack/entity/husk.entity.json +++ b/resource_pack/entity/husk.entity.json @@ -52,8 +52,7 @@ "render_controllers": [ "controller.render.husk" ], "enable_attachables": true, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 28 + "texture": "spawn_egg_husk" } } } diff --git a/resource_pack/entity/iron_golem.entity.json b/resource_pack/entity/iron_golem.entity.json index 78a7971..6b8ec36 100644 --- a/resource_pack/entity/iron_golem.entity.json +++ b/resource_pack/entity/iron_golem.entity.json @@ -3,10 +3,45 @@ "minecraft:client_entity": { "description": { "identifier": "minecraft:iron_golem", + "materials": { "default": "iron_golem" }, + "textures": { + "default": "textures/entity/iron_golem", + "cracked_high": "textures/entity/iron_golem/cracked_high", + "cracked_med": "textures/entity/iron_golem/cracked_medium", + "cracked_low": "textures/entity/iron_golem/cracked_low", + "cracked_none": "textures/entity/iron_golem/cracked_none" + }, + "geometry": { + "default": "geometry.irongolem" + }, + "animations": { + "walk": "animation.iron_golem.walk", + "move": "animation.iron_golem.move", + "walk_to_target": "animation.iron_golem.walk_to_target", + "move_to_target": "animation.iron_golem.move_to_target", + "attack": "animation.iron_golem.attack", + "flower": "animation.iron_golem.flower", + "look_at_target": "animation.common.look_at_target", + "move_controller": "controller.animation.iron_golem.move", + "arm_controller": "controller.animation.iron_golem.arm_movement" + }, + "scripts": { + "pre_animation": [ + "variable.modified_tcos0 = Math.clamp(((Math.cos(query.modified_distance_moved * 13.5) * Math.min(query.modified_move_speed, 0.6) / variable.gliding_speed_value) * 25.0), -12.5, 12.5);" + ], + "animate": [ + "look_at_target", + "move_controller", + "arm_controller" + ] + }, + "render_controllers": [ + "controller.render.iron_golem", + "controller.render.iron_golem_cracks" + ], "spawn_egg": { - "base_color": "#dbcdc2", - "overlay_color": "#74a332" + "texture": "spawn_egg_iron_golem" } } } -} \ No newline at end of file +} diff --git a/resource_pack/entity/llama.entity.json b/resource_pack/entity/llama.entity.json index c682c65..ffd14af 100644 --- a/resource_pack/entity/llama.entity.json +++ b/resource_pack/entity/llama.entity.json @@ -44,8 +44,7 @@ ], "render_controllers": [ "controller.render.llama" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 38 + "texture": "spawn_egg_llama" } } } diff --git a/resource_pack/entity/magma_cube.entity.json b/resource_pack/entity/magma_cube.entity.json index 5eb7a01..df714f7 100644 --- a/resource_pack/entity/magma_cube.entity.json +++ b/resource_pack/entity/magma_cube.entity.json @@ -29,8 +29,7 @@ ], "render_controllers": [ "controller.render.magma_cube" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 20 + "texture": "spawn_egg_magma_cube" } } } diff --git a/resource_pack/entity/mooshroom.entity.json b/resource_pack/entity/mooshroom.entity.json index 86da6ec..e232d47 100644 --- a/resource_pack/entity/mooshroom.entity.json +++ b/resource_pack/entity/mooshroom.entity.json @@ -6,11 +6,11 @@ "min_engine_version": "1.8.0", "materials": { "default": "mooshroom" }, "textures": { - "default": "textures/entity/cow/mooshroom", - "brown": "textures/entity/cow/brown_mooshroom" + "default": "textures/entity/cow/mooshroom_v2", + "brown": "textures/entity/cow/brown_mooshroom_v2" }, "geometry": { - "default": "geometry.mooshroom.v1.8" + "default": "geometry.mooshroom.v2" }, "animations": { "setup": "animation.mooshroom.setup", @@ -25,8 +25,7 @@ ], "render_controllers": [ "controller.render.mooshroom" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 5 + "texture": "spawn_egg_mooshroom" } } } diff --git a/resource_pack/entity/mule_v3.entity.json b/resource_pack/entity/mule_v3.entity.json index 5a3ee46..dd4bd58 100644 --- a/resource_pack/entity/mule_v3.entity.json +++ b/resource_pack/entity/mule_v3.entity.json @@ -46,8 +46,7 @@ }, "render_controllers": [ "controller.render.mule.v3" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 31 + "texture": "spawn_egg_mule" } } } diff --git a/resource_pack/entity/ocelot.entity.json b/resource_pack/entity/ocelot.entity.json index e67655b..c67e982 100644 --- a/resource_pack/entity/ocelot.entity.json +++ b/resource_pack/entity/ocelot.entity.json @@ -29,8 +29,7 @@ ], "render_controllers": [ "controller.render.ocelot" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 16 + "texture": "spawn_egg_ocelot" } } } diff --git a/resource_pack/entity/panda.entity.json b/resource_pack/entity/panda.entity.json index 85dec1f..4b06bef 100644 --- a/resource_pack/entity/panda.entity.json +++ b/resource_pack/entity/panda.entity.json @@ -34,8 +34,7 @@ ], "render_controllers": [ "controller.render.panda" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 54 + "texture": "spawn_egg_panda" } } } diff --git a/resource_pack/entity/parrot.entity.json b/resource_pack/entity/parrot.entity.json index f4e282f..ee6c1e9 100644 --- a/resource_pack/entity/parrot.entity.json +++ b/resource_pack/entity/parrot.entity.json @@ -37,8 +37,7 @@ ], "render_controllers": [ "controller.render.parrot" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 43 + "texture": "spawn_egg_parrot" } } } diff --git a/resource_pack/entity/phantom.entity.json b/resource_pack/entity/phantom.entity.json index f3892ac..5aba246 100644 --- a/resource_pack/entity/phantom.entity.json +++ b/resource_pack/entity/phantom.entity.json @@ -38,8 +38,7 @@ }, "render_controllers": [ "controller.render.phantom" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 51 + "texture": "spawn_egg_phantom" } } } diff --git a/resource_pack/entity/pig.entity.json b/resource_pack/entity/pig.entity.json index 43d97d1..36593ba 100644 --- a/resource_pack/entity/pig.entity.json +++ b/resource_pack/entity/pig.entity.json @@ -4,13 +4,17 @@ "description": { "identifier": "minecraft:pig", "min_engine_version": "1.8.0", - "materials": { "default": "pig" }, + "materials": { + "default": "pig_v3" + }, "textures": { - "default": "textures/entity/pig/pig", - "saddled": "textures/entity/pig/pig_saddle" + "default": "textures/entity/pig/pig_v3", + "warm": "textures/entity/pig/pig_warm", + "cold": "textures/entity/pig/pig_cold", + "saddle": "textures/entity/saddle_v2" }, "geometry": { - "default": "geometry.pig.v1.8" + "default": "geometry.pig.v3" }, "animations": { "setup": "animation.pig.setup", @@ -19,6 +23,10 @@ "baby_transform": "animation.pig.baby_transform" }, "scripts": { + "pre_animation": [ + "t.variant = query.property('minecraft:climate_variant');", + "v.index = (t.variant == 'temperate') ? 0 : ((t.variant == 'warm') ? 1 : 2);" + ], "animate": [ "setup", { "walk": "query.modified_move_speed" }, @@ -26,10 +34,12 @@ { "baby_transform": "query.is_baby" } ] }, - "render_controllers": [ "controller.render.pig" ], + "render_controllers": [ + "controller.render.saddle", + "controller.render.pig.v3" + ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 2 + "texture": "spawn_egg_pig" } } } diff --git a/resource_pack/entity/piglin.entity.json b/resource_pack/entity/piglin.entity.json index 57bf063..4042efb 100644 --- a/resource_pack/entity/piglin.entity.json +++ b/resource_pack/entity/piglin.entity.json @@ -13,8 +13,7 @@ "default": "geometry.piglin" }, "spawn_egg": { - "base_color": "#995f40", - "overlay_color": "#f9f3a4" + "texture": "spawn_egg_piglin" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/piglin_brute.entity.json b/resource_pack/entity/piglin_brute.entity.json index ab6cce9..426762c 100644 --- a/resource_pack/entity/piglin_brute.entity.json +++ b/resource_pack/entity/piglin_brute.entity.json @@ -13,8 +13,7 @@ "default": "geometry.piglin" }, "spawn_egg": { - "base_color": "#592A10", - "overlay_color": "#F9F3A4" + "texture": "spawn_egg_piglin_brute" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/pillager.entity.json b/resource_pack/entity/pillager.entity.json index e77801a..bf40feb 100644 --- a/resource_pack/entity/pillager.entity.json +++ b/resource_pack/entity/pillager.entity.json @@ -13,8 +13,7 @@ "default": "geometry.pillager" }, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 56 + "texture": "spawn_egg_pillager" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/polar_bear.entity.json b/resource_pack/entity/polar_bear.entity.json index c080532..7314304 100644 --- a/resource_pack/entity/polar_bear.entity.json +++ b/resource_pack/entity/polar_bear.entity.json @@ -3,9 +3,37 @@ "minecraft:client_entity": { "description": { "identifier": "minecraft:polar_bear", + "materials": { + "default": "polar_bear" + }, + "textures": { + "default": "textures/entity/polarbear" + }, + "geometry": { + "default": "geometry.polarbear" + }, + "animations": { + "walk": "animation.quadruped.walk", + "move": "animation.polarbear.move", + "look_at_target": "animation.common.look_at_target", + "baby_transform": "animation.polarbear.baby_transform" + }, + "scripts": { + "scale": "1.2" + }, + "animation_controllers": [ + { + "move": "controller.animation.polarbear.move" + }, + { + "baby": "controller.animation.polarbear.baby" + } + ], + "render_controllers": [ + "controller.render.polarbear" + ], "spawn_egg": { - "base_color": "#eeeede", - "overlay_color": "#d5d6cd" + "texture": "spawn_egg_polar_bear" } } } diff --git a/resource_pack/entity/pufferfish.entity.json b/resource_pack/entity/pufferfish.entity.json index 8141779..1065ff8 100644 --- a/resource_pack/entity/pufferfish.entity.json +++ b/resource_pack/entity/pufferfish.entity.json @@ -33,8 +33,7 @@ { "controller.render.pufferfish.large": "query.variant == 2" } ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 46 + "texture": "spawn_egg_pufferfish" } } } diff --git a/resource_pack/entity/rabbit.entity.json b/resource_pack/entity/rabbit.entity.json index cb4c4c0..1cb733f 100644 --- a/resource_pack/entity/rabbit.entity.json +++ b/resource_pack/entity/rabbit.entity.json @@ -28,8 +28,7 @@ ], "render_controllers": [ "controller.render.rabbit" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 24 + "texture": "spawn_egg_rabbit" } } } diff --git a/resource_pack/entity/ravager.entity.json b/resource_pack/entity/ravager.entity.json index 74a6c57..425d594 100644 --- a/resource_pack/entity/ravager.entity.json +++ b/resource_pack/entity/ravager.entity.json @@ -16,8 +16,7 @@ "controller.render.ravager" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 57 + "texture": "spawn_egg_ravager" }, "animations": { "walk": "animation.ravager.walk", diff --git a/resource_pack/entity/salmon.entity.json b/resource_pack/entity/salmon.entity.json index c30d383..cd17b2b 100644 --- a/resource_pack/entity/salmon.entity.json +++ b/resource_pack/entity/salmon.entity.json @@ -27,8 +27,7 @@ ], "render_controllers": [ "controller.render.salmon" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 47 + "texture": "spawn_egg_salmon" } } } diff --git a/resource_pack/entity/sheep.entity.json b/resource_pack/entity/sheep.entity.json index c9bb761..b352b53 100644 --- a/resource_pack/entity/sheep.entity.json +++ b/resource_pack/entity/sheep.entity.json @@ -30,8 +30,7 @@ }, "render_controllers": [ "controller.render.sheep" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 3 + "texture": "spawn_egg_sheep" } } } diff --git a/resource_pack/entity/shulker.entity.json b/resource_pack/entity/shulker.entity.json index 0ee413f..390ca5b 100644 --- a/resource_pack/entity/shulker.entity.json +++ b/resource_pack/entity/shulker.entity.json @@ -28,8 +28,7 @@ "default": "geometry.shulker.v1.8" }, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 34 + "texture": "spawn_egg_shulker" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/silverfish.entity.json b/resource_pack/entity/silverfish.entity.json index ffd0f48..2b9bcb7 100644 --- a/resource_pack/entity/silverfish.entity.json +++ b/resource_pack/entity/silverfish.entity.json @@ -21,8 +21,7 @@ ], "render_controllers": [ "controller.render.silverfish" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 8 + "texture": "spawn_egg_silverfish" } } } diff --git a/resource_pack/entity/skeleton.entity.json b/resource_pack/entity/skeleton.entity.json index bf1922f..4ef044a 100644 --- a/resource_pack/entity/skeleton.entity.json +++ b/resource_pack/entity/skeleton.entity.json @@ -14,8 +14,7 @@ "default": "geometry.skeleton.v1.8" }, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 9 + "texture": "spawn_egg_skeleton" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/skeleton_horse_v3.entity.json b/resource_pack/entity/skeleton_horse_v3.entity.json index 4d9ed10..f63321e 100644 --- a/resource_pack/entity/skeleton_horse_v3.entity.json +++ b/resource_pack/entity/skeleton_horse_v3.entity.json @@ -45,8 +45,7 @@ }, "render_controllers": [ "controller.render.skeleton_horse.v3" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 32 + "texture": "spawn_egg_skeleton_horse" } } } diff --git a/resource_pack/entity/slime.entity.json b/resource_pack/entity/slime.entity.json index 23ff886..4c55243 100644 --- a/resource_pack/entity/slime.entity.json +++ b/resource_pack/entity/slime.entity.json @@ -30,8 +30,7 @@ "controller.render.slime_armor" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 10 + "texture": "spawn_egg_slime" } } } diff --git a/resource_pack/entity/sniffer.entity.json b/resource_pack/entity/sniffer.entity.json index ad9aac5..0356e22 100644 --- a/resource_pack/entity/sniffer.entity.json +++ b/resource_pack/entity/sniffer.entity.json @@ -41,8 +41,7 @@ ], "render_controllers": [ "controller.render.sniffer" ], "spawn_egg": { - "base_color": "#871E09", - "overlay_color": "#25AB70" + "texture": "spawn_egg_sniffer" }, "sound_effects": { "drop_seed": "mob.sniffer.drop_seed", diff --git a/resource_pack/entity/snow_golem.entity.json b/resource_pack/entity/snow_golem.entity.json index d893a9c..d47398b 100644 --- a/resource_pack/entity/snow_golem.entity.json +++ b/resource_pack/entity/snow_golem.entity.json @@ -4,10 +4,27 @@ "description": { "identifier": "minecraft:snow_golem", "min_engine_version": "1.8.0", + "materials": { + "default": "snow_golem", + "head": "snow_golem_pumpkin" + }, + "textures": { + "default": "textures/entity/snow_golem" + }, + "geometry": { + "default": "geometry.snowgolem.v1.8" + }, + "animations": { + "move": "animation.snowgolem.move.v1.8", + "look_at_target": "animation.common.look_at_target" + }, + "animation_controllers": [ + { "move": "controller.animation.snowgolem.move.v1.8" } + ], + "render_controllers": [ "controller.render.snowgolem" ], "spawn_egg": { - "base_color": "#d9f2f2", - "overlay_color": "#81a4a4" + "texture": "spawn_egg_snow_golem" } } } -} +} \ No newline at end of file diff --git a/resource_pack/entity/spider.entity.json b/resource_pack/entity/spider.entity.json index ef2e62a..4be7381 100644 --- a/resource_pack/entity/spider.entity.json +++ b/resource_pack/entity/spider.entity.json @@ -24,8 +24,7 @@ ], "render_controllers": [ "controller.render.spider" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 11 + "texture": "spawn_egg_spider" } } } diff --git a/resource_pack/entity/squid.entity.json b/resource_pack/entity/squid.entity.json index 8b0ef59..6addfdb 100644 --- a/resource_pack/entity/squid.entity.json +++ b/resource_pack/entity/squid.entity.json @@ -22,8 +22,7 @@ }, "render_controllers": [ "controller.render.squid" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 15 + "texture": "spawn_egg_squid" } } } diff --git a/resource_pack/entity/stray.entity.json b/resource_pack/entity/stray.entity.json index 5255736..1a670c2 100644 --- a/resource_pack/entity/stray.entity.json +++ b/resource_pack/entity/stray.entity.json @@ -17,8 +17,7 @@ "overlay": "geometry.stray.armor.v1.8" }, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 27 + "texture": "spawn_egg_stray" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/strider.entity.json b/resource_pack/entity/strider.entity.json index d85b85c..69bb21b 100644 --- a/resource_pack/entity/strider.entity.json +++ b/resource_pack/entity/strider.entity.json @@ -14,8 +14,7 @@ "default": "geometry.strider" }, "spawn_egg": { - "base_color": "#9c3436", - "overlay_color": "#4d494d" + "texture": "spawn_egg_strider" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/tadpole.entity.json b/resource_pack/entity/tadpole.entity.json index 06a285e..dcee2e7 100644 --- a/resource_pack/entity/tadpole.entity.json +++ b/resource_pack/entity/tadpole.entity.json @@ -11,8 +11,7 @@ "default": "geometry.tadpole" }, "spawn_egg": { - "base_color": "#6d533d", - "overlay_color": "#160a00" + "texture": "spawn_egg_tadpole" }, "animations": { "swim": "animation.tadpole.swim" diff --git a/resource_pack/entity/trader_llama.entity.json b/resource_pack/entity/trader_llama.entity.json index 573c561..68f6e6f 100644 --- a/resource_pack/entity/trader_llama.entity.json +++ b/resource_pack/entity/trader_llama.entity.json @@ -43,8 +43,7 @@ ], "render_controllers": [ "controller.render.llama" ], "spawn_egg": { - "base_color": "#eaa430", - "overlay_color": "#456296" + "texture": "spawn_egg_trader_llama" } } } diff --git a/resource_pack/entity/tropicalfish.entity.json b/resource_pack/entity/tropicalfish.entity.json index d6c034b..d77443f 100644 --- a/resource_pack/entity/tropicalfish.entity.json +++ b/resource_pack/entity/tropicalfish.entity.json @@ -39,8 +39,7 @@ ], "render_controllers": [ "controller.render.tropicalfish" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 44 + "texture": "spawn_egg_tropicalfish" } } } diff --git a/resource_pack/entity/turtle.entity.json b/resource_pack/entity/turtle.entity.json index 9ff4ce8..a401a76 100644 --- a/resource_pack/entity/turtle.entity.json +++ b/resource_pack/entity/turtle.entity.json @@ -31,8 +31,7 @@ ], "render_controllers": [ "controller.render.turtle" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 50 + "texture": "spawn_egg_turtle" } } } diff --git a/resource_pack/entity/vex.entity.json b/resource_pack/entity/vex.entity.json index 18d4df8..a7f8258 100644 --- a/resource_pack/entity/vex.entity.json +++ b/resource_pack/entity/vex.entity.json @@ -30,10 +30,9 @@ { "vex_idle": "controller.animation.vex.idle" } ], "render_controllers": [ "controller.render.vex" ], - "held_item_ignores_lighting": true, + "held_item_ignores_lighting": true, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 41 + "texture": "spawn_egg_vex" } } } diff --git a/resource_pack/entity/villager_v2.entity.json b/resource_pack/entity/villager_v2.entity.json index 6ca3ca9..85452cf 100644 --- a/resource_pack/entity/villager_v2.entity.json +++ b/resource_pack/entity/villager_v2.entity.json @@ -81,8 +81,7 @@ "controller.render.villager_v2_level" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 14 + "texture": "spawn_egg_villager" } } } diff --git a/resource_pack/entity/vindicator.entity.json b/resource_pack/entity/vindicator.entity.json index 9b97875..3110f08 100644 --- a/resource_pack/entity/vindicator.entity.json +++ b/resource_pack/entity/vindicator.entity.json @@ -8,8 +8,7 @@ "textures": { "default": "textures/entity/vindicator" }, "geometry": { "default": "geometry.vindicator.v1.8" }, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 39 + "texture": "spawn_egg_vindicator" }, "scripts": { "scale": "0.9375", diff --git a/resource_pack/entity/warden.entity.json b/resource_pack/entity/warden.entity.json index c518a19..d15b4d7 100644 --- a/resource_pack/entity/warden.entity.json +++ b/resource_pack/entity/warden.entity.json @@ -89,8 +89,7 @@ ], "enable_attachables": true, "spawn_egg": { - "base_color": "#0F4649", - "overlay_color": "#39D6E0" + "texture": "spawn_egg_warden" }, "sound_effects": { "emerge": "mob.warden.emerge", diff --git a/resource_pack/entity/witch.entity.json b/resource_pack/entity/witch.entity.json index 0141f7d..1c09904 100644 --- a/resource_pack/entity/witch.entity.json +++ b/resource_pack/entity/witch.entity.json @@ -28,8 +28,7 @@ ], "render_controllers": [ "controller.render.witch" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 17 + "texture": "spawn_egg_witch" } } } diff --git a/resource_pack/entity/wither.entity.json b/resource_pack/entity/wither.entity.json index 524cb13..34c5386 100644 --- a/resource_pack/entity/wither.entity.json +++ b/resource_pack/entity/wither.entity.json @@ -4,9 +4,48 @@ "description": { "identifier": "minecraft:wither", "min_engine_version": "1.8.0", + "materials": { + "default": "wither_boss", + "armor": "wither_boss_armor" + }, + "textures": { + "default": "textures/entity/wither_boss/wither", + "armor_white": "textures/entity/wither_boss/wither_armor_white", + "armor_blue": "textures/entity/wither_boss/wither_armor_blue", + "invulnerable": "textures/entity/wither_boss/wither_invulnerable" + }, + "geometry": { + "default": "geometry.witherBoss", + "armor": "geometry.witherBoss.armor.v1.8" + }, + "scripts": { + "pre_animation": [ + "variable.base_scale = 2;", + "variable.swell_clamped = Math.clamp(query.swell_amount, 0.0, 1.0);", + "variable.wobble = 1.0 + Math.sin(query.swell_amount * 5730) * query.swell_amount * 0.01;", + "variable.swell_adjustment = Math.pow(variable.swell_clamped, 4);", + "variable.scale_xz = (1.0 + variable.swell_adjustment * 0.4) * variable.wobble;", + "variable.scale_y = (1.0 + variable.swell_adjustment * 0.1) / variable.wobble;", + "variable.body_base_rotation = Math.cos(query.life_time * 114.6);", + "variable.upper_body_rotation = (0.065 + 0.05 * variable.body_base_rotation) * 180 + query.target_x_rotation;", + "variable.is_invulnerable = query.invulnerable_ticks > 0.0;", + "variable.display_normal_skin = (query.invulnerable_ticks <= 0) || ((query.invulnerable_ticks <= 80) && (Math.mod(query.invulnerable_ticks / 5, 2) == 1));" + ], + "scalex": "variable.scale_xz * variable.base_scale", + "scaley": "variable.scale_y * variable.base_scale", + "scalez": "variable.scale_xz * variable.base_scale" + }, + "animations": { + "scale": "animation.wither_boss.scale", + "move": "animation.wither_boss.move", + "look_at_target": "animation.wither_boss.look_at_target" + }, + "animation_controllers": [ + { "move": "controller.animation.wither_boss.move" } + ], + "render_controllers": [ "controller.render.wither_boss", "controller.render.wither_boss_armor_white", "controller.render.wither_boss_armor_blue" ], "spawn_egg": { - "base_color": "#141414", - "overlay_color": "#4d72a0" + "texture": "spawn_egg_wither" } } } diff --git a/resource_pack/entity/wither_skeleton.entity.json b/resource_pack/entity/wither_skeleton.entity.json index 2cda3f5..f278248 100644 --- a/resource_pack/entity/wither_skeleton.entity.json +++ b/resource_pack/entity/wither_skeleton.entity.json @@ -53,8 +53,7 @@ "render_controllers": [ "controller.render.wither_skeleton" ], "enable_attachables": true, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 29 + "texture": "spawn_egg_wither_skeleton" } } } diff --git a/resource_pack/entity/wolf.entity.json b/resource_pack/entity/wolf.entity.json index df9d7cf..95d0805 100644 --- a/resource_pack/entity/wolf.entity.json +++ b/resource_pack/entity/wolf.entity.json @@ -77,8 +77,7 @@ ], "enable_attachables": true, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 4 + "texture": "spawn_egg_wolf" } } } diff --git a/resource_pack/entity/zoglin.entity.json b/resource_pack/entity/zoglin.entity.json index c36a61c..b2431f7 100644 --- a/resource_pack/entity/zoglin.entity.json +++ b/resource_pack/entity/zoglin.entity.json @@ -11,8 +11,7 @@ "default": "geometry.hoglin" }, "spawn_egg": { - "base_color": "#c66e55", - "overlay_color": "#e6e6e6" + "texture": "spawn_egg_zoglin" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/zombie.entity.json b/resource_pack/entity/zombie.entity.json index 8624089..19bb246 100644 --- a/resource_pack/entity/zombie.entity.json +++ b/resource_pack/entity/zombie.entity.json @@ -14,8 +14,7 @@ "default": "geometry.zombie.v1.8" }, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 12 + "texture": "spawn_egg_zombie" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/zombie_horse_v3.entity.json b/resource_pack/entity/zombie_horse_v3.entity.json index 14c7506..8f1c8d2 100644 --- a/resource_pack/entity/zombie_horse_v3.entity.json +++ b/resource_pack/entity/zombie_horse_v3.entity.json @@ -45,8 +45,7 @@ }, "render_controllers": [ "controller.render.zombie_horse.v3" ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 33 + "texture": "spawn_egg_zombie_horse" } } } diff --git a/resource_pack/entity/zombie_pigman.entity.json b/resource_pack/entity/zombie_pigman.entity.json index a6f4e91..5dd0d61 100644 --- a/resource_pack/entity/zombie_pigman.entity.json +++ b/resource_pack/entity/zombie_pigman.entity.json @@ -12,8 +12,7 @@ "default": "geometry.piglin" }, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 13 + "texture": "spawn_egg_zombified_piglin" }, "scripts": { "pre_animation": [ diff --git a/resource_pack/entity/zombie_villager.entity.json b/resource_pack/entity/zombie_villager.entity.json index 2f43800..c72191f 100644 --- a/resource_pack/entity/zombie_villager.entity.json +++ b/resource_pack/entity/zombie_villager.entity.json @@ -2,21 +2,47 @@ "format_version": "1.8.0", "minecraft:client_entity": { "description": { - "identifier": "minecraft:zombie_villager", - "min_engine_version": "1.8.0", - "materials": { "default": "zombie_villager" }, + "identifier": "minecraft:zombie_villager_v2", + "materials": { + "default": "zombie_villager_v2", + "masked": "zombie_villager_v2_masked" + }, "textures": { - "smith": "textures/entity/zombie_villager/zombie_smith", - "butcher": "textures/entity/zombie_villager/zombie_butcher", - "librarian": "textures/entity/zombie_villager/zombie_librarian", - "priest": "textures/entity/zombie_villager/zombie_priest", - "farmer": "textures/entity/zombie_villager/zombie_farmer" + "default": "textures/entity/zombie_villager2/zombie-villager", + + // Biome Layer + "desert": "textures/entity/zombie_villager2/biomes/biome-desert-zombie", + "jungle": "textures/entity/zombie_villager2/biomes/biome-jungle-zombie", + "plains": "textures/entity/zombie_villager2/biomes/biome-plains-zombie", + "savanna": "textures/entity/zombie_villager2/biomes/biome-savanna-zombie", + "snow": "textures/entity/zombie_villager2/biomes/biome-snow-zombie", + "swamp": "textures/entity/zombie_villager2/biomes/biome-swamp-zombie", + "taiga": "textures/entity/zombie_villager2/biomes/biome-taiga-zombie", + + // Profession Layer + "armorer": "textures/entity/zombie_villager2/professions/armorer", + "butcher": "textures/entity/zombie_villager2/professions/butcher", + "cartographer": "textures/entity/zombie_villager2/professions/cartographer", + "cleric": "textures/entity/zombie_villager2/professions/cleric", + "farmer": "textures/entity/zombie_villager2/professions/farmer", + "fisherman": "textures/entity/zombie_villager2/professions/fisherman", + "fletcher": "textures/entity/zombie_villager2/professions/fletcher", + "leatherworker": "textures/entity/zombie_villager2/professions/leatherworker", + "librarian": "textures/entity/zombie_villager2/professions/librarian", + "shepherd": "textures/entity/zombie_villager2/professions/shepherd", + "tool_smith": "textures/entity/zombie_villager2/professions/toolsmith", + "weapon_smith": "textures/entity/zombie_villager2/professions/weaponsmith", + "stonemason": "textures/entity/zombie_villager2/professions/stonemason", + "nitwit": "textures/entity/zombie_villager2/professions/nitwit", + "unskilled": "textures/entity/zombie_villager2/professions/unskilled" }, "geometry": { - "default": "geometry.zombie.villager.v1.8" + "default": "geometry.zombie.villager_v2" }, "scripts": { "pre_animation": [ + "variable.num_professions = 15;", + "variable.profession_index = ((query.variant < variable.num_professions) ? query.variant : 0);", "variable.tcos0 = (Math.cos(query.modified_distance_moved * 38.17) * query.modified_move_speed / variable.gliding_speed_value) * 57.3;" ] }, @@ -59,11 +85,13 @@ { "zombie_attack_bare_hand": "controller.animation.zombie.attack_bare_hand" }, { "swimming": "controller.animation.zombie.swimming" } ], - "render_controllers": [ "controller.render.zombie_villager" ], + "render_controllers": [ + "controller.render.zombie_villager_v2_base", + "controller.render.zombie_villager_v2_masked" + ], "enable_attachables": true, "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 42 + "texture": "spawn_egg_zombie_villager" } } } diff --git a/resource_pack/models/entity/chicken.cold.geo.json b/resource_pack/models/entity/chicken.cold.geo.json index d6777d6..2557990 100644 --- a/resource_pack/models/entity/chicken.cold.geo.json +++ b/resource_pack/models/entity/chicken.cold.geo.json @@ -2,38 +2,33 @@ "format_version": "1.12.0", "minecraft:geometry": [ { - "description": { - "identifier": "geometry.chicken.cold", - "texture_width": 64, - "texture_height": 32, - "visible_bounds_width": 2, - "visible_bounds_height": 2.5, - "visible_bounds_offset": [ 0, 0.75, 0 ] - }, + "description": { + "identifier": "geometry.chicken.cold", + "texture_width": 64, + "texture_height": 32, + "visible_bounds_width": 3, + "visible_bounds_height": 2.25, + "visible_bounds_offset": [0, 0.875, 0] + }, "bones": [ - { - "name": "root", - "pivot": [0, 0, 0] - }, { "name": "body", - "parent": "root", "pivot": [0, 8, 0], - "rotation": [90, 0, 0], "cubes": [ - {"origin": [-3, 4, -3], "size": [6, 8, 6], "uv": [0, 9]}, - {"origin": [-3, 4, -3], "size": [6, 8, 6], "uv": [0, 9]}, - {"origin": [0, 2, -1], "size": [0, 3, 5], "uv": [38, 9]} + {"origin": [-3, 12, 5], "size": [6, 8, 6], "pivot": [0, 8, 8], "rotation": [90, 0, 0], "uv": [0, 9]}, + {"origin": [0, 10, 7], "size": [0, 3, 5], "pivot": [0, 8, 8], "rotation": [90, 0, 0], "uv": [38, 9]} ] }, { "name": "head", - "parent": "root", "pivot": [0, 9, -4], "cubes": [ {"origin": [-2, 9, -6], "size": [4, 6, 3], "uv": [0, 0]}, {"origin": [-3, 13, -6.015], "size": [6, 3, 4], "uv": [44, 0]} - ] + ], + "locators": { + "lead": [0, 9, -4] + } }, { "name": "comb", @@ -53,7 +48,6 @@ }, { "name": "leg0", - "parent": "root", "pivot": [-2, 5, 1], "cubes": [ {"origin": [-3, 0, -2], "size": [3, 5, 3], "uv": [26, 0]} @@ -61,7 +55,6 @@ }, { "name": "leg1", - "parent": "root", "pivot": [1, 5, 1], "cubes": [ {"origin": [0, 0, -2], "size": [3, 5, 3], "uv": [26, 0]} @@ -69,7 +62,6 @@ }, { "name": "wing0", - "parent": "root", "pivot": [-3, 11, 0], "cubes": [ {"origin": [-4, 7, -3], "size": [1, 4, 6], "uv": [24, 13]} @@ -77,7 +69,6 @@ }, { "name": "wing1", - "parent": "root", "pivot": [3, 11, 0], "cubes": [ {"origin": [3, 7, -3], "size": [1, 4, 6], "uv": [24, 13]} @@ -86,4 +77,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/resource_pack/models/entity/cow.cold.geo.json b/resource_pack/models/entity/cow.cold.geo.json index 1a306c1..320804d 100644 --- a/resource_pack/models/entity/cow.cold.geo.json +++ b/resource_pack/models/entity/cow.cold.geo.json @@ -13,7 +13,7 @@ "bones": [ { "name": "root", - "pivot": [-21, 0, -1] + "pivot": [0, 0, -1] }, { "name": "head", @@ -22,9 +22,12 @@ "cubes": [ {"origin": [-4, 16, -15], "size": [8, 8, 6], "uv": [0, 0]}, {"origin": [-6, 21, -13], "size": [2, 6, 2], "pivot": [-4.5, 22.5, -12.5], "rotation": [90, 0, 0], "uv": [0, 32]}, - {"origin": [-3, 16.01, -16], "size": [6, 3, 2], "uv": [8, 32]}, - {"origin": [4, 19.5, -14.5], "size": [2, 6, 2], "pivot": [5.5, 22.5, -14], "rotation": [90, 0, 0], "uv": [0, 32]} - ] + {"origin": [-3, 16, -16], "size": [6, 3, 1], "uv": [9, 33]}, + {"origin": [4, 19.5, -14.5], "size": [2, 6, 2], "pivot": [5.5, 22.5, -14], "rotation": [90, 0, 0], "uv": [0, 32], "mirror": true} + ], + "locators": { + "lead": [0, 20, -9] + } }, { "name": "body", diff --git a/resource_pack/models/entity/cow.v2.geo.json b/resource_pack/models/entity/cow.v2.geo.json index a9a9eb0..c41fb97 100644 --- a/resource_pack/models/entity/cow.v2.geo.json +++ b/resource_pack/models/entity/cow.v2.geo.json @@ -21,10 +21,13 @@ "pivot": [0, 20, -9], "cubes": [ {"origin": [-4, 16, -15], "size": [8, 8, 6], "uv": [0, 0]}, - {"origin": [-3, 16, -16], "size": [6, 3, 2], "uv": [0, 32]}, + {"origin": [-3, 16, -16], "size": [6, 3, 1], "uv": [1, 33]}, {"origin": [-5, 22, -14], "size": [1, 3, 1], "uv": [22, 0]}, {"origin": [4, 22, -14], "size": [1, 3, 1], "uv": [22, 0]} - ] + ], + "locators": { + "lead": [0, 20, -9] + } }, { "name": "body", diff --git a/resource_pack/models/entity/cow.warm.geo.json b/resource_pack/models/entity/cow.warm.geo.json index 9de803d..e376234 100644 --- a/resource_pack/models/entity/cow.warm.geo.json +++ b/resource_pack/models/entity/cow.warm.geo.json @@ -13,7 +13,7 @@ "bones": [ { "name": "root", - "pivot": [-21, 0, -1] + "pivot": [0, 0, -1] }, { "name": "head", @@ -25,8 +25,11 @@ {"origin": [-8, 23, -14], "size": [2, 2, 2], "uv": [39, 0]}, {"origin": [4, 21, -14], "size": [4, 2, 2], "uv": [27, 0], "mirror": true}, {"origin": [6, 23, -14], "size": [2, 2, 2], "uv": [39, 0], "mirror": true}, - {"origin": [-3, 16.01, -16], "size": [6, 3, 2], "uv": [0, 32]} - ] + {"origin": [-3, 16, -16], "size": [6, 3, 1], "uv": [1, 33]} + ], + "locators": { + "lead": [0, 20, -9] + } }, { "name": "body", diff --git a/resource_pack/models/entity/mooshroom.v2.geo.json b/resource_pack/models/entity/mooshroom.v2.geo.json new file mode 100644 index 0000000..9182dc7 --- /dev/null +++ b/resource_pack/models/entity/mooshroom.v2.geo.json @@ -0,0 +1,72 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.mooshroom.v2", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 3, + "visible_bounds_height": 3, + "visible_bounds_offset": [0, 1.5, 0] + }, + "bones": [ + { + "name": "body", + "pivot": [0, 19, 2], + "cubes": [ + {"origin": [-6, 8, 2], "size": [12, 18, 10], "pivot": [0, 14, 4], "rotation": [90, 0, 0], "uv": [18, 4]}, + {"origin": [-2, 8, 1], "size": [4, 6, 1], "pivot": [0, 14, 4], "rotation": [90, 0, 0], "uv": [52, 0]} + ] + }, + { + "name": "leg0", + "parent": "body", + "pivot": [-4, 12, 7], + "cubes": [ + {"origin": [-6, 0, 5], "size": [4, 12, 4], "uv": [0, 16]} + ] + }, + { + "name": "leg1", + "parent": "body", + "pivot": [4, 12, 7], + "mirror": true, + "cubes": [ + {"origin": [2, 0, 5], "size": [4, 12, 4], "uv": [0, 16]} + ] + }, + { + "name": "leg2", + "parent": "body", + "pivot": [-4, 12, -6], + "cubes": [ + {"origin": [-6, 0, -7], "size": [4, 12, 4], "uv": [0, 16]} + ] + }, + { + "name": "leg3", + "parent": "body", + "pivot": [4, 12, -6], + "mirror": true, + "cubes": [ + {"origin": [2, 0, -7], "size": [4, 12, 4], "uv": [0, 16]} + ] + }, + { + "name": "head", + "pivot": [0, 20, -8], + "cubes": [ + {"origin": [-4, 16, -14], "size": [8, 8, 6], "uv": [0, 0]}, + {"origin": [-5, 22, -12], "size": [1, 3, 1], "uv": [22, 0]}, + {"origin": [4, 22, -12], "size": [1, 3, 1], "uv": [22, 0]}, + {"origin": [-3, 16, -15], "size": [6, 3, 1], "uv": [1, 33]} + ], + "locators": { + "lead": [0, 20, -8] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/resource_pack/models/entity/pig.v3.geo.json b/resource_pack/models/entity/pig.v3.geo.json index 4ab4d19..c6fe308 100644 --- a/resource_pack/models/entity/pig.v3.geo.json +++ b/resource_pack/models/entity/pig.v3.geo.json @@ -30,7 +30,10 @@ "size": [ 4, 3, 1 ], "uv": [ 16, 16 ] } - ] + ], + "locators": { + "lead": [ 0, 12, -7 ] + } }, { "name": "body", diff --git a/resource_pack/particles/biome_tinted_leaves_particle.json b/resource_pack/particles/biome_tinted_leaves_particle.json index 29c36e9..2c27834 100644 --- a/resource_pack/particles/biome_tinted_leaves_particle.json +++ b/resource_pack/particles/biome_tinted_leaves_particle.json @@ -12,8 +12,8 @@ "minecraft:emitter_initialization": { "creation_expression": "v.fall_acc = -0.3; v.wind_acc = 10; v.curve_len = 15;" }, - "minecraft:emitter_rate_instant": { - "num_particles": 1 + "minecraft:emitter_rate_manual": { + "max_particles": 2000 }, "minecraft:emitter_lifetime_expression": { "activation_expression": 1, diff --git a/resource_pack/render_controllers/saddle.render_controllers.json b/resource_pack/render_controllers/saddle.render_controllers.json index cddd9cd..1fb0541 100644 --- a/resource_pack/render_controllers/saddle.render_controllers.json +++ b/resource_pack/render_controllers/saddle.render_controllers.json @@ -4,10 +4,11 @@ "controller.render.saddle": { "geometry": "Geometry.default", "materials": [ { "*": "Material.default" } ], - "textures": [ "Texture.default" ], + "textures": [ "Texture.saddle" ], "part_visibility": [ - { "*": "variable.should_render" } + { "*": false }, + { "body": "q.is_saddled" } ] } } -} +} \ No newline at end of file diff --git a/resource_pack/sounds.json b/resource_pack/sounds.json index 70bf7c3..9d24bfc 100644 --- a/resource_pack/sounds.json +++ b/resource_pack/sounds.json @@ -1,147 +1,200 @@ { "block_sounds": { - "weeping_vines": { + "leaf_litter": { "volume": 1.0, "pitch": 1.0, "events": { "default": "", - "item.use.on": { - "sound": "block.weeping_vines.use", - "pitch": 0.8 - }, "break": { - "sound": "block.weeping_vines.break", - "volume": 1.0, - "pitch": [ 0.8, 1.0 ] + "sound": "block.leaf_litter.break", + "pitch": 0.8 }, "hit": { - "sound": "block.weeping_vines.hit", - "volume": 0.30, + "sound": "block.leaf_litter.step", + "volume": 0.25, "pitch": 0.5 }, "place": { - "sound": "block.weeping_vines.place", - "volume": 1.0, - "pitch": [ 0.8, 1.0 ] + "sound": "block.leaf_litter.place", + "pitch": 0.8 } } }, - "iron": { + "firefly_bush": { + "base": "sweet_berry_bush", + "volume": 1.0, + "pitch": 1.0, + "events": { + "ambient": "block.firefly_bush.ambient" + } + }, + "cactus_flower": { + "base": "sweet_berry_bush", "volume": 1.0, "pitch": 1.0, "events": { - "default": "", - "item.use.on": { - "sound": "step.iron", - "volume": 1.0 - }, "break": { - "sound": "break.iron", - "volume": 1.0, + "sound": "block.cactus_flower.break", "pitch": 0.8 }, - "hit": { - "sound": "hit.iron", - "volume": 0.3, - "pitch": 0.5 - }, "place": { - "sound": "place.iron", - "volume": 1.0, + "sound": "block.cactus_flower.place", "pitch": 0.8 - }, - "power.on": { - "sound": "random.click", - "pitch": 0.6 - }, - "power.off": { - "sound": "random.click", - "pitch": 0.5 - }, - "button.click_on": { - "sound": "random.click", - "pitch": 0.6 - }, - "button.click_off": { - "sound": "random.click", - "pitch": 0.5 - }, - "door.open": { - "sound": "open.iron_door", - "pitch": [ - 0.9, - 1.0 - ] - }, - "door.close": { - "sound": "close.iron_door", - "pitch": [ - 0.9, - 1.0 - ] - }, - "trapdoor.open": { - "sound": "open.iron_trapdoor", - "pitch": [ - 0.9, - 1.0 - ] - }, - "trapdoor.close": { - "sound": "close.iron_trapdoor", - "pitch": [ - 0.9, - 1.0 - ] } } } }, + "sand": { + "volume": 1.0, + "pitch": 1.0, + "events": { + "ambient": "block.sand.ambient" + } + }, + "terracotta": { + "base": "stone", + "volume": 1.0, + "pitch": 1.0, + "events": { + "ambient": "block.sand.ambient" + } + }, + "deadbush": { + "base": "grass", + "volume": 1.0, + "pitch": 1.0, + "events": { + "ambient": "block.deadbush.ambient" + } + }, "interactive_sounds": { "block_sounds": { - "weeping_vines": { + "leaf_litter": { + "volume": 1.0, + "pitch": 1.0, "events": { "default": "", "fall": { - "sounds": "block.weeping_vines.fall", - "volume": 0.4 + "sounds": "block.leaf_litter.step", + "volume": 0.5, + "pitch": 0.75 }, "step": { - "sound": "block.weeping_vines.step", - "volume": 0.30 + "sound": "block.leaf_litter.step", + "volume": 0.15 }, "jump": { - "sound": "block.weeping_vines.jump", + "sound": "block.leaf_litter.step", "volume": 0.12 }, "land": { - "sound": "block.weeping_vines.land", + "sound": "block.leaf_litter.step", "volume": 0.22 } - }, - "volume": 1.0, - "pitch": 1.00 - }, - "iron": { + } + } + } + }, + "entity_sounds": { + "entities": { + "wolf": { "volume": 1.0, - "pitch": 1.0, + "pitch": [ 0.8, 1.2 ], "events": { - "default": "", - "fall": { - "sound": "step.iron" - }, + "ambient": "mob.wolf.bark", + "hurt": "mob.wolf.hurt", + "death": "mob.wolf.death", "step": { - "sound": "step.iron", - "volume": 0.2 + "sound": "mob.wolf.step", + "volume": 0.65, + "pitch": 1.0 }, - "jump": { - "sound": "step.iron", - "volume": 0.12, - "pitch": 1.1 + "shake": { + "sound": "mob.wolf.shake", + "pitch": [ 0.8, 1.2 ] }, - "land": { - "sound": "step.iron", - "volume": 0.4 + "growl": "mob.wolf.growl", + "whine": "mob.wolf.whine", + "pant": "mob.wolf.panting", + "hurt.reduced": "armor.damage_wolf", + "eat": "" + }, + + "variants": { + "key": "query.property('minecraft:sound_variant')", + "map": { + "big": { + "volume": 1.0, + "pitch": [ 0.8, 1.2 ], + "events": { + "ambient": "mob.wolf.big.bark", + "hurt": "mob.wolf.big.hurt", + "death": "mob.wolf.big.death", + "growl": "mob.wolf.big.growl", + "whine": "mob.wolf.big.whine", + "pant": "mob.wolf.big.panting" + } + }, + "cute": { + "volume": 1.0, + "pitch": [ 0.8, 1.2 ], + "events": { + "ambient": "mob.wolf.cute.bark", + "hurt": "mob.wolf.cute.hurt", + "death": "mob.wolf.cute.death", + "growl": "mob.wolf.cute.growl", + "whine": "mob.wolf.cute.whine", + "pant": "mob.wolf.cute.panting" + } + }, + "grumpy": { + "volume": 1.0, + "pitch": [ 0.8, 1.2 ], + "events": { + "ambient": "mob.wolf.grumpy.bark", + "hurt": "mob.wolf.grumpy.hurt", + "death": "mob.wolf.grumpy.death", + "growl": "mob.wolf.grumpy.growl", + "whine": "mob.wolf.grumpy.whine", + "pant": "mob.wolf.grumpy.panting" + } + }, + "mad": { + "volume": 1.0, + "pitch": [ 0.8, 1.2 ], + "events": { + "ambient": "mob.wolf.mad.bark", + "hurt": "mob.wolf.mad.hurt", + "death": "mob.wolf.mad.death", + "growl": "mob.wolf.mad.growl", + "whine": "mob.wolf.mad.whine", + "pant": "mob.wolf.mad.panting" + } + }, + "puglin": { + "volume": 1.0, + "pitch": [ 0.8, 1.2 ], + "events": { + "ambient": "mob.wolf.puglin.bark", + "hurt": "mob.wolf.puglin.hurt", + "death": "mob.wolf.puglin.death", + "growl": "mob.wolf.puglin.growl", + "whine": "mob.wolf.puglin.whine", + "pant": "mob.wolf.puglin.panting" + } + }, + "sad": { + "volume": 1.0, + "pitch": [ 0.8, 1.2 ], + "events": { + "ambient": "mob.wolf.sad.bark", + "hurt": "mob.wolf.sad.hurt", + "death": "mob.wolf.sad.death", + "growl": "mob.wolf.sad.growl", + "whine": "mob.wolf.sad.whine", + "pant": "mob.wolf.sad.panting" + } + } } } } diff --git a/resource_pack/sounds/sound_definitions.json b/resource_pack/sounds/sound_definitions.json index fb4db62..cb8bdc7 100644 --- a/resource_pack/sounds/sound_definitions.json +++ b/resource_pack/sounds/sound_definitions.json @@ -1,166 +1,661 @@ { - "block.cave_vines.place": { + "block.leaf_litter.break": { "category": "block", - "max_distance": 16.0, "sounds": [ - "sounds/block/cave_vines/break1", - "sounds/block/cave_vines/break2", - "sounds/block/cave_vines/break3", - "sounds/block/cave_vines/break4", - "sounds/block/cave_vines/break5" + "sounds/block/leaf_litter/break1", + "sounds/block/leaf_litter/break2", + "sounds/block/leaf_litter/break3", + "sounds/block/leaf_litter/break4", + "sounds/block/leaf_litter/break5" ] }, - "block.weeping_vines.use": { + "block.leaf_litter.place": { "category": "block", - "max_distance": 16.0, + "max_distance": 64.0, "sounds": [ - "sounds/block/vine/break1", - "sounds/block/vine/break2", - "sounds/block/vine/break3", - "sounds/block/vine/break4" + "sounds/block/leaf_litter/place1", + "sounds/block/leaf_litter/place2", + "sounds/block/leaf_litter/place3", + "sounds/block/leaf_litter/place4", + "sounds/block/leaf_litter/place5" ] }, - "block.weeping_vines.place": { + "block.leaf_litter.step": { + "category": "player", + "max_distance": 64.0, + "sounds": [ + "sounds/block/leaf_litter/step1", + "sounds/block/leaf_litter/step2", + "sounds/block/leaf_litter/step3", + "sounds/block/leaf_litter/step4", + "sounds/block/leaf_litter/step5", + "sounds/block/leaf_litter/step6" + ] + }, + "block.firefly_bush.ambient": { "category": "block", - "max_distance": 16.0, + "max_distance": 64.0, "sounds": [ - "sounds/block/roots/break1", - "sounds/block/roots/break2", - "sounds/block/roots/break3", - "sounds/block/roots/break4", - "sounds/block/roots/break5", - "sounds/block/roots/break6" + { + "name": "sounds/block/firefly_bush/ambient1", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/firefly_bush/ambient2", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/firefly_bush/ambient3", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/firefly_bush/ambient4", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/firefly_bush/ambient5", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/firefly_bush/ambient6", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/firefly_bush/ambient7", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/firefly_bush/ambient8", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/firefly_bush/ambient9", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/firefly_bush/ambient10", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/firefly_bush/ambient11", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + } ] }, - "block.weeping_vines.break": { + "block.sand.ambient.attached": { "category": "block", - "max_distance": 16.0, "sounds": [ - "sounds/block/roots/break1", - "sounds/block/roots/break2", - "sounds/block/roots/break3", - "sounds/block/roots/break4", - "sounds/block/roots/break5", - "sounds/block/roots/break6" + { + "name": "sounds/block/sand/wind1", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind2", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind3", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind4", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind5", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind6", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind7", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind8", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind9", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind10", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind11", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/wind12", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + } ] }, - "block.weeping_vines.hit": { + "block.sand.ambient": { "category": "block", - "max_distance": 16.0, + "max_distance": 64.0, "sounds": [ - "sounds/block/roots/break1", - "sounds/block/roots/break2", - "sounds/block/roots/break3", - "sounds/block/roots/break4", - "sounds/block/roots/break5", - "sounds/block/roots/break6" + { + "name": "sounds/block/sand/sand1", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/sand/sand2", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/sand/sand3", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/sand/sand4", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand5", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/sand/sand6", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/sand/sand7", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand8", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand9", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand10", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/sand/sand11", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand12", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand13", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand14", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand15", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand16", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand17", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/sand/sand18", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/sand/sand19", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/sand/sand20", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/sand/sand21", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + } ] }, - "block.weeping_vines.fall": { - "category": "player", - "max_distance": 16.0, + "block.deadbush.ambient": { + "category": "block", + "max_distance": 64.0, "sounds": [ - "sounds/block/roots/break1", - "sounds/block/roots/break2", - "sounds/block/roots/break3", - "sounds/block/roots/break4", - "sounds/block/roots/break5", - "sounds/block/roots/break6" + { + "name": "sounds/block/deadbush/bushrustle1", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/deadbush/bushrustle2", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/deadbush/bushrustle3", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/deadbush/creakysand1", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/deadbush/crickets", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/deadbush/howlingwind1", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/deadbush/insect1", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/deadbush/leaves", + "volume": 1.0, + "pitch": 1.0, + "weight": 1 + }, + { + "name": "sounds/block/deadbush/movingsand1", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/deadbush/movingsand2", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + }, + { + "name": "sounds/block/deadbush/movingsand3", + "volume": 1.0, + "pitch": 1.0, + "weight": 2 + } ] }, - "block.weeping_vines.step": { - "category": "player", + "block.cactus_flower.break": { + "category": "block", "max_distance": 16.0, "sounds": [ - "sounds/block/roots/step1", - "sounds/block/roots/step2", - "sounds/block/roots/step3", - "sounds/block/roots/step4", - "sounds/block/roots/step5" + "sounds/block/cactus_flower/break1", + "sounds/block/cactus_flower/break2", + "sounds/block/cactus_flower/break3", + "sounds/block/cactus_flower/break4", + "sounds/block/cactus_flower/break5" ] }, - "block.weeping_vines.jump": { - "category": "player", + "block.cactus_flower.place": { + "category": "block", "max_distance": 16.0, "sounds": [ - "sounds/block/roots/step1", - "sounds/block/roots/step2", - "sounds/block/roots/step3", - "sounds/block/roots/step4", - "sounds/block/roots/step5" + "sounds/block/cactus_flower/place1", + "sounds/block/cactus_flower/place2", + "sounds/block/cactus_flower/place3", + "sounds/block/cactus_flower/place4" ] }, - "block.weeping_vines.land": { - "category": "player", - "max_distance": 16.0, + "mob.wolf.big.bark": { + "category": "neutral", "sounds": [ - "sounds/block/roots/step1", - "sounds/block/roots/step2", - "sounds/block/roots/step3", - "sounds/block/roots/step4", - "sounds/block/roots/step5" + "sounds/mob/wolf/big/bark1", + "sounds/mob/wolf/big/bark2", + "sounds/mob/wolf/big/bark3" ] }, - "break.iron": { - "category": "block", + "mob.wolf.big.death": { + "category": "neutral", "sounds": [ - "sounds/block/iron/break1", - "sounds/block/iron/break2", - "sounds/block/iron/break3", - "sounds/block/iron/break4", - "sounds/block/iron/break5", - "sounds/block/iron/break6", - "sounds/block/iron/break7", - "sounds/block/iron/break8" + "sounds/mob/wolf/big/death" ] }, - "hit.iron": { - "category": "block", + "mob.wolf.big.growl": { + "category": "neutral", "sounds": [ - "sounds/block/iron/step1", - "sounds/block/iron/step2", - "sounds/block/iron/step3", - "sounds/block/iron/step4" + "sounds/mob/wolf/big/growl1", + "sounds/mob/wolf/big/growl2", + "sounds/mob/wolf/big/growl3" ] }, - "place.iron": { - "category": "block", + "mob.wolf.big.hurt": { + "category": "neutral", "sounds": [ - "sounds/block/iron/break1", - "sounds/block/iron/break2", - "sounds/block/iron/break3", - "sounds/block/iron/break4", - "sounds/block/iron/break5", - "sounds/block/iron/break6", - "sounds/block/iron/break7", - "sounds/block/iron/break8" + "sounds/mob/wolf/big/hurt1", + "sounds/mob/wolf/big/hurt2", + "sounds/mob/wolf/big/hurt3" ] }, - "step.iron": { - "category": "player", + "mob.wolf.big.panting": { + "category": "neutral", "sounds": [ - "sounds/block/iron/step1", - "sounds/block/iron/step2", - "sounds/block/iron/step3", - "sounds/block/iron/step4" + "sounds/mob/wolf/big/panting" ] }, - "use.grass": { - "category": "block", + "mob.wolf.big.whine": { + "category": "neutral", "sounds": [ - "sounds/block/grass/flatten1", - "sounds/block/grass/flatten2", - "sounds/block/grass/flatten3", - "sounds/block/grass/flatten4" + "sounds/mob/wolf/big/whine" ] }, - "use.wood": { - "category": "block", + "mob.wolf.cute.bark": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/cute/bark1", + "sounds/mob/wolf/cute/bark2", + "sounds/mob/wolf/cute/bark3" + ] + }, + "mob.wolf.cute.death": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/cute/death" + ] + }, + "mob.wolf.cute.growl": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/cute/growl1", + "sounds/mob/wolf/cute/growl2", + "sounds/mob/wolf/cute/growl3" + ] + }, + "mob.wolf.cute.hurt": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/cute/hurt1", + "sounds/mob/wolf/cute/hurt2", + "sounds/mob/wolf/cute/hurt3" + ] + }, + "mob.wolf.cute.panting": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/cute/panting" + ] + }, + "mob.wolf.cute.whine": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/cute/whine" + ] + }, + "mob.wolf.grumpy.bark": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/grumpy/bark1", + "sounds/mob/wolf/grumpy/bark2", + "sounds/mob/wolf/grumpy/bark3" + ] + }, + "mob.wolf.grumpy.death": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/grumpy/death" + ] + }, + "mob.wolf.grumpy.growl": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/grumpy/growl1", + "sounds/mob/wolf/grumpy/growl2", + "sounds/mob/wolf/grumpy/growl3" + ] + }, + "mob.wolf.grumpy.hurt": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/grumpy/hurt1", + "sounds/mob/wolf/grumpy/hurt2", + "sounds/mob/wolf/grumpy/hurt3" + ] + }, + "mob.wolf.grumpy.panting": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/grumpy/panting" + ] + }, + "mob.wolf.grumpy.whine": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/grumpy/whine" + ] + }, + "mob.wolf.mad.bark": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/mad/bark1", + "sounds/mob/wolf/mad/bark2", + "sounds/mob/wolf/mad/bark3" + ] + }, + "mob.wolf.mad.death": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/mad/death" + ] + }, + "mob.wolf.mad.growl": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/mad/growl1", + "sounds/mob/wolf/mad/growl2", + "sounds/mob/wolf/mad/growl3" + ] + }, + "mob.wolf.mad.hurt": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/mad/hurt1", + "sounds/mob/wolf/mad/hurt2", + "sounds/mob/wolf/mad/hurt3" + ] + }, + "mob.wolf.mad.panting": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/mad/panting" + ] + }, + "mob.wolf.mad.whine": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/mad/whine" + ] + }, + "mob.wolf.puglin.bark": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/puglin/bark1", + "sounds/mob/wolf/puglin/bark2", + "sounds/mob/wolf/puglin/bark3" + ] + }, + "mob.wolf.puglin.death": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/puglin/death" + ] + }, + "mob.wolf.puglin.growl": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/puglin/growl1", + "sounds/mob/wolf/puglin/growl2", + "sounds/mob/wolf/puglin/growl3" + ] + }, + "mob.wolf.puglin.hurt": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/puglin/hurt1", + "sounds/mob/wolf/puglin/hurt2", + "sounds/mob/wolf/puglin/hurt3" + ] + }, + "mob.wolf.puglin.panting": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/puglin/panting" + ] + }, + "mob.wolf.puglin.whine": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/puglin/whine" + ] + }, + "mob.wolf.sad.bark": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/sad/bark1", + "sounds/mob/wolf/sad/bark2", + "sounds/mob/wolf/sad/bark3" + ] + }, + "mob.wolf.sad.death": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/sad/death" + ] + }, + "mob.wolf.sad.growl": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/sad/growl1", + "sounds/mob/wolf/sad/growl2", + "sounds/mob/wolf/sad/growl3" + ] + }, + "mob.wolf.sad.hurt": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/sad/hurt1", + "sounds/mob/wolf/sad/hurt2", + "sounds/mob/wolf/sad/hurt3" + ] + }, + "mob.wolf.sad.panting": { + "category": "neutral", + "sounds": [ + "sounds/mob/wolf/sad/panting" + ] + }, + "mob.wolf.sad.whine": { + "category": "neutral", "sounds": [ - "sounds/item/axe/strip1", - "sounds/item/axe/strip2", - "sounds/item/axe/strip3", - "sounds/item/axe/strip4" + "sounds/mob/wolf/sad/whine" ] } } diff --git a/resource_pack/textures/flipbook_textures.json b/resource_pack/textures/flipbook_textures.json index 170995e..4189901 100644 --- a/resource_pack/textures/flipbook_textures.json +++ b/resource_pack/textures/flipbook_textures.json @@ -1,50 +1,8 @@ [ { - "flipbook_texture": "textures/blocks/sculk_sensor_tendril_active", - "atlas_tile": "sculk_sensor_tendril_active", - "ticks_per_frame": 1 - }, - { - "flipbook_texture": "textures/blocks/sculk_sensor_tendril_inactive", - "atlas_tile": "sculk_sensor_tendril_inactive", - "ticks_per_frame": 2 - }, - { - "flipbook_texture": "textures/blocks/sculk", - "atlas_tile": "sculk", - "ticks_per_frame": 20 - }, - { - "flipbook_texture": "textures/blocks/sculk_vein", - "atlas_tile": "sculk_vein", - "ticks_per_frame": 20 - }, - { - "flipbook_texture": "textures/blocks/sculk_catalyst_side_bloom", - "atlas_index": 1, - "atlas_tile": "sculk_catalyst_side", - "atlas_tile_variant": 1, - "ticks_per_frame": 1 - }, - { - "flipbook_texture": "textures/blocks/sculk_catalyst_top_bloom", - "atlas_index": 1, - "atlas_tile": "sculk_catalyst_top", - "atlas_tile_variant": 1, - "ticks_per_frame": 1 - }, - { - "flipbook_texture": "textures/blocks/sculk_shrieker_inner_top", - "atlas_tile": "sculk_shrieker_inner_top", - "atlas_index": 0, - "atlas_tile_variant": 0, - "ticks_per_frame": 6 - }, - { - "flipbook_texture": "textures/blocks/sculk_shrieker_can_summon_inner_top", - "atlas_tile": "sculk_shrieker_inner_top", + "flipbook_texture": "textures/blocks/firefly_bush_firefly", + "atlas_tile": "firefly_bush", "atlas_index": 1, - "atlas_tile_variant": 1, "ticks_per_frame": 3 } ] diff --git a/resource_pack/textures/item_texture.json b/resource_pack/textures/item_texture.json index 855d323..98f2220 100644 --- a/resource_pack/textures/item_texture.json +++ b/resource_pack/textures/item_texture.json @@ -2,45 +2,257 @@ "resource_pack_name": "vanilla", "texture_name": "atlas.items", "texture_data": { - "pale_oak_door": { - "textures": "textures/items/pale_oak_door" - }, - "sign_pale_oak_hanging": { - "textures": "textures/items/pale_oak_hanging_sign" - }, - "pale_oak_sign": { - "textures": "textures/items/pale_oak_sign" - }, - "resin_brick": { - "textures": "textures/items/resin_brick" - }, - "boat": { - "textures": [ - "textures/items/boat_oak", - "textures/items/boat_spruce", - "textures/items/boat_birch", - "textures/items/boat_jungle", - "textures/items/boat_acacia", - "textures/items/boat_darkoak", - "textures/items/mangrove_boat", - "textures/items/bamboo_raft", - "textures/items/cherry_boat", - "textures/items/pale_oak_boat" - ] - }, - "chest_boat": { - "textures": [ - "textures/items/oak_chest_boat", - "textures/items/spruce_chest_boat", - "textures/items/birch_chest_boat", - "textures/items/jungle_chest_boat", - "textures/items/acacia_chest_boat", - "textures/items/dark_oak_chest_boat", - "textures/items/mangrove_chest_boat", - "textures/items/bamboo_chest_raft", - "textures/items/cherry_chest_boat", - "textures/items/pale_oak_chest_boat" - ] + "blue_egg": { + "textures": "textures/items/blue_egg" + }, + "brown_egg": { + "textures": "textures/items/brown_egg" + }, + "spawn_egg_axolotl": { + "textures": "textures/items/spawn_eggs/spawn_egg_axolotl" + }, + "spawn_egg_bat": { + "textures": "textures/items/spawn_eggs/spawn_egg_bat" + }, + "spawn_egg_bee": { + "textures": "textures/items/spawn_eggs/spawn_egg_bee" + }, + "spawn_egg_blaze": { + "textures": "textures/items/spawn_eggs/spawn_egg_blaze" + }, + "spawn_egg_bogged": { + "textures": "textures/items/spawn_eggs/spawn_egg_bogged" + }, + "spawn_egg_breeze": { + "textures": "textures/items/spawn_eggs/spawn_egg_breeze" + }, + "spawn_egg_camel": { + "textures": "textures/items/spawn_eggs/spawn_egg_camel" + }, + "spawn_egg_cat": { + "textures": "textures/items/spawn_eggs/spawn_egg_cat" + }, + "spawn_egg_cave_spider": { + "textures": "textures/items/spawn_eggs/spawn_egg_cave_spider" + }, + "spawn_egg_chicken": { + "textures": "textures/items/spawn_eggs/spawn_egg_chicken" + }, + "spawn_egg_cod": { + "textures": "textures/items/spawn_eggs/spawn_egg_cod" + }, + "spawn_egg_cow": { + "textures": "textures/items/spawn_eggs/spawn_egg_cow" + }, + "spawn_egg_creaking": { + "textures": "textures/items/spawn_eggs/spawn_egg_creaking" + }, + "spawn_egg_creeper": { + "textures": "textures/items/spawn_eggs/spawn_egg_creeper" + }, + "spawn_egg_dolphin": { + "textures": "textures/items/spawn_eggs/spawn_egg_dolphin" + }, + "spawn_egg_donkey": { + "textures": "textures/items/spawn_eggs/spawn_egg_donkey" + }, + "spawn_egg_drowned": { + "textures": "textures/items/spawn_eggs/spawn_egg_drowned" + }, + "spawn_egg_elder_guardian": { + "textures": "textures/items/spawn_eggs/spawn_egg_elder_guardian" + }, + "spawn_egg_ender_dragon": { + "textures": "textures/items/spawn_eggs/spawn_egg_ender_dragon" + }, + "spawn_egg_enderman": { + "textures": "textures/items/spawn_eggs/spawn_egg_enderman" + }, + "spawn_egg_endermite": { + "textures": "textures/items/spawn_eggs/spawn_egg_endermite" + }, + "spawn_egg_evoker": { + "textures": "textures/items/spawn_eggs/spawn_egg_evoker" + }, + "spawn_egg_fox": { + "textures": "textures/items/spawn_eggs/spawn_egg_fox" + }, + "spawn_egg_frog": { + "textures": "textures/items/spawn_eggs/spawn_egg_frog" + }, + "spawn_egg_glow_squid": { + "textures": "textures/items/spawn_eggs/spawn_egg_glow_squid" + }, + "spawn_egg_goat": { + "textures": "textures/items/spawn_eggs/spawn_egg_goat" + }, + "spawn_egg_guardian": { + "textures": "textures/items/spawn_eggs/spawn_egg_guardian" + }, + "spawn_egg_hoglin": { + "textures": "textures/items/spawn_eggs/spawn_egg_hoglin" + }, + "spawn_egg_horse": { + "textures": "textures/items/spawn_eggs/spawn_egg_horse" + }, + "spawn_egg_husk": { + "textures": "textures/items/spawn_eggs/spawn_egg_husk" + }, + "spawn_egg_iron_golem": { + "textures": "textures/items/spawn_eggs/spawn_egg_iron_golem" + }, + "spawn_egg_llama": { + "textures": "textures/items/spawn_eggs/spawn_egg_llama" + }, + "spawn_egg_magma_cube": { + "textures": "textures/items/spawn_eggs/spawn_egg_magma_cube" + }, + "spawn_egg_mooshroom": { + "textures": "textures/items/spawn_eggs/spawn_egg_mooshroom" + }, + "spawn_egg_mule": { + "textures": "textures/items/spawn_eggs/spawn_egg_mule" + }, + "spawn_egg_ocelot": { + "textures": "textures/items/spawn_eggs/spawn_egg_ocelot" + }, + "spawn_egg_panda": { + "textures": "textures/items/spawn_eggs/spawn_egg_panda" + }, + "spawn_egg_parrot": { + "textures": "textures/items/spawn_eggs/spawn_egg_parrot" + }, + "spawn_egg_phantom": { + "textures": "textures/items/spawn_eggs/spawn_egg_phantom" + }, + "spawn_egg_pig": { + "textures": "textures/items/spawn_eggs/spawn_egg_pig" + }, + "spawn_egg_piglin": { + "textures": "textures/items/spawn_eggs/spawn_egg_piglin" + }, + "spawn_egg_piglin_brute": { + "textures": "textures/items/spawn_eggs/spawn_egg_piglin_brute" + }, + "spawn_egg_pillager": { + "textures": "textures/items/spawn_eggs/spawn_egg_pillager" + }, + "spawn_egg_polar_bear": { + "textures": "textures/items/spawn_eggs/spawn_egg_polar_bear" + }, + "spawn_egg_pufferfish": { + "textures": "textures/items/spawn_eggs/spawn_egg_pufferfish" + }, + "spawn_egg_rabbit": { + "textures": "textures/items/spawn_eggs/spawn_egg_rabbit" + }, + "spawn_egg_ravager": { + "textures": "textures/items/spawn_eggs/spawn_egg_ravager" + }, + "spawn_egg_salmon": { + "textures": "textures/items/spawn_eggs/spawn_egg_salmon" + }, + "spawn_egg_sheep": { + "textures": "textures/items/spawn_eggs/spawn_egg_sheep" + }, + "spawn_egg_shulker": { + "textures": "textures/items/spawn_eggs/spawn_egg_shulker" + }, + "spawn_egg_silverfish": { + "textures": "textures/items/spawn_eggs/spawn_egg_silverfish" + }, + "spawn_egg_skeleton": { + "textures": "textures/items/spawn_eggs/spawn_egg_skeleton" + }, + "spawn_egg_skeleton_horse": { + "textures": "textures/items/spawn_eggs/spawn_egg_skeleton_horse" + }, + "spawn_egg_slime": { + "textures": "textures/items/spawn_eggs/spawn_egg_slime" + }, + "spawn_egg_sniffer": { + "textures": "textures/items/spawn_eggs/spawn_egg_sniffer" + }, + "spawn_egg_snow_golem": { + "textures": "textures/items/spawn_eggs/spawn_egg_snow_golem" + }, + "spawn_egg_spider": { + "textures": "textures/items/spawn_eggs/spawn_egg_spider" + }, + "spawn_egg_squid": { + "textures": "textures/items/spawn_eggs/spawn_egg_squid" + }, + "spawn_egg_stray": { + "textures": "textures/items/spawn_eggs/spawn_egg_stray" + }, + "spawn_egg_strider": { + "textures": "textures/items/spawn_eggs/spawn_egg_strider" + }, + "spawn_egg_tadpole": { + "textures": "textures/items/spawn_eggs/spawn_egg_tadpole" + }, + "spawn_egg_trader_llama": { + "textures": "textures/items/spawn_eggs/spawn_egg_trader_llama" + }, + "spawn_egg_tropicalfish": { + "textures": "textures/items/spawn_eggs/spawn_egg_tropicalfish" + }, + "spawn_egg_turtle": { + "textures": "textures/items/spawn_eggs/spawn_egg_turtle" + }, + "spawn_egg_vex": { + "textures": "textures/items/spawn_eggs/spawn_egg_vex" + }, + "spawn_egg_villager": { + "textures": "textures/items/spawn_eggs/spawn_egg_villager" + }, + "spawn_egg_vindicator": { + "textures": "textures/items/spawn_eggs/spawn_egg_vindicator" + }, + "spawn_egg_wandering_trader": { + "textures": "textures/items/spawn_eggs/spawn_egg_wandering_trader" + }, + "spawn_egg_warden": { + "textures": "textures/items/spawn_eggs/spawn_egg_warden" + }, + "spawn_egg_witch": { + "textures": "textures/items/spawn_eggs/spawn_egg_witch" + }, + "spawn_egg_wither": { + "textures": "textures/items/spawn_eggs/spawn_egg_wither" + }, + "spawn_egg_wither_skeleton": { + "textures": "textures/items/spawn_eggs/spawn_egg_wither_skeleton" + }, + "spawn_egg_wolf": { + "textures": "textures/items/spawn_eggs/spawn_egg_wolf" + }, + "spawn_egg_zoglin": { + "textures": "textures/items/spawn_eggs/spawn_egg_zoglin" + }, + "spawn_egg_zombie": { + "textures": "textures/items/spawn_eggs/spawn_egg_zombie" + }, + "spawn_egg_zombie_horse": { + "textures": "textures/items/spawn_eggs/spawn_egg_zombie_horse" + }, + "spawn_egg_zombified_piglin": { + "textures": "textures/items/spawn_eggs/spawn_egg_zombified_piglin" + }, + "spawn_egg_agent": { + "textures": "textures/items/spawn_eggs/spawn_egg_agent" + }, + "spawn_egg_allay": { + "textures": "textures/items/spawn_eggs/spawn_egg_allay" + }, + "spawn_egg_armadillo": { + "textures": "textures/items/spawn_eggs/spawn_egg_armadillo" + }, + "spawn_egg_ghast": { + "textures": "textures/items/spawn_eggs/spawn_egg_ghast" + }, + "spawn_egg_zombie_villager": { + "textures": "textures/items/spawn_eggs/spawn_egg_zombie_villager" } } -} +} \ No newline at end of file diff --git a/resource_pack/textures/terrain_texture.json b/resource_pack/textures/terrain_texture.json index 99d45d9..9596903 100644 --- a/resource_pack/textures/terrain_texture.json +++ b/resource_pack/textures/terrain_texture.json @@ -4,10 +4,53 @@ "padding": 8, "num_mip_levels": 4, "texture_data": { - "mangrove_leaves_carried": { + "wildflowers": { "textures": [ - "textures/blocks/mangrove_leaves_carried", - "textures/blocks/mangrove_leaves_carried" + "textures/blocks/wildflowers", + "textures/blocks/wildflowers_stem" + ] + }, + "wildflowers_carried": { + "textures": [ + "textures/items/wildflowers" + ] + }, + "firefly_bush": { + "textures": [ + "textures/blocks/firefly_bush", + "textures/blocks/firefly_bush_firefly" + ] + }, + "firefly_bush_carried": { + "textures": "textures/items/firefly_bush" + }, + "bush": { + "textures": "textures/blocks/bush" + }, + "bush_carried": { + "textures": "textures/items/bush" + }, + "leaf_litter": { + "textures": [ + "textures/blocks/leaf_litter" + ] + }, + "leaf_litter_carried": { + "textures": [ + "textures/items/leaf_litter" + ] + }, + "cactus_flower": { + "textures": "textures/blocks/cactus_flower" + }, + "short_dry_grass": { + "textures": [ + "textures/blocks/short_dry_grass" + ] + }, + "tall_dry_grass": { + "textures": [ + "textures/blocks/tall_dry_grass" ] } } diff --git a/resource_pack/ui/_global_variables.json b/resource_pack/ui/_global_variables.json index 24c20a7..e0e72a5 100644 --- a/resource_pack/ui/_global_variables.json +++ b/resource_pack/ui/_global_variables.json @@ -310,6 +310,7 @@ "$store_realms-guidelines-deep-blue-5": [ 0.1294, 0.0392, 0.5019 ], "$store_realms-guidelines-deep-blue-6": [ 0.0471, 0.0078, 0.2824 ], "$store_sales_banner_text_color": [ 0.3, 0.3, 0.3 ], + "$store_sales_banner_text_dark_color": [ 0.149, 0.141, 0.137 ], "$store_product_detail_strikethru_color": [ 0.5585, 0.5585, 0.5585 ], "$store_play_button_hover": [ 0.215, 0.839, 0.118 ], "$new_offer_icon_text_color": [ 0.3, 0.3, 0.3 ], diff --git a/resource_pack/ui/csb_sections/csb_subscription_panel.json b/resource_pack/ui/csb_sections/csb_subscription_panel.json index 8b20ec8..19378a5 100644 --- a/resource_pack/ui/csb_sections/csb_subscription_panel.json +++ b/resource_pack/ui/csb_sections/csb_subscription_panel.json @@ -43,19 +43,18 @@ "controls": [ { "side_image_stack_left": { - "type": "stack_panel", - "orientation": "horizontal", - "size": [ "40%", "100%" ], + "type": "panel", + "size": [ "177.8%y", 70 ], "controls": [ { "csb_image": { "type": "image", - "size": [ "default", "default" ], - "keep_ratio": false, + "size": [ "177.8%y", "100%" ], + "keep_ratio": true, "anchor_from": "top_left", "anchor_to": "top_left", "layer": 3, - "texture": "textures/ui/csb_subscribe_banner" + "texture": "textures/ui/subscription_MarketplacePass" } } ] @@ -64,7 +63,7 @@ { "padding_02": { "type": "panel", - "size": [ 5, "100%" ] + "size": [ 4, "100%sm" ] } }, { @@ -72,13 +71,12 @@ "type": "stack_panel", "orientation": "vertical", "anchor_from": "top_right", - "size": [ "45%", "100px" ], + "size": [ "fill", "100%sm" ], "controls": [ { "interior_content_stack": { "type": "stack_panel", "orientation": "vertical", - "size": [ "100%", "100%" ], "layer": 3, "controls": [ { @@ -86,61 +84,12 @@ "offset": [ 0, -1 ], "text": "options.csbHeading", "color": "$store_white_text_color", + "size": [ "100%", "default" ], "anchor_from": "top_left", "anchor_to": "top_left", "layer": 2 } }, - { - "interior_top_padding": { - "type": "panel", - "size": [ "100%", 2 ] - } - }, - { - "description_panel": { - "type": "stack_panel", - "anchor_to": "top_left", - "orientation": "vertical", - "size": [ "100%", 10 ], - "controls": [ - { - "interior_label_panel": { - "type": "panel", - "size": [ "100%", "100%" ], - "controls": [ - { - "panel_label": { - "type": "label", - "text": "options.csbSubheading", - "font_type": "smooth", - "offset": [ 2, -1 ], - "font_scale_factor": 0.7, - "size": [ "default", "default" ], - "max_size": [ "100% - 4px", "100%" ], - "color": "$0_color_format", - "anchor_from": "left_middle", - "anchor_to": "left_middle", - "layer": 3 - } - }, - { - "background_panel": { - "type": "image", - "size": [ "100%sm + 4px", "80%" ], - "anchor_from": "left_middle", - "anchor_to": "left_middle", - "keep_ratio": false, - "texture": "textures/ui/White", - "color": "$csb_secondary_panel_background" - } - } - ] - } - } - ] - } - }, { "interior_top_padding_01": { "type": "panel", @@ -151,7 +100,7 @@ "ln_01_container": { "type": "stack_panel", "orientation": "horizontal", - "size": [ "100%", "15%+5px" ], + "size": [ "100%", 12 ], "controls": [ { "bullet_holder_01": { @@ -190,7 +139,7 @@ "backup_font_type": "UIFont", "color": "$generic_button_text_color", "text_alignment": "left", - "font_scale_factor": 0.8, + "font_scale_factor": 0.6, "size": [ "90%", "100%" ] } } @@ -201,7 +150,7 @@ "ln_02_container": { "type": "stack_panel", "orientation": "horizontal", - "size": [ "100%", "15%" ], + "size": [ "100%", 12 ], "controls": [ { "bullet_holder_02": { @@ -240,7 +189,7 @@ "backup_font_type": "UIFont", "color": "$generic_button_text_color", "text_alignment": "left", - "font_scale_factor": 0.8, + "font_scale_factor": 0.6, "size": [ "90%", "100%" ] } } @@ -278,6 +227,7 @@ "controls": [ { "button_panel_padding": { + "ignored": "$left_button_ignored", "type": "panel", "size": [ 4, "100%" ] } @@ -293,7 +243,7 @@ }, { "csb_info_button@common_buttons.light_content_button": { - "$button_text": "options.viewSubscriptions.button.info", + "$button_text": "options.viewSubscriptions.button.addMarketplacePass", "$button_text_size": [ "default", "default" ], "size": [ "fill", "100%" ], "$button_text_max_size": [ "100% - 10px", 18 ], @@ -319,7 +269,7 @@ "csb_buy_container": { - "ignored": "$pre_release", + "ignored": "($pre_release or $left_button_ignored)", "type": "panel", "size": [ "50%", "100%" ], "controls": [ diff --git a/resource_pack/ui/edu_servers_screen.json b/resource_pack/ui/edu_servers_screen.json new file mode 100644 index 0000000..ee9f2e8 --- /dev/null +++ b/resource_pack/ui/edu_servers_screen.json @@ -0,0 +1,573 @@ +{ + "namespace": "edu_servers", + /* Table of Contents + Misc Definitions + Add Server Button + Server Button + Servers Grid + Screen + */ + + //--------------------------------------------------------------------------- + // Misc Definitions + //--------------------------------------------------------------------------- + + "server_entry_button_def@common_buttons.light_text_button": { + "$font_type": "MinecraftTen", + "$new_ui_label_offset": [ 0, -2 ], + "size": [ "100%", 18 ], + "$border_visible": false, + "$button_bindings": [ + { + "binding_type": "collection_details", + "binding_collection_name": "server_column_collection", + "binding_collection_prefix": "server_column" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_row_collection", + "binding_collection_prefix": "server_row" + } + ] + }, + + "grid_label_def": { + "type": "label", + "text": "$text_binding", + "color": "$text_color", + "font_type": "smooth", + "max_size": [ "100%", 15 ], + "$text_color_binding|default": "#none", + + "bindings": [ + { + "binding_type": "collection_details", + "binding_collection_name": "server_column_collection", + "binding_collection_prefix": "server_column" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_row_collection", + "binding_collection_prefix": "server_row" + }, + { + "binding_name": "$text_binding", + "binding_type": "global" + }, + { + "binding_name": "$text_color_binding", + "binding_name_override": "#color", + "binding_type": "global" + } + ] + }, + + //--------------------------------------------------------------------------- + // Add Server Button + //--------------------------------------------------------------------------- + + "add_server_button@common_buttons.dark_nestable_button": { + "$pressed_button_name": "button.servers.add_server", + "$use_parent_size": true, + "$nestable_button_size": [ "100%", "100%" ], + + "$nested_button_content_size": [ "100%", "fill" ], + "$nested_control_image": "textures/ui/color_plus", + + "$nested_button_label_size": [ "100%", 31 ], + "$nested_label_text": "edu.servers_screen.add_server", + "$nested_label_font_type": "smooth" + }, + + //--------------------------------------------------------------------------- + // Server Button + //--------------------------------------------------------------------------- + + "server_image": { + "type": "image", + "force_texture_reload": true, + "keep_ratio": false, + "bindings": [ + { + "binding_type": "collection_details", + "binding_collection_name": "server_column_collection", + "binding_collection_prefix": "server_column" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_row_collection", + "binding_collection_prefix": "server_row" + }, + { + "binding_name": "#server_texture", + "binding_name_override": "#texture", + "binding_type": "global" + }, + { + "binding_name": "#server_texture_source", + "binding_name_override": "#texture_file_system", + "binding_type": "global" + } + ] + }, + + "server_name@edu_servers.grid_label_def": { + "$text_binding": "#server_name", + "$text_color": "$dark_button_default_text_color" + }, + + "server_player_info": { + "type": "stack_panel", + "orientation": "horizontal", + "size": [ "100%", 12 ], + + "bindings": [ + { + "binding_type": "collection_details", + "binding_collection_name": "server_column_collection", + "binding_collection_prefix": "server_column" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_row_collection", + "binding_collection_prefix": "server_row" + } + ], + "controls": [ + { + "image": { + "type": "image", + "texture": "textures/ui/edu_player_icon", + "size": [ 12, 12 ] + } + }, + { + "image_to_label_padding@common.empty_panel": { + "size": [ 2, "100%" ] + } + }, + { + "label": { + "type": "label", + "text": "#server_player_info_text", + "font_type": "smooth", + "color": "$dark_button_default_text_color", + "bindings": [ + { + "binding_name": "#server_player_info_text", + "binding_type": "global" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_column_collection", + "binding_collection_prefix": "server_column" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_row_collection", + "binding_collection_prefix": "server_row" + } + ] + } + } + ] + }, + + "server_connection_strength": { + "type": "image", + "size": [ 12, 12 ], + "bindings": [ + { + "binding_type": "collection_details", + "binding_collection_name": "server_column_collection", + "binding_collection_prefix": "server_column" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_row_collection", + "binding_collection_prefix": "server_row" + }, + { + "binding_name": "#server_connection_strength", + "binding_name_override": "#texture", + "binding_type": "global" + } + ] + }, + + "server_entry_buttons@edu_common.nested_buttons_base_definition": { + "controls": [ + { + "play_nested_button@edu_servers.server_entry_button_def": { + "$button_text": "edu.servers_screen.play", + "$pressed_button_name": "button.servers.entry.play" + } + }, + { "button_padding_1@edu_common.nested_buttons_base_definition": {} }, + { + "share@edu_servers.server_entry_button_def": { + "$button_text": "edu.servers_screen.share", + "$pressed_button_name": "button.servers.entry.share_copy" + } + }, + { "button_padding_2@edu_common.nested_buttons_base_definition": {} }, + { + "remove@edu_servers.server_entry_button_def": { + "$button_text": "edu.servers_screen.remove", + "$pressed_button_name": "remove_server_button" + } + } + ] + }, + + "server_nested_buttons": { + "type": "panel", + "anchor_from": "top_middle", + "anchor_to": "top_middle", + "size": [ "100%", "100%c" ], + + "controls": [ + { + "server_entry_buttons@edu_servers.server_entry_buttons": { + "bindings": [ + { + "binding_name": "#show_nested_buttons", + "binding_name_override": "#visible" + } + ] + } + } + ] + }, + + "server_button@common_buttons.transparent_label_nestable_button": { + "$has_special_nested_controls": true, + "$pressed_button_name": "button.servers.server_button", + "$nested_content_visibility_binding": "#server_controls_visiblity", + "$nested_content_controls": "edu_servers.server_nested_buttons", + "$special_nested_content_bindings": [ + { + "binding_type": "collection_details", + "binding_collection_name": "server_column_collection", + "binding_collection_prefix": "server_column" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_row_collection", + "binding_collection_prefix": "server_row" + }, + { + "binding_name": "#server_nested_buttons_visible", + "binding_name_override": "#visible", + "binding_type": "global" + } + ], + "$special_nested_button_bindings": [ + { + "binding_type": "collection_details", + "binding_collection_name": "server_column_collection", + "binding_collection_prefix": "server_column" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_row_collection", + "binding_collection_prefix": "server_row" + }, + { + "binding_name": "(not #server_nested_buttons_visible)", + "binding_name_override": "#enabled", + "binding_type": "global" + } + ], + + "$use_parent_size": true, + "$nestable_button_size": [ "100%", "100%" ], + + "$nested_content_control": "edu_servers.server_image", + "$nested_button_content_size": [ "100%", "fill" ], + + "$nested_button_label_size": [ "100%", 30 ], + "$nested_label_control": "common_buttons.nested_six_part_label_control", + "$left_top_label_definition": "edu_servers.server_name", + "$left_bottom_label_definition": "edu_servers.server_player_info", + + "$right_bottom_label_definition": "edu_servers.server_connection_strength", + + "$transparent_label_color": [ 0, 0, 0 ], + "$transparent_label_hover_color": [ 0, 0.45, 0 ], + "$transparent_label_pressed_color": [ 0, 0.45, 0 ], + "$nested_transparent_label_alpha": 0.7 + }, + + //--------------------------------------------------------------------------- + // Servers Grid + //--------------------------------------------------------------------------- + + "server_tile_button": { + "type": "panel", + "controls": [ + { + "add_server@edu_servers.add_server_button": { + "bindings": [ + { + "binding_type": "collection_details", + "binding_collection_name": "server_column_collection", + "binding_collection_prefix": "server_column" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_row_collection", + "binding_collection_prefix": "server_row" + }, + { + "binding_name": "#is_first", + "binding_name_override": "#visible", + "binding_type": "global" + } + ] + } + }, + { + "server@edu_servers.server_button": { + "bindings": [ + { + "binding_type": "collection_details", + "binding_collection_name": "server_column_collection", + "binding_collection_prefix": "server_column" + }, + { + "binding_type": "collection_details", + "binding_collection_name": "server_row_collection", + "binding_collection_prefix": "server_row" + }, + { + "binding_name": "(not #is_first)", + "binding_name_override": "#visible", + "binding_type": "global" + } + ] + } + } + ] + }, + + "server_tile": { + "type": "stack_panel", + "orientation": "horizontal", + "size": [ "100%", "100%cm" ], + "controls": [ + { "left_padding@common.empty_panel": { "size": [ 2, "100%sm" ] } }, + // Since we scroll on y we will fill on x and set y size to screenshot ratio + label size + { "button@edu_servers.server_tile_button": { "size": [ "fill", "56.25%x + 31px" ] } }, + { "right_padding@common.empty_panel": { "size": [ 2, "100%sm" ] } } + ] + }, + + //--------------------------------------------------------------------------- + // Screen + //--------------------------------------------------------------------------- + + "servers_scroll_content": { + "type": "stack_panel", + "size": [ "100% - 8px", "100%c" ], + "controls": [ + { "top_padding@common.empty_panel": { "size": [ "100%", 4 ] } }, + { + "servers_grid@edu_common.stack_panel_grid": { + "$grid_collection_prefix": "server", + "$stack_grid_item": "edu_servers.server_tile" + } + }, + { "bottom_padding@common.empty_panel": { "size": [ "100%", 33 ] } } + ] + }, + + "servers_text_bar": { + "$show_icon|default": false, + "$icon_texture|default": "textures/ui/classrooms_icon", + //Top level image background, holds a stack panel that organizes elements + "type": "image", + "size": [ "100%", 33 ], + "texture": "textures/ui/edu_worlds_search_bar", + "controls": [ + { + "stack_panel": { + "type": "stack_panel", + "orientation": "horizontal", + "size": [ "100%", 30 ], + "anchor_from": "top_right", + "anchor_to": "top_right", + "controls": [ + { + //Each element needs to be set in a wrapper panel to use offsets + "text_bar_wrapper": { + "type": "panel", + "size": [ "fill", 26 ], + "controls": [ + { + "text_bar@common.text_edit_box": { + "size": [ "100%", 26 ], + "offset": [ 4, 3 ], + "max_length": 50, + "$placeholder_label_size": [ "100%", 10 ], + // Variable expected to be overwritten where element is used + "$place_holder_text": "$place_holder_text", + "$text_box_name": "$text_box_name" + } + } + ] + } + }, + //3px space + 4 offset of text_bar + //Will be updated with addition of sort button later + { "temp_padding@common.empty_panel": { "size": [ 7, "100%sm" ] } } + //Space for Sort dropdown + ] + } + } + ] + }, + + "screen_content_while_adding_server": { + "type": "stack_panel", + "anchor_from": "top_middle", + "anchor_to": "top_middle", + "size": [ "100%", "100%" ], + "controls": [ + { + "add_info_bar@edu_servers.servers_text_bar": { + "$show_icon": true, + "$icon_texture": "textures/ui/classrooms_icon", + "size": [ "100%", 33 ], + "$place_holder_text": "edu.servers_screen.add_info_placeholder", + "$text_box_name": "#server_add_info_box" + } + }, + { + "add_info_row": { + "type": "stack_panel", + "orientation": "horizontal", + "anchor_from": "top_middle", + "anchor_to": "top_middle", + "size": [ "100%", 100 ], + "controls": [ + { + "cancel_add_server@common_buttons.dark_nestable_button": { + "$pressed_button_name": "button.servers.cancel_add_server", + "$use_parent_size": true, + "$nestable_button_size": [ "fill", "100%" ], + + "$nested_button_content_size": [ "100%", "fill" ], + "$nested_control_image": "textures/ui/listx", //icon_servers_small, cancel, classrooms_icon, undoArrow, check, color_plus, listcheck, listx + + "$nested_button_label_size": [ "100%", 31 ], + "$nested_label_font_type": "smooth" + } + }, + { + "confirm_add_server@common_buttons.dark_nestable_button": { + "$pressed_button_name": "button.servers.confirm_add_server", + "$use_parent_size": true, + "$nestable_button_size": [ "fill", "100%" ], + + "$nested_button_content_size": [ "100%", "fill" ], + "$nested_control_image": "textures/ui/listcheck", //icon_servers_small, cancel, classrooms_icon, undoArrow, check, color_plus, listcheck, listx + + "$nested_button_label_size": [ "100%", 31 ], + "$nested_label_text": "edu.servers_screen.confirm_add_server", + "$nested_label_font_type": "smooth" + } + } + ] + } + } + ] + }, + + "screen_content_while_selecting": { + "type": "stack_panel", + "anchor_from": "top_middle", + "anchor_to": "top_middle", + "size": [ "100%", "100%" ], + "controls": [ + { + "search_bar@edu_servers.servers_text_bar": { + "$place_holder_text": "edu.servers_screen.search_placeholder", + "$text_box_name": "#server_search_box" + } + }, + { + "server_scroll_panel": { + "type": "panel", + "size": [ "100% - 8px", "fill" ], + "controls": [ + { + "server_scroll@common.scrolling_panel": { + "size": [ "100%", "100%" ], + "$scrolling_content": "edu_servers.servers_scroll_content", + "$show_background": false, + "$scroll_bar_left_padding_size": [ 0, 0 ], + "$scroll_bar_right_padding_size": [ 1, 0 ], + "$scroll_size": [ 5, "100% - 32px" ], + "$scroll_size_touch": "$scroll_size", + "$scroll_track_anchor": "top_middle", + "$scrolling_content_anchor_from": "top_middle", + "$scrolling_content_anchor_to": "top_middle" + } + } + ] + } + } + ] + }, + + "screen_content_stack_panel": { + "type": "stack_panel", + "anchor_from": "top_middle", + "anchor_to": "top_middle", + "size": [ "100%", "100%" ], + "controls": [ + { + "title@edu_common.edu_screen_header": { + "$title_text": "edu.servers_screen.title", + "$title_has_image": true, + "$title_texture": "textures/ui/servers" + } + }, + { + "adding@edu_servers.screen_content_while_adding_server": { + "bindings": [ + { + "binding_name": "#is_entering_add_info", + "binding_name_override": "#visible", + "binding_type": "global" + } + ] + } + }, + { + "selecting@edu_servers.screen_content_while_selecting": { + "bindings": [ + { + "binding_name": "(not #is_entering_add_info)", + "binding_name_override": "#visible", + "binding_type": "global" + } + ] + } + } + ] + }, + + "edu_servers_screen@common.base_screen": { + "$screen_content": "edu_servers.screen_content_stack_panel", + "$screen_bg_content": "common.screen_background", + "button_mappings": [ + { + "from_button_id": "button.menu_cancel", + "to_button_id": "button.menu_exit", + "mapping_type": "global" + } + ] + } +} diff --git a/resource_pack/ui/edu_worlds_screen.json b/resource_pack/ui/edu_worlds_screen.json index af7c34e..25151d5 100644 --- a/resource_pack/ui/edu_worlds_screen.json +++ b/resource_pack/ui/edu_worlds_screen.json @@ -17,14 +17,6 @@ "size": [ "100%", 1 ] }, - "nested_buttons_base_def": { - "type": "stack_panel", - "size": [ "100% - 4px", "100%c" ], - "offset": [ 0, 2 ], - "anchor_from": "top_middle", - "anchor_to": "top_middle" - }, - "world_entry_button_def@common_buttons.light_text_button": { "$font_type": "MinecraftTen", "$new_ui_label_offset": [ 0, -2 ], @@ -158,7 +150,7 @@ "$border_visible": false }, - "new_world_nested_buttons@edu_worlds.nested_buttons_base_def": { + "new_world_nested_buttons@edu_common.nested_buttons_base_definition": { "controls": [ { "guided_create_nested_button@edu_worlds.new_world_nested_button": { @@ -290,7 +282,7 @@ "$text_color": "$light_button_secondary_default_text_color" }, - "world_entry_buttons@edu_worlds.nested_buttons_base_def": { + "world_entry_buttons@edu_common.nested_buttons_base_definition": { "controls": [ { "play_nested_button@edu_worlds.world_entry_button_def": { @@ -402,7 +394,7 @@ ] }, - "manage_buttons@edu_worlds.nested_buttons_base_def": { + "manage_buttons@edu_common.nested_buttons_base_definition": { "controls": [ { "back@edu_worlds.nav_world_back_button_def": { @@ -590,7 +582,7 @@ "$transparent_label_pressed_color": [ 0, 0.45, 0 ], "$nested_transparent_label_alpha": 0.7 }, - + //--------------------------------------------------------------------------- // Worlds grid diff --git a/resource_pack/ui/gathering_info_screen.json b/resource_pack/ui/gathering_info_screen.json index 0fc1a72..df9f76c 100644 --- a/resource_pack/ui/gathering_info_screen.json +++ b/resource_pack/ui/gathering_info_screen.json @@ -68,7 +68,7 @@ }, { "pad_2@common.empty_panel": { - "size": [ "100%", 8 ] + "size": [ "100%", 12 ] } }, { @@ -78,7 +78,6 @@ "controls": [ { "caption@start.gathering_caption": { - "size": [ 100, "default" ], "anchor_to": "bottom_left", "anchor_from": "bottom_left", "offset": [ 8, -20 ], diff --git a/resource_pack/ui/panorama_screen.json b/resource_pack/ui/panorama_screen.json index 8a95d46..c90636f 100644 --- a/resource_pack/ui/panorama_screen.json +++ b/resource_pack/ui/panorama_screen.json @@ -106,7 +106,7 @@ "layer": 3, "anchor_from": "top_left", "anchor_to": "top_left", - "$focus_id": "screenshot_pan_left", + "$focus_id": "panorama_pan_left_button", "$chevron_image_name": "textures/ui/chevron_left", "$pressed_button_name": "button.pan_left", "$cycle_pack_button_name_right": "button.pan_right", @@ -124,7 +124,7 @@ "layer": 3, "anchor_from": "top_right", "anchor_to": "top_right", - "$focus_id": "screenshot_pan_right", + "$focus_id": "panorama_pan_right_button", "$chevron_image_name": "textures/ui/chevron_right", "$pressed_button_name": "button.pan_right", "$cycle_pack_button_name_right": "button.pan_right", diff --git a/resource_pack/ui/pdp_screen.json b/resource_pack/ui/pdp_screen.json index 24cddfe..806d393 100644 --- a/resource_pack/ui/pdp_screen.json +++ b/resource_pack/ui/pdp_screen.json @@ -11,11 +11,6 @@ "layer": 1, "$baseLayer|default": 2, "bindings": [ - { - "binding_type": "$store_factory_collection_details", - "binding_collection_name": "$store_factory_collection_name", - "binding_collection_prefix": "$store_factory_collection_prefix" - }, { "binding_name": "#download_info_visible", "binding_name_override": "#visible" @@ -42,11 +37,6 @@ "color": "$body_text_color", "text": "#text", "bindings": [ - { - "binding_type": "$store_factory_collection_details", - "binding_collection_name": "$store_factory_collection_name", - "binding_collection_prefix": "$store_factory_collection_prefix" - }, { "binding_name": "#download_info_text", "binding_name_override": "#text", @@ -63,11 +53,6 @@ "type": "panel", "size": [ "100%", "50%" ], "bindings": [ - { - "binding_type": "$store_factory_collection_details", - "binding_collection_name": "$store_factory_collection_name", - "binding_collection_prefix": "$store_factory_collection_prefix" - }, { "binding_name": "#download_progress_bar_visible", "binding_name_override": "#visible" @@ -294,6 +279,11 @@ { "binding_name": "#progress_loading_anim_visible", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] }, @@ -341,6 +331,11 @@ { "binding_name": "#progress_loading_anim_visible", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] }, @@ -356,6 +351,11 @@ { "binding_name": "#purchase_buttons_enabled", "binding_name_override": "#enabled" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] }, @@ -417,6 +417,11 @@ { "binding_name": "#activated_purchase_panel_visible", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -427,6 +432,11 @@ { "binding_name": "#deactivated_purchase_panel_visible", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -451,6 +461,11 @@ { "binding_name": "#buttons_panel_visible", "binding_name_override": "#enabled" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ], "controls": [ @@ -460,6 +475,11 @@ { "binding_name": "#purchase_panel_visible", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -474,6 +494,9 @@ "$focus_id": "interact_button_base", "$button_binding_condition": "visible", "$button_text_binding_type": "global", + "$button_text_collection_details": "$store_factory_collection_details", + "$button_text_grid_collection_name": "$store_factory_collection_name", + "$button_text_collection_prefix": "$store_factory_collection_prefix", "size": [ "100%", 20 ], "anchor_from": "top_middle", "anchor_to": "top_middle", @@ -485,6 +508,11 @@ { "binding_name": "#action_button_enabled", "binding_name_override": "#enabled" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -512,6 +540,11 @@ "binding_type": "view", "source_property_name": "#visible", "target_property_name": "#enabled" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -575,6 +608,11 @@ "bindings": [ { "binding_name": "#interact_button_text" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] }, @@ -725,6 +763,11 @@ { "binding_name": "#share_button_enabled", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -747,6 +790,11 @@ { "binding_name": "#share_button_enabled", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -778,6 +826,11 @@ { "binding_name": "#wishlist_button_enabled", "binding_name_override": "#enabled" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -896,29 +949,68 @@ }, "discount_label": { - "type": "label", - "size": [ "default", 10 ], - "$discount_label_font|default": "smooth", - "font_type": "$discount_label_font", - "text": "#markdown_percentage", - "color": "$store_sales_banner_text_color", - "$discount_label_offset|default": [ 0, 0 ], - "offset": "$discount_label_offset", - "layer": 1, - "$discount_label_binding_type|default": "global", - "$discount_label_binding_collection|default": "", - "tts_override_control_value": "#tts_markdown_percentage", - - "bindings": [ + "type": "stack_panel", + "orientation": "horizontal", + "size": [ "default", "default" ], + "offset": [ 1, 0 ], + "controls": [ { - "binding_type": "$discount_label_binding_type", - "binding_collection_name": "$discount_label_binding_collection", - "binding_name": "#markdown_percentage" + "label_panel": { + "type": "panel", + "size": [ 25, "default" ], + "controls": [ + { + "label@common.minecraftTenLabel": { + "type": "label", + "size": [ "default", "default" ], + "text": "#markdown_percentage", + "color": "$store_sales_banner_text_dark_color", + "layer": 1, + "offset": [ 0, -1 ], + "$discount_label_binding_type|default": "global", + "$discount_label_binding_collection|default": "", + "tts_override_control_value": "#tts_markdown_percentage", + "bindings": [ + { + "binding_type": "$discount_label_binding_type", + "binding_collection_name": "$discount_label_binding_collection", + "binding_name": "#markdown_percentage" + }, + { + "binding_type": "$discount_label_binding_type", + "binding_collection_name": "$discount_label_binding_collection", + "binding_name": "#tts_markdown_percentage" + } + ] + } + } + ] + } }, { - "binding_type": "$discount_label_binding_type", - "binding_collection_name": "$discount_label_binding_collection", - "binding_name": "#tts_markdown_percentage" + "icon_panel": { + "type": "panel", + "size": [ 12, "default" ], + "controls": [ + { + "icon": { + "type": "image", + "size": [ 10, 8 ], + "texture": "textures/ui/sidebar_icons/csb_sidebar_icon", + "anchor_from": "left_middle", + "anchor_to": "left_middle", + "layer": 5, + "offset": [ 0, 0 ] + } + } + ], + "bindings": [ + { + "binding_name": "#is_on_marketplace_pass_only_sale", + "binding_name_override": "#visible" + } + ] + } } ] }, @@ -971,7 +1063,7 @@ "markdown_banner@common_store.markdown_background": { "$markdown_label": "pdp.discount_label", "size": [ "100%c", "100%" ], - "$banner_size": [ "20px", "100%" ], + "$banner_size": [ "100%c", "100%" ], "$triangle_offset": [ 0, 0 ], "layer": 9, "$triangle_texture": "textures/ui/saleflagtrianglebeveldefault", @@ -999,7 +1091,7 @@ { "markdown_label@pdp.price_markdown_panel": { "size": [ "100%c + 5px", "100%" ], - "$strike_thru_offset": [ 0, 0 ] + "$strike_thru_offset": [ -0.5, 0 ] } } ], @@ -1115,7 +1207,7 @@ "markdown_banner@common_store.markdown_background": { "$markdown_label": "pdp.discount_label", "size": [ "100%c", "100%" ], - "$banner_size": [ "20px", "100%" ], + "$banner_size": [ "100%c", "100%" ], "$triangle_offset": [ 0, 0 ], "layer": 9, "$triangle_texture": "textures/ui/saleflagtrianglebeveldefault", @@ -1174,7 +1266,7 @@ "texture": "textures/ui/infobulb", "anchor_from": "top_left", "anchor_to": "top_left", - "size": [ 9, 12 ], + "size": [ 9, 14 ], "priority": 1 } }, @@ -1187,7 +1279,7 @@ "controls": [ { "coin@pdp.coin_image": { - "offset": [ -1, 0 ] + "offset": [ 0, 0 ] } } ] @@ -1315,6 +1407,11 @@ { "binding_name": "#wishlist_button_enabled", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -1326,6 +1423,11 @@ { "binding_name": "(not #wishlist_button_enabled)", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -1352,6 +1454,11 @@ { "binding_name": "#is_on_wishlist", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -1526,11 +1633,12 @@ { "offer_price": { "type": "label", - "size": [ "default", 10 ], + "size": [ "default", 8 ], "layer": 4, "color": "$text_color", "alpha": 0.6, "text": "#full_price", + "font_scale_factor": 0.8, "tts_override_control_value": "#tts_full_price", "bindings": [ { @@ -1936,6 +2044,11 @@ { "binding_name": "#ratings_focus_container_visible", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] }, @@ -2067,6 +2180,11 @@ { "binding_name": "$rating_bind_name", "binding_name_override": "#clip_ratio" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -2095,6 +2213,11 @@ "binding_collection_name": "$store_factory_collection_name", "binding_name": "#content_rating_reverse", "binding_name_override": "#clip_ratio" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ], "controls": [ @@ -2111,6 +2234,11 @@ "binding_collection_name": "$store_factory_collection_name", "binding_name": "$rating_bind_name", "binding_name_override": "#clip_ratio" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -2993,33 +3121,72 @@ "anchor_to": "bottom_middle", "texture": "textures/ui/White", "color": "$csub_text_color", - "layer": 3 - } - }, - { - "icon": { - "type": "image", - "size": [ 12, 12 ], - "texture": "textures/ui/sidebar_icons/csb_sidebar_icon", - "anchor_from": "left_middle", - "anchor_to": "left_middle", - "offset": [ 1, 0 ], - "layer": 5 - } - }, - { - "text": { - "type": "label", - "size": [ "default", 10 ], - "color": "$0_color_format", - "anchor_from": "left_middle", - "anchor_to": "left_middle", - "offset": [ 18, 0 ], - "text": "#item_csb_expiration_label", - "layer": 6, - "bindings": [ + "layer": 3, + "controls": [ { - "binding_name": "#item_csb_expiration_label" + "content_stack_panel": { + "type": "stack_panel", + "orientation": "horizontal", + "size": [ "100%", "100%" ], + "anchor_from": "bottom_middle", + "anchor_to": "bottom_middle", + "layer": 4, + "controls": [ + { + "icon_wrapper": { + "type": "panel", + "size": [ 12, 12 ], + "controls": [ + { + "icon": { + "type": "image", + "size": [ 12, 12 ], + "texture": "textures/ui/sidebar_icons/csb_sidebar_icon", + "offset": [ 1, 1 ], + "layer": 5 + } + } + ], + "bindings": [ + { + "binding_name": "#is_on_marketplace_pass_only_sale", + "binding_name_override": "#visible" + } + ] + } + }, + { + "text_wrapper": { + "type": "panel", + "size": [ "fill", "100%" ], + "controls": [ + { + "text": { + "type": "label", + "size": [ "default", 10 ], + "color": "$0_color_format", + "anchor_from": "bottom_left", + "anchor_to": "bottom_left", + "offset": [ 5, -2 ], + "text": "#time_until_sale_expires", + "layer": 6, + "bindings": [ + { + "binding_name": "#time_until_sale_expires" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" + } + ] + } + } + ] + } + } + ] + } } ] } @@ -3027,8 +3194,13 @@ ], "bindings": [ { - "binding_name": "#csb_expiration_banner_visible", + "binding_name": "#is_on_sale", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] }, @@ -3092,6 +3264,11 @@ { "binding_name": "#video_button_enabled", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ], "button_mappings": [ @@ -3135,6 +3312,11 @@ { "binding_name": "#rtx_label_visible", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -3149,6 +3331,11 @@ { "binding_name": "#main_mashup_key_art_file_system", "binding_name_override": "#texture_file_system" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -3208,6 +3395,11 @@ { "binding_name": "#rating_status_valid", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ], "controls": [ @@ -3237,6 +3429,11 @@ "$label_text_bindings": [ { "binding_name": "#rating_button_text" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ], "$pressed_button_name": "button.scrollToRateContent" @@ -3338,6 +3535,11 @@ "binding_name": "#is_creator_label_visible", "binding_name_override": "#visible" }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" + }, { "binding_type": "$store_factory_collection_details", "binding_collection_name": "$store_factory_collection_name", @@ -3531,6 +3733,11 @@ "binding_type": "global", "binding_name": "$glyph_text_binding", "binding_condition": "visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] }, @@ -3549,6 +3756,11 @@ "binding_type": "global", "binding_name": "$glyph_text_binding", "binding_condition": "visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] }, @@ -3738,6 +3950,11 @@ "binding_name": "(not #item_mashup_count_visible)", "binding_name_override": "#visible", "binding_condition": "once" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -3750,36 +3967,6 @@ "size": [ "100%", "100%c" ], "orientation": "vertical", "controls": [ - { - "sale_timer_panel": { - "type": "panel", - "size": [ "100%c", 10 ], - "controls": [ - { - "timer_label": { - "type": "label", - "size": [ "default", "100%" ], - "font_type": "smooth", - "text": "#time_until_sale_expires", - "color": "$coin_color", - "offset": [ 2, 0 ], - "layer": 1, - "bindings": [ - { - "binding_name": "#time_until_sale_expires" - } - ] - } - } - ], - "bindings": [ - { - "binding_name": "#is_sale_timer_visible", - "binding_name_override": "#visible" - } - ] - } - }, { // used in currency purchase treatment - don't rename until the AB test is done "top_interact_button_stack": { @@ -3826,6 +4013,11 @@ { "binding_name": "(not #csb_incompatible_button_visible)", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -3837,6 +4029,11 @@ "binding_type": "view", "source_property_name": "#in_csb_button_visible", "target_property_name": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -3865,6 +4062,11 @@ { "binding_name": "#progress_loading_anim_visible", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -4091,6 +4293,11 @@ { "binding_name": "(not #entitlements_refreshing_visible)", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -4106,6 +4313,11 @@ { "binding_name": "#entitlements_refreshing_visible", "binding_name_override": "#visible" + }, + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" } ] } @@ -4140,6 +4352,13 @@ "size": [ "30%", "100%cm" ] } } + ], + "bindings": [ + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" + } ] }, @@ -4410,13 +4629,6 @@ "offset": [ -3, 0 ], "$single_line_label_text": "#player_count_label", "$pressed_button_name": "button.player_count", - "bindings": [ - { - "binding_type": "$store_factory_collection_details", - "binding_collection_name": "$store_factory_collection_name", - "binding_collection_prefix": "$store_factory_collection_prefix" - } - ], "$label_text_bindings": [ { "binding_type": "collection_details", diff --git a/resource_pack/ui/persona_sdl.json b/resource_pack/ui/persona_sdl.json index 43d392e..81e47ac 100644 --- a/resource_pack/ui/persona_sdl.json +++ b/resource_pack/ui/persona_sdl.json @@ -511,6 +511,9 @@ "$pressed_state_border_visible": true, "$locked_state_border_visible": true, "$focus_id": "open_color_picker_button", + "$focus_override_down": "author_button", + "$focus_override_right": "skin_preview_button", + "focus_enabled": true, "bindings": [ { @@ -662,6 +665,7 @@ "layer": 92, // Must be usable on top of skin rotation input panel which has layer of 90 "$focus_id": "skin_preview_button", + "focus_change_left": "open_color_picker_button", "$button_content": "persona_sdl.view_character_icon", "$button_size_override": [ 22, 22 ], "$pressed_button_name": "$expand_appearance_preview_button_event", @@ -2215,7 +2219,7 @@ //// dressing room right side panel content /////////////////////////////////////////////////////////////////////////////////////// - "info_text_summary_author_button@common_buttons.underline_button": { + "author_button@common_buttons.underline_button": { "offset": [ 2, 0 ], "size": [ "100%c", 12 ], "layer": 2, @@ -2225,6 +2229,9 @@ "$single_line_font_scale_factor": 1, "$single_line_label_color": "$dressing_room_right_side_default_text_color", "$single_line_label_text": "#creator_label", + "focus_identifier": "author_button", + "focus_enabled": true, + "focus_change_up": "open_color_picker_button", "$label_text_bindings": [ { "binding_name": "$single_line_label_text" @@ -2241,6 +2248,7 @@ "info_text_summary_button_panel": { "type": "panel", "size": [ "100%c", "100%c" ], + "$focus_id": "author_button", "bindings": [ { "binding_name": "(not (#creator_label = ''))", @@ -2248,7 +2256,7 @@ } ], "controls": [ - { "summary_author_button@persona_sdl.info_text_summary_author_button": {} } + { "summary_author_button@persona_sdl.author_button": {} } ] }, @@ -4373,7 +4381,7 @@ "size": [ "100%", "100%cm" ], "controls": [ { "getting_started@persona.persona_getting_started_panel": {} }, - { "piece_offer_info_panel@persona.piece_list_right_side_section": {} }, + { "piece_offer_info_panel@persona_sdl.piece_list_right_side_section": {} }, { "size_info_panel@persona.size_right_side_info_section": {} }, { "offer_info_panel_skins@persona.right_side_offer_info_skins": {} }, { "emote_info_panel@persona.right_side_emotes_info_panel": {} } diff --git a/resource_pack/ui/server_form.json b/resource_pack/ui/server_form.json index 9635987..e7a72df 100644 --- a/resource_pack/ui/server_form.json +++ b/resource_pack/ui/server_form.json @@ -128,7 +128,8 @@ "control_ids": { "button": "server_form.dynamic_button", "label": "@server_form.dynamic_label", - "header": "@server_form.dynamic_header" + "header": "@server_form.dynamic_header", + "divider": "@settings_common.option_group_section_divider" } }, @@ -287,7 +288,8 @@ "step_slider": "@server_form.custom_step_slider", "dropdown": "@server_form.custom_dropdown", "input": "@server_form.custom_input", - "header": "@server_form.custom_header" + "header": "@server_form.custom_header", + "divider": "@settings_common.option_group_section_divider" } }, diff --git a/resource_pack/ui/settings_sections/controls_section.json b/resource_pack/ui/settings_sections/controls_section.json index 7e4cfd1..d25fdd1 100644 --- a/resource_pack/ui/settings_sections/controls_section.json +++ b/resource_pack/ui/settings_sections/controls_section.json @@ -1115,6 +1115,15 @@ ] } }, + { + "option_show_toggle_camera_perspective_button@settings_common.option_toggle": { + "ignored": "$education_edition", + "$option_label": "options.showToggleCameraPerspectiveButton", + "$option_binding_name": "#show_toggle_camera_perspective_button", + "$option_enabled_binding_name": "#show_toggle_camera_perspective_button_enabled", + "$toggle_name": "show_toggle_camera_perspective_button" + } + }, { "joystick_visibility_dropdown@settings_common.option_dropdown": { "$option_label": "options.joystickVisibilityOption", diff --git a/resource_pack/ui/settings_sections/general_section.json b/resource_pack/ui/settings_sections/general_section.json index 30df106..ea36863 100644 --- a/resource_pack/ui/settings_sections/general_section.json +++ b/resource_pack/ui/settings_sections/general_section.json @@ -239,7 +239,7 @@ // Add some padding between the buttons/toggles to reduce the impression upon the eyes. (ADO:515619) { "paddingFilterProfanity": { - "ignored": "(not $build_platform_UWP or $disable_toggle_filter_profanity)", + "ignored": "(not ($build_platform_UWP or $is_ios or $google_os) or $disable_toggle_filter_profanity)", "type": "panel", "size": "$spatialPatternsPadding" } @@ -247,7 +247,7 @@ { "filter_profanity_toggle@settings_common.option_toggle": { - "ignored": "(not $build_platform_UWP or $disable_toggle_filter_profanity)", + "ignored": "(not ($build_platform_UWP or $is_ios or $google_os) or $disable_toggle_filter_profanity)", "$option_label": "options.filterProfanity", "$option_binding_name": "#filter_profanity", "$option_enabled_binding_name": "#filter_profanity_enabled", @@ -1435,16 +1435,10 @@ "type": "panel", "size": [ "100%", "62px + 8px" ], "$manage_button_size|default": [ "50% - 1px", 30 ], - "variables": [ - { - "requires": "$is_windows_10_mobile", - "$manage_button_size": [ "100%", 30 ] - } - ], "controls": [ { "change_gamertag_button@settings_common.action_button": { - "ignored": "($is_windows_10_mobile or $is_ios or $is_android)", + "ignored": "($is_ios or $is_android)", "size": [ "50% - 1px", 30 ], "anchor_from": "top_left", "anchor_to": "top_left", @@ -1454,7 +1448,7 @@ }, { "change_gamertag_button_mobile@settings_common.link_button": { - "ignored": "(not ($is_windows_10_mobile or $is_ios or $is_android))", + "ignored": "(not ($is_ios or $is_android))", "size": [ "50% - 1px", 30 ], "anchor_from": "top_left", "anchor_to": "top_left", @@ -4468,28 +4462,6 @@ ] }, */ - "csb_info_label@common.minecraftTenLabel": { - "text": "options.viewSubscriptions.button.info", - "color": "$text_color", - "offset": [ 0, -1 ] - }, - - "csb_cancel_label@common.minecraftTenLabel": { - "text": "gui.cancel", - "color": "$text_color", - "offset": [ 0, -1 ] - }, - - "csb_buy_label@common.minecraftTenLabel": { - "text": "#csb_price", - "color": "$text_color", - "offset": [ 0, -1 ], - "bindings": [ - { - "binding_name": "#csb_price" - } - ] - }, "left_button_label@common.minecraftTenLabel": { "$left_button_text|default": "#left_button_text", @@ -4507,7 +4479,7 @@ }, "right_button_label@common.minecraftTenLabel": { - "text": "options.viewSubscriptions.button.info", + "text": "$right_button_label_text", "color": "$text_color", "offset": [ 0, -1 ] }, @@ -4525,7 +4497,7 @@ }, { "left_button_panel": { - "ignored": "$pre_release", + "ignored": "($pre_release or $left_button_ignored)", "type": "panel", "size": [ "49%", "100%" ], "controls": [ @@ -4579,7 +4551,7 @@ }, { "pad_1": { - "ignored": "$pre_release", + "ignored": "($pre_release or $left_button_ignored)", "type": "panel", "size": [ 4, "100%" ], "bindings": [ @@ -4875,7 +4847,10 @@ "$realm_collection_name|default": "", "controls": [ { - "top_panel@general_section.realms_subscription_main": {} + "top_panel@general_section.realms_subscription_main": { + "$left_button_ignored": false, + "$right_button_label_text": "options.viewSubscriptions.button.info" + } }, { "pad_1": { @@ -5239,6 +5214,7 @@ }, { "csb_purchased_with_cancel@csb_subscription_panel.csb_container": { + "$left_button_ignored": false, "$left_button": "cancel@csb_subscription_panel.csb_cancel_button", "$csb_panel_bindings|default": [ { @@ -5250,6 +5226,7 @@ }, { "csb_purchased_with_buy@csb_subscription_panel.csb_container": { + "$left_button_ignored": true, "$left_button": "buy@csb_subscription_panel.csb_buy_container", "$csb_panel_bindings|default": [ { @@ -5397,15 +5374,10 @@ { "realms_plus_header_label@common.minecraftTenLabel": { "ignored": "$pre_release", - "text": "#available_or_additional_subscriptions_text", + "text": "options.viewSubscriptions.additionalSubscriptions", "text_alignment": "left", "color": "$body_text_color", - "size": [ "100%", 12 ], - "bindings": [ - { - "binding_name": "#available_or_additional_subscriptions_text" - } - ] + "size": [ "100%", 12 ] } }, { @@ -5415,83 +5387,25 @@ "size": [ "100%", 2 ] } }, - { - "realms_plus_buy_offer@general_section.realms_subscription_main": { - "ignored": "$pre_release", - "$realm_collection_name": "realms_plus_subscriptions_collection", - "$right_pressed_button_name": "button.realms_plus_right_button", - "$left_pressed_button_name": "button.realms_plus_buy_button", - "$left_button_label_bindings": [ - { - "binding_name": "#price_text", - "binding_type": "collection", - "binding_collection_name": "$realm_collection_name" - } - ], - "$left_button_visible_bindings": [], - "$left_button_text": "#price_text", - "$name": "options.viewSubscriptions.tenPlayers", - "$name_bindings": [], - "$description": "#upsell_text", - "$description_bindings": [ - { - "binding_name": "#upsell_text", - "binding_type": "collection", - "binding_collection_name": "$realm_collection_name" - } - ], - "bindings": [ - { - "binding_name": "#can_buy_more_subscriptions", - "binding_name_override": "#visible", - "binding_type": "collection", - "binding_collection_name": "$realm_collection_name" - } - ] - } - }, - { - "pad_1": { - "ignored": "$pre_release", - "type": "panel", - "size": [ "100%", 6 ] - } - }, { "additional_realms_buy_offer@general_section.realms_subscription_main": { "ignored": "$pre_release", "$realm_collection_name": "additional_realms_subscriptions_collection", "$right_pressed_button_name": "button.additional_realms_right_button", + "$left_button_ignored": true, + "$right_button_label_text": "options.viewSubscriptions.addRealmsServer.button", "$left_pressed_button_name": "button.additional_realms_buy_button", - "$left_button_label_bindings": [ - { - "binding_name": "#price_text", - "binding_type": "collection", - "binding_collection_name": "$realm_collection_name" - } - ], - "$left_button_visible_bindings": [], "$image_controls": [ { "image": { "type": "image", "size": [ "100%", "100%" ], - "texture": "textures/ui/realms_art_icon" + "texture": "textures/ui/subscription_Realms" } } ], - "$image_size": [ "85.1315%y", 70 ], - "$left_button_text": "#price_text", - "$name": "options.viewSubscriptions.twoPlayers", - "$name_bindings": [], - "$description": "#upsell_text", - "$description_bindings": [ - { - "binding_name": "#upsell_text", - "binding_type": "collection", - "binding_collection_name": "$realm_collection_name" - } - ], + "$name": "options.viewSubscriptions.realmsServer", + "$description": "options.viewSubscriptions.addRealmsServer.Body", "bindings": [ { "binding_name": "#can_buy_more_subscriptions", @@ -5504,7 +5418,6 @@ }, { "pad_8": { - "ignored": "$pre_release", "type": "panel", "size": [ "100%", 6 ] } @@ -5512,6 +5425,7 @@ //csb panel { "csb_buy_panel@csb_subscription_panel.csb_container": { + "$left_button_ignored": true, "$left_button": "csbBuy@csb_subscription_panel.csb_buy_container" } }, @@ -11811,6 +11725,12 @@ "$radio_label_text": "Switch" } }, + { + "@settings_common.radio_with_label": { + "$toggle_state_binding_name": "#console", + "$radio_label_text": "Console" + } + }, { "@settings_common.radio_with_label": { "$toggle_state_binding_name": "#console_gen8", diff --git a/resource_pack/ui/settings_sections/settings_common.json b/resource_pack/ui/settings_sections/settings_common.json index 74ddb5e..96428b5 100644 --- a/resource_pack/ui/settings_sections/settings_common.json +++ b/resource_pack/ui/settings_sections/settings_common.json @@ -164,6 +164,24 @@ ] }, + "option_group_section_divider": { + "type": "panel", + "$size|default": [ "100%", "9px" ], + "size": "$size", + "controls": [ + { + "background": { + "type": "image", + "size": [ "100%", 1 ], + "anchor_from": "center", + "anchor_to": "center", + "layer": 3, + "texture": "textures/ui/list_item_divider_line_light" + } + } + ] + }, + "option_generic": { "type": "panel", "$option_generic_panel_size|default": [ "100%", "100%c" ], diff --git a/resource_pack/ui/start_screen.json b/resource_pack/ui/start_screen.json index cdf8031..b1b532f 100644 --- a/resource_pack/ui/start_screen.json +++ b/resource_pack/ui/start_screen.json @@ -762,7 +762,7 @@ "size": [ "100%c", 25 ], "$pressed_button_name": "button.gathering", "$button_state_panel": "common_buttons.new_ui_width_fitting_button_panel", - "$button_text_max_size": [ 105, 25 ], + "$button_text_max_size": [ 107, 25 ], "$button_text": "#gathering_button_text", "$button_text_binding_type": "global", "$focus_override_right": "play_button", @@ -1398,7 +1398,8 @@ "play_button@start.main_button": { "$pressed_button_name": "$play_button_target", "$button_text": "menu.play", - "$focus_override_right": "profile_button" + "$focus_override_right": "profile_button", + "default_focus_precedence": 1 }, "get_started_button@start.main_button": { @@ -1615,11 +1616,11 @@ "type": "stack_panel", "size": [ "100%", "100%" ], "orientation": "vertical", - "$title_offset_padding|default": [ "100%", "10%" ], + "$title_offset_padding|default": [ "100%", "12%" ], "variables": [ { "requires": "($pocket_screen)", - "$title_offset_padding": [ "100%", "5%" ] + "$title_offset_padding": [ "100%", "12%" ] } ], "controls": [ diff --git a/resource_pack/ui/ui_art_assets_common.json b/resource_pack/ui/ui_art_assets_common.json index b201fbf..1978a09 100644 --- a/resource_pack/ui/ui_art_assets_common.json +++ b/resource_pack/ui/ui_art_assets_common.json @@ -41,10 +41,10 @@ "title_panel_pocket": { "type": "panel", + "offset": [ 0, "5%" ], "anchor_from": "top_middle", "anchor_to": "top_middle", "size": [ "55%", "18.85%x" ], - "offset": [ 0, "40%" ], "controls": [ { "title_image@common_art.title_image": {} }, { @@ -58,7 +58,7 @@ "title_panel_win10": { "type": "panel", "size": [ "55%", "18.85%x" ], - "offset": [ 0, "40%" ], + "offset": [ 0, "10%" ], "anchor_from": "top_middle", "anchor_to": "top_middle", "controls": [ diff --git a/resource_pack/ui/ui_edu_common.json b/resource_pack/ui/ui_edu_common.json index d309f12..cc62bf4 100644 --- a/resource_pack/ui/ui_edu_common.json +++ b/resource_pack/ui/ui_edu_common.json @@ -1940,5 +1940,14 @@ } } ] + }, + + // Used in Worlds screen and Server screen to define nested buttons in world tiles + "nested_buttons_base_definition": { + "type": "stack_panel", + "size": [ "100% - 4px", "100%c" ], + "offset": [ 0, 2 ], + "anchor_from": "top_middle", + "anchor_to": "top_middle" } } diff --git a/resource_pack/ui/ui_iconbutton.json b/resource_pack/ui/ui_iconbutton.json index 4dc1264..1aaf28b 100644 --- a/resource_pack/ui/ui_iconbutton.json +++ b/resource_pack/ui/ui_iconbutton.json @@ -7,15 +7,19 @@ "texture": "$icon_texture" }, - "button@common_buttons.light_content_form_fitting_button": { - "size": [ "100%c", "100%c" ], - "$button_content_size_override": [ "100%c", "100%c - 4px" ], + "button@common_buttons.light_content_button": { + "size": [ "100%", "100%c" ], + "$button_state_panel|default": "common_buttons.new_ui_height_fitting_button_panel", + "$anchor": "top_left", // Cannot override this or will cause unsolvable layout! + "$button_offset|default": [ 3, 1 ], + "$button_pressed_offset|default": [ 3, 2 ], + "$button_type_panel": "common_buttons.height_fitting_button_content_panel", "$button_content": "iconbutton.iconbutton_button_content" }, "iconbutton_button_content": { "type": "stack_panel", - "size": [ "100%c", 24 ], + "size": [ "100%", 16 ], "orientation": "horizontal", "controls": [ { @@ -27,7 +31,7 @@ "icon_with_border": { "type": "panel", "size": [ 18, 18 ], - "offset": [ -2, 0 ], + "offset": [ -3, -2 ], "controls": [ { "iconbutton_animated_icon@iconbutton.iconbutton_animated_icon": {} @@ -58,7 +62,7 @@ { "top_padding": { "type": "panel", - "size": [ "0px", 4 ] + "size": [ "0px", 2 ] } }, { @@ -73,11 +77,6 @@ } ] } - }, - { - "padding_right@common.empty_panel": { - "size": [ 6, "100%" ] - } } ] }