Fix many small GUI issues (#1574)

serenibyss · web-flow · commit 5220ff1a2647 · 2021-07-12T22:10:23.000-05:00
diff --git a/src/main/java/gregtech/api/gui/ModularUI.java b/src/main/java/gregtech/api/gui/ModularUI.java
@@ -180,12 +180,12 @@ public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer) {
         }
 
         public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, int startY) {
-            bindPlayerInventory(inventoryPlayer, GuiTextures.SLOT, 8, startY);
+            bindPlayerInventory(inventoryPlayer, GuiTextures.SLOT, 7, startY);
             return this;
         }
 
         public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, TextureArea imageLocation) {
-            return bindPlayerInventory(inventoryPlayer, imageLocation, 8, 84);
+            return bindPlayerInventory(inventoryPlayer, imageLocation, 7, 84);
         }
 
         public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, TextureArea imageLocation, int x, int y) {
diff --git a/src/main/java/gregtech/api/gui/widgets/CycleButtonWidget.java b/src/main/java/gregtech/api/gui/widgets/CycleButtonWidget.java
@@ -88,7 +88,7 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) {
         String text = I18n.format(optionNames[currentOption]);
         fontRenderer.drawString(text,
             pos.x + size.width / 2 - fontRenderer.getStringWidth(text) / 2,
-            pos.y + size.height / 2 - fontRenderer.FONT_HEIGHT / 2, textColor);
+            pos.y + size.height / 2 - fontRenderer.FONT_HEIGHT / 2 + 1, textColor);
         GlStateManager.color(1.0f, 1.0f, 1.0f);
     }
 
