From 2a85c1d5a3e5e55dfe773e63ec4c1d50d9913a8b Mon Sep 17 00:00:00 2001 From: Asecave Date: Wed, 23 Jun 2021 17:57:55 +0200 Subject: [PATCH] entity package --- Zoelda/src/main/LivingEntity.java | 1 + Zoelda/src/main/Malin.java | 1 + Zoelda/src/main/World.java | 1 + Zoelda/src/main/{ => entities}/Entity.java | 3 ++- Zoelda/src/main/{ => entities}/Player.java | 5 ++++- 5 files changed, 9 insertions(+), 2 deletions(-) rename Zoelda/src/main/{ => entities}/Entity.java (98%) rename Zoelda/src/main/{ => entities}/Player.java (96%) diff --git a/Zoelda/src/main/LivingEntity.java b/Zoelda/src/main/LivingEntity.java index c58d6d4..91cb9bf 100644 --- a/Zoelda/src/main/LivingEntity.java +++ b/Zoelda/src/main/LivingEntity.java @@ -2,6 +2,7 @@ package main; import ea.ActionFigur; import ea.Figur; +import main.entities.Entity; /* * Alles was zustände hat und sich Bewegen kann, ist ein LivingEntity. diff --git a/Zoelda/src/main/Malin.java b/Zoelda/src/main/Malin.java index 466dbde..901014d 100644 --- a/Zoelda/src/main/Malin.java +++ b/Zoelda/src/main/Malin.java @@ -2,6 +2,7 @@ package main; import ea.Game; import ea.Manager; +import main.entities.Player; /** * Von hier wird alles initialisiert. Das ist die höchste Klasse. diff --git a/Zoelda/src/main/World.java b/Zoelda/src/main/World.java index b0273d3..a654611 100644 --- a/Zoelda/src/main/World.java +++ b/Zoelda/src/main/World.java @@ -1,6 +1,7 @@ package main; import ea.Knoten; +import main.entities.Player; /** * Hier werden alle Maps gespeichert. diff --git a/Zoelda/src/main/Entity.java b/Zoelda/src/main/entities/Entity.java similarity index 98% rename from Zoelda/src/main/Entity.java rename to Zoelda/src/main/entities/Entity.java index 7cdca83..8699dd7 100644 --- a/Zoelda/src/main/Entity.java +++ b/Zoelda/src/main/entities/Entity.java @@ -1,6 +1,7 @@ -package main; +package main.entities; import ea.Ticker; +import main.Map; /* * Alles was sich bewegen kann oder nicht an das grid der map gebunden ist, ist ein Entity. diff --git a/Zoelda/src/main/Player.java b/Zoelda/src/main/entities/Player.java similarity index 96% rename from Zoelda/src/main/Player.java rename to Zoelda/src/main/entities/Player.java index 2d1466a..ffea943 100644 --- a/Zoelda/src/main/Player.java +++ b/Zoelda/src/main/entities/Player.java @@ -1,6 +1,9 @@ -package main; +package main.entities; import ea.Taste; +import main.LivingEntity; +import main.Malin; +import main.SheetLoader; public class Player extends LivingEntity {