From 3ab27d42316171fa8b40f24463536f0b4b1320fd Mon Sep 17 00:00:00 2001 From: Andrei Laiff Date: Thu, 12 Oct 2023 12:40:10 +0300 Subject: [PATCH] feat: Update core hooks and integrations --- .../github/client/gui/IGuiTooltipHandler.java | 20 +++++++++++++++++++ .../github/coremod/FCClassTransformer.java | 4 ++-- .../github/coremod/hooker/CoreModHooks.java | 9 +++++---- .../coremod/hooker/CoreModHooksClient.java | 7 ++----- ...EITransfermer.java => NEITransformer.java} | 6 +++--- .../opencomputers/DriverLevelMaintainer.java | 2 +- 6 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/glodblock/github/client/gui/IGuiTooltipHandler.java rename src/main/java/com/glodblock/github/coremod/transform/{NEITransfermer.java => NEITransformer.java} (94%) diff --git a/src/main/java/com/glodblock/github/client/gui/IGuiTooltipHandler.java b/src/main/java/com/glodblock/github/client/gui/IGuiTooltipHandler.java new file mode 100644 index 00000000..29f4f2dc --- /dev/null +++ b/src/main/java/com/glodblock/github/client/gui/IGuiTooltipHandler.java @@ -0,0 +1,20 @@ +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/FCClassTransformer.java b/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java index 6d38d376..4f13a13a 100644 --- a/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java +++ b/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java @@ -11,7 +11,7 @@ import com.glodblock.github.coremod.transform.CraftingTreeNodeTransformer; import com.glodblock.github.coremod.transform.DualityInterfaceTransformer; import com.glodblock.github.coremod.transform.ExternalStorageRegistryTransformer; import com.glodblock.github.coremod.transform.GuiCraftingTransformer; -import com.glodblock.github.coremod.transform.NEITransfermer; +import com.glodblock.github.coremod.transform.NEITransformer; import com.glodblock.github.coremod.transform.PacketCompressedNBTTransformer; public class FCClassTransformer implements IClassTransformer { @@ -24,7 +24,7 @@ public class FCClassTransformer implements IClassTransformer { case "appeng.me.cluster.implementations.CraftingCPUCluster" -> tform = CraftingCpuTransformer.INSTANCE; case "appeng.helpers.DualityInterface" -> tform = DualityInterfaceTransformer.INSTANCE; case "appeng.client.gui.implementations.GuiCraftingCPU", "appeng.client.gui.implementations.GuiCraftConfirm", "net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftConfirm", "appeng.client.gui.widgets.GuiCraftingTree" -> tform = GuiCraftingTransformer.INSTANCE; - case "appeng.integration.modules.NEI" -> tform = NEITransfermer.INSTANCE; + case "appeng.integration.modules.NEI" -> tform = NEITransformer.INSTANCE; case "appeng.core.features.registries.ExternalStorageRegistry" -> tform = ExternalStorageRegistryTransformer.INSTANCE; case "appeng.core.sync.packets.PacketCompressedNBT" -> tform = PacketCompressedNBTTransformer.INSTANCE; default -> { 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 69ca8afe..6b918cb9 100644 --- a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java +++ b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java @@ -13,6 +13,7 @@ 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; @@ -176,15 +177,15 @@ public class CoreModHooks { } public static ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey) { - if (gui instanceof GuiFluidCraftConfirm) { - return ((GuiFluidCraftConfirm) gui).getHoveredStack(); + if (gui instanceof IGuiTooltipHandler guiTooltipHandler) { + return guiTooltipHandler.getHoveredStack(); } return null; } public static boolean shouldShowTooltip(GuiContainer gui) { - if (gui instanceof GuiFluidCraftConfirm) { - return ((GuiFluidCraftConfirm) gui).getHoveredStack() == null; + if (gui instanceof GuiFluidCraftConfirm guiCraftConfirm) { + return guiCraftConfirm.getHoveredStack() == null; } return true; } diff --git a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooksClient.java b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooksClient.java index 4cd9db06..0b86e5d1 100644 --- a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooksClient.java +++ b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooksClient.java @@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; -import com.glodblock.github.client.gui.GuiInterfaceTerminalWireless; +import com.glodblock.github.client.gui.GuiInterfaceWireless; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -14,9 +14,6 @@ public class CoreModHooksClient { public static void clientPacketData(NBTTagCompound data) { GuiScreen gs = Minecraft.getMinecraft().currentScreen; - if (gs instanceof GuiInterfaceTerminalWireless) { - ((GuiInterfaceTerminalWireless) gs).postUpdate(data); - } + if (gs instanceof GuiInterfaceWireless terminal) terminal.postUpdate(data); } - } diff --git a/src/main/java/com/glodblock/github/coremod/transform/NEITransfermer.java b/src/main/java/com/glodblock/github/coremod/transform/NEITransformer.java similarity index 94% rename from src/main/java/com/glodblock/github/coremod/transform/NEITransfermer.java rename to src/main/java/com/glodblock/github/coremod/transform/NEITransformer.java index f7441a80..4a596367 100644 --- a/src/main/java/com/glodblock/github/coremod/transform/NEITransfermer.java +++ b/src/main/java/com/glodblock/github/coremod/transform/NEITransformer.java @@ -6,11 +6,11 @@ import org.objectweb.asm.Opcodes; import com.glodblock.github.coremod.FCClassTransformer; -public class NEITransfermer extends FCClassTransformer.ClassMapper { +public class NEITransformer extends FCClassTransformer.ClassMapper { - public static final NEITransfermer INSTANCE = new NEITransfermer(); + public static final NEITransformer INSTANCE = new NEITransformer(); - private NEITransfermer() { + private NEITransformer() { // NO-OP } diff --git a/src/main/java/com/glodblock/github/crossmod/opencomputers/DriverLevelMaintainer.java b/src/main/java/com/glodblock/github/crossmod/opencomputers/DriverLevelMaintainer.java index e4008522..63fb6d40 100644 --- a/src/main/java/com/glodblock/github/crossmod/opencomputers/DriverLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/crossmod/opencomputers/DriverLevelMaintainer.java @@ -83,7 +83,7 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity { throw new IllegalArgumentException("Invalid slot"); } boolean enable = args.checkBoolean(1); - tileEntity.requests.setEnable(slot, enable); + tileEntity.requests.updateStatus(slot, enable); return true; } }