Skip to content

Commit 913867c

Browse files
LAGIdiotLAGIdiot
authored
Revert "Fix name overlaps in GUIs (#1665)" (#1686)
This reverts commit eea021c.
1 parent 91a8855 commit 913867c

File tree

4 files changed

+27
-68
lines changed

4 files changed

+27
-68
lines changed

‎src/main/java/gregtech/api/gui/ModularUI.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,7 @@ public void triggerCloseListeners() {
9090
}
9191

9292
public static Builder defaultBuilder() {
93-
return defaultBuilder(0);
94-
}
95-
96-
//to be called in order to change the gui height by a specific amount
97-
public static Builder defaultBuilder(int yOffset) {
98-
return new Builder(GuiTextures.BACKGROUND, 176, 166 + yOffset);
93+
return new Builder(GuiTextures.BACKGROUND, 176, 166);
9994
}
10095

10196
public static Builder borderedBuilder() {
@@ -190,12 +185,7 @@ public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, int startY)
190185
}
191186

192187
public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, TextureArea imageLocation) {
193-
return bindPlayerInventory(inventoryPlayer, imageLocation, 0);
194-
}
195-
196-
//to be called in order to offset the player inventory from the top of the window
197-
public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, TextureArea imageLocation, int yOffset) {
198-
return bindPlayerInventory(inventoryPlayer, imageLocation, 8, 84 + yOffset);
188+
return bindPlayerInventory(inventoryPlayer, imageLocation, 8, 84);
199189
}
200190

