The End...

Underplayer97 · Nov 24, 2024 · 8688164 · 8688164
1 parent 24e0be9
commit 8688164
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -28,12 +28,12 @@ Registry.ENTITY_TYPE, new Identifier(ResonantMain.MOD_ID, "shambler"),
     public static final EntityType<ErebusEntity> 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<GrimsleyEntity> 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<AmalgamateEntity> 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
@@ -49,7 +49,7 @@ public class AmalgamateEntity extends AbstractBossEntity implements IAnimatable
 
     public AmalgamateEntity(EntityType<? extends AbstractBossEntity> 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
@@ -68,21 +68,21 @@ public ErebusEntity(EntityType<? extends ErebusEntity> entityType, World world)
         super(entityType, world);
         this.setHealth(this.getMaxHealth());
 
-        primaryAttackDuration = 10;
+        primaryAttackDuration = 5;
 
     }
 
     //TODO: Add spawn and attack animations. Custom beam attacks with animation setup - MIGHT NOT HAVE ENOUGH TIME
 
     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
@@ -50,15 +50,15 @@ public class GrimsleyEntity extends AbstractBossEntity implements IAnimatable {
     public GrimsleyEntity(EntityType<? extends AbstractBossEntity> 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));