diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameModule.java b/core/src/ru/deadsoftware/cavedroid/game/GameModule.java
index fbbd294b0e032dda43c29c6ce772303a83673c1f..d57ab337e9e49c0cbc872ee037cb42b407908d24 100644 (file)
import ru.deadsoftware.cavedroid.MainConfig;
import ru.deadsoftware.cavedroid.game.mobs.MobsController;
import ru.deadsoftware.cavedroid.game.model.block.Block;
-import ru.deadsoftware.cavedroid.game.objects.DropController;
+import ru.deadsoftware.cavedroid.game.objects.drop.DropController;
+import ru.deadsoftware.cavedroid.game.objects.container.ContainerController;
import ru.deadsoftware.cavedroid.game.ui.TooltipManager;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
return controller;
}
+ @Provides
+ @GameScope
+ public static ContainerController provideFurnaceController(MainConfig mainConfig, DropController dropController, GameItemsHolder gameItemsHolder) {
+ load(mainConfig, gameItemsHolder);
+ ContainerController controller = data != null ? data.retrieveFurnaceController() : new ContainerController(dropController, gameItemsHolder);
+ makeDataNullIfEmpty();
+ controller.init(dropController, gameItemsHolder);
+ return controller;
+ }
+
@Provides
@GameScope
public static MobsController provideMobsController(MainConfig mainConfig,
public static GameWorld provideGameWorld(MainConfig mainConfig,
DropController dropController,
MobsController mobsController,
- GameItemsHolder gameItemsHolder) {
+ GameItemsHolder gameItemsHolder,
+ ContainerController containerController) {
load(mainConfig, gameItemsHolder);
Block[][] fm = data != null ? data.retrieveForeMap() : null;
Block[][] bm = data != null ? data.retrieveBackMap() : null;
makeDataNullIfEmpty();
- return new GameWorld(dropController, mobsController, gameItemsHolder, fm, bm);
+ return new GameWorld(dropController, mobsController, gameItemsHolder, containerController, fm, bm);
}
}