X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fworld%2FGameWorld.java;fp=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameWorld.java;h=18afcd4b3eec1c725a4675c5b8b429c317256da4;hb=2aa65a4cdb47df8014f28342d460fc6639bed885;hp=3bf4981d76d5b5914679f3ed82d2f81adcf979b7;hpb=a3995aab81fddd3ca6960b3ce24d2371eb00ef23;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
similarity index 95%
rename from core/src/ru/deadsoftware/cavedroid/game/GameWorld.java
rename to core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
index 3bf4981..18afcd4 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
@@ -1,8 +1,10 @@
-package ru.deadsoftware.cavedroid.game;
+package ru.deadsoftware.cavedroid.game.world;
 
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.TimeUtils;
 import kotlin.Pair;
+import ru.deadsoftware.cavedroid.game.GameItems;
+import ru.deadsoftware.cavedroid.game.GameScope;
 import ru.deadsoftware.cavedroid.game.mobs.FallingGravel;
 import ru.deadsoftware.cavedroid.game.mobs.FallingSand;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
@@ -45,7 +47,7 @@ public class GameWorld implements Disposable {
         if (isNewGame) {
             mWidth = DEFAULT_WIDTH;
             mHeight = DEFAULT_HEIGHT;
-            Pair<int[][], int[][]> maps = GameWorldGeneratorKt.generate(mWidth, mHeight, TimeUtils.millis());
+            Pair<int[][], int[][]> maps = GameWorldGenerator.INSTANCE.generate(mWidth, mHeight, TimeUtils.millis());
             mForeMap = maps.getFirst();
             mBackMap = maps.getSecond();
             mMobsController.getPlayer().respawn(this);
@@ -75,11 +77,11 @@ public class GameWorld implements Disposable {
         return mHeight * 16f;
     }
 
-    int[][] getFullForeMap() {
+    public int[][] getFullForeMap() {
         return mForeMap;
     }
 
-    int[][] getFullBackMap() {
+    public int[][] getFullBackMap() {
         return mBackMap;
     }