remove custom screen

update fusion reactor
GregTechCEu · Jan 29, 2025 · 7a332ba · 7a332ba
1 parent 5b8bac4
commit 7a332ba
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 34 deletions.
diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java b/src/main/java/gregtech/api/metatileentity/multiblock/ui/MultiblockUIFactory.java
@@ -281,44 +281,34 @@ protected Flow createBars(@NotNull ModularPanel mainPanel,
         return column;
     }
 
-    public MultiblockUIFactory customScreen(Supplier<IWidget> customScreen) {
-        this.customScreen = customScreen;
-        return this;
-    }
-
     public MultiblockUIFactory addScreenChildren(Consumer<List<IWidget>> consumer) {
         this.childrenConsumer = consumer;
         return this;
     }
 
     protected Widget<?> createScreen(PanelSyncManager syncManager) {
-        ParentWidget<?> root = new ParentWidget<>();
-        if (customScreen != null && customScreen.get() != null) {
-            root.child(customScreen.get());
-        } else {
-            Builder display = builder();
-            display.setAction(this.displayText);
-            display.sync("display", syncManager);
-
-            var scrollWidget = new ScrollWidget<>(new VerticalScrollData())
-                    .sizeRel(1f)
-                    .child(new RichTextWidget()
-                            .sizeRel(1f)
-                            .alignment(Alignment.TopLeft)
-                            .margin(4, 4)
-                            .autoUpdate(true)
-                            .textBuilder(display::build));
-
-            if (this.childrenConsumer != null) {
-                List<IWidget> extra = new ArrayList<>();
-                this.childrenConsumer.accept(extra);
-                extra.forEach(scrollWidget::child);
-            }
-
-            root.child(scrollWidget);
-        }
-
-        return root.child(createIndicator(syncManager))
+        Builder display = builder();
+        display.setAction(this.displayText);
+        display.sync("display", syncManager);
+
+        var scrollWidget = new ScrollWidget<>(new VerticalScrollData())
+                .sizeRel(1f)
+                .child(new RichTextWidget()
+                        .sizeRel(1f)
+                        .alignment(Alignment.TopLeft)
+                        .margin(4, 4)
+                        .autoUpdate(true)
+                        .textBuilder(display::build));
+
+        if (this.childrenConsumer != null) {
+            List<IWidget> extra = new ArrayList<>();
+            this.childrenConsumer.accept(extra);
+            extra.forEach(scrollWidget::child);
+        }
+
+        return new ParentWidget<>()
+                .child(scrollWidget)
+                .child(createIndicator(syncManager))
                 .background(GTGuiTextures.DISPLAY)
                 .size(190, screenHeight)
                 .pos(4, 4);

diff --git a/...ain/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java b/...ain/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityFusionReactor.java
@@ -454,14 +454,15 @@ protected MultiblockUIFactory createUIFactory() {
                 .setSize(198, 236)
                 .setScreenHeight(138)
                 .configureDisplayText(false, builder -> {})
-                .customScreen(() -> new Column()
+                .addScreenChildren(widgets -> widgets.add(new Column()
                         .padding(4)
                         .expanded()
                         .child(title.asWidget()
                                 .marginBottom(8)
                                 .size(69, 12))
                         .child(new ProgressWidget()
                                 .size(77, 77)
+                                // todo status tooltip
                                 .background(GTGuiTextures.FUSION_DIAGRAM.asIcon()
                                         .size(89, 101)
                                         .marginTop(11))
@@ -471,7 +472,7 @@ protected MultiblockUIFactory createUIFactory() {
                         .child(GTGuiTextures.FUSION_LEGEND.asWidget()
                                 .left(4)
                                 .bottom(4)
-                                .size(108, 41)));
+                                .size(108, 41))));
     }
 
     private void addEnergyBarHoverText(List<ITextComponent> hoverList) {