From 5c8254c07f2b57fa9234aeebe0399fc9ce94bed7 Mon Sep 17 00:00:00 2001 From: direwolf20 <39863894+Direwolf20-MC@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:15:04 -0500 Subject: [PATCH] Resolves #226 --- .../direwolf20/laserio/client/screens/CardEnergyScreen.java | 5 +++-- .../direwolf20/laserio/client/screens/CardItemScreen.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/direwolf20/laserio/client/screens/CardEnergyScreen.java b/src/main/java/com/direwolf20/laserio/client/screens/CardEnergyScreen.java index 4b18e49a..af9e30bc 100644 --- a/src/main/java/com/direwolf20/laserio/client/screens/CardEnergyScreen.java +++ b/src/main/java/com/direwolf20/laserio/client/screens/CardEnergyScreen.java @@ -91,7 +91,8 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia } Button channelButton = buttons.get("channel"); if (MiscTools.inBounds(channelButton.getX(), channelButton.getY(), channelButton.getWidth(), channelButton.getHeight(), mouseX, mouseY)) { - guiGraphics.renderTooltip(font, Component.translatable("screen.laserio.channel").append(String.valueOf(currentChannel)), mouseX, mouseY); + if (currentMode != 3) + guiGraphics.renderTooltip(font, Component.translatable("screen.laserio.channel").append(String.valueOf(currentChannel)), mouseX, mouseY); } Button redstoneChannelButton = buttons.get("redstoneChannel"); if (MiscTools.inBounds(redstoneChannelButton.getX(), redstoneChannelButton.getY(), redstoneChannelButton.getWidth(), redstoneChannelButton.getHeight(), mouseX, mouseY)) { @@ -504,7 +505,7 @@ public void openNode() { @Override public boolean mouseClicked(double x, double y, int btn) { ChannelButton channelButton = ((ChannelButton) buttons.get("channel")); - if (MiscTools.inBounds(channelButton.getX(), channelButton.getY(), channelButton.getWidth(), channelButton.getHeight(), x, y)) { + if ((currentMode != 3) && MiscTools.inBounds(channelButton.getX(), channelButton.getY(), channelButton.getWidth(), channelButton.getHeight(), x, y)) { if (btn == 0) currentChannel = BaseCard.nextChannel(card); else if (btn == 1) diff --git a/src/main/java/com/direwolf20/laserio/client/screens/CardItemScreen.java b/src/main/java/com/direwolf20/laserio/client/screens/CardItemScreen.java index 3616fbc7..7e3851df 100644 --- a/src/main/java/com/direwolf20/laserio/client/screens/CardItemScreen.java +++ b/src/main/java/com/direwolf20/laserio/client/screens/CardItemScreen.java @@ -107,7 +107,8 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia } Button channelButton = buttons.get("channel"); if (MiscTools.inBounds(channelButton.getX(), channelButton.getY(), channelButton.getWidth(), channelButton.getHeight(), mouseX, mouseY)) { - guiGraphics.renderTooltip(font, Component.translatable("screen.laserio.channel").append(String.valueOf(currentChannel)), mouseX, mouseY); + if (currentMode != 3) + guiGraphics.renderTooltip(font, Component.translatable("screen.laserio.channel").append(String.valueOf(currentChannel)), mouseX, mouseY); } Button redstoneChannelButton = buttons.get("redstoneChannel"); if (MiscTools.inBounds(redstoneChannelButton.getX(), redstoneChannelButton.getY(), redstoneChannelButton.getWidth(), redstoneChannelButton.getHeight(), mouseX, mouseY)) { @@ -721,7 +722,7 @@ public void openNode() { @Override public boolean mouseClicked(double x, double y, int btn) { ChannelButton channelButton = ((ChannelButton) buttons.get("channel")); - if (MiscTools.inBounds(channelButton.getX(), channelButton.getY(), channelButton.getWidth(), channelButton.getHeight(), x, y)) { + if ((currentMode != 3) && MiscTools.inBounds(channelButton.getX(), channelButton.getY(), channelButton.getWidth(), channelButton.getHeight(), x, y)) { if (btn == 0) currentChannel = BaseCard.nextChannel(card); else if (btn == 1)