Skip to content

Commit

Permalink
Added new directory bomb in cell divided in api impl and moved interf…
Browse files Browse the repository at this point in the history
…aces and classes
  • Loading branch information
LucaVentu03 committed Jul 5, 2024
1 parent 55a500d commit ef086e9
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package it.unibo.bombardero.cell;
package it.unibo.bombardero.bomb.api;

import java.util.Set;
import java.util.Map.Entry;

import it.unibo.bombardero.cell.Cell;
import it.unibo.bombardero.cell.Flame.FlameType;
import it.unibo.bombardero.map.api.GameMap;
import it.unibo.bombardero.map.api.GenPair;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package it.unibo.bombardero.cell;
package it.unibo.bombardero.bomb.api;

import it.unibo.bombardero.map.api.GenPair;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package it.unibo.bombardero.cell;
package it.unibo.bombardero.bomb.impl;

import java.util.HashMap;
import java.util.List;
Expand All @@ -9,6 +9,8 @@
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import it.unibo.bombardero.bomb.api.Bomb;
import it.unibo.bombardero.cell.AbstractCell;
import it.unibo.bombardero.cell.Flame.FlameType;
import it.unibo.bombardero.character.Direction;
import it.unibo.bombardero.map.api.Functions;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package it.unibo.bombardero.cell;
package it.unibo.bombardero.bomb.impl;

import it.unibo.bombardero.cell.Bomb.BombType;
import it.unibo.bombardero.bomb.api.Bomb;
import it.unibo.bombardero.bomb.api.BombFactory;
import it.unibo.bombardero.bomb.api.Bomb.BombType;
import it.unibo.bombardero.character.Character;
import it.unibo.bombardero.map.api.Functions;
import it.unibo.bombardero.map.api.GameMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.Map;

import it.unibo.bombardero.cell.Bomb.BombType;
import it.unibo.bombardero.bomb.api.Bomb.BombType;

/**
* Enumeration representing the different types of power-ups in the game.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/it/unibo/bombardero/character/Character.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import java.util.List;
import java.util.Optional;

import it.unibo.bombardero.cell.Bomb;
import it.unibo.bombardero.cell.Bomb.BombType;
import it.unibo.bombardero.cell.BombFactory;
import it.unibo.bombardero.bomb.api.Bomb;
import it.unibo.bombardero.bomb.api.BombFactory;
import it.unibo.bombardero.bomb.api.Bomb.BombType;
import it.unibo.bombardero.cell.powerup.api.PowerUpType;
import it.unibo.bombardero.core.api.GameManager;
import it.unibo.bombardero.map.api.GenPair;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/it/unibo/bombardero/character/Enemy.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.List;
import java.util.Optional;

import it.unibo.bombardero.cell.BombFactory;
import it.unibo.bombardero.bomb.api.BombFactory;
import it.unibo.bombardero.cell.powerup.api.PowerUpType;
import it.unibo.bombardero.character.ai.api.EnemyState;
import it.unibo.bombardero.character.ai.impl.EnemyGraphReasonerImpl;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/it/unibo/bombardero/character/Player.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package it.unibo.bombardero.character;

import it.unibo.bombardero.cell.BombFactory;
import it.unibo.bombardero.bomb.api.BombFactory;
import it.unibo.bombardero.cell.powerup.impl.PowerUpImpl;
import it.unibo.bombardero.core.api.GameManager;
import it.unibo.bombardero.map.api.Functions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import java.util.Map;
import java.util.Optional;

import it.unibo.bombardero.cell.Bomb;
import it.unibo.bombardero.cell.BombFactory;
import it.unibo.bombardero.cell.BombFactoryImpl;
import it.unibo.bombardero.bomb.api.Bomb;
import it.unibo.bombardero.bomb.api.BombFactory;
import it.unibo.bombardero.bomb.impl.BombFactoryImpl;
import it.unibo.bombardero.cell.Cell;
import it.unibo.bombardero.cell.FlameImpl;
import it.unibo.bombardero.character.Character;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/it/unibo/bombardero/map/api/GameMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.Map;
import java.util.Optional;

import it.unibo.bombardero.cell.Bomb;
import it.unibo.bombardero.bomb.api.Bomb;
import it.unibo.bombardero.cell.Cell;
import it.unibo.bombardero.cell.Flame;
import it.unibo.bombardero.cell.powerup.api.PowerUpType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.Map;
import java.util.Optional;

import it.unibo.bombardero.cell.Bomb;
import it.unibo.bombardero.bomb.api.Bomb;
import it.unibo.bombardero.cell.Cell;
import it.unibo.bombardero.cell.Cell.CellType;
import it.unibo.bombardero.cell.Flame;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/it/bombardero/ControllerForTesting.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.Map;
import java.util.Optional;

import it.unibo.bombardero.cell.BombFactoryImpl;
import it.unibo.bombardero.bomb.impl.BombFactoryImpl;
import it.unibo.bombardero.cell.Cell;
import it.unibo.bombardero.character.Character;
import it.unibo.bombardero.character.Enemy;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/it/bombardero/MyBomb.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.Optional;
import java.util.Set;

import it.unibo.bombardero.cell.Bomb;
import it.unibo.bombardero.bomb.api.Bomb;
import it.unibo.bombardero.cell.Flame.FlameType;
import it.unibo.bombardero.map.api.GameMap;
import it.unibo.bombardero.map.api.GenPair;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/it/bombardero/MyGameManager.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package it.bombardero;

import it.unibo.bombardero.cell.BombFactoryImpl;
import it.unibo.bombardero.bomb.impl.BombFactoryImpl;
import it.unibo.bombardero.character.Character;
import it.unibo.bombardero.character.Enemy;
import it.unibo.bombardero.character.Player;
Expand Down

0 comments on commit ef086e9

Please sign in to comment.