@@ -24,21 +24,21 @@ object BackpackInventoryHelper {
2424 for (i in 0 until min(list1.size, list2.size)) {
2525 val item1 = list1[i]
2626 val item2 = list2[i]
27- val comparedValue = item1 .compareTo(item2 )
27+ val comparedValue = item2 .compareTo(item1 )
2828
2929 if (comparedValue != 0 )
3030 return comparedValue
3131 }
3232
33- return list1 .size.compareTo(list2 .size)
33+ return list2 .size.compareTo(list1 .size)
3434 }
3535
3636 // Merges all slots first
3737 for (i in 0 until wrapper.backpackInventorySize() - 1 ) {
3838 if (wrapper.isSlotLocked(i))
3939 continue
4040
41- var isMemorizedSlot = wrapper.isSlotMemorized(i)
41+ val isMemorizedSlot = wrapper.isSlotMemorized(i)
4242 val baseStack = wrapper.getStackInSlot(i)
4343 val maxSize = baseStack.maxStackSize * wrapper.getTotalStackMultiplier()
4444
@@ -85,15 +85,15 @@ object BackpackInventoryHelper {
8585
8686 when (wrapper.sortType) {
8787 SortType .BY_NAME -> {
88- item1 .getItemStackDisplayName(stack1 ).compareTo(item2 .getItemStackDisplayName(stack2 ))
88+ item2 .getItemStackDisplayName(stack2 ).compareTo(item1 .getItemStackDisplayName(stack1 ))
8989 }
9090
9191 SortType .BY_MOD_ID -> {
92- item1 .registryName!! .namespace.compareTo(item2 .registryName!! .namespace)
92+ item2 .registryName!! .namespace.compareTo(item1 .registryName!! .namespace)
9393 }
9494
9595 SortType .BY_COUNT -> {
96- stack1 .count.compareTo(stack2 .count)
96+ stack2 .count.compareTo(stack1 .count)
9797 }
9898
9999 SortType .BY_ORE_DICT -> {
@@ -224,7 +224,7 @@ object BackpackInventoryHelper {
224224 return false
225225
226226 for (i in 0 until source.slots) {
227- var sourceStack = source.getStackInSlot(i)
227+ val sourceStack = source.getStackInSlot(i)
228228
229229 if (sourceStack.isEmpty)
230230 continue
@@ -245,9 +245,11 @@ object BackpackInventoryHelper {
245245 }
246246
247247 private fun getHandler (handler : Any , facing : EnumFacing ? ): IItemHandler ? =
248- if (handler is ISidedInventory ) SidedInvWrapper (handler, facing)
249- else if (handler is IInventory ) InvWrapper (handler)
250- else handler as ? IItemHandler
248+ when (handler) {
249+ is ISidedInventory -> SidedInvWrapper (handler, facing)
250+ is IInventory -> InvWrapper (handler)
251+ else -> handler as ? IItemHandler
252+ }
251253
252254 private fun isFull (handler : IItemHandler ): Boolean {
253255 for (i in 0 until handler.slots) {
0 commit comments