From 208ad9d62492a377f8297426f4f448672e749461 Mon Sep 17 00:00:00 2001 From: Samantha Sullivan <samantha@sullivans.id.au> Date: Mon, 16 Oct 2023 15:39:05 +1000 Subject: [PATCH] fixed import statements spelling for MobTask directory --- .../main/com/csse3200/game/components/npc/SplitMoblings.java | 3 ++- .../main/com/csse3200/game/components/tasks/MobDodgeTask.java | 3 +-- .../com/csse3200/game/components/tasks/MobTask/MobTask.java | 3 ++- .../com/csse3200/game/components/tasks/MobTask/MobType.java | 2 +- .../main/com/csse3200/game/entities/factories/NPCFactory.java | 4 ++-- .../com/csse3200/game/components/DodgingComponentTest.java | 3 +-- .../test/com/csse3200/game/components/SplitMoblingsTest.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/core/src/main/com/csse3200/game/components/npc/SplitMoblings.java b/source/core/src/main/com/csse3200/game/components/npc/SplitMoblings.java index 5896c2f10..865dd2345 100644 --- a/source/core/src/main/com/csse3200/game/components/npc/SplitMoblings.java +++ b/source/core/src/main/com/csse3200/game/components/npc/SplitMoblings.java @@ -1,7 +1,8 @@ package com.csse3200.game.components.npc; import com.csse3200.game.components.Component; -import com.csse3200.game.components.tasks.mobtask.MobType; +//import com.csse3200.game.components.tasks.mobtask.MobType; +import com.csse3200.game.components.tasks.MobTask.*; import com.csse3200.game.entities.Entity; import com.csse3200.game.entities.factories.NPCFactory; import com.csse3200.game.services.ServiceLocator; diff --git a/source/core/src/main/com/csse3200/game/components/tasks/MobDodgeTask.java b/source/core/src/main/com/csse3200/game/components/tasks/MobDodgeTask.java index f50ca2ebd..fed334ba6 100644 --- a/source/core/src/main/com/csse3200/game/components/tasks/MobDodgeTask.java +++ b/source/core/src/main/com/csse3200/game/components/tasks/MobDodgeTask.java @@ -1,7 +1,6 @@ package com.csse3200.game.components.tasks; -import com.csse3200.game.components.tasks.mobtask.MobTask; -import com.csse3200.game.components.tasks.mobtask.MobType; +import com.csse3200.game.components.tasks.MobTask.*; import com.csse3200.game.services.GameTime; import com.csse3200.game.services.ServiceLocator; diff --git a/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobTask.java b/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobTask.java index 5ad20684e..145ed404d 100644 --- a/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobTask.java +++ b/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobTask.java @@ -1,4 +1,4 @@ -package com.csse3200.game.components.tasks.mobtask; +package com.csse3200.game.components.tasks.MobTask; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.Timer; @@ -15,6 +15,7 @@ import com.csse3200.game.rendering.AnimationRenderComponent; import com.csse3200.game.services.GameTime; import com.csse3200.game.services.ServiceLocator; +import com.csse3200.game.components.tasks.MobTask.MobType; /** * The AI Task for all general mobs. This task handles the sequencing for melee diff --git a/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobType.java b/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobType.java index 8bf4e3b7e..335b2a7e7 100644 --- a/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobType.java +++ b/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobType.java @@ -1,4 +1,4 @@ -package com.csse3200.game.components.tasks.mobtask; +package com.csse3200.game.components.tasks.MobTask; public enum MobType { SKELETON(true), diff --git a/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java index 1ceb66b31..4b9541a52 100644 --- a/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java +++ b/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java @@ -11,9 +11,9 @@ import com.csse3200.game.components.tasks.MobDodgeTask; import com.csse3200.game.components.tasks.MobMeleeAttackTask; import com.csse3200.game.components.tasks.MobRangedAttackTask; +import com.csse3200.game.components.tasks.MobTask.*; +import com.csse3200.game.components.tasks.MobTask.MobType; import com.csse3200.game.components.tasks.MobWanderTask; -import com.csse3200.game.components.tasks.mobtask.MobTask; -import com.csse3200.game.components.tasks.mobtask.MobType; import com.csse3200.game.entities.Entity; import com.csse3200.game.entities.Melee; import com.csse3200.game.entities.PredefinedWeapons; diff --git a/source/core/src/test/com/csse3200/game/components/DodgingComponentTest.java b/source/core/src/test/com/csse3200/game/components/DodgingComponentTest.java index 05369c3a5..7b7b9be4c 100644 --- a/source/core/src/test/com/csse3200/game/components/DodgingComponentTest.java +++ b/source/core/src/test/com/csse3200/game/components/DodgingComponentTest.java @@ -5,6 +5,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.csse3200.game.components.tasks.MobTask.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -14,8 +15,6 @@ import com.csse3200.game.components.npc.DodgingComponent; import com.csse3200.game.components.tasks.MobDodgeTask; import com.csse3200.game.components.tasks.MobWanderTask; -import com.csse3200.game.components.tasks.mobtask.MobTask; -import com.csse3200.game.components.tasks.mobtask.MobType; import com.csse3200.game.entities.Entity; import com.csse3200.game.entities.EntityService; import com.csse3200.game.entities.factories.NPCFactory; diff --git a/source/core/src/test/com/csse3200/game/components/SplitMoblingsTest.java b/source/core/src/test/com/csse3200/game/components/SplitMoblingsTest.java index a28f836a1..d21af300c 100644 --- a/source/core/src/test/com/csse3200/game/components/SplitMoblingsTest.java +++ b/source/core/src/test/com/csse3200/game/components/SplitMoblingsTest.java @@ -19,7 +19,7 @@ import com.badlogic.gdx.math.Vector2; import com.csse3200.game.components.npc.SplitMoblings; -import com.csse3200.game.components.tasks.mobtask.MobType; +import com.csse3200.game.components.tasks.MobTask.MobType; import com.csse3200.game.entities.Entity; import com.csse3200.game.entities.EntityService; import com.csse3200.game.entities.factories.NPCFactory;