From e9a5416d1f21fe42bdb0b08603e08e6d3bb8505d Mon Sep 17 00:00:00 2001 From: lov3b Date: Sun, 15 May 2022 15:06:42 +0200 Subject: [PATCH] Ta bort blanksteg och annan formatering --- src/schack/Board.java | 17 ++++++----------- src/schack/Horse.java | 3 +-- src/schack/King.java | 2 +- src/schack/Piece.java | 2 +- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/schack/Board.java b/src/schack/Board.java index 23d52b3..e8552a3 100644 --- a/src/schack/Board.java +++ b/src/schack/Board.java @@ -26,10 +26,8 @@ public class Board extends JPanel implements MouseListener { private boolean whitesTurn = true; public Board() throws IOException { - this.pieces = getPieces(); setPreferredSize(new Dimension(800, 800)); - } /** @@ -44,7 +42,6 @@ public class Board extends JPanel implements MouseListener { } private Piece[][] getPieces() throws IOException { - Piece[][] piecesRet = { {new Rook(false, new Point(0, 0)), null, null, null, null, null, null, new Rook(true, new Point(0, 7))}, {new Horse(false, true, new Point(1, 0)), null, null, null, null, null, null, new Horse(true, true, new Point(1, 7))}, @@ -85,11 +82,9 @@ public class Board extends JPanel implements MouseListener { Arrays.stream(pieces).forEach(pieceArr -> Arrays.stream(pieceArr) .filter(piece -> piece != null) .forEach(piece -> piece.draw(g2))); - } private void drawSquares(Graphics2D g2) { - g2.setBackground(Color.WHITE); g2.setColor(Color.DARK_GRAY); @@ -106,10 +101,6 @@ public class Board extends JPanel implements MouseListener { } } - @Override - public void mouseClicked(MouseEvent mouseEvent) { - } - @Override public void mousePressed(MouseEvent mouseEvent) { int mouseCoordinateX = (int) (mouseEvent.getX() / SIZE_OF_TILE); @@ -210,6 +201,10 @@ public class Board extends JPanel implements MouseListener { return attacks; } + public boolean isWhitesTurn() { + return whitesTurn; + } + @Override public void mouseReleased(MouseEvent e) { } @@ -222,7 +217,7 @@ public class Board extends JPanel implements MouseListener { public void mouseExited(MouseEvent e) { } - public boolean isWhitesTurn() { - return whitesTurn; + @Override + public void mouseClicked(MouseEvent mouseEvent) { } } diff --git a/src/schack/Horse.java b/src/schack/Horse.java index 72d3e27..a4245fd 100644 --- a/src/schack/Horse.java +++ b/src/schack/Horse.java @@ -2,7 +2,6 @@ package schack; import java.awt.Point; import java.io.IOException; -import static java.lang.Math.abs; import java.util.ArrayList; public class Horse extends Piece { @@ -17,7 +16,7 @@ public class Horse extends Piece { for (int dx : new int[]{-2, -1, 1, 2}) { for (int direction : new int[]{-1, 1}) { - int stepLength = (3 - abs(dx)); + int stepLength = (3 - Math.abs(dx)); int dy = direction * stepLength; Point potentialMove = new Point(this.position.x + dx, this.position.y + dy); addMovesIfCan(potentialMove, movable, pieces, isSelected); diff --git a/src/schack/King.java b/src/schack/King.java index 5cf7804..b6e6e11 100644 --- a/src/schack/King.java +++ b/src/schack/King.java @@ -12,7 +12,7 @@ public final class King extends PieceKnownIfMoved { } /** - * Få en ArrayList med möjliga rockadMoves + * Få en ArrayList med möjliga rockader * * @param pieces * @return diff --git a/src/schack/Piece.java b/src/schack/Piece.java index bf9c78d..15c54e8 100644 --- a/src/schack/Piece.java +++ b/src/schack/Piece.java @@ -149,7 +149,7 @@ public abstract class Piece { * @param pos Kollar ifall det är schack om denna Piece flyttar hit * @return true ifall det är schack */ - boolean isInSchack(Piece[][] pieces, Point pos) { + protected boolean isInSchack(Piece[][] pieces, Point pos) { // Kom ihåg vart vi var Point previousPosition = new Point(this.position);