diff --git a/src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java
@@ -320,15 +320,15 @@ protected RecipeLogicEnergy createWorkable(RecipeMap<?> recipeMap) {
 
     protected ModularUI.Builder createGuiTemplate(EntityPlayer player) {
         ModularUI.Builder builder = workable.recipeMap.createUITemplate(workable::getProgressPercent, importItems, exportItems, importFluids, exportFluids)
-            .widget(new LabelWidget(5, 5, getMetaFullName()))
+            .widget(new LabelWidget(7, 5, getMetaFullName()))
             .widget(new DischargerSlotWidget(chargerInventory, 0, 79, 62)
                 .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.CHARGER_OVERLAY))
             .widget(new ImageWidget(79, 42, 18, 18, GuiTextures.INDICATOR_NO_ENERGY)
                 .setPredicate(workable::isHasNotEnoughEnergy))
             .bindPlayerInventory(player.inventory);
 
         int leftButtonStartX = 7;
-        int rightButtonStartX = 176 - 7 - 24;
+        int rightButtonStartX = 176 - 7 - 45;
         if (workable.recipeMap instanceof RecipeMapWithConfigButton) {
             leftButtonStartX += ((RecipeMapWithConfigButton) workable.recipeMap).getLeftButtonOffset();
             rightButtonStartX -= ((RecipeMapWithConfigButton) workable.recipeMap).getRightButtonOffset();
@@ -344,11 +344,13 @@ protected ModularUI.Builder createGuiTemplate(EntityPlayer player) {
             builder.widget(new ToggleButtonWidget(leftButtonStartX, 62, 18, 18,
                 GuiTextures.BUTTON_FLUID_OUTPUT, this::isAutoOutputFluids, this::setAutoOutputFluids)
                 .setTooltipText("gregtech.gui.fluid_auto_output.tooltip"));
+            leftButtonStartX += 18;
         }
 
-        builder.widget(new CycleButtonWidget(rightButtonStartX, 60, 24, 20,
+        builder.widget(new CycleButtonWidget(leftButtonStartX, 62, 18, 18,
                 workable.getAvailableOverclockingTiers(), workable::getOverclockTier, workable::setOverclockTier)
-                .setTooltipHoverString("gregtech.gui.overclock.description"));
+                .setTooltipHoverString("gregtech.gui.overclock.description")
+                .setButtonTexture(GuiTextures.BUTTON_OVERCLOCK));
 
         return builder;
     }
diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockWithDisplayBase.java
@@ -47,8 +47,8 @@ protected void handleDisplayClick(String componentData, ClickData clickData) {
     protected ModularUI.Builder createUITemplate(EntityPlayer entityPlayer) {
         ModularUI.Builder builder = ModularUI.extendedBuilder();
         builder.image(7, 4, 162, 121, GuiTextures.DISPLAY);
-        builder.label(10, 7, getMetaFullName(), 0xFFFFFF);
-        builder.widget(new AdvancedTextWidget(10, 17, this::addDisplayText, 0xFFFFFF)
+        builder.label(11, 9, getMetaFullName(), 0xFFFFFF);
+        builder.widget(new AdvancedTextWidget(11, 19, this::addDisplayText, 0xFFFFFF)
             .setMaxWidthLimit(156)
             .setClickHandler(this::handleDisplayClick));
         builder.bindPlayerInventory(entityPlayer.inventory, 134);
diff --git a/src/main/java/gregtech/api/recipes/machines/RecipeMapGroupOutput.java b/src/main/java/gregtech/api/recipes/machines/RecipeMapGroupOutput.java
@@ -33,7 +33,7 @@ public Builder createUITemplate(DoubleSupplier progressSupplier, IItemHandlerMod
         ServerWidgetGroup itemOutputGroup = createItemOutputWidgetGroup(exportItems, new ServerWidgetGroup(() -> !booleanWrapper.getCurrentMode()));
         ServerWidgetGroup fluidOutputGroup = createFluidOutputWidgetGroup(exportFluids, new ServerWidgetGroup(booleanWrapper::getCurrentMode));
         builder.widget(itemOutputGroup).widget(fluidOutputGroup);
-        ToggleButtonWidget buttonWidget = new ToggleButtonWidget(176 - 7 - 20, 60, 20, 20,
+        ToggleButtonWidget buttonWidget = new ToggleButtonWidget(176 - 7 - 54, 62, 18, 18,
             GuiTextures.BUTTON_SWITCH_VIEW, booleanWrapper::getCurrentMode, booleanWrapper::setCurrentMode)
             .setTooltipText("gregtech.gui.toggle_view");
         builder.widget(buttonWidget);
@@ -47,7 +47,7 @@ public int getLeftButtonOffset() {
 
     @Override
     public int getRightButtonOffset() {
-        return 20;
+        return 18;
     }
 
     private static class BooleanWrapper {
diff --git a/src/main/java/gregtech/common/covers/CoverConveyor.java b/src/main/java/gregtech/common/covers/CoverConveyor.java
@@ -433,7 +433,7 @@ public ModularUI createUI(EntityPlayer player) {
 
         ModularUI.Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176, 190 + 82)
             .widget(primaryGroup)
-            .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 8, 190);
+            .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 190);
         return buildUI(builder, player);
     }
 
diff --git a/src/main/java/gregtech/common/covers/CoverFluidFilter.java b/src/main/java/gregtech/common/covers/CoverFluidFilter.java
@@ -79,7 +79,7 @@ public ModularUI createUI(EntityPlayer player) {
         this.fluidFilter.initUI(45, fluidFilterGroup::addWidget);
         return ModularUI.builder(GuiTextures.BACKGROUND, 176, 105 + 82)
             .widget(fluidFilterGroup)
-            .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 8, 105)
+            .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 105)
             .build(this, player);
     }
 
diff --git a/src/main/java/gregtech/common/covers/CoverItemFilter.java b/src/main/java/gregtech/common/covers/CoverItemFilter.java
@@ -82,7 +82,7 @@ public ModularUI createUI(EntityPlayer player) {
 
         return ModularUI.builder(GuiTextures.BACKGROUND, 176, 105 + 82)
             .widget(filterGroup)
-            .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 8, 105)
+            .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 105)
             .build(this, player);
     }
 
diff --git a/src/main/java/gregtech/common/covers/CoverPump.java b/src/main/java/gregtech/common/covers/CoverPump.java
@@ -170,7 +170,7 @@ public ModularUI createUI(EntityPlayer player) {
 
         ModularUI.Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176, 184 + 82)
                 .widget(primaryGroup)
-                .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 8, 184);
+                .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 184);
         return buildUI(builder, player);
     }
 
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBatteryBuffer.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBatteryBuffer.java
@@ -138,7 +138,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
                     .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.BATTERY_OVERLAY));
             }
         }
