Merge remote-tracking branch 'origin/master' into fabric/master

# Conflicts: # src/main/java/appeng/client/gui/AEBaseScreen.java # src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java # src/main/java/appeng/client/gui/widgets/ITooltip.java # src/main/java/appeng/client/gui/widgets/IconButton.java # src/main/java/appeng/client/gui/widgets/ProgressBar.java # src/main/java/appeng/client/gui/widgets/SettingToggleButton.java # src/main/java/appeng/client/gui/widgets/ToggleButton.java # src/main/java/appeng/container/slot/PlayerInvSlot.java # src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java # src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java # src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java # src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java # src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java # src/main/java/appeng/parts/automation/AnnihilationPlanePart.java # src/main/java/appeng/parts/automation/FormationPlanePart.java # src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java # src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java
2020-08-05 23:40:58 +02:00
parent a807b4e3ad 822249dda8
commit 3c737d8d1e
21 changed files with 591 additions and 580 deletions
@@ -93,27 +93,32 @@ public class TabButton extends ButtonWidget implements ITooltip {
    }

    @Override
-    public int xPos() {
+    public ITextComponent getTooltipMessage() {
+        return getMessage();
+    }
+
+    @Override
+    public int getTooltipAreaX() {
        return this.x;
    }

    @Override
-    public int yPos() {
+    public int getTooltipAreaY() {
        return this.y;
    }

    @Override
-    public int getWidth() {
+    public int getTooltipAreaWidth() {
        return 22;
    }

    @Override
-    public int getHeight() {
+    public int getTooltipAreaHeight() {
        return 22;
    }

    @Override
-    public boolean isVisible() {
+    public boolean isTooltipAreaVisible() {
        return this.visible;
    }