From bec414e676498a47d80949a6a8356b5f267d3dab Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Wed, 19 Feb 2020 11:15:23 +0100
Subject: [PATCH] =?UTF-8?q?Legger=20til=20enum=20Action=20og=20bytter=20na?=
=?UTF-8?q?vn=20p=C3=A5=20abstractions=20pakken?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bytter pakkenavn fra abstractions til element_properties
---
.../roborally/element_properties/Action.java | 14 ++++++++++++++
.../Direction.java | 2 +-
.../GameTexture.java | 2 +-
.../{game => element_properties}/Position.java | 2 +-
.../TileType.java | 2 +-
.../WallType.java | 2 +-
.../fiasko/roborally/objects/DrawableObject.java | 4 ++--
.../fiasko/roborally/objects/IDrawableObject.java | 2 +-
.../inf112/fiasko/roborally/DirectionTest.java | 2 +-
.../fiasko/roborally/DrawableObjectTest.java | 2 +-
.../java/inf112/fiasko/roborally/PositionTest.java | 2 +-
.../java/inf112/fiasko/roborally/TileTypeTest.java | 2 +-
.../java/inf112/fiasko/roborally/WallTypeTest.java | 4 ++--
13 files changed, 28 insertions(+), 14 deletions(-)
create mode 100644 src/main/java/inf112/fiasko/roborally/element_properties/Action.java
rename src/main/java/inf112/fiasko/roborally/{abstractions => element_properties}/Direction.java (96%)
rename src/main/java/inf112/fiasko/roborally/{abstractions => element_properties}/GameTexture.java (65%)
rename src/main/java/inf112/fiasko/roborally/{game => element_properties}/Position.java (93%)
rename src/main/java/inf112/fiasko/roborally/{abstractions => element_properties}/TileType.java (97%)
rename src/main/java/inf112/fiasko/roborally/{abstractions => element_properties}/WallType.java (95%)
diff --git a/src/main/java/inf112/fiasko/roborally/element_properties/Action.java b/src/main/java/inf112/fiasko/roborally/element_properties/Action.java
new file mode 100644
index 0000000..5c42c89
--- /dev/null
+++ b/src/main/java/inf112/fiasko/roborally/element_properties/Action.java
@@ -0,0 +1,14 @@
+package inf112.fiasko.roborally.element_properties;
+
+/**
+ * This enum represents an action on a programming card
+ */
+public enum Action {
+ ROTATE_RIGHT,
+ ROTATE_LEFT,
+ U_TURN,
+ MOVE_1,
+ MOVE_2,
+ MOVE_3,
+ BACK_UP
+}
\ No newline at end of file
diff --git a/src/main/java/inf112/fiasko/roborally/abstractions/Direction.java b/src/main/java/inf112/fiasko/roborally/element_properties/Direction.java
similarity index 96%
rename from src/main/java/inf112/fiasko/roborally/abstractions/Direction.java
rename to src/main/java/inf112/fiasko/roborally/element_properties/Direction.java
index 67415c8..864b974 100644
--- a/src/main/java/inf112/fiasko/roborally/abstractions/Direction.java
+++ b/src/main/java/inf112/fiasko/roborally/element_properties/Direction.java
@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.abstractions;
+package inf112.fiasko.roborally.element_properties;
/**
* This enum represents all possible directions for an element on the board
diff --git a/src/main/java/inf112/fiasko/roborally/abstractions/GameTexture.java b/src/main/java/inf112/fiasko/roborally/element_properties/GameTexture.java
similarity index 65%
rename from src/main/java/inf112/fiasko/roborally/abstractions/GameTexture.java
rename to src/main/java/inf112/fiasko/roborally/element_properties/GameTexture.java
index debcb61..83b0505 100644
--- a/src/main/java/inf112/fiasko/roborally/abstractions/GameTexture.java
+++ b/src/main/java/inf112/fiasko/roborally/element_properties/GameTexture.java
@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.abstractions;
+package inf112.fiasko.roborally.element_properties;
/**
* This enum represents a drawable texture
diff --git a/src/main/java/inf112/fiasko/roborally/game/Position.java b/src/main/java/inf112/fiasko/roborally/element_properties/Position.java
similarity index 93%
rename from src/main/java/inf112/fiasko/roborally/game/Position.java
rename to src/main/java/inf112/fiasko/roborally/element_properties/Position.java
index 1e948fd..aab5f6e 100644
--- a/src/main/java/inf112/fiasko/roborally/game/Position.java
+++ b/src/main/java/inf112/fiasko/roborally/element_properties/Position.java
@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.game;
+package inf112.fiasko.roborally.element_properties;
/**
* This class represent a position on the board
diff --git a/src/main/java/inf112/fiasko/roborally/abstractions/TileType.java b/src/main/java/inf112/fiasko/roborally/element_properties/TileType.java
similarity index 97%
rename from src/main/java/inf112/fiasko/roborally/abstractions/TileType.java
rename to src/main/java/inf112/fiasko/roborally/element_properties/TileType.java
index 18cf3ab..5ee031c 100644
--- a/src/main/java/inf112/fiasko/roborally/abstractions/TileType.java
+++ b/src/main/java/inf112/fiasko/roborally/element_properties/TileType.java
@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.abstractions;
+package inf112.fiasko.roborally.element_properties;
/**
* This enum represents all possible tile types
diff --git a/src/main/java/inf112/fiasko/roborally/abstractions/WallType.java b/src/main/java/inf112/fiasko/roborally/element_properties/WallType.java
similarity index 95%
rename from src/main/java/inf112/fiasko/roborally/abstractions/WallType.java
rename to src/main/java/inf112/fiasko/roborally/element_properties/WallType.java
index 8eea294..1b5c79a 100644
--- a/src/main/java/inf112/fiasko/roborally/abstractions/WallType.java
+++ b/src/main/java/inf112/fiasko/roborally/element_properties/WallType.java
@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally.abstractions;
+package inf112.fiasko.roborally.element_properties;
/**
* This enum represents all possible wall types
diff --git a/src/main/java/inf112/fiasko/roborally/objects/DrawableObject.java b/src/main/java/inf112/fiasko/roborally/objects/DrawableObject.java
index df8333a..bbedf7d 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/DrawableObject.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/DrawableObject.java
@@ -1,12 +1,12 @@
package inf112.fiasko.roborally.objects;
-import inf112.fiasko.roborally.abstractions.GameTexture;
+import inf112.fiasko.roborally.element_properties.GameTexture;
/**
* This class represents an object that can be drawn using libgdx
*/
public class DrawableObject implements IDrawableObject {
- private GameTexture texture;
+ private final GameTexture texture;
private int xPos;
private int yPos;
private int width = 64;
diff --git a/src/main/java/inf112/fiasko/roborally/objects/IDrawableObject.java b/src/main/java/inf112/fiasko/roborally/objects/IDrawableObject.java
index f6d2816..afbdd8e 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/IDrawableObject.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/IDrawableObject.java
@@ -1,6 +1,6 @@
package inf112.fiasko.roborally.objects;
-import inf112.fiasko.roborally.abstractions.GameTexture;
+import inf112.fiasko.roborally.element_properties.GameTexture;
/**
* This interface describes an object drawable using libgdx
diff --git a/src/test/java/inf112/fiasko/roborally/DirectionTest.java b/src/test/java/inf112/fiasko/roborally/DirectionTest.java
index 9b797fd..987f1fb 100644
--- a/src/test/java/inf112/fiasko/roborally/DirectionTest.java
+++ b/src/test/java/inf112/fiasko/roborally/DirectionTest.java
@@ -1,6 +1,6 @@
package inf112.fiasko.roborally;
-import inf112.fiasko.roborally.abstractions.Direction;
+import inf112.fiasko.roborally.element_properties.Direction;
import org.junit.Test;
import java.util.ArrayList;
diff --git a/src/test/java/inf112/fiasko/roborally/DrawableObjectTest.java b/src/test/java/inf112/fiasko/roborally/DrawableObjectTest.java
index 7c24462..7c767d3 100644
--- a/src/test/java/inf112/fiasko/roborally/DrawableObjectTest.java
+++ b/src/test/java/inf112/fiasko/roborally/DrawableObjectTest.java
@@ -1,7 +1,7 @@
package inf112.fiasko.roborally;
import inf112.fiasko.roborally.objects.DrawableObject;
-import inf112.fiasko.roborally.abstractions.GameTexture;
+import inf112.fiasko.roborally.element_properties.GameTexture;
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/inf112/fiasko/roborally/PositionTest.java b/src/test/java/inf112/fiasko/roborally/PositionTest.java
index 09c4449..6fe10b3 100644
--- a/src/test/java/inf112/fiasko/roborally/PositionTest.java
+++ b/src/test/java/inf112/fiasko/roborally/PositionTest.java
@@ -1,6 +1,6 @@
package inf112.fiasko.roborally;
-import inf112.fiasko.roborally.game.Position;
+import inf112.fiasko.roborally.element_properties.Position;
import org.junit.Before;
import org.junit.Test;
diff --git a/src/test/java/inf112/fiasko/roborally/TileTypeTest.java b/src/test/java/inf112/fiasko/roborally/TileTypeTest.java
index ea791e5..266c6b3 100644
--- a/src/test/java/inf112/fiasko/roborally/TileTypeTest.java
+++ b/src/test/java/inf112/fiasko/roborally/TileTypeTest.java
@@ -1,6 +1,6 @@
package inf112.fiasko.roborally;
-import inf112.fiasko.roborally.abstractions.TileType;
+import inf112.fiasko.roborally.element_properties.TileType;
import org.junit.Test;
import java.util.ArrayList;
diff --git a/src/test/java/inf112/fiasko/roborally/WallTypeTest.java b/src/test/java/inf112/fiasko/roborally/WallTypeTest.java
index 70f085f..8ae480d 100644
--- a/src/test/java/inf112/fiasko/roborally/WallTypeTest.java
+++ b/src/test/java/inf112/fiasko/roborally/WallTypeTest.java
@@ -1,7 +1,7 @@
package inf112.fiasko.roborally;
-import inf112.fiasko.roborally.abstractions.TileType;
-import inf112.fiasko.roborally.abstractions.WallType;
+import inf112.fiasko.roborally.element_properties.TileType;
+import inf112.fiasko.roborally.element_properties.WallType;
import org.junit.Test;
import java.util.ArrayList;