Implement JEI lookups on fluid tanks

This commit is contained in:
mezz committed 2016-11-03 21:24:42 -07:00
1 parent d3054c33e7
commit 2ae52451b2
5 files changed
+49 -16

No files matched your search

@@ -11,6 +11,7 @@
package forestry.core.gui;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.awt.Rectangle;
import java.io.IOException;
import java.util.List;
@@ -23,6 +24,8 @@ import forestry.core.gui.ledgers.HintLedger;
import forestry.core.gui.ledgers.LedgerManager;
import forestry.core.gui.ledgers.OwnerLedger;
import forestry.core.gui.ledgers.PowerLedger;
import forestry.core.gui.widgets.TankWidget;
import forestry.core.gui.widgets.Widget;
import forestry.core.gui.widgets.WidgetManager;
import forestry.core.owner.IOwnedTile;
import forestry.core.proxy.Proxies;
@@ -40,6 +43,8 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
public abstract class GuiForestry<C extends Container, I extends IInventory> extends GuiContainer {
protected final I inventory;
@@ -152,11 +157,25 @@ public abstract class GuiForestry<C extends Container, I extends IInventory> ext
super.mouseClickMove(mouseX, mouseY, mouseButton, time);
}
protected Slot getSlotAtPosition(int par1, int par2) {
@Nullable
public FluidStack getFluidStackAtPosition(int mouseX, int mouseY) {
for (Widget widget : widgetManager.getWidgets()) {
if (widget instanceof TankWidget && widget.isMouseOver(mouseX - guiLeft, mouseY - guiTop)) {
TankWidget tankWidget = (TankWidget) widget;
IFluidTank tank = tankWidget.getTank();
if (tank != null) {
return tank.getFluid();
}
}
}
return null;
}
protected Slot getSlotAtPosition(int mouseX, int mouseY) {
for (int k = 0; k < this.inventorySlots.inventorySlots.size(); ++k) {
Slot slot = this.inventorySlots.inventorySlots.get(k);
if (isMouseOverSlot(slot, par1, par2)) {
if (isMouseOverSlot(slot, mouseX, mouseY)) {
return slot;
}
}
@@ -164,8 +183,8 @@ public abstract class GuiForestry<C extends Container, I extends IInventory> ext
return null;
}
private boolean isMouseOverSlot(Slot par1Slot, int par2, int par3) {
return isPointInRegion(par1Slot.xDisplayPosition, par1Slot.yDisplayPosition, 16, 16, par2, par3);
private boolean isMouseOverSlot(Slot par1Slot, int mouseX, int mouseY) {
return isPointInRegion(par1Slot.xDisplayPosition, par1Slot.yDisplayPosition, 16, 16, mouseX, mouseY);
}
@Override
@@ -10,6 +10,15 @@
******************************************************************************/
package forestry.core.gui.widgets;
import javax.annotation.Nullable;
import forestry.api.core.IToolPipette;
import forestry.core.fluids.tanks.StandardTank;
import forestry.core.gui.IContainerLiquidTanks;
import forestry.core.gui.tooltips.ToolTip;
import forestry.core.proxy.Proxies;
import forestry.farming.gui.ContainerFarm;
import forestry.greenhouse.gui.ContainerGreenhouse;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
@@ -22,19 +31,10 @@ import net.minecraft.inventory.Container;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
import forestry.api.core.IToolPipette;
import forestry.core.fluids.tanks.StandardTank;
import forestry.core.gui.IContainerLiquidTanks;
import forestry.core.gui.tooltips.ToolTip;
import forestry.core.proxy.Proxies;
import forestry.farming.gui.ContainerFarm;
import forestry.greenhouse.gui.ContainerGreenhouse;
/**
* Slot for liquid tanks
*/
@@ -57,6 +57,7 @@ public class TankWidget extends Widget {
return this;
}
@Nullable
public IFluidTank getTank() {
Container container = manager.gui.inventorySlots;
if (container instanceof IContainerLiquidTanks) {
@@ -54,7 +54,7 @@ import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
import mezz.jei.api.gui.IAdvancedGuiHandler;
import mezz.jei.api.gui.BlankAdvancedGuiHandler;
import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
import mezz.jei.api.recipe.transfer.IRecipeTransferRegistry;
import net.minecraft.item.ItemStack;
@@ -141,7 +141,7 @@ public class FactoryJeiPlugin extends BlankModPlugin {
);
}
private static class ForestryAdvancedGuiHandler implements IAdvancedGuiHandler<GuiForestry> {
private static class ForestryAdvancedGuiHandler extends BlankAdvancedGuiHandler<GuiForestry> {
@Nonnull
@Override
public Class<GuiForestry> getGuiContainerClass() {
@@ -154,5 +154,11 @@ public class FactoryJeiPlugin extends BlankModPlugin {
GuiForestry<?, ?> guiForestry = guiContainer;
return guiForestry.getExtraGuiAreas();
}
@Nullable
@Override
public Object getIngredientUnderMouse(GuiForestry guiContainer, int mouseX, int mouseY) {
return guiContainer.getFluidStackAtPosition(mouseX, mouseY);
}
}
}
@@ -0,0 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package forestry.factory.recipes.jei;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;