Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: allow to rotate items in the InventoryHud #24

Merged
merged 8 commits into from
Jul 20, 2020
Merged

feat: allow to rotate items in the InventoryHud #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e075db8
Inventory items rotate within the quickslot
stefaniamak Jul 8, 2020
2d8af72
Option to use old or new quickslot navigation
stefaniamak Jul 8, 2020
754f3eb
Create ui - Shortcut.lnk
stefaniamak Jul 8, 2020
7077f30
Update src/main/java/org/terasology/rendering/nui/layers/hud/Inventor…
stefaniamak Jul 13, 2020
7b28a40
removed unused commented line
stefaniamak Jul 13, 2020
8fc082e
Merge branch 'ring-format-quickslot-for-LaS' of https://github.com/st…
stefaniamak Jul 13, 2020
50b666a
Delete ui - Shortcut.lnk
skaldarnar Jul 20, 2020
63c8949
Apply suggestions from code review
skaldarnar Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion src/main/java/org/terasology/rendering/nui/layers/hud/InventoryHud.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.terasology.logic.inventory.SelectedInventorySlotComponent;
import org.terasology.logic.players.LocalPlayer;
import org.terasology.registry.In;
import org.terasology.rendering.nui.LayoutConfig;
import org.terasology.rendering.nui.databinding.ReadOnlyBinding;
import org.terasology.rendering.nui.layers.ingame.inventory.InventoryCell;

Expand All @@ -33,10 +34,19 @@ public class InventoryHud extends CoreHudWidget {

private UICrosshair crosshair;

// Set "true" to use the rotating style quickslot; set "false" to get the default style quickslot
@LayoutConfig
private boolean rotateItems = false;

@Override
public void initialise() {
for (InventoryCell cell : findAll(InventoryCell.class)) {
cell.bindSelected(new SlotSelectedBinding(cell.getTargetSlot(), localPlayer));
int offset = cell.getTargetSlot();
if (rotateItems) {
cell.bindTargetSlot(new TargetSlotBinding(offset, localPlayer));
} else {
cell.bindSelected(new SlotSelectedBinding(offset, localPlayer));
}
cell.bindTargetInventory(new ReadOnlyBinding<EntityRef>() {
@Override
public EntityRef get() {
Expand Down Expand Up @@ -69,4 +79,22 @@ public Boolean get() {
return component != null && component.slot == slot;
}
}

private class TargetSlotBinding extends ReadOnlyBinding<Integer> {

private int offset;
private LocalPlayer localPlayer;

public TargetSlotBinding(int targetSlot, LocalPlayer localPlayer) {
this.offset = targetSlot;
this.localPlayer = localPlayer;
}

@Override
public Integer get() {
SelectedInventorySlotComponent component =
localPlayer.getCharacterEntity().getComponent(SelectedInventorySlotComponent.class);
return (component.slot + offset) % 10;
}
}
}
2 changes: 2 additions & 0 deletions src/main/java/org/terasology/rendering/nui/layers/ingame/inventory/ItemCell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.terasology.rendering.nui.layers.ingame.inventory;

import com.google.common.primitives.UnsignedBytes;
import org.terasology.rendering.nui.LayoutConfig;
import org.terasology.utilities.Assets;
import org.terasology.entitySystem.entity.EntityRef;
import org.terasology.logic.common.DisplayNameComponent;
Expand All @@ -40,6 +41,7 @@
*/
public abstract class ItemCell extends CoreWidget {
protected ItemIcon icon = new ItemIcon();
@LayoutConfig
private Binding<Boolean> selected = new DefaultBinding<>(false);

public ItemCell() {
Expand Down