feat: Update core hooks and integrations

This commit is contained in:
Andrei Laiff committed 2023-10-21 22:41:00 +03:00
1 parent bd0e7fabca
commit 3ab27d4231
6 files changed
+33 -15

No files matched your search

@@ -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<String> handleItemTooltip(final ItemStack stack, final int mouseX, final int mouseY,
final List<String> currentToolTip) {
return currentToolTip;
}
default ItemStack getHoveredStack() {
return null;
}
}
@@ -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 -> {
@@ -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;
}
@@ -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);
}
}
@@ -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
}
@@ -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;
}
}