feat: allow to rotate items in the InventoryHud (#24)

Co-authored-by: jdrueckert <jd.rueckert@googlemail.com> Co-authored-by: Tobias Nett <skaldarnar@googlemail.com>
Terasology · Jul 20, 2020 · df5397e · df5397e
1 parent e4583f3
commit df5397e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/main/java/org/terasology/rendering/nui/layers/hud/InventoryHud.java b/src/main/java/org/terasology/rendering/nui/layers/hud/InventoryHud.java
@@ -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;
 
@@ -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() {
@@ -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;
+        }
+    }
 }
diff --git a/src/main/java/org/terasology/rendering/nui/layers/ingame/inventory/ItemCell.java b/src/main/java/org/terasology/rendering/nui/layers/ingame/inventory/ItemCell.java
@@ -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;
@@ -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() {