fix last selected resolution and inconsistent move order

Author: fishstiz

CHANGELOG.md

@@ -1,15 +1,2 @@
-- Changed the **Sort** cycling button to a dropdown button.
-- Added dropdown button next to the **Open Pack Folder** button to open additional folders if there is any.
-- Added buttons to toggle **default** and **lock** of profiles next to the profile list when on dev mode. 
-- Increased the max height of context menu.
-- Fixed folder pack order not saving when the folder pack list is not closed.
-- Fixed 'Open File' and 'Show File Manager' context menu options not appearing when the pack file is locked.
-- Fixed pack entries getting stuck with the incompatible title and description when navigating by keyboard.
-- Fixed hidden override not immediately reflecting on the pack screen when toggling dev mode.
-- Fixed profile name failing to resolve when the profiles directory has not yet created.
-- Fixed crash when reading an invalid config file.
-
---- 
-**Packed Packs API**
-- Added methods to add `Renderable` and `Renderable & LayoutElement`s to `InitializePackEntryEvent`.
-- Added `ScreenContext#getMinecraft()`
+- Fixed focus not correctly resolving on updating a pack list if multiple packs are selected.
+- Fixed inconsistent move order when dragging and dropping multiple packs to the same pack list 

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.parallel=true
 # Project
 archives_base_name=packed_packs
 maven_group=io.github.fishstiz.packed_packs
-mod_version=2.2.0-alpha.1+26.2
+mod_version=2.2.1-alpha.1+26.2
 mod_id=packed_packs
 mod_name=Packed Packs
 mod_author=fishstiz

mod/common/src/main/java/io/github/fishstiz/packed_packs/gui/components/PackList.java

@@ -251,7 +251,7 @@ public void setFocused(@Nullable GuiEventListener focused) {
 
     private @Nullable Entry getSelected() {
         for (Entry entry : children()) {
-            if (entry.entryModel.selected()) {
+            if (entry.entryModel.selectedLast()) {
                 return entry;
             }
         }

mod/common/src/main/java/io/github/fishstiz/packed_packs/gui/model/PackListViewModel.java

@@ -416,7 +416,7 @@ public void drag() {
 
             List<Pack> payload = createPayload();
             if (!payload.isEmpty()) {
-                List<Pack> orderedPayload = sortByOrderOf(state.get().visiblePacks(), payload).reversed();
+                List<Pack> orderedPayload = sortByOrderOf(state.get().visiblePacks(), payload);
                 dispatch.accept(new PackListIntent.Drag(target, this, new ObjectLinkedOpenHashSet<>(orderedPayload)));
             }
         }

mod/common/src/main/java/io/github/fishstiz/packed_packs/gui/states/PackedPacksReducer.java

@@ -156,8 +156,8 @@ yield new PackedPacksState(
                     CollectionUtils.addIf(packs, payload, p -> canTransfer(target, p, options));
                     if (!packs.isEmpty()) {
                         yield this.reduce(newState, switch (destination.type()) {
-                            case AVAILABLE -> new PackListIntent.Disable(destination, ctx, packs);
-                            case ENABLED -> new PackListIntent.Enable(destination, ctx, packs, position);
+                            case AVAILABLE -> new PackListIntent.Disable(destination, ctx, packs.reversed());
+                            case ENABLED -> new PackListIntent.Enable(destination, ctx, packs.reversed(), position);
                         });
                     }
                 }
@@ -246,11 +246,14 @@ private PackListState reduceList(PackListState state, PackListIntent.ListScoped
                 List<Pack> ordered = sortByOrderOf(state.visiblePacks(), move.payload());
                 List<Pack> newPacks = new ObjectArrayList<>(state.packs());
                 int to = move.index();
+                int insertOffset = 0;
                 for (Pack pack : ordered) {
                     int previous = newPacks.indexOf(pack);
-                    int target = previous != -1 && previous < to ? to - 1 : to;
+                    boolean isBeforeTo = previous != -1 && previous < to;
+                    int target = isBeforeTo ? to - 1 : to + insertOffset;
                     newPacks.remove(pack);
                     newPacks.add(Math.clamp(target, 0, newPacks.size()), pack);
+                    if (!isBeforeTo) insertOffset++;
                 }
                 yield newPacks.equals(state.packs()) ? state : state.withPacks(newPacks, options);
             }