Merge pull request #66 from asdflj/master

missing items always in the top
This commit is contained in:
Martin Robertz authored and GitHub committed 2023-01-20 08:09:27 +01:00
commit e29f044e2e
2 files changed
+20 -6

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@
dependencies {
compile('com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev')
compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-138-GTNH:dev')
compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-143-GTNH:dev')
compile('curse.maven:cofh-core-69162:2388751')
compile('com.github.GTNewHorizons:waila:1.5.22:dev')
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.25:dev') { transitive = false }
@@ -20,10 +20,7 @@ import com.glodblock.github.network.CPacketSwitchGuis;
import com.glodblock.github.util.ModAndClassUtil;
import com.google.common.base.Joiner;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.*;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
@@ -380,10 +377,27 @@ public class GuiFluidCraftConfirm extends AEBaseGui {
is.setStackSize(amt);
}
}
this.sortItems();
this.setScrollBar();
}
Comparator<IAEItemStack> comparator = (i1, i2) -> {
if (missing.findPrecise(i1) != null) {
if (missing.findPrecise(i2) != null) return 0;
return -1;
} else if (missing.findPrecise(i2) != null) {
return 1;
} else {
return 0;
}
};
private void sortItems() {
if (!this.missing.isEmpty()) {
this.visual.sort(comparator);
}
}
private void handleInput(final IItemList<IAEItemStack> s, final IAEItemStack l) {
IAEItemStack a = s.findPrecise(l);