add UIBuildContext to getGUI method

GTNewHorizons · Dec 27, 2023 · a32ee83 · a32ee83
1 parent 8090cad
commit a32ee83
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/gregtech/api/gui/GUIHost.java b/src/main/java/gregtech/api/gui/GUIHost.java
@@ -4,6 +4,7 @@
 
 import javax.annotation.Nonnull;
 
+import com.gtnewhorizons.modularui.api.math.Size;
 import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
@@ -13,10 +14,14 @@ public interface GUIHost extends ITileWithModularUI {
     @Nonnull
     @Override
     default ModularWindow createWindow(UIBuildContext uiContext) {
-        GUIProvider<?> gui = getGUI();
-        return gui.openGUI(Objects.requireNonNull(uiContext));
+        Objects.requireNonNull(uiContext);
+        GUIProvider<?> gui = getGUI(uiContext);
+        return gui.openGUI(uiContext);
     }
 
+    /**
+     * Width of the GUI when its being displayed
+     */
     default int getWidth() {
         return 170;
     }
@@ -26,6 +31,6 @@ default int getHeight() {
     }
 
     @Nonnull
-    GUIProvider<?> getGUI();
+    GUIProvider<?> getGUI(@Nonnull UIBuildContext uiContext);
 
 }
diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
@@ -26,6 +26,7 @@
 
 import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable;
 import com.gtnewhorizons.modularui.api.forge.ItemStackHandler;
+import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -785,7 +786,7 @@ protected GUIProvider<?> createGUIProvider() {
     }
 
     @Nonnull
-    public GUIProvider<?> getGUI() {
+    public GUIProvider<?> getGUI(@Nonnull UIBuildContext uiContext) {
         return guiProvider;
     }
 }
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
@@ -668,13 +668,11 @@ public String getInventoryName() {
         if (modeSelected(ITEM_IN, ITEM_OUT)) {
             InventoryType type = modeSelected(ITEM_IN) ? InventoryType.Input : InventoryType.Output;
             ItemInventoryLogic itemLogic = controller.getItemLogic(type, lockedInventory);
-            if (itemLogic == null) return "";
             return itemLogic.getDisplayName();
         }
         if (modeSelected(FLUID_IN, FLUID_OUT)) {
             InventoryType type = modeSelected(FLUID_IN) ? InventoryType.Input : InventoryType.Output;
             FluidInventoryLogic fluidLogic = controller.getFluidLogic(type, lockedInventory);
-            if (fluidLogic == null) return "";
             return fluidLogic.getDisplayName();
         }
         return "";
@@ -694,12 +692,13 @@ protected GUIProvider<?> createGUIProvider() {
 
     @Override
     @Nonnull
-    public GUIProvider<?> getGUI() {
+    public GUIProvider<?> getGUI(@Nonnull UIBuildContext uiContext) {
         IMultiBlockController controller = getTarget(false);
         if (controller == null) return guiProvider;
         if (!modeSelected(NOTHING, ENERGY_IN, ENERGY_OUT)) return guiProvider;
         if (!canOpenControllerGui()) return guiProvider;
-        GUIProvider<?> controllerGUI = controller.getGUI();
+        if (uiContext.getPlayer().isSneaking()) return guiProvider;
+        GUIProvider<?> controllerGUI = controller.getGUI(uiContext);
         return controllerGUI;
     }