-        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 8, 18 + 18 * rowSize + 12);
+        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 7, 18 + 18 * rowSize + 12);
         return builder.build(getHolder(), entityPlayer);
     }
 
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java
@@ -250,7 +250,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
                     .setBackgroundTexture(GuiTextures.SLOT));
             }
         }
-        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 8, 18 + 18 * rowSize + 12);
+        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 7, 18 + 18 * rowSize + 12);
         return builder.build(getHolder(), entityPlayer);
     }
 
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityCharger.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityCharger.java
@@ -101,7 +101,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
                     .setBackgroundTexture(GuiTextures.SLOT, GuiTextures.CHARGER_OVERLAY));
             }
         }
-        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 8, 18 + 18 * rowSize + 12);
+        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 7, 18 + 18 * rowSize + 12);
         return builder.build(getHolder(), entityPlayer);
     }
 
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java
@@ -72,7 +72,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
             }
         }
 
-        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 8, 18 + 18 * rowSize + 12);
+        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 7, 18 + 18 * rowSize + 12);
         return builder.build(getHolder(), entityPlayer);
     }
 
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityItemCollector.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityItemCollector.java
@@ -236,7 +236,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
         }
 
         this.itemFilter.initUI(45 + rowSize * 18 + 5, builder::widget);
-        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 8, 45 + rowSize * 18 + 105);
+        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 7, 45 + rowSize * 18 + 105);
         return builder.build(getHolder(), entityPlayer);
     }
 }
