Use libgdx's timer for fluids

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / world / GameWorld.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
index 60a34e14353704bc0c76d52b505efa80cb9f7b58..43fc1641033616ec6645795ead6daed286dc82e3 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
@@ -1,26 +1,23 @@
 package ru.deadsoftware.cavedroid.game.world;
 
 import com.badlogic.gdx.utils.Disposable;
-import com.badlogic.gdx.utils.TimeUtils;
+import com.badlogic.gdx.utils.Timer;
 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;
+import ru.deadsoftware.cavedroid.game.model.world.generator.WorldGeneratorConfig;
 import ru.deadsoftware.cavedroid.game.objects.Block;
 import ru.deadsoftware.cavedroid.game.objects.DropController;
 
 import javax.annotation.CheckForNull;
 import javax.inject.Inject;
-import java.sql.Time;
-import java.util.Timer;
 
 @GameScope
 public class GameWorld implements Disposable {
 
-    private static final int DEFAULT_WIDTH = 1024;
-    private static final int DEFAULT_HEIGHT = 256;
     private static final int UPDATE_RANGE = 16;
 
     private final DropController mDropController;
@@ -49,9 +46,10 @@ public class GameWorld implements Disposable {
         boolean isNewGame = foreMap == null || backMap == null;
 
         if (isNewGame) {
-            mWidth = DEFAULT_WIDTH;
-            mHeight = DEFAULT_HEIGHT;
-            Pair<int[][], int[][]> maps = GameWorldGenerator.INSTANCE.generate(mWidth, mHeight, TimeUtils.millis());
+            final WorldGeneratorConfig config = WorldGeneratorConfig.Companion.getDefault();
+            mWidth = config.getWidth();
+            mHeight = config.getHeight();
+            Pair<int[][], int[][]> maps = new GameWorldGenerator(config).generate();
             mForeMap = maps.getFirst();
             mBackMap = maps.getSecond();
             mMobsController.getPlayer().respawn(this);
@@ -62,10 +60,10 @@ public class GameWorld implements Disposable {
             mHeight = mForeMap[0].length;
         }
 
-        mGameFluidsThread = new GameFluidsThread(this, mMobsController, Thread.currentThread());
+        mGameFluidsThread = new GameFluidsThread(this, mMobsController);
 
         mGameFluidsTimer = new Timer();
-        mGameFluidsTimer.scheduleAtFixedRate(mGameFluidsThread, 0, GameFluidsThread.FLUID_UPDATE_INTERVAL_MS);
+        mGameFluidsTimer.scheduleTask(mGameFluidsThread, 0, GameFluidsThread.FLUID_UPDATE_INTERVAL_SEC);
     }
 
     public int getWidth() {
@@ -215,15 +213,15 @@ public class GameWorld implements Disposable {
         if (getForeMap(x, y) == 10) {
             if (!hasForeAt(x, y + 1) || !getForeMapBlock(x, y + 1).hasCollision()) {
                 setForeMap(x, y, 0);
-                mMobsController.addMob(FallingSand.class, x * 16, y * 16);
+                mMobsController.addMob(new FallingSand(x * 16, y * 16));
                 updateBlock(x, y - 1);
-            }   
+            }
         }
 
         if (getForeMap(x, y) == 11) {
             if (!hasForeAt(x, y + 1) || !getForeMapBlock(x, y + 1).hasCollision()) {
                 setForeMap(x, y, 0);
-                mMobsController.addMob(FallingGravel.class, x * 16, y * 16);
+                mMobsController.addMob(new FallingGravel(x * 16, y * 16));
                 updateBlock(x, y - 1);
             }
         }
@@ -256,6 +254,6 @@ public class GameWorld implements Disposable {
 
     @Override
     public void dispose() {
-        mGameFluidsTimer.cancel();
+        mGameFluidsThread.cancel();
     }
 }
\ No newline at end of file