Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: replace anonymous inner class with lambda

Browse Source
This commit is contained in:
P0nk
2021-04-07 23:45:16 +02:00
parent 2d143d0afd
commit 6253169e35
65 changed files with 1204 additions and 2234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/MapleArrowFetcher/src/maplearrowfetcher/MapleArrowFetcher.java
View File

@@ -21,22 +21,15 @@ package maplearrowfetcher;
import life.MapleLifeFactory;
import life.MapleMonsterStats;
import tools.DatabaseConnection;
import tools.Pair;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.io.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import tools.DatabaseConnection;
import tools.Pair;
/**
*
@@ -123,14 +116,11 @@ public class MapleArrowFetcher {
List<Entry<Integer, List<Integer>>> listEntries = new ArrayList<>(existingEntries.entrySet());
Collections.sort(listEntries, new Comparator<Entry<Integer, List<Integer>>>() {
@Override
public int compare(Entry<Integer, List<Integer>> o1, Entry<Integer, List<Integer>> o2) {
int val1 = o1.getKey();
int val2 = o2.getKey();
return (val1 < val2 ? -1 : (val1 == val2 ? 0 : 1));
}
});
Collections.sort(listEntries, (o1, o2) -> {
int val1 = o1.getKey();
int val2 = o2.getKey();
return (val1 < val2 ? -1 : (val1 == val2 ? 0 : 1));
});
for(Entry<Integer, List<Integer>> ee : listEntries) {
int mobid = ee.getKey();

39
tools/MapleCashCosmeticsChecker/src/maplecashcosmeticschecker/MapleCashCosmeticsChecker.java
View File

@@ -19,22 +19,9 @@
*/
package maplecashcosmeticschecker;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.io.*;
import java.util.*;
import java.util.Map.Entry;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Set;
/**
*
@@ -595,25 +582,17 @@ public class MapleCashCosmeticsChecker {
il.add(i);
}
Collections.sort(il, new Comparator<Integer>() {
@Override
public int compare(Integer o1, Integer o2) {
return o1 - o2;
}
});
Collections.sort(il, (o1, o2) -> o1 - o2);
list.add(new Pair<>(e.getKey(), il));
}
Collections.sort(list, new Comparator<Pair<Pair<Integer, String>, List<Integer>>>() {
@Override
public int compare(Pair<Pair<Integer, String>, List<Integer>> o1, Pair<Pair<Integer, String>, List<Integer>> o2) {
int cmp = o1.getLeft().getLeft() - o2.getLeft().getLeft();
if (cmp == 0) {
return o1.getLeft().getRight().compareTo(o2.getLeft().getRight());
} else {
return cmp;
}
Collections.sort(list, (o1, o2) -> {
int cmp = o1.getLeft().getLeft() - o2.getLeft().getLeft();
if (cmp == 0) {
return o1.getLeft().getRight().compareTo(o2.getLeft().getRight());
} else {
return cmp;
}
});

57
tools/MapleQuestItemFetcher/src/maplequestitemfetcher/MapleQuestItemFetcher.java
View File

@@ -19,34 +19,15 @@
*/
package maplequestitemfetcher;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.apache.commons.io.FileUtils;
import java.io.File;
import tools.MapleItemInformationProvider;
import tools.Pair;
import java.io.*;
import java.sql.*;
import java.util.*;
import java.util.Map.Entry;
/**
*
* @author RonanLana
@@ -434,12 +415,7 @@ public class MapleQuestItemFetcher {
list.add(e);
}
Collections.sort(list, new Comparator<Entry<Integer, Integer>>() {
@Override
public int compare(Entry<Integer, Integer> o1, Entry<Integer, Integer> o2) {
return o1.getKey() - o2.getKey();
}
});
Collections.sort(list, (o1, o2) -> o1.getKey() - o2.getKey());
return list;
}
@@ -450,12 +426,7 @@ public class MapleQuestItemFetcher {
list.add(e);
}
Collections.sort(list, new Comparator<Entry<Integer, int[]>>() {
@Override
public int compare(Entry<Integer, int[]> o1, Entry<Integer, int[]> o2) {
return o1.getKey() - o2.getKey();
}
});
Collections.sort(list, (o1, o2) -> o1.getKey() - o2.getKey());
return list;
}
@@ -468,22 +439,12 @@ public class MapleQuestItemFetcher {
il.add(i);
}
Collections.sort(il, new Comparator<Integer>() {
@Override
public int compare(Integer o1, Integer o2) {
return o1 - o2;
}
});
Collections.sort(il, (o1, o2) -> o1 - o2);
list.add(new Pair<>(e.getKey(), il));
}
Collections.sort(list, new Comparator<Pair<Integer, List<Integer>>>() {
@Override
public int compare(Pair<Integer, List<Integer>> o1, Pair<Integer, List<Integer>> o2) {
return o1.getLeft() - o2.getLeft();
}
});
Collections.sort(list, (o1, o2) -> o1.getLeft() - o2.getLeft());
return list;
}

30
tools/MapleQuestMesoFetcher/src/maplequestmesofetcher/MapleQuestMesoFetcher.java
View File

@@ -19,22 +19,10 @@
*/
package maplequestmesofetcher;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.*;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import java.util.HashSet;
import java.util.Set;
/**
*
@@ -248,12 +236,7 @@ public class MapleQuestMesoFetcher {
if(!result.isEmpty() || !error.isEmpty()) {
printWriter.println("MISMATCH INFORMATION ON '" + (testingCheck ? "check" : "act") + "':");
if(!result.isEmpty()) {
Collections.sort(result, new Comparator<Integer>() {
@Override
public int compare(Integer o1, Integer o2) {
return o1 - o2;
}
});
Collections.sort(result, (o1, o2) -> o1 - o2);
printWriter.println("# MISSING");
@@ -271,12 +254,7 @@ public class MapleQuestMesoFetcher {
}
if(!error.isEmpty() && testingCheck) {
Collections.sort(error, new Comparator<Integer>() {
@Override
public int compare(Integer o1, Integer o2) {
return o1 - o2;
}
});
Collections.sort(error, (o1, o2) -> o1 - o2);
printWriter.println("# WRONG VALUE");

15
tools/MapleSkillMakerReagentIndexer/src/mapleskillmakerreagentindexer/MapleSkillMakerReagentIndexer.java
View File

@@ -19,15 +19,9 @@
*/
package mapleskillmakerreagentindexer;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
/**
@@ -154,12 +148,7 @@ public class MapleSkillMakerReagentIndexer {
}
private static void SortReagentList() {
Collections.sort(reagentList, new Comparator<Pair<Integer, Pair<String, Integer>>>() {
@Override
public int compare(Pair<Integer, Pair<String, Integer>> p1, Pair<Integer, Pair<String, Integer>> p2) {
return p1.getLeft().compareTo(p2.getLeft());
}
});
Collections.sort(reagentList, (p1, p2) -> p1.getLeft().compareTo(p2.getLeft()));
}
private static void WriteMakerReagentTableFile() {

30
tools/MapleSkillbookChanceFetcher/src/mapleskillbookchancefetcher/MapleSkillbookChanceFetcher.java
View File

@@ -21,24 +21,17 @@ package mapleskillbookchancefetcher;
import life.MapleLifeFactory;
import life.MapleMonsterStats;
import tools.DatabaseConnection;
import tools.Pair;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.io.*;
import java.util.Collections;
import java.util.Comparator;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import tools.DatabaseConnection;
import tools.Pair;
/**
*
* @author RonanLana
@@ -63,15 +56,12 @@ public class MapleSkillbookChanceFetcher {
private static List<Entry<Pair<Integer, Integer>, Integer>> sortedSkillbookChances() {
List<Entry<Pair<Integer, Integer>, Integer>> skillbookChancesList = new ArrayList<>(skillbookChances.entrySet());
Collections.sort(skillbookChancesList, new Comparator<Entry<Pair<Integer, Integer>, Integer>>() {
@Override
public int compare(Entry<Pair<Integer, Integer>, Integer> o1, Entry<Pair<Integer, Integer>, Integer> o2) {
if (o1.getKey().getLeft().equals(o2.getKey().getLeft())) {
return o1.getKey().getRight() < o2.getKey().getRight() ? -1 : (o1.getKey().getRight().equals(o2.getKey().getRight()) ? 0 : 1);
}
return (o1.getKey().getLeft() < o2.getKey().getLeft()) ? -1 : 1;
Collections.sort(skillbookChancesList, (o1, o2) -> {
if (o1.getKey().getLeft().equals(o2.getKey().getLeft())) {
return o1.getKey().getRight() < o2.getKey().getRight() ? -1 : (o1.getKey().getRight().equals(o2.getKey().getRight()) ? 0 : 1);
}
return (o1.getKey().getLeft() < o2.getKey().getLeft()) ? -1 : 1;
});
return skillbookChancesList;

31
tools/MapleWorldmapChecker/src/mapleworldmapchecker/MapleWorldmapChecker.java
View File

@@ -19,21 +19,8 @@
*/
package mapleworldmapchecker;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Set;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.io.*;
import java.util.*;
import java.util.Map.Entry;
/**
@@ -282,22 +269,12 @@ public class MapleWorldmapChecker {
List<Pair<String, List<Pair<Integer, String>>>> unreferencedEntries = new ArrayList<>(20);
for (Entry<String, List<Pair<Integer, String>>> e : unreferencedMapids.entrySet()) {
List<Pair<Integer, String>> list = new ArrayList<>(e.getValue());
Collections.sort(list, new Comparator<Pair<Integer, String>>() {
@Override
public int compare(Pair<Integer, String> o1, Pair<Integer, String> o2) {
return o1.getLeft().compareTo(o2.getLeft());
}
});
Collections.sort(list, (o1, o2) -> o1.getLeft().compareTo(o2.getLeft()));
unreferencedEntries.add(new Pair<>(e.getKey(), list));
}
Collections.sort(unreferencedEntries, new Comparator<Pair<String, List<Pair<Integer, String>>>>() {
@Override
public int compare(Pair<String, List<Pair<Integer, String>>> o1, Pair<String, List<Pair<Integer, String>>> o2) {
return o1.getLeft().compareTo(o2.getLeft());
}
});
Collections.sort(unreferencedEntries, (o1, o2) -> o1.getLeft().compareTo(o2.getLeft()));
printReportFileResults(unreferencedEntries);
}