Compare commits

..

4 Commits

Author SHA1 Message Date
Markil3
93767421ee Gets ready for release 1.1 2021-04-01 13:08:56 -06:00
Markil3
96718b2b57 Adds the ability to always show hands and crosshairs.
Apparently, @rflambert doesn't want the hands to fade. It seemed like a good idea, so I added a configurable option to the main repo.
2021-03-26 11:15:55 -06:00
Markil3
e3c0f1d533 Catches any errors that occur when triggering events.
It is pretty annoying for the game to crash because of a GUI mod. This should reduce that.
2021-03-26 10:08:16 -06:00
Markil3
6daf696e01 Fixes a ClassCastException (#1). 2021-03-25 17:09:03 -06:00
8 changed files with 500 additions and 136 deletions

View File

@@ -11,6 +11,6 @@ cloth_version=4.11.14
modmenu_version=1.16.8 modmenu_version=1.16.8
# Mod Properties # Mod Properties
mod_version = 1.0 mod_version = 1.1
maven_group = markil3 maven_group = markil3
archives_base_name = immersive_hud archives_base_name = immersive_hud

View File

@@ -82,7 +82,9 @@ public class ConfigManager
private TimeValues hungerTime = new TimeValues(); private TimeValues hungerTime = new TimeValues();
private TimeValues effectTime = new TimeValues(); private TimeValues effectTime = new TimeValues();
private int crosshairTime = 6 * TICKS_PER_SECOND; private int crosshairTime = 6 * TICKS_PER_SECOND;
private boolean hideCrosshair = true;
private int handTime = 30 * TICKS_PER_SECOND; private int handTime = 30 * TICKS_PER_SECOND;
private boolean hideHands = true;
private boolean showArmor = true; private boolean showArmor = true;
private double minHealth = 0.5; private double minHealth = 0.5;
private int minHunger = 17; private int minHunger = 17;
@@ -183,6 +185,15 @@ public class ConfigManager
{ {
return this.crosshairTime; return this.crosshairTime;
} }
/**
* Checks whether the crosshairs should be hidden after a period of time.
*
* @return - Whether or not crosshairs will be hidden.
*/
public boolean hideCrosshair()
{
return this.hideCrosshair;
}
/** /**
* Obtains the time that the hands are allowed to display. * Obtains the time that the hands are allowed to display.
@@ -194,6 +205,16 @@ public class ConfigManager
return this.handTime; return this.handTime;
} }
/**
* Checks whether hands should be hidden after a period of time.
*
* @return - Whether or not hands will be hidden.
*/
public boolean hideHands()
{
return this.hideHands;
}
/** /**
* Checks whether the armor bar should render. * Checks whether the armor bar should render.
* *
@@ -236,6 +257,16 @@ public class ConfigManager
this.crosshairTime = time; this.crosshairTime = time;
} }
/**
* Sets whether the crosshairs should be hidden after a period of time.
*
* @param hide - Whether or not crosshairs will be hidden.
*/
public void hideCrosshair(boolean hide)
{
this.hideCrosshair = hide;
}
/** /**
* Sets the time that the hands are allowed to display. * Sets the time that the hands are allowed to display.
* *
@@ -246,6 +277,16 @@ public class ConfigManager
this.handTime = time; this.handTime = time;
} }
/**
* Sets whether hands should be hidden after a period of time.
*
* @param hide - Whether or not hands will be hidden.
*/
public void hideHands(boolean hide)
{
this.hideHands = hide;
}
/** /**
* Determines whether the armor bar should render. * Determines whether the armor bar should render.
* *

View File

@@ -131,6 +131,15 @@ public class ModMenu implements ModMenuApi
.setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND))) .setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
.build()); .build());
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
"option.immersive_hud.hideCrosshair"),
instance.hideCrosshair())
.setDefaultValue(true)
.setTooltip(new TranslatableText(
"tooltip.immersive_hud.hideCrosshair"))
.setSaveConsumer(val -> instance.hideCrosshair(val))
.build());
general.addEntry(entryBuilder.startDoubleField(new TranslatableText( general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
"option.immersive_hud.handTime"), "option.immersive_hud.handTime"),
(float) instance.getHandTime() / TICKS_PER_SECOND) (float) instance.getHandTime() / TICKS_PER_SECOND)
@@ -140,6 +149,15 @@ public class ModMenu implements ModMenuApi
.setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND))) .setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
.build()); .build());
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
"option.immersive_hud.hideHands"),
instance.hideHands())
.setDefaultValue(true)
.setTooltip(new TranslatableText(
"tooltip.immersive_hud.hideHands"))
.setSaveConsumer(val -> instance.hideHands(val))
.build());
general.addEntry(entryBuilder.startDoubleField(new TranslatableText( general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
"option.immersive_hud.minHealth"), "option.immersive_hud.minHealth"),
instance.getMinHealth()) instance.getMinHealth())

View File

@@ -360,50 +360,54 @@ public class TimerUtils
{ {
final float HAND_UP_TIME = 20F; final float HAND_UP_TIME = 20F;
switch (hand) boolean hideHands = ConfigManager.getInstance().hideHands();
if (hideHands)
{ {
case OFF_HAND: switch (hand)
if (offHandTime == 0 && !offHandLock)
{ {
return true; case OFF_HAND:
} if (offHandTime == 0 && !offHandLock)
else if (!offHandLock && (mapLock & 0b01) == 0)
{
if (offHandTime > 0)
{ {
offHandTime -= ticks; return true;
} }
if (offHandTime < HAND_UP_TIME) else if (!offHandLock && (mapLock & 0b01) == 0)
{ {
matrixStack if (offHandTime > 0)
.translate(0, {
-1.0F * (HAND_UP_TIME - offHandTime) / offHandTime -= ticks;
HAND_UP_TIME, }
0); if (offHandTime < HAND_UP_TIME)
{
matrixStack
.translate(0,
-1.0F * (HAND_UP_TIME - offHandTime) /
HAND_UP_TIME,
0);
}
} }
} break;
break; case MAIN_HAND:
case MAIN_HAND: if (mainHandTime == 0 && !mainHandLock)
if (mainHandTime == 0 && !mainHandLock)
{
return true;
}
else if (!mainHandLock && (mapLock & 0b10) == 0)
{
if (mainHandTime > 0)
{ {
mainHandTime -= ticks; return true;
} }
if (mainHandTime < HAND_UP_TIME) else if (!mainHandLock && (mapLock & 0b10) == 0)
{ {
matrixStack if (mainHandTime > 0)
.translate(0, {
-1.0F * (HAND_UP_TIME - mainHandTime) / mainHandTime -= ticks;
HAND_UP_TIME, }
0); if (mainHandTime < HAND_UP_TIME)
{
matrixStack
.translate(0,
-1.0F * (HAND_UP_TIME - mainHandTime) /
HAND_UP_TIME,
0);
}
} }
break;
} }
break;
} }
return false; return false;
} }
@@ -426,37 +430,41 @@ public class TimerUtils
boolean changed = false; boolean changed = false;
boolean canceled = false; boolean canceled = false;
if (mc.crosshairTarget != null && mc.crosshairTarget boolean hideCrosshair = ConfigManager.getInstance().hideCrosshair();
.getType() != HitResult.Type.MISS) if (hideCrosshair)
{ {
if (mc.crosshairTarget.getType() == HitResult.Type if (mc.crosshairTarget != null && mc.crosshairTarget
.ENTITY) .getType() != HitResult.Type.MISS)
{ {
if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity if (mc.crosshairTarget.getType() == HitResult.Type
.getVehicle()) .ENTITY)
{
if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
.getVehicle())
{
changed = true;
}
}
else
{ {
changed = true; changed = true;
} }
} }
if (changed || mainHandLock || offHandLock || crosshairTime
> 0)
{
setAlpha(Main.getAlpha(crosshairTime > 0 ?
crosshairTime :
CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
}
else else
{ {
changed = true; canceled = true;
}
if (crosshairTime > 0)
{
crosshairTime -= ticks;
} }
}
if (changed || mainHandLock || offHandLock || crosshairTime
> 0)
{
setAlpha(Main.getAlpha(crosshairTime > 0 ?
crosshairTime :
CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
}
else
{
canceled = true;
}
if (crosshairTime > 0)
{
crosshairTime -= ticks;
} }
return canceled; return canceled;
} }
@@ -488,7 +496,7 @@ public class TimerUtils
LivingEntity mount; LivingEntity mount;
boolean changed = false; boolean changed = false;
if (tmp == null) if (tmp == null || !(tmp instanceof LivingEntity))
{ {
mountHealth = -1; mountHealth = -1;
mountMaxHealth = -1; mountMaxHealth = -1;

View File

@@ -21,6 +21,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@@ -38,6 +40,9 @@ import markil3.immersive_hud.TimerUtils;
@Mixin(ClientPlayerEntity.class) @Mixin(ClientPlayerEntity.class)
public class ClientPlayerHook public class ClientPlayerHook
{ {
private static final Logger LOGGER =
LogManager.getLogger(ClientPlayerHook.class);
/** /**
* Updates hand timing every time an attack is initiated. * Updates hand timing every time an attack is initiated.
* *
@@ -49,7 +54,18 @@ public class ClientPlayerHook
@Inject(method = "swingHand", at = @At(value = "TAIL")) @Inject(method = "swingHand", at = @At(value = "TAIL"))
public void swingHand(Hand hand, CallbackInfo callbackInfo) public void swingHand(Hand hand, CallbackInfo callbackInfo)
{ {
TimerUtils.onClick(hand, hand == null); try
{
TimerUtils.onClick(hand, hand == null);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.network" +
".ClientPlayerEntity#swingHand " +
"event",
e);
}
} }
/** /**
@@ -63,7 +79,18 @@ public class ClientPlayerHook
@Inject(method = "setCurrentHand", at = @At(value = "TAIL")) @Inject(method = "setCurrentHand", at = @At(value = "TAIL"))
public void setCurrentHand(Hand hand, CallbackInfo callbackInfo) public void setCurrentHand(Hand hand, CallbackInfo callbackInfo)
{ {
TimerUtils.onClick(hand, hand == null); try
{
TimerUtils.onClick(hand, hand == null);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.network" +
".ClientPlayerEntity#setCurrentHand " +
"event",
e);
}
} }
/** /**
@@ -76,10 +103,21 @@ public class ClientPlayerHook
@Inject(method = "clearActiveItem", at = @At(value = "HEAD")) @Inject(method = "clearActiveItem", at = @At(value = "HEAD"))
public void clearActiveItem(CallbackInfo callbackInfo) public void clearActiveItem(CallbackInfo callbackInfo)
{ {
if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity) try
{ {
TimerUtils.onClick(((LivingEntity) MinecraftClient.getInstance().cameraEntity) if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
.getActiveHand(), true); {
TimerUtils.onClick(((LivingEntity) MinecraftClient.getInstance().cameraEntity)
.getActiveHand(), true);
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.network" +
".ClientPlayerEntity#clearActiveItem " +
"event",
e);
} }
} }
} }

View File

@@ -23,6 +23,8 @@ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@@ -40,6 +42,9 @@ import markil3.immersive_hud.TimerUtils;
@Mixin(HeldItemRenderer.class) @Mixin(HeldItemRenderer.class)
public class HeldItemHook public class HeldItemHook
{ {
private static final Logger LOGGER =
LogManager.getLogger(HeldItemHook.class);
/** /**
* Determines whether or not to render a certain hand. * Determines whether or not to render a certain hand.
* *
@@ -72,9 +77,20 @@ public class HeldItemHook
int light, int light,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
if (TimerUtils.onRenderHand(hand, matrices, tickDelta)) try
{ {
callbackInfo.cancel(); if (TimerUtils.onRenderHand(hand, matrices, tickDelta))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.render.item" +
".HeldItemRenderer#renderFirstPersonItem " +
"event",
e);
} }
} }

View File

@@ -24,6 +24,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectInstance;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@@ -43,6 +45,8 @@ import markil3.immersive_hud.TimerUtils;
@Mixin(InGameHud.class) @Mixin(InGameHud.class)
public class HudHook public class HudHook
{ {
private static final Logger LOGGER = LogManager.getLogger(HudHook.class);
private StatusEffectInstance currentEffect; private StatusEffectInstance currentEffect;
/** /**
@@ -58,10 +62,21 @@ public class HudHook
cancellable = true) cancellable = true)
public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo) public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
{ {
if (TimerUtils.drawCrosshair(MinecraftClient.getInstance() try
.getTickDelta()))
{ {
callbackInfo.cancel(); if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
.getTickDelta()))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#startCrosshair " +
"event",
e);
} }
} }
@@ -77,10 +92,21 @@ public class HudHook
@Inject(method = "renderCrosshair", at = @At(value = "TAIL")) @Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo) public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
{ {
/* try
* Resets the color so that nothing else is bothered. {
*/ /*
TimerUtils.resetAlpha(); * Resets the color so that nothing else is bothered.
*/
TimerUtils.resetAlpha();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderCrosshair " +
"event",
e);
}
} }
/** /**
@@ -98,10 +124,21 @@ public class HudHook
int x, int x,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
if (TimerUtils.drawJumpbar(stack, try
MinecraftClient.getInstance().getTickDelta()))
{ {
callbackInfo.cancel(); if (TimerUtils.drawJumpbar(stack,
MinecraftClient.getInstance().getTickDelta()))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountJumpBar " +
"event",
e);
} }
} }
@@ -119,11 +156,22 @@ public class HudHook
int x, int x,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
stack.pop(); try
/* {
* Resets the color so that nothing else is bothered. stack.pop();
*/ /*
TimerUtils.resetAlpha(); * Resets the color so that nothing else is bothered.
*/
TimerUtils.resetAlpha();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountJumpBar " +
"event",
e);
}
} }
/** /**
@@ -141,10 +189,21 @@ public class HudHook
int x, int x,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
if (TimerUtils.drawExperience(stack, try
MinecraftClient.getInstance().getTickDelta()))
{ {
callbackInfo.cancel(); if (TimerUtils.drawExperience(stack,
MinecraftClient.getInstance().getTickDelta()))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderExperienceBar " +
"event",
e);
} }
} }
@@ -162,11 +221,22 @@ public class HudHook
int x, int x,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
stack.pop(); try
/* {
* Resets the color so that nothing else is bothered. stack.pop();
*/ /*
TimerUtils.resetAlpha(); * Resets the color so that nothing else is bothered.
*/
TimerUtils.resetAlpha();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderExperienceBar " +
"event",
e);
}
} }
/** /**
@@ -181,8 +251,19 @@ public class HudHook
"/math/MatrixStack;)V", at = @At("HEAD")) "/math/MatrixStack;)V", at = @At("HEAD"))
public MatrixStack startStatus(MatrixStack stack) public MatrixStack startStatus(MatrixStack stack)
{ {
stack.push(); try
stack.translate(0F, TimerUtils.getHealthTranslation(), 0F); {
stack.push();
stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
return stack; return stack;
} }
@@ -197,9 +278,20 @@ public class HudHook
"/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V")) "/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
public void renderArmor(MatrixStack matrices, CallbackInfo callbackInfo) public void renderArmor(MatrixStack matrices, CallbackInfo callbackInfo)
{ {
if (TimerUtils.drawArmor()) try
{ {
TimerUtils.setAlpha(0F); if (TimerUtils.drawArmor())
{
TimerUtils.setAlpha(0F);
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
} }
} }
@@ -215,13 +307,25 @@ public class HudHook
ordinal = 0)) ordinal = 0))
public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo) public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
{ {
/* try
* Resets the transparency from the previous call.
*/
TimerUtils.setAlpha(1F);
if (TimerUtils.drawHealth(MinecraftClient.getInstance().getTickDelta()))
{ {
TimerUtils.setAlpha(0F); /*
* Resets the transparency from the previous call.
*/
TimerUtils.setAlpha(1F);
if (TimerUtils.drawHealth(MinecraftClient.getInstance()
.getTickDelta()))
{
TimerUtils.setAlpha(0F);
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
} }
} }
@@ -237,13 +341,25 @@ public class HudHook
ordinal = 1)) ordinal = 1))
public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo) public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
{ {
/* try
* Resets the transparency from the previous call.
*/
TimerUtils.setAlpha(1F);
if (TimerUtils.drawHunger(MinecraftClient.getInstance().getTickDelta()))
{ {
TimerUtils.setAlpha(0F); /*
* Resets the transparency from the previous call.
*/
TimerUtils.setAlpha(1F);
if (TimerUtils.drawHunger(MinecraftClient.getInstance()
.getTickDelta()))
{
TimerUtils.setAlpha(0F);
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
} }
} }
@@ -259,17 +375,39 @@ public class HudHook
ordinal = 2)) ordinal = 2))
public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo) public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
{ {
/* try
* Resets the color so that nothing else is bothered. {
*/ /*
TimerUtils.setAlpha(1F); * Resets the color so that nothing else is bothered.
*/
TimerUtils.setAlpha(1F);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
} }
@ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" + @ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
"/math/MatrixStack;)V", at = @At("TAIL")) "/math/MatrixStack;)V", at = @At("TAIL"))
public MatrixStack finishStatus(MatrixStack stack) public MatrixStack finishStatus(MatrixStack stack)
{ {
stack.pop(); try
{
stack.pop();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
return stack; return stack;
} }
@@ -286,10 +424,21 @@ public class HudHook
cancellable = true) cancellable = true)
public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo) public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
{ {
if (TimerUtils.drawMountHealth(stack, try
MinecraftClient.getInstance().getTickDelta()))
{ {
callbackInfo.cancel(); if (TimerUtils.drawMountHealth(stack,
MinecraftClient.getInstance().getTickDelta()))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountHealth " +
"event",
e);
} }
} }
@@ -305,11 +454,22 @@ public class HudHook
@Inject(method = "renderMountHealth", at = @At(value = "TAIL")) @Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo) public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
{ {
/* try
* Resets the color so that nothing else is bothered. {
*/ /*
stack.pop(); * Resets the color so that nothing else is bothered.
TimerUtils.resetAlpha(); */
stack.pop();
TimerUtils.resetAlpha();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountHealth " +
"event",
e);
}
} }
/** /**
@@ -323,9 +483,20 @@ public class HudHook
@At(value = "HEAD", shift = At.Shift.AFTER)) @At(value = "HEAD", shift = At.Shift.AFTER))
public void startPotion(MatrixStack effect, CallbackInfo info) public void startPotion(MatrixStack effect, CallbackInfo info)
{ {
TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ? try
((ClientPlayerEntity) MinecraftClient.getInstance().cameraEntity) : {
null); TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
((ClientPlayerEntity) MinecraftClient.getInstance().cameraEntity) :
null);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusEffectOverlay " +
"event",
e);
}
} }
/** /**
@@ -342,9 +513,21 @@ public class HudHook
"shouldShowIcon()Z")) "shouldShowIcon()Z"))
public boolean shouldRenderPotion(StatusEffectInstance effect) public boolean shouldRenderPotion(StatusEffectInstance effect)
{ {
currentEffect = effect; try
return TimerUtils.updatePotion(effect, {
MinecraftClient.getInstance().getTickDelta()); currentEffect = effect;
return TimerUtils.updatePotion(effect,
MinecraftClient.getInstance().getTickDelta());
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusEffectOverlay " +
"event",
e);
}
return true;
} }
/** /**
@@ -362,7 +545,19 @@ public class HudHook
public float updatePotion(float f, public float updatePotion(float f,
MatrixStack stack) MatrixStack stack)
{ {
return TimerUtils.getPotionAlpha(currentEffect); try
{
return TimerUtils.getPotionAlpha(currentEffect);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusEffectOverlay " +
"event",
e);
}
return 1F;
} }
/** /**
@@ -378,10 +573,21 @@ public class HudHook
public void finishPotion(MatrixStack matrices, public void finishPotion(MatrixStack matrices,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
/* try
* Resets the color so that nothing else is bothered. {
*/ /*
TimerUtils.resetAlpha(); * Resets the color so that nothing else is bothered.
*/
TimerUtils.resetAlpha();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusEffectOverlay " +
"event",
e);
}
} }
/** /**
@@ -400,9 +606,20 @@ public class HudHook
MatrixStack matrices, MatrixStack matrices,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
if (TimerUtils.updateHotbar(tickDelta)) try
{ {
callbackInfo.cancel(); if (TimerUtils.updateHotbar(tickDelta))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderHotbar " +
"event",
e);
} }
} }
@@ -423,7 +640,18 @@ public class HudHook
MatrixStack matrices, MatrixStack matrices,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
TimerUtils.recolorHotbar(matrices); try
{
TimerUtils.recolorHotbar(matrices);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderHotbar " +
"event",
e);
}
} }
/** /**
@@ -441,11 +669,22 @@ public class HudHook
MatrixStack stack, MatrixStack stack,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
RenderSystem.popMatrix(); try
stack.pop(); {
/* RenderSystem.popMatrix();
* Resets the color so that nothing else is bothered. stack.pop();
*/ /*
TimerUtils.resetAlpha(); * Resets the color so that nothing else is bothered.
*/
TimerUtils.resetAlpha();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderHotbar " +
"event",
e);
}
} }
} }

