Update buildscript & apply automatic formatting rules

This commit is contained in:
Raven Szewczyk authored and Jason Mitchell committed 2022-06-27 10:23:18 -07:00
1 parent a7683b885d
commit f7a900e910
173 files changed
+4581 -5321

No files matched your search

+25 -35
View File
@@ -6,19 +6,16 @@ import codechicken.nei.api.API;
import codechicken.nei.api.ItemInfo;
import codechicken.nei.config.GuiItemSorter;
import codechicken.nei.config.OptionOpenGui;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
{
public static class SortEntry
{
public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback {
public static class SortEntry {
public final String name;
public final Comparator<ItemStack> comparator;
@@ -32,7 +29,7 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
}
public String getTooltip() {
String tipname = name+".tip";
String tipname = name + ".tip";
String tip = StatCollector.translateToLocal(tipname);
return !tip.equals(tipname) ? tip : null;
}
@@ -42,12 +39,13 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
public static ArrayList<SortEntry> list = new ArrayList<>();
public static final ItemSorter instance = new ItemSorter();
//optimisations
// optimisations
public HashMap<ItemStack, Integer> ordering = null;
public static void sort(ArrayList<ItemStack> items) {
try {
// items = (ArrayList<ItemStack>) items.parallelStream().sorted(instance).collect(Collectors.toList());
// items = (ArrayList<ItemStack>)
// items.parallelStream().sorted(instance).collect(Collectors.toList());
items.sort(instance);
} catch (Exception e) {
NEIClientConfig.logger.error("Exception sorting item list", e);
@@ -56,9 +54,9 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
@Override
public int compare(ItemStack o1, ItemStack o2) {
for(SortEntry e : list) {
for (SortEntry e : list) {
int c = e.comparator.compare(o1, o2);
if(c != 0) return c;
if (c != 0) return c;
}
return 0;
}
@@ -67,15 +65,12 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
public void itemsLoaded() {
HashMap<ItemStack, Integer> newMap = new HashMap<>();
int i = 0;
for(ItemStack stack : ItemList.items)
newMap.put(stack, i++);
for (ItemStack stack : ItemList.items) newMap.put(stack, i++);
ordering = newMap;
}
public static SortEntry find(String name) {
for(SortEntry e : entries)
if(e.name.equals(name))
return e;
for (SortEntry e : entries) if (e.name.equals(name)) return e;
return null;
}
@@ -89,11 +84,11 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
entries.add(e);
ArrayList<SortEntry> nlist = new ArrayList<>(list);
nlist.add(e);
list = nlist;//concurrency
list = nlist; // concurrency
}
public static void initConfig(ConfigTagParent tag) {
//minecraft, mod, id, default, meta, name
// minecraft, mod, id, default, meta, name
API.addSortOption("nei.itemsort.minecraft", (o1, o2) -> {
boolean m1 = "minecraft".equals(ItemInfo.itemOwners.get(o1.getItem()));
boolean m2 = "minecraft".equals(ItemInfo.itemOwners.get(o2.getItem()));
@@ -102,8 +97,8 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
API.addSortOption("nei.itemsort.mod", (o1, o2) -> {
String mod1 = ItemInfo.itemOwners.get(o1.getItem());
String mod2 = ItemInfo.itemOwners.get(o2.getItem());
if(mod1 == null) return mod2 == null ? 0 : 1;
if(mod2 == null) return -1;
if (mod1 == null) return mod2 == null ? 0 : 1;
if (mod2 == null) return -1;
return mod1.compareTo(mod2);
});
API.addSortOption("nei.itemsort.id", (o1, o2) -> {
@@ -114,8 +109,8 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
API.addSortOption("nei.itemsort.default", (o1, o2) -> {
Integer order1 = instance.ordering.get(o1);
Integer order2 = instance.ordering.get(o2);
if(order1 == null) return order2 == null ? 0 : 1;
if(order2 == null) return -1;
if (order1 == null) return order2 == null ? 0 : 1;
if (order2 == null) return -1;
return compareInt(order1, order2);
});
API.addSortOption("nei.itemsort.damage", (o1, o2) -> {
@@ -141,27 +136,22 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
public static String getSaveString(List<SortEntry> list) {
StringBuilder sb = new StringBuilder();
for(SortEntry e : list) {
if(sb.length() > 0)
sb.append(',');
for (SortEntry e : list) {
if (sb.length() > 0) sb.append(',');
sb.append(e.name);
}
return sb.toString();
}
public static ArrayList<SortEntry> fromSaveString(String s) {
if(s == null)
return new ArrayList<>(entries);
if (s == null) return new ArrayList<>(entries);
ArrayList<SortEntry> list = new ArrayList<>();
for(String s2 : s.split(",")) {
for (String s2 : s.split(",")) {
SortEntry e = find(s2.trim());
if(e != null)
list.add(e);
if (e != null) list.add(e);
}
for(SortEntry e : entries)
if(!list.contains(e))
list.add(e);
for (SortEntry e : entries) if (!list.contains(e)) list.add(e);
return list;
}