Merge branch '1.19.3' into 1.19.2
This commit is contained in:
commit
d06f3b5856
@ -3,16 +3,16 @@ package ru.dbotthepony.mc.otm.registry
|
|||||||
import net.minecraft.world.damagesource.DamageSource
|
import net.minecraft.world.damagesource.DamageSource
|
||||||
|
|
||||||
object MDamageTypes {
|
object MDamageTypes {
|
||||||
val BECOME_ANDROID = ImmutableDamageSource(DamageSource("become_android").bypassArmor().bypassInvul().bypassMagic().bypassEnchantments())
|
val BECOME_ANDROID = ImmutableDamageSource(DamageSource("otm_become_android").bypassArmor().bypassInvul().bypassMagic().bypassEnchantments())
|
||||||
val BECOME_HUMANE = ImmutableDamageSource(DamageSource("become_humane").bypassArmor().bypassInvul().bypassMagic().bypassEnchantments())
|
val BECOME_HUMANE = ImmutableDamageSource(DamageSource("otm_become_humane").bypassArmor().bypassInvul().bypassMagic().bypassEnchantments())
|
||||||
val EVENT_HORIZON = ImmutableDamageSource(DamageSource("event_horizon").bypassArmor())
|
val EVENT_HORIZON = ImmutableDamageSource(DamageSource("otm_event_horizon").bypassArmor())
|
||||||
val HAWKING_RADIATION = ImmutableDamageSource(DamageSource("hawking_radiation").bypassArmor())
|
val HAWKING_RADIATION = ImmutableDamageSource(DamageSource("otm_hawking_radiation").bypassArmor())
|
||||||
val EXOPACK_PROBE = ImmutableDamageSource(DamageSource("exopack_probe").bypassArmor().bypassMagic().bypassEnchantments())
|
val EXOPACK_PROBE = ImmutableDamageSource(DamageSource("otm_exopack_probe").bypassArmor().bypassMagic().bypassEnchantments())
|
||||||
val EMP = ImmutableDamageSource(DamageSource("emp").bypassArmor())
|
val EMP = ImmutableDamageSource(DamageSource("otm_emp").bypassArmor())
|
||||||
val SHOCKWAVE = ImmutableDamageSource(DamageSource("shockwave").bypassArmor())
|
val SHOCKWAVE = ImmutableDamageSource(DamageSource("otm_shockwave").bypassArmor())
|
||||||
val PLASMA = ImmutableDamageSource(DamageSource("plasma"))
|
val PLASMA = ImmutableDamageSource(DamageSource("otm_plasma"))
|
||||||
val COSMIC_RAYS = ImmutableDamageSource(DamageSource("cosmic_rays").bypassArmor().bypassMagic().bypassEnchantments())
|
val COSMIC_RAYS = ImmutableDamageSource(DamageSource("otm_cosmic_rays").bypassArmor().bypassMagic().bypassEnchantments())
|
||||||
val EXPLOSIVE_HAMMER = ImmutableDamageSource(DamageSource("explosive_hammer"))
|
val EXPLOSIVE_HAMMER = ImmutableDamageSource(DamageSource("otm_explosive_hammer"))
|
||||||
val HAMMER_NAIL = ImmutableDamageSource(DamageSource("hammer_nail"))
|
val HAMMER_NAIL = ImmutableDamageSource(DamageSource("otm_hammer_nail"))
|
||||||
val ANDROID_DISCHARGE = ImmutableDamageSource(DamageSource("android_discharge").bypassArmor().bypassInvul().bypassMagic().bypassEnchantments())
|
val ANDROID_DISCHARGE = ImmutableDamageSource(DamageSource("otm_android_discharge").bypassArmor().bypassInvul().bypassMagic().bypassEnchantments())
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user