diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index 32826528c62ba6ed0ce38772a5b44a45ff965f13..f8c44b310324762c20db96284c995471f3d6144c 100644 (file)
import ru.deadsoftware.cavedroid.misc.Assets;
import ru.deadsoftware.cavedroid.misc.ControlMode;
+import javax.annotation.CheckForNull;
import javax.inject.Inject;
import java.util.Map;
-import static ru.deadsoftware.cavedroid.game.GameItems.*;
-
@GameScope
public class GameInput {
checkCursorBounds();
}
- private void useItem(int x, int y, int id, boolean bg) {
+ private void useItem(int x, int y, @CheckForNull Item item, boolean bg) {
mPlayer.startHitting();
- if (id > 0) {
- final Item item = getItem(id);
+ if (item == null) {
+ return;
+ }
- if (item instanceof Item.Placeable) {
- if (!bg) {
- CommonBlockActionUtilsKt.placeToForegroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
- } else {
- CommonBlockActionUtilsKt.placeToBackgroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
- }
- } else if (item instanceof Item.Usable) {
- final String actionKey = ((Item.Usable)item).getUseActionKey();
- final IUseItemAction useItemAction = mUseItemActionMap.get(actionKey);
+ if (item instanceof Item.Placeable) {
+ if (!bg) {
+ CommonBlockActionUtilsKt.placeToForegroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
+ } else {
+ CommonBlockActionUtilsKt.placeToBackgroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
+ }
+ } 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.Usable) item, x, y);
- } else {
- Gdx.app.error(TAG, "use item action " + actionKey + " not found");
- }
+ if (useItemAction != null) {
+ useItemAction.perform((Item.Usable) item, x, y);
+ } else {
+ Gdx.app.error(TAG, "use item action " + actionKey + " not found");
}
}
}
if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY) && insideCreativeInv(screenX, screenY)) {
int ix = (int) (screenX - (mMainConfig.getWidth() / 2 - creative.getRegionWidth() / 2 + 8)) / 18;
int iy = (int) (screenY - (mMainConfig.getHeight() / 2 - creative.getRegionHeight() / 2 + 18)) / 18;
- int item = mCreativeScroll * 8 + (ix + iy * 8);
+ int itemPos = mCreativeScroll * 8 + (ix + iy * 8);
if (ix >= 8 || ix < 0 || iy < 0 || iy >= 5) {
- item = -1;
- }
- if (item >= 0 && item < GameItems.getItemsSize()) {
- System.arraycopy(mPlayer.inventory, 0, mPlayer.inventory, 1, 8);
- mPlayer.inventory[0] = item;
+ itemPos = -1;
}
+
+ System.arraycopy(mPlayer.inventory, 0, mPlayer.inventory, 1, 8);
+ mPlayer.inventory[0] = mGameItemsHolder.getItemFromCreativeInventory(itemPos);
} else if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY)) {
mMainConfig.setGameUiWindow(GameUiWindow.NONE);
} else if (screenY < hotbar.getRegionHeight() &&
if (mCreativeScroll < 0) {
mCreativeScroll = 0;
}
- if (mCreativeScroll > GameProc.MAX_CREATIVE_SCROLL) {
- mCreativeScroll = GameProc.MAX_CREATIVE_SCROLL;
+
+ final int maxScroll = mGameItemsHolder.getCreativeScrollAmount();
+ if (mCreativeScroll > maxScroll) {
+ mCreativeScroll = maxScroll;
}
}
}
if (mCreativeScroll < 0) {
mCreativeScroll = 0;
}
- if (mCreativeScroll > GameProc.MAX_CREATIVE_SCROLL) {
- mCreativeScroll = GameProc.MAX_CREATIVE_SCROLL;
+
+ final int maxScroll = mGameItemsHolder.getCreativeScrollAmount();
+ if (mCreativeScroll > maxScroll) {
+ mCreativeScroll = maxScroll;
}
break;
}