View File

@@ -19,7 +19,9 @@
"option.immersive_hud.effectFadeIn": "Potion Fade In Time", "option.immersive_hud.effectFadeIn": "Potion Fade In Time",
"option.immersive_hud.effectFadeOut": "Potion Fade Out Time", "option.immersive_hud.effectFadeOut": "Potion Fade Out Time",
"option.immersive_hud.crosshairTime": "Crosshair Display Time", "option.immersive_hud.crosshairTime": "Crosshair Display Time",
"option.immersive_hud.hideCrosshair": "Hide Crosshair",
"option.immersive_hud.handTime": "Hand Display Time", "option.immersive_hud.handTime": "Hand Display Time",
"option.immersive_hud.hideHands": "Hide Hands",
"option.immersive_hud.minHealth": "Minimum Health Fade", "option.immersive_hud.minHealth": "Minimum Health Fade",
"option.immersive_hud.minHunger": "Minimum Hunger Fade", "option.immersive_hud.minHunger": "Minimum Hunger Fade",
"option.immersive_hud.showArmor": "Show Armor", "option.immersive_hud.showArmor": "Show Armor",
@@ -42,7 +44,9 @@
"tooltip.immersive_hud.effectFadeIn": "How many seconds it takes for potion icons to fade in", "tooltip.immersive_hud.effectFadeIn": "How many seconds it takes for potion icons to fade in",
"tooltip.immersive_hud.effectFadeOut": "How many seconds it takes for potion icons to fade out", "tooltip.immersive_hud.effectFadeOut": "How many seconds it takes for potion icons to fade out",
"tooltip.immersive_hud.crosshairTime": "How many seconds the crosshairs can be on screen", "tooltip.immersive_hud.crosshairTime": "How many seconds the crosshairs can be on screen",
"tooltip.immersive_hud.hideCrosshair": "Whether or not the crosshairs should be hidden after a period of time",
"tooltip.immersive_hud.handTime": "How many seconds the hands can be on screen", "tooltip.immersive_hud.handTime": "How many seconds the hands can be on screen",
"tooltip.immersive_hud.hideHands": "Whether or not hands should be hidden after a period of time",
"tooltip.immersive_hud.minHealth": "When the percentage of health goes below this level, the health bar won't fade away", "tooltip.immersive_hud.minHealth": "When the percentage of health goes below this level, the health bar won't fade away",
"tooltip.immersive_hud.minHunger": "When the hunger level goes below this level, the hunger bar won't fade away", "tooltip.immersive_hud.minHunger": "When the hunger level goes below this level, the hunger bar won't fade away",
"tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD" "tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD"