General fix

Author: EliasVahlberg

src/evhh/common/imagemanipulation/ImageTiler.java

@@ -19,13 +19,18 @@ public static BufferedImage tileImage(BufferedImage image, int cols, int rows)
         int height = image.getWidth()*rows;
         BufferedImage tiledImage = new BufferedImage(width,height, BufferedImage.TYPE_INT_ARGB);
         Graphics2D graphics2D = tiledImage.createGraphics();
+        Color oldColor = graphics2D.getColor();
+        graphics2D.setPaint(Color.BLACK);
+        graphics2D.fillRect(0, 0, width, height);
+        graphics2D.setColor(oldColor);
         for (int i = 0; i < cols; i++)
         {
             for (int j = 0; j < rows; j++)
             {
-                graphics2D.drawImage(image,null,image.getWidth()*cols,image.getHeight()*cols);
+                graphics2D.drawImage(image,null,image.getWidth()*i,image.getHeight()*j);
             }
         }
+        graphics2D.drawImage(tiledImage,null,0,0);
         graphics2D.dispose();
         return tiledImage;
 

src/evhh/model/GameInstance.java

@@ -338,4 +338,6 @@ public void setGridSavePath()
     {
         this.gridSavePath = AssetLoader.setPathToSaveData();
     }
+
+
 }

src/evhh/model/Grid.java

@@ -36,7 +36,7 @@ public Grid(int gridWidth, int gridHeight)
         dynamicObjects = new ArrayList<>();
     }
 
-    public GameObject get(int x, int y)
+    synchronized public GameObject get(int x, int y)
     {
         if (!isValidCoordinates(x, y))
             throw new NoSuchElementException("The coordinates :{x=" + x + " ,y=" + y + "} Are not valid coordinates");

src/evhh/model/ObjectPrefab.java

@@ -5,15 +5,19 @@
 import java.io.Serializable;
 
 /***********************************************************************************************************************
- * @project: MainProject
- * @package: evhh.model
- * ---------------------------------------------------------------------------------------------------------------------
- * @authors: Hamed Haghjo & Elias Vahlberg
- * @date: 2021-05-13
- * @time: 14:31
  **********************************************************************************************************************/
 public interface ObjectPrefab extends Serializable
 {
+    /**
+     * @param x X position in grid
+     * @param y Y position in grid
+     * @return instantiated Game object
+     */
     public GameObject getInstance(int x, int y);
+
+    /**
+     * When creating the sprite the (@param GameObject parent) should be null
+     * @return A reference sprite used in map editing
+     */
     public Sprite getSprite();
 }

src/evhh/view/renderers/GridPanel.java

@@ -1,7 +1,10 @@
 package evhh.view.renderers;
 
+import evhh.model.gamecomponents.Sprite;
+
 import javax.swing.*;
 import java.awt.*;
+import java.util.ArrayList;
 
 /***********************************************************************************************************************
  * @project: MainProject
@@ -35,7 +38,8 @@ public void paintComponent(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
         if(backgroundImage!=null)
             g2d.drawImage(backgroundImage,0,0,this);
-        gridRenderer.getSprites().forEach(s->
+        ArrayList<Sprite> sprites = (ArrayList<Sprite>) gridRenderer.getSprites().clone(); //This is to avoid ConcurrentModificationException
+        sprites.stream().parallel().forEach(s->
                 g2d.drawImage(
                         s.getTexture(),
                         (int) s.getX()*cellSize,