Skip to content

Commit 47c143b

Browse files
committed
Fix scope detection for single slot containers
1 parent cf0d046 commit 47c143b

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

common/src/main/java/dev/terminalmc/clientsort/ClientSort.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static void onConfigSaved(ServerConfig config) {
6969
) {
7070
return switch (container) {
7171
case null -> null;
72-
case ContainerSingleItem ignored -> null;
72+
case ContainerSingleItem ignored -> menu;
7373
case SimpleContainer ignored -> menu;
7474
default -> container;
7575
};

common/src/main/java/dev/terminalmc/clientsort/client/inventory/screen/ContainerScreenHelper.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import net.minecraft.world.entity.player.Inventory;
2929
import net.minecraft.world.inventory.ClickType;
3030
import net.minecraft.world.inventory.Slot;
31+
import net.minecraft.world.ticks.ContainerSingleItem;
3132

3233
import static dev.terminalmc.clientsort.client.config.Config.options;
3334

@@ -122,6 +123,12 @@ public boolean isExtraSlot(Slot slot) {
122123
* @return the scope of the slot, or {@link Scope#INVALID} if the slot is not accessible.
123124
*/
124125
public Scope getScope(Slot slot) {
126+
//noinspection ConstantValue
127+
if (slot.container == null)
128+
return Scope.INVALID;
129+
if (slot.container instanceof ContainerSingleItem)
130+
return Scope.INVALID;
131+
125132
// Screen with only player inventory
126133
if (screen instanceof EffectRenderingInventoryScreen) {
127134
// Player inventory

0 commit comments

Comments
 (0)