Small refactor, adding a state.

Working on SpriteLibrary.java

Author: LouisdeLooze

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />

Paris-Invaders-Java.iml

@@ -13,10 +13,6 @@ public abstract class AFact {
     public List<Entity> entities;
     protected Input input;
 
-    public abstract void createEnemy();
-    public abstract void createPlayer();
-    public abstract void createBullet(Entity entity);
     public abstract void update();
     public abstract void render();
-    public abstract List<Entity> getEntities();
 }

src/be/uantwerpen/fti/ei/invaders/AFact.java

@@ -1,7 +1,7 @@
 package be.uantwerpen.fti.ei.invaders;
 
 import be.uantwerpen.fti.ei.invaders.gameEngine.GameLoop;
-import be.uantwerpen.fti.ei.invaders.graphicsEngine.Java2DFact;
+import be.uantwerpen.fti.ei.invaders.graphicsEngine.entities.Java2DFact;
 
 public class Main {
 

src/be/uantwerpen/fti/ei/invaders/Main.java

@@ -1,14 +1,12 @@
 package be.uantwerpen.fti.ei.invaders.gameEngine.entities;
 
-import be.uantwerpen.fti.ei.invaders.AFact;
 import be.uantwerpen.fti.ei.invaders.gameEngine.entities.helperFunctions.Position;
 import be.uantwerpen.fti.ei.invaders.gameEngine.entities.helperFunctions.Size;
 
 import java.awt.*;
 
 public class BulletEntity extends Entity {
-    public BulletEntity(AFact afact, int x, int y) {
-        super(afact);
+    public BulletEntity(int x, int y) {
         position = new Position(x,y);
         size = new Size(5, 20);
     }

src/be/uantwerpen/fti/ei/invaders/gameEngine/entities/BulletEntity.java

@@ -1,6 +1,5 @@
 package be.uantwerpen.fti.ei.invaders.gameEngine.entities;
 
-import be.uantwerpen.fti.ei.invaders.AFact;
 import be.uantwerpen.fti.ei.invaders.controlEngine.Controller;
 import be.uantwerpen.fti.ei.invaders.gameEngine.entities.helperFunctions.Position;
 
@@ -15,8 +14,7 @@ public class EnemyEntity extends Entity {
     private static ArrayList<Integer> x = new ArrayList<>((Arrays.asList(100,200,300,400,500,100,200,300,400,500)));
     private static ArrayList<Integer> y = new ArrayList<>((Arrays.asList(50,50,50,50,50,150,150,150,150,150)));
 
-    public EnemyEntity(AFact afact, Controller controller, Integer enemyCount) {
-        super(afact);
+    public EnemyEntity(Controller controller, Integer enemyCount) {
         position = new Position(x.get(enemyCount),y.get(enemyCount));
         this.controller = controller;
     }

src/be/uantwerpen/fti/ei/invaders/gameEngine/entities/EnemyEntity.java

@@ -12,13 +12,11 @@
 public abstract class Entity {
     protected Position position;
     protected Size size;
-    protected AFact afact;
 
     /**
      * The constructor provides a default position and size.
      */
-    public Entity(AFact afact) {
-        this.afact = afact;
+    public Entity() {
         position = new Position(50,350);
         size = new Size(50, 50);
     }

src/be/uantwerpen/fti/ei/invaders/gameEngine/entities/Entity.java

@@ -1,20 +1,16 @@
 package be.uantwerpen.fti.ei.invaders.gameEngine.entities;
 
-import be.uantwerpen.fti.ei.invaders.AFact;
 import be.uantwerpen.fti.ei.invaders.controlEngine.Controller;
 import be.uantwerpen.fti.ei.invaders.gameEngine.entities.helperFunctions.Position;
-import be.uantwerpen.fti.ei.invaders.graphicsEngine.Java2DBulletEntity;
 
 import java.awt.*;
 
 public class PlayerEntity extends Entity {
 
     private Controller controller;
-    private BulletEntity bulletEntity;
     private long lastSpaceEntry = System.currentTimeMillis();
 
-    public PlayerEntity(AFact afact, Controller controller) {
-        super(afact);
+    public PlayerEntity(Controller controller) {
         this.controller = controller;
     }
 
@@ -31,7 +27,6 @@ public void update() {
             if (lastSpaceEntry + 1000 < System.currentTimeMillis()) {
                 System.out.println("Fired!");
                 lastSpaceEntry = System.currentTimeMillis();
-                afact.createBullet(this);
             }
         }
         position = new Position(position.getX() + deltaX, position.getY());

src/be/uantwerpen/fti/ei/invaders/gameEngine/entities/PlayerEntity.java

@@ -0,0 +1,7 @@
+package be.uantwerpen.fti.ei.invaders.gameEngine.entities.actions;
+
+import be.uantwerpen.fti.ei.invaders.graphicsEngine.state.State;
+
+public abstract class Actions {
+
+}

src/be/uantwerpen/fti/ei/invaders/gameEngine/entities/actions/Actions.java

@@ -1,7 +1,7 @@
 package be.uantwerpen.fti.ei.invaders.graphicsEngine;
 
-import be.uantwerpen.fti.ei.invaders.AFact;
 import be.uantwerpen.fti.ei.invaders.controlEngine.Input;
+import be.uantwerpen.fti.ei.invaders.graphicsEngine.state.State;
 
 import javax.swing.*;
 import java.awt.*;
@@ -31,14 +31,14 @@ public Display(int width, int height, Input input) {
         setVisible(true);
     }
 
-    public void render(AFact afact) {
+    public void render(State state) {
         BufferStrategy bufferStrategy = canvas.getBufferStrategy();
         Graphics graphics = bufferStrategy.getDrawGraphics();
 
         graphics.setColor(Color.BLACK);
         graphics.fillRect(0,0, canvas.getWidth(),canvas.getHeight());
 
-        renderer.render(afact, graphics);
+        renderer.render(state, graphics);
 
         graphics.dispose();
         bufferStrategy.show();