diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index e26b06bad903c54c3bbc2dcc4cefec8887a0749d..bab16fd0533b3733701e803a7f944fc84fe3dba3 100644 (file)
import com.badlogic.gdx.utils.TimeUtils;
import com.google.common.collect.Range;
import ru.deadsoftware.cavedroid.MainConfig;
-import ru.deadsoftware.cavedroid.game.actions.PlaceBlockActionUtilsKt;
+import ru.deadsoftware.cavedroid.game.actions.CommonBlockActionUtilsKt;
+import ru.deadsoftware.cavedroid.game.actions.placeblock.IPlaceBlockAction;
import ru.deadsoftware.cavedroid.game.actions.useitem.IUseItemAction;
import ru.deadsoftware.cavedroid.game.mobs.Mob;
import ru.deadsoftware.cavedroid.game.mobs.MobsController;
import ru.deadsoftware.cavedroid.game.mobs.Pig;
import ru.deadsoftware.cavedroid.game.mobs.Player;
+import ru.deadsoftware.cavedroid.game.model.item.Item;
import ru.deadsoftware.cavedroid.game.objects.DropController;
-import ru.deadsoftware.cavedroid.game.objects.Item;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import ru.deadsoftware.cavedroid.misc.Assets;
import ru.deadsoftware.cavedroid.misc.ControlMode;
private final DropController mDropController;
private final MobsController mMobsController;
private final Map<String, IUseItemAction> mUseItemActionMap;
+ private final Map<String, IPlaceBlockAction> mPlaceBlockActionMap;
private final Player mPlayer;
GameWorld gameWorld,
DropController dropController,
MobsController mobsController,
- Map<String, IUseItemAction> useItemActionMap) {
+ Map<String, IUseItemAction> useItemActionMap,
+ Map<String, IPlaceBlockAction> placeBlockActionMap) {
mMainConfig = mainConfig;
mGameWorld = gameWorld;
mDropController = dropController;
mMobsController = mobsController;
mUseItemActionMap = useItemActionMap;
+ mPlaceBlockActionMap = placeBlockActionMap;
mPlayer = mMobsController.getPlayer();
if (id > 0) {
final Item item = getItem(id);
- @CheckForNull final String actionKey = item.getActionKey();
- if (item.isBlock()) {
+
+ if (item instanceof Item.Placeable) {
if (!bg) {
- PlaceBlockActionUtilsKt.placeToForegroundAction(mUseItemActionMap, item, x, y);
+ CommonBlockActionUtilsKt.placeToForegroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
} else {
- PlaceBlockActionUtilsKt.placeToBackgroundAction(mUseItemActionMap, item, x, y);
+ CommonBlockActionUtilsKt.placeToBackgroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
}
- } else if (actionKey != null) {
+ } else if (item instanceof Item.Usable) {
+ final String actionKey = ((Item.Usable)item).getUseActionKey();
final IUseItemAction useItemAction = mUseItemActionMap.get(actionKey);
if (useItemAction != null) {
- useItemAction.perform(item, x, y);
+ useItemAction.perform((Item.Usable) item, x, y);
} else {
- Gdx.app.error(TAG, "use item action " + actionKey + "not found");
+ Gdx.app.error(TAG, "use item action " + actionKey + " not found");
}
}
}
break;
case Input.Keys.G:
- mMobsController.addMob(new Pig(mCurX * 16, mCurY * 16));
+ final Mob pig = new Pig(mCurX * 16, mCurY * 16);
+ pig.attachToController(mMobsController);
break;
case Input.Keys.Q: