Config progress

Updating Hibernate to version v7.0.0.Final

Author: MadeByIToncek

commons

@@ -13,7 +13,7 @@ repositories {
 }
 
 String lombokVersion = "1.18.38"
-String hibernateVersion = "7.0.0.CR1"
+String hibernateVersion = "7.0.0.Final"
 
 dependencies {
     testImplementation platform('org.junit:junit-bom:5.10.0')

server/build.gradle

@@ -83,7 +83,7 @@ public SeekerLocationResponse getSeekerLocation(SeekerLocationRequest request) t
 					.stream()
 					.filter(x -> {
 						try {
-							return !server.config.getConfig().getHider().equals(x.getId());
+							return !server.config.getConfig().getRules().getHider().equals(x.getId());
 						} catch (IOException e) {
 							return false;
 						}

server/src/main/java/space/itoncek/trailcompass/exchange/GameManagerExchange.java

@@ -1,17 +1,17 @@
 package space.itoncek.trailcompass.gamedata;
 
+import space.itoncek.trailcompass.TrailServer;
 import space.itoncek.trailcompass.database.DatabaseCard;
+import space.itoncek.trailcompass.objects.CardClass;
 import space.itoncek.trailcompass.objects.CardType;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
+import java.io.IOException;
+import java.util.*;
 
 public class HomeGameDeck {
-	public List<DatabaseCard> cards = new ArrayList<>();
+	public final List<DatabaseCard> cards = new ArrayList<>();
 
-	public HomeGameDeck() {
+	public HomeGameDeck(TrailServer server) {
 		cards.addAll(generateCurses());
 		cards.addAll(generateCards(25, CardType.TimeBonusRed));
 		cards.addAll(generateCards(15, CardType.TimeBonusOrange));
@@ -21,41 +21,26 @@ public HomeGameDeck() {
 		cards.addAll(generateCards(4, CardType.Randomize));
 		cards.addAll(generateCards(4, CardType.Veto));
 		cards.addAll(generateCards(2, CardType.Duplicate));
-		cards.addAll(generateCards(1, CardType.Move));
 		cards.addAll(generateCards(4, CardType.Discard1));
 		cards.addAll(generateCards(4, CardType.Discard2));
 		cards.addAll(generateCards(2, CardType.Draw1Expand));
 
-		Collections.shuffle(cards);
+        try {
+            if(server.config.getConfig().getRules().isIncludeMoveCard()) {
+                cards.addAll(generateCards(1, CardType.Move));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("Unable to read config!",e);
+        }
+
+        Collections.shuffle(cards);
 	}
 
 	private List<DatabaseCard> generateCurses() {
-		List<DatabaseCard> tempCards = new ArrayList<>();
-		tempCards.add(generateCard(CardType.Curse_Zoologist));
-		tempCards.add(generateCard(CardType.Curse_UnguidedTourist));
-		tempCards.add(generateCard(CardType.Curse_EndlessTumble));
-		tempCards.add(generateCard(CardType.Curse_HiddenHangman));
-		tempCards.add(generateCard(CardType.Curse_OverflowingChalice));
-		tempCards.add(generateCard(CardType.Curse_MediocreTravelAgent));
-		tempCards.add(generateCard(CardType.Curse_LuxuryCard));
-		tempCards.add(generateCard(CardType.Curse_UTurn));
-		tempCards.add(generateCard(CardType.Curse_BridgeTroll));
-		tempCards.add(generateCard(CardType.Curse_WaterWeight));
-		tempCards.add(generateCard(CardType.Curse_JammmedDoor));
-		tempCards.add(generateCard(CardType.Curse_Cairn));
-		tempCards.add(generateCard(CardType.Curse_Urbex));
-		tempCards.add(generateCard(CardType.Curse_ImpressionableConsumer));
-		tempCards.add(generateCard(CardType.Curse_EggPartner));
-		tempCards.add(generateCard(CardType.Curse_DistantCuisine));
-		tempCards.add(generateCard(CardType.Curse_RightTurn));
-		tempCards.add(generateCard(CardType.Curse_Labyrinth));
-		tempCards.add(generateCard(CardType.Curse_BirdGuide));
-		tempCards.add(generateCard(CardType.Curse_SpottyMemory));
-		tempCards.add(generateCard(CardType.Curse_LemonPhylactery));
-		tempCards.add(generateCard(CardType.Curse_DrainedBrain));
-		tempCards.add(generateCard(CardType.Curse_RansomNote));
-		tempCards.add(generateCard(CardType.Curse_GamblersFeet));
-		return tempCards;
+        return Arrays.stream(CardType.values())
+                .filter(x->x.cardClass.equals(CardClass.Curse))
+                .map(this::generateCard)
+                .toList();
 	}
 
 	private DatabaseCard generateCard(CardType type) {

server/src/main/java/space/itoncek/trailcompass/gamedata/HomeGameDeck.java

@@ -1,10 +1,20 @@
 package space.itoncek.trailcompass.gamedata.metadata;
 
+import space.itoncek.trailcompass.TrailServer;
+import space.itoncek.trailcompass.modules.config.GameSize;
 import space.itoncek.trailcompass.objects.CardClass;
 import space.itoncek.trailcompass.objects.CardType;
 
+import java.io.IOException;
+
 public class CurseMetadataHandler {
-	public static CardMetadata parseMetadata(CardType type) {
+	private final TrailServer server;
+
+	public CurseMetadataHandler(TrailServer server) {
+		this.server = server;
+	}
+
+	private static CardMetadata parseMetadata(CardType type) {
 		// Regex to parse different values depending on game size
 		// /\[([^\]]+),([^\]]+),([^\]]+)\]/gm
 
@@ -58,7 +68,21 @@ public static CardMetadata parseMetadata(CardType type) {
 			case Curse_GamblersFeet ->
 					new CardMetadata(CardClass.Curse, "The Gambler's Feet", "For the next [20 minutes,40 minutes,60 minutes] minutes seekers must roll a die before they take any steps in any direction, they may take that many steps before rolling again", "Roll a die if its even number this curse has no effect");
 			case TimeBonusRed, TimeBonusOrange, TimeBonusYellow, TimeBonusGreen, TimeBonusBlue, Randomize, Veto,
-				 Duplicate, Move, Discard1, Discard2, Draw1Expand -> PowerupMetadataHandler.parseMetadata(type);
+				 Duplicate, Move, Discard1, Discard2, Draw1Expand -> null;
 		};
 	}
+
+	public CardMetadata parseMetadataContextDependant(CardType cardType) throws IOException {
+		GameSize size = server.config.getConfig().getRules().getSize();
+
+		if(cardType.cardClass != CardClass.Curse) {
+			throw new IllegalArgumentException("Card is not a curse!");
+		}
+
+		CardMetadata cardMetadata = parseMetadata(cardType);
+
+		//TODO)) change description based on game size
+
+		return cardMetadata;
+	}
 }

server/src/main/java/space/itoncek/trailcompass/gamedata/metadata/CurseMetadataHandler.java

@@ -22,7 +22,7 @@ public void resetDeck() {
 	}
 
 	private void initNewDeck() {
-		HomeGameDeck deck = new HomeGameDeck();
+		HomeGameDeck deck = new HomeGameDeck(server);
 		server.ef.runInTransaction(em -> {
 			deck.cards.stream().map(x -> {
 				DatabaseCard card = new DatabaseCard();

server/src/main/java/space/itoncek/trailcompass/gamedata/metadata/MetadataHandler.java

@@ -3,11 +3,14 @@
 import space.itoncek.trailcompass.TrailServer;
 import space.itoncek.trailcompass.commons.objects.GameState;
 import space.itoncek.trailcompass.modules.config.Config;
+import space.itoncek.trailcompass.modules.config.RestPeriod;
 
 import java.io.IOException;
 import java.time.ZonedDateTime;
 import java.util.UUID;
 
+import static space.itoncek.trailcompass.commons.objects.GameState.*;
+
 public class GameManager {
 	private final TrailServer server;
 
@@ -17,21 +20,34 @@ public GameManager(TrailServer server) {
 
 	public GameState getGameState() throws IOException {
 		Config cfg = server.config.getConfig();
-		ZonedDateTime start = cfg.getStartTime();
-		if(ZonedDateTime.now().isBefore(start)) {
-			return GameState.OUTSIDE_OF_GAME;
-		}else if (ZonedDateTime.now().isBefore(cfg.getStartTime().plusSeconds(cfg.getMovePeriodSeconds()))) {
-			return GameState.MOVE_PERIOD;
-		} else if(ZonedDateTime.now().isBefore(cfg.getGameDayEndTime())) {
-			return GameState.INGAME;
-		} else return GameState.REST_PERIOD;
+		ZonedDateTime now = ZonedDateTime.now();
+		if (now.isBefore(cfg.getTime().getStartTime())) {
+			return WAITING_FOR_GAME;
+		} else if (now.isBefore(cfg.getTime().getStartTime().plusSeconds(cfg.getRules().getMovePeriodSeconds()))) {
+			return MOVE_PERIOD;
+		} else {
+			boolean restPeriod = false;
+			for (RestPeriod x : cfg.getTime().getRestPeriods()) {
+				restPeriod = restPeriod || x.isInside(now);
+			}
+
+			if (restPeriod) {
+				return REST_PERIOD;
+			} else {
+				if (now.isAfter(cfg.getTime().getEndTime())) {
+					return ENDED;
+				} else {
+					return INGAME;
+				}
+			}
+		}
 	}
 
 	public UUID getCurrentHider() throws IOException {
-		return server.config.getConfig().getHider();
+		return server.config.getConfig().getRules().getHider();
 	}
 
 	public ZonedDateTime getStartingTime() throws IOException {
-		return server.config.getConfig().getStartTime();
+		return server.config.getConfig().getTime().getStartTime();
 	}
 }

server/src/main/java/space/itoncek/trailcompass/gamedata/metadata/PowerupMetadataHandler.java

@@ -2,33 +2,12 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import space.itoncek.trailcompass.TrailServer;
-import space.itoncek.trailcompass.database.DatabasePlayer;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.List;
-import java.util.UUID;
 
 @Getter
 @Setter
 public class Config implements Serializable {
-	ZonedDateTime startTime;
-	ZonedDateTime gameDayEndTime;
-	UUID hider;
-	long movePeriodSeconds;
-
-	public static Config generateConfig(TrailServer server) {
-		Config cfg = new Config();
-
-		cfg.startTime = LocalDate.now().atStartOfDay(ZoneId.systemDefault()).plusHours(8);
-		server.ef.runInTransaction(em -> {
-			List<DatabasePlayer> players = em.createNamedQuery("findAllPlayers", DatabasePlayer.class).getResultList();
-			cfg.hider = players.getFirst().getId();
-		});
-
-		return cfg;
-	}
+	RuleConfig rules;
+	TimeConfig time;
 }