Compare commits

...

4 Commits

Author SHA1 Message Date
Markil3
f054a5aa20 Gets ready for release 1.1 2021-04-01 13:07:40 -06:00
Markil3
93548ae7a7 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:21:22 -06:00
Markil3
7195d8ac0d 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:18:00 -06:00
Markil3
a6b05ba15a Fixes a ClassCastException (#1) 2021-03-25 17:12:38 -06:00
8 changed files with 523 additions and 159 deletions

View File

@@ -12,6 +12,6 @@ modmenu_version=1.8.4+build.20
autoconfig_version=2.2.0 autoconfig_version=2.2.0
# 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;
@@ -184,6 +186,16 @@ 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 +206,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 +258,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 +278,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

@@ -130,6 +130,14 @@ 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(
"option.immersive_hud.hideCrosshair",
instance.hideCrosshair())
.setDefaultValue(true)
.setTooltip("tooltip.immersive_hud.hideCrosshair")
.setSaveConsumer(val -> instance.hideCrosshair(val))
.build());
general.addEntry(entryBuilder.startDoubleField( general.addEntry(entryBuilder.startDoubleField(
"option.immersive_hud.handTime", "option.immersive_hud.handTime",
(float) instance.getHandTime() / TICKS_PER_SECOND) (float) instance.getHandTime() / TICKS_PER_SECOND)
@@ -138,6 +146,14 @@ 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(
"option.immersive_hud.hideHands",
instance.hideHands())
.setDefaultValue(true)
.setTooltip("tooltip.immersive_hud.hideHands")
.setSaveConsumer(val -> instance.hideHands(val))
.build());
general.addEntry(entryBuilder.startDoubleField( general.addEntry(entryBuilder.startDoubleField(
"option.immersive_hud.minHealth", "option.immersive_hud.minHealth",
instance.getMinHealth()) instance.getMinHealth())

View File

@@ -356,50 +356,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;
} }
@@ -422,37 +426,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;
} }
@@ -484,7 +492,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;
@@ -900,7 +908,9 @@ public class TimerUtils
if (experienceTime > 0) if (experienceTime > 0)
{ {
RenderSystem.pushMatrix(); RenderSystem.pushMatrix();
RenderSystem.translatef(0F, TimerUtils.getExperienceTranslation(), 0F); RenderSystem.translatef(0F,
TimerUtils.getExperienceTranslation(),
0F);
setAlpha(Main.getAlpha(experienceTime, setAlpha(Main.getAlpha(experienceTime,
experience.getMaxTime(), experience.getMaxTime(),
experience.getFadeInTime(), experience.getFadeInTime(),

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

@@ -44,7 +44,7 @@ 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 static final Logger LOGGER = LogManager.getLogger(HudHook.class);
private StatusEffectInstance currentEffect; private StatusEffectInstance currentEffect;
@@ -60,11 +60,22 @@ public class HudHook
cancellable = true) cancellable = true)
public void startCrosshair(CallbackInfo callbackInfo) public void startCrosshair(CallbackInfo callbackInfo)
{ {
logger.debug("Starting crosshair"); LOGGER.debug("Starting crosshair");
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#renderCrosshair " +
"event",
e);
} }
} }
@@ -79,11 +90,22 @@ public class HudHook
@Inject(method = "renderCrosshair", at = @At(value = "TAIL")) @Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
public void finishCrosshair(CallbackInfo callbackInfo) public void finishCrosshair(CallbackInfo callbackInfo)
{ {
logger.debug("Finishing crosshair"); LOGGER.debug("Finishing crosshair");
/* 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 +120,22 @@ public class HudHook
cancellable = true) cancellable = true)
public void startJumpbar(int x, CallbackInfo callbackInfo) public void startJumpbar(int x, CallbackInfo callbackInfo)
{ {
logger.debug("Starting jumpbar"); LOGGER.debug("Starting jumpbar");
if (TimerUtils.drawJumpbar(MinecraftClient.getInstance().getTickDelta())) try
{ {
callbackInfo.cancel(); if (TimerUtils.drawJumpbar(MinecraftClient.getInstance()
.getTickDelta()))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountJumpBar " +
"event",
e);
} }
} }
@@ -118,12 +152,23 @@ public class HudHook
int x, int x,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
logger.debug("Finishing jumpbar"); LOGGER.debug("Finishing jumpbar");
RenderSystem.popMatrix(); try
/* {
* Resets the color so that nothing else is bothered. RenderSystem.popMatrix();
*/ /*
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);
}
} }
/** /**
@@ -138,10 +183,22 @@ public class HudHook
cancellable = true) cancellable = true)
public void startExperience(int x, CallbackInfo callbackInfo) public void startExperience(int x, CallbackInfo callbackInfo)
{ {
logger.debug("Starting experience bar"); LOGGER.debug("Starting experience bar");
if (TimerUtils.drawExperience(MinecraftClient.getInstance().getTickDelta())) try
{ {
callbackInfo.cancel(); if (TimerUtils.drawExperience(MinecraftClient.getInstance()
.getTickDelta()))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderExperienceBar " +
"event",
e);
} }
} }
@@ -156,27 +213,48 @@ public class HudHook
@Inject(method = "renderExperienceBar", at = @At(value = "TAIL")) @Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
public void finishExperience(int x, CallbackInfo callbackInfo) public void finishExperience(int x, CallbackInfo callbackInfo)
{ {
logger.debug("Finishing experience bar"); LOGGER.debug("Finishing experience bar");
RenderSystem.popMatrix(); try
/* {
* Resets the color so that nothing else is bothered. RenderSystem.popMatrix();
*/ /*
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);
}
} }
/** /**
* Changes the position of the status bars as the ones below them move up * Changes the position of the status bars as the ones below them move up
* and down. * and down.
* *
*
* @return The same matrix stack, with a new matrix pushed onto it. * @return The same matrix stack, with a new matrix pushed onto it.
*/ */
@Inject(method = "renderStatusBars", at = @At("HEAD")) @Inject(method = "renderStatusBars", at = @At("HEAD"))
public void startStatus(CallbackInfo info) public void startStatus(CallbackInfo info)
{ {
logger.debug("Starting status bars"); LOGGER.debug("Starting status bars");
RenderSystem.pushMatrix(); try
RenderSystem.translatef(0F, TimerUtils.getHealthTranslation(), 0F); {
RenderSystem.pushMatrix();
RenderSystem.translatef(0F, TimerUtils.getHealthTranslation(), 0F);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
} }
/** /**
@@ -190,10 +268,21 @@ public class HudHook
"(Ljava/lang/String;)V")) "(Ljava/lang/String;)V"))
public void renderArmor(CallbackInfo callbackInfo) public void renderArmor(CallbackInfo callbackInfo)
{ {
logger.debug("Rendering armor"); LOGGER.debug("Rendering armor");
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);
} }
} }
@@ -209,14 +298,26 @@ public class HudHook
ordinal = 0)) ordinal = 0))
public void renderHealth(CallbackInfo callbackInfo) public void renderHealth(CallbackInfo callbackInfo)
{ {
logger.debug("Rendering health"); LOGGER.debug("Rendering health");
/* 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);
} }
} }
@@ -225,19 +326,32 @@ public class HudHook
* *
* @param callbackInfo * @param callbackInfo
*/ */
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE", target = "Lnet" + @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
target = "Lnet" +
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
ordinal = 1)) ordinal = 1))
public void renderFood(CallbackInfo callbackInfo) public void renderFood(CallbackInfo callbackInfo)
{ {
logger.debug("Rendering food"); LOGGER.debug("Rendering food");
/* 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);
} }
} }
@@ -246,23 +360,46 @@ public class HudHook
* *
* @param callbackInfo * @param callbackInfo
*/ */
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE", target = "Lnet" + @Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
target = "Lnet" +
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", "/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
ordinal = 2)) ordinal = 2))
public void renderAir(CallbackInfo callbackInfo) public void renderAir(CallbackInfo callbackInfo)
{ {
logger.debug("Rendering air"); LOGGER.debug("Rendering air");
/* 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);
}
} }
@Inject(method = "renderStatusBars", at = @At("TAIL")) @Inject(method = "renderStatusBars", at = @At("TAIL"))
public void finishStatus(CallbackInfo info) public void finishStatus(CallbackInfo info)
{ {
logger.debug("Finishing status bars"); LOGGER.debug("Finishing status bars");
RenderSystem.popMatrix(); try
{
RenderSystem.popMatrix();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
} }
/** /**
@@ -277,13 +414,25 @@ public class HudHook
cancellable = true) cancellable = true)
public void startMountHealth(CallbackInfo callbackInfo) public void startMountHealth(CallbackInfo callbackInfo)
{ {
if (TimerUtils.drawMountHealth(MinecraftClient.getInstance().getTickDelta())) try
{ {
callbackInfo.cancel(); if (TimerUtils.drawMountHealth(MinecraftClient.getInstance()
.getTickDelta()))
{
callbackInfo.cancel();
}
else
{
LOGGER.debug("Starting mount health");
}
} }
else catch (Exception e)
{ {
logger.debug("Starting mount health"); LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountHealth " +
"event",
e);
} }
} }
@@ -298,12 +447,23 @@ public class HudHook
@Inject(method = "renderMountHealth", at = @At(value = "TAIL")) @Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
public void finishMountHealth(CallbackInfo callbackInfo) public void finishMountHealth(CallbackInfo callbackInfo)
{ {
logger.debug("Finishing mount health"); LOGGER.debug("Finishing mount health");
/* try
* Resets the color so that nothing else is bothered. {
*/ /*
RenderSystem.popMatrix(); * Resets the color so that nothing else is bothered.
TimerUtils.resetAlpha(); */
RenderSystem.popMatrix();
TimerUtils.resetAlpha();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountHealth " +
"event",
e);
}
} }
/** /**
@@ -316,10 +476,21 @@ public class HudHook
@At(value = "HEAD", shift = At.Shift.AFTER)) @At(value = "HEAD", shift = At.Shift.AFTER))
public void startPotion(CallbackInfo info) public void startPotion(CallbackInfo info)
{ {
logger.debug("Starting potions"); LOGGER.debug("Starting potions");
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);
}
} }
/** /**
@@ -335,10 +506,22 @@ public class HudHook
"shouldShowIcon()Z")) "shouldShowIcon()Z"))
public boolean shouldRenderPotion(StatusEffectInstance effect) public boolean shouldRenderPotion(StatusEffectInstance effect)
{ {
logger.debug("Updating potions"); LOGGER.debug("Updating potions");
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;
} }
/** /**
@@ -353,8 +536,20 @@ public class HudHook
@At(value = "STORE")) @At(value = "STORE"))
public float updatePotion(float f) public float updatePotion(float f)
{ {
logger.debug("Adjusting potions"); LOGGER.debug("Adjusting potions");
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;
} }
/** /**
@@ -368,11 +563,22 @@ public class HudHook
@Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL")) @Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL"))
public void finishPotion(CallbackInfo callbackInfo) public void finishPotion(CallbackInfo callbackInfo)
{ {
logger.debug("Finishing potions"); LOGGER.debug("Finishing potions");
/* 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);
}
} }
/** /**
@@ -389,10 +595,21 @@ public class HudHook
public void startHotbar(float tickDelta, public void startHotbar(float tickDelta,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
logger.debug("Starting hotbar"); LOGGER.debug("Starting hotbar");
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);
} }
} }
@@ -411,8 +628,19 @@ public class HudHook
public void adjustHotbar(float tickDelta, public void adjustHotbar(float tickDelta,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
logger.debug("Adjusting hotbar"); LOGGER.debug("Adjusting hotbar");
TimerUtils.recolorHotbar(); try
{
TimerUtils.recolorHotbar();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderHotbar " +
"event",
e);
}
} }
/** /**
@@ -428,11 +656,21 @@ public class HudHook
public void finishHotbar(float tickDelta, public void finishHotbar(float tickDelta,
CallbackInfo callbackInfo) CallbackInfo callbackInfo)
{ {
logger.debug("Finishing hotbar"); LOGGER.debug("Finishing hotbar");
RenderSystem.popMatrix(); try
/* {
* Resets the color so that nothing else is bothered. RenderSystem.popMatrix();
*/ /*
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"