From bde96e986e94e74773e18d66753bb4653e7543ec Mon Sep 17 00:00:00 2001
From: Dennis Eisold <de@itstall.de>
Date: Tue, 19 Nov 2019 21:41:28 +0100
Subject: [PATCH] Code cleanup
---
src/de/itstall/EmptyTile.java | 2 +-
src/de/itstall/GameField.java | 14 +++++---------
src/de/itstall/GameMain.java | 3 ---
src/de/itstall/GameTile.java | 2 +-
src/de/itstall/Player.java | 2 +-
src/de/itstall/Position.java | 18 +++++++-----------
src/de/itstall/WallTile.java | 2 +-
src/de/itstall/World.java | 18 ++++++++----------
8 files changed, 24 insertions(+), 37 deletions(-)
diff --git a/src/de/itstall/EmptyTile.java b/src/de/itstall/EmptyTile.java
index d823bcf..aa3fda1 100644
--- a/src/de/itstall/EmptyTile.java
+++ b/src/de/itstall/EmptyTile.java
@@ -3,7 +3,7 @@ package de.itstall;
public class EmptyTile extends GameTile {
EmptyTile(Position position) {
- this.pos = new Position(0, 0);
+ this.pos = position;
}
@Override
diff --git a/src/de/itstall/GameField.java b/src/de/itstall/GameField.java
index 4dfc429..a627550 100644
--- a/src/de/itstall/GameField.java
+++ b/src/de/itstall/GameField.java
@@ -1,7 +1,7 @@
package de.itstall;
public class GameField {
- public int width, height;
+ int width, height;
private GameTile[][] field;
GameField(int width, String stringField) {
@@ -26,12 +26,8 @@ public class GameField {
}
}
- public boolean checkField(int x, int y) {
- if(this.field[x][y].getClass().getSimpleName().equals("EmptyTile")) {
- return true;
- } else {
- return false;
- }
+ boolean checkField(int x, int y) {
+ return this.field[x][y].getClass().getSimpleName().equals("EmptyTile");
}
@Override
@@ -40,8 +36,8 @@ public class GameField {
StringBuilder sb = new StringBuilder();
for (int y = 0; y < this.field[0].length; y++) {
- for (int x = 0; x < this.field.length; x++) {
- sb.append(this.field[x][y]);
+ for (GameTile[] gameTiles : this.field) {
+ sb.append(gameTiles[y]);
}
}
diff --git a/src/de/itstall/GameMain.java b/src/de/itstall/GameMain.java
index 491dd73..3a34adb 100644
--- a/src/de/itstall/GameMain.java
+++ b/src/de/itstall/GameMain.java
@@ -1,11 +1,8 @@
package de.itstall;
-import java.io.*;
-
public class GameMain {
public static void main(String[] args) {
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
World w = new World();
w.setLineBreaks(7);
char key;
diff --git a/src/de/itstall/GameTile.java b/src/de/itstall/GameTile.java
index faa3df0..3a4a839 100644
--- a/src/de/itstall/GameTile.java
+++ b/src/de/itstall/GameTile.java
@@ -3,7 +3,7 @@ package de.itstall;
public abstract class GameTile {
Position pos;
- public GameTile() {
+ GameTile() {
pos = new Position(0, 0);
}
diff --git a/src/de/itstall/Player.java b/src/de/itstall/Player.java
index 4dbac69..06a488f 100644
--- a/src/de/itstall/Player.java
+++ b/src/de/itstall/Player.java
@@ -6,7 +6,7 @@ public class Player extends GameTile {
this.pos = position;
}
- public String draw(String s, int worldLength) {
+ String draw(String s, int worldLength) {
int index = pos.toIndex( worldLength );
char[] chars = s.toCharArray();
chars[index] = this.toString().charAt(0);
diff --git a/src/de/itstall/Position.java b/src/de/itstall/Position.java
index 97e43ae..39d23a5 100644
--- a/src/de/itstall/Position.java
+++ b/src/de/itstall/Position.java
@@ -1,20 +1,16 @@
package de.itstall;
public class Position {
- private int x = 0;
- private int y = 0;
+ private int x;
+ private int y;
- public Position(int x, int y) {
+ Position(int x, int y) {
this.x = x;
this.y = y;
}
public boolean equals(Position obj, Position obj2) {
- if (obj.getX() == obj2.getX() && obj.getY() == obj2.getY()) {
- return true;
- } else {
- return false;
- }
+ return obj.getX() == obj2.getX() && obj.getY() == obj2.getY();
}
void setPosition(int x, int y) {
@@ -22,15 +18,15 @@ public class Position {
this.y = y;
}
- public int getX() {
+ int getX() {
return x;
}
- public int getY() {
+ int getY() {
return y;
}
- public int toIndex(int width) {
+ int toIndex(int width) {
return x + y * width;
}
}
diff --git a/src/de/itstall/WallTile.java b/src/de/itstall/WallTile.java
index 88b7678..ede7b6f 100644
--- a/src/de/itstall/WallTile.java
+++ b/src/de/itstall/WallTile.java
@@ -3,7 +3,7 @@ package de.itstall;
public class WallTile extends GameTile {
WallTile(Position position) {
- this.pos = new Position(0, 0);
+ this.pos = position;
}
@Override
diff --git a/src/de/itstall/World.java b/src/de/itstall/World.java
index 458c72d..d3e2e8d 100644
--- a/src/de/itstall/World.java
+++ b/src/de/itstall/World.java
@@ -1,18 +1,18 @@
package de.itstall;
-public class World {
- GameField field;
- Player player;
+class World {
+ private GameField field;
+ private Player player;
private int lineBreaks = 0;
private boolean tempLineBreaks = false;
- public World() {
+ World() {
String canvas = "######### ## #### ## #########";
this.field = new GameField(8, canvas);
this.player = new Player(new Position(1, 1));
}
- public String draw() {
+ String draw() {
StringBuilder sb = new StringBuilder();
String s = this.player.draw(this.field.toString(), this.field.width);
@@ -22,9 +22,7 @@ public class World {
breaks--;
}
- for(int i = 0; i < breaks; i++) {
- sb.append("\n");
- }
+ sb.append("\n".repeat(Math.max(0, breaks)));
for (int y = 0; y < this.field.height; y++) {
sb.append(s.substring(y * this.field.width, (y + 1) * this.field.width));
@@ -34,7 +32,7 @@ public class World {
return sb.toString();
}
- public void keyPressed(String s) {
+ void keyPressed(String s) {
if( s.isEmpty() ) {
return;
}
@@ -72,7 +70,7 @@ public class World {
}
}
- public void setLineBreaks(int lineBreaks) {
+ void setLineBreaks(int lineBreaks) {
this.lineBreaks = lineBreaks;
}
}
--
GitLab