Fix many small GUI issues (#1574)

GregTechCE · Jul 13, 2021 · 5220ff1 · 5220ff1
1 parent 68dec27
commit 5220ff1
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 28 deletions.
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/.../java/gregtech/common/metatileentities/electric/multiblockpart/MetaTileEntityItemBus.java b/.../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