Compare commits
4 Commits
v1.2-1.14-
...
v1.1-1.16.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
93767421ee | ||
|
|
96718b2b57 | ||
|
|
e3c0f1d533 | ||
|
|
6daf696e01 |
@@ -11,6 +11,6 @@ cloth_version=4.11.14
|
||||
modmenu_version=1.16.8
|
||||
|
||||
# Mod Properties
|
||||
mod_version = 1.0
|
||||
mod_version = 1.1
|
||||
maven_group = markil3
|
||||
archives_base_name = immersive_hud
|
||||
|
||||
@@ -82,7 +82,9 @@ public class ConfigManager
|
||||
private TimeValues hungerTime = new TimeValues();
|
||||
private TimeValues effectTime = new TimeValues();
|
||||
private int crosshairTime = 6 * TICKS_PER_SECOND;
|
||||
private boolean hideCrosshair = true;
|
||||
private int handTime = 30 * TICKS_PER_SECOND;
|
||||
private boolean hideHands = true;
|
||||
private boolean showArmor = true;
|
||||
private double minHealth = 0.5;
|
||||
private int minHunger = 17;
|
||||
@@ -183,6 +185,15 @@ public class ConfigManager
|
||||
{
|
||||
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.
|
||||
@@ -194,6 +205,16 @@ public class ConfigManager
|
||||
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.
|
||||
*
|
||||
@@ -236,6 +257,16 @@ public class ConfigManager
|
||||
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.
|
||||
*
|
||||
@@ -246,6 +277,16 @@ public class ConfigManager
|
||||
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.
|
||||
*
|
||||
|
||||
@@ -131,6 +131,15 @@ public class ModMenu implements ModMenuApi
|
||||
.setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
|
||||
.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(
|
||||
"option.immersive_hud.handTime"),
|
||||
(float) instance.getHandTime() / TICKS_PER_SECOND)
|
||||
@@ -140,6 +149,15 @@ public class ModMenu implements ModMenuApi
|
||||
.setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
|
||||
.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(
|
||||
"option.immersive_hud.minHealth"),
|
||||
instance.getMinHealth())
|
||||
|
||||
@@ -360,50 +360,54 @@ public class TimerUtils
|
||||
{
|
||||
final float HAND_UP_TIME = 20F;
|
||||
|
||||
switch (hand)
|
||||
boolean hideHands = ConfigManager.getInstance().hideHands();
|
||||
if (hideHands)
|
||||
{
|
||||
case OFF_HAND:
|
||||
if (offHandTime == 0 && !offHandLock)
|
||||
switch (hand)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if (!offHandLock && (mapLock & 0b01) == 0)
|
||||
{
|
||||
if (offHandTime > 0)
|
||||
case OFF_HAND:
|
||||
if (offHandTime == 0 && !offHandLock)
|
||||
{
|
||||
offHandTime -= ticks;
|
||||
return true;
|
||||
}
|
||||
if (offHandTime < HAND_UP_TIME)
|
||||
else if (!offHandLock && (mapLock & 0b01) == 0)
|
||||
{
|
||||
matrixStack
|
||||
.translate(0,
|
||||
-1.0F * (HAND_UP_TIME - offHandTime) /
|
||||
HAND_UP_TIME,
|
||||
0);
|
||||
if (offHandTime > 0)
|
||||
{
|
||||
offHandTime -= ticks;
|
||||
}
|
||||
if (offHandTime < HAND_UP_TIME)
|
||||
{
|
||||
matrixStack
|
||||
.translate(0,
|
||||
-1.0F * (HAND_UP_TIME - offHandTime) /
|
||||
HAND_UP_TIME,
|
||||
0);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case MAIN_HAND:
|
||||
if (mainHandTime == 0 && !mainHandLock)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if (!mainHandLock && (mapLock & 0b10) == 0)
|
||||
{
|
||||
if (mainHandTime > 0)
|
||||
break;
|
||||
case MAIN_HAND:
|
||||
if (mainHandTime == 0 && !mainHandLock)
|
||||
{
|
||||
mainHandTime -= ticks;
|
||||
return true;
|
||||
}
|
||||
if (mainHandTime < HAND_UP_TIME)
|
||||
else if (!mainHandLock && (mapLock & 0b10) == 0)
|
||||
{
|
||||
matrixStack
|
||||
.translate(0,
|
||||
-1.0F * (HAND_UP_TIME - mainHandTime) /
|
||||
HAND_UP_TIME,
|
||||
0);
|
||||
if (mainHandTime > 0)
|
||||
{
|
||||
mainHandTime -= ticks;
|
||||
}
|
||||
if (mainHandTime < HAND_UP_TIME)
|
||||
{
|
||||
matrixStack
|
||||
.translate(0,
|
||||
-1.0F * (HAND_UP_TIME - mainHandTime) /
|
||||
HAND_UP_TIME,
|
||||
0);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -426,37 +430,41 @@ public class TimerUtils
|
||||
boolean changed = false;
|
||||
boolean canceled = false;
|
||||
|
||||
if (mc.crosshairTarget != null && mc.crosshairTarget
|
||||
.getType() != HitResult.Type.MISS)
|
||||
boolean hideCrosshair = ConfigManager.getInstance().hideCrosshair();
|
||||
if (hideCrosshair)
|
||||
{
|
||||
if (mc.crosshairTarget.getType() == HitResult.Type
|
||||
.ENTITY)
|
||||
if (mc.crosshairTarget != null && mc.crosshairTarget
|
||||
.getType() != HitResult.Type.MISS)
|
||||
{
|
||||
if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
|
||||
.getVehicle())
|
||||
if (mc.crosshairTarget.getType() == HitResult.Type
|
||||
.ENTITY)
|
||||
{
|
||||
if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
|
||||
.getVehicle())
|
||||
{
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
if (changed || mainHandLock || offHandLock || crosshairTime
|
||||
> 0)
|
||||
{
|
||||
setAlpha(Main.getAlpha(crosshairTime > 0 ?
|
||||
crosshairTime :
|
||||
CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
|
||||
}
|
||||
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;
|
||||
}
|
||||
@@ -488,7 +496,7 @@ public class TimerUtils
|
||||
LivingEntity mount;
|
||||
boolean changed = false;
|
||||
|
||||
if (tmp == null)
|
||||
if (tmp == null || !(tmp instanceof LivingEntity))
|
||||
{
|
||||
mountHealth = -1;
|
||||
mountMaxHealth = -1;
|
||||
|
||||
@@ -21,6 +21,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
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.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
@@ -38,6 +40,9 @@ import markil3.immersive_hud.TimerUtils;
|
||||
@Mixin(ClientPlayerEntity.class)
|
||||
public class ClientPlayerHook
|
||||
{
|
||||
private static final Logger LOGGER =
|
||||
LogManager.getLogger(ClientPlayerHook.class);
|
||||
|
||||
/**
|
||||
* Updates hand timing every time an attack is initiated.
|
||||
*
|
||||
@@ -49,7 +54,18 @@ public class ClientPlayerHook
|
||||
@Inject(method = "swingHand", at = @At(value = "TAIL"))
|
||||
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"))
|
||||
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"))
|
||||
public void clearActiveItem(CallbackInfo callbackInfo)
|
||||
{
|
||||
if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
|
||||
try
|
||||
{
|
||||
TimerUtils.onClick(((LivingEntity) MinecraftClient.getInstance().cameraEntity)
|
||||
.getActiveHand(), true);
|
||||
if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
|
||||
{
|
||||
TimerUtils.onClick(((LivingEntity) MinecraftClient.getInstance().cameraEntity)
|
||||
.getActiveHand(), true);
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error(
|
||||
"Error in running net.minecraft.client.network" +
|
||||
".ClientPlayerEntity#clearActiveItem " +
|
||||
"event",
|
||||
e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,6 +23,8 @@ import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.item.ItemStack;
|
||||
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.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
@@ -40,6 +42,9 @@ import markil3.immersive_hud.TimerUtils;
|
||||
@Mixin(HeldItemRenderer.class)
|
||||
public class HeldItemHook
|
||||
{
|
||||
private static final Logger LOGGER =
|
||||
LogManager.getLogger(HeldItemHook.class);
|
||||
|
||||
/**
|
||||
* Determines whether or not to render a certain hand.
|
||||
*
|
||||
@@ -72,9 +77,20 @@ public class HeldItemHook
|
||||
int light,
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -24,6 +24,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
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.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
@@ -43,6 +45,8 @@ import markil3.immersive_hud.TimerUtils;
|
||||
@Mixin(InGameHud.class)
|
||||
public class HudHook
|
||||
{
|
||||
private static final Logger LOGGER = LogManager.getLogger(HudHook.class);
|
||||
|
||||
private StatusEffectInstance currentEffect;
|
||||
|
||||
/**
|
||||
@@ -58,10 +62,21 @@ public class HudHook
|
||||
cancellable = true)
|
||||
public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
{
|
||||
if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
|
||||
.getTickDelta()))
|
||||
try
|
||||
{
|
||||
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"))
|
||||
public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
TimerUtils.resetAlpha();
|
||||
try
|
||||
{
|
||||
/*
|
||||
* 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,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
if (TimerUtils.drawJumpbar(stack,
|
||||
MinecraftClient.getInstance().getTickDelta()))
|
||||
try
|
||||
{
|
||||
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,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
stack.pop();
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
TimerUtils.resetAlpha();
|
||||
try
|
||||
{
|
||||
stack.pop();
|
||||
/*
|
||||
* 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,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
if (TimerUtils.drawExperience(stack,
|
||||
MinecraftClient.getInstance().getTickDelta()))
|
||||
try
|
||||
{
|
||||
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,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
stack.pop();
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
TimerUtils.resetAlpha();
|
||||
try
|
||||
{
|
||||
stack.pop();
|
||||
/*
|
||||
* 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"))
|
||||
public MatrixStack startStatus(MatrixStack stack)
|
||||
{
|
||||
stack.push();
|
||||
stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
|
||||
try
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -197,9 +278,20 @@ public class HudHook
|
||||
"/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
|
||||
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))
|
||||
public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the transparency from the previous call.
|
||||
*/
|
||||
TimerUtils.setAlpha(1F);
|
||||
if (TimerUtils.drawHealth(MinecraftClient.getInstance().getTickDelta()))
|
||||
try
|
||||
{
|
||||
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))
|
||||
public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the transparency from the previous call.
|
||||
*/
|
||||
TimerUtils.setAlpha(1F);
|
||||
if (TimerUtils.drawHunger(MinecraftClient.getInstance().getTickDelta()))
|
||||
try
|
||||
{
|
||||
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))
|
||||
public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
TimerUtils.setAlpha(1F);
|
||||
try
|
||||
{
|
||||
/*
|
||||
* 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" +
|
||||
"/math/MatrixStack;)V", at = @At("TAIL"))
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -286,10 +424,21 @@ public class HudHook
|
||||
cancellable = true)
|
||||
public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
{
|
||||
if (TimerUtils.drawMountHealth(stack,
|
||||
MinecraftClient.getInstance().getTickDelta()))
|
||||
try
|
||||
{
|
||||
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"))
|
||||
public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
stack.pop();
|
||||
TimerUtils.resetAlpha();
|
||||
try
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
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))
|
||||
public void startPotion(MatrixStack effect, CallbackInfo info)
|
||||
{
|
||||
TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
|
||||
((ClientPlayerEntity) MinecraftClient.getInstance().cameraEntity) :
|
||||
null);
|
||||
try
|
||||
{
|
||||
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"))
|
||||
public boolean shouldRenderPotion(StatusEffectInstance effect)
|
||||
{
|
||||
currentEffect = effect;
|
||||
return TimerUtils.updatePotion(effect,
|
||||
MinecraftClient.getInstance().getTickDelta());
|
||||
try
|
||||
{
|
||||
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,
|
||||
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,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
TimerUtils.resetAlpha();
|
||||
try
|
||||
{
|
||||
/*
|
||||
* 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,
|
||||
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,
|
||||
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,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
RenderSystem.popMatrix();
|
||||
stack.pop();
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
TimerUtils.resetAlpha();
|
||||
try
|
||||
{
|
||||
RenderSystem.popMatrix();
|
||||
stack.pop();
|
||||
/*
|
||||
* 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,9 @@
|
||||
"option.immersive_hud.effectFadeIn": "Potion Fade In Time",
|
||||
"option.immersive_hud.effectFadeOut": "Potion Fade Out Time",
|
||||
"option.immersive_hud.crosshairTime": "Crosshair Display Time",
|
||||
"option.immersive_hud.hideCrosshair": "Hide Crosshair",
|
||||
"option.immersive_hud.handTime": "Hand Display Time",
|
||||
"option.immersive_hud.hideHands": "Hide Hands",
|
||||
"option.immersive_hud.minHealth": "Minimum Health Fade",
|
||||
"option.immersive_hud.minHunger": "Minimum Hunger Fade",
|
||||
"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.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.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.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.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"
|
||||
|
||||
Reference in New Issue
Block a user