Skip to content

[1.21.1] 伤害类型修正 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dr-WeiAL wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

[1.21.1] 伤害类型修正 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/generated/resources/.cache/a7525c52c5569dcceff143f7b0958748679e5163
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2026-01-31T21:50:06.601136 Registrate Provider for l2damagetracker [Registries, Data Maps, Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), generic_server_provider, Blockstates, Item models, Lang (en_us/en_ud), generic_client_provider, Tags (mob_effect), Tags (attribute), Tags (enchantment), Tags (damage_type)]
// 1.21.1 2026-02-02T17:25:42.5004709 Registrate Provider for l2damagetracker [Registries, Data Maps, Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), generic_server_provider, Blockstates, Item models, Lang (en_us/en_ud), generic_client_provider, Tags (mob_effect), Tags (attribute), Tags (enchantment), Tags (damage_type)]
74a65c0670c8214726d4a79d7a83f89b6ce9a45c assets/l2damagetracker/lang/en_ud.json
5633c82ef9e0c686b095781f20536cfe3a782c1c assets/l2damagetracker/lang/en_us.json
25d924fdac4392adb88fe3b6aa2c23420f6fb4f9 data/l2damagetracker/damage_type/mob_attack-bypass_armor-bypass_cooldown-bypass_magic.json
Expand All @@ -24,4 +24,4 @@ feb2719d63ef038cdb576d9f16f82539dd9449d9 data/minecraft/tags/damage_type/bypasse
cbfaa8efe26d5fe4a1ad3094a54c46bcac8c5bc9 data/minecraft/tags/damage_type/bypasses_effects.json
cbfaa8efe26d5fe4a1ad3094a54c46bcac8c5bc9 data/minecraft/tags/damage_type/bypasses_enchantments.json
cbfaa8efe26d5fe4a1ad3094a54c46bcac8c5bc9 data/minecraft/tags/damage_type/bypasses_resistance.json
8884048cc55c9025708ebd59402e556fcd4aa4bc data/neoforge/tags/damage_type/is_magic.json
5790d0ea393aa2ddb7823afa788647c2757f86b4 data/neoforge/tags/damage_type/is_magic.json
2 changes: 1 addition & 1 deletion src/generated/resources/data/neoforge/tags/damage_type/is_magic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"required": false
},
{
"id": "#alshanex_familiars:sound_magic",
"id": "#familiarslib:sound_magic",
"required": false
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/xkmc/l2damagetracker/init/data/L2DamageTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ protected void addDamageTypeTags(RegistrateTagsProvider.Impl<DamageType> pvd) {
.addOptional(ResourceLocation.fromNamespaceAndPath("aero_additions", "wind_magic"))
.addOptional(ResourceLocation.fromNamespaceAndPath("fantasy_ending", "ds_power"))
.addOptional(ResourceLocation.fromNamespaceAndPath("fantasy_ending", "fe_power"))
.addOptionalTag(ResourceLocation.fromNamespaceAndPath("alshanex_familiars", "sound_magic"))
.addOptionalTag(ResourceLocation.fromNamespaceAndPath("familiarslib", "sound_magic"))
.addOptionalTag(ResourceLocation.fromNamespaceAndPath("iss_magicfromtheeast", "dune_magic"))
.addOptionalTag(ResourceLocation.fromNamespaceAndPath("iss_magicfromtheeast", "is_soul"))
.addOptionalTag(ResourceLocation.fromNamespaceAndPath("iss_magicfromtheeast", "spirit_magic"))
Expand Down