Compare commits

..
Author SHA1 Message Date
Martin Robertz 4298d7d426 Merge remote-tracking branch 'slprime/fix_nei_loading' into dev
# Conflicts:
#	src/main/java/codechicken/nei/NEIClientConfig.java
2024-12-31 13:59:21 +01:00
slprime 85813941bb add synchronized 2024-12-31 11:05:53 +02:00
slprime 88b1b0077d Fixed NEI reload when changing dimension 2024-12-31 09:47:07 +02:00
Martin Robertz 7a1065e789 Merge remote-tracking branch 'slprime/hide_items_until_searching' into dev 2024-12-29 11:56:47 +01:00
Martin Robertz 2cb60ea0cf Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2024-12-29 11:56:40 +01:00
Martin Robertz a078d71746 Merge remote-tracking branch 'slprime/extend_subset_widget' into dev 2024-12-29 11:56:30 +01:00
Martin Robertz 1608665de0 Merge remote-tracking branch 'slprime/option_integer_field_width' into dev 2024-12-29 11:54:35 +01:00
Maya 55c111dff0 Merge branch 'master' into option_integer_field_width 2024-12-28 20:32:48 -06:00
Martin Robertz c041c953c6 missing imports 2024-12-27 09:56:46 +01:00
Martin Robertz 2448008b91 Merge remote-tracking branch 'slprime/extend_subset_widget' into dev
# Conflicts:
#	src/main/java/codechicken/nei/ItemPanel.java
#	src/main/java/codechicken/nei/guihook/GuiContainerManager.java
2024-12-27 09:55:10 +01:00
Martin Robertz 4e808cb44e Merge remote-tracking branch 'slprime/option_integer_field_width' into dev 2024-12-27 09:49:59 +01:00
Martin Robertz 827d42907d Merge remote-tracking branch 'origin/colored-tooltips' into dev 2024-12-27 09:49:40 +01:00
Martin Robertz ba659ee6ef Merge remote-tracking branch 'slprime/fix_item_rendering_cache' into dev 2024-12-27 09:49:34 +01:00
Martin Robertz a23e70c433 Merge remote-tracking branch 'slprime/hide_items_until_searching' into dev 2024-12-27 09:49:00 +01:00
Martin Robertz 489bfb7079 Merge branch 'master' into colored-tooltips 2024-12-26 23:20:56 +01:00
slprime c824d26bb1 Change OptionIntegerField Width 2024-12-20 18:37:08 +02:00
glowredman 91ec6b7e5e Add RenderTooltipEvent compat 2024-12-20 15:16:27 +01:00
4 changed files with 34 additions and 36 deletions

No files matched your search

