Merge remote-tracking branch 'origin/1.19-deeper-down' into 1.19-deeper-down

Author: DaFuqs

src/main/java/de/dafuqs/spectrum/cca/OnPrimordialFireComponent.java

@@ -24,6 +24,11 @@ public class OnPrimordialFireComponent implements Component, AutoSyncedComponent
 
 	public static final float DAMAGE_ON_TICK = 1.0F;
 
+	// Delay added to the primordial fire ticking per level of fire resistance on provider
+	public static final int FIRE_RESISTANCE_TICK_DELAY = 5;
+	// Delay added to the primordial fire ticking for the highest level of Fire Protection on provider
+	public static final float FIRE_PROTECTION_TICK_DELAY = 1.0F;
+
 	public static final ComponentKey<OnPrimordialFireComponent> ON_PRIMORDIAL_FIRE_COMPONENT = ComponentRegistry.getOrCreate(SpectrumCommon.locate("on_primordial_fire"), OnPrimordialFireComponent.class);
 
 	private LivingEntity provider;
@@ -104,10 +109,10 @@ public void serverTick() {
 	 * Primordial fire's DPS ranges from 4 to 1.
 	 */
 	public int getDamageTickFrequency(LivingEntity entity) {
-		float fireProt = EnchantmentHelper.getEquipmentLevel(Enchantments.FIRE_PROTECTION, provider) / 2F;
-		int fireRes = Optional.ofNullable(provider.getStatusEffect(StatusEffects.FIRE_RESISTANCE)).map(StatusEffectInstance::getAmplifier).orElse(0);
+		float fireProt = FIRE_PROTECTION_TICK_DELAY * (EnchantmentHelper.getEquipmentLevel(Enchantments.FIRE_PROTECTION, provider) / 2F);
+		int fireRes = FIRE_RESISTANCE_TICK_DELAY + Optional.ofNullable(provider.getStatusEffect(StatusEffects.FIRE_RESISTANCE)).map(StatusEffectInstance::getAmplifier).orElse(-FIRE_RESISTANCE_TICK_DELAY);
 		int duration = Math.min(Math.round(5 + fireRes + fireProt), 20);
-		return entity.isFireImmune() ? duration / 2 : duration;
+		return entity.isFireImmune() ? duration : duration / 2;
 	}
 
 	@Override

src/main/java/de/dafuqs/spectrum/registries/SpectrumDamageSources.java

@@ -68,7 +68,7 @@ public SetHealthDamageSource(String name, LivingEntity attacker) {
 		}
 	}
 
-	public static class PrimordialFireDamageSource extends DamageSource implements DirectDamage {
+	public static class PrimordialFireDamageSource extends DamageSource {
 
 		public PrimordialFireDamageSource(String name) {
 			super(name);