diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
index f8a5cc970e1749d34eb8abeb7f0f7acacb8df382..c038f1541d21822f90c122a75e30961dfee1fa40 100644 (file)
import ru.deadsoftware.cavedroid.game.model.item.InventoryItem;
import ru.deadsoftware.cavedroid.game.model.item.Item;
import ru.deadsoftware.cavedroid.game.model.world.generator.WorldGeneratorConfig;
-import ru.deadsoftware.cavedroid.game.objects.DropController;
+import ru.deadsoftware.cavedroid.game.objects.container.Container;
+import ru.deadsoftware.cavedroid.game.objects.drop.DropController;
+import ru.deadsoftware.cavedroid.game.objects.container.Furnace;
+import ru.deadsoftware.cavedroid.game.objects.container.ContainerController;
import ru.deadsoftware.cavedroid.misc.utils.MeasureUnitsUtilsKt;
import javax.annotation.CheckForNull;
@GameScope
public class GameWorld {
+ private static final int FOREGROUND_Z = 0;
+ private static final int BACKGROUND_Z = 1;
+
private final DropController mDropController;
private final MobsController mMobsController;
private final GameItemsHolder mGameItemsHolder;
+ private final ContainerController mContainerController;
private final int mWidth;
private final int mHeight;
private final Block[][] mForeMap;
private final Block[][] mBackMap;
+ private final WorldGeneratorConfig mWorldConfig = WorldGeneratorConfig.Companion.getDefault();
+
@Inject
public GameWorld(DropController dropController,
MobsController mobsController,
GameItemsHolder gameItemsHolder,
+ ContainerController containerController,
@CheckForNull Block[][] foreMap,
@CheckForNull Block[][] backMap) {
mDropController = dropController;
mMobsController = mobsController;
mGameItemsHolder = gameItemsHolder;
+ mContainerController = containerController;
boolean isNewGame = foreMap == null || backMap == null;
if (isNewGame) {
- final WorldGeneratorConfig config = WorldGeneratorConfig.Companion.getDefault();
- mWidth = config.getWidth();
- mHeight = config.getHeight();
- Pair<Block[][], Block[][]> maps = new GameWorldGenerator(config, mGameItemsHolder).generate();
+ mWidth = mWorldConfig.getWidth();
+ mHeight = mWorldConfig.getHeight();
+ Pair<Block[][], Block[][]> maps = new GameWorldGenerator(mWorldConfig, mGameItemsHolder).generate();
mForeMap = maps.getFirst();
mBackMap = maps.getSecond();
mMobsController.getPlayer().respawn(this, mGameItemsHolder);
private Block getMap(int x, int y, int layer) {
Block map = mGameItemsHolder.getFallbackBlock();
- try {
- x = transformX(x);
- map = (layer == 0) ? mForeMap[x][y] : mBackMap[x][y];
- } catch (ArrayIndexOutOfBoundsException ignored) {
+
+ if (y < 0 || y >= getHeight()) {
+ return map;
+ }
+
+ x = transformX(x);
+
+ if (x < 0 || x >= getWidth()) {
+ return map;
}
+
+ map = (layer == 0) ? mForeMap[x][y] : mBackMap[x][y];
+
return map;
}
private void setMap(int x, int y, int layer, Block value) {
- try {
- x = transformX(x);
- if (layer == 0) {
- mForeMap[x][y] = value;
- } else {
- mBackMap[x][y] = value;
- }
- } catch (ArrayIndexOutOfBoundsException ignored) {
+ if (y < 0 || y >= getHeight()) {
+ return;
+ }
+
+ x = transformX(x);
+
+ if (x < 0 || x >= getWidth()) {
+ return;
+ }
+
+ mContainerController.destroyContainer(x, y, layer, false);
+
+ if (value.isContainer()) {
+ mContainerController.addContainer(x, y, layer, (Class<? extends Block.Container>) value.getClass());
+ }
+
+ if (layer == 0) {
+ mForeMap[x][y] = value;
+ } else {
+ mBackMap[x][y] = value;
}
}
}
public boolean hasForeAt(int x, int y) {
- return getMap(x, y, 0) != mGameItemsHolder.getFallbackBlock();
+ return getMap(x, y, FOREGROUND_Z) != mGameItemsHolder.getFallbackBlock();
}
public boolean hasBackAt(int x, int y) {
- return getMap(x, y, 1) != mGameItemsHolder.getFallbackBlock();
+ return getMap(x, y, BACKGROUND_Z) != mGameItemsHolder.getFallbackBlock();
}
public Block getForeMap(int x, int y) {
- return getMap(x, y, 0);
+ return getMap(x, y, FOREGROUND_Z);
}
public void setForeMap(int x, int y, Block block) {
- setMap(x, y, 0, block);
+ setMap(x, y, FOREGROUND_Z, block);
}
public void resetForeMap(int x, int y) {
}
public Block getBackMap(int x, int y) {
- return getMap(x, y, 1);
+ return getMap(x, y, BACKGROUND_Z);
}
public void setBackMap(int x, int y, Block block) {
- setMap(x, y, 1, block);
+ setMap(x, y, BACKGROUND_Z, block);
}
public boolean placeToForeground(int x, int y, Block value) {
public boolean placeToBackground(int x, int y, Block value) {
if (value == mGameItemsHolder.getFallbackBlock() || (getBackMap(x, y) == mGameItemsHolder.getFallbackBlock() && value.hasCollision()) &&
- (!value.isTransparent() || value == mGameItemsHolder.getBlock("glass"))) {
+ (!value.isTransparent() || value == mGameItemsHolder.getBlock("glass") || value.isChest() || value.isSlab())) {
setBackMap(x, y, value);
return true;
}
}
private void playerDurateTool() {
- final InventoryItem playerCurrentItem = mMobsController.getPlayer().getCurrentItem();
- if (mMobsController.getPlayer().getCurrentItem().getItem().isTool()) {
+ final InventoryItem playerCurrentItem = mMobsController.getPlayer().inventory.getActiveItem();
+ if (playerCurrentItem.getItem().isTool()) {
mMobsController.getPlayer().decreaseCurrentItemCount(mGameItemsHolder);
}
}
private boolean shouldDrop(Block block) {
- final Item item = mMobsController.getPlayer().getCurrentItem().getItem();
- int toolLevel = item.isTool() ? ((Item.Tool)item).getLevel() : 0;
+ final Item item = mMobsController.getPlayer().inventory.getActiveItem().getItem();
+ int toolLevel = item.isTool() ? ((Item.Tool) item).getLevel() : 0;
if (item.isTool() && block.getParams().getToolType() != item.getClass()) {
toolLevel = 0;
}
public void destroyForeMap(int x, int y) {
Block block = getForeMap(x, y);
+ if (block.isContainer()) {
+ mContainerController.destroyContainer(x, y, FOREGROUND_Z);
+ }
if (block.hasDrop() && shouldDrop(block)) {
for (int i = 0; i < block.getParams().getDropInfo().getCount(); i++) {
mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, mGameItemsHolder.getItem(block.getDrop()));
placeToForeground(x, y, mGameItemsHolder.getFallbackBlock());
}
-
+ public WorldGeneratorConfig getWorldConfig() {
+ return mWorldConfig;
+ }
public void destroyBackMap(int x, int y) {
Block block = getBackMap(x, y);
playerDurateTool();
placeToBackground(x, y, mGameItemsHolder.getFallbackBlock());
}
+
+ @CheckForNull
+ private Container getContainerAt(int x, int y, int z) {
+ return mContainerController.getContainer(transformX(x), y, z);
+ }
+
+ @CheckForNull
+ public Container getForegroundContainer(int x, int y) {
+ return getContainerAt(x, y, FOREGROUND_Z);
+ }
+
+ @CheckForNull
+ public Container getBackgroundContainer(int x, int y) {
+ return getContainerAt(x, y, BACKGROUND_Z);
+ }
+
+ @CheckForNull
+ public Furnace getForegroundFurnace(int x, int y) {
+ @CheckForNull
+ final Container container = getForegroundContainer(x, y);
+
+ if (container instanceof Furnace) {
+ return (Furnace) container;
+ }
+
+ return null;
+ }
+
+ @CheckForNull
+ public Furnace getBackgroundFurnace(int x, int y) {
+ @CheckForNull
+ final Container container = getBackgroundContainer(x, y);
+
+ if (container instanceof Furnace) {
+ return (Furnace) container;
+ }
+
+ return null;
+ }
}
\ No newline at end of file