diff --git a/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityItemBus.java b/src/main/java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityItemBus.java
@@ -91,19 +91,24 @@ public void registerAbilities(List<IItemHandlerModifiable> abilityList) {
     @Override
     protected ModularUI createUI(EntityPlayer entityPlayer) {
         int rowSize = (int) Math.sqrt(getInventorySize());
-        Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176,
+        return createUITemplate(entityPlayer, rowSize, rowSize == 10 ? 9 : 0)
+                .build(getHolder(), entityPlayer);
+    }
+
+    private ModularUI.Builder createUITemplate(EntityPlayer player, int rowSize, int xOffset) {
+        Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176 + xOffset * 2,
                 18 + 18 * rowSize + 94)
                 .label(10, 5, getMetaFullName());
 
         for (int y = 0; y < rowSize; y++) {
-            for (int x = 0; x < rowSize; x++) {
+            for (int x = 0; x < rowSize; x ++) {
                 int index = y * rowSize + x;
-                builder.widget(new SlotWidget(isExportHatch ? exportItems : importItems, index, 89 - rowSize * 9 + x * 18, 18 + y * 18, true, !isExportHatch)
+                builder.widget(new SlotWidget(isExportHatch ? exportItems : importItems, index,
+                        (88 - rowSize * 9 + x * 18) + xOffset, 18 + y * 18, true, !isExportHatch)
                         .setBackgroundTexture(GuiTextures.SLOT));
             }
         }
-        builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 8, 18 + 18 * rowSize + 12);
-        return builder.build(getHolder(), entityPlayer);
+        return builder.bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7 + xOffset, 18 + 18 * rowSize + 12);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityChest.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityChest.java
@@ -243,7 +243,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {
         for (int y = 0; y < amountOfRows; y++) {
             for (int x = 0; x < rowSize; x++) {
                 int index = y * rowSize + x;
-                builder.slot(inventory, index, 8 + x * 18, 18 + y * 18, GuiTextures.SLOT);
+                builder.slot(inventory, index, 7 + x * 18, 18 + y * 18, GuiTextures.SLOT);
             }
         }
         int startX = (Math.max(176, 14 + rowSize * 18) - 162) / 2;
diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang
@@ -2927,8 +2927,8 @@ gregtech.gui.toggle_view.disabled=Toggle View (Fluids)
 gregtech.gui.toggle_view.enabled=Toggle View (Items)
 gregtech.gui.overclock.enabled=Overclocking Enabled./nClick to Disable
 gregtech.gui.overclock.disabled=Overclocking Disabled./nClick to Enable
-gregtech.gui.overclock.description=Recipes can overclock to this tier./nOFF means no overclocking is performed.
-gregtech.gui.overclock.off=OFF
+gregtech.gui.overclock.description=Recipes can overclock to this tier./nX means no overclocking is performed.
+gregtech.gui.overclock.off=X
 gregtech.gui.sort=Sort
 gregtech.gui.fluid_auto_output.tooltip.enabled=Fluid Auto-Output Enabled
 gregtech.gui.fluid_auto_output.tooltip.disabled=Fluid Auto-Output Disabled
diff --git a/src/main/resources/assets/gregtech/textures/gui/widget/button_overclock.png b/src/main/resources/assets/gregtech/textures/gui/widget/button_overclock.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/widget/button_switch_view.png b/src/main/resources/assets/gregtech/textures/gui/widget/button_switch_view.png

Original file line number	Diff line number	Diff line change
`@@ -180,12 +180,12 @@ public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer) {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, int startY) {`
`183`		`- bindPlayerInventory(inventoryPlayer, GuiTextures.SLOT, 8, startY);`
	`183`	`+ bindPlayerInventory(inventoryPlayer, GuiTextures.SLOT, 7, startY);`
`184`	`184`	`return this;`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, TextureArea imageLocation) {`
`188`		`- return bindPlayerInventory(inventoryPlayer, imageLocation, 8, 84);`
	`188`	`+ return bindPlayerInventory(inventoryPlayer, imageLocation, 7, 84);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, TextureArea imageLocation, int x, int y) {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) {`
`88`	`88`	`String text = I18n.format(optionNames[currentOption]);`
`89`	`89`	`fontRenderer.drawString(text,`
`90`	`90`	`pos.x + size.width / 2 - fontRenderer.getStringWidth(text) / 2,`
`91`		`- pos.y + size.height / 2 - fontRenderer.FONT_HEIGHT / 2, textColor);`
	`91`	`+ pos.y + size.height / 2 - fontRenderer.FONT_HEIGHT / 2 + 1, textColor);`
`92`	`92`	`GlStateManager.color(1.0f, 1.0f, 1.0f);`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ public ModularUI createUI(EntityPlayer player) {`
`433`	`433`
`434`	`434`	`ModularUI.Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176, 190 + 82)`
`435`	`435`	`.widget(primaryGroup)`
`436`		`- .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 8, 190);`
	`436`	`+ .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 190);`
`437`	`437`	`return buildUI(builder, player);`
`438`	`438`	`}`
`439`	`439`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public ModularUI createUI(EntityPlayer player) {`
`79`	`79`	`this.fluidFilter.initUI(45, fluidFilterGroup::addWidget);`
`80`	`80`	`return ModularUI.builder(GuiTextures.BACKGROUND, 176, 105 + 82)`
`81`	`81`	`.widget(fluidFilterGroup)`
`82`		`- .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 8, 105)`
	`82`	`+ .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 105)`
`83`	`83`	`.build(this, player);`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public ModularUI createUI(EntityPlayer player) {`
`82`	`82`
`83`	`83`	`return ModularUI.builder(GuiTextures.BACKGROUND, 176, 105 + 82)`
`84`	`84`	`.widget(filterGroup)`
`85`		`- .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 8, 105)`
	`85`	`+ .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 105)`
`86`	`86`	`.build(this, player);`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public ModularUI createUI(EntityPlayer player) {`
`170`	`170`
`171`	`171`	`ModularUI.Builder builder = ModularUI.builder(GuiTextures.BACKGROUND, 176, 184 + 82)`
`172`	`172`	`.widget(primaryGroup)`
`173`		`- .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 8, 184);`
	`173`	`+ .bindPlayerInventory(player.inventory, GuiTextures.SLOT, 7, 184);`
`174`	`174`	`return buildUI(builder, player);`
`175`	`175`	`}`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ protected ModularUI createUI(EntityPlayer entityPlayer) {`
`138`	`138`	`.setBackgroundTexture(GuiTextures.SLOT, GuiTextures.BATTERY_OVERLAY));`
`139`	`139`	`}`
`140`	`140`	`}`
`141`		`- builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 8, 18 + 18 * rowSize + 12);`
	`141`	`+ builder.bindPlayerInventory(entityPlayer.inventory, GuiTextures.SLOT, 7, 18 + 18 * rowSize + 12);`
`142`	`142`	`return builder.build(getHolder(), entityPlayer);`
`143`	`143`	`}`
`144`	`144`