201191
public Builder bindPlayerInventory(InventoryPlayer inventoryPlayer, TextureArea imageLocation, int x, int y) {

‎src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ public class SimpleMachineMetaTileEntity extends WorkableTieredMetaTileEntity im
5656
protected IItemHandler outputItemInventory;
5757
protected IFluidHandler outputFluidInventory;
5858

59-
private static final int FONT_HEIGHT = 9; // Minecraft's FontRenderer FONT_HEIGHT value
60-
6159
public SimpleMachineMetaTileEntity(ResourceLocation metaTileEntityId, RecipeMap<?> recipeMap, OrientedOverlayRenderer renderer, int tier) {
6260
this(metaTileEntityId, recipeMap, renderer, tier, true);
6361
}
@@ -321,40 +319,34 @@ protected RecipeLogicEnergy createWorkable(RecipeMap<?> recipeMap) {
321319
}
322320

323321
protected ModularUI.Builder createGuiTemplate(EntityPlayer player) {
324-
RecipeMap<?> workableRecipeMap = workable.recipeMap;
325-
int yOffset = 0;
326-
if (workableRecipeMap.getMaxInputs() > 6 || workableRecipeMap.getMaxFluidInputs() > 6 || workableRecipeMap.getMaxOutputs() > 6 || workableRecipeMap.getMaxFluidOutputs() > 6) {
327-
yOffset = FONT_HEIGHT;
328-
}
329-
330-
ModularUI.Builder builder = workableRecipeMap.createUITemplate(workable::getProgressPercent, importItems, exportItems, importFluids, exportFluids, yOffset)
322+
ModularUI.Builder builder = workable.recipeMap.createUITemplate(workable::getProgressPercent, importItems, exportItems, importFluids, exportFluids)
331323
.widget(new LabelWidget(5, 5, getMetaFullName()))
332-
.widget(new DischargerSlotWidget(chargerInventory, 0, 79, 62 + yOffset)
324+
.widget(new DischargerSlotWidget(chargerInventory, 0, 79, 62)
333325
.setBackgroundTexture(GuiTextures.SLOT, GuiTextures.CHARGER_OVERLAY))
334-
.widget(new ImageWidget(79, 42 + yOffset, 18, 18, GuiTextures.INDICATOR_NO_ENERGY)
326+
.widget(new ImageWidget(79, 42, 18, 18, GuiTextures.INDICATOR_NO_ENERGY)
335327
.setPredicate(workable::isHasNotEnoughEnergy))
336-
.bindPlayerInventory(player.inventory, GuiTextures.SLOT, yOffset);
328+
.bindPlayerInventory(player.inventory);
337329

338330
int leftButtonStartX = 7;
339331
int rightButtonStartX = 176 - 7 - 24;
340-
if (workableRecipeMap instanceof RecipeMapWithConfigButton) {
341-
leftButtonStartX += ((RecipeMapWithConfigButton) workableRecipeMap).getLeftButtonOffset();
342-
rightButtonStartX -= ((RecipeMapWithConfigButton) workableRecipeMap).getRightButtonOffset();
332+
if (workable.recipeMap instanceof RecipeMapWithConfigButton) {
333+
leftButtonStartX += ((RecipeMapWithConfigButton) workable.recipeMap).getLeftButtonOffset();
334+
rightButtonStartX -= ((RecipeMapWithConfigButton) workable.recipeMap).getRightButtonOffset();
343335
}
344336

345337
if (exportItems.getSlots() > 0) {
346-
builder.widget(new ToggleButtonWidget(leftButtonStartX, 62 + yOffset, 18, 18,
338+
builder.widget(new ToggleButtonWidget(leftButtonStartX, 62, 18, 18,
347339
GuiTextures.BUTTON_ITEM_OUTPUT, this::isAutoOutputItems, this::setAutoOutputItems)
348340
.setTooltipText("gregtech.gui.item_auto_output.tooltip"));
349341
leftButtonStartX += 18;
350342
}
351343
if (exportFluids.getTanks() > 0) {
352-
builder.widget(new ToggleButtonWidget(leftButtonStartX, 62 + yOffset, 18, 18,
344+
builder.widget(new ToggleButtonWidget(leftButtonStartX, 62, 18, 18,
353345
GuiTextures.BUTTON_FLUID_OUTPUT, this::isAutoOutputFluids, this::setAutoOutputFluids)
354346
.setTooltipText("gregtech.gui.fluid_auto_output.tooltip"));
355347
}
356348

357-
builder.widget(new CycleButtonWidget(rightButtonStartX, 60 + yOffset, 24, 20,
349+
builder.widget(new CycleButtonWidget(rightButtonStartX, 60, 24, 20,
358350
workable.getAvailableOverclockingTiers(), workable::getOverclockTier, workable::setOverclockTier)
359351
.setTooltipHoverString("gregtech.gui.overclock.description"));
360352

‎src/main/java/gregtech/api/recipes/RecipeMap.java‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -285,24 +285,14 @@ public ModularUI.Builder createJeiUITemplate(IItemHandlerModifiable importItems,
285285

286286
//this DOES NOT include machine control widgets or binds player inventory
287287
public ModularUI.Builder createUITemplate(DoubleSupplier progressSupplier, IItemHandlerModifiable importItems, IItemHandlerModifiable exportItems, FluidTankList importFluids, FluidTankList exportFluids) {
288-
return createUITemplate(progressSupplier, importItems, exportItems, importFluids, exportFluids, 0);
289-
}
290-
291-
//this DOES NOT include machine control widgets or binds player inventory
292-
//to be called in order to offset widgets and slots from the top of the window
293-
public ModularUI.Builder createUITemplate(DoubleSupplier progressSupplier, IItemHandlerModifiable importItems, IItemHandlerModifiable exportItems, FluidTankList importFluids, FluidTankList exportFluids, int yOffset) {
294-
ModularUI.Builder builder = ModularUI.defaultBuilder(yOffset);
295-
builder.widget(new ProgressWidget(progressSupplier, 77, 22 + yOffset, 21, 20, progressBarTexture, moveType));
296-
addInventorySlotGroup(builder, importItems, importFluids, false, yOffset);
297-
addInventorySlotGroup(builder, exportItems, exportFluids, true, yOffset);
288+
ModularUI.Builder builder = ModularUI.defaultBuilder();
289+
builder.widget(new ProgressWidget(progressSupplier, 77, 22, 21, 20, progressBarTexture, moveType));
290+
addInventorySlotGroup(builder, importItems, importFluids, false);
291+
addInventorySlotGroup(builder, exportItems, exportFluids, true);
298292
return builder;
299293
}
300294

301295
protected void addInventorySlotGroup(ModularUI.Builder builder, IItemHandlerModifiable itemHandler, FluidTankList fluidHandler, boolean isOutputs) {
302-
addInventorySlotGroup(builder, itemHandler, fluidHandler, isOutputs, 0);
303-
}
304-
305-
protected void addInventorySlotGroup(ModularUI.Builder builder, IItemHandlerModifiable itemHandler, FluidTankList fluidHandler, boolean isOutputs, int yOffset) {
306296
int itemInputsCount = itemHandler.getSlots();
307297
int fluidInputsCount = fluidHandler.getTanks();
308298
boolean invertFluids = false;
@@ -316,7 +306,7 @@ protected void addInventorySlotGroup(ModularUI.Builder builder, IItemHandlerModi
316306
int itemSlotsToLeft = inputSlotGrid[0];
317307
int itemSlotsToDown = inputSlotGrid[1];
318308
int startInputsX = isOutputs ? 106 : 69 - itemSlotsToLeft * 18;
319-
int startInputsY = 32 - (int) (itemSlotsToDown / 2.0 * 18) + yOffset;
309+
int startInputsY = 32 - (int) (itemSlotsToDown / 2.0 * 18);
320310
for (int i = 0; i < itemSlotsToDown; i++) {
321311
for (int j = 0; j < itemSlotsToLeft; j++) {
322312
int slotIndex = i * itemSlotsToLeft + j;

‎src/main/java/gregtech/api/recipes/machines/RecipeMapGroupOutput.java‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,16 @@ public Builder createJeiUITemplate(IItemHandlerModifiable importItems, IItemHand
2626

2727
@Override
2828
public Builder createUITemplate(DoubleSupplier progressSupplier, IItemHandlerModifiable importItems, IItemHandlerModifiable exportItems, FluidTankList importFluids, FluidTankList exportFluids) {
29-
return createUITemplate(progressSupplier, importItems, exportItems, importFluids, exportFluids, 0);
30-
}
31-
32-
@Override
33-
public Builder createUITemplate(DoubleSupplier progressSupplier, IItemHandlerModifiable importItems, IItemHandlerModifiable exportItems, FluidTankList importFluids, FluidTankList exportFluids, int yOffset) {
34-
ModularUI.Builder builder = ModularUI.defaultBuilder(yOffset);
35-
builder.widget(new ProgressWidget(progressSupplier, 77, 22 + yOffset, 21, 20, progressBarTexture, moveType));
36-
addInventorySlotGroup(builder, importItems, importFluids, false, yOffset);
29+
ModularUI.Builder builder = ModularUI.defaultBuilder();
30+
builder.widget(new ProgressWidget(progressSupplier, 77, 22, 21, 20, progressBarTexture, moveType));
31+
addInventorySlotGroup(builder, importItems, importFluids, false);
3732
BooleanWrapper booleanWrapper = new BooleanWrapper();
38-
ServerWidgetGroup itemOutputGroup = createItemOutputWidgetGroup(exportItems, new ServerWidgetGroup(() -> !booleanWrapper.getCurrentMode()), yOffset);
39-
ServerWidgetGroup fluidOutputGroup = createFluidOutputWidgetGroup(exportFluids, new ServerWidgetGroup(booleanWrapper::getCurrentMode), yOffset);
33+
ServerWidgetGroup itemOutputGroup = createItemOutputWidgetGroup(exportItems, new ServerWidgetGroup(() -> !booleanWrapper.getCurrentMode()));
34+
ServerWidgetGroup fluidOutputGroup = createFluidOutputWidgetGroup(exportFluids, new ServerWidgetGroup(booleanWrapper::getCurrentMode));
4035
builder.widget(itemOutputGroup).widget(fluidOutputGroup);
41-
ToggleButtonWidget buttonWidget = new ToggleButtonWidget(176 - 7 - 20, 60 + yOffset, 20, 20,
42-
GuiTextures.BUTTON_SWITCH_VIEW, booleanWrapper::getCurrentMode, booleanWrapper::setCurrentMode)
43-
.setTooltipText("gregtech.gui.toggle_view");
36+
ToggleButtonWidget buttonWidget = new ToggleButtonWidget(176 - 7 - 20, 60, 20, 20,
37+
GuiTextures.BUTTON_SWITCH_VIEW, booleanWrapper::getCurrentMode, booleanWrapper::setCurrentMode)
38+
.setTooltipText("gregtech.gui.toggle_view");
4439
builder.widget(buttonWidget);
4540
return builder;
4641
}
@@ -69,15 +64,11 @@ public void setCurrentMode(boolean newMode) {
6964
}
7065

7166
protected ServerWidgetGroup createItemOutputWidgetGroup(IItemHandlerModifiable itemHandler, ServerWidgetGroup widgetGroup) {
72-
return createItemOutputWidgetGroup(itemHandler, widgetGroup, 0);
73-
}
74-
75-
protected ServerWidgetGroup createItemOutputWidgetGroup(IItemHandlerModifiable itemHandler, ServerWidgetGroup widgetGroup, int yOffset) {
7667
int[] inputSlotGrid = determineSlotsGrid(itemHandler.getSlots());
7768
int itemSlotsToLeft = inputSlotGrid[0];
7869
int itemSlotsToDown = inputSlotGrid[1];
7970
int startInputsX = 106;
80-
int startInputsY = 32 - (int) (itemSlotsToDown / 2.0 * 18) + yOffset;
71+
int startInputsY = 32 - (int) (itemSlotsToDown / 2.0 * 18);
8172
for (int i = 0; i < itemSlotsToDown; i++) {
8273
for (int j = 0; j < itemSlotsToLeft; j++) {
8374
int slotIndex = i * itemSlotsToLeft + j;
@@ -91,15 +82,11 @@ protected ServerWidgetGroup createItemOutputWidgetGroup(IItemHandlerModifiable i
9182
}
9283

9384
protected ServerWidgetGroup createFluidOutputWidgetGroup(IMultipleTankHandler fluidHandler, ServerWidgetGroup widgetGroup) {
94-
return createFluidOutputWidgetGroup(fluidHandler, widgetGroup, 0);
95-
}
96-
97-
protected ServerWidgetGroup createFluidOutputWidgetGroup(IMultipleTankHandler fluidHandler, ServerWidgetGroup widgetGroup, int yOffset) {
9885
int[] inputSlotGrid = determineSlotsGrid(fluidHandler.getTanks());
9986
int itemSlotsToLeft = inputSlotGrid[0];
10087
int itemSlotsToDown = inputSlotGrid[1];
10188
int startInputsX = 106;
102-
int startInputsY = 32 - (int) (itemSlotsToDown / 2.0 * 18) + yOffset;
89+
int startInputsY = 32 - (int) (itemSlotsToDown / 2.0 * 18);
10390
for (int i = 0; i < itemSlotsToDown; i++) {
10491
for (int j = 0; j < itemSlotsToLeft; j++) {
10592
int slotIndex = i * itemSlotsToLeft + j;

0 commit comments

Comments
 (0)