diff options
| author | Jakub <53441451+kuba6000@users.noreply.github.com> | 2022-08-10 07:14:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-10 07:14:16 +0200 |
| commit | 975a89ea5bf7df5008131ab43e42a3a97a1bee2c (patch) | |
| tree | 967b6c2aaf7803d9065997730fa28db79a63a563 /src/main/java/gregtech/common/gui | |
| parent | a1f9608198731fe2c4b4b7f83c8a75f4a336457b (diff) | |
| download | GT5-Unofficial-975a89ea5bf7df5008131ab43e42a3a97a1bee2c.tar.gz GT5-Unofficial-975a89ea5bf7df5008131ab43e42a3a97a1bee2c.tar.bz2 GT5-Unofficial-975a89ea5bf7df5008131ab43e42a3a97a1bee2c.zip | |
Industrial Apiary Fixes (#1225)
* Upgrade slot tooltip
* Fix Hellish biomes temperature
* Princess -> Queen process is always automated
Diffstat (limited to 'src/main/java/gregtech/common/gui')
| -rw-r--r-- | src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java | 11 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java b/src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java index 5160b6b0f0..26170a9478 100644 --- a/src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java +++ b/src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java @@ -27,10 +27,10 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine GT_Slot_Holo slotItemTransferToggle; GT_Slot_Holo slotSpeedToggle; - GT_Slot_Holo slotPollenToggle; GT_Slot_Holo slotCancelProcess; Slot slotBattery; Slot slotSpecial; + ArrayList<Slot> slotUpgrade; boolean mItemTransfer; boolean mStuttering; @@ -54,10 +54,11 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 37, 22)); addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 37, 42)); - addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 62, 24)); - addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 80, 24)); - addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 62, 42)); - addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 80, 42)); + slotUpgrade = new ArrayList<>(4); + slotUpgrade.add(addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 62, 24))); + slotUpgrade.add(addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 80, 24))); + slotUpgrade.add(addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 62, 42))); + slotUpgrade.add(addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 80, 42))); for(int i = 107; i <= 143; i += 18) for(int j = 6; j <= 42; j += 18) diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java index c810704403..3737632dd4 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java @@ -29,7 +29,8 @@ public class GT_GUIContainer_IndustrialApiary extends GT_GUIContainerMetaTile_Ma SPEED_TOOLTIP = "GT5U.machines.industrialapiary.speed.tooltip", SPEED_LOCKED_TOOLTIP = "GT5U.machines.industrialapiary.speedlocked.tooltip", INFO_TOOLTIP = "GT5U.machines.industrialapiary.info.tooltip", - INFO_WITH_BEE_TOOLTIP = "GT5U.machines.industrialapiary.infoextended.tooltip" + INFO_WITH_BEE_TOOLTIP = "GT5U.machines.industrialapiary.infoextended.tooltip", + UPGRADE_TOOLTIP = "GT5U.machines.industrialapiary.upgradeslot.tooltip" ; @@ -57,6 +58,7 @@ public class GT_GUIContainer_IndustrialApiary extends GT_GUIContainerMetaTile_Ma addToolTip(mInfoTooltip = new GT_GuiTooltip(new Rectangle(this.guiLeft + 163, guiTop + 5, 6, 17))); addToolTip(new GT_GuiSlotTooltip(getContainer().slotCancelProcess, mTooltipCache.getData(CANCEL_PROCESS_TOOLTIP))); + getContainer().slotUpgrade.forEach(s->addToolTip(new GT_GuiSlotTooltip(s, mTooltipCache.getData(UPGRADE_TOOLTIP)))); addToolTip(new GT_GuiSlotTooltip(getContainer().slotItemTransferToggle, mTooltipCache.getData(ITEM_TRANSFER_TOOLTIP))); |