From 70a45379fae61987ef27a2c0db8108c970090dbe Mon Sep 17 00:00:00 2001 From: jull Date: Thu, 29 May 2025 19:31:40 +0200 Subject: [PATCH] chore: refactoring --- src/main/java/cz/jull/Game.java | 1 + src/main/java/cz/jull/Player.java | 1 + .../java/cz/jull/{ => items}/Buildable.java | 4 ++- src/main/java/cz/jull/{ => items}/Item.java | 33 ++++++++++--------- .../cz/jull/{ => items}/actions/Action.java | 4 +-- .../jull/{ => items}/actions/BuildAction.java | 4 +-- .../actions/axe/AxeCutTreesAction.java | 6 ++-- .../actions/bakery/BakeryProduceAction.java | 6 ++-- .../CheeseFactoryProduceAction.java | 6 ++-- .../CoalFactoryProduceAction.java | 6 ++-- .../actions/cow/CowMilkAction.java | 6 ++-- .../HopsFarmlandHarvestAction.java | 6 ++-- .../HopsFarmlandPlantAction.java | 6 ++-- .../actions/pub/PubProduceAction.java | 6 ++-- .../vineyard/VineyardHarvestAction.java | 6 ++-- .../actions/vineyard/VineyardPlantAction.java | 6 ++-- .../WheatFarmlandHarvestAction.java | 6 ++-- .../WheatFarmlandPlantAction.java | 6 ++-- .../actions/winery/WineryProduceAction.java | 6 ++-- src/main/java/cz/jull/market/Market.java | 2 +- src/main/java/cz/jull/stats/Events.java | 2 +- src/main/java/cz/jull/tui/Menu.java | 4 +-- .../java/cz/jull/NotSufficientCoinsTest.java | 1 + 23 files changed, 70 insertions(+), 64 deletions(-) rename src/main/java/cz/jull/{ => items}/Buildable.java (59%) rename src/main/java/cz/jull/{ => items}/Item.java (87%) rename src/main/java/cz/jull/{ => items}/actions/Action.java (72%) rename src/main/java/cz/jull/{ => items}/actions/BuildAction.java (80%) rename src/main/java/cz/jull/{ => items}/actions/axe/AxeCutTreesAction.java (71%) rename src/main/java/cz/jull/{ => items}/actions/bakery/BakeryProduceAction.java (71%) rename src/main/java/cz/jull/{ => items}/actions/cheese_factory/CheeseFactoryProduceAction.java (70%) rename src/main/java/cz/jull/{ => items}/actions/coal_factory/CoalFactoryProduceAction.java (70%) rename src/main/java/cz/jull/{ => items}/actions/cow/CowMilkAction.java (70%) rename src/main/java/cz/jull/{ => items}/actions/hops_farmland/HopsFarmlandHarvestAction.java (71%) rename src/main/java/cz/jull/{ => items}/actions/hops_farmland/HopsFarmlandPlantAction.java (71%) rename src/main/java/cz/jull/{ => items}/actions/pub/PubProduceAction.java (71%) rename src/main/java/cz/jull/{ => items}/actions/vineyard/VineyardHarvestAction.java (72%) rename src/main/java/cz/jull/{ => items}/actions/vineyard/VineyardPlantAction.java (72%) rename src/main/java/cz/jull/{ => items}/actions/wheat_farmland/WheatFarmlandHarvestAction.java (71%) rename src/main/java/cz/jull/{ => items}/actions/wheat_farmland/WheatFarmlandPlantAction.java (71%) rename src/main/java/cz/jull/{ => items}/actions/winery/WineryProduceAction.java (71%) diff --git a/src/main/java/cz/jull/Game.java b/src/main/java/cz/jull/Game.java index d894e08..aced9eb 100644 --- a/src/main/java/cz/jull/Game.java +++ b/src/main/java/cz/jull/Game.java @@ -1,5 +1,6 @@ package cz.jull; +import cz.jull.items.Item; import cz.jull.market.Market; import cz.jull.stats.Events; import cz.jull.stats.surroundings.ForestType; diff --git a/src/main/java/cz/jull/Player.java b/src/main/java/cz/jull/Player.java index 05cc76f..f2c5815 100644 --- a/src/main/java/cz/jull/Player.java +++ b/src/main/java/cz/jull/Player.java @@ -1,5 +1,6 @@ package cz.jull; +import cz.jull.items.Item; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/cz/jull/Buildable.java b/src/main/java/cz/jull/items/Buildable.java similarity index 59% rename from src/main/java/cz/jull/Buildable.java rename to src/main/java/cz/jull/items/Buildable.java index ed052ff..30ad308 100644 --- a/src/main/java/cz/jull/Buildable.java +++ b/src/main/java/cz/jull/items/Buildable.java @@ -1,4 +1,6 @@ -package cz.jull; +package cz.jull.items; + +import cz.jull.Game; public interface Buildable { boolean canBuild(Game game); diff --git a/src/main/java/cz/jull/Item.java b/src/main/java/cz/jull/items/Item.java similarity index 87% rename from src/main/java/cz/jull/Item.java rename to src/main/java/cz/jull/items/Item.java index 291685d..c119607 100644 --- a/src/main/java/cz/jull/Item.java +++ b/src/main/java/cz/jull/items/Item.java @@ -1,20 +1,21 @@ -package cz.jull; +package cz.jull.items; -import cz.jull.actions.Action; -import cz.jull.actions.BuildAction; -import cz.jull.actions.axe.AxeCutTreesAction; -import cz.jull.actions.bakery.BakeryProduceAction; -import cz.jull.actions.cheese_factory.CheeseFactoryProduceAction; -import cz.jull.actions.coal_factory.CoalFactoryProduceAction; -import cz.jull.actions.cow.CowMilkAction; -import cz.jull.actions.hops_farmland.HopsFarmlandHarvestAction; -import cz.jull.actions.hops_farmland.HopsFarmlandPlantAction; -import cz.jull.actions.pub.PubProduceAction; -import cz.jull.actions.vineyard.VineyardHarvestAction; -import cz.jull.actions.vineyard.VineyardPlantAction; -import cz.jull.actions.wheat_farmland.WheatFarmlandHarvestAction; -import cz.jull.actions.wheat_farmland.WheatFarmlandPlantAction; -import cz.jull.actions.winery.WineryProduceAction; +import cz.jull.Game; +import cz.jull.items.actions.Action; +import cz.jull.items.actions.BuildAction; +import cz.jull.items.actions.axe.AxeCutTreesAction; +import cz.jull.items.actions.bakery.BakeryProduceAction; +import cz.jull.items.actions.cheese_factory.CheeseFactoryProduceAction; +import cz.jull.items.actions.coal_factory.CoalFactoryProduceAction; +import cz.jull.items.actions.cow.CowMilkAction; +import cz.jull.items.actions.hops_farmland.HopsFarmlandHarvestAction; +import cz.jull.items.actions.hops_farmland.HopsFarmlandPlantAction; +import cz.jull.items.actions.pub.PubProduceAction; +import cz.jull.items.actions.vineyard.VineyardHarvestAction; +import cz.jull.items.actions.vineyard.VineyardPlantAction; +import cz.jull.items.actions.wheat_farmland.WheatFarmlandHarvestAction; +import cz.jull.items.actions.wheat_farmland.WheatFarmlandPlantAction; +import cz.jull.items.actions.winery.WineryProduceAction; import lombok.Getter; import java.util.ArrayList; diff --git a/src/main/java/cz/jull/actions/Action.java b/src/main/java/cz/jull/items/actions/Action.java similarity index 72% rename from src/main/java/cz/jull/actions/Action.java rename to src/main/java/cz/jull/items/actions/Action.java index 8d469bc..31fd0b1 100644 --- a/src/main/java/cz/jull/actions/Action.java +++ b/src/main/java/cz/jull/items/actions/Action.java @@ -1,7 +1,7 @@ -package cz.jull.actions; +package cz.jull.items.actions; import cz.jull.Game; -import cz.jull.Item; +import cz.jull.items.Item; public abstract class Action { public abstract String toString(); diff --git a/src/main/java/cz/jull/actions/BuildAction.java b/src/main/java/cz/jull/items/actions/BuildAction.java similarity index 80% rename from src/main/java/cz/jull/actions/BuildAction.java rename to src/main/java/cz/jull/items/actions/BuildAction.java index 40ed828..17f8336 100644 --- a/src/main/java/cz/jull/actions/BuildAction.java +++ b/src/main/java/cz/jull/items/actions/BuildAction.java @@ -1,7 +1,7 @@ -package cz.jull.actions; +package cz.jull.items.actions; import cz.jull.Game; -import cz.jull.Item; +import cz.jull.items.Item; public class BuildAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/axe/AxeCutTreesAction.java b/src/main/java/cz/jull/items/actions/axe/AxeCutTreesAction.java similarity index 71% rename from src/main/java/cz/jull/actions/axe/AxeCutTreesAction.java rename to src/main/java/cz/jull/items/actions/axe/AxeCutTreesAction.java index eeb7bf9..9478fa3 100644 --- a/src/main/java/cz/jull/actions/axe/AxeCutTreesAction.java +++ b/src/main/java/cz/jull/items/actions/axe/AxeCutTreesAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.axe; +package cz.jull.items.actions.axe; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class AxeCutTreesAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/bakery/BakeryProduceAction.java b/src/main/java/cz/jull/items/actions/bakery/BakeryProduceAction.java similarity index 71% rename from src/main/java/cz/jull/actions/bakery/BakeryProduceAction.java rename to src/main/java/cz/jull/items/actions/bakery/BakeryProduceAction.java index 8f426b4..45f7637 100644 --- a/src/main/java/cz/jull/actions/bakery/BakeryProduceAction.java +++ b/src/main/java/cz/jull/items/actions/bakery/BakeryProduceAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.bakery; +package cz.jull.items.actions.bakery; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class BakeryProduceAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/cheese_factory/CheeseFactoryProduceAction.java b/src/main/java/cz/jull/items/actions/cheese_factory/CheeseFactoryProduceAction.java similarity index 70% rename from src/main/java/cz/jull/actions/cheese_factory/CheeseFactoryProduceAction.java rename to src/main/java/cz/jull/items/actions/cheese_factory/CheeseFactoryProduceAction.java index 6933abe..9b0e573 100644 --- a/src/main/java/cz/jull/actions/cheese_factory/CheeseFactoryProduceAction.java +++ b/src/main/java/cz/jull/items/actions/cheese_factory/CheeseFactoryProduceAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.cheese_factory; +package cz.jull.items.actions.cheese_factory; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class CheeseFactoryProduceAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/coal_factory/CoalFactoryProduceAction.java b/src/main/java/cz/jull/items/actions/coal_factory/CoalFactoryProduceAction.java similarity index 70% rename from src/main/java/cz/jull/actions/coal_factory/CoalFactoryProduceAction.java rename to src/main/java/cz/jull/items/actions/coal_factory/CoalFactoryProduceAction.java index 88e053a..9f81be8 100644 --- a/src/main/java/cz/jull/actions/coal_factory/CoalFactoryProduceAction.java +++ b/src/main/java/cz/jull/items/actions/coal_factory/CoalFactoryProduceAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.coal_factory; +package cz.jull.items.actions.coal_factory; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class CoalFactoryProduceAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/cow/CowMilkAction.java b/src/main/java/cz/jull/items/actions/cow/CowMilkAction.java similarity index 70% rename from src/main/java/cz/jull/actions/cow/CowMilkAction.java rename to src/main/java/cz/jull/items/actions/cow/CowMilkAction.java index 895fab0..d50a9b0 100644 --- a/src/main/java/cz/jull/actions/cow/CowMilkAction.java +++ b/src/main/java/cz/jull/items/actions/cow/CowMilkAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.cow; +package cz.jull.items.actions.cow; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class CowMilkAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/hops_farmland/HopsFarmlandHarvestAction.java b/src/main/java/cz/jull/items/actions/hops_farmland/HopsFarmlandHarvestAction.java similarity index 71% rename from src/main/java/cz/jull/actions/hops_farmland/HopsFarmlandHarvestAction.java rename to src/main/java/cz/jull/items/actions/hops_farmland/HopsFarmlandHarvestAction.java index 189c276..f64b138 100644 --- a/src/main/java/cz/jull/actions/hops_farmland/HopsFarmlandHarvestAction.java +++ b/src/main/java/cz/jull/items/actions/hops_farmland/HopsFarmlandHarvestAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.hops_farmland; +package cz.jull.items.actions.hops_farmland; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class HopsFarmlandHarvestAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/hops_farmland/HopsFarmlandPlantAction.java b/src/main/java/cz/jull/items/actions/hops_farmland/HopsFarmlandPlantAction.java similarity index 71% rename from src/main/java/cz/jull/actions/hops_farmland/HopsFarmlandPlantAction.java rename to src/main/java/cz/jull/items/actions/hops_farmland/HopsFarmlandPlantAction.java index 43a7d02..2edf5b9 100644 --- a/src/main/java/cz/jull/actions/hops_farmland/HopsFarmlandPlantAction.java +++ b/src/main/java/cz/jull/items/actions/hops_farmland/HopsFarmlandPlantAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.hops_farmland; +package cz.jull.items.actions.hops_farmland; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class HopsFarmlandPlantAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/pub/PubProduceAction.java b/src/main/java/cz/jull/items/actions/pub/PubProduceAction.java similarity index 71% rename from src/main/java/cz/jull/actions/pub/PubProduceAction.java rename to src/main/java/cz/jull/items/actions/pub/PubProduceAction.java index 62ab270..66bef3f 100644 --- a/src/main/java/cz/jull/actions/pub/PubProduceAction.java +++ b/src/main/java/cz/jull/items/actions/pub/PubProduceAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.pub; +package cz.jull.items.actions.pub; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class PubProduceAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/vineyard/VineyardHarvestAction.java b/src/main/java/cz/jull/items/actions/vineyard/VineyardHarvestAction.java similarity index 72% rename from src/main/java/cz/jull/actions/vineyard/VineyardHarvestAction.java rename to src/main/java/cz/jull/items/actions/vineyard/VineyardHarvestAction.java index 1ba1f3b..5cf18e8 100644 --- a/src/main/java/cz/jull/actions/vineyard/VineyardHarvestAction.java +++ b/src/main/java/cz/jull/items/actions/vineyard/VineyardHarvestAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.vineyard; +package cz.jull.items.actions.vineyard; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class VineyardHarvestAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/vineyard/VineyardPlantAction.java b/src/main/java/cz/jull/items/actions/vineyard/VineyardPlantAction.java similarity index 72% rename from src/main/java/cz/jull/actions/vineyard/VineyardPlantAction.java rename to src/main/java/cz/jull/items/actions/vineyard/VineyardPlantAction.java index c12a4eb..1c11c0d 100644 --- a/src/main/java/cz/jull/actions/vineyard/VineyardPlantAction.java +++ b/src/main/java/cz/jull/items/actions/vineyard/VineyardPlantAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.vineyard; +package cz.jull.items.actions.vineyard; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class VineyardPlantAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/wheat_farmland/WheatFarmlandHarvestAction.java b/src/main/java/cz/jull/items/actions/wheat_farmland/WheatFarmlandHarvestAction.java similarity index 71% rename from src/main/java/cz/jull/actions/wheat_farmland/WheatFarmlandHarvestAction.java rename to src/main/java/cz/jull/items/actions/wheat_farmland/WheatFarmlandHarvestAction.java index 9c27715..ab03d9d 100644 --- a/src/main/java/cz/jull/actions/wheat_farmland/WheatFarmlandHarvestAction.java +++ b/src/main/java/cz/jull/items/actions/wheat_farmland/WheatFarmlandHarvestAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.wheat_farmland; +package cz.jull.items.actions.wheat_farmland; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class WheatFarmlandHarvestAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/wheat_farmland/WheatFarmlandPlantAction.java b/src/main/java/cz/jull/items/actions/wheat_farmland/WheatFarmlandPlantAction.java similarity index 71% rename from src/main/java/cz/jull/actions/wheat_farmland/WheatFarmlandPlantAction.java rename to src/main/java/cz/jull/items/actions/wheat_farmland/WheatFarmlandPlantAction.java index d985e5d..d64cb2c 100644 --- a/src/main/java/cz/jull/actions/wheat_farmland/WheatFarmlandPlantAction.java +++ b/src/main/java/cz/jull/items/actions/wheat_farmland/WheatFarmlandPlantAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.wheat_farmland; +package cz.jull.items.actions.wheat_farmland; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class WheatFarmlandPlantAction extends Action { @Override diff --git a/src/main/java/cz/jull/actions/winery/WineryProduceAction.java b/src/main/java/cz/jull/items/actions/winery/WineryProduceAction.java similarity index 71% rename from src/main/java/cz/jull/actions/winery/WineryProduceAction.java rename to src/main/java/cz/jull/items/actions/winery/WineryProduceAction.java index e9cc63f..ad3e2aa 100644 --- a/src/main/java/cz/jull/actions/winery/WineryProduceAction.java +++ b/src/main/java/cz/jull/items/actions/winery/WineryProduceAction.java @@ -1,8 +1,8 @@ -package cz.jull.actions.winery; +package cz.jull.items.actions.winery; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; public class WineryProduceAction extends Action { @Override diff --git a/src/main/java/cz/jull/market/Market.java b/src/main/java/cz/jull/market/Market.java index b22b86f..0b5557b 100644 --- a/src/main/java/cz/jull/market/Market.java +++ b/src/main/java/cz/jull/market/Market.java @@ -1,7 +1,7 @@ package cz.jull.market; import cz.jull.Game; -import cz.jull.Item; +import cz.jull.items.Item; import cz.jull.exceptions.ItemNotAvailableException; import cz.jull.exceptions.NotSufficientsCoinsException; import cz.jull.stats.surroundings.PathType; diff --git a/src/main/java/cz/jull/stats/Events.java b/src/main/java/cz/jull/stats/Events.java index 232ffa8..77c3dfc 100644 --- a/src/main/java/cz/jull/stats/Events.java +++ b/src/main/java/cz/jull/stats/Events.java @@ -1,7 +1,7 @@ package cz.jull.stats; import cz.jull.Game; -import cz.jull.Item; +import cz.jull.items.Item; import lombok.Getter; import java.util.ArrayList; diff --git a/src/main/java/cz/jull/tui/Menu.java b/src/main/java/cz/jull/tui/Menu.java index b774a63..a7eee38 100644 --- a/src/main/java/cz/jull/tui/Menu.java +++ b/src/main/java/cz/jull/tui/Menu.java @@ -1,8 +1,8 @@ package cz.jull.tui; import cz.jull.Game; -import cz.jull.Item; -import cz.jull.actions.Action; +import cz.jull.items.Item; +import cz.jull.items.actions.Action; import cz.jull.exceptions.ItemNotAvailableException; import cz.jull.exceptions.NotSufficientsCoinsException; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/cz/jull/NotSufficientCoinsTest.java b/src/test/java/cz/jull/NotSufficientCoinsTest.java index b4620f1..050e038 100644 --- a/src/test/java/cz/jull/NotSufficientCoinsTest.java +++ b/src/test/java/cz/jull/NotSufficientCoinsTest.java @@ -1,6 +1,7 @@ package cz.jull; import cz.jull.exceptions.NotSufficientsCoinsException; +import cz.jull.items.Item; import cz.jull.tui.Strings; import org.junit.jupiter.api.Test;