fixing sorting type

anviaan · anviaan · commit 4ce32a86ff0b · 2024-07-22T15:05:19.000-05:00
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.21+build.9
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=2.1
+mod_version=2.2
 maven_group=net.anvian.inventorytweaks
 archives_base_name=InventoryTweaks
 
diff --git a/src/main/java/net/anvian/inventorytweaks/sort/SortInventory.java b/src/main/java/net/anvian/inventorytweaks/sort/SortInventory.java
@@ -72,7 +72,8 @@ private static List<Integer> getSortedSlots(InventorySlots inventorySlots, Scree
         } else {
             return inventorySlots.stream()
                     .filter(slot -> !screenHandler.getSlot(slot).getStack().isEmpty())
-                    .sorted(Comparator.comparing((Integer slot) -> Item.getRawId(screenHandler.getSlot(slot).getStack().getItem())))
+                    .sorted(Comparator.comparing((Integer slot) -> Item.getRawId(screenHandler.getSlot(slot).getStack().getItem()))
+                            .thenComparing(slot -> screenHandler.getSlot(slot).getStack().getCount(), Comparator.reverseOrder()))
                     .toList();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ private static List<Integer> getSortedSlots(InventorySlots inventorySlots, Scree`
`72`	`72`	`} else {`
`73`	`73`	`return inventorySlots.stream()`
`74`	`74`	`.filter(slot -> !screenHandler.getSlot(slot).getStack().isEmpty())`
`75`		`- .sorted(Comparator.comparing((Integer slot) -> Item.getRawId(screenHandler.getSlot(slot).getStack().getItem())))`
	`75`	`+ .sorted(Comparator.comparing((Integer slot) -> Item.getRawId(screenHandler.getSlot(slot).getStack().getItem()))`
	`76`	`+ .thenComparing(slot -> screenHandler.getSlot(slot).getStack().getCount(), Comparator.reverseOrder()))`
`76`	`77`	`.toList();`
`77`	`78`	`}`
`78`	`79`