fix: make the mouseIn method more consistent

Show the tooltip/highlighting when the mouse is over the border of the capacitors/tanks to match slots
Remove unused copy of the mouseIn method from TankImpl

Author: Roelymole

src/main/java/dev/galacticraft/machinelib/client/api/screen/MachineScreen.java

@@ -229,7 +229,7 @@ private static Item getOptionalItem(ResourceLocation id, Item fallback) {
     }
 
     protected static boolean mouseIn(double mouseX, double mouseY, int x, int y, int width, int height) {
-        return mouseX >= x && mouseY >= y && mouseX <= x + width && mouseY <= y + height;
+        return mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height;
     }
 
     @Override
@@ -820,7 +820,7 @@ protected void drawCapacitor(GuiGraphics graphics, int mouseX, int mouseY) {
             long amount = this.menu.energyStorage.getAmount();
             GraphicsUtil.drawCapacitor(graphics, x, y, capacity, amount, false);
 
-            if (mouseIn(mouseX, mouseY, x, y, 16, this.capacitorHeight)) {
+            if (mouseIn(mouseX, mouseY, x - 1, y - 1, OVERLAY_WIDTH + 2, this.capacitorHeight + 2)) {
                 List<Component> lines = new ArrayList<>();
                 this.appendEnergyTooltip(lines);
                 this.setTooltipForNextRenderPass(Lists.transform(lines, Component::getVisualOrderText));
@@ -865,7 +865,7 @@ protected void drawTanks(GuiGraphics graphics, int mouseX, int mouseY) {
                     }
                 }
 
-                if (this.hoveredTank == null && mouseIn(mouseX, mouseY, this.leftPos + tank.getX(), this.topPos + tank.getY(), tank.getWidth(), tank.getHeight())) {
+                if (this.hoveredTank == null && mouseIn(mouseX, mouseY, this.leftPos + tank.getX() - 1, this.topPos + tank.getY() - 1, tank.getWidth() + 2, tank.getHeight() + 2)) {
                     this.hoveredTank = tank;
                     RenderSystem.disableDepthTest();
                     graphics.fill(tank.getX(), tank.getY(), tank.getX() + tank.getWidth(), tank.getY() + tank.getHeight(), 0x80ffffff);
@@ -876,7 +876,7 @@ protected void drawTanks(GuiGraphics graphics, int mouseX, int mouseY) {
         graphics.pose().popPose();
 
         for (Tank tank : this.menu.tanks) {
-            if (mouseIn(mouseX, mouseY, this.leftPos + tank.getX(), this.topPos + tank.getY(), tank.getWidth(), tank.getHeight())) {
+            if (mouseIn(mouseX, mouseY, this.leftPos + tank.getX() - 1, this.topPos + tank.getY() - 1, tank.getWidth() + 2, tank.getHeight() + 2)) {
                 this.setTooltipForNextRenderPass(Lists.transform(tank.getTooltip(), Component::getVisualOrderText));
                 break;
             }

src/main/java/dev/galacticraft/machinelib/impl/Constant.java

@@ -111,8 +111,8 @@ interface TextureCoordinate {
         /**
          * The height of a configuration tab.
          */
-
         int TAB_HEIGHT = 22;
+
         int BUTTON_U = 0;
         int BUTTON_V = 196;
         int BUTTON_HOVERED_V = 216;

src/main/java/dev/galacticraft/machinelib/impl/menu/TankImpl.java

@@ -67,10 +67,6 @@ public TankImpl(ResourceSlot<Fluid> slot, TransferType transferType, int index,
         this.marked = marked;
     }
 
-    private static boolean mouseIn(double mouseX, double mouseY, int x, int y, int width, int height) {
-        return mouseX >= x && mouseY >= y && mouseX <= x + width && mouseY <= y + height;
-    }
-
     @Override
     public @Nullable Fluid getFluid() {
         return this.slot.getResource();