调整伤害的注册名

src/main/java/net/mcreator/superbwarfare/init/ModDamageTypes.java

@@ -17,21 +17,19 @@ import javax.annotation.Nullable;
 @SuppressWarnings("OptionalGetWithoutIsPresent")
 public class ModDamageTypes {
     public static final ResourceKey<DamageType> GUN_FIRE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire"));
-    public static final ResourceKey<DamageType> GUN_FIRE_BYPASS = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_bypass"));
+    public static final ResourceKey<DamageType> GUN_FIRE_ABSOLUTE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_absolute"));
+    public static final ResourceKey<DamageType> GUN_FIRE_HEADSHOT = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_headshot"));
+    public static final ResourceKey<DamageType> GUN_FIRE_HEADSHOT_ABSOLUTE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_headshot_absolute"));
     public static final ResourceKey<DamageType> ARROW_IN_KNEE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_knee"));
+    public static final ResourceKey<DamageType> ARROW_IN_KNEE_ABSOLUTE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_knee_absolute"));
     public static final ResourceKey<DamageType> ARROW_IN_BRAIN = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_brain"));
+    public static final ResourceKey<DamageType> ARROW_IN_BRAIN_ABSOLUTE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_brain_absolute"));
     public static final ResourceKey<DamageType> MINE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "mine"));
     public static final ResourceKey<DamageType> BEAST = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "beast"));
     public static final ResourceKey<DamageType> SHOCK = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "shock"));
     public static final ResourceKey<DamageType> PROJECTILE_BOOM = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "projectile_boom"));
     public static final ResourceKey<DamageType> CANNON_FIRE = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "cannon_fire"));
 
-
-    public static final ResourceKey<DamageType> GUN_FIRE_HEADSHOT = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_headshot"));
-    public static final ResourceKey<DamageType> GUN_FIRE_HEADSHOT_BYPASS = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "gunfire_headshot_bypass"));
-    public static final ResourceKey<DamageType> ARROW_IN_KNEE_BYPASS = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_knee_bypass"));
-    public static final ResourceKey<DamageType> ARROW_IN_BRAIN_BYPASS = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ModUtils.MODID, "arrow_in_brain_bypass"));
-
     public static DamageSource causeGunFireDamage(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) {
         return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(GUN_FIRE), directEntity, attacker);
     }
@@ -64,20 +62,20 @@ public class ModDamageTypes {
         return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(CANNON_FIRE), directEntity, attacker);
     }
 
-    public static DamageSource causeGunFireDamageBypass(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) {
+    public static DamageSource causeGunFireAbsoluteDamage(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) {
-        return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(GUN_FIRE_BYPASS), directEntity, attacker);
+        return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(GUN_FIRE_ABSOLUTE), directEntity, attacker);
     }
 
-    public static DamageSource causeGunFireHeadshotDamageBypass(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) {
+    public static DamageSource causeGunFireHeadshotAbsoluteDamage(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) {
-        return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(GUN_FIRE_HEADSHOT_BYPASS), directEntity, attacker);
+        return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(GUN_FIRE_HEADSHOT_ABSOLUTE), directEntity, attacker);
     }
 
-    public static DamageSource causeArrowInKneeDamageBypass(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) {
+    public static DamageSource causeArrowInKneeAbsoluteDamage(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) {
-        return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(ARROW_IN_KNEE_BYPASS), directEntity, attacker);
+        return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(ARROW_IN_KNEE_ABSOLUTE), directEntity, attacker);
     }
 
-    public static DamageSource causeArrowInBrainDamageBypass(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) {
+    public static DamageSource causeArrowInBrainAbsoluteDamage(RegistryAccess registryAccess, @Nullable Entity directEntity, @Nullable Entity attacker) {
-        return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(ARROW_IN_BRAIN_BYPASS), directEntity, attacker);
+        return new DamageMessages(registryAccess.registry(Registries.DAMAGE_TYPE).get().getHolderOrThrow(ARROW_IN_BRAIN_ABSOLUTE), directEntity, attacker);
     }
 
     private static class DamageMessages extends DamageSource {

src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json

@@ -1,10 +1,10 @@
 {
   "replace": false,
   "values": [
-    "superbwarfare:gunfire_bypass",
+    "superbwarfare:gunfire_absolute",
-    "superbwarfare:gunfire_headshot_bypass",
+    "superbwarfare:gunfire_headshot_absolute",
-    "superbwarfare:arrow_in_knee_bypass",
+    "superbwarfare:arrow_in_knee_absolute",
-    "superbwarfare:arrow_in_brain_bypass",
+    "superbwarfare:arrow_in_brain_absolute",
     "superbwarfare:shock",
     "superbwarfare:cannon_fire"
   ]

src/main/resources/data/minecraft/tags/damage_type/bypasses_effects.json

@@ -1,10 +1,10 @@
 {
   "replace": false,
   "values": [
-    "superbwarfare:gunfire_bypass",
+    "superbwarfare:gunfire_absolute",
-    "superbwarfare:gunfire_headshot_bypass",
+    "superbwarfare:gunfire_headshot_absolute",
-    "superbwarfare:arrow_in_knee_bypass",
+    "superbwarfare:arrow_in_knee_absolute",
-    "superbwarfare:arrow_in_brain_bypass",
+    "superbwarfare:arrow_in_brain_absolute",
     "superbwarfare:shock"
   ]
 }

src/main/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json

@@ -1,10 +1,10 @@
 {
   "replace": false,
   "values": [
-    "superbwarfare:gunfire_bypass",
+    "superbwarfare:gunfire_absolute",
-    "superbwarfare:gunfire_headshot_bypass",
+    "superbwarfare:gunfire_headshot_absolute",
-    "superbwarfare:arrow_in_knee_bypass",
+    "superbwarfare:arrow_in_knee_absolute",
-    "superbwarfare:arrow_in_brain_bypass",
+    "superbwarfare:arrow_in_brain_absolute",
     "superbwarfare:shock",
     "superbwarfare:cannon_fire"
   ]

src/main/resources/data/minecraft/tags/damage_type/bypasses_resistance.json

@@ -1,10 +1,10 @@
 {
   "replace": false,
   "values": [
-    "superbwarfare:gunfire_bypass",
+    "superbwarfare:gunfire_absolute",
-    "superbwarfare:gunfire_headshot_bypass",
+    "superbwarfare:gunfire_headshot_absolute",
-    "superbwarfare:arrow_in_knee_bypass",
+    "superbwarfare:arrow_in_knee_absolute",
-    "superbwarfare:arrow_in_brain_bypass",
+    "superbwarfare:arrow_in_brain_absolute",
     "superbwarfare:shock",
     "superbwarfare:cannon_fire"
   ]