+11 -15
View File
@@ -2,7 +2,6 @@ package codechicken.nei;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
@@ -47,7 +46,7 @@ public class ItemList {
private static final HashSet<Item> erroredItems = new HashSet<>();
private static final HashSet<String> stackTraces = new HashSet<>();
private static HashMap<ItemStack, Integer> ordering = new HashMap<>();
private static final HashMap<ItemStack, Integer> ordering = new HashMap<>();
/**
* Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is actually finished or not.
*/
@@ -237,9 +236,9 @@ public class ItemList {
}
private void updateOrdering(List<ItemStack> items) {
ItemSorter.sort(items);
ItemList.ordering.clear();
HashMap<ItemStack, Integer> newOrdering = new HashMap<>();
ItemSorter.sort(items);
if (!CollapsibleItems.isEmpty()) {
HashMap<Integer, Integer> groups = new HashMap<>();
@@ -249,25 +248,23 @@ public class ItemList {
final int groupIndex = CollapsibleItems.getGroupIndex(stack);
if (groupIndex == -1) {
newOrdering.put(stack, orderIndex++);
ItemList.ordering.put(stack, orderIndex++);
} else {
if (!groups.containsKey(groupIndex)) {
groups.put(groupIndex, orderIndex++);
}
newOrdering.put(stack, groups.get(groupIndex));
ItemList.ordering.put(stack, groups.get(groupIndex));
}
}
} else {
int orderIndex = 0;
for (ItemStack stack : items) {
newOrdering.put(stack, orderIndex++);
ItemList.ordering.put(stack, orderIndex++);
}
}
ItemList.ordering = newOrdering;
}
private List<ItemStack> getPermutations(Item item) {
@@ -390,9 +387,12 @@ public class ItemList {
public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering") {
private int compare(ItemStack o1, ItemStack o2) {
return Integer.compare(ItemList.ordering.get(o1), ItemList.ordering.get(o2));
}
@Override
public void execute() {
if (!loadFinished) return;
ItemFilter filter = getItemListFilter();
ArrayList<ItemStack> filtered;
@@ -409,12 +409,8 @@ public class ItemList {
}
if (interrupted()) return;
Comparator<ItemStack> comparator = Comparator.comparingInt(ItemList.ordering::get);
filtered.sort(comparator::compare);
filtered.sort(this::compare);
if (interrupted()) return;
ItemPanel.updateItemList(filtered);
}
};
@@ -414,6 +414,7 @@ public class ItemPanel extends PanelWidget {
super.setVisible();
if (grid.getPerPage() > 0) {
if (!CollapsibleItems.isEmpty() && !grid.isEmpty()) {
LayoutManager.addWidget(toggleGroups);
}
@@ -723,21 +723,25 @@ public class NEIClientConfig {
public static void loadWorld(String worldPath) {
unloadWorld();
NEIClientConfig.worldPath = worldPath;
setInternalEnabled(true);
logger.debug("Loading " + (Minecraft.getMinecraft().isSingleplayer() ? "Local" : "Remote") + " World");
final File specificDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
final boolean newWorld = !specificDir.exists();
if (!worldPath.equals(NEIClientConfig.worldPath)) {
NEIClientConfig.worldPath = worldPath;
if (newWorld) {
specificDir.mkdirs();
logger.debug("Loading " + (Minecraft.getMinecraft().isSingleplayer() ? "Local" : "Remote") + " World");
final File specificDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
final boolean newWorld = !specificDir.exists();
if (newWorld) {
specificDir.mkdirs();
}
world = new ConfigSet(new File(specificDir, "NEI.dat"), new ConfigFile(new File(specificDir, "NEI.cfg")));
bootNEI(ClientUtils.getWorld());
onWorldLoad(newWorld);
ItemPanels.bookmarkPanel.load();
}
world = new ConfigSet(new File(specificDir, "NEI.dat"), new ConfigFile(new File(specificDir, "NEI.cfg")));
bootNEI(ClientUtils.getWorld());
onWorldLoad(newWorld);
}
public static String getWorldPath() {
@@ -838,9 +842,8 @@ public class NEIClientConfig {
});
RecipeCatalysts.loadCatalystInfo();
ItemPanels.bookmarkPanel.load();
SubsetWidget.loadHidden();
CollapsibleItems.load();
SubsetWidget.loadHidden();
ItemSorter.loadConfig();
// Set pluginNEIConfigLoaded here before posting the NEIConfigsLoadedEvent. This used to be the
@@ -854,10 +857,6 @@ public class NEIClientConfig {
ItemList.loadItems.restart();
}
}.start();
} else {
ItemPanels.bookmarkPanel.load();
SubsetWidget.loadHidden();
ItemList.loadItems.restart();
}
}
@@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
@@ -21,6 +22,7 @@ import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler;
public class StackInfo {
private static final FluidStack NULL_FLUID = new FluidStack(FluidRegistry.WATER, 0);
public static final ArrayList<IStackStringifyHandler> stackStringifyHandlers = new ArrayList<>();
private static final HashMap<String, HashMap<String, String[]>> guidfilters = new HashMap<>();
private static final ItemStackMap<String> guidcache = new ItemStackMap<>();
@@ -30,7 +32,7 @@ public class StackInfo {
@Override
protected boolean removeEldestEntry(Map.Entry<ItemStack, FluidStack> eldest) {
return size() > 20;
return size() > 200;
}
};
@@ -92,7 +94,7 @@ public class StackInfo {
return true;
}
public static FluidStack getFluid(ItemStack stack) {
public static synchronized FluidStack getFluid(ItemStack stack) {
FluidStack fluid = fluidcache.get(stack);
if (fluid == null && !fluidcache.containsKey(stack)) {
@@ -101,10 +103,10 @@ public class StackInfo {
fluid = stackStringifyHandlers.get(i).getFluid(stack);
}
fluidcache.put(stack, fluid);
fluidcache.put(stack, fluid == null ? NULL_FLUID : fluid);
}
return fluid;
return fluid == NULL_FLUID ? null : fluid;
}
public static boolean isFluidContainer(ItemStack stack) {