dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow grid filter searching in crafter manager and fix misc bugs

Browse Source
This commit is contained in:
raoulvdberge
2018-03-19 15:33:55 +01:00
parent 69227cad31
commit 20c96b467f
5 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java
View File

@@ -4,6 +4,9 @@ import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCrafterManager;
import com.raoulvdberge.refinedstorage.container.slot.SlotCrafterManager;
import com.raoulvdberge.refinedstorage.gui.IResizableDisplay;
import com.raoulvdberge.refinedstorage.gui.grid.filtering.GridFilterParser;
import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import com.raoulvdberge.refinedstorage.inventory.ItemHandlerBase;
import com.raoulvdberge.refinedstorage.item.ItemPattern;
import com.raoulvdberge.refinedstorage.tile.TileCrafterManager;
@@ -19,9 +22,11 @@ import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.SlotItemHandler;
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
public class ContainerCrafterManager extends ContainerBase {
public class CrafterManagerListener implements IContainerListener {
@@ -70,6 +75,7 @@ public class ContainerCrafterManager extends ContainerBase {
private Map<String, Integer> containerData;
private Map<String, IItemHandlerModifiable> dummyInventories = new HashMap<>();
private Map<String, Integer> headings = new HashMap<>();
private int rows;
@Override
public void addListener(IContainerListener listener) {
@@ -116,11 +122,15 @@ public class ContainerCrafterManager extends ContainerBase {
this.inventoryItemStacks.clear();
this.headings.clear();
rows = 0;
addPlayerInventory(8, display.getYPlayerInventory());
int y = 19 + 18 - display.getCurrentOffset() * 18;
int x = 8;
List<Predicate<IGridStack>> filters = GridFilterParser.getFilters(null, display.getSearchFieldText(), Collections.emptyList());
for (Map.Entry<String, Integer> category : containerData.entrySet()) {
IItemHandlerModifiable dummy;
@@ -139,6 +149,7 @@ public class ContainerCrafterManager extends ContainerBase {
int yHeading = y - 19;
int slotFound = 0;
for (int slot = 0; slot < category.getValue(); ++slot) {
boolean visible = true;
@@ -153,9 +164,13 @@ public class ContainerCrafterManager extends ContainerBase {
visible = false;
for (ItemStack output : pattern.getOutputs()) {
if (output.getDisplayName().toLowerCase().contains(display.getSearchFieldText().toLowerCase())) {
visible = true;
break;
GridStackItem outputConverted = new GridStackItem(output);
for (Predicate<IGridStack> filter : filters) {
if (filter.test(outputConverted)) {
visible = true;
break;
}
}
}
}
@@ -169,10 +184,13 @@ public class ContainerCrafterManager extends ContainerBase {
x += 18;
// Don't increase y level if we are on our last slot row (otherwise we do y += 18 * 3)
if ((slot + 1) % 9 == 0 && slot + 1 < category.getValue()) {
if ((slotFound + 1) % 9 == 0 && slot + 1 < category.getValue()) {
x = 8;
y += 18;
rows++;
}
slotFound++;
}
}
@@ -181,6 +199,7 @@ public class ContainerCrafterManager extends ContainerBase {
x = 8;
y += 18 * 2;
rows += 2; // Heading and first row
}
}
}
@@ -189,8 +208,8 @@ public class ContainerCrafterManager extends ContainerBase {
return headings;
}
public Map<String, Integer> getContainerData() {
return containerData;
public int getRows() {
return rows;
}
@Override

15
src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCrafterManager.java
View File

@@ -73,20 +73,7 @@ public class GuiCrafterManager extends GuiBase implements IResizableDisplay {
@Override
public int getRows() {
if (container == null || container.getContainerData() == null) {
return 0;
}
int rows = 0;
for (Map.Entry<String, Integer> containerData : container.getContainerData().entrySet()) {
if (t(containerData.getKey()).toLowerCase().contains(getSearchFieldText().toLowerCase())) {
rows++;
rows += Math.ceil((double) Math.max(9, containerData.getValue()) / 9D);
}
}
return rows;
return (container == null || !crafterManager.isActive()) ? 0 : container.getRows();
}
@Override

13
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/filtering/GridFilterParser.java
View File

@@ -4,12 +4,13 @@ import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
import com.raoulvdberge.refinedstorage.api.util.IFilter;
import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
import javax.annotation.Nullable;
import java.util.LinkedList;
import java.util.List;
import java.util.function.Predicate;
public final class GridFilterParser {
public static List<Predicate<IGridStack>> getFilters(IGrid grid, String query, List<IFilter> filters) {
public static List<Predicate<IGridStack>> getFilters(@Nullable IGrid grid, String query, List<IFilter> filters) {
List<Predicate<IGridStack>> gridFilters = new LinkedList<>();
for (String part : query.toLowerCase().trim().split(" ")) {
@@ -24,10 +25,12 @@ public final class GridFilterParser {
}
}
if (grid.getViewType() == IGrid.VIEW_TYPE_NON_CRAFTABLES) {
gridFilters.add(new GridFilterCraftable(false));
} else if (grid.getViewType() == IGrid.VIEW_TYPE_CRAFTABLES) {
gridFilters.add(new GridFilterCraftable(true));
if (grid != null) {
if (grid.getViewType() == IGrid.VIEW_TYPE_NON_CRAFTABLES) {
gridFilters.add(new GridFilterCraftable(false));
} else if (grid.getViewType() == IGrid.VIEW_TYPE_CRAFTABLES) {
gridFilters.add(new GridFilterCraftable(true));
}
}
if (!filters.isEmpty()) {

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java
View File

@@ -28,6 +28,10 @@ public class GridStackItem implements IGridStack {
@Nullable
private IStorageTracker.IStorageTrackerEntry entry;
public GridStackItem(ItemStack stack) {
this.stack = stack;
}
public GridStackItem(ByteBuf buf) {
this.stack = StackUtils.readItemStack(buf);
this.hash = buf.readInt();

2
src/main/java/com/raoulvdberge/refinedstorage/integration/inventorysorter/IntegrationInventorySorter.java
View File

@@ -5,6 +5,6 @@ import net.minecraftforge.fml.common.event.FMLInterModComms;
public class IntegrationInventorySorter {
public static void register() {
// Prevent items moving while scrolling through slots with Inventory Sorter in the Crafter Manager
FMLInterModComms.sendMessage("inventorysorter", "slotblacklist", "com.raoulvdberge.refinedstorage.container.slot.SlotCrafterManager");
FMLInterModComms.sendMessage("inventorysorter", "containerblacklist", "com.raoulvdberge.refinedstorage.container.ContainerCrafterManager");
}
}