add tooltip for wireless crafting terminal

This commit is contained in:
vfyjxf committed 2021-10-17 03:25:39 +08:00
1 parent ac3fa7fcc2
commit e921b199b6
11 files changed
+193 -80

No files matched your search

@@ -13,6 +13,7 @@ import com.github.vfyjxf.nee.nei.NEECraftingHelper;
import com.github.vfyjxf.nee.processor.IRecipeProcessor;
import com.github.vfyjxf.nee.processor.RecipeProcessor;
import cpw.mods.fml.common.Loader;
import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal;
import org.lwjgl.input.Keyboard;
import thaumicenergistics.client.gui.GuiKnowledgeInscriber;
import wanion.avaritiaddons.block.extremeautocrafter.GuiExtremeAutoCrafter;
@@ -45,12 +46,14 @@ public class NEINeeConfig implements IConfigureNEI {
API.registerGuiOverlayHandler(GuiPatternTerm.class, new NEECraftingHandler(), ident);
}
if(NEEConfig.drawHighlight){
if (NEEConfig.drawHighlight) {
GuiContainerManager.addDrawHandler(NEEContainerDrawHandler.instance);
}
installCraftingTermSupport();
installWirelessCraftingTermSupport();
installPatternTerminalExSupport(identifiers);
installThaumicEnergisticsSupport();
@@ -82,6 +85,13 @@ public class NEINeeConfig implements IConfigureNEI {
API.registerGuiOverlayHandler(GuiCraftingTerm.class, new NEECraftingHelper(), "crafting2x2");
}
private void installWirelessCraftingTermSupport() {
if (Loader.isModLoaded("ae2wct")) {
API.registerGuiOverlayHandler(GuiWirelessCraftingTerminal.class, new NEECraftingHelper(), "crafting");
API.registerGuiOverlayHandler(GuiWirelessCraftingTerminal.class, new NEECraftingHelper(), "crafting2x2");
}
}
private void installThaumicEnergisticsSupport() {
try {
Class.forName("thaumicenergistics.client.gui.GuiKnowledgeInscriber");
@@ -49,7 +49,9 @@ public class GuiHandler {
@SubscribeEvent
public void onGuiOpen(GuiOpenEvent event) {
GuiScreen currentScreen = Minecraft.getMinecraft().currentScreen;
if (event.gui instanceof GuiCraftingTerm && currentScreen instanceof GuiCraftConfirm && tracker != null) {
boolean isGuiCraftingTerm = event.gui instanceof GuiCraftingTerm || GuiUtils.isGuiWirelessCrafting(event.gui);
boolean isGuiCraftConfirm = currentScreen instanceof GuiCraftConfirm || GuiUtils.isWirelessGuiCraftConfirm(currentScreen);
if (isGuiCraftingTerm && isGuiCraftConfirm && tracker != null) {
if (tracker.getRequireToCraftStacks().size() > 1 && stackIndex < tracker.getRequireToCraftStacks().size()) {
NEENetworkHandler.getInstance().sendToServer(new PacketCraftingHelper(tracker.getRequireToCraftStacks().get(stackIndex), noPreview));
stackIndex++;
@@ -74,7 +74,8 @@ public class NEEContainerDrawHandler implements IContainerDrawHandler {
if (gui instanceof GuiRecipe) {
Minecraft mc = Minecraft.getMinecraft();
GuiRecipe guiRecipe = (GuiRecipe) gui;
if (guiRecipe.firstGui instanceof GuiCraftingTerm || guiRecipe.firstGui instanceof GuiPatternTerm || GuiUtils.isPatternTermExGui(guiRecipe.firstGui)) {
GuiContainer firstGui = guiRecipe.firstGui;
if (firstGui instanceof GuiPatternTerm || firstGui instanceof GuiCraftingTerm || GuiUtils.isPatternTermExGui(firstGui) || GuiUtils.isGuiWirelessCrafting(firstGui)) {
final ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
int i = scaledresolution.getScaledWidth();
int j = scaledresolution.getScaledHeight();
@@ -108,10 +109,9 @@ public class NEEContainerDrawHandler implements IContainerDrawHandler {
Ingredient ingredient = tracker.getIngredients().get(var1);
Slot stackSlot = guiRecipe.slotcontainer.getSlotWithStack(stack, guiRecipe.getRecipePosition(recipeIndex).x, guiRecipe.getRecipePosition(recipeIndex).y);
if (stackSlot.equals(slot)) {
GuiContainer firstGui = guiRecipe.firstGui;
boolean renderAutoAbleItems = firstGui instanceof GuiCraftingTerm && ingredient.isCraftable() && ingredient.requiresToCraft();
boolean renderAutoAbleItems = (firstGui instanceof GuiCraftingTerm || GuiUtils.isGuiWirelessCrafting(firstGui)) && ingredient.isCraftable() && ingredient.requiresToCraft();
boolean renderCraftableItems = (firstGui instanceof GuiPatternTerm || GuiUtils.isPatternTermExGui(firstGui)) && ingredient.isCraftable();
boolean renderMissingItems = firstGui instanceof GuiCraftingTerm && !ingredient.isCraftable() && ingredient.requiresToCraft();
boolean renderMissingItems = (firstGui instanceof GuiCraftingTerm || GuiUtils.isGuiWirelessCrafting(firstGui)) && !ingredient.isCraftable() && ingredient.requiresToCraft();
if (renderAutoAbleItems || renderCraftableItems) {
Gui.drawRect(slot.xDisplayPosition, slot.yDisplayPosition,
slot.xDisplayPosition + 16, slot.yDisplayPosition + 16,
@@ -154,7 +154,7 @@ public class NEEContainerDrawHandler implements IContainerDrawHandler {
private void drawCraftingHelperTooltip(GuiRecipe guiRecipe, int mouseX, int mouseY) {
List<String> tooltips = new ArrayList<>();
if (guiRecipe.firstGui instanceof GuiCraftingTerm) {
if (guiRecipe.firstGui instanceof GuiCraftingTerm || GuiUtils.isGuiWirelessCrafting(guiRecipe.firstGui)) {
tooltips.add(String.format("%s" + EnumChatFormatting.GRAY + " + " +
EnumChatFormatting.BLUE + I18n.format("neenergistics.gui.tooltip.helper.crafting"),
EnumChatFormatting.YELLOW + Keyboard.getKeyName(NEIClientConfig.getKeyBinding("nee.preview"))));
@@ -174,6 +174,7 @@ public class NEEContainerDrawHandler implements IContainerDrawHandler {
}
}
@SuppressWarnings("unchecked")
private IngredientTracker createTracker(GuiContainer firstGui, List<PositionedStack> ingredients) {
IngredientTracker tracker = new IngredientTracker(firstGui, ingredients);
@@ -20,7 +20,7 @@ public class NEEConfig {
public static String[] transformPriorityModList = new String[0];
public static boolean noShift = true;
public static boolean matchOtherItems = false;
public static boolean matchOtherItems = true;
public static boolean drawHighlight = true;
public static void loadConfig(File configFile) {
@@ -40,10 +40,10 @@ public class NEEConfig {
noShift = config.get("client", "noShift", true,
"if true, you don't need to press shift to use NEI's transfer system in CratingTerminal and PatternTerminal").getBoolean();
matchOtherItems = config.get("client", "matchOnCraftableItems", false,
"If false, Crafting Helper will not match other items").getBoolean();
matchOtherItems = config.get("client", "matchOnCraftableItems", true,
"If true, Crafting Helper will match other items even they can't auto-crafting").getBoolean();
drawHighlight = config.get("client","drawHighlight",true,
drawHighlight = config.get("client", "drawHighlight", true,
"if true,it will draw highlight for missing items and item which can autocraft in nei").getBoolean();
if (config.hasChanged()) config.save();
@@ -48,8 +48,8 @@ public class NEECraftingHelper implements IOverlayHandler {
@Override
public void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift) {
Container container = Minecraft.getMinecraft().thePlayer.openContainer;
if (firstGui instanceof GuiCraftingTerm && NEECraftingHandler.isCraftingTableRecipe(recipe) && container instanceof ContainerCraftingTerm) {
boolean isCraftingGuiTerm = firstGui instanceof GuiCraftingTerm || GuiUtils.isGuiWirelessCrafting(firstGui);
if (isCraftingGuiTerm && NEECraftingHandler.isCraftingTableRecipe(recipe)) {
tracker = createTracker(firstGui, recipe, recipeIndex);
boolean doCraftingHelp = Keyboard.isKeyDown(NEIClientConfig.getKeyBinding("nee.preview")) || Keyboard.isKeyDown(NEIClientConfig.getKeyBinding("nee.nopreview"));
noPreview = Keyboard.isKeyDown(NEIClientConfig.getKeyBinding("nee.nopreview"));
@@ -62,6 +62,7 @@ public class NEECraftingHelper implements IOverlayHandler {
}
}
@SuppressWarnings("unchecked")
private IngredientTracker createTracker(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex) {
IngredientTracker tracker = new IngredientTracker(firstGui, recipe, recipeIndex);
@@ -82,12 +83,16 @@ public class NEECraftingHelper implements IOverlayHandler {
private void moveItem(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex) {
try {
final List<PositionedStack> ingredients = recipe.getIngredientStacks(recipeIndex);
PacketNEIRecipe packet = new PacketNEIRecipe(packIngredients(firstGui, ingredients, false));
if (packet.size() >= 32 * 1024) {
AELog.warn("Recipe for " + recipe.getRecipeName() + " has too many variants, reduced version will be used");
packet = new PacketNEIRecipe(packIngredients(firstGui, ingredients, true));
if (firstGui instanceof GuiCraftingTerm) {
PacketNEIRecipe packet = new PacketNEIRecipe(packIngredients(firstGui, ingredients, false));
if (packet.size() >= 32 * 1024) {
AELog.warn("Recipe for " + recipe.getRecipeName() + " has too many variants, reduced version will be used");
packet = new PacketNEIRecipe(packIngredients(firstGui, ingredients, true));
}
NetworkHandler.instance.sendToServer(packet);
} else if (GuiUtils.isGuiWirelessCrafting(firstGui)) {
net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler.instance.sendToServer(new net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketNEIRecipe(packIngredients(firstGui, ingredients, false)));
}
NetworkHandler.instance.sendToServer(packet);
} catch (final Exception | Error ignored) {
}
}
@@ -105,6 +110,7 @@ public class NEECraftingHelper implements IOverlayHandler {
/**
* Copied from GTNewHorizons/Applied-Energistics-2-Unofficial
*/
@SuppressWarnings("unchecked")
private NBTTagCompound packIngredients(GuiContainer gui, List<PositionedStack> ingredients, boolean limited) throws IOException {
final NBTTagCompound recipe = new NBTTagCompound();
for (final PositionedStack positionedStack : ingredients) {
@@ -112,7 +118,7 @@ public class NEECraftingHelper implements IOverlayHandler {
final int row = (positionedStack.rely - 6) / 18;
if (positionedStack.items != null && positionedStack.items.length > 0) {
for (final Slot slot : (List<Slot>) gui.inventorySlots.inventorySlots) {
if (slot instanceof SlotCraftingMatrix || slot instanceof SlotFakeCraftingMatrix) {
if (isCraftingMatrixSlot(gui, slot)) {
if (slot.getSlotIndex() == col + row * 3) {
final NBTTagList tags = new NBTTagList();
final List<ItemStack> list = new LinkedList<>();
@@ -149,6 +155,15 @@ public class NEECraftingHelper implements IOverlayHandler {
return recipe;
}
private boolean isCraftingMatrixSlot(GuiContainer gui, Slot slot) {
if (gui instanceof GuiCraftingTerm) {
return slot instanceof SlotCraftingMatrix || slot instanceof SlotFakeCraftingMatrix;
} else if (GuiUtils.isGuiWirelessCrafting(gui)) {
return slot instanceof net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotCraftingMatrix || slot instanceof net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotFakeCraftingMatrix;
}
return false;
}
@SubscribeEvent
public void onActionPerformedEventPre(GuiScreenEvent.ActionPerformedEvent.Pre event) {
//make nei's transfer system doesn't require presses shift
@@ -162,7 +177,9 @@ public class NEECraftingHelper implements IOverlayHandler {
e.printStackTrace();
}
if (overlayButtons != null && event.button.id >= OVERLAY_BUTTON_ID_START && event.button.id < OVERLAY_BUTTON_ID_START + overlayButtons.length) {
if (guiRecipe.firstGui instanceof GuiPatternTerm || guiRecipe.firstGui instanceof GuiCraftingTerm || GuiUtils.isPatternTermExGui(guiRecipe.firstGui)) {
boolean isPatternTerm = guiRecipe.firstGui instanceof GuiPatternTerm || GuiUtils.isPatternTermExGui(guiRecipe.firstGui);
boolean isCraftingTerm = guiRecipe.firstGui instanceof GuiCraftingTerm || GuiUtils.isGuiWirelessCrafting(guiRecipe.firstGui);
if (isCraftingTerm || isPatternTerm) {
int recipesPerPage = -1;
IRecipeHandler handler = null;
try {
@@ -13,6 +13,8 @@ import appeng.core.AELog;
import appeng.core.sync.GuiBridge;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
import com.github.vfyjxf.nee.utils.GuiUtils;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
@@ -23,6 +25,10 @@ import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler;
import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal;
import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject;
import net.p455w0rd.wirelesscraftingterminal.reference.Reference;
import java.util.concurrent.Future;
@@ -65,29 +71,62 @@ public class PacketCraftingHelper implements IMessage, IMessageHandler<PacketCra
public IMessage onMessage(PacketCraftingHelper message, MessageContext ctx) {
EntityPlayerMP player = ctx.getServerHandler().playerEntity;
Container container = player.openContainer;
AEBaseContainer baseContainer = (AEBaseContainer) container;
Object target = baseContainer.getTarget();
if (target instanceof IGridHost) {
IGridHost gh = (IGridHost) target;
IGridNode gn = gh.getGridNode(ForgeDirection.UNKNOWN);
if (gn != null) {
IGrid grid = gn.getGrid();
if (container instanceof AEBaseContainer) {
AEBaseContainer baseContainer = (AEBaseContainer) container;
Object target = baseContainer.getTarget();
if (target instanceof IGridHost) {
IGridHost gh = (IGridHost) target;
IGridNode gn = gh.getGridNode(ForgeDirection.UNKNOWN);
if (gn != null) {
IGrid grid = gn.getGrid();
if (grid != null && message.getRequireToCraftStack() != null) {
Future<ICraftingJob> futureJob = null;
try {
final ICraftingGrid cg = grid.getCache(ICraftingGrid.class);
IAEItemStack result = AEItemStack.create(message.getRequireToCraftStack());
futureJob = cg.beginCraftingJob(player.worldObj, grid, baseContainer.getActionSource(), result, null);
final ContainerOpenContext context = baseContainer.getOpenContext();
if (context != null) {
final TileEntity te = context.getTile();
Platform.openGUI(player, te, baseContainer.getOpenContext().getSide(), GuiBridge.GUI_CRAFTING_CONFIRM);
if (player.openContainer instanceof ContainerCraftConfirm) {
final ContainerCraftConfirm ccc = (ContainerCraftConfirm) player.openContainer;
ccc.setJob(futureJob);
ccc.setAutoStart(message.isNoPreview());
}
}
} catch (final Throwable e) {
if (futureJob != null) {
futureJob.cancel(true);
}
AELog.debug(e);
}
}
}
}
} else if (GuiUtils.isWirelessCraftingTermContainer(container)) {
ContainerWirelessCraftingTerminal cwt = (ContainerWirelessCraftingTerminal) container;
Object target = cwt.getTarget();
if (target instanceof WirelessTerminalGuiObject) {
IGrid grid = ((WirelessTerminalGuiObject) target).getTargetGrid();
if (grid != null && message.getRequireToCraftStack() != null) {
Future<ICraftingJob> futureJob = null;
try {
final ICraftingGrid cg = grid.getCache(ICraftingGrid.class);
IAEItemStack result = AEItemStack.create(message.getRequireToCraftStack());
futureJob = cg.beginCraftingJob(player.worldObj, grid, baseContainer.getActionSource(), result, null);
futureJob = cg.beginCraftingJob(player.worldObj, grid, cwt.getActionSource(), result, null);
final ContainerOpenContext context = baseContainer.getOpenContext();
if (context != null) {
final TileEntity te = context.getTile();
Platform.openGUI(player, te, baseContainer.getOpenContext().getSide(), GuiBridge.GUI_CRAFTING_CONFIRM);
if (player.openContainer instanceof ContainerCraftConfirm) {
final ContainerCraftConfirm ccc = (ContainerCraftConfirm) player.openContainer;
ccc.setJob(futureJob);
ccc.setAutoStart(message.isNoPreview());
}
int x = (int) player.posX;
int y = (int) player.posY;
int z = (int) player.posZ;
WCTGuiHandler.launchGui(Reference.GUI_CRAFT_CONFIRM, player, player.worldObj, x, y, z);
if (player.openContainer instanceof net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftConfirm) {
final net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftConfirm ccc = (net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftConfirm) player.openContainer;
ccc.setJob(futureJob);
ccc.setAutoStart(message.isNoPreview());
}
} catch (final Throwable e) {
if (futureJob != null) {
@@ -100,4 +139,5 @@ public class PacketCraftingHelper implements IMessage, IMessageHandler<PacketCra
}
return null;
}
}
@@ -8,6 +8,7 @@ import codechicken.nei.PositionedStack;
import com.github.vfyjxf.nee.nei.NEECraftingHandler;
import com.github.vfyjxf.nee.network.NEENetworkHandler;
import com.github.vfyjxf.nee.network.packet.PacketRecipeItemChange;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.ReflectionHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
@@ -18,6 +19,7 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -68,28 +70,6 @@ public class GuiUtils {
return false;
}
public static List<ItemStack> getStacksFromCraftingTerminal(ContainerCraftingTerm container) {
List<ItemStack> stacks = new ArrayList<>();
IInventory craftingGrid = container.getInventoryByName("crafting");
for (int i = 0; i < craftingGrid.getSizeInventory(); i++) {
ItemStack currentStack = craftingGrid.getStackInSlot(i);
boolean find = false;
if (currentStack != null) {
for (ItemStack stack : stacks) {
boolean isStackEqual = stack.isItemEqual(currentStack) && ItemStack.areItemStackTagsEqual(stack, currentStack);
if (isStackEqual && stack.stackSize + currentStack.stackSize <= stack.getMaxStackSize()) {
stack.stackSize = stack.stackSize + currentStack.stackSize;
find = true;
}
}
}
if (!find && currentStack != null) {
stacks.add(currentStack.copy());
}
}
return stacks;
}
public static boolean isMouseOverButton(GuiButton button, int mouseX, int mouseY) {
return mouseX >= button.xPosition &&
mouseY >= button.yPosition &&
@@ -97,6 +77,35 @@ public class GuiUtils {
mouseY < button.yPosition + button.height;
}
public static boolean isGuiWirelessCrafting(GuiScreen gui) {
try {
Class<?> guiWirelessCraftingClass = Class.forName("net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal");
return guiWirelessCraftingClass.isInstance(gui);
} catch (ClassNotFoundException e) {
return false;
}
}
public static boolean isWirelessCraftingTermContainer(Container container) {
try {
Class<?> wirelessCraftingTermContainerClass = Class.forName("net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal");
return wirelessCraftingTermContainerClass.isInstance(container);
} catch (ClassNotFoundException e) {
return false;
}
}
public static boolean isWirelessGuiCraftConfirm(GuiScreen gui) {
try {
Class<?> wirelessGuiCraftConfirmClass = Class.forName("net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftConfirm");
return wirelessGuiCraftConfirmClass.isInstance(gui);
} catch (ClassNotFoundException e) {
return false;
}
}
public static void handleRecipeIngredientChange(Slot currentSlot, int dWheel) {
PositionedStack currentIngredients = NEECraftingHandler.ingredients.get("input" + currentSlot.getSlotIndex());
@@ -11,6 +11,7 @@ import com.github.vfyjxf.nee.config.NEEConfig;
import cpw.mods.fml.relauncher.ReflectionHelper;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal;
import java.util.ArrayList;
import java.util.List;
@@ -42,17 +43,19 @@ public class IngredientTracker {
Ingredient ingredient = new Ingredient(requiredIngredient);
ingredients.add(ingredient);
for (IAEItemStack craftableStack : NEEConfig.matchOtherItems ? this.getAEStacks(gui) : craftbleAEItemStacks) {
if (requiredIngredient.contains(craftableStack.getItemStack())) {
ingredient.setCraftableIngredient(craftableStack.getItemStack());
ingredient.addCurrentCount(craftableStack.getItemStack().stackSize);
for (IAEItemStack stack : NEEConfig.matchOtherItems ? this.getStorageStacks(gui) : craftbleAEItemStacks) {
if (requiredIngredient.contains(stack.getItemStack())) {
if (stack.isCraftable()) {
ingredient.setCraftableIngredient(stack.getItemStack());
}
ingredient.addCurrentCount(stack.getItemStack().stackSize);
}
}
}
}
public IngredientTracker(GuiContainer gui, List<PositionedStack> requiredIngredients) {
IItemList<IAEItemStack> aeItemStacks = this.getAEStacks(gui);
IItemList<IAEItemStack> aeItemStacks = this.getStorageStacks(gui);
for (PositionedStack positionedStack : requiredIngredients) {
this.ingredients.add(new Ingredient(positionedStack));
}
@@ -75,12 +78,20 @@ public class IngredientTracker {
}
}
@SuppressWarnings("unchecked")
private List<IAEItemStack> getCraftableStacks(GuiContainer gui) {
List<IAEItemStack> craftableAEItemSafcks = new ArrayList<>();
IItemList<IAEItemStack> list = null;
try {
ItemRepo repo = (ItemRepo) ReflectionHelper.findField(GuiMEMonitorable.class, "repo").get(gui);
list = (IItemList<IAEItemStack>) ReflectionHelper.findField(ItemRepo.class, "list").get(repo);
if (!GuiUtils.isGuiWirelessCrafting(gui)) {
ItemRepo repo = (ItemRepo) ReflectionHelper.findField(GuiMEMonitorable.class, "repo").get(gui);
list = (IItemList<IAEItemStack>) ReflectionHelper.findField(ItemRepo.class, "list").get(repo);
} else {
//wireless crafting terminal support
net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo repo = (net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo) ReflectionHelper.findField(GuiWirelessCraftingTerminal.class, "repo").get(gui);
list = (IItemList<IAEItemStack>) ReflectionHelper.findField(net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo.class,
"list").get(repo);
}
} catch (IllegalAccessException e) {
e.printStackTrace();
}
@@ -94,12 +105,22 @@ public class IngredientTracker {
return craftableAEItemSafcks;
}
private IItemList<IAEItemStack> getAEStacks(GuiContainer gui) {
@SuppressWarnings("unchecked")
private IItemList<IAEItemStack> getStorageStacks(GuiContainer gui) {
IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
try {
ItemRepo repo = (ItemRepo) ReflectionHelper.findField(GuiMEMonitorable.class, "repo").get(gui);
for (IAEItemStack stack : (IItemList<IAEItemStack>) ReflectionHelper.findField(ItemRepo.class, "list").get(repo)) {
list.add(stack.copy());
if (!GuiUtils.isGuiWirelessCrafting(gui)) {
ItemRepo repo = (ItemRepo) ReflectionHelper.findField(GuiMEMonitorable.class, "repo").get(gui);
for (IAEItemStack stack : (IItemList<IAEItemStack>) ReflectionHelper.findField(ItemRepo.class, "list").get(repo)) {
list.add(stack.copy());
}
} else {
//wireless crafting terminal support
net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo repo = (net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo) ReflectionHelper.findField(GuiWirelessCraftingTerminal.class, "repo").get(gui);
for (IAEItemStack stack : (IItemList<IAEItemStack>) ReflectionHelper.findField(net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo.class,
"list").get(repo)) {
list.add(stack.copy());
}
}
} catch (IllegalAccessException e) {
e.printStackTrace();
@@ -127,16 +148,29 @@ public class IngredientTracker {
public void addAvailableStack(ItemStack stack) {
for (Ingredient ingredient : this.ingredients) {
if (ingredient.requiresToCraft()) {
ItemStack craftableStack = ingredient.getCraftableIngredient();
if (craftableStack != null && craftableStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(craftableStack, stack) && stack.stackSize > 0) {
int missingCount = (int) ingredient.getMissingCount();
ingredient.addCurrentCount(stack.stackSize);
if (ingredient.requiresToCraft()) {
stack.stackSize = 0;
} else {
stack.stackSize -= missingCount;
if (NEEConfig.matchOtherItems) {
if (stack.stackSize > 0 && ingredient.getIngredients().contains(stack) && ItemStack.areItemStackTagsEqual(ingredient.getCraftableIngredient(), stack)) {
int missingCount = (int) ingredient.getMissingCount();
ingredient.addCurrentCount(stack.stackSize);
if (ingredient.requiresToCraft()) {
stack.stackSize = 0;
} else {
stack.stackSize -= missingCount;
}
break;
}
} else {
ItemStack craftableStack = ingredient.getCraftableIngredient();
if (craftableStack != null && craftableStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(craftableStack, stack) && stack.stackSize > 0) {
int missingCount = (int) ingredient.getMissingCount();
ingredient.addCurrentCount(stack.stackSize);
if (ingredient.requiresToCraft()) {
stack.stackSize = 0;
} else {
stack.stackSize -= missingCount;
}
break;
}
break;
}
}
}