TowerDefence/Server
6
0
Fork 0
Code Issues Pull requests2 Releases8 Packages1 Activity Actions

Compare commits

..

1 commit
5ec9b899f0 ... 9b10902d2a

Author SHA1 Message Date
Snoweuph
9b10902d2a
TD-5: Cleanup and Finalizing 2025-03-13 19:17:24 +01:00
7 changed files with 64 additions and 65 deletions

28
src/main/java/de/towerdefence/server/game/GameSession.java
View file

@ -41,11 +41,10 @@ public class GameSession {
private long lastSpawn = Instant.now().toEpochMilli();
public GameSession(
Player player,
PlayerMoneyCallback moneyCallback,
PlayerHitpointsCallback hitpointsCallback,
EnemiesChangedCallback enemyCallback
) {
Player player,
PlayerMoneyCallback moneyCallback,
PlayerHitpointsCallback hitpointsCallback,
EnemiesChangedCallback enemyCallback) {
this.player = player;
this.moneyCallback = moneyCallback;
this.hitpointsCallback = hitpointsCallback;
@ -74,16 +73,15 @@ public class GameSession {
if (newEnemies.size() > 0 || changedEnemies.size() > 0) {
enemyCallback.call(
player,
newEnemies.toArray(new Enemy[newEnemies.size()]),
changedEnemies.toArray(new Enemy[changedEnemies.size()])
);
player,
newEnemies.toArray(new Enemy[newEnemies.size()]),
changedEnemies.toArray(new Enemy[changedEnemies.size()]));
}
}
private boolean shouldSpawn() {
return lastSpawn + WAVE_SPAWN_DELAY < Instant.now().toEpochMilli()
&& enemies[WAVE_SPAWN.x][WAVE_SPAWN.y] == null;
&& enemies[WAVE_SPAWN.x][WAVE_SPAWN.y] == null;
}
private List<Enemy> moveEnemies() {
@ -98,11 +96,11 @@ public class GameSession {
}
AStar a = new AStar((Vector2i pos) -> {
return pos.x >= 0
&& pos.x < MAP_SIZE.x
&& pos.y >= 0
&& pos.y < MAP_SIZE.y
&& (towers[pos.x] == null || towers[pos.x][pos.y] == null)
&& (enemies[pos.x] == null || enemies[pos.x][pos.y] != null);
&& pos.x < MAP_SIZE.x
&& pos.y >= 0
&& pos.y < MAP_SIZE.y
&& (towers[pos.x] == null || towers[pos.x][pos.y] == null)
&& (enemies[pos.x] == null || enemies[pos.x][pos.y] != null);
});
Vector2i next;
try {

7
src/main/java/de/towerdefence/server/game/pathfinding/AStar.java
View file

@ -92,12 +92,9 @@ public class AStar {
if (!walkable.call(pos)) {
return;
}
accumulator.add(
new PathNode(
accumulator.add(new PathNode(
right,
nextCost,
right.gridDistance(target) + nextCost
)
);
right.gridDistance(target) + nextCost));
}
}

9
src/main/java/de/towerdefence/server/match/Match.java
View file

@ -52,11 +52,10 @@ public class Match {
}
public void connectPlayer(
Player player,
PlayerMoneyCallback moneyCallback,
PlayerHitpointsCallback hitpointsCallback,
EnemiesChangedCallback enemyCallback
) {
Player player,
PlayerMoneyCallback moneyCallback,
PlayerHitpointsCallback hitpointsCallback,
EnemiesChangedCallback enemyCallback) {
boolean isPlayer1 = player1.equals(player);
boolean isPlayer2 = player2.equals(player);
if (!isPlayer1 && !isPlayer2) {

23
src/main/java/de/towerdefence/server/match/MatchService.java
View file

@ -58,11 +58,10 @@ public class MatchService {
}
public void playerConnected(
Player player,
PlayerMoneyCallback moneyCallback,
PlayerHitpointsCallback hitpointsCallback,
EnemiesChangedCallback enemyCallback
) {
Player player,
PlayerMoneyCallback moneyCallback,
PlayerHitpointsCallback hitpointsCallback,
EnemiesChangedCallback enemyCallback) {
Match match = playerMatches.get(player);
match.connectPlayer(player, moneyCallback, hitpointsCallback, enemyCallback);
Optional<GameSession> optionalPlayerSession = match.getPlayerGameSession(player);
@ -86,13 +85,13 @@ public class MatchService {
}
GameSession opponentSession = optionalOpponentSession.get();
ScheduledFuture<?> moneyTask = scheduler.scheduleAtFixedRate(
() -> {
playerSession.addMoney(3);
opponentSession.addMoney(3);
},
5,
5,
TimeUnit.SECONDS);
() -> {
playerSession.addMoney(3);
opponentSession.addMoney(3);
},
5,
5,
TimeUnit.SECONDS);
moneyTasks.put(match, moneyTask);
}
}

47
src/main/java/de/towerdefence/server/server/channels/match/MatchWebsocketHandler.java
View file

@ -1,6 +1,16 @@
package de.towerdefence.server.server.channels.match;
import java.io.IOException;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.towerdefence.server.game.Enemy;
import de.towerdefence.server.game.exeptions.InvalidPlacementException;
import de.towerdefence.server.match.MatchService;
@ -16,13 +26,6 @@ import de.towerdefence.server.server.channels.match.placing.RequestTowerPlacingM
import de.towerdefence.server.server.channels.match.placing.TowerPlacedMessage;
import de.towerdefence.server.session.Channel;
import de.towerdefence.server.session.SessionsService;
import java.io.IOException;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.WebSocketSession;
public class MatchWebsocketHandler extends JsonWebsocketHandler {
@ -40,10 +43,10 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
super.afterConnectionEstablished(session);
playerSessions.put(sessionPlayers.get(session), session);
matchService.playerConnected(
sessionPlayers.get(session),
this::onPlayerMoneyChanged,
this::onPlayerHitpointsChanged,
this::onEnemiesChanged
sessionPlayers.get(session),
this::onPlayerMoneyChanged,
this::onPlayerHitpointsChanged,
this::onEnemiesChanged
);
}
@ -74,7 +77,7 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
WebSocketSession session = playerSessions.get(player);
try {
new EnemyUpdateMessage(newEnemies, changedEnemies).send(session);
} catch (IOException ignored) {
}catch(IOException ignored){
}
}
@ -83,8 +86,8 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
try {
String payload = message.getPayload();
if (!Objects.equals(
objectMapper.readTree(payload).get("$id").asText(),
RequestTowerPlacingMessage.MESSAGE_ID)) {
objectMapper.readTree(payload).get("$id").asText(),
RequestTowerPlacingMessage.MESSAGE_ID)) {
this.closeSession(session, CloseStatus.BAD_DATA);
return;
}
@ -92,16 +95,20 @@ public class MatchWebsocketHandler extends JsonWebsocketHandler {
} catch (IOException ignored) {
this.closeSession(session, CloseStatus.BAD_DATA);
}
}
private void handleRequestTowerPlacingMessage(WebSocketSession session, String payload)
throws IOException {
RequestTowerPlacingMessage msg =
objectMapper.readValue(payload, RequestTowerPlacingMessage.class);
private void handleRequestTowerPlacingMessage(
WebSocketSession session,
String payload) throws IOException {
RequestTowerPlacingMessage msg = objectMapper.readValue(payload, RequestTowerPlacingMessage.class);
Player opponent;
try {
opponent =
this.matchService.placeTower(this.sessionPlayers.get(session), msg.getX(), msg.getY());
opponent = this.matchService.placeTower(
this.sessionPlayers.get(session),
msg.getX(),
msg.getY()
);
} catch (InvalidPlacementException exception) {
new InvalidPlacementMessage(msg.getX(), msg.getY(), exception.getReason()).send(session);
return;

7
src/main/java/de/towerdefence/server/server/channels/match/placing/InvalidPlacementMessage.java
View file

@ -24,9 +24,8 @@ public class InvalidPlacementMessage extends JsonMessage {
@Override
protected Map<String, JsonNode> getData(JsonNodeFactory factory) {
return Map.of(
"x", factory.numberNode(this.x),
"y", factory.numberNode(this.y),
"reason", factory.textNode(this.reason.getJsonName())
);
"x", factory.numberNode(this.x),
"y", factory.numberNode(this.y),
"reason", factory.textNode(this.reason.getJsonName()));
}
}

8
src/main/java/de/towerdefence/server/server/channels/match/placing/TowerPlacedMessage.java
View file

@ -22,9 +22,9 @@ public class TowerPlacedMessage extends JsonMessage {
@Override
protected Map<String, JsonNode> getData(JsonNodeFactory factory) {
return Map.of(
"x", factory.numberNode(this.x),
"y", factory.numberNode(this.y),
"map", factory.textNode(this.map.getJsonName())
);
"x", factory.numberNode(this.x),
"y", factory.numberNode(this.y),
"map", factory.textNode(this.map.getJsonName())
);
}
}