Skip to content

Commit 06b908e

Browse files
committed
Fix overlays not checking if the gui is hidden (#8112)
1 parent e2f161f commit 06b908e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/main/java/mekanism/client/render/hud/MekaSuitEnergyLevel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ private MekaSuitEnergyLevel() {
2626

2727
@Override
2828
public void render(@NotNull GuiGraphics graphics, @NotNull DeltaTracker delta) {
29-
if (!Minecraft.getInstance().gameMode.canHurtPlayer()) {
30-
//Copy of vanilla check for if the armor level can render
29+
Minecraft minecraft = Minecraft.getInstance();
30+
if (!minecraft.gameMode.canHurtPlayer() || minecraft.options.hideGui) {
31+
//canHurtPlayer is a copy of vanilla check for if the armor level can render
3132
return;
3233
}
33-
Minecraft minecraft = Minecraft.getInstance();
3434
FloatingLong capacity = FloatingLong.ZERO, stored = FloatingLong.ZERO;
3535
for (ItemStack stack : minecraft.player.getArmorSlots()) {
3636
if (stack.getItem() instanceof ItemMekaSuitArmor) {

src/main/java/mekanism/client/render/hud/MekanismHUD.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private IItemHUDProvider getHudProvider(ItemStack stack) {
5454
public void render(@NotNull GuiGraphics graphics, @NotNull DeltaTracker delta) {
5555
Minecraft minecraft = Minecraft.getInstance();
5656
Player player = minecraft.player;
57-
if (player != null && !player.isSpectator() && MekanismConfig.client.enableHUD.get()) {
57+
if (player != null && !player.isSpectator() && !minecraft.options.hideGui && MekanismConfig.client.enableHUD.get()) {
5858
int count = 0;
5959
List<List<Component>> renderStrings = new ArrayList<>();
6060
for (EquipmentSlot slotType : EQUIPMENT_ORDER) {

src/main/java/mekanism/client/render/hud/MekanismStatusOverlay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void setTimer() {
3434
@Override
3535
public void render(@NotNull GuiGraphics graphics, @NotNull DeltaTracker delta) {
3636
Minecraft minecraft = Minecraft.getInstance();
37-
if (modeSwitchTimer > 1 && minecraft.player != null && minecraft.gameMode.getPlayerMode() != GameType.SPECTATOR) {
37+
if (modeSwitchTimer > 1 && minecraft.player != null && minecraft.gameMode.getPlayerMode() != GameType.SPECTATOR && !minecraft.options.hideGui) {
3838
ItemStack stack = minecraft.player.getMainHandItem();
3939
if (IModeItem.isModeItem(stack, EquipmentSlot.MAINHAND)) {
4040
Component scrollTextComponent = ((IModeItem) stack.getItem()).getScrollTextComponent(stack);

0 commit comments

Comments
 (0)