From 42741d84bd674dbf9d0fb9902f213b8d692a8bec Mon Sep 17 00:00:00 2001 From: Andrei Laiff Date: Fri, 13 Oct 2023 15:44:18 +0300 Subject: [PATCH] use `IGuiTooltipHandler` directly from ae2 include #160 --- dependencies.gradle | 2 +- .../client/gui/GuiFluidCraftConfirm.java | 2 +- .../github/client/gui/GuiLevelTerminal.java | 1 + .../github/client/gui/IGuiTooltipHandler.java | 20 ------------------- .../github/coremod/hooker/CoreModHooks.java | 2 +- .../github/loader/ChannelLoader.java | 2 +- .../glodblock/github/proxy/CommonProxy.java | 7 +++---- 7 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 src/main/java/com/glodblock/github/client/gui/IGuiTooltipHandler.java diff --git a/dependencies.gradle b/dependencies.gradle index 1b580f3f..f2e495b0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.4.3-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-262-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-263-GTNH-pre:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.6.0:dev') api("com.github.GTNewHorizons:WirelessCraftingTerminal:1.10.0:dev") diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java index 506bde77..4ddbaea4 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java @@ -15,7 +15,7 @@ import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; 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; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java index c72feacd..a5b3e65c 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java @@ -63,6 +63,7 @@ import appeng.api.config.YesNo; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.WorldCoord; +import appeng.client.gui.IGuiTooltipHandler; import appeng.client.gui.widgets.GuiImgButton; import appeng.client.gui.widgets.GuiScrollbar; import appeng.client.gui.widgets.GuiTabButton; diff --git a/src/main/java/com/glodblock/github/client/gui/IGuiTooltipHandler.java b/src/main/java/com/glodblock/github/client/gui/IGuiTooltipHandler.java deleted file mode 100644 index 29f4f2dc..00000000 --- a/src/main/java/com/glodblock/github/client/gui/IGuiTooltipHandler.java +++ /dev/null @@ -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 handleItemTooltip(final ItemStack stack, final int mouseX, final int mouseY, - final List currentToolTip) { - return currentToolTip; - } - - default ItemStack getHoveredStack() { - return null; - } -} diff --git a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java index 6b918cb9..3a3f63f5 100644 --- a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java +++ b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java @@ -13,7 +13,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; @@ -34,6 +33,7 @@ import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.IMEInventory; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; +import appeng.client.gui.IGuiTooltipHandler; import appeng.crafting.MECraftingInventory; import appeng.me.MachineSet; import appeng.me.cluster.implementations.CraftingCPUCluster; diff --git a/src/main/java/com/glodblock/github/loader/ChannelLoader.java b/src/main/java/com/glodblock/github/loader/ChannelLoader.java index ca6f9c8b..0312a07a 100644 --- a/src/main/java/com/glodblock/github/loader/ChannelLoader.java +++ b/src/main/java/com/glodblock/github/loader/ChannelLoader.java @@ -1,6 +1,5 @@ package com.glodblock.github.loader; -import com.glodblock.github.network.wrapper.FCNetworkWrapper; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.Packet; import net.minecraft.world.World; @@ -25,6 +24,7 @@ import com.glodblock.github.network.SPacketMEFluidInvUpdate; import com.glodblock.github.network.SPacketMEItemInvUpdate; import com.glodblock.github.network.SPacketSetItemAmount; import com.glodblock.github.network.SPacketStringUpdate; +import com.glodblock.github.network.wrapper.FCNetworkWrapper; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/glodblock/github/proxy/CommonProxy.java b/src/main/java/com/glodblock/github/proxy/CommonProxy.java index 756be904..1c3d1ead 100644 --- a/src/main/java/com/glodblock/github/proxy/CommonProxy.java +++ b/src/main/java/com/glodblock/github/proxy/CommonProxy.java @@ -19,7 +19,6 @@ import com.glodblock.github.util.ModAndClassUtil; import appeng.api.AEApi; import appeng.api.IAppEngApi; import appeng.api.config.Upgrades; -import appeng.helpers.InterfaceTerminalSupportedClassProvider; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -66,9 +65,9 @@ public class CommonProxy { Upgrades.CRAFTING.registerItem(new ItemStack(ItemAndBlockHolder.FLUID_EXPORT_BUS), 1); } AEApi.instance().registries().externalStorage().addExternalStorageInterface(new AEFluidInterfaceHandler()); - InterfaceTerminalSupportedClassProvider.register(PartFluidP2PInterface.class); - InterfaceTerminalSupportedClassProvider.register(PartFluidInterface.class); - InterfaceTerminalSupportedClassProvider.register(TileFluidInterface.class); + AEApi.instance().registries().ifaceTerm().register(PartFluidP2PInterface.class); + AEApi.instance().registries().ifaceTerm().register(PartFluidInterface.class); + AEApi.instance().registries().ifaceTerm().register(TileFluidInterface.class); } public void registerRenderers() {}