Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose entire network inventory to EMI for craftable/favorite checks (configurable, off by default) #8215

Merged
merged 4 commits into from
Dec 8, 2024
Merged

Expose entire network inventory to EMI for craftable/favorite checks (configurable, off by default) #8215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c3873a
Add all viewable items in MEStorageMenus to Emi inventory
ramidzkh Oct 17, 2024
783e65f
Add crafting slots to input sources
ramidzkh Oct 17, 2024
c5e59b8
Let it work with PatternEncodingTermMenus
ramidzkh Oct 17, 2024
4c7f91b
Add config
shartte Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/appeng/core/AEConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ public boolean isEnableFacadeRecipesInRecipeViewer() {
return client.enableFacadeRecipesInRecipeViewer.getAsBoolean();
}

public boolean isExposeNetworkInventoryToEmi() {
return client.exposeNetworkInventoryToEmi.getAsBoolean();
}

public int getCraftingCalculationTimePerTick() {
return common.craftingCalculationTimePerTick.get();
}
Expand Down Expand Up @@ -424,6 +428,7 @@ private static class ClientConfig {
public final BooleanValue disableColoredCableRecipesInRecipeViewer;
public final BooleanValue enableFacadesInRecipeViewer;
public final BooleanValue enableFacadeRecipesInRecipeViewer;
public final BooleanValue exposeNetworkInventoryToEmi;
public final EnumValue<PowerUnit> selectedPowerUnit;
public final BooleanValue debugGuiOverlays;
public final BooleanValue showPlacementPreview;
Expand Down Expand Up @@ -458,6 +463,8 @@ public ClientConfig() {
"Show facades in REI/JEI/EMI item list");
this.enableFacadeRecipesInRecipeViewer = define(builder, "enableFacadeRecipesInRecipeViewer", true,
"Show facade recipes in REI/JEI/EMI for supported blocks");
this.exposeNetworkInventoryToEmi = define(builder, "provideNetworkInventoryToEmi", false,
"Expose the full network inventory to EMI, which might cause performance problems.");
builder.pop();

builder.push("client");
Expand Down
35 changes: 35 additions & 0 deletions src/main/java/appeng/integration/modules/emi/AbstractRecipeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,33 @@

import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
import net.minecraft.network.chat.Component;
import net.minecraft.world.inventory.Slot;
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.level.Level;

import dev.emi.emi.api.recipe.EmiPlayerInventory;
import dev.emi.emi.api.recipe.EmiRecipe;
import dev.emi.emi.api.recipe.VanillaEmiRecipeCategories;
import dev.emi.emi.api.recipe.handler.EmiCraftContext;
import dev.emi.emi.api.recipe.handler.StandardRecipeHandler;
import dev.emi.emi.api.stack.EmiIngredient;
import dev.emi.emi.api.stack.EmiStack;
import dev.emi.emi.api.widget.Bounds;
import dev.emi.emi.api.widget.SlotWidget;
import dev.emi.emi.api.widget.Widget;

import appeng.api.stacks.AEKey;
import appeng.api.stacks.GenericStack;
import appeng.core.AEConfig;
import appeng.integration.modules.itemlists.EncodingHelper;
import appeng.integration.modules.itemlists.TransferHelper;
import appeng.menu.AEBaseMenu;
import appeng.menu.SlotSemantics;
import appeng.menu.me.common.MEStorageMenu;
import appeng.menu.me.items.CraftingTermMenu;

abstract class AbstractRecipeHandler<T extends AEBaseMenu> implements StandardRecipeHandler<T> {
Expand All @@ -51,6 +57,7 @@ public List<Slot> getInputSources(T menu) {
var slots = new ArrayList<Slot>();
slots.addAll(menu.getSlots(SlotSemantics.PLAYER_INVENTORY));
slots.addAll(menu.getSlots(SlotSemantics.PLAYER_HOTBAR));
slots.addAll(menu.getSlots(SlotSemantics.CRAFTING_GRID));
return slots;
}

Expand All @@ -67,6 +74,34 @@ public List<Slot> getCraftingSlots(T menu) {
return null;
}

@Override
public EmiPlayerInventory getInventory(AbstractContainerScreen<T> screen) {
if (!AEConfig.instance().isExposeNetworkInventoryToEmi()) {
return StandardRecipeHandler.super.getInventory(screen);
}

var list = new ArrayList<EmiStack>();

for (Slot slot : getInputSources(screen.getMenu())) {
list.add(EmiStack.of(slot.getItem()));
}

if (screen.getMenu() instanceof MEStorageMenu menu) {
var repo = menu.getClientRepo();

if (repo != null) {
for (var entry : repo.getAllEntries()) {
if (entry.getStoredAmount() <= 0) {
continue; // Skip items that are only craftable
}
list.add(EmiStackHelper.toEmiStack(new GenericStack(entry.getWhat(), entry.getStoredAmount())));
}
}
}

return new EmiPlayerInventory(list);
}

@Override
public boolean canCraft(EmiRecipe recipe, EmiCraftContext<T> context) {
if (context.getType() == EmiCraftContext.Type.FILL_BUTTON) {
Expand Down
Loading