forked from xsun2001/Applied-Energistics-2-Unofficial
-
Notifications
You must be signed in to change notification settings - Fork 105
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feat/blood_magic_compat
# Conflicts: # dependencies.gradle
- Loading branch information
Showing
9 changed files
with
188 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package appeng.api.config; | ||
|
|
||
| import java.util.Comparator; | ||
|
|
||
| import appeng.util.AlphanumComparator; | ||
|
|
||
| public enum StringOrder { | ||
|
|
||
| NATURAL(Comparator.naturalOrder()), | ||
|
|
||
| ALPHANUM(AlphanumComparator.INSTANCE); | ||
|
|
||
| public final Comparator<String> comparator; | ||
|
|
||
| StringOrder(Comparator<String> comparator) { | ||
| this.comparator = comparator; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| package appeng.util; | ||
| // This code is copied from the library https://github.com/metamx/alphanum | ||
| // spotless:off | ||
| /* | ||
| * The Alphanum Algorithm is an improved sorting algorithm for strings | ||
| * containing numbers. Instead of sorting numbers in ASCII order like | ||
| * a standard sort, this algorithm sorts numbers in numeric order. | ||
| * | ||
| * The Alphanum Algorithm is discussed at http://www.DaveKoelle.com | ||
| * | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| * | ||
| */ | ||
| // spotless:on | ||
|
|
||
| import java.util.Comparator; | ||
|
|
||
| /** | ||
| * This is an updated version with enhancements made by Daniel Migowski, Andre Bogus, and David Koelle | ||
| */ | ||
| public class AlphanumComparator implements Comparator<String> { | ||
|
|
||
| public final static AlphanumComparator INSTANCE = new AlphanumComparator(); | ||
|
|
||
| private final boolean isDigit(char ch) { | ||
| return ch >= 48 && ch <= 57; | ||
| } | ||
|
|
||
| /** | ||
| * Length of string is passed in for improved efficiency (only need to calculate it once) * | ||
| */ | ||
| private final String getChunk(String s, int slength, int marker) { | ||
| StringBuilder chunk = new StringBuilder(); | ||
| char c = s.charAt(marker); | ||
| chunk.append(c); | ||
| marker++; | ||
| if (isDigit(c)) { | ||
| while (marker < slength) { | ||
| c = s.charAt(marker); | ||
| if (!isDigit(c)) break; | ||
| chunk.append(c); | ||
| marker++; | ||
| } | ||
| } else { | ||
| while (marker < slength) { | ||
| c = s.charAt(marker); | ||
| if (isDigit(c)) break; | ||
| chunk.append(c); | ||
| marker++; | ||
| } | ||
| } | ||
| return chunk.toString(); | ||
| } | ||
|
|
||
| public int compare(String s1, String s2) { | ||
| if (s1 == null || s2 == null) { | ||
| return 0; | ||
| } | ||
|
|
||
| int thisMarker = 0; | ||
| int thatMarker = 0; | ||
| int s1Length = s1.length(); | ||
| int s2Length = s2.length(); | ||
|
|
||
| while (thisMarker < s1Length && thatMarker < s2Length) { | ||
| String thisChunk = getChunk(s1, s1Length, thisMarker); | ||
| thisMarker += thisChunk.length(); | ||
|
|
||
| String thatChunk = getChunk(s2, s2Length, thatMarker); | ||
| thatMarker += thatChunk.length(); | ||
|
|
||
| // If both chunks contain numeric characters, sort them numerically | ||
| int result = 0; | ||
| if (isDigit(thisChunk.charAt(0)) && isDigit(thatChunk.charAt(0))) { | ||
| // Simple chunk comparison by length. | ||
| int thisChunkLength = thisChunk.length(); | ||
| result = thisChunkLength - thatChunk.length(); | ||
| // If equal, the first different number counts | ||
| if (result == 0) { | ||
| for (int i = 0; i < thisChunkLength; i++) { | ||
| result = thisChunk.charAt(i) - thatChunk.charAt(i); | ||
| if (result != 0) { | ||
| return result; | ||
| } | ||
| } | ||
| } | ||
| } else { | ||
| result = thisChunk.compareTo(thatChunk); | ||
| } | ||
|
|
||
| if (result != 0) return result; | ||
| } | ||
|
|
||
| return s1Length - s2Length; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters