From 496e6792c345f9e3c3513b3cb062e36ad6ce78eb Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Thu, 6 Nov 2014 23:29:33 +0100
Subject: [PATCH] Move package item from background to entity.

---
 src/de/teamteamteam/spacescooter/entity/LivingEntity.java       | 2 +-
 src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java   | 2 +-
 .../spacescooter/{background => entity}/item/ItemChance.java    | 2 +-
 .../spacescooter/{background => entity}/item/Items.java         | 2 +-
 .../spacescooter/{background => entity}/item/TestItem1.java     | 2 +-
 .../spacescooter/{background => entity}/item/TestItem2.java     | 2 +-
 .../spacescooter/{background => entity}/item/TestItem3.java     | 2 +-
 .../spacescooter/{background => entity}/item/TestItem4.java     | 2 +-
 src/de/teamteamteam/spacescooter/screen/GameScreen.java         | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename src/de/teamteamteam/spacescooter/{background => entity}/item/ItemChance.java (91%)
 rename src/de/teamteamteam/spacescooter/{background => entity}/item/Items.java (94%)
 rename src/de/teamteamteam/spacescooter/{background => entity}/item/TestItem1.java (84%)
 rename src/de/teamteamteam/spacescooter/{background => entity}/item/TestItem2.java (86%)
 rename src/de/teamteamteam/spacescooter/{background => entity}/item/TestItem3.java (86%)
 rename src/de/teamteamteam/spacescooter/{background => entity}/item/TestItem4.java (86%)

diff --git a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
index 058e19e..e374726 100644
--- a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
+++ b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java
@@ -3,9 +3,9 @@ package de.teamteamteam.spacescooter.entity;
 import java.awt.Rectangle;
 import java.util.List;
 
-import de.teamteamteam.spacescooter.background.item.Items;
 import de.teamteamteam.spacescooter.entity.enemy.Enemy;
 import de.teamteamteam.spacescooter.entity.explosion.Explosion;
+import de.teamteamteam.spacescooter.entity.item.Items;
 import de.teamteamteam.spacescooter.entity.shot.Shot;
 import de.teamteamteam.spacescooter.screen.Screen;
 import de.teamteamteam.spacescooter.utility.GameConfig;
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
index 039762b..db9984e 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
@@ -4,9 +4,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
-import de.teamteamteam.spacescooter.background.item.Items;
 import de.teamteamteam.spacescooter.entity.Entity;
 import de.teamteamteam.spacescooter.entity.Player;
+import de.teamteamteam.spacescooter.entity.item.Items;
 import de.teamteamteam.spacescooter.screen.Screen;
 import de.teamteamteam.spacescooter.utility.GameConfig;
 
diff --git a/src/de/teamteamteam/spacescooter/background/item/ItemChance.java b/src/de/teamteamteam/spacescooter/entity/item/ItemChance.java
similarity index 91%
rename from src/de/teamteamteam/spacescooter/background/item/ItemChance.java
rename to src/de/teamteamteam/spacescooter/entity/item/ItemChance.java
index 1b8f720..d21b5e5 100644
--- a/src/de/teamteamteam/spacescooter/background/item/ItemChance.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/ItemChance.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.background.item;
+package de.teamteamteam.spacescooter.entity.item;
 
 import java.util.Random;
 
diff --git a/src/de/teamteamteam/spacescooter/background/item/Items.java b/src/de/teamteamteam/spacescooter/entity/item/Items.java
similarity index 94%
rename from src/de/teamteamteam/spacescooter/background/item/Items.java
rename to src/de/teamteamteam/spacescooter/entity/item/Items.java
index 627f91a..2084c8b 100644
--- a/src/de/teamteamteam/spacescooter/background/item/Items.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/Items.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.background.item;
+package de.teamteamteam.spacescooter.entity.item;
 
 import java.util.List;
 
diff --git a/src/de/teamteamteam/spacescooter/background/item/TestItem1.java b/src/de/teamteamteam/spacescooter/entity/item/TestItem1.java
similarity index 84%
rename from src/de/teamteamteam/spacescooter/background/item/TestItem1.java
rename to src/de/teamteamteam/spacescooter/entity/item/TestItem1.java
index fea29c4..4f524ba 100644
--- a/src/de/teamteamteam/spacescooter/background/item/TestItem1.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/TestItem1.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.background.item;
+package de.teamteamteam.spacescooter.entity.item;
 
 import de.teamteamteam.spacescooter.entity.Player;
 
diff --git a/src/de/teamteamteam/spacescooter/background/item/TestItem2.java b/src/de/teamteamteam/spacescooter/entity/item/TestItem2.java
similarity index 86%
rename from src/de/teamteamteam/spacescooter/background/item/TestItem2.java
rename to src/de/teamteamteam/spacescooter/entity/item/TestItem2.java
index 6e19222..0e4fbab 100644
--- a/src/de/teamteamteam/spacescooter/background/item/TestItem2.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/TestItem2.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.background.item;
+package de.teamteamteam.spacescooter.entity.item;
 
 import de.teamteamteam.spacescooter.entity.Player;
 
diff --git a/src/de/teamteamteam/spacescooter/background/item/TestItem3.java b/src/de/teamteamteam/spacescooter/entity/item/TestItem3.java
similarity index 86%
rename from src/de/teamteamteam/spacescooter/background/item/TestItem3.java
rename to src/de/teamteamteam/spacescooter/entity/item/TestItem3.java
index 51951f7..504f818 100644
--- a/src/de/teamteamteam/spacescooter/background/item/TestItem3.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/TestItem3.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.background.item;
+package de.teamteamteam.spacescooter.entity.item;
 
 import de.teamteamteam.spacescooter.entity.Player;
 
diff --git a/src/de/teamteamteam/spacescooter/background/item/TestItem4.java b/src/de/teamteamteam/spacescooter/entity/item/TestItem4.java
similarity index 86%
rename from src/de/teamteamteam/spacescooter/background/item/TestItem4.java
rename to src/de/teamteamteam/spacescooter/entity/item/TestItem4.java
index 94f9eb3..943a4d7 100644
--- a/src/de/teamteamteam/spacescooter/background/item/TestItem4.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/TestItem4.java
@@ -1,4 +1,4 @@
-package de.teamteamteam.spacescooter.background.item;
+package de.teamteamteam.spacescooter.entity.item;
 
 import de.teamteamteam.spacescooter.entity.Player;
 
diff --git a/src/de/teamteamteam/spacescooter/screen/GameScreen.java b/src/de/teamteamteam/spacescooter/screen/GameScreen.java
index 442e0ff..e2f2c1e 100644
--- a/src/de/teamteamteam/spacescooter/screen/GameScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/GameScreen.java
@@ -8,13 +8,13 @@ import java.util.Iterator;
 import java.util.List;
 
 import de.teamteamteam.spacescooter.background.StarBackground;
-import de.teamteamteam.spacescooter.background.item.ItemChance;
 import de.teamteamteam.spacescooter.control.Keyboard;
 import de.teamteamteam.spacescooter.entity.Entity;
 import de.teamteamteam.spacescooter.entity.HealthBar;
 import de.teamteamteam.spacescooter.entity.Player;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyFour;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyThree;
+import de.teamteamteam.spacescooter.entity.item.ItemChance;
 
 /**
  * In this GameScreen, the actual gameplay takes place.