From 4427c5fd1b9985ab65a17eb5d3f4ec1801285966 Mon Sep 17 00:00:00 2001 From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:20:14 +1000 Subject: [PATCH] Fix Sorting AA Crates & Other Slots --- .../mixin/bogosorter/SortHandlerMixin.java | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nomiceu/nomilabs/mixin/bogosorter/SortHandlerMixin.java b/src/main/java/com/nomiceu/nomilabs/mixin/bogosorter/SortHandlerMixin.java index e95e3ab..2b580d8 100644 --- a/src/main/java/com/nomiceu/nomilabs/mixin/bogosorter/SortHandlerMixin.java +++ b/src/main/java/com/nomiceu/nomilabs/mixin/bogosorter/SortHandlerMixin.java @@ -18,6 +18,7 @@ import com.cleanroommc.bogosorter.api.ISlot; import com.cleanroommc.bogosorter.common.sort.SlotGroup; import com.cleanroommc.bogosorter.common.sort.SortHandler; +import com.google.common.collect.ImmutableList; /** * Prevents Modification of 'Locked' Slots. @@ -86,8 +87,27 @@ private void newSortBogo(SlotGroup instance) { List result = new ArrayList<>(); for (var slot : slots) { - if (slot.bogo$canTakeStack(player)) result.add(slot); + /* + * Logic being used to check if we cannot access the slot: + * 1. Can the player take the stack? + * This usually returns true, but some slot implementations return false if the slot is empty. + * + * 2. Can we insert the current stack into the slot? + * This may seem roundabout, but this means that if it returns false, then most likely, the slot is + * always returning false. + * + * 3. Is the stack in the slot empty? + * If it is empty, some implementations return false for both above methods. + * Although this might risk changing actually inaccessible slots, most likely, those slots would not be + * empty. + * + * The slot should only be marked as inaccessible if all three conditions return false. + */ + boolean canTake = slot.bogo$canTakeStack(player); + boolean canInsert = slot.bogo$isItemValid(slot.bogo$getStack().copy()); + boolean isEmpty = slot.bogo$getStack().isEmpty(); + if (canTake || canInsert || isEmpty) result.add(slot); } - return result; + return ImmutableList.copyOf(result); } }