From cb06105892c79da0fb304f316450bea4edaeae73 Mon Sep 17 00:00:00 2001 From: Sergeant Acoustic Date: Wed, 3 Sep 2025 02:04:55 +0100 Subject: [PATCH] Update logical iframes via datapack --- modrinth.index.json | 15 ------ .../advancements/entity_hurt_player.json | 23 +++++++++ .../advancements/player_hurt_entity.json | 47 +++++++++++++++++ .../logical_iframes/advancements/root.json | 7 +++ .../advancements/slimes_hurt_player.json | 18 +++++++ .../damage/entity_hurt_player.mcfunction | 4 ++ .../damage/knockback/apply.mcfunction | 2 + .../damage/knockback/remove.mcfunction | 3 ++ .../damage/player_hurt_entity.mcfunction | 3 ++ .../armor.mcfunction | 16 ++++++ .../fix_armor_macro_1.mcfunction | 9 ++++ .../fix_armor_macro_2.mcfunction | 1 + .../functions/damage/tickdown.mcfunction | 4 ++ .../logical_iframes/functions/load.mcfunction | 2 + .../logical_iframes/functions/main.mcfunction | 1 + .../functions/slime_fix.mcfunction | 3 ++ .../logical_iframes/tags/damage_type/dot.json | 7 +++ .../tags/damage_type/melee.json | 7 +++ .../tags/entity_types/invalid_targets.json | 50 +++++++++++++++++++ .../tags/entity_types/slimes.json | 6 +++ .../always_hurts_ender_dragons.json | 5 ++ .../always_most_significant_fall.json | 5 ++ .../always_triggers_silverfish.json | 5 ++ .../damage_type/avoids_guardian_thorns.json | 8 +++ .../tags/damage_type/burns_armor_stands.json | 5 ++ .../tags/damage_type/bypasses_armor.json | 22 ++++++++ .../tags/damage_type/bypasses_cooldown.json | 10 ++++ .../tags/damage_type/bypasses_effects.json | 5 ++ .../damage_type/bypasses_enchantments.json | 5 ++ .../damage_type/bypasses_invulnerability.json | 6 +++ .../tags/damage_type/bypasses_resistance.json | 6 +++ .../tags/damage_type/bypasses_shield.json | 7 +++ .../tags/damage_type/damages_helmet.json | 7 +++ .../damage_type/ignites_armor_stands.json | 5 ++ .../tags/damage_type/is_drowning.json | 5 ++ .../tags/damage_type/is_explosion.json | 8 +++ .../minecraft/tags/damage_type/is_fall.json | 6 +++ .../minecraft/tags/damage_type/is_fire.json | 10 ++++ .../tags/damage_type/is_freezing.json | 5 ++ .../tags/damage_type/is_lightning.json | 5 ++ .../tags/damage_type/is_projectile.json | 11 ++++ .../minecraft/tags/damage_type/no_anger.json | 5 ++ .../minecraft/tags/damage_type/no_impact.json | 5 ++ .../tags/damage_type/no_knockback.json | 7 +++ .../tags/damage_type/witch_resistant_to.json | 8 +++ .../tags/damage_type/wither_immune_to.json | 6 +++ .../data/minecraft/tags/functions/load.json | 5 ++ .../data/minecraft/tags/functions/tick.json | 5 ++ .../LogicalIFrames-1-1-2/pack.mcmeta | 6 +++ 49 files changed, 411 insertions(+), 15 deletions(-) create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/entity_hurt_player.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/player_hurt_entity.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/root.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/slimes_hurt_player.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/entity_hurt_player.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/knockback/apply.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/knockback/remove.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_hurt_entity.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/armor.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/fix_armor_macro_1.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/fix_armor_macro_2.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/tickdown.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/load.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/main.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/slime_fix.mcfunction create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/damage_type/dot.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/damage_type/melee.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/entity_types/invalid_targets.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/entity_types/slimes.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_hurts_ender_dragons.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_most_significant_fall.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_triggers_silverfish.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/avoids_guardian_thorns.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/burns_armor_stands.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_armor.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_cooldown.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_effects.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_enchantments.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_invulnerability.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_resistance.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_shield.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/damages_helmet.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/ignites_armor_stands.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_drowning.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_explosion.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_fall.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_fire.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_freezing.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_lightning.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_projectile.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_anger.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_impact.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_knockback.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/witch_resistant_to.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/wither_immune_to.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/functions/load.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/functions/tick.json create mode 100644 overrides/global_packs/required_data/LogicalIFrames-1-1-2/pack.mcmeta diff --git a/modrinth.index.json b/modrinth.index.json index a1b0cc7..db0f24c 100644 --- a/modrinth.index.json +++ b/modrinth.index.json @@ -1028,21 +1028,6 @@ }, "path": "mods/kotlinforforge-4.11.0-all.jar" }, - { - "downloads": [ - "https://cdn.modrinth.com/data/6sYYcZFx/versions/ogY1TqWD/logical-iframes-1.0.1.jar" - ], - "env": { - "client": "required", - "server": "required" - }, - "fileSize": 35440, - "hashes": { - "sha1": "c6f32b2aafda3f39880022026b1b58702d1863ab", - "sha512": "7fab7f901a5414dfc428b55f4e3a90e8f66c2b81888cd2fe80a9b16d63e79711409d08594d94f48f44800f0033f04fd80168da18d606d93180dbfd0208192f64" - }, - "path": "mods/logical-iframes-1.0.1.jar" - }, { "downloads": [ "https://cdn.modrinth.com/data/NRjRiSSD/versions/3w0IxNtk/memoryleakfix-forge-1.17%2B-1.1.5.jar" diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/entity_hurt_player.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/entity_hurt_player.json new file mode 100644 index 0000000..0602b07 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/entity_hurt_player.json @@ -0,0 +1,23 @@ +{ + "parent": "logical_iframes:root", + "criteria": { + "requirement": { + "trigger": "minecraft:entity_hurt_player", + "conditions": { + "damage": { + "type": { + "tags": [ + { + "id": "logical_iframes:melee", + "expected": true + } + ] + } + } + } + } + }, + "rewards": { + "function": "logical_iframes:damage/entity_hurt_player" + } +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/player_hurt_entity.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/player_hurt_entity.json new file mode 100644 index 0000000..e9e5ac3 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/player_hurt_entity.json @@ -0,0 +1,47 @@ +{ + "parent": "logical_iframes:root", + "criteria": { + "requirement": { + "trigger": "minecraft:player_hurt_entity", + "conditions": { + "damage": { + "type": { + "tags": [ + { + "id": "logical_iframes:melee", + "expected": true + } + ] + } + }, + "entity": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "logical_iframes.timer": { + "min": 1 + } + } + } + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "type": "minecraft:player" + } + } + } + ] + } + } + }, + "rewards": { + "function": "logical_iframes:damage/player_hurt_entity" + } +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/root.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/root.json new file mode 100644 index 0000000..d896051 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/root.json @@ -0,0 +1,7 @@ +{ + "criteria": { + "root": { + "trigger": "minecraft:tick" + } + } +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/slimes_hurt_player.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/slimes_hurt_player.json new file mode 100644 index 0000000..695ba63 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/advancements/slimes_hurt_player.json @@ -0,0 +1,18 @@ +{ + "parent": "logical_iframes:root", + "criteria": { + "requirement": { + "trigger": "minecraft:entity_hurt_player", + "conditions": { + "damage": { + "source_entity": { + "type": "#logical_iframes:slimes" + } + } + } + } + }, + "rewards": { + "function": "logical_iframes:slime_fix" + } +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/entity_hurt_player.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/entity_hurt_player.mcfunction new file mode 100644 index 0000000..8149116 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/entity_hurt_player.mcfunction @@ -0,0 +1,4 @@ +advancement revoke @s only logical_iframes:entity_hurt_player + +execute unless entity @s[tag=logical_iframes.tick] run function logical_iframes:damage/knockback/apply +execute if score @s logical_iframes.timer matches 1..9 run function logical_iframes:damage/player_prevent_armor_damage/armor diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/knockback/apply.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/knockback/apply.mcfunction new file mode 100644 index 0000000..08ce1f6 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/knockback/apply.mcfunction @@ -0,0 +1,2 @@ +scoreboard players set @s logical_iframes.timer 10 +tag @s add logical_iframes.tick diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/knockback/remove.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/knockback/remove.mcfunction new file mode 100644 index 0000000..c37de4f --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/knockback/remove.mcfunction @@ -0,0 +1,3 @@ +attribute @s minecraft:generic.knockback_resistance modifier remove logical_iframes:kb_res + +tag @s remove logical_iframes.tick diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_hurt_entity.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_hurt_entity.mcfunction new file mode 100644 index 0000000..5dfa86f --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_hurt_entity.mcfunction @@ -0,0 +1,3 @@ +advancement revoke @s only logical_iframes:player_hurt_entity + +execute as @e[type=!#logical_iframes:invalid_targets,nbt={HurtTime:10s},distance=0.01..10] run function logical_iframes:damage/knockback/apply diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/armor.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/armor.mcfunction new file mode 100644 index 0000000..7a7225d --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/armor.mcfunction @@ -0,0 +1,16 @@ +data modify storage logical_iframes:temp Inventory set from entity @s Inventory + +function logical_iframes:damage/player_prevent_armor_damage/fix_armor_macro_1 {slot_num:100,slot:"feet"} +function logical_iframes:damage/player_prevent_armor_damage/fix_armor_macro_1 {slot_num:101,slot:"legs"} +function logical_iframes:damage/player_prevent_armor_damage/fix_armor_macro_1 {slot_num:102,slot:"chest"} +function logical_iframes:damage/player_prevent_armor_damage/fix_armor_macro_1 {slot_num:103,slot:"head"} + +stopsound @a[distance=..16] * minecraft:item.armor.equip_chain +stopsound @a[distance=..16] * minecraft:item.armor.equip_diamond +stopsound @a[distance=..16] * minecraft:item.armor.equip_elytra +stopsound @a[distance=..16] * minecraft:item.armor.equip_generic +stopsound @a[distance=..16] * minecraft:item.armor.equip_gold +stopsound @a[distance=..16] * minecraft:item.armor.equip_iron +stopsound @a[distance=..16] * minecraft:item.armor.equip_leather +stopsound @a[distance=..16] * minecraft:item.armor.equip_netherite +stopsound @a[distance=..16] * minecraft:item.armor.equip_turtle diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/fix_armor_macro_1.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/fix_armor_macro_1.mcfunction new file mode 100644 index 0000000..2d44d66 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/fix_armor_macro_1.mcfunction @@ -0,0 +1,9 @@ +$data modify storage logical_iframes:temp item set from storage logical_iframes:temp Inventory[{Slot:$(slot_num)b}] +execute if data storage logical_iframes:temp {item:{components:{"minecraft:unbreakable":{}}}} run return 1 + +execute store result score #damage logical_iframes.misc run data get storage logical_iframes:temp item.components."minecraft:damage" +scoreboard players remove #damage logical_iframes.misc 1 +execute store result storage logical_iframes:temp for_macro.damage int 1 run scoreboard players get #damage logical_iframes.misc + +$data modify storage logical_iframes:temp for_macro.slot set value $(slot) +function logical_iframes:damage/player_prevent_armor_damage/fix_armor_macro_2 with storage logical_iframes:temp for_macro diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/fix_armor_macro_2.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/fix_armor_macro_2.mcfunction new file mode 100644 index 0000000..7a85a91 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/player_prevent_armor_damage/fix_armor_macro_2.mcfunction @@ -0,0 +1 @@ +$item modify entity @s armor.$(slot) [{"function":"minecraft:set_components","components":{"minecraft:damage":$(damage)}}] diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/tickdown.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/tickdown.mcfunction new file mode 100644 index 0000000..633113e --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/damage/tickdown.mcfunction @@ -0,0 +1,4 @@ +execute if score @s logical_iframes.timer matches 10 run attribute @s minecraft:generic.knockback_resistance modifier add logical_iframes:kb_res 1 add_value + +scoreboard players remove @s logical_iframes.timer 1 +execute if score @s logical_iframes.timer matches 0 run function logical_iframes:damage/knockback/remove diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/load.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/load.mcfunction new file mode 100644 index 0000000..9cf5272 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/load.mcfunction @@ -0,0 +1,2 @@ +scoreboard objectives add logical_iframes.timer dummy +scoreboard objectives add logical_iframes.misc dummy diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/main.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/main.mcfunction new file mode 100644 index 0000000..9b57f8a --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/main.mcfunction @@ -0,0 +1 @@ +execute as @e[type=!#logical_iframes:invalid_targets,tag=logical_iframes.tick] run function logical_iframes:damage/tickdown diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/slime_fix.mcfunction b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/slime_fix.mcfunction new file mode 100644 index 0000000..39d1d96 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/functions/slime_fix.mcfunction @@ -0,0 +1,3 @@ +advancement revoke @s only logical_iframes:slimes_hurt_player + +execute on attacker run effect give @s weakness 1 255 true diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/damage_type/dot.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/damage_type/dot.json new file mode 100644 index 0000000..736e6e8 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/damage_type/dot.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:magic", + "minecraft:wither"//, +// "minecraft:on_fire" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/damage_type/melee.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/damage_type/melee.json new file mode 100644 index 0000000..812274d --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/damage_type/melee.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:mob_attack", + "minecraft:mob_attack_no_aggro", + "minecraft:player_attack" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/entity_types/invalid_targets.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/entity_types/invalid_targets.json new file mode 100644 index 0000000..ea4d715 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/entity_types/invalid_targets.json @@ -0,0 +1,50 @@ +{ + "values": [ + "minecraft:area_effect_cloud", + "minecraft:armor_stand", + "minecraft:arrow", + "minecraft:block_display", + "minecraft:boat", + "minecraft:breeze_wind_charge", + "minecraft:chest_boat", + "minecraft:chest_minecart", + "minecraft:command_block_minecart", + "minecraft:dragon_fireball", + "minecraft:egg", + "minecraft:end_crystal", + "minecraft:ender_pearl", + "minecraft:evoker_fangs", + "minecraft:experience_bottle", + "minecraft:experience_orb", + "minecraft:eye_of_ender", + "minecraft:falling_block", + "minecraft:fireball", + "minecraft:firework_rocket", + "minecraft:fishing_bobber", + "minecraft:furnace_minecart", + "minecraft:glow_item_frame", + "minecraft:hopper_minecart", + "minecraft:interaction", + "minecraft:item", + "minecraft:item_display", + "minecraft:item_frame", + "minecraft:leash_knot", + "minecraft:lightning_bolt", + "minecraft:llama_spit", + "minecraft:marker", + "minecraft:ominous_item_spawner", + "minecraft:painting", + "minecraft:potion", + "minecraft:shulker_bullet", + "minecraft:small_fireball", + "minecraft:snowball", + "minecraft:spawner_minecart", + "minecraft:spectral_arrow", + "minecraft:text_display", + "minecraft:tnt", + "minecraft:tnt_minecart", + "minecraft:trident", + "minecraft:wind_charge", + "minecraft:wither_skull" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/entity_types/slimes.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/entity_types/slimes.json new file mode 100644 index 0000000..10b7a56 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/logical_iframes/tags/entity_types/slimes.json @@ -0,0 +1,6 @@ +{ + "values": [ + "slime", + "magma_cube" + ] +} \ No newline at end of file diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_hurts_ender_dragons.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_hurts_ender_dragons.json new file mode 100644 index 0000000..0d5d36c --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_hurts_ender_dragons.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_explosion" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_most_significant_fall.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_most_significant_fall.json new file mode 100644 index 0000000..1a415ce --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_most_significant_fall.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:out_of_world" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_triggers_silverfish.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_triggers_silverfish.json new file mode 100644 index 0000000..f4d8c78 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/always_triggers_silverfish.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:magic" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/avoids_guardian_thorns.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/avoids_guardian_thorns.json new file mode 100644 index 0000000..e64fbad --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/avoids_guardian_thorns.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:magic", + "minecraft:thorns", + "#minecraft:is_projectile", + "#minecraft:is_explosion" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/burns_armor_stands.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/burns_armor_stands.json new file mode 100644 index 0000000..7fae89d --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/burns_armor_stands.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:on_fire" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_armor.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_armor.json new file mode 100644 index 0000000..3f881d8 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_armor.json @@ -0,0 +1,22 @@ +{ + "values": [ + "minecraft:on_fire", + "minecraft:in_wall", + "minecraft:cramming", + "minecraft:drown", + "minecraft:fly_into_wall", + "minecraft:generic", + "minecraft:wither", + "minecraft:dragon_breath", + "minecraft:starve", + "minecraft:fall", + "minecraft:freeze", + "minecraft:stalagmite", + "minecraft:magic", + "minecraft:indirect_magic", + "minecraft:out_of_world", + "minecraft:generic_kill", + "minecraft:sonic_boom", + "minecraft:outside_border" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_cooldown.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_cooldown.json new file mode 100644 index 0000000..2bf0df1 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_cooldown.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:sonic_boom", + "#minecraft:is_projectile", + "#logical_iframes:melee", + "#logical_iframes:dot", + "#minecraft:is_explosion", + "minecraft:fall" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_effects.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_effects.json new file mode 100644 index 0000000..3b3c8af --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_effects.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:starve" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_enchantments.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_enchantments.json new file mode 100644 index 0000000..2f6a204 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_enchantments.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:sonic_boom" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_invulnerability.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_invulnerability.json new file mode 100644 index 0000000..7f62652 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_invulnerability.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:out_of_world", + "minecraft:generic_kill" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_resistance.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_resistance.json new file mode 100644 index 0000000..7f62652 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_resistance.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:out_of_world", + "minecraft:generic_kill" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_shield.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_shield.json new file mode 100644 index 0000000..34dcd94 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/bypasses_shield.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#minecraft:bypasses_armor", + "minecraft:falling_anvil", + "minecraft:falling_stalactite" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/damages_helmet.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/damages_helmet.json new file mode 100644 index 0000000..35fb5c8 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/damages_helmet.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:falling_anvil", + "minecraft:falling_block", + "minecraft:falling_stalactite" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/ignites_armor_stands.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/ignites_armor_stands.json new file mode 100644 index 0000000..77069b8 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/ignites_armor_stands.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:in_fire" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_drowning.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_drowning.json new file mode 100644 index 0000000..b0fd762 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_drowning.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:drown" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_explosion.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_explosion.json new file mode 100644 index 0000000..8c41119 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_explosion.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:fireworks", + "minecraft:explosion", + "minecraft:player_explosion", + "minecraft:bad_respawn_point" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_fall.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_fall.json new file mode 100644 index 0000000..1c658fb --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_fall.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:fall", + "minecraft:stalagmite" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_fire.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_fire.json new file mode 100644 index 0000000..f9673a1 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_fire.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:in_fire", + "minecraft:on_fire", + "minecraft:lava", + "minecraft:hot_floor", + "minecraft:unattributed_fireball", + "minecraft:fireball" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_freezing.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_freezing.json new file mode 100644 index 0000000..c66aff9 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_freezing.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:freeze" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_lightning.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_lightning.json new file mode 100644 index 0000000..f78d4c0 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_lightning.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lightning_bolt" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_projectile.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_projectile.json new file mode 100644 index 0000000..42ebd65 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/is_projectile.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:arrow", + "minecraft:trident", + "minecraft:mob_projectile", + "minecraft:unattributed_fireball", + "minecraft:fireball", + "minecraft:wither_skull", + "minecraft:thrown" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_anger.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_anger.json new file mode 100644 index 0000000..f07f5a8 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_anger.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:mob_attack_no_aggro" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_impact.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_impact.json new file mode 100644 index 0000000..b0fd762 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_impact.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:drown" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_knockback.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_knockback.json new file mode 100644 index 0000000..32a49ad --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/no_knockback.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:explosion", + "minecraft:player_explosion", + "minecraft:bad_respawn_point" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/witch_resistant_to.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/witch_resistant_to.json new file mode 100644 index 0000000..119e6f2 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/witch_resistant_to.json @@ -0,0 +1,8 @@ +{ + "replace": true, + "values": [ + "minecraft:magic", + "minecraft:indirect_magic", + "minecraft:thorns" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/wither_immune_to.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/wither_immune_to.json new file mode 100644 index 0000000..5479d0c --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/damage_type/wither_immune_to.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:drown", + "minecraft:in_wall" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/functions/load.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/functions/load.json new file mode 100644 index 0000000..386bc5b --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/functions/load.json @@ -0,0 +1,5 @@ +{ + "values": [ + "logical_iframes:load" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/functions/tick.json b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/functions/tick.json new file mode 100644 index 0000000..6a6b584 --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/data/minecraft/tags/functions/tick.json @@ -0,0 +1,5 @@ +{ + "values": [ + "logical_iframes:main" + ] +} diff --git a/overrides/global_packs/required_data/LogicalIFrames-1-1-2/pack.mcmeta b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/pack.mcmeta new file mode 100644 index 0000000..f962c6c --- /dev/null +++ b/overrides/global_packs/required_data/LogicalIFrames-1-1-2/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 15, + "description": "Reinventing the entire I-frames mechanic" + } +}