diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 495a923dde..88f9fb6012 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: env: - VERSION: '26.1' + VERSION: '26.2' COMMIT_MSG: ${{ github.event.head_commit.message }} jobs: @@ -86,11 +86,11 @@ jobs: # https://fabricmc.net/use/server/ # https://modrinth.com/mod/fabric-api/versions # https://modrinth.com/mod/packtest/versions - - version: '26.1' - fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/26.1-snapshot-6/0.18.4/1.1.1/server/jar - fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/WAZ95Yd8/fabric-api-0.143.2%2B26.1.jar - packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/eupLiv70/packtest-2.5.0-beta1.jar - command_limit_tracer_url: https://cdn.modrinth.com/data/Ao12dSbt/versions/DxBN5h3K/commandlimittracer-0.2.0.jar + - version: '26.2' + fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/26.2-rc-2/0.19.3/1.1.1/server/jar + fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/Fsy077WD/fabric-api-0.152.0%2B26.2.jar + packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/qT2wdJhc/packtest-2.6.0-beta1.jar + command_limit_tracer_url: https://cdn.modrinth.com/data/Ao12dSbt/versions/zKvlVzlN/commandlimittracer-0.3.0.jar name: 'test-${{ matrix.version }}' runs-on: ubuntu-24.04 steps: diff --git a/base/data/gm4/function/conflict_logs/traverse.mcfunction b/base/data/gm4/function/conflict_logs/traverse.mcfunction index 2b8fab5ef6..eaca515ef7 100644 --- a/base/data/gm4/function/conflict_logs/traverse.mcfunction +++ b/base/data/gm4/function/conflict_logs/traverse.mcfunction @@ -1,7 +1,7 @@ execute store success score #not_match gm4_data run data modify storage gm4:log traverse_versions[0].id set from storage gm4:log log.require_id -execute if data storage gm4:log traverse_versions[0].from run data modify storage gm4:log temp set value [{"text":" (packaged in ","color":"red"},{"nbt":"traverse_versions[0].from","storage":"gm4:log","plain":true,"color":"red"},{"text":")","color":"red"}] +execute if data storage gm4:log traverse_versions[0].from run data modify storage gm4:log temp set value [{"text":" (packaged in ","color":"red"},{"nbt":"traverse_versions[0].from","storage":"gm4:log","interpret":true,"color":"red"},{"text":")","color":"red"}] -execute if score #not_match gm4_data matches 0 run tellraw @a[tag=gm4_show_log] [{"nbt":"log.module","storage":"gm4:log","plain":true,"color":"red"},{"text":" is disabled. It requires ","color":"red"},{"nbt":"log.require","storage":"gm4:log","plain":true,"color":"red"},{"text":" v","color":"red"},{"nbt":"log.require_ver","storage":"gm4:log","plain":true},{"text":" but ","color":"red"},{"nbt":"traverse_versions[0].module","storage":"gm4:log","plain":true},{"text":" v"},{"nbt":"traverse_versions[0].version","storage":"gm4:log","color":"red"},{"text":" is installed instead","color":"red"},{"nbt":"temp","storage":"gm4:log","interpret":true}] +execute if score #not_match gm4_data matches 0 run tellraw @a[tag=gm4_show_log] [{"nbt":"log.module","storage":"gm4:log","interpret":true,"color":"red"},{"text":" is disabled. It requires ","color":"red"},{"nbt":"log.require","storage":"gm4:log","interpret":true,"color":"red"},{"text":" v","color":"red"},{"nbt":"log.require_ver","storage":"gm4:log","interpret":true},{"text":" but ","color":"red"},{"nbt":"traverse_versions[0].module","storage":"gm4:log","interpret":true},{"text":" v"},{"nbt":"traverse_versions[0].version","storage":"gm4:log","color":"red"},{"text":" is installed instead","color":"red"},{"nbt":"temp","storage":"gm4:log","interpret":true}] data remove storage gm4:log temp execute if score #not_match gm4_data matches 1 run data remove storage gm4:log traverse_versions[0] diff --git a/base/data/gm4/function/conflict_logs/version_conflict_start.mcfunction b/base/data/gm4/function/conflict_logs/version_conflict_start.mcfunction index 72ed753fdc..45c7fc1d26 100644 --- a/base/data/gm4/function/conflict_logs/version_conflict_start.mcfunction +++ b/base/data/gm4/function/conflict_logs/version_conflict_start.mcfunction @@ -1,6 +1,6 @@ data modify storage gm4:log traverse_versions set from storage gm4:log versions function gm4:conflict_logs/traverse -execute if score #not_match gm4_data matches 1 run tellraw @a[tag=gm4_show_log] [{"nbt":"log.module","storage":"gm4:log","plain":true,"color":"red"},{"text":" is disabled. It requires ","color":"red"},{"nbt":"log.require","storage":"gm4:log","plain":true,"color":"red"},{"text":" v","color":"red"},{"nbt":"log.require_ver","storage":"gm4:log","plain":true},{"text":" but ?Unknown Version? is installed instead","color":"red"}] +execute if score #not_match gm4_data matches 1 run tellraw @a[tag=gm4_show_log] [{"nbt":"log.module","storage":"gm4:log","interpret":true,"color":"red"},{"text":" is disabled. It requires ","color":"red"},{"nbt":"log.require","storage":"gm4:log","interpret":true,"color":"red"},{"text":" v","color":"red"},{"nbt":"log.require_ver","storage":"gm4:log","interpret":true},{"text":" but ?Unknown Version? is installed instead","color":"red"}] data remove storage gm4:log traverse_versions diff --git a/base/data/gm4/tags/block/full_collision.json b/base/data/gm4/tags/block/full_collision.json index b7448d3230..b35efa8e41 100644 --- a/base/data/gm4/tags/block/full_collision.json +++ b/base/data/gm4/tags/block/full_collision.json @@ -48,6 +48,7 @@ "minecraft:carved_pumpkin", "minecraft:chain_command_block", "minecraft:chiseled_bookshelf", + "minecraft:chiseled_cinnabar", "minecraft:chiseled_copper", "minecraft:chiseled_deepslate", "minecraft:chiseled_nether_bricks", @@ -57,7 +58,10 @@ "minecraft:chiseled_resin_bricks", "minecraft:chiseled_sandstone", "minecraft:chiseled_stone_bricks", + "minecraft:chiseled_sulfur", "minecraft:chiseled_tuff", + "minecraft:cinnabar", + "minecraft:cinnabar_bricks", "minecraft:clay", "minecraft:coal_block", "minecraft:coal_ore", @@ -223,10 +227,13 @@ "minecraft:polished_basalt", "minecraft:polished_blackstone_bricks", "minecraft:polished_blackstone", + "minecraft:polished_cinnabar", "minecraft:polished_deepslate", "minecraft:polished_diorite", "minecraft:polished_granite", + "minecraft:polished_sulfur", "minecraft:polished_tuff", + "minecraft:potent_sulfur", "minecraft:prismarine_bricks", "minecraft:prismarine", "minecraft:pumpkin", @@ -281,6 +288,8 @@ "minecraft:stone_bricks", "minecraft:stone", "minecraft:structure_block", + "minecraft:sulfur", + "minecraft:sulfur_bricks", "minecraft:suspicious_gravel", "minecraft:suspicious_sand", "minecraft:target", diff --git a/base/data/gm4/tags/block/waterloggable.json b/base/data/gm4/tags/block/waterloggable.json index 0bc100d66d..e85af62f73 100644 --- a/base/data/gm4/tags/block/waterloggable.json +++ b/base/data/gm4/tags/block/waterloggable.json @@ -73,6 +73,7 @@ "minecraft:sea_pickle", "minecraft:small_dripleaf", "minecraft:soul_lantern", + "minecraft:sulfur_spike", "minecraft:trapped_chest", "minecraft:white_stained_glass_pane", "minecraft:yellow_stained_glass_pane" diff --git a/base/data/gm4/tags/entity_type/passive.json b/base/data/gm4/tags/entity_type/passive.json index a6ea9fec7e..60e76b4479 100644 --- a/base/data/gm4/tags/entity_type/passive.json +++ b/base/data/gm4/tags/entity_type/passive.json @@ -30,6 +30,7 @@ "minecraft:snow_golem", "minecraft:squid", "minecraft:strider", + "minecraft:sulfur_cube", "minecraft:tadpole", "minecraft:tropical_fish", "minecraft:turtle", diff --git a/gm4/plugins/manifest.py b/gm4/plugins/manifest.py index eec67451d9..1e8274a5e8 100644 --- a/gm4/plugins/manifest.py +++ b/gm4/plugins/manifest.py @@ -21,7 +21,7 @@ parent_logger = logging.getLogger("gm4.manifest") -SUPPORTED_GAME_VERSIONS = ["26.1"] +SUPPORTED_GAME_VERSIONS = ["26.2"] # config models for beet.yaml metas CreditsModel = dict[str, list[str]] @@ -145,7 +145,7 @@ def create(ctx: Context): ctx.cache["gm4_manifest"].json = manifest.model_dump() # Read in the previous manifest, if found - version = os.getenv("VERSION", "26.1") + version = os.getenv("VERSION", "26.2") release_dir = Path('release') / version manifest_file = release_dir / "meta.json" @@ -219,7 +219,7 @@ def update_patch(ctx: Context): def write_meta(ctx: Context): """Write the updated meta.json file.""" - version = os.getenv("VERSION", "26.1") + version = os.getenv("VERSION", "26.2") release_dir = Path('release') / version os.makedirs(release_dir, exist_ok=True) diff --git a/gm4/plugins/output.py b/gm4/plugins/output.py index 7b5206fa54..4589c159a3 100644 --- a/gm4/plugins/output.py +++ b/gm4/plugins/output.py @@ -21,7 +21,7 @@ def beet_default(ctx: Context): """Saves the datapack to the ./out folder in it's exit phase. Should be first in pipeline to properly wrap all other plugins cleanup phases""" - version = os.getenv("VERSION", "26.1") + version = os.getenv("VERSION", "26.2") out_dir = Path("out") yield # wait for exit phase, after other plugins cleanup @@ -33,7 +33,7 @@ def beet_default(ctx: Context): def resource_pack(ctx: Context): """Saves the resourcepack to the ./out folder.""" - version = os.getenv("VERSION", "26.1") + version = os.getenv("VERSION", "26.2") out_dir = Path("out") ctx.assets.save( @@ -43,7 +43,7 @@ def resource_pack(ctx: Context): def release_resource_pack(ctx: Context): """Saves the resourcepack to the ./out folder.""" - version = os.getenv("VERSION", "26.1") + version = os.getenv("VERSION", "26.2") release_dir = Path("release") / version yield @@ -82,7 +82,7 @@ def release(ctx: Context): `BEET_SMITHED_TOKEN` environment variable is set, will try to publish a new version to Smithed if it doesn't already exist. """ - version_dir = os.getenv("VERSION", "26.1") + version_dir = os.getenv("VERSION", "26.2") release_dir = Path("release") / version_dir corrected_project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id @@ -199,7 +199,7 @@ def publish_smithed(ctx: Context, config: ManifestConfig, file_name: str): """Attempts to publish pack to smithed""" auth_token = os.getenv(SMITHED_AUTH_KEY, None) logger = parent_logger.getChild(f"smithed.{ctx.project_id}") - mc_version_dir = os.getenv("VERSION", "26.1") + mc_version_dir = os.getenv("VERSION", "26.2") manifest = ManifestCacheModel.model_validate(ctx.cache["gm4_manifest"].json) project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id @@ -299,7 +299,7 @@ def clear_release(ctx: Context): 1. Deleted modules no longer stick around in the current version 2. Changes to the build system (such as renamed files/folders) are properly reflected """ - version = os.getenv("VERSION", "26.1") + version = os.getenv("VERSION", "26.2") release_dir = Path("release") / version shutil.rmtree(release_dir, ignore_errors=True) os.makedirs(release_dir, exist_ok=True) diff --git a/gm4/plugins/resource_pack.py b/gm4/plugins/resource_pack.py index 973691711f..d9cf604a5d 100644 --- a/gm4/plugins/resource_pack.py +++ b/gm4/plugins/resource_pack.py @@ -43,7 +43,7 @@ JsonType = dict[str,Any] -MINECRAFT_REFERENCE_VERSION = "26.1" +MINECRAFT_REFERENCE_VERSION = "26.2" parent_logger = logging.getLogger("gm4.resource_pack") diff --git a/gm4/plugins/write_mcmeta.py b/gm4/plugins/write_mcmeta.py index b242a58bc9..0125e2fb53 100644 --- a/gm4/plugins/write_mcmeta.py +++ b/gm4/plugins/write_mcmeta.py @@ -9,18 +9,18 @@ def beet_default(ctx: Context): manifest = ManifestCacheModel.model_validate(ctx.cache["gm4_manifest"].json) manifest_entry = {v.id:v for v in (manifest.modules|manifest.libraries).values()}.get(ctx.project_id, NoneAttribute()) - ctx.data.min_format = 101 - ctx.data.max_format = 101 + ctx.data.min_format = 107 + ctx.data.max_format = 107 - ctx.assets.min_format = 84 - ctx.assets.max_format = 84 + ctx.assets.min_format = 88 + ctx.assets.max_format = 88 for pack in ctx.packs: pack.description = [ ctx.project_name, "\n", { - "text": f"Gamemode 4 for 26.1", + "text": f"Gamemode 4 for 26.2", "color": "#4AA0C7" } ] diff --git a/gm4_apple_trees/data/gm4_apple_trees/advancement/apple_hand_empty.json b/gm4_apple_trees/data/gm4_apple_trees/advancement/apple_hand_empty.json index 52aecfe02c..4df17b219f 100644 --- a/gm4_apple_trees/data/gm4_apple_trees/advancement/apple_hand_empty.json +++ b/gm4_apple_trees/data/gm4_apple_trees/advancement/apple_hand_empty.json @@ -27,8 +27,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:armor_stand", - "nbt": "{Tags:[\"gm4_apple\",\"gm4_ripe_apple\"]}" + "minecraft:entity_type": "minecraft:armor_stand", + "minecraft:entity_tags": { + "all_of": [ + "gm4_apple", + "gm4_ripe_apple" + ] + } } } ] diff --git a/gm4_apple_trees/data/gm4_apple_trees/advancement/apple_hand_item.json b/gm4_apple_trees/data/gm4_apple_trees/advancement/apple_hand_item.json index 5abb43ca7a..b0e1617a2b 100644 --- a/gm4_apple_trees/data/gm4_apple_trees/advancement/apple_hand_item.json +++ b/gm4_apple_trees/data/gm4_apple_trees/advancement/apple_hand_item.json @@ -30,8 +30,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:armor_stand", - "nbt": "{Tags:[\"gm4_apple\",\"gm4_ripe_apple\"]}" + "minecraft:entity_type": "minecraft:armor_stand", + "minecraft:entity_tags": { + "all_of": [ + "gm4_apple", + "gm4_ripe_apple" + ] + } } } ] diff --git a/gm4_apple_trees/data/gm4_apple_trees/guidebook/apple_trees.json b/gm4_apple_trees/data/gm4_apple_trees/guidebook/apple_trees.json index 1feef03af8..32d98c82f1 100644 --- a/gm4_apple_trees/data/gm4_apple_trees/guidebook/apple_trees.json +++ b/gm4_apple_trees/data/gm4_apple_trees/guidebook/apple_trees.json @@ -29,8 +29,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:armor_stand", - "nbt": "{Tags:[\"gm4_apple\"]}" + "minecraft:entity_type": "minecraft:armor_stand", + "minecraft:entity_tags": { + "all_of": [ + "gm4_apple" + ] + } } } ] diff --git a/gm4_apple_trees/data/gm4_golden_apple_trees/advancement/apple_hand_empty.json b/gm4_apple_trees/data/gm4_golden_apple_trees/advancement/apple_hand_empty.json index ecb7c28cf9..735ddcc204 100644 --- a/gm4_apple_trees/data/gm4_golden_apple_trees/advancement/apple_hand_empty.json +++ b/gm4_apple_trees/data/gm4_golden_apple_trees/advancement/apple_hand_empty.json @@ -27,8 +27,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:armor_stand", - "nbt": "{Tags:[\"gm4_golden_apple\",\"gm4_ripe_apple\"]}" + "minecraft:entity_type": "minecraft:armor_stand", + "minecraft:entity_tags": { + "all_of": [ + "gm4_golden_apple", + "gm4_ripe_apple" + ] + } } } ] diff --git a/gm4_apple_trees/data/gm4_golden_apple_trees/advancement/apple_hand_item.json b/gm4_apple_trees/data/gm4_golden_apple_trees/advancement/apple_hand_item.json index 38623d978f..fd7a2d86a1 100644 --- a/gm4_apple_trees/data/gm4_golden_apple_trees/advancement/apple_hand_item.json +++ b/gm4_apple_trees/data/gm4_golden_apple_trees/advancement/apple_hand_item.json @@ -30,8 +30,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:armor_stand", - "nbt": "{Tags:[\"gm4_golden_apple\",\"gm4_ripe_apple\"]}" + "minecraft:entity_type": "minecraft:armor_stand", + "minecraft:entity_tags": { + "all_of": [ + "gm4_golden_apple", + "gm4_ripe_apple" + ] + } } } ] diff --git a/gm4_balloon_animals/data/gm4_balloon_animals/guidebook/balloon_animals.json b/gm4_balloon_animals/data/gm4_balloon_animals/guidebook/balloon_animals.json index 2bbdc42b2e..585ef21bc0 100644 --- a/gm4_balloon_animals/data/gm4_balloon_animals/guidebook/balloon_animals.json +++ b/gm4_balloon_animals/data/gm4_balloon_animals/guidebook/balloon_animals.json @@ -14,7 +14,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_balloon_animal_trader\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_balloon_animal_trader" + ] + } } } ] diff --git a/gm4_bat_grenades/data/gm4/advancement/bat_grenades.json b/gm4_bat_grenades/data/gm4/advancement/bat_grenades.json index 863dfe734b..2675d2b422 100644 --- a/gm4_bat_grenades/data/gm4/advancement/bat_grenades.json +++ b/gm4_bat_grenades/data/gm4/advancement/bat_grenades.json @@ -22,8 +22,12 @@ "trigger": "minecraft:entity_killed_player", "conditions": { "entity": { - "type": "creeper", - "nbt": "{Tags:[\"gm4_bat_grenade\"]}" + "minecraft:entity_type": "creeper", + "minecraft:entity_tags": { + "all_of": [ + "gm4_bat_grenade" + ] + } } } } diff --git a/gm4_bat_grenades/data/gm4_bat_grenades/guidebook/bat_grenades.json b/gm4_bat_grenades/data/gm4_bat_grenades/guidebook/bat_grenades.json index 75599145f8..cba7b1a189 100644 --- a/gm4_bat_grenades/data/gm4_bat_grenades/guidebook/bat_grenades.json +++ b/gm4_bat_grenades/data/gm4_bat_grenades/guidebook/bat_grenades.json @@ -11,8 +11,12 @@ "conditions": { "damage": { "source_entity": { - "type": "minecraft:creeper", - "nbt": "{Tags:[\"gm4_bat_grenade\"]}" + "minecraft:entity_type": "minecraft:creeper", + "minecraft:entity_tags": { + "all_of": [ + "gm4_bat_grenade" + ] + } } } } diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/tracking.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/tracking.json index cbe1b846c0..d6137a4f35 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/tracking.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/tracking.json @@ -8,7 +8,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_bas_track\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_track" + ] + } } } ], @@ -22,7 +26,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:armor_stand" + "minecraft:entity_type": "minecraft:armor_stand" } }, { @@ -39,4 +43,4 @@ "rewards": { "function": "gm4_better_armour_stands:pose/set" } -} \ No newline at end of file +} diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/use.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/use.json index cb7293d8f6..790133b52d 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/use.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/use.json @@ -13,7 +13,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:armor_stand" + "minecraft:entity_type": "minecraft:armor_stand" } }, { diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/use_arms.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/use_arms.json index 31be4bdc9a..324252a128 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/use_arms.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/use_arms.json @@ -13,8 +13,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:interaction", - "nbt": "{Tags:[\"gm4_bas_arms_detect\"]}" + "minecraft:entity_type": "minecraft:interaction", + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_arms_detect" + ] + } } } ] diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/pose/invert.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/pose/invert.json index 92ce360788..849551f972 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/pose/invert.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/pose/invert.json @@ -8,7 +8,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_bas_track\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_track" + ] + } } } ], @@ -17,7 +21,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:interaction" + "minecraft:entity_type": "minecraft:interaction" } } ] diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/pose/set.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/pose/set.json index d6a51f7fa7..274b87f2c4 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/pose/set.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/pose/set.json @@ -8,7 +8,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_bas_track\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_track" + ] + } } } ], @@ -17,7 +21,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:interaction" + "minecraft:entity_type": "minecraft:interaction" } } ] diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/base.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/base.json index 89faf4a2dd..770058c14b 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/base.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/base.json @@ -2,10 +2,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "nbt": "{Tags:[\"gm4_bas_base\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_base" + ] + } } } } diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/body.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/body.json index 8af7bb5c4f..00d873ac62 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/body.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/body.json @@ -2,10 +2,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "nbt": "{Tags:[\"gm4_bas_body\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_body" + ] + } } } } diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/head.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/head.json index 9a20c957f9..74cec3caf0 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/head.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/head.json @@ -2,10 +2,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "nbt": "{Tags:[\"gm4_bas_head\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_head" + ] + } } } } diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/left_arm.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/left_arm.json index 1d22f676e0..67dfb936ae 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/left_arm.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/left_arm.json @@ -2,10 +2,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "nbt": "{Tags:[\"gm4_bas_left_arm\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_left_arm" + ] + } } } } diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/left_leg.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/left_leg.json index 2bd6a6edbd..72c911f8eb 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/left_leg.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/left_leg.json @@ -2,10 +2,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "nbt": "{Tags:[\"gm4_bas_left_leg\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_left_leg" + ] + } } } } diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/right_arm.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/right_arm.json index 5d87fe31ca..5d94029e44 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/right_arm.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/right_arm.json @@ -2,10 +2,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "nbt": "{Tags:[\"gm4_bas_right_arm\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_right_arm" + ] + } } } } diff --git a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/right_leg.json b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/right_leg.json index 6ac10b09c3..58e86ba673 100644 --- a/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/right_leg.json +++ b/gm4_better_armour_stands/data/gm4_better_armour_stands/predicate/select/right_leg.json @@ -2,10 +2,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "nbt": "{Tags:[\"gm4_bas_right_leg\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_bas_right_leg" + ] + } } } } diff --git a/gm4_blossoming_pots/data/gm4_blossoming_pots/function/decorated/set_storage.mcfunction b/gm4_blossoming_pots/data/gm4_blossoming_pots/function/decorated/set_storage.mcfunction index f672a0f8e3..91810748b0 100644 --- a/gm4_blossoming_pots/data/gm4_blossoming_pots/function/decorated/set_storage.mcfunction +++ b/gm4_blossoming_pots/data/gm4_blossoming_pots/function/decorated/set_storage.mcfunction @@ -124,7 +124,8 @@ data modify storage gm4_blossoming_pots:decorated_pots minecraft:pointed_dripsto left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.7f,0.7f,0.7f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ },\ {\ block_state:{\ @@ -139,7 +140,8 @@ data modify storage gm4_blossoming_pots:decorated_pots minecraft:pointed_dripsto left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.7f,0.7f,0.7f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ }\ ],\ 2:[\ @@ -156,7 +158,8 @@ data modify storage gm4_blossoming_pots:decorated_pots minecraft:pointed_dripsto left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.7f,0.7f,0.7f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ },\ {\ block_state:{\ @@ -171,7 +174,8 @@ data modify storage gm4_blossoming_pots:decorated_pots minecraft:pointed_dripsto left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.7f,0.7f,0.7f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ },\ {\ block_state:{\ @@ -186,7 +190,8 @@ data modify storage gm4_blossoming_pots:decorated_pots minecraft:pointed_dripsto left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.7f,0.7f,0.7f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ }\ ],\ 3:[\ @@ -203,7 +208,8 @@ data modify storage gm4_blossoming_pots:decorated_pots minecraft:pointed_dripsto left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.7f,0.7f,0.7f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ },\ {\ block_state:{\ @@ -218,7 +224,8 @@ data modify storage gm4_blossoming_pots:decorated_pots minecraft:pointed_dripsto left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.7f,0.7f,0.7f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ },\ {\ block_state:{\ @@ -233,7 +240,8 @@ data modify storage gm4_blossoming_pots:decorated_pots minecraft:pointed_dripsto left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.7f,0.7f,0.7f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ },\ {\ block_state:{\ @@ -248,7 +256,163 @@ data modify storage gm4_blossoming_pots:decorated_pots minecraft:pointed_dripsto left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.7f,0.7f,0.7f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ + }\ + ]\ +} + +data modify storage gm4_blossoming_pots:decorated_pots minecraft:sulfur_spike set value {\ + place_sound:"minecraft:block.sulfur.place",\ + maximum:3,\ + 1:[\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"frustum"\ + }\ + },\ + transformation:{\ + translation:[-0.35f,1.4435f,0.35f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.7f,0.7f,0.7f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ + },\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"tip"\ + }\ + },\ + transformation:{\ + translation:[-0.35f,2.143f,0.35f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.7f,0.7f,0.7f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ + }\ + ],\ + 2:[\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"middle"\ + }\ + },\ + transformation:{\ + translation:[-0.35f,1.4435f,0.35f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.7f,0.7f,0.7f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ + },\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"frustum"\ + }\ + },\ + transformation:{\ + translation:[-0.35f,2.143f,0.35f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.7f,0.7f,0.7f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ + },\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"tip"\ + }\ + },\ + transformation:{\ + translation:[-0.35f,2.8425f,0.35f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.7f,0.7f,0.7f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ + }\ + ],\ + 3:[\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"middle"\ + }\ + },\ + transformation:{\ + translation:[-0.35f,1.4435f,0.35f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.7f,0.7f,0.7f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ + },\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"middle"\ + }\ + },\ + transformation:{\ + translation:[-0.35f,2.143f,0.35f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.7f,0.7f,0.7f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ + },\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"frustum"\ + }\ + },\ + transformation:{\ + translation:[-0.35f,2.8425f,0.35f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.7f,0.7f,0.7f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ + },\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"tip"\ + }\ + },\ + transformation:{\ + translation:[-0.35f,3.542f,0.35f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.7f,0.7f,0.7f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ }\ ]\ } diff --git a/gm4_blossoming_pots/data/gm4_blossoming_pots/function/flower/set_storage.mcfunction b/gm4_blossoming_pots/data/gm4_blossoming_pots/function/flower/set_storage.mcfunction index d101d2a9b2..19ad744411 100644 --- a/gm4_blossoming_pots/data/gm4_blossoming_pots/function/flower/set_storage.mcfunction +++ b/gm4_blossoming_pots/data/gm4_blossoming_pots/function/flower/set_storage.mcfunction @@ -59,7 +59,8 @@ data modify storage gm4_blossoming_pots:flower_pots minecraft:pointed_dripstone left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.5f,0.5f,0.5f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ },\ {\ block_state:{\ @@ -74,7 +75,46 @@ data modify storage gm4_blossoming_pots:flower_pots minecraft:pointed_dripstone left_rotation:[0.707f,0f,0f,0.707f],\ scale:[0.5f,0.5f,0.5f],\ right_rotation:[0.707f,0f,0f,0.707f]\ - }\ + },\ + Rotation:[0f,0f]\ + }\ + ]\ +} + +data modify storage gm4_blossoming_pots:flower_pots minecraft:sulfur_spike set value {\ + place_sound:"minecraft:block.sulfur.place",\ + display:[\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"frustum"\ + }\ + },\ + transformation:{\ + translation:[-0.25f,0.1435f,0.25f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.5f,0.5f,0.5f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ + },\ + {\ + block_state:{\ + Name:"minecraft:sulfur_spike",\ + Properties:{\ + vertical_direction:"down",\ + thickness:"tip"\ + }\ + },\ + transformation:{\ + translation:[-0.25f,0.6435f,0.25f],\ + left_rotation:[0.707f,0f,0f,0.707f],\ + scale:[0.5f,0.5f,0.5f],\ + right_rotation:[0.707f,0f,0f,0.707f]\ + },\ + Rotation:[0f,0f]\ }\ ]\ } diff --git a/gm4_blossoming_pots/data/gm4_blossoming_pots/guidebook/blossoming_pots.json b/gm4_blossoming_pots/data/gm4_blossoming_pots/guidebook/blossoming_pots.json index 4a219bcd76..8fad4f9464 100644 --- a/gm4_blossoming_pots/data/gm4_blossoming_pots/guidebook/blossoming_pots.json +++ b/gm4_blossoming_pots/data/gm4_blossoming_pots/guidebook/blossoming_pots.json @@ -50,7 +50,7 @@ }, { "translate": "text.gm4.guidebook.blossoming_pots.item_list.1", - "fallback": "Vanilla Flower Pot\n plants\nPale hanging moss\nPointed dripstone\nAmethyst crystals\nLeaves\nGrass plants\nLush cave plants", + "fallback": "Vanilla Flower Pot\n plants\nPale hanging moss\nPointed dripstone\nSulfur spike\nAmethyst crystals\nLeaves\nGrass plants\nLush cave plants", "underlined":false } ], diff --git a/gm4_blossoming_pots/data/gm4_blossoming_pots/predicate/item_potable.json b/gm4_blossoming_pots/data/gm4_blossoming_pots/predicate/item_potable.json index bf77742bbc..110cd037a8 100644 --- a/gm4_blossoming_pots/data/gm4_blossoming_pots/predicate/item_potable.json +++ b/gm4_blossoming_pots/data/gm4_blossoming_pots/predicate/item_potable.json @@ -2,8 +2,8 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:item", - "slots": { + "minecraft:entity_type": "minecraft:item", + "minecraft:slots": { "contents": { "items": "#gm4_blossoming_pots:potable_plants" } diff --git a/gm4_blossoming_pots/translations.csv b/gm4_blossoming_pots/translations.csv index 49ca61691f..37680be18c 100644 --- a/gm4_blossoming_pots/translations.csv +++ b/gm4_blossoming_pots/translations.csv @@ -2,5 +2,5 @@ key,en_us text.gm4.guidebook.module_desc.blossoming_pots,"Greatly expands the selection of potable plants. Use Decorated Pots as abnormally large flower pots. Decorate in Style!" text.gm4.guidebook.blossoming_pots.description,"To pot a plant, interact with a Decorated Pot or empty Flower Pot while holding a supported item.\nTo remove a plant, break the decorated pot or interact with the flower pot with an empty hand." text.gm4.guidebook.blossoming_pots.item_list.header,"Supported Items:" -text.gm4.guidebook.blossoming_pots.item_list.1,"Vanilla Flower Pot\n plants\nPale hanging moss\nPointed dripstone\nAmethyst crystals\nLeaves\nGrass plants\nLush cave plants" +text.gm4.guidebook.blossoming_pots.item_list.1,"Vanilla Flower Pot\n plants\nPale hanging moss\nPointed dripstone\nSulfur spike\nAmethyst crystals\nLeaves\nGrass plants\nLush cave plants" text.gm4.guidebook.blossoming_pots.item_list.2,"Sugar cane\nNether vines\n2 tall plants\nChorus flower\nNon-sniffer seeds\nNether wart\nBush plants\nCoral reef plants\nCactus Flower" diff --git a/gm4_chairs/data/gm4_chairs/advancement/hit.json b/gm4_chairs/data/gm4_chairs/advancement/hit.json index e5708f14fd..e26ffa2130 100644 --- a/gm4_chairs/data/gm4_chairs/advancement/hit.json +++ b/gm4_chairs/data/gm4_chairs/advancement/hit.json @@ -8,8 +8,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:pig", - "nbt": "{Tags:[\"gm4_chairs\"]}" + "minecraft:entity_type": "minecraft:pig", + "minecraft:entity_tags": { + "all_of": [ + "gm4_chairs" + ] + } } } ] diff --git a/gm4_chairs/data/gm4_chairs/predicate/sitting_in_chair.json b/gm4_chairs/data/gm4_chairs/predicate/sitting_in_chair.json index 35e26e6085..737b652566 100644 --- a/gm4_chairs/data/gm4_chairs/predicate/sitting_in_chair.json +++ b/gm4_chairs/data/gm4_chairs/predicate/sitting_in_chair.json @@ -3,8 +3,12 @@ "entity": "this", "predicate": { "vehicle": { - "type": "minecraft:pig", - "nbt": "{Tags:[\"gm4_chairs\"]}" + "minecraft:entity_type": "minecraft:pig", + "minecraft:entity_tags": { + "all_of": [ + "gm4_chairs" + ] + } } } } diff --git a/gm4_cooler_caves/data/minecraft/worldgen/noise_settings/overworld.json b/gm4_cooler_caves/data/minecraft/worldgen/noise_settings/overworld.json index b434eaae2a..18c1c2558c 100644 --- a/gm4_cooler_caves/data/minecraft/worldgen/noise_settings/overworld.json +++ b/gm4_cooler_caves/data/minecraft/worldgen/noise_settings/overworld.json @@ -1,9 +1,5 @@ { - "sea_level": 63, - "disable_mob_generation": false, "aquifers_enabled": true, - "ore_veins_enabled": true, - "legacy_random_source": false, "default_block": { "Name": "minecraft:stone" }, @@ -13,9 +9,11 @@ "level": "0" } }, + "disable_mob_generation": false, + "legacy_random_source": false, "noise": { - "min_y": -64, "height": 384, + "min_y": -64, "size_horizontal": 1, "size_vertical": 2 }, @@ -26,122 +24,19 @@ "xz_scale": 1, "y_scale": 0.5 }, - "fluid_level_floodedness": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_fluid_level_floodedness", - "xz_scale": 1, - "y_scale": 0.67 - }, - "fluid_level_spread": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_fluid_level_spread", - "xz_scale": 1, - "y_scale": 0.7142857142857143 - }, - "lava": { - "type": "minecraft:noise", - "noise": "minecraft:aquifer_lava", - "xz_scale": 1, - "y_scale": 1 - }, - "temperature": { - "type": "minecraft:shifted_noise", - "noise": "minecraft:temperature", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - }, - "vegetation": { - "type": "minecraft:shifted_noise", - "noise": "minecraft:vegetation", - "xz_scale": 0.25, - "y_scale": 0, - "shift_x": "minecraft:shift_x", - "shift_y": 0, - "shift_z": "minecraft:shift_z" - }, "continents": "minecraft:overworld/continents", - "erosion": "minecraft:overworld/erosion", "depth": "minecraft:overworld/depth", - "ridges": "minecraft:overworld/ridges", - "preliminary_surface_level": { - "type": "minecraft:find_top_surface", - "cell_height": 8, - "lower_bound": -64, - "upper_bound": 320, - "density": { - "type": "minecraft:add", - "argument1": 0.1171875, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": -64, - "to_y": -40, - "from_value": 0, - "to_value": 1 - }, - "argument2": { - "type": "minecraft:add", - "argument1": -0.1171875, - "argument2": { - "type": "minecraft:add", - "argument1": -0.078125, - "argument2": { - "type": "minecraft:mul", - "argument1": { - "type": "minecraft:y_clamped_gradient", - "from_y": 240, - "to_y": 256, - "from_value": 1, - "to_value": 0 - }, - "argument2": { - "type": "minecraft:add", - "argument1": 0.078125, - "argument2": { - "type": "minecraft:clamp", - "input": { - "type": "minecraft:add", - "argument1": -0.703125, - "argument2": { - "type": "minecraft:mul", - "argument1": 4, - "argument2": { - "type": "minecraft:quarter_negative", - "argument": { - "type": "minecraft:mul", - "argument1": "minecraft:overworld/depth", - "argument2": { - "type": "minecraft:cache_2d", - "argument": "minecraft:overworld/factor" - } - } - } - } - }, - "min": -64, - "max": 64 - } - } - } - } - } - } - } - }, + "erosion": "minecraft:overworld/erosion", "final_density": { "type": "minecraft:min", "argument1": { "type": "minecraft:squeeze", "argument": { - "type": "minecraft:mul", - "argument1": 0.64, - "argument2": { - "type": "minecraft:interpolated", - "argument": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:mul", + "argument1": 0.64, + "argument2": { "type": "minecraft:blend_density", "argument": { "type": "minecraft:add", @@ -150,10 +45,10 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_y": -64, - "to_y": -40, "from_value": 0, - "to_value": 1 + "from_y": -64, + "to_value": 1, + "to_y": -40 }, "argument2": { "type": "minecraft:add", @@ -165,22 +60,28 @@ "type": "minecraft:mul", "argument1": { "type": "minecraft:y_clamped_gradient", - "from_y": 240, - "to_y": 256, "from_value": 1, - "to_value": 0 + "from_y": 240, + "to_value": 0, + "to_y": 256 }, "argument2": { "type": "minecraft:add", "argument1": 0.078125, "argument2": { "type": "minecraft:range_choice", - "input": "minecraft:overworld/sloped_cheese", - "min_inclusive": -1000000, + "input": { + "type": "minecraft:cache_once", + "argument": "minecraft:overworld/sloped_cheese" + }, "max_exclusive": 1.5625, + "min_inclusive": -1000000, "when_in_range": { "type": "minecraft:min", - "argument1": "minecraft:overworld/sloped_cheese", + "argument1": { + "type": "minecraft:cache_once", + "argument": "minecraft:overworld/sloped_cheese" + }, "argument2": { "type": "minecraft:mul", "argument1": 5, @@ -222,8 +123,8 @@ "y_scale": 0.6666666666666666 } }, - "min": -1, - "max": 1 + "max": 1, + "min": -1 }, "argument2": { "type": "minecraft:clamp", @@ -233,11 +134,14 @@ "argument2": { "type": "minecraft:mul", "argument1": -0.64, - "argument2": "minecraft:overworld/sloped_cheese" + "argument2": { + "type": "minecraft:cache_once", + "argument": "minecraft:overworld/sloped_cheese" + } } }, - "min": 0, - "max": 0.5 + "max": 0.5, + "min": 0 } } }, @@ -252,8 +156,8 @@ "argument2": { "type": "minecraft:range_choice", "input": "minecraft:overworld/caves/pillars", - "min_inclusive": -1000000, "max_exclusive": 0.03, + "min_inclusive": -1000000, "when_in_range": -1000000, "when_out_of_range": "minecraft:overworld/caves/pillars" } @@ -271,22 +175,166 @@ }, "argument2": "minecraft:overworld/caves/noodle" }, - "vein_toggle": { - "type": "minecraft:interpolated", - "argument": { - "type": "minecraft:range_choice", - "input": "minecraft:y", - "min_inclusive": -60, - "max_exclusive": 51, - "when_in_range": { - "type": "minecraft:noise", - "noise": "minecraft:ore_veininess", - "xz_scale": 1.5, - "y_scale": 1.5 + "fluid_level_floodedness": { + "type": "minecraft:noise", + "noise": "minecraft:aquifer_fluid_level_floodedness", + "xz_scale": 1, + "y_scale": 0.67 + }, + "fluid_level_spread": { + "type": "minecraft:noise", + "noise": "minecraft:aquifer_fluid_level_spread", + "xz_scale": 1, + "y_scale": 0.7142857142857143 + }, + "lava": { + "type": "minecraft:noise", + "noise": "minecraft:aquifer_lava", + "xz_scale": 1, + "y_scale": 1 + }, + "preliminary_surface_level": { + "type": "minecraft:find_top_surface", + "cell_height": 8, + "density": { + "type": "minecraft:add", + "argument1": -0.390625, + "argument2": { + "type": "minecraft:add", + "argument1": 0.1171875, + "argument2": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_value": 0, + "from_y": -64, + "to_value": 1, + "to_y": -40 + }, + "argument2": { + "type": "minecraft:add", + "argument1": -0.1171875, + "argument2": { + "type": "minecraft:add", + "argument1": -0.078125, + "argument2": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_value": 1, + "from_y": 240, + "to_value": 0, + "to_y": 256 + }, + "argument2": { + "type": "minecraft:add", + "argument1": 0.078125, + "argument2": { + "type": "minecraft:clamp", + "input": { + "type": "minecraft:add", + "argument1": -0.703125, + "argument2": { + "type": "minecraft:mul", + "argument1": 4, + "argument2": { + "type": "minecraft:quarter_negative", + "argument": { + "type": "minecraft:mul", + "argument1": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:y_clamped_gradient", + "from_value": 1.5, + "from_y": -64, + "to_value": -1.5, + "to_y": 320 + }, + "argument2": { + "type": "minecraft:cache_2d", + "argument": "minecraft:overworld/offset" + } + }, + "argument2": { + "type": "minecraft:cache_2d", + "argument": "minecraft:overworld/factor" + } + } + } + } + }, + "max": 64, + "min": -64 + } + } + } + } + } + } + } + }, + "lower_bound": -64, + "upper_bound": { + "type": "minecraft:clamp", + "input": { + "type": "minecraft:add", + "argument1": 128, + "argument2": { + "type": "minecraft:mul", + "argument1": -128, + "argument2": { + "type": "minecraft:add", + "argument1": { + "type": "minecraft:mul", + "argument1": 0.2734375, + "argument2": { + "type": "minecraft:invert", + "argument": { + "type": "minecraft:cache_2d", + "argument": "minecraft:overworld/factor" + } + } + }, + "argument2": { + "type": "minecraft:mul", + "argument1": -1, + "argument2": { + "type": "minecraft:cache_2d", + "argument": "minecraft:overworld/offset" + } + } + } + } }, - "when_out_of_range": 0 + "max": 320, + "min": -40 } }, + "ridges": "minecraft:overworld/ridges", + "temperature": { + "type": "minecraft:shifted_noise", + "noise": "minecraft:temperature", + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z", + "xz_scale": 0.25, + "y_scale": 0 + }, + "vegetation": { + "type": "minecraft:shifted_noise", + "noise": "minecraft:vegetation", + "shift_x": "minecraft:shift_x", + "shift_y": 0, + "shift_z": "minecraft:shift_z", + "xz_scale": 0.25, + "y_scale": 0 + }, + "vein_gap": { + "type": "minecraft:noise", + "noise": "minecraft:ore_gap", + "xz_scale": 1, + "y_scale": 1 + }, "vein_ridged": { "type": "minecraft:add", "argument1": -0.07999999821186066, @@ -299,8 +347,8 @@ "argument": { "type": "minecraft:range_choice", "input": "minecraft:y", - "min_inclusive": -60, "max_exclusive": 51, + "min_inclusive": -60, "when_in_range": { "type": "minecraft:noise", "noise": "minecraft:ore_vein_a", @@ -318,8 +366,8 @@ "argument": { "type": "minecraft:range_choice", "input": "minecraft:y", - "min_inclusive": -60, "max_exclusive": 51, + "min_inclusive": -60, "when_in_range": { "type": "minecraft:noise", "noise": "minecraft:ore_vein_b", @@ -332,61 +380,73 @@ } } }, - "vein_gap": { - "type": "minecraft:noise", - "noise": "minecraft:ore_gap", - "xz_scale": 1, - "y_scale": 1 + "vein_toggle": { + "type": "minecraft:interpolated", + "argument": { + "type": "minecraft:range_choice", + "input": "minecraft:y", + "max_exclusive": 51, + "min_inclusive": -60, + "when_in_range": { + "type": "minecraft:noise", + "noise": "minecraft:ore_veininess", + "xz_scale": 1.5, + "y_scale": 1.5 + }, + "when_out_of_range": 0 + } } }, + "ore_veins_enabled": true, + "sea_level": 63, "spawn_target": [ { - "temperature": [ - -1, + "continentalness": [ + -0.11, 1 ], - "humidity": [ + "depth": 0, + "erosion": [ -1, 1 ], - "continentalness": [ - -0.11, + "humidity": [ + -1, 1 ], - "erosion": [ + "offset": 0, + "temperature": [ -1, 1 ], "weirdness": [ -1, -0.16 - ], - "depth": 0, - "offset": 0 + ] }, { - "temperature": [ - -1, + "continentalness": [ + -0.11, 1 ], - "humidity": [ + "depth": 0, + "erosion": [ -1, 1 ], - "continentalness": [ - -0.11, + "humidity": [ + -1, 1 ], - "erosion": [ + "offset": 0, + "temperature": [ -1, 1 ], "weirdness": [ 0.16, 1 - ], - "depth": 0, - "offset": 0 + ] } ], "surface_rule": { @@ -396,12 +456,12 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:vertical_gradient", + "false_at_and_above": { + "above_bottom": 5 + }, "random_name": "minecraft:bedrock_floor", "true_at_and_below": { "above_bottom": 0 - }, - "false_at_and_above": { - "above_bottom": 5 } }, "then_run": { @@ -423,10 +483,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "floor" }, "then_run": { "type": "minecraft:sequence", @@ -435,19 +495,17 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:wooded_badlands" - ] + "biome_is": "minecraft:wooded_badlands" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:y_above", + "add_stone_depth": false, "anchor": { "absolute": 97 }, - "surface_depth_multiplier": 2, - "add_stone_depth": false + "surface_depth_multiplier": 2 }, "then_run": { "type": "minecraft:sequence", @@ -456,9 +514,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": -0.5454, "min_threshold": -0.909, - "max_threshold": -0.5454 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -471,9 +529,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 0.1818, "min_threshold": -0.1818, - "max_threshold": 0.1818 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -486,9 +544,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 0.909, "min_threshold": 0.5454, - "max_threshold": 0.909 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -504,9 +562,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -534,19 +592,17 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:swamp" - ] + "biome_is": "minecraft:swamp" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:y_above", + "add_stone_depth": false, "anchor": { "absolute": 62 }, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:condition", @@ -554,20 +610,20 @@ "type": "minecraft:not", "invert": { "type": "minecraft:y_above", + "add_stone_depth": false, "anchor": { "absolute": 63 }, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 } }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface_swamp", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface_swamp" }, "then_run": { "type": "minecraft:block", @@ -586,19 +642,17 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] + "biome_is": "minecraft:mangrove_swamp" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:y_above", + "add_stone_depth": false, "anchor": { "absolute": 60 }, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:condition", @@ -606,20 +660,20 @@ "type": "minecraft:not", "invert": { "type": "minecraft:y_above", + "add_stone_depth": false, "anchor": { "absolute": 63 }, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 } }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface_swamp", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface_swamp" }, "then_run": { "type": "minecraft:block", @@ -654,10 +708,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "floor" }, "then_run": { "type": "minecraft:sequence", @@ -666,11 +720,11 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:y_above", + "add_stone_depth": false, "anchor": { "absolute": 256 }, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -683,11 +737,11 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:y_above", + "add_stone_depth": true, "anchor": { "absolute": 74 }, - "surface_depth_multiplier": 1, - "add_stone_depth": true + "surface_depth_multiplier": 1 }, "then_run": { "type": "minecraft:sequence", @@ -696,9 +750,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": -0.5454, "min_threshold": -0.909, - "max_threshold": -0.5454 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -711,9 +765,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 0.1818, "min_threshold": -0.1818, - "max_threshold": 0.1818 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -726,9 +780,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 0.909, "min_threshold": 0.5454, - "max_threshold": 0.909 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -747,9 +801,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": -1, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:sequence", @@ -758,10 +812,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -798,9 +852,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": true, "offset": -6, - "surface_depth_multiplier": -1, - "add_stone_depth": true + "surface_depth_multiplier": -1 }, "then_run": { "type": "minecraft:block", @@ -816,10 +870,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -843,11 +897,11 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:y_above", + "add_stone_depth": true, "anchor": { "absolute": 63 }, - "surface_depth_multiplier": -1, - "add_stone_depth": true + "surface_depth_multiplier": -1 }, "then_run": { "type": "minecraft:sequence", @@ -856,11 +910,11 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:y_above", + "add_stone_depth": false, "anchor": { "absolute": 63 }, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:condition", @@ -868,11 +922,11 @@ "type": "minecraft:not", "invert": { "type": "minecraft:y_above", + "add_stone_depth": true, "anchor": { "absolute": 74 }, - "surface_depth_multiplier": 1, - "add_stone_depth": true + "surface_depth_multiplier": 1 } }, "then_run": { @@ -893,18 +947,18 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", "add_surface_depth": true, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "floor" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": true, "offset": -6, - "surface_depth_multiplier": -1, - "add_stone_depth": true + "surface_depth_multiplier": -1 }, "then_run": { "type": "minecraft:block", @@ -921,18 +975,18 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "floor" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": -1, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:sequence", @@ -958,9 +1012,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1001,9 +1055,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_peaks" - ] + "biome_is": "minecraft:frozen_peaks" }, "then_run": { "type": "minecraft:sequence", @@ -1024,9 +1076,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:packed_ice", + "max_threshold": 0.2, "min_threshold": 0, - "max_threshold": 0.2 + "noise": "minecraft:packed_ice" }, "then_run": { "type": "minecraft:block", @@ -1039,9 +1091,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:ice", + "max_threshold": 0.025, "min_threshold": 0, - "max_threshold": 0.025 + "noise": "minecraft:ice" }, "then_run": { "type": "minecraft:block", @@ -1054,9 +1106,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1072,9 +1124,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:snowy_slopes" - ] + "biome_is": "minecraft:snowy_slopes" }, "then_run": { "type": "minecraft:sequence", @@ -1095,17 +1145,17 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", + "max_threshold": 0.6, "min_threshold": 0.35, - "max_threshold": 0.6 + "noise": "minecraft:powder_snow" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1119,9 +1169,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1137,9 +1187,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:jagged_peaks" - ] + "biome_is": "minecraft:jagged_peaks" }, "then_run": { "type": "minecraft:sequence", @@ -1160,9 +1208,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1178,9 +1226,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:grove" - ] + "biome_is": "minecraft:grove" }, "then_run": { "type": "minecraft:sequence", @@ -1189,17 +1235,17 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", + "max_threshold": 0.6, "min_threshold": 0.35, - "max_threshold": 0.6 + "noise": "minecraft:powder_snow" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1213,9 +1259,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1234,9 +1280,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_peaks" - ] + "biome_is": "minecraft:stony_peaks" }, "then_run": { "type": "minecraft:sequence", @@ -1245,9 +1289,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:calcite", + "max_threshold": 0.0125, "min_threshold": -0.0125, - "max_threshold": 0.0125 + "noise": "minecraft:calcite" }, "then_run": { "type": "minecraft:block", @@ -1269,9 +1313,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_shore" - ] + "biome_is": "minecraft:stony_shore" }, "then_run": { "type": "minecraft:sequence", @@ -1280,9 +1322,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:gravel", + "max_threshold": 0.05, "min_threshold": -0.05, - "max_threshold": 0.05 + "noise": "minecraft:gravel" }, "then_run": { "type": "minecraft:sequence", @@ -1291,10 +1333,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -1325,17 +1367,15 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_hills" - ] + "biome_is": "minecraft:windswept_hills" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -1362,10 +1402,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -1387,9 +1427,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:desert" - ] + "biome_is": "minecraft:desert" }, "then_run": { "type": "minecraft:sequence", @@ -1398,10 +1436,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -1423,9 +1461,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:dripstone_caves" - ] + "biome_is": "minecraft:dripstone_caves" }, "then_run": { "type": "minecraft:block", @@ -1433,6 +1469,77 @@ "Name": "minecraft:stone" } } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": "minecraft:sulfur_caves" + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "is_3d": true, + "max_threshold": -0.10000000149011612, + "min_threshold": -0.4000000059604645, + "noise": "minecraft:sulfur_cave_gradient" + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:cinnabar" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "is_3d": true, + "max_threshold": 0.4000000059604645, + "min_threshold": 0, + "noise": "minecraft:sulfur_cave_gradient" + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:sulfur" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "is_3d": true, + "max_threshold": 1.7976931348623157e+308, + "min_threshold": 0.4000000059604645, + "noise": "minecraft:sulfur_cave_gradient" + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:cinnabar" + } + } + } + ] + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:stone" + } + } + ] + } } ] }, @@ -1440,9 +1547,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_savanna" - ] + "biome_is": "minecraft:windswept_savanna" }, "then_run": { "type": "minecraft:sequence", @@ -1451,9 +1556,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0.21212121212121213, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -1466,9 +1571,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": -0.06060606060606061, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -1484,9 +1589,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_gravelly_hills" - ] + "biome_is": "minecraft:windswept_gravelly_hills" }, "then_run": { "type": "minecraft:sequence", @@ -1495,9 +1598,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0.24242424242424243, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:sequence", @@ -1506,10 +1609,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -1531,9 +1634,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -1546,9 +1649,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": -0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:sequence", @@ -1557,9 +1660,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1587,10 +1690,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -1626,9 +1729,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0.21212121212121213, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -1641,9 +1744,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": -0.11515151515151514, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -1676,9 +1779,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1692,9 +1795,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] + "biome_is": "minecraft:mangrove_swamp" }, "then_run": { "type": "minecraft:block", @@ -1707,9 +1808,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:mushroom_fields" - ] + "biome_is": "minecraft:mushroom_fields" }, "then_run": { "type": "minecraft:block", @@ -1728,9 +1827,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1760,9 +1859,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": true, "offset": -6, - "surface_depth_multiplier": -1, - "add_stone_depth": true + "surface_depth_multiplier": -1 }, "then_run": { "type": "minecraft:sequence", @@ -1771,10 +1870,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "floor" }, "then_run": { "type": "minecraft:condition", @@ -1806,10 +1905,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", "add_surface_depth": true, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "floor" }, "then_run": { "type": "minecraft:sequence", @@ -1818,9 +1917,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:frozen_peaks" - ] + "biome_is": "minecraft:frozen_peaks" }, "then_run": { "type": "minecraft:sequence", @@ -1841,9 +1938,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:packed_ice", + "max_threshold": 0.2, "min_threshold": -0.5, - "max_threshold": 0.2 + "noise": "minecraft:packed_ice" }, "then_run": { "type": "minecraft:block", @@ -1856,9 +1953,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:ice", + "max_threshold": 0.025, "min_threshold": -0.0625, - "max_threshold": 0.025 + "noise": "minecraft:ice" }, "then_run": { "type": "minecraft:block", @@ -1871,9 +1968,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1889,9 +1986,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:snowy_slopes" - ] + "biome_is": "minecraft:snowy_slopes" }, "then_run": { "type": "minecraft:sequence", @@ -1912,17 +2007,17 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", + "max_threshold": 0.58, "min_threshold": 0.45, - "max_threshold": 0.58 + "noise": "minecraft:powder_snow" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1936,9 +2031,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -1954,9 +2049,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:jagged_peaks" - ] + "biome_is": "minecraft:jagged_peaks" }, "then_run": { "type": "minecraft:block", @@ -1969,9 +2062,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:grove" - ] + "biome_is": "minecraft:grove" }, "then_run": { "type": "minecraft:sequence", @@ -1980,17 +2071,17 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:powder_snow", + "max_threshold": 0.58, "min_threshold": 0.45, - "max_threshold": 0.58 + "noise": "minecraft:powder_snow" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:water", + "add_stone_depth": false, "offset": 0, - "surface_depth_multiplier": 0, - "add_stone_depth": false + "surface_depth_multiplier": 0 }, "then_run": { "type": "minecraft:block", @@ -2016,9 +2107,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_peaks" - ] + "biome_is": "minecraft:stony_peaks" }, "then_run": { "type": "minecraft:sequence", @@ -2027,9 +2116,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:calcite", + "max_threshold": 0.0125, "min_threshold": -0.0125, - "max_threshold": 0.0125 + "noise": "minecraft:calcite" }, "then_run": { "type": "minecraft:block", @@ -2051,9 +2140,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:stony_shore" - ] + "biome_is": "minecraft:stony_shore" }, "then_run": { "type": "minecraft:sequence", @@ -2062,9 +2149,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:gravel", + "max_threshold": 0.05, "min_threshold": -0.05, - "max_threshold": 0.05 + "noise": "minecraft:gravel" }, "then_run": { "type": "minecraft:sequence", @@ -2073,10 +2160,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -2107,17 +2194,15 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_hills" - ] + "biome_is": "minecraft:windswept_hills" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -2144,10 +2229,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -2169,9 +2254,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:desert" - ] + "biome_is": "minecraft:desert" }, "then_run": { "type": "minecraft:sequence", @@ -2180,10 +2263,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -2205,9 +2288,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:dripstone_caves" - ] + "biome_is": "minecraft:dripstone_caves" }, "then_run": { "type": "minecraft:block", @@ -2215,6 +2296,77 @@ "Name": "minecraft:stone" } } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": "minecraft:sulfur_caves" + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "is_3d": true, + "max_threshold": -0.10000000149011612, + "min_threshold": -0.4000000059604645, + "noise": "minecraft:sulfur_cave_gradient" + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:cinnabar" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "is_3d": true, + "max_threshold": 0.4000000059604645, + "min_threshold": 0, + "noise": "minecraft:sulfur_cave_gradient" + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:sulfur" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "is_3d": true, + "max_threshold": 1.7976931348623157e+308, + "min_threshold": 0.4000000059604645, + "noise": "minecraft:sulfur_cave_gradient" + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:cinnabar" + } + } + } + ] + }, + { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:stone" + } + } + ] + } } ] }, @@ -2222,17 +2374,15 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_savanna" - ] + "biome_is": "minecraft:windswept_savanna" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0.21212121212121213, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -2246,9 +2396,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:windswept_gravelly_hills" - ] + "biome_is": "minecraft:windswept_gravelly_hills" }, "then_run": { "type": "minecraft:sequence", @@ -2257,9 +2405,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0.24242424242424243, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:sequence", @@ -2268,10 +2416,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -2293,9 +2441,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": 0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -2308,9 +2456,9 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:noise_threshold", - "noise": "minecraft:surface", + "max_threshold": 1.7976931348623157e+308, "min_threshold": -0.12121212121212122, - "max_threshold": 1.7976931348623157e+308 + "noise": "minecraft:surface" }, "then_run": { "type": "minecraft:block", @@ -2326,10 +2474,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -2353,9 +2501,7 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:mangrove_swamp" - ] + "biome_is": "minecraft:mangrove_swamp" }, "then_run": { "type": "minecraft:block", @@ -2406,10 +2552,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", "add_surface_depth": true, - "secondary_depth_range": 6 + "offset": 0, + "secondary_depth_range": 6, + "surface_type": "floor" }, "then_run": { "type": "minecraft:block", @@ -2423,18 +2569,16 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:biome", - "biome_is": [ - "minecraft:desert" - ] + "biome_is": "minecraft:desert" }, "then_run": { "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", "add_surface_depth": true, - "secondary_depth_range": 30 + "offset": 0, + "secondary_depth_range": 30, + "surface_type": "floor" }, "then_run": { "type": "minecraft:block", @@ -2451,10 +2595,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "floor", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "floor" }, "then_run": { "type": "minecraft:sequence", @@ -2492,10 +2636,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -2520,10 +2664,10 @@ "type": "minecraft:condition", "if_true": { "type": "minecraft:stone_depth", - "offset": 0, - "surface_type": "ceiling", "add_surface_depth": false, - "secondary_depth_range": 0 + "offset": 0, + "secondary_depth_range": 0, + "surface_type": "ceiling" }, "then_run": { "type": "minecraft:block", @@ -2546,16 +2690,76 @@ ] } }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:biome", + "biome_is": "minecraft:sulfur_caves" + }, + "then_run": { + "type": "minecraft:sequence", + "sequence": [ + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "is_3d": true, + "max_threshold": -0.10000000149011612, + "min_threshold": -0.4000000059604645, + "noise": "minecraft:sulfur_cave_gradient" + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:cinnabar" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "is_3d": true, + "max_threshold": 0.4000000059604645, + "min_threshold": 0, + "noise": "minecraft:sulfur_cave_gradient" + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:sulfur" + } + } + }, + { + "type": "minecraft:condition", + "if_true": { + "type": "minecraft:noise_threshold", + "is_3d": true, + "max_threshold": 1.7976931348623157e+308, + "min_threshold": 0.4000000059604645, + "noise": "minecraft:sulfur_cave_gradient" + }, + "then_run": { + "type": "minecraft:block", + "result_state": { + "Name": "minecraft:cinnabar" + } + } + } + ] + } + }, { "type": "minecraft:condition", "if_true": { "type": "minecraft:vertical_gradient", + "false_at_and_above": { + "absolute": 8 + }, "random_name": "minecraft:deepslate", "true_at_and_below": { "absolute": 0 - }, - "false_at_and_above": { - "absolute": 8 } }, "then_run": { diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/check_projectile.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/check_projectile.mcfunction index a5525466f2..ee29fd3634 100644 --- a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/check_projectile.mcfunction +++ b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/check_projectile.mcfunction @@ -6,7 +6,7 @@ # tripwire execute if entity @s[gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/string,x_rotation=-15..15] align xyz positioned ~0.5 ~ ~0.5 run function gm4_crossbow_cartridges:cables/shoot_arrow -# bucket with fish/axolotl +# bucket with mob execute if entity @s[tag=!gm4_cb_use,predicate=gm4_crossbow_cartridges:items/bucket] run function gm4_crossbow_cartridges:projectile/bucket # torch diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket.mcfunction index 6fb5ff70eb..67c4c4897c 100644 --- a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket.mcfunction +++ b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket.mcfunction @@ -1,19 +1,21 @@ -# Check fish/axolotl and shoot +# Check bucket type and shoot # @s = player using the crossbow # at arrow # run from check_projectile tag @s add gm4_cb_use +execute if predicate gm4_crossbow_cartridges:items/axolotl run function gm4_crossbow_cartridges:projectile/bucket/axolotl execute if predicate gm4_crossbow_cartridges:items/cod run function gm4_crossbow_cartridges:projectile/bucket/cod -execute if predicate gm4_crossbow_cartridges:items/salmon run function gm4_crossbow_cartridges:projectile/bucket/salmon execute if predicate gm4_crossbow_cartridges:items/pufferfish run function gm4_crossbow_cartridges:projectile/bucket/pufferfish -execute if predicate gm4_crossbow_cartridges:items/tropical run function gm4_crossbow_cartridges:projectile/bucket/tropical -execute if predicate gm4_crossbow_cartridges:items/axolotl run function gm4_crossbow_cartridges:projectile/bucket/axolotl +execute if predicate gm4_crossbow_cartridges:items/salmon run function gm4_crossbow_cartridges:projectile/bucket/salmon +execute if predicate gm4_crossbow_cartridges:items/sulfur_cube run function gm4_crossbow_cartridges:projectile/bucket/sulfur_cube execute if predicate gm4_crossbow_cartridges:items/tadpole run function gm4_crossbow_cartridges:projectile/bucket/tadpole +execute if predicate gm4_crossbow_cartridges:items/tropical run function gm4_crossbow_cartridges:projectile/bucket/tropical + +# give advancement for launching mob in a bucket +execute unless predicate gm4_crossbow_cartridges:items/sulfur_cube run advancement grant @s only gm4:crossbow_cartridges_bucket # replace filled bucket in player's offhand with water bucket +execute if predicate gm4_crossbow_cartridges:items/sulfur_cube run return run item replace entity @s[gamemode=!creative] weapon.offhand with minecraft:bucket item replace entity @s[gamemode=!creative] weapon.offhand with minecraft:water_bucket - -# give advancement for launching mob in a bucket -advancement grant @s only gm4:crossbow_cartridges_bucket diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/multishot/sulfur_cube.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/multishot/sulfur_cube.mcfunction new file mode 100644 index 0000000000..38829cc8cf --- /dev/null +++ b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/multishot/sulfur_cube.mcfunction @@ -0,0 +1,12 @@ +# Summon sulfur cube +# @s = player using the crossbow +# at @s +# run from projectile/bucket + +# replace arrow with sulfur cube and copy data +summon minecraft:sulfur_cube ~ ~ ~ {from_bucket:1b,Size:1,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:instant_damage',amplifier:10,duration:1}],Silent:1b,DeathLootTable:"gm4:empty"} + +execute as @e[type=minecraft:sulfur_cube,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion + +# sulfur cube sound +playsound minecraft:entity.sulfur_cube.squish player @a[distance=..15] ^ ^ ^1 2 1 diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/sulfur_cube.mcfunction b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/sulfur_cube.mcfunction new file mode 100644 index 0000000000..ba0e3eb9e9 --- /dev/null +++ b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/bucket/sulfur_cube.mcfunction @@ -0,0 +1,18 @@ +# Summon sulfur cube +# @s = player using the crossbow +# at arrow +# run from projectile/bucket + +# replace arrow with sulfur cube and copy data +summon minecraft:sulfur_cube ~ ~ ~ {from_bucket:1b,Size:1,Tags:["gm4_cb_projectile"],active_effects:[{id:'minecraft:regeneration',amplifier:10,duration:200,show_particles:0b}]} + +data modify storage gm4_crossbow_cartridges:temp projectile.Age merge from entity @s equipment.offhand.components."minecraft:bucket_entity_data".age +data modify storage gm4_crossbow_cartridges:temp projectile.AgeLocked merge from entity @s equipment.offhand.components."minecraft:bucket_entity_data".age_locked +data modify storage gm4_crossbow_cartridges:temp projectile.equipment.body set from entity @s equipment.offhand.components."minecraft:sulfur_cube_content" +execute as @e[type=minecraft:sulfur_cube,tag=gm4_cb_projectile,limit=1,distance=..1] run function gm4_crossbow_cartridges:projectile/arrow_motion + +# sulfur cube sound +playsound minecraft:entity.sulfur_cube.squish player @a[distance=..15] ^ ^ ^1 2 1 + +# shoot 2 more if using multishot +execute at @e[tag=gm4_cb_arrow,distance=..1,limit=2] run function gm4_crossbow_cartridges:projectile/bucket/multishot/sulfur_cube diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/predicate/items/bucket.json b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/predicate/items/bucket.json index 01411d2c8a..8312b0a3b1 100644 --- a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/predicate/items/bucket.json +++ b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/predicate/items/bucket.json @@ -1,18 +1,11 @@ { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "offhand": { - "items": [ - "minecraft:cod_bucket", - "minecraft:salmon_bucket", - "minecraft:pufferfish_bucket", - "minecraft:tropical_fish_bucket", - "minecraft:axolotl_bucket", - "minecraft:tadpole_bucket" - ] - } + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "equipment": { + "offhand": { + "items": "#gm4_crossbow_cartridges:bucket" + } + } } - } } diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/predicate/items/sulfur_cube.json b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/predicate/items/sulfur_cube.json new file mode 100644 index 0000000000..5158fbb2db --- /dev/null +++ b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/predicate/items/sulfur_cube.json @@ -0,0 +1,13 @@ +{ + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "equipment": { + "offhand": { + "items": [ + "minecraft:sulfur_cube_bucket" + ] + } + } + } +} diff --git a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/item/bucket.json b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/item/bucket.json index 1437bb8e1f..2e37537f17 100644 --- a/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/item/bucket.json +++ b/gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/tags/item/bucket.json @@ -1,10 +1,11 @@ { "values": [ + "minecraft:axolotl_bucket", "minecraft:cod_bucket", - "minecraft:salmon_bucket", "minecraft:pufferfish_bucket", - "minecraft:tropical_fish_bucket", - "minecraft:axolotl_bucket", - "minecraft:tadpole_bucket" + "minecraft:salmon_bucket", + "minecraft:sulfur_cube_bucket", + "minecraft:tadpole_bucket", + "minecraft:tropical_fish_bucket" ] } diff --git a/gm4_desire_lines/data/gm4_desire_lines/predicate/is_affected.json b/gm4_desire_lines/data/gm4_desire_lines/predicate/is_affected.json index 93d53e887e..3ad4e24b19 100644 --- a/gm4_desire_lines/data/gm4_desire_lines/predicate/is_affected.json +++ b/gm4_desire_lines/data/gm4_desire_lines/predicate/is_affected.json @@ -5,8 +5,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "gamemode": [ "survival" ] diff --git a/gm4_disassemblers/generate_disassembly.py b/gm4_disassemblers/generate_disassembly.py index aa2fd9922e..fba089f83a 100644 --- a/gm4_disassemblers/generate_disassembly.py +++ b/gm4_disassemblers/generate_disassembly.py @@ -66,7 +66,7 @@ def beet_default(ctx: Context): """Creates a loot table for dropping the 9 result items when disassembling an item.""" vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.1' + vanilla.minecraft_version = '26.2' recipes = vanilla.data.recipes for item, durability in ITEMS.items(): diff --git a/gm4_double_doors/generate.py b/gm4_double_doors/generate.py index 1c06d13d3a..d1627d5e7a 100644 --- a/gm4_double_doors/generate.py +++ b/gm4_double_doors/generate.py @@ -63,7 +63,7 @@ def beet_default(ctx: Context): # prepare list of door materials door_materials = [ door.removeprefix("minecraft:").removesuffix("_door") - for door in resolve_blocktag(ctx, "26.1", "minecraft:mob_interactable_doors") + for door in resolve_blocktag(ctx, "26.2", "minecraft:mob_interactable_doors") ] # make list of wood types accessible for bolt ctx.meta['door_materials'] = door_materials diff --git a/gm4_end_fishing/data/gm4_end_fishing/advancement/reel_loot.json b/gm4_end_fishing/data/gm4_end_fishing/advancement/reel_loot.json index 8fff7f4588..68f6a1a557 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/advancement/reel_loot.json +++ b/gm4_end_fishing/data/gm4_end_fishing/advancement/reel_loot.json @@ -4,9 +4,14 @@ "trigger": "minecraft:fishing_rod_hooked", "conditions": { "entity": { - "type": "minecraft:armor_stand", - "nbt": "{Tags:[\"gm4_no_edit\",\"gm4_ef_has_fish\"]}", - "location": { + "minecraft:entity_type": "minecraft:armor_stand", + "minecraft:entity_tags": { + "all_of": [ + "gm4_no_edit", + "gm4_ef_has_fish" + ] + }, + "minecraft:location": { "dimension": "the_end" } } diff --git a/gm4_end_fishing/data/gm4_end_fishing/advancement/reel_rod.json b/gm4_end_fishing/data/gm4_end_fishing/advancement/reel_rod.json index f4e88f07dd..0b861b35f6 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/advancement/reel_rod.json +++ b/gm4_end_fishing/data/gm4_end_fishing/advancement/reel_rod.json @@ -4,9 +4,14 @@ "trigger": "minecraft:fishing_rod_hooked", "conditions": { "entity": { - "type": "minecraft:armor_stand", - "nbt": "{Tags:[\"gm4_no_edit\",\"gm4_end_fishing_bait\"]}", - "location": { + "minecraft:entity_type": "minecraft:armor_stand", + "minecraft:entity_tags": { + "all_of": [ + "gm4_no_edit", + "gm4_end_fishing_bait" + ] + }, + "minecraft:location": { "dimension": "the_end" } } diff --git a/gm4_end_fishing/data/gm4_end_fishing/guidebook/end_fishing.json b/gm4_end_fishing/data/gm4_end_fishing/guidebook/end_fishing.json index 5877bca1bc..2b55c1829c 100644 --- a/gm4_end_fishing/data/gm4_end_fishing/guidebook/end_fishing.json +++ b/gm4_end_fishing/data/gm4_end_fishing/guidebook/end_fishing.json @@ -28,8 +28,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4:end_fishing_phantom": true } diff --git a/gm4_everstone/data/gm4_everstone/advancement/kill_age_locked.json b/gm4_everstone/data/gm4_everstone/advancement/kill_age_locked.json index 9ebaacff8d..5b802237af 100644 --- a/gm4_everstone/data/gm4_everstone/advancement/kill_age_locked.json +++ b/gm4_everstone/data/gm4_everstone/advancement/kill_age_locked.json @@ -4,7 +4,11 @@ "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "nbt": "{Tags:[\"gm4_everstone_locked\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_everstone_locked" + ] + } } } } diff --git a/gm4_everstone/data/gm4_everstone/guidebook/everstone.json b/gm4_everstone/data/gm4_everstone/guidebook/everstone.json index bb47cb7798..57faa3623d 100644 --- a/gm4_everstone/data/gm4_everstone/guidebook/everstone.json +++ b/gm4_everstone/data/gm4_everstone/guidebook/everstone.json @@ -48,7 +48,7 @@ "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "minecraft:zombie" + "minecraft:entity_type": "minecraft:zombie" } } }, @@ -56,7 +56,7 @@ "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "minecraft:skeleton" + "minecraft:entity_type": "minecraft:skeleton" } } }, @@ -64,7 +64,7 @@ "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "minecraft:slime" + "minecraft:entity_type": "minecraft:slime" } } }, @@ -72,7 +72,7 @@ "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "minecraft:stray" + "minecraft:entity_type": "minecraft:stray" } } }, @@ -80,7 +80,7 @@ "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "minecraft:piglin" + "minecraft:entity_type": "minecraft:piglin" } } }, @@ -88,7 +88,7 @@ "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "minecraft:guardian" + "minecraft:entity_type": "minecraft:guardian" } } }, @@ -96,7 +96,7 @@ "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "minecraft:vindicator" + "minecraft:entity_type": "minecraft:vindicator" } } } diff --git a/gm4_guidebook/generate_guidebooks.py b/gm4_guidebook/generate_guidebooks.py index 6c1349a034..a18d84374a 100644 --- a/gm4_guidebook/generate_guidebooks.py +++ b/gm4_guidebook/generate_guidebooks.py @@ -789,7 +789,7 @@ def generate_lectern_header(book: Book) -> list[dict[Any, Any]|str]: """ def item_to_display(item: str, components: dict[str, Any] | None, ctx: Context) -> tuple[TextComponent, TextComponent]: vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.1' + vanilla.minecraft_version = '26.2' if item == "air": # show empty slot slot = { @@ -947,7 +947,7 @@ def generate_recipe_display(recipe: str, ctx: Context) -> list[TextComponent]: ingr = ingr[0] elif ingr.startswith("#"): vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.1' + vanilla.minecraft_version = '26.2' ingr = get_item_from_tag(ctx, ingr, vanilla) ingredients.append(ingr) @@ -980,7 +980,7 @@ def generate_recipe_display(recipe: str, ctx: Context) -> list[TextComponent]: ingr = ingr[0] elif ingr.startswith("#"): vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.1' + vanilla.minecraft_version = '26.2' ingr = get_item_from_tag(ctx, ingr, vanilla) ingredients.append(ingr) while len(ingredients) < 9: @@ -1234,8 +1234,7 @@ def generate_prereq(prereq: str, module: str): "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { f"gm4_guidebook:{module}/unlock/{prereq}": True } @@ -1280,8 +1279,7 @@ def generate_advancement(book: Book, section_index: int) -> Advancement | None: "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "spectator" ] diff --git a/gm4_holographic_tags/data/gm4_holographic_tags/guidebook/holographic_tags.json b/gm4_holographic_tags/data/gm4_holographic_tags/guidebook/holographic_tags.json index 07e455d894..10606a1502 100644 --- a/gm4_holographic_tags/data/gm4_holographic_tags/guidebook/holographic_tags.json +++ b/gm4_holographic_tags/data/gm4_holographic_tags/guidebook/holographic_tags.json @@ -26,8 +26,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4:holographic_tags": true } diff --git a/gm4_horsemanship/data/gm4_horsemanship/advancement/feed_horse.json b/gm4_horsemanship/data/gm4_horsemanship/advancement/feed_horse.json index d9d07a1676..73cd41fc62 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/advancement/feed_horse.json +++ b/gm4_horsemanship/data/gm4_horsemanship/advancement/feed_horse.json @@ -13,8 +13,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ] + } } } ] @@ -33,8 +37,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ] + } } } ] @@ -53,8 +61,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ] + } } } ] @@ -73,8 +85,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ] + } } } ] @@ -93,8 +109,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ] + } } } ] @@ -113,8 +133,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ] + } } } ] @@ -133,8 +157,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ] + } } } ] @@ -153,8 +181,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ] + } } } ] diff --git a/gm4_horsemanship/data/gm4_horsemanship/advancement/feed_untamed_horse.json b/gm4_horsemanship/data/gm4_horsemanship/advancement/feed_untamed_horse.json index d8cdad397c..b4b057c068 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/advancement/feed_untamed_horse.json +++ b/gm4_horsemanship/data/gm4_horsemanship/advancement/feed_untamed_horse.json @@ -13,17 +13,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_horse.tamed\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ], + "none_of": [ + "gm4_horse.tamed" + ] } } } @@ -43,17 +40,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_horse.tamed\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ], + "none_of": [ + "gm4_horse.tamed" + ] } } } @@ -73,17 +67,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_horse.tamed\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ], + "none_of": [ + "gm4_horse.tamed" + ] } } } @@ -103,17 +94,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_horse.tamed\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ], + "none_of": [ + "gm4_horse.tamed" + ] } } } @@ -133,17 +121,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_horse.tamed\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ], + "none_of": [ + "gm4_horse.tamed" + ] } } } @@ -163,17 +148,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_horse.tamed\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ], + "none_of": [ + "gm4_horse.tamed" + ] } } } @@ -193,17 +175,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_horse.tamed\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ], + "none_of": [ + "gm4_horse.tamed" + ] } } } @@ -223,17 +202,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_horse.tamed\"]}" + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ], + "none_of": [ + "gm4_horse.tamed" + ] } } } diff --git a/gm4_horsemanship/data/gm4_horsemanship/advancement/start_riding_horse.json b/gm4_horsemanship/data/gm4_horsemanship/advancement/start_riding_horse.json index e1aa5708e5..e7acbadfcf 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/advancement/start_riding_horse.json +++ b/gm4_horsemanship/data/gm4_horsemanship/advancement/start_riding_horse.json @@ -8,9 +8,13 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "vehicle": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" + "minecraft:vehicle": { + "minecraft:entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ] + } } } } diff --git a/gm4_horsemanship/data/gm4_horsemanship/advancement/tame_horse.json b/gm4_horsemanship/data/gm4_horsemanship/advancement/tame_horse.json index df6c5f7ac1..2aa2f11aec 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/advancement/tame_horse.json +++ b/gm4_horsemanship/data/gm4_horsemanship/advancement/tame_horse.json @@ -8,7 +8,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "#gm4_horsemanship:trainable" + "minecraft:entity_type": "#gm4_horsemanship:trainable" } } ] diff --git a/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/feed_original_food.mcfunction b/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/feed_original_food.mcfunction index 3034b6b112..5353875ca0 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/feed_original_food.mcfunction +++ b/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/feed_original_food.mcfunction @@ -9,6 +9,7 @@ execute as @e[type=#gm4_horsemanship:trainable,distance=..8] run function gm4_ho tag @s remove gm4_horse_check_player # check advancement criteria to find used food item +# /!\ breed items are disabled for now as they caused problems letting the horse breed scoreboard players set $food_processed gm4_horse_data 0 execute if score $food_processed gm4_horse_data matches 0 if entity @s[advancements={gm4_horsemanship:feed_horse={apple=true}}] as @e[type=#gm4_horsemanship:trainable,tag=gm4_horse_target,distance=..8,limit=1] run function gm4_horsemanship:horse_processing/food/type/apple execute if score $food_processed gm4_horse_data matches 0 if entity @s[advancements={gm4_horsemanship:feed_horse={golden_apple=true}}] as @e[type=#gm4_horsemanship:trainable,tag=gm4_horse_target,distance=..8,limit=1] run function gm4_horsemanship:horse_processing/food/type/golden_apple diff --git a/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/enchanted_golden_apple.mcfunction b/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/enchanted_golden_apple.mcfunction index 661c70089a..f245fd5642 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/enchanted_golden_apple.mcfunction +++ b/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/enchanted_golden_apple.mcfunction @@ -6,4 +6,5 @@ scoreboard players set $food_processed gm4_horse_data 1 tag @s remove gm4_horse_target -function gm4_horsemanship:horse_processing/cap_health +# /!\ Disabled as it intereferes with the horse breeding +# function gm4_horsemanship:horse_processing/cap_health diff --git a/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/golden_apple.mcfunction b/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/golden_apple.mcfunction index 661c70089a..f245fd5642 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/golden_apple.mcfunction +++ b/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/golden_apple.mcfunction @@ -6,4 +6,5 @@ scoreboard players set $food_processed gm4_horse_data 1 tag @s remove gm4_horse_target -function gm4_horsemanship:horse_processing/cap_health +# /!\ Disabled as it intereferes with the horse breeding +# function gm4_horsemanship:horse_processing/cap_health diff --git a/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/golden_carrot.mcfunction b/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/golden_carrot.mcfunction index 661c70089a..f245fd5642 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/golden_carrot.mcfunction +++ b/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/food/type/golden_carrot.mcfunction @@ -6,4 +6,5 @@ scoreboard players set $food_processed gm4_horse_data 1 tag @s remove gm4_horse_target -function gm4_horsemanship:horse_processing/cap_health +# /!\ Disabled as it intereferes with the horse breeding +# function gm4_horsemanship:horse_processing/cap_health diff --git a/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/general.mcfunction b/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/general.mcfunction index ae309018a4..a9fd84e993 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/general.mcfunction +++ b/gm4_horsemanship/data/gm4_horsemanship/function/horse_processing/general.mcfunction @@ -21,10 +21,6 @@ execute store success score $mounted gm4_horse_data on controller if entity @s[t execute if score $mounted gm4_horse_data matches 1 on controller store result score $riding gm4_horse_data if predicate gm4_horsemanship:riding execute store result score $on_ground gm4_horse_data run data get entity @s OnGround -# give horses in love a speed boost (slow horses may fail to breed) -execute store result score $in_love gm4_horse_data run data get entity @s InLove -execute if score $in_love gm4_horse_data matches 1.. if score $mounted gm4_horse_data matches 0 run effect give @s speed 1 4 true - # glider execute if items entity @s[tag=!gm4_horse.glider_disabled] armor.body *[custom_data~{gm4_horsemanship:{glider:{}}}] run function gm4_horsemanship:horse_processing/glider/process execute unless items entity @s[tag=gm4_horse.gliding] armor.body *[custom_data~{gm4_horsemanship:{glider:{}}}] run function gm4_horsemanship:horse_processing/glider/ground diff --git a/gm4_horsemanship/data/gm4_horsemanship/function/level/init_horse.mcfunction b/gm4_horsemanship/data/gm4_horsemanship/function/level/init_horse.mcfunction index c447a28fc2..dd7c8cbc7d 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/function/level/init_horse.mcfunction +++ b/gm4_horsemanship/data/gm4_horsemanship/function/level/init_horse.mcfunction @@ -16,14 +16,16 @@ execute store result storage gm4_horsemanship:temp attribute.scale float 0.01 ru # | Movement Speed # Formula: 0.85*x + level*((0.555*x)/15) -execute store result storage gm4_horsemanship:temp attribute.speed_base float 0.00001 run attribute @s movement_speed base get 100000 -execute store result score $speed.start gm4_horse_data run attribute @s movement_speed base get 100000 +execute store result score $speed.base gm4_horse_data run attribute @s movement_speed base get 100000 +execute store result storage gm4_horsemanship:temp attribute.speed_base float 0.00001 run scoreboard players get $speed.base gm4_horse_data +scoreboard players operation $speed.start gm4_horse_data = $speed.base gm4_horse_data scoreboard players operation @s gm4_horse.speed_on_level = $speed.start gm4_horse_data scoreboard players operation @s gm4_horse.speed_on_level *= #555 gm4_horse_data scoreboard players operation @s gm4_horse.speed_on_level /= #15000 gm4_horse_data scoreboard players operation $speed.start gm4_horse_data *= #85 gm4_horse_data execute store result storage gm4_horsemanship:temp attribute.speed_start float 0.0000001 run scoreboard players get $speed.start gm4_horse_data +execute store result storage gm4_horsemanship:temp attribute.speed_wild float 0.0000001 run scoreboard players operation $speed.base gm4_horse_data -= $speed.start gm4_horse_data # | Jump Strength # Formula: x + level*(-x/45 + 0.02888) diff --git a/gm4_horsemanship/data/gm4_horsemanship/function/level/init_horse_eval.mcfunction b/gm4_horsemanship/data/gm4_horsemanship/function/level/init_horse_eval.mcfunction index bd27ce142c..2c12ee39ec 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/function/level/init_horse_eval.mcfunction +++ b/gm4_horsemanship/data/gm4_horsemanship/function/level/init_horse_eval.mcfunction @@ -10,7 +10,7 @@ $attribute @s jump_strength modifier add gm4_horse:jump.remove_base -$(jump_base # add boosts for wild horses attribute @s max_health modifier add gm4_horse:untamed 10 add_value -$attribute @s movement_speed modifier add gm4_horse:untamed $(speed_base) add_value +$attribute @s movement_speed modifier add gm4_horse:untamed $(speed_wild) add_value # add base stats attribute @s max_health modifier add gm4_horse:health 11.01 add_value diff --git a/gm4_horsemanship/data/gm4_horsemanship/guidebook/horsemanship.json b/gm4_horsemanship/data/gm4_horsemanship/guidebook/horsemanship.json index b381f6ff41..7b14b13906 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/guidebook/horsemanship.json +++ b/gm4_horsemanship/data/gm4_horsemanship/guidebook/horsemanship.json @@ -16,7 +16,11 @@ "predicate": { "vehicle": { "entity_type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse" + ] + } } } } diff --git a/gm4_horsemanship/data/gm4_horsemanship/predicate/check_horse_looking_at.json b/gm4_horsemanship/data/gm4_horsemanship/predicate/check_horse_looking_at.json index 69c8d45967..0eccf2dcb8 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/predicate/check_horse_looking_at.json +++ b/gm4_horsemanship/data/gm4_horsemanship/predicate/check_horse_looking_at.json @@ -2,11 +2,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "type": "#gm4_horsemanship:trainable", - "nbt": "{Tags:[\"gm4_horse_check\"]}" + "entity_type": "#gm4_horsemanship:trainable", + "minecraft:entity_tags": { + "all_of": [ + "gm4_horse_check" + ] + } } } } diff --git a/gm4_horsemanship/data/gm4_horsemanship/predicate/jumping.json b/gm4_horsemanship/data/gm4_horsemanship/predicate/jumping.json index 2401f5ca1d..320123b196 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/predicate/jumping.json +++ b/gm4_horsemanship/data/gm4_horsemanship/predicate/jumping.json @@ -2,8 +2,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "input": { "jump": true } diff --git a/gm4_horsemanship/data/gm4_horsemanship/predicate/riding.json b/gm4_horsemanship/data/gm4_horsemanship/predicate/riding.json index 564aa541b4..224da00454 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/predicate/riding.json +++ b/gm4_horsemanship/data/gm4_horsemanship/predicate/riding.json @@ -5,8 +5,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "input": { "forward": true } @@ -17,8 +16,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "input": { "backward": true } @@ -29,8 +27,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "input": { "left": true } @@ -41,8 +38,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "input": { "right": true } diff --git a/gm4_horsemanship/data/gm4_horsemanship/tags/block/can_eat_through.json b/gm4_horsemanship/data/gm4_horsemanship/tags/block/can_eat_through.json index 2ead3fa7c4..332d1ae6f9 100644 --- a/gm4_horsemanship/data/gm4_horsemanship/tags/block/can_eat_through.json +++ b/gm4_horsemanship/data/gm4_horsemanship/tags/block/can_eat_through.json @@ -2,6 +2,6 @@ "values": [ "#gm4:foliage", "#gm4:no_collision", - "snow" + "minecraft:snow" ] } diff --git a/gm4_ink_spitting_squid/data/gm4_ink_spitting_squid/guidebook/ink_spitting_squid.json b/gm4_ink_spitting_squid/data/gm4_ink_spitting_squid/guidebook/ink_spitting_squid.json index 2d7ce1db16..f3dcce8e82 100644 --- a/gm4_ink_spitting_squid/data/gm4_ink_spitting_squid/guidebook/ink_spitting_squid.json +++ b/gm4_ink_spitting_squid/data/gm4_ink_spitting_squid/guidebook/ink_spitting_squid.json @@ -14,8 +14,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4:ink_spitting_squid": true } @@ -33,8 +32,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4:glow_ink_spitting_squid": true } diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/guidebook/lavish_livestock.json b/gm4_lavish_livestock/data/gm4_lavish_livestock/guidebook/lavish_livestock.json index 2af67b0418..47009139ed 100644 --- a/gm4_lavish_livestock/data/gm4_lavish_livestock/guidebook/lavish_livestock.json +++ b/gm4_lavish_livestock/data/gm4_lavish_livestock/guidebook/lavish_livestock.json @@ -10,7 +10,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "#gm4_lavish_livestock:livestock" + "minecraft:entity_type": "#gm4_lavish_livestock:livestock" } } } diff --git a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/advancement/breed.json b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/advancement/breed.json index 44c9ca24cb..e8262f9bb9 100644 --- a/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/advancement/breed.json +++ b/gm4_lavish_livestock/data/gm4_lavish_livestock/templates/advancement/breed.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "{{ entity_id }}" + "minecraft:entity_type": "{{ entity_id }}" } } } diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/advancement/place_lightning_rod.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/advancement/place_lightning_rod.json index 3e774cd4ef..f33d904ea4 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/advancement/place_lightning_rod.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/advancement/place_lightning_rod.json @@ -7,7 +7,7 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": "#gm4_lightning_in_a_bottle:lightning_rod" + "items": "#minecraft:lightning_rods" } }, { diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/texture_connector/force_update.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/texture_connector/force_update.mcfunction index f740a56f23..e716e6513f 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/texture_connector/force_update.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/texture_connector/force_update.mcfunction @@ -7,5 +7,5 @@ advancement revoke @s only gm4_lightning_in_a_bottle:place_lightning_rod # add texture connectors to nearby brewing stands -execute as @e[type=marker,tag=gm4_brewing_stand,distance=..8] at @s if block ~ ~1 ~ #gm4_lightning_in_a_bottle:lightning_rod[facing=up] \ +execute as @e[type=marker,tag=gm4_brewing_stand,distance=..8] at @s if block ~ ~1 ~ #minecraft:lightning_rods[facing=up] \ align xyz unless entity @e[tag=gm4_lightning_rod_texture_connector,dy=0.01,limit=1] run function gm4_lightning_in_a_bottle:brewing_stand/texture_connector/summon diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/texture_connector/update.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/texture_connector/update.mcfunction index b0c98d5b7f..3787364310 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/texture_connector/update.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/brewing_stand/texture_connector/update.mcfunction @@ -4,7 +4,7 @@ # kill if unneeded execute unless block ~ ~-0.1 ~ minecraft:brewing_stand run return run kill @s -execute unless block ~ ~ ~ #gm4_lightning_in_a_bottle:lightning_rod run return run kill @s +execute unless block ~ ~ ~ #minecraft:lightning_rods run return run kill @s # update texture scoreboard players set $texture_changed gm4_liab_data 0 diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/lightning/check.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/lightning/check.mcfunction index bf4231c026..709f9882a6 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/lightning/check.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/lightning/check.mcfunction @@ -7,8 +7,8 @@ tag @s add gm4_liab_processed # create Bottles of Lightning from Thick Potions in Brewing Stands under (or above) Lightning Rods -execute if block ~ ~-.01 ~ #gm4_lightning_in_a_bottle:lightning_rod[facing=up] if block ~ ~-1.01 ~ brewing_stand positioned ~ ~-1.01 ~ run function gm4_lightning_in_a_bottle:brewing_stand/check_fuel -execute if block ~ ~-.01 ~ #gm4_lightning_in_a_bottle:lightning_rod[facing=down] if block ~ ~.99 ~ brewing_stand positioned ~ ~.99 ~ run function gm4_lightning_in_a_bottle:brewing_stand/check_fuel +execute if block ~ ~-.01 ~ #minecraft:lightning_rods[facing=up] if block ~ ~-1.01 ~ brewing_stand positioned ~ ~-1.01 ~ run function gm4_lightning_in_a_bottle:brewing_stand/check_fuel +execute if block ~ ~-.01 ~ #minecraft:lightning_rods[facing=down] if block ~ ~.99 ~ brewing_stand positioned ~ ~.99 ~ run function gm4_lightning_in_a_bottle:brewing_stand/check_fuel # Lightning-based mob transformation # Evokers -> Illusioners diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/main.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/main.mcfunction index a7f8046a62..f8a681599d 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/main.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/main.mcfunction @@ -3,7 +3,7 @@ execute as @e[type=area_effect_cloud,tag=gm4_liab_lingering,predicate=gm4_lightning_in_a_bottle:random_strike] at @s run function gm4_lightning_in_a_bottle:sustain_lingering_lightning # summon lightning rod - brewing stand connectors if needed -execute as @e[type=marker,tag=gm4_brewing_stand] at @s if block ~ ~1 ~ #gm4_lightning_in_a_bottle:lightning_rod[facing=up] \ +execute as @e[type=marker,tag=gm4_brewing_stand] at @s if block ~ ~1 ~ #minecraft:lightning_rods[facing=up] \ align xyz unless entity @e[tag=gm4_lightning_rod_texture_connector,dy=0.01,limit=1] run function gm4_lightning_in_a_bottle:brewing_stand/texture_connector/summon schedule function gm4_lightning_in_a_bottle:main 4s diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/potion_tracking/potion_landed.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/potion_tracking/potion_landed.mcfunction index 166ed95973..1a9bae27b1 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/potion_tracking/potion_landed.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/potion_tracking/potion_landed.mcfunction @@ -3,6 +3,6 @@ # at @s # run from potion_tracking/verify_landed_potion -execute if block ~ ~-1 ~ #gm4_lightning_in_a_bottle:lightning_rod align y run summon lightning_bolt ~ ~ ~ -execute unless block ~ ~-1 ~ #gm4_lightning_in_a_bottle:lightning_rod run summon lightning_bolt ~ ~ ~ +execute if block ~ ~-1 ~ #minecraft:lightning_rods align y run summon lightning_bolt ~ ~ ~ +execute unless block ~ ~-1 ~ #minecraft:lightning_rods run summon lightning_bolt ~ ~ ~ execute as @e[type=area_effect_cloud,distance=..8,limit=1,sort=nearest,nbt={potion_contents:{custom_effects:[{id:'minecraft:night_vision',amplifier:12b,duration:1}]}}] run function gm4_lightning_in_a_bottle:potion_tracking/modify_cloud diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/sustain_lingering_lightning.mcfunction b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/sustain_lingering_lightning.mcfunction index 11b98711c3..97328520e9 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/sustain_lingering_lightning.mcfunction +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/function/sustain_lingering_lightning.mcfunction @@ -4,5 +4,5 @@ # run from main # summon lightning; snap to lightning rod if there is one below -execute if block ~ ~-1 ~ #gm4_lightning_in_a_bottle:lightning_rod align y run summon lightning_bolt ~ ~ ~ -execute unless block ~ ~-1 ~ #gm4_lightning_in_a_bottle:lightning_rod run summon lightning_bolt ~ ~ ~ +execute if block ~ ~-1 ~ #minecraft:lightning_rods align y run summon lightning_bolt ~ ~ ~ +execute unless block ~ ~-1 ~ #minecraft:lightning_rods run summon lightning_bolt ~ ~ ~ diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/guidebook/lightning_in_a_bottle.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/guidebook/lightning_in_a_bottle.json index 725b976946..3b07609afa 100644 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/guidebook/lightning_in_a_bottle.json +++ b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/guidebook/lightning_in_a_bottle.json @@ -24,7 +24,7 @@ "conditions": { "items": [ { - "items": "#gm4_lightning_in_a_bottle:lightning_rod" + "items": "#minecraft:lightning_rods" } ] } diff --git a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/lightning_rod.json b/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/lightning_rod.json deleted file mode 100644 index 5ad0a0140a..0000000000 --- a/gm4_lightning_in_a_bottle/data/gm4_lightning_in_a_bottle/tags/block/lightning_rod.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "values": [ - "minecraft:lightning_rod", - "minecraft:exposed_lightning_rod", - "minecraft:weathered_lightning_rod", - "minecraft:oxidized_lightning_rod", - "minecraft:waxed_lightning_rod", - "minecraft:waxed_exposed_lightning_rod", - "minecraft:waxed_weathered_lightning_rod", - "minecraft:waxed_oxidized_lightning_rod" - ] -} diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/candle_rcd.json b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/candle_rcd.json index 193c5afb58..120a0cc40f 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/candle_rcd.json +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/candle_rcd.json @@ -8,8 +8,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "gamemode": [ "survival", "creative" @@ -23,8 +22,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:interaction", - "nbt": "{Tags:[\"gm4_llp_candle_rcd\"]}" + "minecraft:entity_type": "minecraft:interaction", + "minecraft:entity_tags": { + "all_of": [ + "gm4_llp_candle_rcd" + ] + } } } ] diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/placement_rcd.json b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/placement_rcd.json index de9e186148..e67e9cf6b4 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/placement_rcd.json +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/placement_rcd.json @@ -12,14 +12,17 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "gamemode": [ "survival", "creative" ] }, - "nbt": "{Tags:[\"gm4_llp_holding_item\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_llp_holding_item" + ] + } } } ], @@ -28,8 +31,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:interaction", - "nbt": "{Tags:[\"gm4_llp_placement_rcd\"]}" + "minecraft:entity_type": "minecraft:interaction", + "minecraft:entity_tags": { + "all_of": [ + "gm4_llp_placement_rcd" + ] + } } } ] diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/punch_perma_rcd.json b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/punch_perma_rcd.json index 49cb45eb21..308023fd29 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/punch_perma_rcd.json +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/punch_perma_rcd.json @@ -8,8 +8,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "gamemode": [ "survival", "creative" @@ -23,8 +22,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:interaction", - "nbt": "{Tags:[\"gm4_llp_perma_rcd\"]}" + "minecraft:entity_type": "minecraft:interaction", + "minecraft:entity_tags": { + "all_of": [ + "gm4_llp_perma_rcd" + ] + } } } ] diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/punch_placement_rcd.json b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/punch_placement_rcd.json index 8d4558bd36..93fbc4c6ff 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/punch_placement_rcd.json +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/punch_placement_rcd.json @@ -8,8 +8,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "gamemode": [ "survival", "creative" @@ -23,8 +22,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:interaction", - "nbt": "{Tags:[\"gm4_llp_placement_rcd\"]}" + "minecraft:entity_type": "minecraft:interaction", + "minecraft:entity_tags": { + "all_of": [ + "gm4_llp_placement_rcd" + ] + } } } ] diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/unwaxed_copper_rcd.json b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/unwaxed_copper_rcd.json index 1f51ca72a2..29d471c9bc 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/unwaxed_copper_rcd.json +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/unwaxed_copper_rcd.json @@ -8,8 +8,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "gamemode": [ "survival", "creative" @@ -23,8 +22,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:interaction", - "nbt": "{Tags:[\"gm4_llp_unwaxed_copper_rcd\"]}" + "minecraft:entity_type": "minecraft:interaction", + "minecraft:entity_tags": { + "all_of": [ + "gm4_llp_unwaxed_copper_rcd" + ] + } } } ] diff --git a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/waxed_copper_rcd.json b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/waxed_copper_rcd.json index 13c92ec645..0603281f4c 100644 --- a/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/waxed_copper_rcd.json +++ b/gm4_lively_lily_pads/data/gm4_lively_lily_pads/advancement/waxed_copper_rcd.json @@ -8,8 +8,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "gamemode": [ "survival", "creative" @@ -23,8 +22,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:interaction", - "nbt": "{Tags:[\"gm4_llp_waxed_copper_rcd\"]}" + "minecraft:entity_type": "minecraft:interaction", + "minecraft:entity_tags": { + "all_of": [ + "gm4_llp_waxed_copper_rcd" + ] + } } } ] diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_allay.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_allay.json index 775592b2f5..c74674edf3 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_allay.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_allay.json @@ -13,7 +13,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:allay" + "minecraft:entity_type": "minecraft:allay" } } ] diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_armadillo.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_armadillo.json index 265623706d..5fe7e62214 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_armadillo.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_armadillo.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "armadillo" + "minecraft:entity_type": "armadillo" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_axolotl.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_axolotl.json index 1664cdf37f..ffb0cdbf9d 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_axolotl.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_axolotl.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "axolotl" + "minecraft:entity_type": "axolotl" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_bee.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_bee.json index 636dc4e139..3f3414005e 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_bee.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_bee.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "bee" + "minecraft:entity_type": "bee" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_cat.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_cat.json index a6bec65dfc..98f11fa7d7 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_cat.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_cat.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "cat" + "minecraft:entity_type": "cat" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_chicken.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_chicken.json index d50df0c3c1..3397e28ddb 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_chicken.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_chicken.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "chicken" + "minecraft:entity_type": "chicken" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_cow.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_cow.json index dfe0b05894..3dbbaa4be2 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_cow.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_cow.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "cow" + "minecraft:entity_type": "cow" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_donkey.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_donkey.json index 0a33d13607..3fb4ee9177 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_donkey.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_donkey.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "donkey" + "minecraft:entity_type": "donkey" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_fox.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_fox.json index b6cf6c9a5c..bb4cc2656e 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_fox.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_fox.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "fox" + "minecraft:entity_type": "fox" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_frog.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_frog.json index 6c1d4b1b01..fc060985a2 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_frog.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_frog.json @@ -8,7 +8,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:frog" + "minecraft:entity_type": "minecraft:frog" } } ], @@ -17,7 +17,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:frog" + "minecraft:entity_type": "minecraft:frog" } } ] diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_goat.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_goat.json index 9c564c90b1..8181cb09f6 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_goat.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_goat.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "goat" + "minecraft:entity_type": "goat" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_hoglin.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_hoglin.json index 434679a57a..7cae6ae314 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_hoglin.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_hoglin.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "hoglin" + "minecraft:entity_type": "hoglin" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_horse.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_horse.json index da04d82d5b..a37cb49080 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_horse.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_horse.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "horse" + "minecraft:entity_type": "horse" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_llama.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_llama.json index 58e681bed5..f7252d4028 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_llama.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_llama.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "llama" + "minecraft:entity_type": "llama" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_mooshroom.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_mooshroom.json index a36837f0e4..5b8bfc132a 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_mooshroom.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_mooshroom.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "mooshroom" + "minecraft:entity_type": "mooshroom" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_mule.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_mule.json index 6962cf604a..0cd4c7f582 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_mule.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_mule.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "mule" + "minecraft:entity_type": "mule" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_ocelot.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_ocelot.json index dda71b076a..d1003ec520 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_ocelot.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_ocelot.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "ocelot" + "minecraft:entity_type": "ocelot" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_panda.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_panda.json index 4c29830394..75c6c4917b 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_panda.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_panda.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "panda" + "minecraft:entity_type": "panda" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_pig.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_pig.json index 2b910aa6a5..67abdf46f6 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_pig.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_pig.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "pig" + "minecraft:entity_type": "pig" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_rabbit.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_rabbit.json index 1f915a133e..16deb83fb5 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_rabbit.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_rabbit.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "rabbit" + "minecraft:entity_type": "rabbit" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_sheep.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_sheep.json index 8e8b9d9ddd..4ed006d046 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_sheep.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_sheep.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "sheep" + "minecraft:entity_type": "sheep" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_strider.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_strider.json index 7611f5b24c..7daa16af8e 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_strider.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_strider.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "strider" + "minecraft:entity_type": "strider" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_trader_llama.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_trader_llama.json index 4bb5ca2e30..bd8ecf9e0b 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_trader_llama.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_trader_llama.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "trader_llama" + "minecraft:entity_type": "trader_llama" } } } diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_turtle.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_turtle.json index 4e22c761e4..201fbc6b89 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_turtle.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_turtle.json @@ -8,7 +8,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:turtle" + "minecraft:entity_type": "minecraft:turtle" } } ], @@ -17,7 +17,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:turtle" + "minecraft:entity_type": "minecraft:turtle" } } ] diff --git a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_wolf.json b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_wolf.json index 1c64f64ee2..f399af99fd 100644 --- a/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_wolf.json +++ b/gm4_metallurgy/data/gm4_gemini_shamir/advancement/breed_wolf.json @@ -4,7 +4,7 @@ "trigger": "minecraft:bred_animals", "conditions": { "child": { - "type": "wolf" + "minecraft:entity_type": "wolf" } } } diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/empty/pickup_mainhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/empty/pickup_mainhand.json index 1cf96327f5..f9bde6c3ea 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/empty/pickup_mainhand.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/empty/pickup_mainhand.json @@ -8,8 +8,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_mainhand_empty\"]}", - "equipment": { + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_mainhand_empty" + ] + }, + "minecraft:equipment": { "mainhand": { "items": [ "minecraft:lava_bucket", @@ -43,7 +47,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_mainhand_empty\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_mainhand_empty" + ] + } } } ], @@ -62,7 +70,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_mainhand_empty\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_mainhand_empty" + ] + } } } ], @@ -81,7 +93,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_mainhand_empty\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_mainhand_empty" + ] + } } } ], @@ -100,7 +116,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_mainhand_empty\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_mainhand_empty" + ] + } } } ], diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/empty/pickup_offhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/empty/pickup_offhand.json index 5f624c2944..0ec734a7d0 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/empty/pickup_offhand.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/empty/pickup_offhand.json @@ -8,8 +8,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_offhand_empty\"]}", - "equipment": { + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_offhand_empty" + ] + }, + "minecraft:equipment": { "offhand": { "items": [ "minecraft:lava_bucket", @@ -43,7 +47,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_offhand_empty\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_offhand_empty" + ] + } } } ], @@ -62,7 +70,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_offhand_empty\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_offhand_empty" + ] + } } } ], @@ -81,7 +93,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_offhand_empty\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_offhand_empty" + ] + } } } ], @@ -100,7 +116,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_offhand_empty\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_offhand_empty" + ] + } } } ], diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/lava/place_mainhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/lava/place_mainhand.json index 57a33aec24..81d0a4b793 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/lava/place_mainhand.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/lava/place_mainhand.json @@ -10,8 +10,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -72,8 +71,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -97,8 +95,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_mainhand_lava\"]}", - "equipment": { + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_mainhand_lava" + ] + }, + "minecraft:equipment": { "mainhand": { "items": [ "minecraft:bucket" diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/lava/place_offhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/lava/place_offhand.json index ccd62a9dec..99c14d88a6 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/lava/place_offhand.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/lava/place_offhand.json @@ -10,8 +10,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -72,8 +71,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -97,8 +95,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_offhand_lava\"]}", - "equipment": { + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_offhand_lava" + ] + }, + "minecraft:equipment": { "offhand": { "items": [ "minecraft:bucket" diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/milk/drink_mainhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/milk/drink_mainhand.json index fca91f4654..67aa3392a1 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/milk/drink_mainhand.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/milk/drink_mainhand.json @@ -10,8 +10,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/milk/drink_offhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/milk/drink_offhand.json index 65c8b5e976..83912e30d7 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/milk/drink_offhand.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/milk/drink_offhand.json @@ -10,8 +10,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/powder_snow/place_mainhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/powder_snow/place_mainhand.json index 4e4d4a5f53..00c5d8823d 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/powder_snow/place_mainhand.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/powder_snow/place_mainhand.json @@ -10,8 +10,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -72,8 +71,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -97,8 +95,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_mainhand_powder_snow\"]}", - "equipment": { + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_mainhand_powder_snow" + ] + }, + "minecraft:equipment": { "mainhand": { "items": [ "minecraft:bucket" diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/powder_snow/place_offhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/powder_snow/place_offhand.json index 3356297123..347c794c43 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/powder_snow/place_offhand.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/powder_snow/place_offhand.json @@ -10,8 +10,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -72,8 +71,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -97,8 +95,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_offhand_powder_snow\"]}", - "equipment": { + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_offhand_powder_snow" + ] + }, + "minecraft:equipment": { "offhand": { "items": [ "minecraft:bucket" diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/water/pickup_fish.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/water/pickup_fish.json index 97fbd412cc..b666603078 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/water/pickup_fish.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/water/pickup_fish.json @@ -10,8 +10,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -23,7 +22,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_mainhand_water\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_mainhand_water" + ] + } } } ], @@ -49,8 +52,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -62,7 +64,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_offhand_water\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_offhand_water" + ] + } } } ], diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/water/place.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/water/place.json index 47f9e2e8ae..7ce15014e1 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/water/place.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancement/water/place.json @@ -10,8 +10,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -84,7 +83,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_mainhand_water\"]}", + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_mainhand_water" + ] + }, "equipment": { "mainhand": { "items": [ @@ -119,8 +122,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "creative" ] @@ -193,8 +195,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_offhand_water\"]}", - "equipment": { + "minecraft:entity_tags": { + "all_of": [ + "gm4_infinitas_offhand_water" + ] + }, + "minecraft:equipment": { "offhand": { "items": [ "minecraft:bucket" diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/predicate/mainhand/after/water_advancement.json b/gm4_metallurgy/data/gm4_infinitas_shamir/predicate/mainhand/after/water_advancement.json index 529c24f0c0..46836c7911 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/predicate/mainhand/after/water_advancement.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/predicate/mainhand/after/water_advancement.json @@ -5,8 +5,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4_infinitas_shamir:water/place": { "place_water_mainhand": true @@ -19,8 +18,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4_infinitas_shamir:water/place": { "use_on_cauldron_mainhand": true diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/predicate/offhand/after/water_advancement.json b/gm4_metallurgy/data/gm4_infinitas_shamir/predicate/offhand/after/water_advancement.json index aa561f5a27..1f826c5f18 100644 --- a/gm4_metallurgy/data/gm4_infinitas_shamir/predicate/offhand/after/water_advancement.json +++ b/gm4_metallurgy/data/gm4_infinitas_shamir/predicate/offhand/after/water_advancement.json @@ -5,8 +5,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4_infinitas_shamir:water/place": { "place_water_offhand": true @@ -19,8 +18,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4_infinitas_shamir:water/place": { "use_on_cauldron_offhand": true diff --git a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/slightly_damaged_obsidian.json b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/slightly_damaged_obsidian.json index 0d704549ec..2db62ed8d3 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/item_modifier/slightly_damaged_obsidian.json +++ b/gm4_metallurgy/data/gm4_metallurgy/item_modifier/slightly_damaged_obsidian.json @@ -3,7 +3,6 @@ "function": "minecraft:set_components", "components": { "minecraft:custom_model_data": {"strings":["gm4_metallurgy:item/slightly_damaged_obsidian"]}, - "!minecraft:item_name": {}, "!minecraft:custom_name": {}, "!minecraft:profile": {} } diff --git a/gm4_metallurgy/data/gm4_metallurgy/predicate/infinitas_active.json b/gm4_metallurgy/data/gm4_metallurgy/predicate/infinitas_active.json index c3e844094e..afa662a8de 100644 --- a/gm4_metallurgy/data/gm4_metallurgy/predicate/infinitas_active.json +++ b/gm4_metallurgy/data/gm4_metallurgy/predicate/infinitas_active.json @@ -1,25 +1,15 @@ { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_mainhand_empty\"]}", - "flags": { - "is_sneaking": true - } - } + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "minecraft:entity_tags": { + "any_of": [ + "gm4_infinitas_mainhand_empty", + "gm4_infinitas_offhand_empty" + ] }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_infinitas_offhand_empty\"]}", - "flags": { - "is_sneaking": true - } - } + "minecraft:flags": { + "is_sneaking": true } - ] + } } diff --git a/gm4_metallurgy/data/minecraft/loot_table/blocks/andesite.json b/gm4_metallurgy/data/minecraft/loot_table/blocks/andesite.json index dcb723cd2d..e9f6665852 100644 --- a/gm4_metallurgy/data/minecraft/loot_table/blocks/andesite.json +++ b/gm4_metallurgy/data/minecraft/loot_table/blocks/andesite.json @@ -20,7 +20,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:tnt" + "minecraft:entity_type": "minecraft:tnt" } } } @@ -58,7 +58,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:tnt" + "minecraft:entity_type": "minecraft:tnt" } } ] diff --git a/gm4_metallurgy/data/minecraft/loot_table/blocks/diorite.json b/gm4_metallurgy/data/minecraft/loot_table/blocks/diorite.json index fafde56dfd..28b797d4d5 100644 --- a/gm4_metallurgy/data/minecraft/loot_table/blocks/diorite.json +++ b/gm4_metallurgy/data/minecraft/loot_table/blocks/diorite.json @@ -20,7 +20,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:tnt" + "minecraft:entity_type": "minecraft:tnt" } } } @@ -58,7 +58,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:tnt" + "minecraft:entity_type": "minecraft:tnt" } } ] diff --git a/gm4_metallurgy/data/minecraft/loot_table/blocks/granite.json b/gm4_metallurgy/data/minecraft/loot_table/blocks/granite.json index 55ccb4f72a..a7052ace59 100644 --- a/gm4_metallurgy/data/minecraft/loot_table/blocks/granite.json +++ b/gm4_metallurgy/data/minecraft/loot_table/blocks/granite.json @@ -20,7 +20,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:tnt" + "minecraft:entity_type": "minecraft:tnt" } } } @@ -58,7 +58,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:tnt" + "minecraft:entity_type": "minecraft:tnt" } } ] diff --git a/gm4_metallurgy/data/minecraft/loot_table/blocks/stone.json b/gm4_metallurgy/data/minecraft/loot_table/blocks/stone.json index 2d8c624213..69537b5f15 100644 --- a/gm4_metallurgy/data/minecraft/loot_table/blocks/stone.json +++ b/gm4_metallurgy/data/minecraft/loot_table/blocks/stone.json @@ -37,7 +37,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": [ + "minecraft:entity_type": [ "minecraft:tnt", "minecraft:creeper", "minecraft:wither", diff --git a/gm4_metallurgy/shamir_model_template.py b/gm4_metallurgy/shamir_model_template.py index 5426376ca3..07e3cb16a0 100644 --- a/gm4_metallurgy/shamir_model_template.py +++ b/gm4_metallurgy/shamir_model_template.py @@ -221,7 +221,7 @@ def beet_default(ctx: Context): # bind context object to a ClassVar so it can be accessed later during template processing ShamirTemplate.bound_ctx = ctx vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.1' + vanilla.minecraft_version = '26.2' ShamirTemplate.vanilla_models_jar = vanilla.mount("assets/minecraft/items") merge_policy(ctx) diff --git a/gm4_midnight_menaces/data/gm4_enlarging_phantoms/guidebook/enlarging_phantoms.json b/gm4_midnight_menaces/data/gm4_enlarging_phantoms/guidebook/enlarging_phantoms.json index a1876293f5..45fcb27af5 100644 --- a/gm4_midnight_menaces/data/gm4_enlarging_phantoms/guidebook/enlarging_phantoms.json +++ b/gm4_midnight_menaces/data/gm4_enlarging_phantoms/guidebook/enlarging_phantoms.json @@ -17,8 +17,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:phantom", - "nbt": "{Tags:['gm4_enlarged_phantom']}" + "minecraft:entity_type": "minecraft:phantom", + "minecraft:entity_tags": { + "all_of": [ + "gm4_enlarged_phantom" + ] + } } } ] diff --git a/gm4_midnight_menaces/data/gm4_icy_strays/guidebook/icy_strays.json b/gm4_midnight_menaces/data/gm4_icy_strays/guidebook/icy_strays.json index 54badc8cad..aa11c4885d 100644 --- a/gm4_midnight_menaces/data/gm4_icy_strays/guidebook/icy_strays.json +++ b/gm4_midnight_menaces/data/gm4_icy_strays/guidebook/icy_strays.json @@ -17,8 +17,8 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:stray", - "nbt": "{DeathLootTable:\"gm4_icy_strays:entities/icy_stray\"}" + "minecraft:entity_type": "minecraft:stray", + "minecraft:nbt": "{DeathLootTable:\"gm4_icy_strays:entities/icy_stray\"}" } } ] diff --git a/gm4_midnight_menaces/data/gm4_illusioner_nights/guidebook/illusioner_nights.json b/gm4_midnight_menaces/data/gm4_illusioner_nights/guidebook/illusioner_nights.json index 61d0ab7bf1..d4fc1cdb34 100644 --- a/gm4_midnight_menaces/data/gm4_illusioner_nights/guidebook/illusioner_nights.json +++ b/gm4_midnight_menaces/data/gm4_illusioner_nights/guidebook/illusioner_nights.json @@ -20,8 +20,8 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:illusioner", - "nbt": "{DeathLootTable:\"gm4_illusioner_nights:entities/illusioner\"}" + "minecraft:entity_type": "minecraft:illusioner", + "minecraft:nbt": "{DeathLootTable:\"gm4_illusioner_nights:entities/illusioner\"}" } } ] diff --git a/gm4_midnight_menaces/data/gm4_menacing_goblins/guidebook/menacing_goblins.json b/gm4_midnight_menaces/data/gm4_menacing_goblins/guidebook/menacing_goblins.json index c687531af9..90b7fecb9e 100644 --- a/gm4_midnight_menaces/data/gm4_menacing_goblins/guidebook/menacing_goblins.json +++ b/gm4_midnight_menaces/data/gm4_menacing_goblins/guidebook/menacing_goblins.json @@ -17,8 +17,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:zombie", - "nbt": "{Tags:['gm4_goblin']}" + "minecraft:entity_type": "minecraft:zombie", + "minecraft:entity_tags": { + "all_of": [ + "gm4_goblin" + ] + } } } ] diff --git a/gm4_midnight_menaces/data/gm4_sandy_husks/guidebook/sandy_husks.json b/gm4_midnight_menaces/data/gm4_sandy_husks/guidebook/sandy_husks.json index a324356c44..aa6ddb62e7 100644 --- a/gm4_midnight_menaces/data/gm4_sandy_husks/guidebook/sandy_husks.json +++ b/gm4_midnight_menaces/data/gm4_sandy_husks/guidebook/sandy_husks.json @@ -17,8 +17,8 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:husk", - "nbt": "{DeathLootTable:\"gm4_sandy_husks:entities/sandy_husk\"}" + "minecraft:entity_type": "minecraft:husk", + "minecraft:nbt": "{DeathLootTable:\"gm4_sandy_husks:entities/sandy_husk\"}" } } ] diff --git a/gm4_midnight_menaces/data/gm4_slime_fests/guidebook/slime_fests.json b/gm4_midnight_menaces/data/gm4_slime_fests/guidebook/slime_fests.json index 936274d378..887feb21a2 100644 --- a/gm4_midnight_menaces/data/gm4_slime_fests/guidebook/slime_fests.json +++ b/gm4_midnight_menaces/data/gm4_slime_fests/guidebook/slime_fests.json @@ -20,20 +20,19 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:slime", - "type_specific": { - "type": "slime", + "minecraft:entity_type": "minecraft:slime", + "minecraft:type_specific/cube_mob": { "size": 0 }, - "nbt": "{DeathLootTable:\"minecraft:empty\"}" + "minecraft:nbt": "{DeathLootTable:\"minecraft:empty\"}" } }, { "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:slime", - "nbt": "{DeathLootTable:\"gm4_slime_fests:entities/giant_slime\"}" + "minecraft:entity_type": "minecraft:slime", + "minecraft:nbt": "{DeathLootTable:\"gm4_slime_fests:entities/giant_slime\"}" } } ] diff --git a/gm4_monsters_unbound/data/gm4/advancement/monsters_unbound_elite_kill.json b/gm4_monsters_unbound/data/gm4/advancement/monsters_unbound_elite_kill.json index e9ca0c94a5..0ad9494a46 100644 --- a/gm4_monsters_unbound/data/gm4/advancement/monsters_unbound_elite_kill.json +++ b/gm4_monsters_unbound/data/gm4/advancement/monsters_unbound_elite_kill.json @@ -24,7 +24,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite" + ] + } } } ] diff --git a/gm4_monsters_unbound/data/gm4/advancement/monsters_unbound_elite_kill_all.json b/gm4_monsters_unbound/data/gm4/advancement/monsters_unbound_elite_kill_all.json index 47814434c8..1905e3ebe3 100644 --- a/gm4_monsters_unbound/data/gm4/advancement/monsters_unbound_elite_kill_all.json +++ b/gm4_monsters_unbound/data/gm4/advancement/monsters_unbound_elite_kill_all.json @@ -24,7 +24,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.blazing\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.blazing" + ] + } } } ] @@ -38,7 +42,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.gargantuan\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.gargantuan" + ] + } } } ] @@ -52,7 +60,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.glacial\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.glacial" + ] + } } } ] @@ -66,7 +78,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.mending\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.mending" + ] + } } } ] @@ -80,7 +96,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.pearlescent\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.pearlescent" + ] + } } } ] @@ -94,7 +114,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.splitting\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.splitting" + ] + } } } ] @@ -108,7 +132,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.volatile\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.volatile" + ] + } } } ] @@ -122,7 +150,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.vorpal\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.vorpal" + ] + } } } ] @@ -136,7 +168,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.zephyr\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.zephyr" + ] + } } } ] diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/charging.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/charging.json index cdfb40abcf..b0b9fc25b7 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/charging.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/charging.json @@ -5,7 +5,11 @@ "conditions": { "damage": { "source_entity": { - "nbt": "{Tags:[\"gm4_mu_charging_attack\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_charging_attack" + ] + } } } } diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/slowing.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/slowing.json index 774b625a6c..5af5cd66eb 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/slowing.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/slowing.json @@ -10,7 +10,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_frozen\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_frozen" + ] + } } } } @@ -18,7 +22,11 @@ "damage": { "blocked": false, "source_entity": { - "nbt": "{Tags:[\"gm4_mu_slowing_attack\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_slowing_attack" + ] + } } } } diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/toxic.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/toxic.json index 6af221acf6..6490911083 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/toxic.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/toxic.json @@ -6,7 +6,11 @@ "damage": { "blocked": false, "source_entity": { - "nbt": "{Tags:[\"gm4_mu_toxic_attack\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_toxic_attack" + ] + } } } } diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/weakness.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/weakness.json index 08e7460766..ccaf305d2d 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/weakness.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/damaged/attack_effect/weakness.json @@ -6,7 +6,11 @@ "damage": { "blocked": false, "source_entity": { - "nbt": "{Tags:[\"gm4_mu_weakness_attack\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_weakness_attack" + ] + } } } } diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/elite/on_hit.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/elite/on_hit.json index e1ffca6508..993b791bd7 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/elite/on_hit.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/advancement/elite/on_hit.json @@ -8,7 +8,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.on_hit\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.on_hit" + ] + } } } ] diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/guidebook/monsters_unbound.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/guidebook/monsters_unbound.json index d044e8399c..75df45c535 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/guidebook/monsters_unbound.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/guidebook/monsters_unbound.json @@ -117,7 +117,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.blazing\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.blazing" + ] + } } } ] @@ -131,7 +135,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.gargantuan\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.gargantuan" + ] + } } } ] @@ -145,7 +153,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.glacial\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.glacial" + ] + } } } ] @@ -159,7 +171,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.mending\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.mending" + ] + } } } ] @@ -173,7 +189,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.pearlescent\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.pearlescent" + ] + } } } ] @@ -187,7 +207,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.splitting\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.splitting" + ] + } } } ] @@ -201,7 +225,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.volatile\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.volatile" + ] + } } } ] @@ -215,7 +243,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.vorpal\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.vorpal" + ] + } } } ] @@ -229,7 +261,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_elite.zephyr\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_elite.zephyr" + ] + } } } ] diff --git a/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/mob/equip_armor/spore.json b/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/mob/equip_armor/spore.json index 520446a2a8..c0f35e68f4 100644 --- a/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/mob/equip_armor/spore.json +++ b/gm4_monsters_unbound/data/gm4_monsters_unbound/loot_table/mob/equip_armor/spore.json @@ -19,7 +19,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_mu_spore_zombie.cherry\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_mu_spore_zombie.cherry" + ] + } } } ] @@ -41,12 +45,13 @@ "chance": 0.66 }, { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_mu_spore_zombie.cherry\"]}" + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "minecraft:entity_tags": { + "none_of": [ + "gm4_mu_spore_zombie.cherry" + ] } } } @@ -65,12 +70,13 @@ ], "conditions": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"gm4_mu_spore_zombie.cherry\"]}" + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "minecraft:entity_tags": { + "none_of": [ + "gm4_mu_spore_zombie.cherry" + ] } } } diff --git a/gm4_mysterious_midnights/data/gm4_falling_stars/guidebook/falling_stars.json b/gm4_mysterious_midnights/data/gm4_falling_stars/guidebook/falling_stars.json index d5637c9fff..67925a9da7 100644 --- a/gm4_mysterious_midnights/data/gm4_falling_stars/guidebook/falling_stars.json +++ b/gm4_mysterious_midnights/data/gm4_falling_stars/guidebook/falling_stars.json @@ -20,19 +20,26 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:splash_potion", - "nbt": "{Tags:['gm4_falling_star']}" + "minecraft:entity_type": "minecraft:splash_potion", + "minecraft:entity_tags": { + "all_of": [ + "gm4_falling_star" + ] + } } }, { "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "type": "minecraft:area_effect_cloud", - "nbt": "{Tags:['gm4_falling_star']}" + "minecraft:entity_type": "minecraft:area_effect_cloud", + "minecraft:entity_tags": { + "all_of": [ + "gm4_falling_star" + ] + } } } } @@ -41,11 +48,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "type": "minecraft:shulker_bullet", - "nbt": "{Tags:['gm4_falling_star']}" + "minecraft:entity_type": "minecraft:shulker_bullet", + "minecraft:entity_tags": { + "all_of": [ + "gm4_falling_star" + ] + } } } } diff --git a/gm4_mysterious_midnights/data/gm4_resurrecting_skeletons/guidebook/resurrecting_skeletons.json b/gm4_mysterious_midnights/data/gm4_resurrecting_skeletons/guidebook/resurrecting_skeletons.json index 8a1f68a1f3..eb4e7d199c 100644 --- a/gm4_mysterious_midnights/data/gm4_resurrecting_skeletons/guidebook/resurrecting_skeletons.json +++ b/gm4_mysterious_midnights/data/gm4_resurrecting_skeletons/guidebook/resurrecting_skeletons.json @@ -17,8 +17,8 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:skeleton", - "nbt": "{DeathLootTable:\"minecraft:empty\",attributes:[{id:\"minecraft:attack_damage\",base:10.0d}]}" + "minecraft:entity_type": "minecraft:skeleton", + "minecraft:nbt": "{DeathLootTable:\"minecraft:empty\",attributes:[{id:\"minecraft:attack_damage\",base:10.0d}]}" } } ] diff --git a/gm4_mysterious_midnights/data/gm4_resurrecting_zombies/guidebook/resurrecting_zombies.json b/gm4_mysterious_midnights/data/gm4_resurrecting_zombies/guidebook/resurrecting_zombies.json index 2a2717cc87..0fb073a591 100644 --- a/gm4_mysterious_midnights/data/gm4_resurrecting_zombies/guidebook/resurrecting_zombies.json +++ b/gm4_mysterious_midnights/data/gm4_resurrecting_zombies/guidebook/resurrecting_zombies.json @@ -17,8 +17,8 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:zombie", - "nbt": "{DeathLootTable:\"minecraft:empty\",attributes:[{id:\"minecraft:attack_damage\",base:10.0d}]}" + "minecraft:entity_type": "minecraft:zombie", + "minecraft:nbt": "{DeathLootTable:\"minecraft:empty\",attributes:[{id:\"minecraft:attack_damage\",base:10.0d}]}" } } ] diff --git a/gm4_mysterious_midnights/data/gm4_tipped_skeletons/guidebook/tipped_skeletons.json b/gm4_mysterious_midnights/data/gm4_tipped_skeletons/guidebook/tipped_skeletons.json index 6bb32d5fc9..9f64689d14 100644 --- a/gm4_mysterious_midnights/data/gm4_tipped_skeletons/guidebook/tipped_skeletons.json +++ b/gm4_mysterious_midnights/data/gm4_tipped_skeletons/guidebook/tipped_skeletons.json @@ -17,8 +17,12 @@ "conditions": { "damage": { "source_entity": { - "type": "minecraft:skeleton", - "nbt": "{Tags:['gm4_tipped_skeleton']}" + "minecraft:entity_type": "minecraft:skeleton", + "minecraft:entity_tags": { + "all_of": [ + "gm4_tipped_skeleton" + ] + } } } } diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/advancement/triggers/magic_evoker_fang.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/advancement/triggers/magic_evoker_fang.json index 494e1c769e..19a751a712 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/advancement/triggers/magic_evoker_fang.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/advancement/triggers/magic_evoker_fang.json @@ -13,7 +13,7 @@ ] }, "source_entity": { - "type": "minecraft:evoker" + "minecraft:entity_type": "minecraft:evoker" } } } diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/guidebook/orb_of_ankou.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/guidebook/orb_of_ankou.json index acc0639b7a..27918259cb 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/guidebook/orb_of_ankou.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/guidebook/orb_of_ankou.json @@ -29,8 +29,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4:create_soul_forge": true } diff --git a/gm4_orb_of_ankou/generate_pneumas.py b/gm4_orb_of_ankou/generate_pneumas.py index e920762916..603a184ec5 100644 --- a/gm4_orb_of_ankou/generate_pneumas.py +++ b/gm4_orb_of_ankou/generate_pneumas.py @@ -29,7 +29,9 @@ def generate_corripio(ctx: Context): { "condition": "minecraft:entity_properties", "entity": "this", - "predicate": { "type": f"minecraft:{entity}" } + "predicate": { + "minecraft:entity_type": f"minecraft:{entity}" + } }, *[{ "condition": "minecraft:inverted", @@ -37,7 +39,11 @@ def generate_corripio(ctx: Context): "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"" + tag + "\"]}" + "minecraft:entity_tags": { + "all_of": [ + tag + ] + } } } } for tag in ["gm4_oa_ignore", "smithed.entity"]], @@ -158,7 +164,7 @@ def generate_soul_essence_loot_tables(ctx: Context): "strings": [f"gm4_orb_of_ankou:pneuma/{pneuma}"] }, "minecraft:damage_resistant": { - "types": "#minecraft:is_fire" + "types": "#minecraft:is_fire" }, } }, diff --git a/gm4_particles_pack/data/gm4_particles_pack/guidebook/particles_pack.json b/gm4_particles_pack/data/gm4_particles_pack/guidebook/particles_pack.json index 8fcab1d1ed..226e82bd12 100644 --- a/gm4_particles_pack/data/gm4_particles_pack/guidebook/particles_pack.json +++ b/gm4_particles_pack/data/gm4_particles_pack/guidebook/particles_pack.json @@ -15,8 +15,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4:better_armour_stands": true } diff --git a/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/guidebook/phantom_scarecrows.json b/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/guidebook/phantom_scarecrows.json index d77152a81c..f2e0008c07 100644 --- a/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/guidebook/phantom_scarecrows.json +++ b/gm4_phantom_scarecrows/data/gm4_phantom_scarecrows/guidebook/phantom_scarecrows.json @@ -28,11 +28,14 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "looking_at": { - "type": "minecraft:armor_stand", - "nbt": "{Tags:[\"gm4_phantom_scarecrow\"]}" + "minecraft:entity_type": "minecraft:armor_stand", + "minecraft:entity_tags": { + "all_of": [ + "gm4_phantom_scarecrow" + ] + } } } } diff --git a/gm4_pig_tractors/data/gm4_pig_tractors/guidebook/pig_tractors.json b/gm4_pig_tractors/data/gm4_pig_tractors/guidebook/pig_tractors.json index e0d6201d3d..a6f546de49 100644 --- a/gm4_pig_tractors/data/gm4_pig_tractors/guidebook/pig_tractors.json +++ b/gm4_pig_tractors/data/gm4_pig_tractors/guidebook/pig_tractors.json @@ -15,7 +15,7 @@ "entity": "this", "predicate": { "vehicle": { - "type": "minecraft:pig" + "minecraft:entity_type": "minecraft:pig" } } }, @@ -26,8 +26,8 @@ "entity": "this", "predicate": { "vehicle": { - "type": "minecraft:pig", - "nbt": "{NoAI:1b}" + "minecraft:entity_type": "minecraft:pig", + "minecraft:nbt": "{NoAI:1b}" } } } @@ -43,8 +43,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4:pig_tractors": true } diff --git a/gm4_pig_tractors/data/gm4_pig_tractors/predicate/player/vehicle/pig/in_air.json b/gm4_pig_tractors/data/gm4_pig_tractors/predicate/player/vehicle/pig/in_air.json index 7f5baceb16..cb007fed7e 100644 --- a/gm4_pig_tractors/data/gm4_pig_tractors/predicate/player/vehicle/pig/in_air.json +++ b/gm4_pig_tractors/data/gm4_pig_tractors/predicate/player/vehicle/pig/in_air.json @@ -1,28 +1,19 @@ -[ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "vehicle": { - "type": "minecraft:pig", - "location": { - "block": { - "blocks": "#gm4_pig_tractors:replaceable" - } - } - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "vehicle": { - "nbt": "{Tags:[\"smithed.entity\"]}" +{ + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "minecraft:vehicle": { + "minecraft:entity_type": "minecraft:pig", + "minecraft:location": { + "block": { + "blocks": "#gm4_pig_tractors:replaceable" } } + }, + "minecraft:entity_tags": { + "none_of": [ + "smithed.entity" + ] } } -] +} diff --git a/gm4_pig_tractors/data/gm4_pig_tractors/predicate/player/vehicle/pig/in_farmland.json b/gm4_pig_tractors/data/gm4_pig_tractors/predicate/player/vehicle/pig/in_farmland.json index 723579ba43..4421cbb418 100644 --- a/gm4_pig_tractors/data/gm4_pig_tractors/predicate/player/vehicle/pig/in_farmland.json +++ b/gm4_pig_tractors/data/gm4_pig_tractors/predicate/player/vehicle/pig/in_farmland.json @@ -1,30 +1,21 @@ -[ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "vehicle": { - "type": "minecraft:pig", - "location": { - "block": { - "blocks": [ - "minecraft:farmland" - ] - } - } - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "vehicle": { - "nbt": "{Tags:[\"smithed.entity\"]}" +{ + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "minecraft:vehicle": { + "minecraft:entity_type": "minecraft:pig", + "minecraft:location": { + "block": { + "blocks": [ + "minecraft:farmland" + ] } } + }, + "minecraft:entity_tags": { + "none_of": [ + "smithed.entity" + ] } } -] +} diff --git a/gm4_reeling_rods/data/gm4_reeling_rods/function/reeling/sulfur_cube.mcfunction b/gm4_reeling_rods/data/gm4_reeling_rods/function/reeling/sulfur_cube.mcfunction new file mode 100644 index 0000000000..cfa72917f2 --- /dev/null +++ b/gm4_reeling_rods/data/gm4_reeling_rods/function/reeling/sulfur_cube.mcfunction @@ -0,0 +1,17 @@ +# Action for reeled sulfur cube +# @s = sulfur cube +# at bobber in @s +# run from hooked_entity/select_type + +# fail if no block +execute unless items entity @s armor.body * run return fail + +data modify storage gm4_reeling_rods:temp item_data set value {} +data modify storage gm4_reeling_rods:temp item_data.Item set from entity @s equipment.body +data modify storage gm4_reeling_rods:temp item_data.PickupDelay set value 10s + +item replace entity @s armor.body with air + +function gm4_reeling_rods:pull_items + +playsound minecraft:entity.sulfur_cube.eject neutral @a[distance=..16] ~ ~ ~ diff --git a/gm4_reeling_rods/entities.csv b/gm4_reeling_rods/entities.csv index 95c36c03d6..1544f5aae0 100644 --- a/gm4_reeling_rods/entities.csv +++ b/gm4_reeling_rods/entities.csv @@ -11,6 +11,7 @@ minecraft:enderman,TRUE,TRUE,"gm4_reeling_rods:reeling/enderman/action" minecraft:mooshroom,TRUE,TRUE,"gm4_reeling_rods:reeling/mooshroom" minecraft:sheep,TRUE,TRUE,"gm4_reeling_rods:reeling/sheep" minecraft:snow_golem,TRUE,TRUE,"gm4_reeling_rods:reeling/snow_golem" +minecraft:sulfur_cube,TRUE,TRUE,"gm4_reeling_rods:reeling/sulfur_cube" minecraft:villager,TRUE,TRUE,"gm4_reeling_rods:reeling/villager/action" minecraft:chest_minecart,TRUE,FALSE,"gm4_reeling_rods:reeling/minecart {block:'minecraft:chest'}" minecraft:furnace_minecart,TRUE,FALSE,"gm4_reeling_rods:reeling/minecart {block:'minecraft:furnace'}" diff --git a/gm4_rope_ladders/data/gm4_rope_ladders/advancement/right_click_detection.json b/gm4_rope_ladders/data/gm4_rope_ladders/advancement/right_click_detection.json index e69ee273f3..8f8e0e8d54 100644 --- a/gm4_rope_ladders/data/gm4_rope_ladders/advancement/right_click_detection.json +++ b/gm4_rope_ladders/data/gm4_rope_ladders/advancement/right_click_detection.json @@ -12,8 +12,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "gamemode": [ "survival", "creative" @@ -27,7 +26,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:interaction" + "minecraft:entity_type": "minecraft:interaction" } }, { diff --git a/gm4_scuba_gear/data/gm4_scuba_gear/enchantment/wetsuit.json b/gm4_scuba_gear/data/gm4_scuba_gear/enchantment/wetsuit.json index 9cd1e8ccfa..a38f71b3eb 100644 --- a/gm4_scuba_gear/data/gm4_scuba_gear/enchantment/wetsuit.json +++ b/gm4_scuba_gear/data/gm4_scuba_gear/enchantment/wetsuit.json @@ -68,8 +68,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "input": { "jump": false, "sneak": false @@ -81,8 +80,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "input": { "jump": true, "sneak": true @@ -132,8 +130,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "input": { "jump": false, "sneak": true @@ -171,8 +168,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "minecraft:player", + "minecraft:type_specific/player": { "input": { "jump": true, "sneak": false diff --git a/gm4_soul_glass/data/gm4_soul_glass/advancement/place_soul_glass.json b/gm4_soul_glass/data/gm4_soul_glass/advancement/place_soul_glass.json index 2c408640fb..449bdff2ee 100644 --- a/gm4_soul_glass/data/gm4_soul_glass/advancement/place_soul_glass.json +++ b/gm4_soul_glass/data/gm4_soul_glass/advancement/place_soul_glass.json @@ -10,8 +10,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "spectator" ] diff --git a/gm4_soul_glass/data/gm4_soul_glass/tags/block/beacon_passable.json b/gm4_soul_glass/data/gm4_soul_glass/tags/block/beacon_passable.json index ba28f8e12d..e53d440c9d 100644 --- a/gm4_soul_glass/data/gm4_soul_glass/tags/block/beacon_passable.json +++ b/gm4_soul_glass/data/gm4_soul_glass/tags/block/beacon_passable.json @@ -49,7 +49,7 @@ "minecraft:dragon_egg", "minecraft:dragon_head", "minecraft:dragon_wall_head", - { "id": "minecraft:dried_ghast", "required": false }, + "minecraft:dried_ghast", "minecraft:enchanting_table", "minecraft:end_portal_frame", "minecraft:end_rod", @@ -89,6 +89,7 @@ "minecraft:piston_head", "minecraft:player_head", "minecraft:player_wall_head", + "minecraft:pointed_dripstone", "minecraft:purple_stained_glass_pane", "minecraft:purple_stained_glass", "minecraft:red_stained_glass_pane", @@ -103,6 +104,7 @@ "minecraft:spawner", "minecraft:stonecutter", "minecraft:sweet_berry_bush", + "minecraft:sulfur_spike", "minecraft:trapped_chest", "minecraft:tripwire_hook", "minecraft:tripwire", diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/sulfur_spike.json b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/sulfur_spike.json new file mode 100644 index 0000000000..e1d2c1e0ed --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/advancement/recipes/sulfur_spike.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "gm4_standard_crafting:sulfur_spike" + } + }, + "has_materials": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "minecraft:sulfur" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_materials" + ] + ], + "rewards": { + "recipes": [ + "gm4_standard_crafting:sulfur_spike" + ] + } +} diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/guidebook/standard_crafting.json b/gm4_standard_crafting/data/gm4_standard_crafting/guidebook/standard_crafting.json index e01fa1203d..455f37e8be 100644 --- a/gm4_standard_crafting/data/gm4_standard_crafting/guidebook/standard_crafting.json +++ b/gm4_standard_crafting/data/gm4_standard_crafting/guidebook/standard_crafting.json @@ -69,6 +69,19 @@ ] } }, + "obtain_sulfur": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:sulfur", + "minecraft:sulfur_spike" + ] + } + ] + } + }, "obtain_quartz": { "trigger": "minecraft:inventory_changed", "conditions": { @@ -114,7 +127,7 @@ "entity": "this", "predicate": { "vehicle": { - "type": "minecraft:horse" + "minecraft:entity_type": "minecraft:horse" } } }, @@ -125,8 +138,8 @@ "entity": "this", "predicate": { "vehicle": { - "type": "minecraft:horse", - "nbt": "{NoAI:1b}" + "minecraft:entity_type": "minecraft:horse", + "minecraft:nbt": "{NoAI:1b}" } } } diff --git a/gm4_standard_crafting/data/gm4_standard_crafting/recipe/sulfur_spike.json b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/sulfur_spike.json new file mode 100644 index 0000000000..1aa2054e2e --- /dev/null +++ b/gm4_standard_crafting/data/gm4_standard_crafting/recipe/sulfur_spike.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "minecraft:sulfur" + ], + "result": { + "id": "minecraft:sulfur_spike", + "count": 4 + } +} diff --git a/gm4_standard_crafting/generate_recipes.py b/gm4_standard_crafting/generate_recipes.py index 8d15cb314f..5875c5db94 100644 --- a/gm4_standard_crafting/generate_recipes.py +++ b/gm4_standard_crafting/generate_recipes.py @@ -11,7 +11,7 @@ def beet_default(ctx: Context): """ vanilla = ctx.inject(Vanilla) - vanilla.minecraft_version = '26.1' + vanilla.minecraft_version = '26.2' item_tags = vanilla.mount("data/minecraft/tags/item").data.item_tags recipes = vanilla.mount("data/minecraft/recipe").data.recipes diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/advancement/damaged.json b/gm4_survival_refightalized/data/gm4_survival_refightalized/advancement/damaged.json index 2d8fcb3fea..81331c25ac 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/advancement/damaged.json +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/advancement/damaged.json @@ -44,7 +44,11 @@ "damage": { "type": { "source_entity": { - "nbt": "{Tags:[\"gm4_sr_stat.armor_pierce_attack\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_sr_stat.armor_pierce_attack" + ] + } } } } @@ -199,7 +203,7 @@ "minecraft:poison": {} }, "source": { - "type": "minecraft:witch" + "minecraft:entity_type": "minecraft:witch" } } }, @@ -208,7 +212,7 @@ "conditions": { "damage": { "source_entity": { - "type": "minecraft:cave_spider" + "minecraft:entity_type": "minecraft:cave_spider" }, "type": { "tags": [ diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/advancement/kill_mob.json b/gm4_survival_refightalized/data/gm4_survival_refightalized/advancement/kill_mob.json index 2f8406c8d6..f0d5c2243e 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/advancement/kill_mob.json +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/advancement/kill_mob.json @@ -4,7 +4,7 @@ "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "#gm4:hostile" + "minecraft:entity_type": "#gm4:hostile" } } }, @@ -12,7 +12,7 @@ "trigger": "minecraft:player_killed_entity", "conditions": { "entity": { - "type": "#gm4:neutral_hostile" + "minecraft:entity_type": "#gm4:neutral_hostile" } } } diff --git a/gm4_survival_refightalized/data/gm4_survival_refightalized/guidebook/survival_refightalized.json b/gm4_survival_refightalized/data/gm4_survival_refightalized/guidebook/survival_refightalized.json index ef74c1f0ee..d203ae93ce 100644 --- a/gm4_survival_refightalized/data/gm4_survival_refightalized/guidebook/survival_refightalized.json +++ b/gm4_survival_refightalized/data/gm4_survival_refightalized/guidebook/survival_refightalized.json @@ -81,8 +81,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "minecraft:adventure/kill_a_mob": true } diff --git a/gm4_towering_trees/data/gm4_towering_trees/worldgen/configured_feature/leaf_litter.json b/gm4_towering_trees/data/gm4_towering_trees/worldgen/configured_feature/leaf_litter.json index 6009e00a0f..7b87687eec 100644 --- a/gm4_towering_trees/data/gm4_towering_trees/worldgen/configured_feature/leaf_litter.json +++ b/gm4_towering_trees/data/gm4_towering_trees/worldgen/configured_feature/leaf_litter.json @@ -305,11 +305,9 @@ "tries": 300 } ], - "dirt_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } + "below_trunk_provider": { + "type": "minecraft:rule_based_state_provider", + "rules": [] }, "foliage_placer": { "type": "minecraft:bush_foliage_placer", @@ -323,7 +321,6 @@ "Name": "minecraft:air" } }, - "force_dirt": false, "ignore_vines": true, "minimum_size": { "type": "minecraft:two_layers_feature_size", diff --git a/gm4_towering_trees/data/gm4_towering_trees/worldgen/configured_feature/pink_petals.json b/gm4_towering_trees/data/gm4_towering_trees/worldgen/configured_feature/pink_petals.json index 272e1612c1..b9ff8b3add 100644 --- a/gm4_towering_trees/data/gm4_towering_trees/worldgen/configured_feature/pink_petals.json +++ b/gm4_towering_trees/data/gm4_towering_trees/worldgen/configured_feature/pink_petals.json @@ -305,11 +305,9 @@ "tries": 300 } ], - "dirt_provider": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:air" - } + "below_trunk_provider": { + "type": "minecraft:rule_based_state_provider", + "rules": [] }, "foliage_placer": { "type": "minecraft:bush_foliage_placer", @@ -323,7 +321,6 @@ "Name": "minecraft:air" } }, - "force_dirt": false, "ignore_vines": true, "minimum_size": { "type": "minecraft:two_layers_feature_size", diff --git a/gm4_undead_players/data/gm4_undead_players/guidebook/undead_players.json b/gm4_undead_players/data/gm4_undead_players/guidebook/undead_players.json index d6022e52f4..5eb4c17144 100644 --- a/gm4_undead_players/data/gm4_undead_players/guidebook/undead_players.json +++ b/gm4_undead_players/data/gm4_undead_players/guidebook/undead_players.json @@ -14,8 +14,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4:undead_players": true } diff --git a/gm4_undead_players/data/gm4_undead_players/item_modifier/zombie_name.json b/gm4_undead_players/data/gm4_undead_players/item_modifier/zombie_name.json index 0d787d1b3e..c1ad7356c9 100644 --- a/gm4_undead_players/data/gm4_undead_players/item_modifier/zombie_name.json +++ b/gm4_undead_players/data/gm4_undead_players/item_modifier/zombie_name.json @@ -7,7 +7,8 @@ "with": [ { "storage": "gm4_undead_players:temp", - "nbt": "name_attribute.Name" + "nbt": "name_attribute.Name", + "interpret": true } ] } diff --git a/gm4_vecto_shamir/data/gm4_vecto_shamir/advancement/vehicle_check.json b/gm4_vecto_shamir/data/gm4_vecto_shamir/advancement/vehicle_check.json index 8a529445d8..93cd58beee 100644 --- a/gm4_vecto_shamir/data/gm4_vecto_shamir/advancement/vehicle_check.json +++ b/gm4_vecto_shamir/data/gm4_vecto_shamir/advancement/vehicle_check.json @@ -8,7 +8,11 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "nbt": "{Tags:[\"gm4_vecto_active\"]}" + "minecraft:entity_tags": { + "all_of": [ + "gm4_vecto_active" + ] + } } }, { diff --git a/gm4_vecto_shamir/data/gm4_vecto_shamir/predicate/in_vehicle.json b/gm4_vecto_shamir/data/gm4_vecto_shamir/predicate/in_vehicle.json index 3fc39c0481..3636524a10 100644 --- a/gm4_vecto_shamir/data/gm4_vecto_shamir/predicate/in_vehicle.json +++ b/gm4_vecto_shamir/data/gm4_vecto_shamir/predicate/in_vehicle.json @@ -2,8 +2,12 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "vehicle": { - "nbt": "{Tags:[\"gm4_vecto_vehicle\"]}" + "minecraft:vehicle": { + "minecraft:entity_tags": { + "all_of": [ + "gm4_vecto_vehicle" + ] + } } } } diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/advancement/equipment/unequipped_armor.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/advancement/equipment/unequipped_armor.json index 8402aec498..5f37ed6ee5 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/advancement/equipment/unequipped_armor.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/advancement/equipment/unequipped_armor.json @@ -8,8 +8,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4_zauber_cauldrons:equipment/has_full_armor": true } diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/guidebook/zauber_cauldrons.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/guidebook/zauber_cauldrons.json index 6d45c85749..6a6f198937 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/guidebook/zauber_cauldrons.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/guidebook/zauber_cauldrons.json @@ -26,8 +26,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4:zauber_cauldrons_create": true } diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/player/advancement/use/multi_use_bottle.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/player/advancement/use/multi_use_bottle.json index 86bfabafbd..d2e76f2bb3 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/player/advancement/use/multi_use_bottle.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/player/advancement/use/multi_use_bottle.json @@ -2,8 +2,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4_zauber_cauldrons:use/multi_use_bottle": true } diff --git a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/player/survival_or_adventure.json b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/player/survival_or_adventure.json index bfec55b2ec..020023a2c9 100644 --- a/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/player/survival_or_adventure.json +++ b/gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/predicate/player/survival_or_adventure.json @@ -2,8 +2,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "gamemode": [ "survival", "adventure" diff --git a/gm4_zauber_liquids/data/gm4_zauber_liquids/guidebook/zauber_liquids.json b/gm4_zauber_liquids/data/gm4_zauber_liquids/guidebook/zauber_liquids.json index a14296e793..5e919ba7b0 100644 --- a/gm4_zauber_liquids/data/gm4_zauber_liquids/guidebook/zauber_liquids.json +++ b/gm4_zauber_liquids/data/gm4_zauber_liquids/guidebook/zauber_liquids.json @@ -27,8 +27,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type_specific": { - "type": "player", + "minecraft:type_specific/player": { "advancements": { "gm4:liquid_tanks_create": true } diff --git a/gm4_ziprails/data/gm4/advancement/ziprails.json b/gm4_ziprails/data/gm4/advancement/ziprails.json index d2c9c3f98d..db258baf9e 100644 --- a/gm4_ziprails/data/gm4/advancement/ziprails.json +++ b/gm4_ziprails/data/gm4/advancement/ziprails.json @@ -27,8 +27,12 @@ "entity": "this", "predicate": { "vehicle": { - "type": "minecraft:minecart", - "nbt": "{Tags:[\"gm4_linked\"]}" + "minecraft:entity_type": "minecraft:minecart", + "minecraft:entity_tags": { + "all_of": [ + "gm4_linked" + ] + } } } } diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/configured_carver/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/configured_carver/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..29d21116ad --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/configured_carver/in_biome/sulfur_caves.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:in_overworld", + "required": false + }, + "minecraft:cave", + "minecraft:cave_extra_underground", + "minecraft:canyon" + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/fluid_springs/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/fluid_springs/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..051c50a9df --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/fluid_springs/in_biome/sulfur_caves.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:fluid_springs/in_overworld", + "required": false + }, + "minecraft:spring_water", + "minecraft:spring_lava" + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/lakes/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/lakes/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..f6c1cc496a --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/lakes/in_biome/sulfur_caves.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:lakes/in_overworld", + "required": false + }, + "minecraft:lake_lava_underground", + "minecraft:lake_lava_surface", + "minecraft:rooted_sulfur_spring", + "minecraft:sulfur_pool" + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/local_modifications/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/local_modifications/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..d1325cc236 --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/local_modifications/in_biome/sulfur_caves.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:local_modifications/in_overworld", + "required": false + }, + "minecraft:amethyst_geode" + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/raw_generation/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/raw_generation/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..a79eca521a --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/raw_generation/in_biome/sulfur_caves.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:raw_generation/in_overworld", + "required": false + } + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/strongholds/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/strongholds/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..edd568eb0f --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/strongholds/in_biome/sulfur_caves.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:strongholds/in_overworld", + "required": false + } + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/surface_structures/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/surface_structures/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..36b1953568 --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/surface_structures/in_biome/sulfur_caves.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:surface_structures/in_overworld", + "required": false + } + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/top_layer_modification/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/top_layer_modification/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..2b821afa66 --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/top_layer_modification/in_biome/sulfur_caves.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:top_layer_modification/in_overworld", + "required": false + }, + "minecraft:freeze_top_layer" + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/underground_decoration/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/underground_decoration/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..21af970afd --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/underground_decoration/in_biome/sulfur_caves.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:underground_decoration/in_overworld", + "required": false + }, + "minecraft:sulfur_spike_cluster", + "minecraft:sulfur_spike" + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/underground_ores/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/underground_ores/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..6d0a840770 --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/underground_ores/in_biome/sulfur_caves.json @@ -0,0 +1,38 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:underground_ores/in_overworld", + "required": false + }, + "minecraft:ore_dirt", + "minecraft:ore_gravel", + "minecraft:ore_granite_upper", + "minecraft:ore_granite_lower", + "minecraft:ore_diorite_upper", + "minecraft:ore_diorite_lower", + "minecraft:ore_andesite_upper", + "minecraft:ore_andesite_lower", + "minecraft:ore_tuff", + "minecraft:ore_coal_upper", + "minecraft:ore_coal_lower", + "minecraft:ore_iron_upper", + "minecraft:ore_iron_middle", + "minecraft:ore_iron_small", + "minecraft:ore_gold", + "minecraft:ore_gold_lower", + "minecraft:ore_redstone", + "minecraft:ore_redstone_lower", + "minecraft:ore_diamond", + "minecraft:ore_diamond_medium", + "minecraft:ore_diamond_large", + "minecraft:ore_diamond_buried", + "minecraft:ore_lapis", + "minecraft:ore_lapis_buried", + "minecraft:ore_copper", + "minecraft:underwater_magma", + "minecraft:disk_sand", + "minecraft:disk_clay", + "minecraft:disk_gravel" + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/underground_structures/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/underground_structures/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..5004667bfa --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/underground_structures/in_biome/sulfur_caves.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:underground_structures/in_overworld", + "required": false + }, + "minecraft:monster_room", + "minecraft:monster_room_deep" + ] +} diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/vegetal_decoration/in_biome/mushroom_fields.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/vegetal_decoration/in_biome/mushroom_fields.json index 8e4ac94055..fdcc61ce4d 100644 --- a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/vegetal_decoration/in_biome/mushroom_fields.json +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/vegetal_decoration/in_biome/mushroom_fields.json @@ -9,7 +9,6 @@ "minecraft:mushroom_island_vegetation", "minecraft:brown_mushroom_taiga", "minecraft:red_mushroom_taiga", - "minecraft:patch_pumpkin", "minecraft:patch_sugar_cane", "minecraft:patch_firefly_bush_near_water" ] diff --git a/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/vegetal_decoration/in_biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/vegetal_decoration/in_biome/sulfur_caves.json new file mode 100644 index 0000000000..be90782a28 --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/tags/worldgen/placed_feature/vegetal_decoration/in_biome/sulfur_caves.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + { + "id": "#minecraft:vegetal_decoration/in_overworld", + "required": false + }, + "minecraft:glow_lichen", + "minecraft:patch_tall_grass_2" + ] +} diff --git a/pfb_biome_extensions/data/minecraft/worldgen/biome/sulfur_caves.json b/pfb_biome_extensions/data/minecraft/worldgen/biome/sulfur_caves.json new file mode 100644 index 0000000000..77d53cbe9e --- /dev/null +++ b/pfb_biome_extensions/data/minecraft/worldgen/biome/sulfur_caves.json @@ -0,0 +1,108 @@ +{ + "attributes": { + "minecraft:audio/background_music": { + "default": { + "max_delay": 24000, + "min_delay": 12000, + "sound": "minecraft:music.overworld.sulfur_caves" + } + }, + "minecraft:visual/fog_color": "#8cb831", + "minecraft:visual/sky_color": "#78a7ff", + "minecraft:visual/water_fog_color": "#17543c" + }, + "carvers": "#minecraft:in_biome/sulfur_caves", + "downfall": 0.4, + "effects": { + "grass_color": "#aba64f", + "water_color": "#34bf89" + }, + "features": [ + "#minecraft:raw_generation/in_biome/sulfur_caves", + "#minecraft:lakes/in_biome/sulfur_caves", + "#minecraft:local_modifications/in_biome/sulfur_caves", + "#minecraft:underground_structures/in_biome/sulfur_caves", + "#minecraft:surface_structures/in_biome/sulfur_caves", + "#minecraft:strongholds/in_biome/sulfur_caves", + "#minecraft:underground_ores/in_biome/sulfur_caves", + "#minecraft:underground_decoration/in_biome/sulfur_caves", + "#minecraft:fluid_springs/in_biome/sulfur_caves", + "#minecraft:vegetal_decoration/in_biome/sulfur_caves", + "#minecraft:top_layer_modification/in_biome/sulfur_caves" + ], + "has_precipitation": true, + "spawn_costs": {}, + "spawners": { + "ambient": [ + { + "type": "minecraft:bat", + "maxCount": 8, + "minCount": 8, + "weight": 10 + } + ], + "axolotls": [], + "creature": [], + "misc": [], + "monster": [ + { + "type": "minecraft:sulfur_cube", + "maxCount": 4, + "minCount": 2, + "weight": 100 + }, + { + "type": "minecraft:creeper", + "maxCount": 2, + "minCount": 2, + "weight": 50 + }, + { + "type": "minecraft:skeleton", + "maxCount": 2, + "minCount": 2, + "weight": 50 + }, + { + "type": "minecraft:slime", + "maxCount": 1, + "minCount": 1, + "weight": 25 + }, + { + "type": "minecraft:cave_spider", + "maxCount": 1, + "minCount": 1, + "weight": 20 + }, + { + "type": "minecraft:zombie", + "maxCount": 2, + "minCount": 2, + "weight": 50 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 10 + }, + { + "type": "minecraft:witch", + "maxCount": 1, + "minCount": 1, + "weight": 1 + }, + { + "type": "minecraft:zombie_villager", + "maxCount": 1, + "minCount": 1, + "weight": 5 + } + ], + "underground_water_creature": [], + "water_ambient": [], + "water_creature": [] + }, + "temperature": 0.8 +}