make magic entities immune to fire (fixes #40)

CammiesCorner · Dec 30, 2024 · 5b6d771 · 5b6d771
1 parent d16b092
commit 5b6d771
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/BeamEntity.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/BeamEntity.java
@@ -94,11 +94,6 @@ public boolean displayFireAnimation() {
 		return false;
 	}
 
-	@Override
-	public boolean fireImmune() {
-		return true;
-	}
-
 	@Override
 	protected void readAdditionalSaveData(CompoundTag tag) {
 		effects.clear();

diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/ManaShieldEntity.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/ManaShieldEntity.java
@@ -78,11 +78,6 @@ public boolean displayFireAnimation() {
 		return false;
 	}
 
-	@Override
-	public boolean fireImmune() {
-		return true;
-	}
-
 	@Override
 	protected void readAdditionalSaveData(CompoundTag tag) {
 		entityData.set(MAX_AGE, tag.getInt("MaxAge"));

diff --git a/...dev/cammiescorner/arcanuscontinuum/common/entities/magic/PocketDimensionPortalEntity.java b/...dev/cammiescorner/arcanuscontinuum/common/entities/magic/PocketDimensionPortalEntity.java
@@ -97,6 +97,11 @@ public boolean isPickable() {
 		return true;
 	}
 
+	@Override
+	public boolean displayFireAnimation() {
+		return false;
+	}
+
 	@Override
 	protected void readAdditionalSaveData(CompoundTag tag) {
 		casterId = tag.getUUID("CasterId");

diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/registry/ArcanusEntities.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/common/registry/ArcanusEntities.java
@@ -18,13 +18,13 @@ public class ArcanusEntities {
 	public static final RegistrySupplier<EntityType<WizardEntity>> WIZARD = ENTITY_TYPES.register("wizard", () -> FabricEntityTypeBuilder.createMob().entityFactory(WizardEntity::new).defaultAttributes(WizardEntity::createMobAttributes).dimensions(EntityDimensions.scalable(0.7F, 1.8F)).build());
 	public static final RegistrySupplier<EntityType<OpossumEntity>> OPOSSUM = ENTITY_TYPES.register("opossum", () -> FabricEntityTypeBuilder.createMob().entityFactory(OpossumEntity::new).defaultAttributes(OpossumEntity::createMobAttributes).dimensions(EntityDimensions.scalable(0.6F, 0.7F)).build());
 	public static final RegistrySupplier<EntityType<NecroSkeletonEntity>> NECRO_SKELETON = ENTITY_TYPES.register("necro_skeleton", () -> FabricEntityTypeBuilder.createMob().entityFactory(NecroSkeletonEntity::new).disableSummon().defaultAttributes(NecroSkeletonEntity::createAttributes).dimensions(EntityDimensions.scalable(0.6F, 1.8F)).build());
-	public static final RegistrySupplier<EntityType<ManaShieldEntity>> MANA_SHIELD = ENTITY_TYPES.register("mana_shield", () -> FabricEntityTypeBuilder.create().entityFactory(ManaShieldEntity::new).disableSummon().dimensions(EntityDimensions.fixed(4F, 4F)).build());
-	public static final RegistrySupplier<EntityType<MagicProjectileEntity>> MAGIC_PROJECTILE = ENTITY_TYPES.register("magic_projectile", () -> FabricEntityTypeBuilder.create().entityFactory(MagicProjectileEntity::new).disableSummon().dimensions(EntityDimensions.fixed(0.6F, 0.6F)).build());
-	public static final RegistrySupplier<EntityType<SmiteEntity>> SMITE = ENTITY_TYPES.register("smite", () -> FabricEntityTypeBuilder.create().entityFactory(SmiteEntity::new).disableSummon().dimensions(EntityDimensions.fixed(4F, 4F)).build());
-	public static final RegistrySupplier<EntityType<MagicRuneEntity>> MAGIC_RUNE = ENTITY_TYPES.register("magic_rune", () -> FabricEntityTypeBuilder.create().entityFactory(MagicRuneEntity::new).disableSummon().dimensions(EntityDimensions.fixed(1F, 0.125F)).build());
-	public static final RegistrySupplier<EntityType<AreaOfEffectEntity>> AOE = ENTITY_TYPES.register("area_of_effect", () -> FabricEntityTypeBuilder.create().entityFactory(AreaOfEffectEntity::new).disableSummon().dimensions(EntityDimensions.fixed(4F, 2.5F)).build());
-	public static final RegistrySupplier<EntityType<BeamEntity>> BEAM = ENTITY_TYPES.register("beam", () -> FabricEntityTypeBuilder.create().entityFactory(BeamEntity::new).disableSummon().dimensions(EntityDimensions.fixed(0.1F, 0.1F)).build());
-	public static final RegistrySupplier<EntityType<GuardianOrbEntity>> GUARDIAN_ORB = ENTITY_TYPES.register("guardian_orb", () -> FabricEntityTypeBuilder.create().entityFactory(GuardianOrbEntity::new).trackedUpdateRate(60).disableSummon().dimensions(EntityDimensions.fixed(0.4F, 0.4F)).build());
-	public static final RegistrySupplier<EntityType<AggressorbEntity>> AGGRESSORB = ENTITY_TYPES.register("aggressorb", () -> FabricEntityTypeBuilder.create().entityFactory(AggressorbEntity::new).trackedUpdateRate(60).disableSummon().dimensions(EntityDimensions.fixed(0.4F, 0.4F)).build());
-	public static final RegistrySupplier<EntityType<PocketDimensionPortalEntity>> PORTAL = ENTITY_TYPES.register("pocket_dimension_portal", () -> FabricEntityTypeBuilder.create().entityFactory(PocketDimensionPortalEntity::new).disableSummon().dimensions(EntityDimensions.fixed(1.5f, 0.1f)).build());
+	public static final RegistrySupplier<EntityType<ManaShieldEntity>> MANA_SHIELD = ENTITY_TYPES.register("mana_shield", () -> FabricEntityTypeBuilder.create().entityFactory(ManaShieldEntity::new).fireImmune().disableSummon().dimensions(EntityDimensions.fixed(4F, 4F)).build());
+	public static final RegistrySupplier<EntityType<MagicProjectileEntity>> MAGIC_PROJECTILE = ENTITY_TYPES.register("magic_projectile", () -> FabricEntityTypeBuilder.create().entityFactory(MagicProjectileEntity::new).fireImmune().disableSummon().dimensions(EntityDimensions.fixed(0.6F, 0.6F)).build());
+	public static final RegistrySupplier<EntityType<SmiteEntity>> SMITE = ENTITY_TYPES.register("smite", () -> FabricEntityTypeBuilder.create().entityFactory(SmiteEntity::new).fireImmune().disableSummon().dimensions(EntityDimensions.fixed(4F, 4F)).build());
+	public static final RegistrySupplier<EntityType<MagicRuneEntity>> MAGIC_RUNE = ENTITY_TYPES.register("magic_rune", () -> FabricEntityTypeBuilder.create().entityFactory(MagicRuneEntity::new).fireImmune().disableSummon().dimensions(EntityDimensions.fixed(1F, 0.125F)).build());
+	public static final RegistrySupplier<EntityType<AreaOfEffectEntity>> AOE = ENTITY_TYPES.register("area_of_effect", () -> FabricEntityTypeBuilder.create().entityFactory(AreaOfEffectEntity::new).fireImmune().disableSummon().dimensions(EntityDimensions.fixed(4F, 2.5F)).build());
+	public static final RegistrySupplier<EntityType<BeamEntity>> BEAM = ENTITY_TYPES.register("beam", () -> FabricEntityTypeBuilder.create().entityFactory(BeamEntity::new).fireImmune().disableSummon().dimensions(EntityDimensions.fixed(0.1F, 0.1F)).build());
+	public static final RegistrySupplier<EntityType<GuardianOrbEntity>> GUARDIAN_ORB = ENTITY_TYPES.register("guardian_orb", () -> FabricEntityTypeBuilder.create().entityFactory(GuardianOrbEntity::new).trackedUpdateRate(60).fireImmune().disableSummon().dimensions(EntityDimensions.fixed(0.4F, 0.4F)).build());
+	public static final RegistrySupplier<EntityType<AggressorbEntity>> AGGRESSORB = ENTITY_TYPES.register("aggressorb", () -> FabricEntityTypeBuilder.create().entityFactory(AggressorbEntity::new).trackedUpdateRate(60).fireImmune().disableSummon().dimensions(EntityDimensions.fixed(0.4F, 0.4F)).build());
+	public static final RegistrySupplier<EntityType<PocketDimensionPortalEntity>> PORTAL = ENTITY_TYPES.register("pocket_dimension_portal", () -> FabricEntityTypeBuilder.create().entityFactory(PocketDimensionPortalEntity::new).fireImmune().disableSummon().dimensions(EntityDimensions.fixed(1.5f, 0.1f)).build());
 }