Get it to work with Java 21 and fix dimensions

Maxe12 · Jan 7, 2024 · 916f171 · 916f171
1 parent 8864ae0
commit 916f171
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 10 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/SimpleGameOfLife.iml b/.idea/SimpleGameOfLife.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Conway.iml b/Conway.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="JavaSE-12" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
diff --git a/bin/gameoflife/Draw.class b/bin/gameoflife/Draw.class
diff --git a/bin/gameoflife/GameLoop.class b/bin/gameoflife/GameLoop.class
diff --git a/bin/gameoflife/Grid.class b/bin/gameoflife/Grid.class
diff --git a/bin/gameoflife/Main.class b/bin/gameoflife/Main.class
diff --git a/bin/module-info.class b/bin/module-info.class
diff --git a/src/gameoflife/Draw.java b/src/gameoflife/Draw.java
@@ -11,10 +11,10 @@ protected void paintComponent(Graphics g) {
 		super.paintComponent(g);
 
 		g.setColor(Color.BLACK);
-		g.drawRect(9, 9, 514, 514);
+		g.drawRect(9, 9, 514, 258);
 
 		for(int x=0; x < Grid.CELLCOUNT; x++) {
-			for(int y=0; y < Grid.CELLCOUNT; y++) {
+			for(int y=0; y < Grid.CELLCOUNT_Y; y++) {
 				if(Grid.cells[x][y]) {
 					g.setColor(Color.RED);
 					g.drawRect(x + 10, y + 10, 1, 1);

diff --git a/src/gameoflife/Grid.java b/src/gameoflife/Grid.java
@@ -4,6 +4,7 @@
 
 public class Grid {
 	public static final int CELLCOUNT = 512;
+	public static final int CELLCOUNT_Y = 256;
 	public static boolean[][] cells = new boolean[CELLCOUNT][CELLCOUNT];
 
 	public final int startCells = 10000;
@@ -12,7 +13,7 @@ public class Grid {
 	public void init() {
 		for (int i = 0; i < startCells; i++) {
 			int x = genRandom(0, CELLCOUNT);
-			int y = genRandom(0, CELLCOUNT);
+			int y = genRandom(0, CELLCOUNT_Y);
 			cells[x][y] = true;
 		}
 	}
@@ -21,7 +22,7 @@ public static void step() {
 		gen++;
 		System.out.println("generation: " + gen);
 		for (int x = 0; x < CELLCOUNT; x++) {
-			for (int y = 0; y < CELLCOUNT; y++) {
+			for (int y = 0; y < CELLCOUNT_Y; y++) {
 				int neighbours = countNeighbours(x, y);
 				// rule: if cell is dead and has 3 neighbours revive it
 				if (neighbours == 3 && !cells[x][y]) {

diff --git a/src/gameoflife/Main.java b/src/gameoflife/Main.java
@@ -6,17 +6,18 @@
 public class Main extends JFrame{
 
 	public static void main(String [] args) {
+
+		Draw drawer = new Draw();
+		drawer.setVisible(true);
+
 		JFrame GUI = new JFrame("Game of Life");
-		GUI.setSize(550, 570);
+		GUI.setSize(540, 310);
 		GUI.setDefaultCloseOperation(EXIT_ON_CLOSE);
 		GUI.setResizable(false);
 		GUI.setLocationRelativeTo(null);
-		GUI.setVisible(true);
-
-		Draw drawer = new Draw();
 		GUI.add(drawer);
-		drawer.setVisible(true);
-		
+		GUI.setVisible(true);
+
 		Grid g = new Grid();
 		GameLoop gl = new GameLoop();
 		g.init();