Merge remote-tracking branch 'Laiff/dev-for-fix' into dev

This commit is contained in:
Martin Robertz committed 2023-10-13 13:29:21 +02:00
commit 2c09dbd08e
4 files changed
+3 -23

No files matched your search

@@ -16,7 +16,7 @@ import com.glodblock.github.network.CPacketSwitchGuis;
import appeng.api.storage.ITerminalHost;
import appeng.client.gui.implementations.GuiCraftConfirm;
public class GuiFluidCraftConfirm extends GuiCraftConfirm implements IGuiTooltipHandler {
public class GuiFluidCraftConfirm extends GuiCraftConfirm {
private GuiType originalGui;
@@ -85,7 +85,7 @@ import appeng.util.Platform;
import appeng.util.item.AEItemStack;
import cpw.mods.fml.common.Loader;
public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextField, IGuiTooltipHandler {
public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextField {
public static final int HEADER_HEIGHT = 52;
public static final int INV_HEIGHT = 98;
@@ -1,20 +0,0 @@
package com.glodblock.github.client.gui;
import java.util.List;
import net.minecraft.item.ItemStack;
/**
* Interface for handling tooltips from NEIGuiContainerManager.
*/
public interface IGuiTooltipHandler {
default List<String> handleItemTooltip(final ItemStack stack, final int mouseX, final int mouseY,
final List<String> currentToolTip) {
return currentToolTip;
}
default ItemStack getHoveredStack() {
return null;
}
}
@@ -5,6 +5,7 @@ import java.util.Set;
import javax.annotation.Nullable;
import appeng.client.gui.IGuiTooltipHandler;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
@@ -13,7 +14,6 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import com.glodblock.github.client.gui.GuiFluidCraftConfirm;
import com.glodblock.github.client.gui.IGuiTooltipHandler;
import com.glodblock.github.common.item.ItemFluidDrop;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.common.parts.PartFluidInterface;