From c45435a6b09a32a4fb19c40d3096e310f1834fd1 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 23 Aug 2021 19:44:34 +0700 Subject: [PATCH] Fix android station missing widgets --- .../mc/otm/screen/AndroidStationScreen.java | 3 +++ .../ru/dbotthepony/mc/otm/screen/MatteryScreen.java | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/AndroidStationScreen.java b/src/main/java/ru/dbotthepony/mc/otm/screen/AndroidStationScreen.java index 0e733775b..a2280990b 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/AndroidStationScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/screen/AndroidStationScreen.java @@ -112,6 +112,9 @@ public class AndroidStationScreen extends MatteryScreen impl @Override protected FramePanel makeMainFrame() { var frame = new FramePanel(this, null, 0, 0, FRAME_WIDTH, FRAME_HEIGHT, getTitle()); + + autoAttachToFrame(frame); + var grid = new GridPanel(this, frame, 0, 0, GRID_WIDTH * 18, 0, GRID_WIDTH, GRID_HEIGHT); minecraft.player.getCapability(MatteryCapability.ANDROID).ifPresent(_cap -> { diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/MatteryScreen.java b/src/main/java/ru/dbotthepony/mc/otm/screen/MatteryScreen.java index 5120dba0c..97c1d0038 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/MatteryScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/screen/MatteryScreen.java @@ -157,11 +157,17 @@ public abstract class MatteryScreen extends AbstractConta protected FramePanel makeMainFrame() { var frame = new FramePanel(this, null, 0, 0, 18 * 9 + 16, 100, getTitle()); + autoAttachToFrame(frame); + + return frame; + } + + protected void autoAttachToFrame(FramePanel frame) { if (this instanceof IMatteryScreenLeftPanel) { var reserve = new EditablePanel(this, frame, 0, 0, 0, 0); reserve.setDock(Dock.LEFT); - float available_height = 90; + float available_height = frame.getHeight() - 14; if (this instanceof IMatteryScreenGaugeGetter gauges) { float width = 0; @@ -213,8 +219,6 @@ public abstract class MatteryScreen extends AbstractConta grid_based.createGridPanels(grid); } - - return frame; } public ItemRenderer getItemRenderer() {