From 99d22fa7018ddc06fa2c256dd4758819b404dd7d Mon Sep 17 00:00:00 2001 From: GammelJan Date: Wed, 1 Apr 2020 11:41:11 +0200 Subject: [PATCH] =?UTF-8?q?MVC=20Struktur=20einf=C3=BChrt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/com/dungeoncrawler/{ => model}/Dungeon.java | 4 ++-- core/src/com/dungeoncrawler/{ => model}/Entity.java | 2 +- core/src/com/dungeoncrawler/{ => model}/Inventory.java | 2 +- core/src/com/dungeoncrawler/{ => model}/Item.java | 2 +- core/src/com/dungeoncrawler/{ => model}/ItemContainer.java | 4 +--- core/src/com/dungeoncrawler/{ => model}/Level.java | 2 +- core/src/com/dungeoncrawler/{ => model}/Room.java | 4 ++-- core/src/com/dungeoncrawler/{ => model}/entities/Archer.java | 4 ++-- core/src/com/dungeoncrawler/{ => model}/entities/Player.java | 4 ++-- .../com/dungeoncrawler/{ => model}/entities/Swordsman.java | 4 ++-- core/src/com/dungeoncrawler/{ => model}/items/Key.java | 4 ++-- core/src/com/dungeoncrawler/{ => model}/items/Potion.java | 4 ++-- core/src/com/dungeoncrawler/{ => model}/items/Sword.java | 4 ++-- core/src/com/dungeoncrawler/{Grafik.java => view/View.java} | 4 ++-- 14 files changed, 23 insertions(+), 25 deletions(-) rename core/src/com/dungeoncrawler/{ => model}/Dungeon.java (95%) rename core/src/com/dungeoncrawler/{ => model}/Entity.java (97%) rename core/src/com/dungeoncrawler/{ => model}/Inventory.java (95%) rename core/src/com/dungeoncrawler/{ => model}/Item.java (94%) rename core/src/com/dungeoncrawler/{ => model}/ItemContainer.java (94%) rename core/src/com/dungeoncrawler/{ => model}/Level.java (94%) rename core/src/com/dungeoncrawler/{ => model}/Room.java (93%) rename core/src/com/dungeoncrawler/{ => model}/entities/Archer.java (77%) rename core/src/com/dungeoncrawler/{ => model}/entities/Player.java (85%) rename core/src/com/dungeoncrawler/{ => model}/entities/Swordsman.java (85%) rename core/src/com/dungeoncrawler/{ => model}/items/Key.java (80%) rename core/src/com/dungeoncrawler/{ => model}/items/Potion.java (80%) rename core/src/com/dungeoncrawler/{ => model}/items/Sword.java (80%) rename core/src/com/dungeoncrawler/{Grafik.java => view/View.java} (88%) diff --git a/core/src/com/dungeoncrawler/Dungeon.java b/core/src/com/dungeoncrawler/model/Dungeon.java similarity index 95% rename from core/src/com/dungeoncrawler/Dungeon.java rename to core/src/com/dungeoncrawler/model/Dungeon.java index 51a8f3b..3a063d2 100644 --- a/core/src/com/dungeoncrawler/Dungeon.java +++ b/core/src/com/dungeoncrawler/model/Dungeon.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package com.dungeoncrawler; +package com.dungeoncrawler.model; -import com.dungeoncrawler.entities.Player; +import com.dungeoncrawler.model.entities.Player; /** * diff --git a/core/src/com/dungeoncrawler/Entity.java b/core/src/com/dungeoncrawler/model/Entity.java similarity index 97% rename from core/src/com/dungeoncrawler/Entity.java rename to core/src/com/dungeoncrawler/model/Entity.java index 082bae4..c50a2a8 100644 --- a/core/src/com/dungeoncrawler/Entity.java +++ b/core/src/com/dungeoncrawler/model/Entity.java @@ -1,4 +1,4 @@ -package com.dungeoncrawler; +package com.dungeoncrawler.model; public abstract class Entity { diff --git a/core/src/com/dungeoncrawler/Inventory.java b/core/src/com/dungeoncrawler/model/Inventory.java similarity index 95% rename from core/src/com/dungeoncrawler/Inventory.java rename to core/src/com/dungeoncrawler/model/Inventory.java index ba6ebc3..10f3d50 100644 --- a/core/src/com/dungeoncrawler/Inventory.java +++ b/core/src/com/dungeoncrawler/model/Inventory.java @@ -1,4 +1,4 @@ -package com.dungeoncrawler; +package com.dungeoncrawler.model; public class Inventory { diff --git a/core/src/com/dungeoncrawler/Item.java b/core/src/com/dungeoncrawler/model/Item.java similarity index 94% rename from core/src/com/dungeoncrawler/Item.java rename to core/src/com/dungeoncrawler/model/Item.java index e5404fa..9777aa1 100644 --- a/core/src/com/dungeoncrawler/Item.java +++ b/core/src/com/dungeoncrawler/model/Item.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package com.dungeoncrawler; +package com.dungeoncrawler.model; /** * diff --git a/core/src/com/dungeoncrawler/ItemContainer.java b/core/src/com/dungeoncrawler/model/ItemContainer.java similarity index 94% rename from core/src/com/dungeoncrawler/ItemContainer.java rename to core/src/com/dungeoncrawler/model/ItemContainer.java index d515f01..38a9f10 100644 --- a/core/src/com/dungeoncrawler/ItemContainer.java +++ b/core/src/com/dungeoncrawler/model/ItemContainer.java @@ -3,9 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package com.dungeoncrawler; - -import com.dungeoncrawler.items.*; +package com.dungeoncrawler.model; /** * * @author jonathan diff --git a/core/src/com/dungeoncrawler/Level.java b/core/src/com/dungeoncrawler/model/Level.java similarity index 94% rename from core/src/com/dungeoncrawler/Level.java rename to core/src/com/dungeoncrawler/model/Level.java index 8429aba..15d0fb5 100644 --- a/core/src/com/dungeoncrawler/Level.java +++ b/core/src/com/dungeoncrawler/model/Level.java @@ -3,7 +3,7 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package com.dungeoncrawler; +package com.dungeoncrawler.model; /** * diff --git a/core/src/com/dungeoncrawler/Room.java b/core/src/com/dungeoncrawler/model/Room.java similarity index 93% rename from core/src/com/dungeoncrawler/Room.java rename to core/src/com/dungeoncrawler/model/Room.java index 1a5d582..69d1dfe 100644 --- a/core/src/com/dungeoncrawler/Room.java +++ b/core/src/com/dungeoncrawler/model/Room.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package com.dungeoncrawler; +package com.dungeoncrawler.model; -import com.dungeoncrawler.entities.*; +import com.dungeoncrawler.model.Entity; /** * diff --git a/core/src/com/dungeoncrawler/entities/Archer.java b/core/src/com/dungeoncrawler/model/entities/Archer.java similarity index 77% rename from core/src/com/dungeoncrawler/entities/Archer.java rename to core/src/com/dungeoncrawler/model/entities/Archer.java index 6612fdc..df0fa20 100644 --- a/core/src/com/dungeoncrawler/entities/Archer.java +++ b/core/src/com/dungeoncrawler/model/entities/Archer.java @@ -1,5 +1,5 @@ -package com.dungeoncrawler.entities; -import com.dungeoncrawler.Entity; +package com.dungeoncrawler.model.entities; +import com.dungeoncrawler.model.Entity; public class Archer extends Entity{ diff --git a/core/src/com/dungeoncrawler/entities/Player.java b/core/src/com/dungeoncrawler/model/entities/Player.java similarity index 85% rename from core/src/com/dungeoncrawler/entities/Player.java rename to core/src/com/dungeoncrawler/model/entities/Player.java index 36c25b9..0d3c5b8 100644 --- a/core/src/com/dungeoncrawler/entities/Player.java +++ b/core/src/com/dungeoncrawler/model/entities/Player.java @@ -3,10 +3,10 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package com.dungeoncrawler.entities; +package com.dungeoncrawler.model.entities; -import com.dungeoncrawler.Entity; +import com.dungeoncrawler.model.Entity; /** * * @author Jan diff --git a/core/src/com/dungeoncrawler/entities/Swordsman.java b/core/src/com/dungeoncrawler/model/entities/Swordsman.java similarity index 85% rename from core/src/com/dungeoncrawler/entities/Swordsman.java rename to core/src/com/dungeoncrawler/model/entities/Swordsman.java index 473c2ee..d18f6fa 100644 --- a/core/src/com/dungeoncrawler/entities/Swordsman.java +++ b/core/src/com/dungeoncrawler/model/entities/Swordsman.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package com.dungeoncrawler.entities; +package com.dungeoncrawler.model.entities; -import com.dungeoncrawler.Entity; +import com.dungeoncrawler.model.Entity; /** * diff --git a/core/src/com/dungeoncrawler/items/Key.java b/core/src/com/dungeoncrawler/model/items/Key.java similarity index 80% rename from core/src/com/dungeoncrawler/items/Key.java rename to core/src/com/dungeoncrawler/model/items/Key.java index bafebba..cd2e88f 100644 --- a/core/src/com/dungeoncrawler/items/Key.java +++ b/core/src/com/dungeoncrawler/model/items/Key.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package com.dungeoncrawler.items; +package com.dungeoncrawler.model.items; -import com.dungeoncrawler.Item; +import com.dungeoncrawler.model.Item; /** * diff --git a/core/src/com/dungeoncrawler/items/Potion.java b/core/src/com/dungeoncrawler/model/items/Potion.java similarity index 80% rename from core/src/com/dungeoncrawler/items/Potion.java rename to core/src/com/dungeoncrawler/model/items/Potion.java index 79af380..164a5d4 100644 --- a/core/src/com/dungeoncrawler/items/Potion.java +++ b/core/src/com/dungeoncrawler/model/items/Potion.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package com.dungeoncrawler.items; +package com.dungeoncrawler.model.items; -import com.dungeoncrawler.Item; +import com.dungeoncrawler.model.Item; /** * diff --git a/core/src/com/dungeoncrawler/items/Sword.java b/core/src/com/dungeoncrawler/model/items/Sword.java similarity index 80% rename from core/src/com/dungeoncrawler/items/Sword.java rename to core/src/com/dungeoncrawler/model/items/Sword.java index 4992619..fe17918 100644 --- a/core/src/com/dungeoncrawler/items/Sword.java +++ b/core/src/com/dungeoncrawler/model/items/Sword.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package com.dungeoncrawler.items; +package com.dungeoncrawler.model.items; -import com.dungeoncrawler.Item; +import com.dungeoncrawler.model.Item; /** * diff --git a/core/src/com/dungeoncrawler/Grafik.java b/core/src/com/dungeoncrawler/view/View.java similarity index 88% rename from core/src/com/dungeoncrawler/Grafik.java rename to core/src/com/dungeoncrawler/view/View.java index 08a0175..4c75d76 100644 --- a/core/src/com/dungeoncrawler/Grafik.java +++ b/core/src/com/dungeoncrawler/view/View.java @@ -1,4 +1,4 @@ -package com.dungeoncrawler; +package com.dungeoncrawler.view; import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Gdx; @@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -public class Grafik extends ApplicationAdapter { +public class View extends ApplicationAdapter { SpriteBatch batch; Texture img;