From 8688164874a75524f25ee300d145c7e8705dc7a0 Mon Sep 17 00:00:00 2001 From: Under97 <66751151+Underplayer97@users.noreply.github.com> Date: Sat, 23 Nov 2024 23:01:59 -0500 Subject: [PATCH] The End... --- gradle.properties | 2 +- .../ResonantEnemies/entity/ModEntities.java | 4 ++-- .../ResonantEnemies/entity/boss/AmalgamateEntity.java | 4 ++-- .../ResonantEnemies/entity/boss/ErebusEntity.java | 10 +++++----- .../ResonantEnemies/entity/boss/GrimsleyEntity.java | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index c3ecdd4..4ebfc6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.14.6 # Mod Properties - mod_version = 1.4.0-DEV + mod_version = 1.4.1 maven_group = net.underplayer97 archives_base_name = ResonantEnemies diff --git a/src/main/java/net/underplayer97/ResonantEnemies/entity/ModEntities.java b/src/main/java/net/underplayer97/ResonantEnemies/entity/ModEntities.java index b61849f..27bb17b 100644 --- a/src/main/java/net/underplayer97/ResonantEnemies/entity/ModEntities.java +++ b/src/main/java/net/underplayer97/ResonantEnemies/entity/ModEntities.java @@ -28,12 +28,12 @@ Registry.ENTITY_TYPE, new Identifier(ResonantMain.MOD_ID, "shambler"), public static final EntityType EREBUS = Registry.register( Registry.ENTITY_TYPE, new Identifier(ResonantMain.MOD_ID, "erebus"), FabricEntityTypeBuilder.create(SpawnGroup.CREATURE, ErebusEntity::new) - .dimensions(EntityDimensions.fixed(2.0f,6.0f)).build()); + .dimensions(EntityDimensions.fixed(1.5f,6.0f)).build()); public static final EntityType GRIMSLEY = Registry.register( Registry.ENTITY_TYPE, new Identifier(ResonantMain.MOD_ID, "grimsley"), FabricEntityTypeBuilder.create(SpawnGroup.CREATURE, GrimsleyEntity::new) - .dimensions(EntityDimensions.fixed(3.0f,6.0f)).build()); + .dimensions(EntityDimensions.fixed(1.5f,5.0f)).build()); public static final EntityType AMALGAMATE = Registry.register( Registry.ENTITY_TYPE, new Identifier(ResonantMain.MOD_ID, "amalgamate"), diff --git a/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/AmalgamateEntity.java b/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/AmalgamateEntity.java index 47c40c1..e2f87c3 100644 --- a/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/AmalgamateEntity.java +++ b/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/AmalgamateEntity.java @@ -49,7 +49,7 @@ public class AmalgamateEntity extends AbstractBossEntity implements IAnimatable public AmalgamateEntity(EntityType entityType, World world) { super(entityType, world); - primaryAttackDuration = 10; + primaryAttackDuration = 5; } @@ -65,7 +65,7 @@ public static DefaultAttributeContainer.Builder setAttributes() { return HostileEntity.createHostileAttributes() .add(EntityAttributes.GENERIC_MAX_HEALTH, 400.0f) .add(EntityAttributes.GENERIC_ARMOR, 15.0f) - .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 15.0f) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 20.0f) .add(EntityAttributes.GENERIC_ATTACK_SPEED, 2.0f) .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 50.0f) .add(EntityAttributes.GENERIC_ATTACK_KNOCKBACK, 4.0f) diff --git a/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/ErebusEntity.java b/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/ErebusEntity.java index 1a0022a..554d5d4 100644 --- a/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/ErebusEntity.java +++ b/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/ErebusEntity.java @@ -68,7 +68,7 @@ public ErebusEntity(EntityType entityType, World world) super(entityType, world); this.setHealth(this.getMaxHealth()); - primaryAttackDuration = 10; + primaryAttackDuration = 5; } @@ -76,13 +76,13 @@ public ErebusEntity(EntityType entityType, World world) public static DefaultAttributeContainer.Builder setAttributes() { return HostileEntity.createHostileAttributes() - .add(EntityAttributes.GENERIC_MAX_HEALTH, 400.0f) + .add(EntityAttributes.GENERIC_MAX_HEALTH, 800.0f) .add(EntityAttributes.GENERIC_ARMOR, 15.0f) - .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 15.0f) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 25.0f) .add(EntityAttributes.GENERIC_ATTACK_SPEED, 2.0f) .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 50.0f) .add(EntityAttributes.GENERIC_ATTACK_KNOCKBACK, 4.0f) - .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.25f) + .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0.3f) .add(ModAttributes.EREBUS_SPECIAL_ATTACK_COOLDOWN, 6.0f) .add(ModAttributes.EREBUS_PRIMARY_ATTACK_COOLDOWN, 2.0f) .add(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE, 1.0f); @@ -91,7 +91,7 @@ public static DefaultAttributeContainer.Builder setAttributes() { @Override protected void initGoals() { - this.goalSelector.add(1, new ErebusAttackGoal(this, 250)); + this.goalSelector.add(1, new AttackGoal(this)); this.targetSelector.add(1, new ActiveTargetGoal<>(this, PlayerEntity.class, true)); diff --git a/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/GrimsleyEntity.java b/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/GrimsleyEntity.java index faed474..65ea2f8 100644 --- a/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/GrimsleyEntity.java +++ b/src/main/java/net/underplayer97/ResonantEnemies/entity/boss/GrimsleyEntity.java @@ -50,15 +50,15 @@ public class GrimsleyEntity extends AbstractBossEntity implements IAnimatable { public GrimsleyEntity(EntityType entityType, World world) { super(entityType, world); - primaryAttackDuration = 10; + primaryAttackDuration = 5; } public static DefaultAttributeContainer.Builder setAttributes() { return HostileEntity.createHostileAttributes() - .add(EntityAttributes.GENERIC_MAX_HEALTH, 400.0f) + .add(EntityAttributes.GENERIC_MAX_HEALTH, 800.0f) .add(EntityAttributes.GENERIC_ARMOR, 15.0f) - .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 15.0f) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, 25.0f) .add(EntityAttributes.GENERIC_ATTACK_SPEED, 2.0f) .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 50.0f) .add(EntityAttributes.GENERIC_ATTACK_KNOCKBACK, 4.0f) @@ -148,7 +148,7 @@ public void tick() { @Override protected void initGoals() { - this.goalSelector.add(1, new GrimsleyAttackGoal(this, 250)); + this.goalSelector.add(1, new AttackGoal(this)); this.targetSelector.add(1, new ActiveTargetGoal<>(this, PlayerEntity.class, true));