fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #3520: Correct order for sort by mod and general code cleanup (#3517)

Browse Source 
Comparable/Comparator implementation now use fast Java built-ins for
primitive types rather than hand-coded versions. Also DRY some code
and simplify logic.

This maintains the "biggest stack first" notion of "ascending", but
also fixes the inconsistent/accidental reversal of sort by mod (the
mod name should sort the same direction as the item name).
This commit is contained in:
Kyle VanderBeek
2018-06-02 02:05:44 -07:00
committed by yueh
parent 3c4a0cae11
commit f4212a86c3
3 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/me/ClientDCInternalInv.java
+1 -1
View File
@@ -68,4 +68,4 @@ public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>
{
return this.id;
}
}
}
src/main/java/appeng/container/implementations/CraftingCPURecord.java
+1 -1
View File
@@ -70,4 +70,4 @@ public class CraftingCPURecord implements Comparable<CraftingCPURecord>
{
return this.size;
}
}
}
src/main/java/appeng/util/ItemSorters.java
+22 -28
View File
@@ -39,13 +39,11 @@ public class ItemSorters
@Override
public int compare( final IAEItemStack o1, final IAEItemStack o2 )
{
if( getDirection() == SortDir.ASCENDING )
{
return Platform.getItemDisplayName( o1 ).compareToIgnoreCase( Platform.getItemDisplayName( o2 ) );
}
return Platform.getItemDisplayName( o2 ).compareToIgnoreCase( Platform.getItemDisplayName( o1 ) );
final int cmp = Platform.getItemDisplayName( o1 ).compareToIgnoreCase( Platform.getItemDisplayName( o2 ) );
return applyDirection( cmp );
}
};
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_MOD = new Comparator<IAEItemStack>()
{
@@ -54,38 +52,30 @@ public class ItemSorters
{
final AEItemStack op1 = (AEItemStack) o1;
final AEItemStack op2 = (AEItemStack) o2;
int cmp = op1.getModID().compareToIgnoreCase( op2.getModID() );
if( getDirection() == SortDir.ASCENDING )
if( cmp == 0 )
{
return this.secondarySort( op2.getModID().compareToIgnoreCase( op1.getModID() ), o1, o2 );
}
return this.secondarySort( op1.getModID().compareToIgnoreCase( op2.getModID() ), o2, o1 );
}
private int secondarySort( final int compareToIgnoreCase, final IAEItemStack o1, final IAEItemStack o2 )
{
if( compareToIgnoreCase == 0 )
{
return Platform.getItemDisplayName( o2 ).compareToIgnoreCase( Platform.getItemDisplayName( o1 ) );
cmp = Platform.getItemDisplayName( o1 ).compareToIgnoreCase( Platform.getItemDisplayName( o2 ) );
}
return compareToIgnoreCase;
return applyDirection( cmp );
}
};
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_SIZE = new Comparator<IAEItemStack>()
{
@Override
public int compare( final IAEItemStack o1, final IAEItemStack o2 )
{
if( getDirection() == SortDir.ASCENDING )
{
return Long.compare( o2.getStackSize(), o1.getStackSize() );
}
return Long.compare( o1.getStackSize(), o2.getStackSize() );
final int cmp = Long.compare( o2.getStackSize(), o1.getStackSize() );
return applyDirection( cmp );
}
};
private static IInvTweaks api;
public static final Comparator<IAEItemStack> CONFIG_BASED_SORT_BY_INV_TWEAKS = new Comparator<IAEItemStack>()
{
@@ -98,12 +88,7 @@ public class ItemSorters
}
final int cmp = api.compareItems( o1.asItemStackRepresentation(), o2.asItemStackRepresentation() );
if( getDirection() == SortDir.ASCENDING )
{
return cmp;
}
return -cmp;
return applyDirection( cmp );
}
};
@@ -133,4 +118,13 @@ public class ItemSorters
{
Direction = direction;
}
private static int applyDirection( int cmp )
{
if ( getDirection() == SortDir.ASCENDING )
{
return cmp;
}
return -cmp;
}
}