jull/medieval_village_simulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: refactoring

Browse Source
This commit is contained in:
jull
2025-05-29 19:31:40 +02:00
parent a69f31dcaa
commit 70a45379fa
23 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/cz/jull/Game.java
View File

@@ -1,5 +1,6 @@
package cz.jull; package cz.jull;
import cz.jull.items.Item;
import cz.jull.market.Market; import cz.jull.market.Market;
import cz.jull.stats.Events; import cz.jull.stats.Events;
import cz.jull.stats.surroundings.ForestType; import cz.jull.stats.surroundings.ForestType;

1
src/main/java/cz/jull/Player.java
View File

@@ -1,5 +1,6 @@
package cz.jull; package cz.jull;
import cz.jull.items.Item;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

4
src/main/java/cz/jull/Buildable.java → src/main/java/cz/jull/items/Buildable.java
View File

@@ -1,4 +1,6 @@
package cz.jull; package cz.jull.items;
import cz.jull.Game;
public interface Buildable { public interface Buildable {
boolean canBuild(Game game); boolean canBuild(Game game);

33
src/main/java/cz/jull/Item.java → src/main/java/cz/jull/items/Item.java
View File

@@ -1,20 +1,21 @@
package cz.jull; package cz.jull.items;
import cz.jull.actions.Action; import cz.jull.Game;
import cz.jull.actions.BuildAction; import cz.jull.items.actions.Action;
import cz.jull.actions.axe.AxeCutTreesAction; import cz.jull.items.actions.BuildAction;
import cz.jull.actions.bakery.BakeryProduceAction; import cz.jull.items.actions.axe.AxeCutTreesAction;
import cz.jull.actions.cheese_factory.CheeseFactoryProduceAction; import cz.jull.items.actions.bakery.BakeryProduceAction;
import cz.jull.actions.coal_factory.CoalFactoryProduceAction; import cz.jull.items.actions.cheese_factory.CheeseFactoryProduceAction;
import cz.jull.actions.cow.CowMilkAction; import cz.jull.items.actions.coal_factory.CoalFactoryProduceAction;
import cz.jull.actions.hops_farmland.HopsFarmlandHarvestAction; import cz.jull.items.actions.cow.CowMilkAction;
import cz.jull.actions.hops_farmland.HopsFarmlandPlantAction; import cz.jull.items.actions.hops_farmland.HopsFarmlandHarvestAction;
import cz.jull.actions.pub.PubProduceAction; import cz.jull.items.actions.hops_farmland.HopsFarmlandPlantAction;
import cz.jull.actions.vineyard.VineyardHarvestAction; import cz.jull.items.actions.pub.PubProduceAction;
import cz.jull.actions.vineyard.VineyardPlantAction; import cz.jull.items.actions.vineyard.VineyardHarvestAction;
import cz.jull.actions.wheat_farmland.WheatFarmlandHarvestAction; import cz.jull.items.actions.vineyard.VineyardPlantAction;
import cz.jull.actions.wheat_farmland.WheatFarmlandPlantAction; import cz.jull.items.actions.wheat_farmland.WheatFarmlandHarvestAction;
import cz.jull.actions.winery.WineryProduceAction; import cz.jull.items.actions.wheat_farmland.WheatFarmlandPlantAction;
import cz.jull.items.actions.winery.WineryProduceAction;
import lombok.Getter; import lombok.Getter;
import java.util.ArrayList; import java.util.ArrayList;

4
src/main/java/cz/jull/actions/Action.java → src/main/java/cz/jull/items/actions/Action.java
View File

@@ -1,7 +1,7 @@
package cz.jull.actions; package cz.jull.items.actions;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
public abstract class Action { public abstract class Action {
public abstract String toString(); public abstract String toString();

4
src/main/java/cz/jull/actions/BuildAction.java → src/main/java/cz/jull/items/actions/BuildAction.java
View File

@@ -1,7 +1,7 @@
package cz.jull.actions; package cz.jull.items.actions;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
public class BuildAction extends Action { public class BuildAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/axe/AxeCutTreesAction.java → src/main/java/cz/jull/items/actions/axe/AxeCutTreesAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.axe; package cz.jull.items.actions.axe;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class AxeCutTreesAction extends Action { public class AxeCutTreesAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/bakery/BakeryProduceAction.java → src/main/java/cz/jull/items/actions/bakery/BakeryProduceAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.bakery; package cz.jull.items.actions.bakery;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class BakeryProduceAction extends Action { public class BakeryProduceAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/cheese_factory/CheeseFactoryProduceAction.java → src/main/java/cz/jull/items/actions/cheese_factory/CheeseFactoryProduceAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.cheese_factory; package cz.jull.items.actions.cheese_factory;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class CheeseFactoryProduceAction extends Action { public class CheeseFactoryProduceAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/coal_factory/CoalFactoryProduceAction.java → src/main/java/cz/jull/items/actions/coal_factory/CoalFactoryProduceAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.coal_factory; package cz.jull.items.actions.coal_factory;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class CoalFactoryProduceAction extends Action { public class CoalFactoryProduceAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/cow/CowMilkAction.java → src/main/java/cz/jull/items/actions/cow/CowMilkAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.cow; package cz.jull.items.actions.cow;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class CowMilkAction extends Action { public class CowMilkAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/hops_farmland/HopsFarmlandHarvestAction.java → src/main/java/cz/jull/items/actions/hops_farmland/HopsFarmlandHarvestAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.hops_farmland; package cz.jull.items.actions.hops_farmland;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class HopsFarmlandHarvestAction extends Action { public class HopsFarmlandHarvestAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/hops_farmland/HopsFarmlandPlantAction.java → src/main/java/cz/jull/items/actions/hops_farmland/HopsFarmlandPlantAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.hops_farmland; package cz.jull.items.actions.hops_farmland;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class HopsFarmlandPlantAction extends Action { public class HopsFarmlandPlantAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/pub/PubProduceAction.java → src/main/java/cz/jull/items/actions/pub/PubProduceAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.pub; package cz.jull.items.actions.pub;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class PubProduceAction extends Action { public class PubProduceAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/vineyard/VineyardHarvestAction.java → src/main/java/cz/jull/items/actions/vineyard/VineyardHarvestAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.vineyard; package cz.jull.items.actions.vineyard;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class VineyardHarvestAction extends Action { public class VineyardHarvestAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/vineyard/VineyardPlantAction.java → src/main/java/cz/jull/items/actions/vineyard/VineyardPlantAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.vineyard; package cz.jull.items.actions.vineyard;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class VineyardPlantAction extends Action { public class VineyardPlantAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/wheat_farmland/WheatFarmlandHarvestAction.java → src/main/java/cz/jull/items/actions/wheat_farmland/WheatFarmlandHarvestAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.wheat_farmland; package cz.jull.items.actions.wheat_farmland;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class WheatFarmlandHarvestAction extends Action { public class WheatFarmlandHarvestAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/wheat_farmland/WheatFarmlandPlantAction.java → src/main/java/cz/jull/items/actions/wheat_farmland/WheatFarmlandPlantAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.wheat_farmland; package cz.jull.items.actions.wheat_farmland;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class WheatFarmlandPlantAction extends Action { public class WheatFarmlandPlantAction extends Action {
@Override @Override

6
src/main/java/cz/jull/actions/winery/WineryProduceAction.java → src/main/java/cz/jull/items/actions/winery/WineryProduceAction.java
View File

@@ -1,8 +1,8 @@
package cz.jull.actions.winery; package cz.jull.items.actions.winery;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
public class WineryProduceAction extends Action { public class WineryProduceAction extends Action {
@Override @Override

2
src/main/java/cz/jull/market/Market.java
View File

@@ -1,7 +1,7 @@
package cz.jull.market; package cz.jull.market;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.exceptions.ItemNotAvailableException; import cz.jull.exceptions.ItemNotAvailableException;
import cz.jull.exceptions.NotSufficientsCoinsException; import cz.jull.exceptions.NotSufficientsCoinsException;
import cz.jull.stats.surroundings.PathType; import cz.jull.stats.surroundings.PathType;

2
src/main/java/cz/jull/stats/Events.java
View File

@@ -1,7 +1,7 @@
package cz.jull.stats; package cz.jull.stats;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import lombok.Getter; import lombok.Getter;
import java.util.ArrayList; import java.util.ArrayList;

4
src/main/java/cz/jull/tui/Menu.java
View File

@@ -1,8 +1,8 @@
package cz.jull.tui; package cz.jull.tui;
import cz.jull.Game; import cz.jull.Game;
import cz.jull.Item; import cz.jull.items.Item;
import cz.jull.actions.Action; import cz.jull.items.actions.Action;
import cz.jull.exceptions.ItemNotAvailableException; import cz.jull.exceptions.ItemNotAvailableException;
import cz.jull.exceptions.NotSufficientsCoinsException; import cz.jull.exceptions.NotSufficientsCoinsException;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

1
src/test/java/cz/jull/NotSufficientCoinsTest.java
View File

@@ -1,6 +1,7 @@
package cz.jull; package cz.jull;
import cz.jull.exceptions.NotSufficientsCoinsException; import cz.jull.exceptions.NotSufficientsCoinsException;
import cz.jull.items.Item;
import cz.jull.tui.Strings; import cz.jull.tui.Strings;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;