Merge remote-tracking branch 'slprime/bookmarks_groups_and_filter' into dev

This commit is contained in:
Martin Robertz committed 2024-01-16 22:09:20 +01:00
commit d35e77661f
2 files changed
+6 -12

No files matched your search

@@ -269,27 +269,23 @@ public class BookmarkCraftingChain {
return false;
}
int shift = 0;
int minRecipeIndex = 0;
int minShift = 0x7fffff;
int minShift = Integer.MAX_VALUE;
for (CraftingChainItem item : request.outputs.get(stackIndex)) {
if (!request.initialItems.contains(item.recipeIndex) && item.factor > 0) {
long ingrCount = calculateCount(request, request.inputs.get(item.stackIndex));
long outputCount = calculateCount(request, request.outputs.get(item.stackIndex));
long shift = (ingrCount - outputCount) / item.factor;
while ((outputCount + item.factor * shift) < ingrCount && shift < minShift) {
shift++;
}
if (shift < minShift) {
minShift = shift;
if (shift > 0 && shift < minShift) {
minShift = (int) shift;
minRecipeIndex = item.recipeIndex;
}
}
}
if (minShift < 0x7fffff) {
if (minShift < Integer.MAX_VALUE) {
request.multiplier.put(minRecipeIndex, request.multiplier.get(minRecipeIndex) + minShift);
return true;
}
@@ -1983,7 +1983,7 @@ public class BookmarkPanel extends PanelWidget {
if (this.sortableItem != null) {
this.sortableItem = null;
this.mouseDownSlot = -1;
grid.onGridChanged(); /* make sure grid redraws the new item */
grid.onItemsChanged(); /* make sure grid redraws the new item */
saveBookmarks();
} else if (this.groupingItem != null) {
final BookmarkGrid BGrid = (BookmarkGrid) grid;
@@ -2113,8 +2113,6 @@ public class BookmarkPanel extends PanelWidget {
final BookmarkGroup group = groupId >= 0 ? BGrid.groups.get(groupId) : null;
ItemStackMetadata meta;
System.out.println("onlyIngredients: " + onlyIngredients);
for (int idx = 0; idx < BGrid.realItems.size(); idx++) {
meta = BGrid.metadata.get(idx);