diff --git a/Backup/v5/draw/Draw.java b/Backup/v5/draw/Draw.java index 73f3c62..9eb5d7f 100644 --- a/Backup/v5/draw/Draw.java +++ b/Backup/v5/draw/Draw.java @@ -1,6 +1,6 @@ package v5.draw; -import v4.gui.GUI; +import v5.gui.GUI; import v5.game.Control; import javax.swing.*; diff --git a/Backup/v5/game/Clock.java b/Backup/v5/game/Clock.java index becdb23..ec4a592 100644 --- a/Backup/v5/game/Clock.java +++ b/Backup/v5/game/Clock.java @@ -19,7 +19,7 @@ public class Clock extends Thread{ } }; - t.scheduleAtFixedRate(tt, 1, 1); + t.scheduleAtFixedRate(tt, 1, 1000); } diff --git a/Backup/v5/gui/GUI.java b/Backup/v5/gui/GUI.java index f16ead1..5518292 100644 --- a/Backup/v5/gui/GUI.java +++ b/Backup/v5/gui/GUI.java @@ -3,9 +3,11 @@ package v5.gui; import v5.draw.Draw; import v5.game.Control; +import javax.swing.*; +import java.awt.*; -public class GUI { +public class GUI extends JFrame { JFrame jf; diff --git a/src/game/Clock.java b/src/game/Clock.java index cefa06f..b9851bb 100644 --- a/src/game/Clock.java +++ b/src/game/Clock.java @@ -19,7 +19,7 @@ public class Clock extends Thread{ } }; - t.scheduleAtFixedRate(tt, 1, 1); + t.scheduleAtFixedRate(tt, 1, 1000); } diff --git a/src/game/Control.java b/src/game/Control.java index a82b07a..8aaa9b3 100644 --- a/src/game/Control.java +++ b/src/game/Control.java @@ -41,16 +41,15 @@ public class Control { case Task1 -> { generateTask1(); - System.out.println("Taks1"); } case Randomized -> { generateRandomized(); - System.out.println("Random"); } case Manuel -> { buildManuelGame(); } + } } diff --git a/src/game/StartMode.java b/src/game/StartMode.java index d566f94..1521bb0 100644 --- a/src/game/StartMode.java +++ b/src/game/StartMode.java @@ -2,6 +2,6 @@ package game; public enum StartMode { - Task1, Randomized, Manuel + Manuel, Task1, Randomized, Hallo } diff --git a/src/gui/GUI.java b/src/gui/GUI.java index 348574d..314292f 100644 --- a/src/gui/GUI.java +++ b/src/gui/GUI.java @@ -35,7 +35,7 @@ public class GUI { private MouseListener hover; - private JButton randomStart; + private JButton startButton; private JButton manuelStart; private ImageIcon preview; @@ -195,32 +195,39 @@ public class GUI { }; modeName = new JLabel("Select Figure: "); - modeName.setBounds(50, 270, 200, 30); + modeName.setBounds(50, 250, 200, 30); modeName.setFont(text); modeName.setForeground(Color.decode("#121212")); modeName.setVisible(true); modeBox = new JComboBox(); - modeBox.setBounds(180, 270, 100, 20); + modeBox.setBounds(180, 257, 100, 20); addComboBoxEntry(modeBox, "CTTask1"); addComboBoxEntry(modeBox, "Randomized"); - randomStart = new JButton(); - randomStart.setText("Start Game"); - randomStart.setFont(text); - randomStart.setForeground(Color.decode("#121212")); - randomStart.setBorderPainted(true); - randomStart.setFocusPainted(false); - randomStart.setContentAreaFilled(false); - randomStart.setBounds(50, 320, 150, 50); - randomStart.setVisible(true); - randomStart.addMouseListener(hover); - randomStart.setBorder(new RoundedBorder(25)); - randomStart.addActionListener(new ActionListener() { + startButton = new JButton(); + startButton.setText("Start Game"); + startButton.setFont(text); + startButton.setForeground(Color.decode("#121212")); + startButton.setBorderPainted(true); + startButton.setFocusPainted(false); + startButton.setContentAreaFilled(false); + startButton.setBounds(50, 310, 150, 50); + startButton.setVisible(true); + startButton.addMouseListener(hover); + startButton.setBorder(new RoundedBorder(25)); + startButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - control.buildGameWindow(xAxisSize, yAxisSize, cellCount, StartMode.Randomized); + + StartMode startMethod = StartMode.Task1; + + int index = modeBox.getSelectedIndex(); + + startMethod = StartMode.values()[index + 1]; // + 1 BECAUSE MANUEL HAS THE FIRST INDEX IN ENUM + + control.buildGameWindow(xAxisSize, yAxisSize, cellCount, startMethod); } }); @@ -231,7 +238,7 @@ public class GUI { manuelStart.setBorderPainted(true); manuelStart.setFocusPainted(false); manuelStart.setContentAreaFilled(false); - manuelStart.setBounds(225, 320, 150, 50); + manuelStart.setBounds(225, 310, 150, 50); manuelStart.setVisible(true); manuelStart.addMouseListener(hover); manuelStart.setBorder(new RoundedBorder(25)); @@ -278,7 +285,7 @@ public class GUI { jf.add(startCells); jf.add(startCellsName); jf.add(startCellsLabel); - jf.add(randomStart); + jf.add(startButton); jf.add(manuelStart); jf.add(previewLabel); jf.add(modeName); @@ -286,7 +293,7 @@ public class GUI { } - private void addComboBoxEntry(JComboBox comboBox, String entry){ + private void addComboBoxEntry(JComboBox comboBox, String entry) { comboBox.addItem(entry); }