From b0c79f8d836b7d998a1fe7a3837008bc08686f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20=C3=81d=C3=A1m?= Date: Thu, 22 Dec 2022 11:15:51 +0100 Subject: [PATCH] reorganize packaged --- .../tbg/command/impl/ListEffectsCommand.java | 2 +- .../vamk/tbg/command/impl/ListMovesCommand.java | 2 +- .../tbg/command/impl/RemoveEffectCommand.java | 2 +- .../vamk/tbg/command/impl/SetEffectCommand.java | 2 +- .../tbg/command/mapper/StatusEffectMapper.java | 2 +- .../vamk/tbg/di/module/EffectHandlerModule.java | 6 +++--- .../java/com/vamk/tbg/di/module/MoveModule.java | 16 ++++++++-------- src/main/java/com/vamk/tbg/game/Entity.java | 6 +++--- src/main/java/com/vamk/tbg/game/Game.java | 6 +++--- src/main/java/com/vamk/tbg/game/MoveContext.java | 2 +- .../tbg/{ => game}/combat/AbstractBuffMove.java | 4 ++-- .../vamk/tbg/{ => game}/combat/AbstractMove.java | 2 +- .../com/vamk/tbg/{ => game}/combat/BuffMove.java | 4 ++-- .../com/vamk/tbg/{ => game}/combat/CureMove.java | 4 ++-- .../vamk/tbg/{ => game}/combat/DamageMove.java | 4 ++-- .../vamk/tbg/{ => game}/combat/DebuffMove.java | 4 ++-- .../vamk/tbg/{ => game}/combat/HealAllMove.java | 2 +- .../com/vamk/tbg/{ => game}/combat/HealMove.java | 2 +- .../com/vamk/tbg/{ => game}/combat/Move.java | 2 +- .../tbg/{ => game}/combat/SplashDamageMove.java | 4 ++-- .../{ => game}/effect/BleedingEffectHandler.java | 2 +- .../{ => game}/effect/RegenEffectHandler.java | 2 +- .../vamk/tbg/{ => game}/effect/StatusEffect.java | 2 +- .../{ => game}/effect/StatusEffectHandler.java | 2 +- .../vamk/tbg/signal/impl/UserReadySignal.java | 2 +- .../java/com/vamk/tbg/ui/ButtonContainer.java | 2 +- src/main/java/com/vamk/tbg/ui/EntityData.java | 2 +- 27 files changed, 46 insertions(+), 46 deletions(-) rename src/main/java/com/vamk/tbg/{ => game}/combat/AbstractBuffMove.java (93%) rename src/main/java/com/vamk/tbg/{ => game}/combat/AbstractMove.java (89%) rename src/main/java/com/vamk/tbg/{ => game}/combat/BuffMove.java (90%) rename src/main/java/com/vamk/tbg/{ => game}/combat/CureMove.java (89%) rename src/main/java/com/vamk/tbg/{ => game}/combat/DamageMove.java (92%) rename src/main/java/com/vamk/tbg/{ => game}/combat/DebuffMove.java (90%) rename src/main/java/com/vamk/tbg/{ => game}/combat/HealAllMove.java (94%) rename src/main/java/com/vamk/tbg/{ => game}/combat/HealMove.java (94%) rename src/main/java/com/vamk/tbg/{ => game}/combat/Move.java (93%) rename src/main/java/com/vamk/tbg/{ => game}/combat/SplashDamageMove.java (92%) rename src/main/java/com/vamk/tbg/{ => game}/effect/BleedingEffectHandler.java (93%) rename src/main/java/com/vamk/tbg/{ => game}/effect/RegenEffectHandler.java (93%) rename src/main/java/com/vamk/tbg/{ => game}/effect/StatusEffect.java (92%) rename src/main/java/com/vamk/tbg/{ => game}/effect/StatusEffectHandler.java (72%) diff --git a/src/main/java/com/vamk/tbg/command/impl/ListEffectsCommand.java b/src/main/java/com/vamk/tbg/command/impl/ListEffectsCommand.java index ea43ed2..c4c3f97 100644 --- a/src/main/java/com/vamk/tbg/command/impl/ListEffectsCommand.java +++ b/src/main/java/com/vamk/tbg/command/impl/ListEffectsCommand.java @@ -4,8 +4,8 @@ import com.vamk.tbg.command.Command; import com.vamk.tbg.command.CommandContext; import com.vamk.tbg.command.CommandException; -import com.vamk.tbg.effect.StatusEffect; import com.vamk.tbg.game.Entity; +import com.vamk.tbg.game.effect.StatusEffect; import javax.inject.Inject; import java.util.Arrays; diff --git a/src/main/java/com/vamk/tbg/command/impl/ListMovesCommand.java b/src/main/java/com/vamk/tbg/command/impl/ListMovesCommand.java index 624ff59..1edbc4b 100644 --- a/src/main/java/com/vamk/tbg/command/impl/ListMovesCommand.java +++ b/src/main/java/com/vamk/tbg/command/impl/ListMovesCommand.java @@ -1,11 +1,11 @@ package com.vamk.tbg.command.impl; -import com.vamk.tbg.combat.Move; import com.vamk.tbg.command.Argument; import com.vamk.tbg.command.Command; import com.vamk.tbg.command.CommandContext; import com.vamk.tbg.command.CommandException; import com.vamk.tbg.game.Entity; +import com.vamk.tbg.game.combat.Move; import javax.inject.Inject; import java.util.stream.Collectors; diff --git a/src/main/java/com/vamk/tbg/command/impl/RemoveEffectCommand.java b/src/main/java/com/vamk/tbg/command/impl/RemoveEffectCommand.java index 7553b0e..6f31758 100644 --- a/src/main/java/com/vamk/tbg/command/impl/RemoveEffectCommand.java +++ b/src/main/java/com/vamk/tbg/command/impl/RemoveEffectCommand.java @@ -4,8 +4,8 @@ import com.vamk.tbg.command.Command; import com.vamk.tbg.command.CommandContext; import com.vamk.tbg.command.CommandException; -import com.vamk.tbg.effect.StatusEffect; import com.vamk.tbg.game.Entity; +import com.vamk.tbg.game.effect.StatusEffect; import javax.inject.Inject; diff --git a/src/main/java/com/vamk/tbg/command/impl/SetEffectCommand.java b/src/main/java/com/vamk/tbg/command/impl/SetEffectCommand.java index 53fce02..0cfc1f0 100644 --- a/src/main/java/com/vamk/tbg/command/impl/SetEffectCommand.java +++ b/src/main/java/com/vamk/tbg/command/impl/SetEffectCommand.java @@ -4,8 +4,8 @@ import com.vamk.tbg.command.Command; import com.vamk.tbg.command.CommandContext; import com.vamk.tbg.command.CommandException; -import com.vamk.tbg.effect.StatusEffect; import com.vamk.tbg.game.Entity; +import com.vamk.tbg.game.effect.StatusEffect; import javax.inject.Inject; diff --git a/src/main/java/com/vamk/tbg/command/mapper/StatusEffectMapper.java b/src/main/java/com/vamk/tbg/command/mapper/StatusEffectMapper.java index a55aa70..56fefb9 100644 --- a/src/main/java/com/vamk/tbg/command/mapper/StatusEffectMapper.java +++ b/src/main/java/com/vamk/tbg/command/mapper/StatusEffectMapper.java @@ -1,6 +1,6 @@ package com.vamk.tbg.command.mapper; -import com.vamk.tbg.effect.StatusEffect; +import com.vamk.tbg.game.effect.StatusEffect; import javax.inject.Inject; import java.util.Arrays; diff --git a/src/main/java/com/vamk/tbg/di/module/EffectHandlerModule.java b/src/main/java/com/vamk/tbg/di/module/EffectHandlerModule.java index 7c197a8..c5c4e13 100644 --- a/src/main/java/com/vamk/tbg/di/module/EffectHandlerModule.java +++ b/src/main/java/com/vamk/tbg/di/module/EffectHandlerModule.java @@ -1,9 +1,9 @@ package com.vamk.tbg.di.module; import com.vamk.tbg.di.qualifier.EffectHandlerSet; -import com.vamk.tbg.effect.BleedingEffectHandler; -import com.vamk.tbg.effect.RegenEffectHandler; -import com.vamk.tbg.effect.StatusEffectHandler; +import com.vamk.tbg.game.effect.BleedingEffectHandler; +import com.vamk.tbg.game.effect.RegenEffectHandler; +import com.vamk.tbg.game.effect.StatusEffectHandler; import dagger.Binds; import dagger.Module; import dagger.multibindings.IntoSet; diff --git a/src/main/java/com/vamk/tbg/di/module/MoveModule.java b/src/main/java/com/vamk/tbg/di/module/MoveModule.java index 203cbc3..bf73ab9 100644 --- a/src/main/java/com/vamk/tbg/di/module/MoveModule.java +++ b/src/main/java/com/vamk/tbg/di/module/MoveModule.java @@ -1,14 +1,14 @@ package com.vamk.tbg.di.module; -import com.vamk.tbg.combat.BuffMove; -import com.vamk.tbg.combat.CureMove; -import com.vamk.tbg.combat.DamageMove; -import com.vamk.tbg.combat.DebuffMove; -import com.vamk.tbg.combat.HealAllMove; -import com.vamk.tbg.combat.HealMove; -import com.vamk.tbg.combat.Move; -import com.vamk.tbg.combat.SplashDamageMove; import com.vamk.tbg.di.qualifier.MoveSet; +import com.vamk.tbg.game.combat.BuffMove; +import com.vamk.tbg.game.combat.CureMove; +import com.vamk.tbg.game.combat.DamageMove; +import com.vamk.tbg.game.combat.DebuffMove; +import com.vamk.tbg.game.combat.HealAllMove; +import com.vamk.tbg.game.combat.HealMove; +import com.vamk.tbg.game.combat.Move; +import com.vamk.tbg.game.combat.SplashDamageMove; import dagger.Binds; import dagger.Module; import dagger.multibindings.IntoSet; diff --git a/src/main/java/com/vamk/tbg/game/Entity.java b/src/main/java/com/vamk/tbg/game/Entity.java index b842969..b3351f5 100644 --- a/src/main/java/com/vamk/tbg/game/Entity.java +++ b/src/main/java/com/vamk/tbg/game/Entity.java @@ -1,7 +1,7 @@ package com.vamk.tbg.game; -import com.vamk.tbg.combat.Move; -import com.vamk.tbg.effect.StatusEffect; +import com.vamk.tbg.game.combat.Move; +import com.vamk.tbg.game.effect.StatusEffect; import com.vamk.tbg.signal.SignalDispatcher; import com.vamk.tbg.signal.impl.EffectsUpdatedSignal; import com.vamk.tbg.signal.impl.EntityDeathSignal; @@ -208,7 +208,7 @@ public void removeEffect(StatusEffect effect) { * Removes all negative status effects from this entity. * * @see this#removeEffect(StatusEffect) - * @see com.vamk.tbg.combat.CureMove + * @see com.vamk.tbg.game.combat.CureMove */ public void cure() { Set negativeEffects = this.activeEffects.keySet() diff --git a/src/main/java/com/vamk/tbg/game/Game.java b/src/main/java/com/vamk/tbg/game/Game.java index 3493226..6724f86 100644 --- a/src/main/java/com/vamk/tbg/game/Game.java +++ b/src/main/java/com/vamk/tbg/game/Game.java @@ -1,12 +1,12 @@ package com.vamk.tbg.game; -import com.vamk.tbg.combat.Move; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.Keys; import com.vamk.tbg.di.qualifier.EffectHandlerSet; import com.vamk.tbg.di.qualifier.MoveSet; -import com.vamk.tbg.effect.StatusEffect; -import com.vamk.tbg.effect.StatusEffectHandler; +import com.vamk.tbg.game.combat.Move; +import com.vamk.tbg.game.effect.StatusEffect; +import com.vamk.tbg.game.effect.StatusEffectHandler; import com.vamk.tbg.signal.SignalDispatcher; import com.vamk.tbg.signal.impl.EntityDeathSignal; import com.vamk.tbg.signal.impl.EntityPlaysSignal; diff --git a/src/main/java/com/vamk/tbg/game/MoveContext.java b/src/main/java/com/vamk/tbg/game/MoveContext.java index 39416a4..e762134 100644 --- a/src/main/java/com/vamk/tbg/game/MoveContext.java +++ b/src/main/java/com/vamk/tbg/game/MoveContext.java @@ -6,6 +6,6 @@ * A context for all moves. It has a reference to the currently * playing entity, the target as well as all living entities. * - * @see com.vamk.tbg.combat.Move#perform(MoveContext) + * @see com.vamk.tbg.game.combat.Move#perform(MoveContext) */ public record MoveContext(Entity source, Entity target, List allEntities) {} diff --git a/src/main/java/com/vamk/tbg/combat/AbstractBuffMove.java b/src/main/java/com/vamk/tbg/game/combat/AbstractBuffMove.java similarity index 93% rename from src/main/java/com/vamk/tbg/combat/AbstractBuffMove.java rename to src/main/java/com/vamk/tbg/game/combat/AbstractBuffMove.java index 8703bfe..821a10a 100644 --- a/src/main/java/com/vamk/tbg/combat/AbstractBuffMove.java +++ b/src/main/java/com/vamk/tbg/game/combat/AbstractBuffMove.java @@ -1,10 +1,10 @@ -package com.vamk.tbg.combat; +package com.vamk.tbg.game.combat; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.ConfigKey; -import com.vamk.tbg.effect.StatusEffect; import com.vamk.tbg.game.Entity; import com.vamk.tbg.game.MoveContext; +import com.vamk.tbg.game.effect.StatusEffect; import com.vamk.tbg.util.LogUtil; import com.vamk.tbg.util.RandomUtil; diff --git a/src/main/java/com/vamk/tbg/combat/AbstractMove.java b/src/main/java/com/vamk/tbg/game/combat/AbstractMove.java similarity index 89% rename from src/main/java/com/vamk/tbg/combat/AbstractMove.java rename to src/main/java/com/vamk/tbg/game/combat/AbstractMove.java index 587978c..4602990 100644 --- a/src/main/java/com/vamk/tbg/combat/AbstractMove.java +++ b/src/main/java/com/vamk/tbg/game/combat/AbstractMove.java @@ -1,4 +1,4 @@ -package com.vamk.tbg.combat; +package com.vamk.tbg.game.combat; import com.vamk.tbg.game.Entity; diff --git a/src/main/java/com/vamk/tbg/combat/BuffMove.java b/src/main/java/com/vamk/tbg/game/combat/BuffMove.java similarity index 90% rename from src/main/java/com/vamk/tbg/combat/BuffMove.java rename to src/main/java/com/vamk/tbg/game/combat/BuffMove.java index dd3ea59..6039ca6 100644 --- a/src/main/java/com/vamk/tbg/combat/BuffMove.java +++ b/src/main/java/com/vamk/tbg/game/combat/BuffMove.java @@ -1,10 +1,10 @@ -package com.vamk.tbg.combat; +package com.vamk.tbg.game.combat; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.Keys; -import com.vamk.tbg.effect.StatusEffect; import com.vamk.tbg.game.Entity; import com.vamk.tbg.game.MoveContext; +import com.vamk.tbg.game.effect.StatusEffect; import com.vamk.tbg.util.LogUtil; import javax.inject.Inject; diff --git a/src/main/java/com/vamk/tbg/combat/CureMove.java b/src/main/java/com/vamk/tbg/game/combat/CureMove.java similarity index 89% rename from src/main/java/com/vamk/tbg/combat/CureMove.java rename to src/main/java/com/vamk/tbg/game/combat/CureMove.java index 2ade51f..86b4e1a 100644 --- a/src/main/java/com/vamk/tbg/combat/CureMove.java +++ b/src/main/java/com/vamk/tbg/game/combat/CureMove.java @@ -1,8 +1,8 @@ -package com.vamk.tbg.combat; +package com.vamk.tbg.game.combat; -import com.vamk.tbg.effect.StatusEffect; import com.vamk.tbg.game.Entity; import com.vamk.tbg.game.MoveContext; +import com.vamk.tbg.game.effect.StatusEffect; import com.vamk.tbg.util.LogUtil; import javax.inject.Inject; diff --git a/src/main/java/com/vamk/tbg/combat/DamageMove.java b/src/main/java/com/vamk/tbg/game/combat/DamageMove.java similarity index 92% rename from src/main/java/com/vamk/tbg/combat/DamageMove.java rename to src/main/java/com/vamk/tbg/game/combat/DamageMove.java index 6718073..33b6f49 100644 --- a/src/main/java/com/vamk/tbg/combat/DamageMove.java +++ b/src/main/java/com/vamk/tbg/game/combat/DamageMove.java @@ -1,10 +1,10 @@ -package com.vamk.tbg.combat; +package com.vamk.tbg.game.combat; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.Keys; -import com.vamk.tbg.effect.StatusEffect; import com.vamk.tbg.game.Entity; import com.vamk.tbg.game.MoveContext; +import com.vamk.tbg.game.effect.StatusEffect; import com.vamk.tbg.util.LogUtil; import com.vamk.tbg.util.RandomUtil; diff --git a/src/main/java/com/vamk/tbg/combat/DebuffMove.java b/src/main/java/com/vamk/tbg/game/combat/DebuffMove.java similarity index 90% rename from src/main/java/com/vamk/tbg/combat/DebuffMove.java rename to src/main/java/com/vamk/tbg/game/combat/DebuffMove.java index 4028b88..370e918 100644 --- a/src/main/java/com/vamk/tbg/combat/DebuffMove.java +++ b/src/main/java/com/vamk/tbg/game/combat/DebuffMove.java @@ -1,10 +1,10 @@ -package com.vamk.tbg.combat; +package com.vamk.tbg.game.combat; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.Keys; -import com.vamk.tbg.effect.StatusEffect; import com.vamk.tbg.game.Entity; import com.vamk.tbg.game.MoveContext; +import com.vamk.tbg.game.effect.StatusEffect; import com.vamk.tbg.util.LogUtil; import javax.inject.Inject; diff --git a/src/main/java/com/vamk/tbg/combat/HealAllMove.java b/src/main/java/com/vamk/tbg/game/combat/HealAllMove.java similarity index 94% rename from src/main/java/com/vamk/tbg/combat/HealAllMove.java rename to src/main/java/com/vamk/tbg/game/combat/HealAllMove.java index 2558fd5..ae007e3 100644 --- a/src/main/java/com/vamk/tbg/combat/HealAllMove.java +++ b/src/main/java/com/vamk/tbg/game/combat/HealAllMove.java @@ -1,4 +1,4 @@ -package com.vamk.tbg.combat; +package com.vamk.tbg.game.combat; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.Keys; diff --git a/src/main/java/com/vamk/tbg/combat/HealMove.java b/src/main/java/com/vamk/tbg/game/combat/HealMove.java similarity index 94% rename from src/main/java/com/vamk/tbg/combat/HealMove.java rename to src/main/java/com/vamk/tbg/game/combat/HealMove.java index 5c1d2a3..ef1948e 100644 --- a/src/main/java/com/vamk/tbg/combat/HealMove.java +++ b/src/main/java/com/vamk/tbg/game/combat/HealMove.java @@ -1,4 +1,4 @@ -package com.vamk.tbg.combat; +package com.vamk.tbg.game.combat; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.Keys; diff --git a/src/main/java/com/vamk/tbg/combat/Move.java b/src/main/java/com/vamk/tbg/game/combat/Move.java similarity index 93% rename from src/main/java/com/vamk/tbg/combat/Move.java rename to src/main/java/com/vamk/tbg/game/combat/Move.java index c57f832..4a4eb15 100644 --- a/src/main/java/com/vamk/tbg/combat/Move.java +++ b/src/main/java/com/vamk/tbg/game/combat/Move.java @@ -1,4 +1,4 @@ -package com.vamk.tbg.combat; +package com.vamk.tbg.game.combat; import com.vamk.tbg.game.Entity; import com.vamk.tbg.game.MoveContext; diff --git a/src/main/java/com/vamk/tbg/combat/SplashDamageMove.java b/src/main/java/com/vamk/tbg/game/combat/SplashDamageMove.java similarity index 92% rename from src/main/java/com/vamk/tbg/combat/SplashDamageMove.java rename to src/main/java/com/vamk/tbg/game/combat/SplashDamageMove.java index 2735e65..4b8e296 100644 --- a/src/main/java/com/vamk/tbg/combat/SplashDamageMove.java +++ b/src/main/java/com/vamk/tbg/game/combat/SplashDamageMove.java @@ -1,10 +1,10 @@ -package com.vamk.tbg.combat; +package com.vamk.tbg.game.combat; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.Keys; -import com.vamk.tbg.effect.StatusEffect; import com.vamk.tbg.game.Entity; import com.vamk.tbg.game.MoveContext; +import com.vamk.tbg.game.effect.StatusEffect; import com.vamk.tbg.util.LogUtil; import com.vamk.tbg.util.RandomUtil; diff --git a/src/main/java/com/vamk/tbg/effect/BleedingEffectHandler.java b/src/main/java/com/vamk/tbg/game/effect/BleedingEffectHandler.java similarity index 93% rename from src/main/java/com/vamk/tbg/effect/BleedingEffectHandler.java rename to src/main/java/com/vamk/tbg/game/effect/BleedingEffectHandler.java index 5bd6326..45b56f8 100644 --- a/src/main/java/com/vamk/tbg/effect/BleedingEffectHandler.java +++ b/src/main/java/com/vamk/tbg/game/effect/BleedingEffectHandler.java @@ -1,4 +1,4 @@ -package com.vamk.tbg.effect; +package com.vamk.tbg.game.effect; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.Keys; diff --git a/src/main/java/com/vamk/tbg/effect/RegenEffectHandler.java b/src/main/java/com/vamk/tbg/game/effect/RegenEffectHandler.java similarity index 93% rename from src/main/java/com/vamk/tbg/effect/RegenEffectHandler.java rename to src/main/java/com/vamk/tbg/game/effect/RegenEffectHandler.java index 9629d6f..21e6dd1 100644 --- a/src/main/java/com/vamk/tbg/effect/RegenEffectHandler.java +++ b/src/main/java/com/vamk/tbg/game/effect/RegenEffectHandler.java @@ -1,4 +1,4 @@ -package com.vamk.tbg.effect; +package com.vamk.tbg.game.effect; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.Keys; diff --git a/src/main/java/com/vamk/tbg/effect/StatusEffect.java b/src/main/java/com/vamk/tbg/game/effect/StatusEffect.java similarity index 92% rename from src/main/java/com/vamk/tbg/effect/StatusEffect.java rename to src/main/java/com/vamk/tbg/game/effect/StatusEffect.java index 4ba193e..7ad361e 100644 --- a/src/main/java/com/vamk/tbg/effect/StatusEffect.java +++ b/src/main/java/com/vamk/tbg/game/effect/StatusEffect.java @@ -1,4 +1,4 @@ -package com.vamk.tbg.effect; +package com.vamk.tbg.game.effect; public enum StatusEffect { diff --git a/src/main/java/com/vamk/tbg/effect/StatusEffectHandler.java b/src/main/java/com/vamk/tbg/game/effect/StatusEffectHandler.java similarity index 72% rename from src/main/java/com/vamk/tbg/effect/StatusEffectHandler.java rename to src/main/java/com/vamk/tbg/game/effect/StatusEffectHandler.java index 4aed1e8..d1a33ad 100644 --- a/src/main/java/com/vamk/tbg/effect/StatusEffectHandler.java +++ b/src/main/java/com/vamk/tbg/game/effect/StatusEffectHandler.java @@ -1,4 +1,4 @@ -package com.vamk.tbg.effect; +package com.vamk.tbg.game.effect; import com.vamk.tbg.game.Entity; diff --git a/src/main/java/com/vamk/tbg/signal/impl/UserReadySignal.java b/src/main/java/com/vamk/tbg/signal/impl/UserReadySignal.java index 2c1a700..25c002b 100644 --- a/src/main/java/com/vamk/tbg/signal/impl/UserReadySignal.java +++ b/src/main/java/com/vamk/tbg/signal/impl/UserReadySignal.java @@ -1,7 +1,7 @@ package com.vamk.tbg.signal.impl; -import com.vamk.tbg.combat.Move; import com.vamk.tbg.game.Entity; +import com.vamk.tbg.game.combat.Move; import com.vamk.tbg.signal.Signal; /** diff --git a/src/main/java/com/vamk/tbg/ui/ButtonContainer.java b/src/main/java/com/vamk/tbg/ui/ButtonContainer.java index f0847ef..90dd20f 100644 --- a/src/main/java/com/vamk/tbg/ui/ButtonContainer.java +++ b/src/main/java/com/vamk/tbg/ui/ButtonContainer.java @@ -1,9 +1,9 @@ package com.vamk.tbg.ui; -import com.vamk.tbg.combat.Move; import com.vamk.tbg.config.Config; import com.vamk.tbg.config.Keys; import com.vamk.tbg.game.Entity; +import com.vamk.tbg.game.combat.Move; import com.vamk.tbg.signal.SignalDispatcher; import com.vamk.tbg.signal.impl.EntityDeathSignal; import com.vamk.tbg.signal.impl.EntityPlaysSignal; diff --git a/src/main/java/com/vamk/tbg/ui/EntityData.java b/src/main/java/com/vamk/tbg/ui/EntityData.java index 8cc000c..6d37bf6 100644 --- a/src/main/java/com/vamk/tbg/ui/EntityData.java +++ b/src/main/java/com/vamk/tbg/ui/EntityData.java @@ -1,7 +1,7 @@ package com.vamk.tbg.ui; -import com.vamk.tbg.effect.StatusEffect; import com.vamk.tbg.game.Entity; +import com.vamk.tbg.game.effect.StatusEffect; import javax.swing.BorderFactory; import javax.swing.JPanel;