refactor move highlighting
parent
077f4a2505
commit
bffb1ff60f
19
.classpath
19
.classpath
|
|
@ -36,7 +36,22 @@
|
|||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="lib" path="com.jgoodies.common_1.8.1.v20240327-0800.jar"/>
|
||||
<classpathentry kind="lib" path="com.jgoodies.forms_1.9.0.v20240327-0800.jar"/>
|
||||
<classpathentry kind="src" path="target/generated-sources/annotations">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="ignore_optional_problems" value="true"/>
|
||||
<attribute name="m2e-apt" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="ignore_optional_problems" value="true"/>
|
||||
<attribute name="m2e-apt" value="true"/>
|
||||
<attribute name="test" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
||||
|
|
|
|||
13
.project
13
.project
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>Schach</name>
|
||||
<name>SchachMVN</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
|
|
@ -20,4 +20,15 @@
|
|||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
</natures>
|
||||
<filteredResources>
|
||||
<filter>
|
||||
<id>1750157105125</id>
|
||||
<name></name>
|
||||
<type>30</type>
|
||||
<matcher>
|
||||
<id>org.eclipse.core.resources.regexFilterMatcher</id>
|
||||
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
|
||||
</matcher>
|
||||
</filter>
|
||||
</filteredResources>
|
||||
</projectDescription>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import com.github.bhlangonijr.chesslib.Board;
|
|||
import com.github.bhlangonijr.chesslib.Square;
|
||||
import com.github.bhlangonijr.chesslib.move.Move;
|
||||
import com.github.bhlangonijr.chesslib.move.MoveList;
|
||||
import com.github.bhlangonijr.chesslib.pgn.PgnHolder;
|
||||
|
||||
import de.mannheim.th.chess.utl.Clock;
|
||||
|
||||
|
|
@ -104,7 +105,21 @@ public class Game {
|
|||
|
||||
}
|
||||
|
||||
public List<Square> getAllLegalMoveableSquares() {
|
||||
return this.board.legalMoves().stream()
|
||||
.map(move -> move.getFrom())
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public List<Square> getLegalMoveableSquares(Square square) {
|
||||
return this.board.legalMoves().stream()
|
||||
.filter(move -> move.getFrom() == square)
|
||||
.map(move -> move.getTo())
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public String toFEN() {
|
||||
board.toString();
|
||||
return board.getFen();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package de.mannheim.th.chess.ui;
|
|||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.apache.logging.log4j.core.pattern.AbstractStyleNameConverter.Red;
|
||||
|
||||
import com.github.bhlangonijr.chesslib.Board;
|
||||
import com.github.bhlangonijr.chesslib.File;
|
||||
|
|
@ -53,6 +54,14 @@ public class SpielFrame extends JFrame {
|
|||
private boolean playerWhite = true;
|
||||
private boolean moveFinished = false;
|
||||
|
||||
private BoardMode mode;
|
||||
private Square selectedSquare;
|
||||
|
||||
enum BoardMode {
|
||||
normal,
|
||||
pieceSelected,
|
||||
}
|
||||
|
||||
/**
|
||||
* Launch the application. Die Main-Methode für den WindowBuilder.
|
||||
*/
|
||||
|
|
@ -75,6 +84,7 @@ public class SpielFrame extends JFrame {
|
|||
public SpielFrame() {
|
||||
|
||||
game = new Game();
|
||||
mode = BoardMode.normal;
|
||||
|
||||
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||
setBounds(100, 100, 1920, 1080);
|
||||
|
|
@ -108,168 +118,217 @@ public class SpielFrame extends JFrame {
|
|||
* Erstellt alle Buttons und fügt sie dem Frame hinzu.
|
||||
*/
|
||||
private void erstelleBrett() {
|
||||
for (int i = 0; i < 64; i++) {
|
||||
JButton b = new JButton();
|
||||
b.setFocusPainted(false);
|
||||
b.setFont(new Font("Arial", Font.PLAIN, 30));
|
||||
|
||||
if ((i / 8 + i % 8) % 2 == 0) {
|
||||
logger.info("Helles Feld erstellt." + i);
|
||||
b.setBackground(new Color(90, 90, 90));
|
||||
} else {
|
||||
logger.info("Dunkles Feld erstellt." + i);
|
||||
b.setBackground(new Color(65, 65, 65));
|
||||
}
|
||||
clearButtons();
|
||||
setDefaultBackground();
|
||||
|
||||
b.setForeground(Color.WHITE);
|
||||
b.setBorder(BorderFactory.createLineBorder(Color.BLACK, 1));
|
||||
b.addActionListener(new ActionListener() {
|
||||
List<Square> selectables;
|
||||
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
switch (this.mode) {
|
||||
case BoardMode.normal:
|
||||
selectables = game.getAllLegalMoveableSquares();
|
||||
|
||||
// setzt alle Roten Felder zurück
|
||||
for (JButton b : farben.keySet()) {
|
||||
System.out.println(selectables);
|
||||
|
||||
if (b.getBackground().equals(new Color(230, 100, 100))) {
|
||||
|
||||
b.setBackground(farben.get(b));
|
||||
for (Square square : selectables) {
|
||||
final Square currentSquare = square; // ActionListener need it to be final
|
||||
JButton b = buttons.get(63 - square.ordinal());
|
||||
b.setEnabled(true);
|
||||
b.setBackground(Color.green);
|
||||
b.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
System.out.println("switch to selected");
|
||||
mode = BoardMode.pieceSelected;
|
||||
selectedSquare = currentSquare;
|
||||
erstelleBrett();
|
||||
}
|
||||
}
|
||||
|
||||
// wenn weiß dran
|
||||
if (playerWhite) {
|
||||
|
||||
// wenn gerade Figur ausgewählt wird...
|
||||
buttonChoosed = (JButton) e.getSource();
|
||||
symbolChoosed = belegungen.get(buttonChoosed);
|
||||
|
||||
// setzt cursor auf spielfigur für die animation
|
||||
String pfad = "src/main/resources/" + (int) symbolChoosed.toCharArray()[2] + ".png";
|
||||
|
||||
// Bild laden und Cursor im gesamten Frame setzen
|
||||
Image image = Toolkit.getDefaultToolkit().getImage(pfad);
|
||||
Image scaled = image.getScaledInstance(32, 32, Image.SCALE_SMOOTH);
|
||||
Cursor figurCursor = Toolkit.getDefaultToolkit().createCustomCursor(scaled, new Point(0, 0),
|
||||
"figurCursor");
|
||||
setCursor(figurCursor);
|
||||
|
||||
// filtert möglichen Züge heraus
|
||||
int position = positions.get(buttonChoosed);
|
||||
|
||||
clickableButtons = game
|
||||
.getLegalMoves(
|
||||
Square.encode(Rank.allRanks[7 - position / 8], File.allFiles[position % 8]))
|
||||
.stream().peek(System.out::println).map(m -> m.getTo()).peek(System.out::println)
|
||||
.map(s -> 56 - s.getRank().ordinal() * 8 + s.getFile().ordinal())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
// filtert mögliche Züge und nicht mögliche Züge in eine Map aus Listen
|
||||
Map<Boolean, List<JButton>> buttonsSeperated = buttons.stream()
|
||||
.collect(Collectors.partitioningBy(b -> clickableButtons.contains(buttons.indexOf(b))));
|
||||
|
||||
for (Boolean list : buttonsSeperated.keySet()) {
|
||||
|
||||
if (list) {
|
||||
// alle möglichen felder rot markieren
|
||||
for (JButton b : positions.keySet()) {
|
||||
// wenn button ein möglicher zug ist
|
||||
if (clickableButtons.contains(positions.get(b))) {
|
||||
farben.put(b, b.getBackground()); // damit sich gemerkt werden kann welches feld welche farbe vorher
|
||||
// hatte
|
||||
b.setBackground(new Color(230, 100, 100));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
// den rest der buttons ausser die möglichen züge deaktivieren
|
||||
List<JButton> andere = buttonsSeperated.get(list);
|
||||
|
||||
for (JButton b : andere) {
|
||||
if (!belegungen.get(b).split("-")[0].equals("w")) {
|
||||
b.setEnabled(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// alle weisen squares deaktivieren, damit dannach klar ist wer dran ist
|
||||
for (JButton b : belegungen.keySet()) {
|
||||
if (belegungen.get(b).split("-")[0].equals("b")) {
|
||||
b.setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
// wenn gerade Figur ausgewählt wird...
|
||||
buttonChoosed = (JButton) e.getSource();
|
||||
symbolChoosed = belegungen.get(buttonChoosed);
|
||||
// System.out.println(symbolChoosed+" wurde gewählt.");
|
||||
// setzt cursor auf spielfigur für die animation
|
||||
String pfad = "src/main/resources/" + (int) symbolChoosed.toCharArray()[2] + ".png";
|
||||
|
||||
// Bild laden und Cursor im gesamten Frame setzen
|
||||
Image image = Toolkit.getDefaultToolkit().getImage(pfad);
|
||||
Image scaled = image.getScaledInstance(32, 32, Image.SCALE_SMOOTH);
|
||||
Cursor figurCursor = Toolkit.getDefaultToolkit().createCustomCursor(scaled, new Point(0, 0),
|
||||
"figurCursor");
|
||||
setCursor(figurCursor);
|
||||
|
||||
// filtert möglichen Züge heraus
|
||||
int position = positions.get(buttonChoosed);
|
||||
List<Integer> clickableButtons = new ArrayList<>();
|
||||
clickableButtons = game
|
||||
.getLegalMoves(
|
||||
Square.encode(Rank.allRanks[7 - position / 8], File.allFiles[position % 8]))
|
||||
.stream().peek(System.out::println).map(m -> m.getTo()).peek(System.out::println)
|
||||
.map(s -> 56 - s.getRank().ordinal() * 8 + s.getFile().ordinal())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
for (JButton b : positions.keySet()) {
|
||||
// wenn button ein möglicher zug ist
|
||||
if (clickableButtons.contains(positions.get(b))) {
|
||||
b.setBackground(new Color(230, 100, 100));
|
||||
}
|
||||
}
|
||||
|
||||
// alle schwarzen squares deaktivieren, damit dannach klar ist wer dran ist
|
||||
for (JButton b : belegungen.keySet()) {
|
||||
if (belegungen.get(b).split("-")[0].equals("w")) {
|
||||
b.setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// alle anderen Buttons nicht ckickbar zu machen
|
||||
|
||||
// Button Icon zurücksetzen
|
||||
|
||||
// Buttonposition merken (in MoveListe oder so)
|
||||
|
||||
// wenn Button platzierd werden soll...
|
||||
|
||||
// neuen Button in Moveliste eintragen
|
||||
|
||||
// Icon ändern
|
||||
|
||||
// Modus auf auswählen setzen und spielerwechsel markieren
|
||||
|
||||
// spielerwechsel
|
||||
if (moveFinished)
|
||||
playerWhite = !playerWhite;
|
||||
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
panelLinks.add(b);
|
||||
buttons.add(b);
|
||||
positions.put(b, i);
|
||||
break;
|
||||
|
||||
case BoardMode.pieceSelected:
|
||||
JButton s = buttons.get(63 - selectedSquare.ordinal());
|
||||
s.setEnabled(true);
|
||||
s.setBackground(Color.orange);
|
||||
s.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
mode = BoardMode.normal;
|
||||
selectedSquare = null;
|
||||
erstelleBrett();
|
||||
}
|
||||
}); // cancel action
|
||||
|
||||
selectables = game.getLegalMoveableSquares(selectedSquare);
|
||||
|
||||
for (Square square : selectables) {
|
||||
JButton b = buttons.get(63 - square.ordinal());
|
||||
b.setEnabled(true);
|
||||
b.setBackground(Color.RED);
|
||||
b.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
System.out.println("switch to normal");
|
||||
mode = BoardMode.normal;
|
||||
erstelleBrett();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
for (JButton b : this.buttons) {
|
||||
panelLinks.add(b);
|
||||
}
|
||||
|
||||
// int i = 0;i<64;i++)
|
||||
// {
|
||||
//
|
||||
// // wenn gerade Figur ausgewählt wird...
|
||||
// buttonChoosed = (JButton) e.getSource();
|
||||
// symbolChoosed = belegungen.get(buttonChoosed);
|
||||
//
|
||||
// // setzt cursor auf spielfigur für die animation
|
||||
// String pfad = "src/main/resources/" + (int) symbolChoosed.toCharArray()[2] +
|
||||
// ".png";
|
||||
//
|
||||
// // Bild laden und Cursor im gesamten Frame setzen
|
||||
// Image image = Toolkit.getDefaultToolkit().getImage(pfad);
|
||||
// Image scaled = image.getScaledInstance(32, 32, Image.SCALE_SMOOTH);
|
||||
// Cursor figurCursor = Toolkit.getDefaultToolkit().createCustomCursor(scaled,
|
||||
// new Point(0, 0),
|
||||
// "figurCursor");
|
||||
// setCursor(figurCursor);
|
||||
//
|
||||
// // filtert möglichen Züge heraus
|
||||
// int position = positions.get(buttonChoosed);
|
||||
//
|
||||
// clickableButtons = game
|
||||
// .getLegalMoves(
|
||||
// Square.encode(Rank.allRanks[7 - position / 8], File.allFiles[position % 8]))
|
||||
// .stream().peek(System.out::println).map(m ->
|
||||
// m.getTo()).peek(System.out::println)
|
||||
// .map(s -> 56 - s.getRank().ordinal() * 8 + s.getFile().ordinal())
|
||||
// .collect(Collectors.toList());
|
||||
//
|
||||
// // filtert mögliche Züge und nicht mögliche Züge in eine Map aus Listen
|
||||
// Map<Boolean, List<JButton>> buttonsSeperated = buttons.stream()
|
||||
// .collect(Collectors.partitioningBy(b ->
|
||||
// clickableButtons.contains(buttons.indexOf(b))));
|
||||
//
|
||||
// for (Boolean list : buttonsSeperated.keySet()) {
|
||||
//
|
||||
// if (list) {
|
||||
// // alle möglichen felder rot markieren
|
||||
// for (JButton b : positions.keySet()) {
|
||||
// // wenn button ein möglicher zug ist
|
||||
// if (clickableButtons.contains(positions.get(b))) {
|
||||
// farben.put(b, b.getBackground()); // damit sich gemerkt werden kann welches
|
||||
// feld welche farbe vorher
|
||||
// // hatte
|
||||
// b.setBackground(new Color(230, 100, 100));
|
||||
//
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// } else {
|
||||
// // den rest der buttons ausser die möglichen züge deaktivieren
|
||||
// List<JButton> andere = buttonsSeperated.get(list);
|
||||
//
|
||||
// for (JButton b : andere) {
|
||||
// if (!belegungen.get(b).split("-")[0].equals("w")) {
|
||||
// b.setEnabled(false);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // alle weisen squares deaktivieren, damit dannach klar ist wer dran ist
|
||||
// for (JButton b : belegungen.keySet()) {
|
||||
// if (belegungen.get(b).split("-")[0].equals("b")) {
|
||||
// b.setEnabled(false);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// }else
|
||||
// {
|
||||
//
|
||||
// // wenn gerade Figur ausgewählt wird...
|
||||
// buttonChoosed = (JButton) e.getSource();
|
||||
// symbolChoosed = belegungen.get(buttonChoosed);
|
||||
// // System.out.println(symbolChoosed+" wurde gewählt.");
|
||||
// // setzt cursor auf spielfigur für die animation
|
||||
// String pfad = "src/main/resources/" + (int) symbolChoosed.toCharArray()[2] +
|
||||
// ".png";
|
||||
//
|
||||
// // Bild laden und Cursor im gesamten Frame setzen
|
||||
// Image image = Toolkit.getDefaultToolkit().getImage(pfad);
|
||||
// Image scaled = image.getScaledInstance(32, 32, Image.SCALE_SMOOTH);
|
||||
// Cursor figurCursor = Toolkit.getDefaultToolkit().createCustomCursor(scaled,
|
||||
// new Point(0, 0),
|
||||
// "figurCursor");
|
||||
// setCursor(figurCursor);
|
||||
//
|
||||
// // filtert möglichen Züge heraus
|
||||
// int position = positions.get(buttonChoosed);
|
||||
// List<Integer> clickableButtons = new ArrayList<>();
|
||||
// clickableButtons = game
|
||||
// .getLegalMoves(
|
||||
// Square.encode(Rank.allRanks[7 - position / 8], File.allFiles[position % 8]))
|
||||
// .stream().peek(System.out::println).map(m ->
|
||||
// m.getTo()).peek(System.out::println)
|
||||
// .map(s -> 56 - s.getRank().ordinal() * 8 + s.getFile().ordinal())
|
||||
// .collect(Collectors.toList());
|
||||
//
|
||||
// for (JButton b : positions.keySet()) {
|
||||
// // wenn button ein möglicher zug ist
|
||||
// if (clickableButtons.contains(positions.get(b))) {
|
||||
// b.setBackground(new Color(230, 100, 100));
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // alle schwarzen squares deaktivieren, damit dannach klar ist wer dran ist
|
||||
// for (JButton b : belegungen.keySet()) {
|
||||
// if (belegungen.get(b).split("-")[0].equals("w")) {
|
||||
// b.setEnabled(false);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// // alle anderen Buttons nicht ckickbar zu machen
|
||||
//
|
||||
// // Button Icon zurücksetzen
|
||||
//
|
||||
// // Buttonposition merken (in MoveListe oder so)
|
||||
//
|
||||
// // wenn Button platzierd werden soll...
|
||||
//
|
||||
// // neuen Button in Moveliste eintragen
|
||||
//
|
||||
// // Icon ändern
|
||||
//
|
||||
// // Modus auf auswählen setzen und spielerwechsel markieren
|
||||
//
|
||||
// // spielerwechsel
|
||||
// if(moveFinished)playerWhite=!playerWhite;
|
||||
//
|
||||
// }
|
||||
//
|
||||
// });
|
||||
|
||||
// panelLinks.add(b);
|
||||
// buttons.add(b);
|
||||
// positions.put(b, i);
|
||||
//
|
||||
// }
|
||||
|
||||
ladeBrett();
|
||||
|
||||
}
|
||||
|
|
@ -287,7 +346,8 @@ public class SpielFrame extends JFrame {
|
|||
int leerfelder = Character.getNumericValue(fen[j]);
|
||||
for (int k = 0; k < leerfelder; k++) {
|
||||
belegungen.put(buttons.get(i), "n-n");
|
||||
buttons.get(i).setEnabled(false); // erstmal deaktivieren, weil leere Felder nicht ckickbar sein sollten.
|
||||
// buttons.get(i).setEnabled(false); // erstmal deaktivieren, weil leere Felder
|
||||
// nicht ckickbar sein sollten.
|
||||
i++;
|
||||
}
|
||||
continue;
|
||||
|
|
@ -303,4 +363,39 @@ public class SpielFrame extends JFrame {
|
|||
|
||||
}
|
||||
}
|
||||
|
||||
private void clearButtons() {
|
||||
buttons.clear();
|
||||
panelLinks.removeAll();
|
||||
|
||||
for (int i = 0; i < 64; i++) {
|
||||
JButton b = new JButton();
|
||||
|
||||
b.setEnabled(false);
|
||||
|
||||
// style
|
||||
b.setFocusPainted(false);
|
||||
b.setFont(new Font("Arial", Font.PLAIN, 30));
|
||||
|
||||
b.setForeground(Color.WHITE);
|
||||
b.setBorder(BorderFactory.createLineBorder(Color.BLACK, 1));
|
||||
b.setName(i + "");
|
||||
|
||||
buttons.add(b);
|
||||
}
|
||||
}
|
||||
|
||||
private void setDefaultBackground() {
|
||||
for (int i = 0; i < 64; i++) {
|
||||
JButton b = buttons.get(i);
|
||||
if ((i / 8 + i % 8) % 2 == 0) {
|
||||
logger.info("Helles Feld erstellt." + i);
|
||||
b.setBackground(new Color(90, 90, 90));
|
||||
} else {
|
||||
logger.info("Dunkles Feld erstellt." + i);
|
||||
b.setBackground(new Color(65, 65, 65));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue