Skip to content

Commit 1cd71e8

Browse files
committed
Fix rendering the mekasuit energy bar even in creative (#8101)
1 parent 9989abc commit 1cd71e8

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ 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
31+
return;
32+
}
2933
Minecraft minecraft = Minecraft.getInstance();
3034
FloatingLong capacity = FloatingLong.ZERO, stored = FloatingLong.ZERO;
3135
for (ItemStack stack : minecraft.player.getArmorSlots()) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.minecraft.network.chat.Component;
1414
import net.minecraft.world.entity.EquipmentSlot;
1515
import net.minecraft.world.item.ItemStack;
16+
import net.minecraft.world.level.GameType;
1617
import org.jetbrains.annotations.NotNull;
1718

1819
public class MekanismStatusOverlay implements LayeredDraw.Layer {
@@ -33,7 +34,7 @@ public void setTimer() {
3334
@Override
3435
public void render(@NotNull GuiGraphics graphics, @NotNull DeltaTracker delta) {
3536
Minecraft minecraft = Minecraft.getInstance();
36-
if (modeSwitchTimer > 1 && minecraft.player != null) {
37+
if (modeSwitchTimer > 1 && minecraft.player != null && minecraft.gameMode.getPlayerMode() != GameType.SPECTATOR) {
3738
ItemStack stack = minecraft.player.getMainHandItem();
3839
if (IModeItem.isModeItem(stack, EquipmentSlot.MAINHAND)) {
3940
Component scrollTextComponent = ((IModeItem) stack.getItem()).getScrollTextComponent(stack);

0 commit comments

Comments
 (0)