Compare commits

..

4 Commits

Author SHA1 Message Date
Markil3
929aeec7ba Gets ready for release 1.1 2021-04-01 12:57:15 -06:00
Markil3
2eff4a4bb2 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:25:55 -06:00
Markil3
83d17c1037 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:24:23 -06:00
Markil3
b2329a34a9 Fixes a ClassCastException (#1) 2021-03-25 17:11:44 -06:00
7 changed files with 505 additions and 156 deletions

View File

@@ -12,6 +12,6 @@ modmenu_version=1.6.3-95
autoconfig_version=2.2.0
# Mod Properties
mod_version = 1.0
mod_version = 1.1
maven_group = markil3
archives_base_name = immersive_hud

View File

@@ -84,7 +84,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;
@@ -186,6 +188,16 @@ 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.
*
@@ -196,6 +208,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.
*
@@ -238,6 +260,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.
*
@@ -248,6 +280,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.
*

View File

@@ -354,6 +354,9 @@ public class TimerUtils
{
final float HAND_UP_TIME = 20F;
boolean hideHands = ConfigManager.getInstance().hideHands();
if (hideHands)
{
switch (hand)
{
case OFF_HAND:
@@ -397,6 +400,7 @@ public class TimerUtils
}
break;
}
}
return false;
}
@@ -418,6 +422,9 @@ public class TimerUtils
boolean changed = false;
boolean canceled = false;
boolean hideCrosshair = ConfigManager.getInstance().hideCrosshair();
if (hideCrosshair)
{
if (mc.hitResult != null && mc.hitResult
.getType() != HitResult.Type.MISS)
{
@@ -450,6 +457,7 @@ public class TimerUtils
{
crosshairTime -= ticks;
}
}
return canceled;
}
@@ -480,7 +488,7 @@ public class TimerUtils
LivingEntity mount;
boolean changed = false;
if (tmp == null)
if (tmp == null || !(tmp instanceof LivingEntity))
{
mountHealth = -1;
mountMaxHealth = -1;

View File

@@ -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.
*
@@ -48,9 +53,20 @@ public class ClientPlayerHook
*/
@Inject(method = "swingHand", at = @At(value = "TAIL"))
public void swingHand(Hand hand, CallbackInfo callbackInfo)
{
try
{
TimerUtils.onClick(hand, hand == null);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.network" +
".ClientPlayerEntity#swingHand " +
"event",
e);
}
}
/**
* Updates hand timing every time an item is used.
@@ -62,9 +78,20 @@ public class ClientPlayerHook
*/
@Inject(method = "setCurrentHand", at = @At(value = "TAIL"))
public void setCurrentHand(Hand hand, CallbackInfo callbackInfo)
{
try
{
TimerUtils.onClick(hand, hand == null);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.network" +
".ClientPlayerEntity#setCurrentHand " +
"event",
e);
}
}
/**
* Updates hand timing every the hand is no longer being used.
@@ -75,6 +102,8 @@ public class ClientPlayerHook
*/
@Inject(method = "clearActiveItem", at = @At(value = "HEAD"))
public void clearActiveItem(CallbackInfo callbackInfo)
{
try
{
if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
{
@@ -82,4 +111,13 @@ public class ClientPlayerHook
.getActiveHand(), true);
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.network" +
".ClientPlayerEntity#clearActiveItem " +
"event",
e);
}
}
}

View File

@@ -21,6 +21,8 @@ import net.minecraft.client.render.FirstPersonRenderer;
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;
@@ -38,6 +40,8 @@ import markil3.immersive_hud.TimerUtils;
@Mixin(FirstPersonRenderer.class)
public class HeldItemHook
{
private static final Logger LOGGER = LogManager.getLogger(HeldItemHook.class);
/**
* Determines whether or not to render a certain hand.
*
@@ -60,11 +64,22 @@ public class HeldItemHook
ItemStack itemStack,
float i,
CallbackInfo callbackInfo)
{
try
{
if (TimerUtils.onRenderHand(hand, f))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.render" +
".FirstPersonRenderer#renderFirstPersonItem " +
"event",
e);
}
}
}

View File

@@ -44,7 +44,7 @@ import markil3.immersive_hud.TimerUtils;
@Mixin(InGameHud.class)
public class HudHook
{
private static final Logger logger = LogManager.getLogger(HudHook.class);
private static final Logger LOGGER = LogManager.getLogger(HudHook.class);
private StatusEffectInstance currentEffect;
@@ -60,13 +60,24 @@ public class HudHook
cancellable = true)
public void startCrosshair(CallbackInfo callbackInfo)
{
logger.debug("Starting crosshair");
LOGGER.debug("Starting crosshair");
try
{
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);
}
}
/**
* Resets any changes from drawing the crosshair.
@@ -79,12 +90,23 @@ public class HudHook
@Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
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();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderCrosshair " +
"event",
e);
}
}
/**
* Determines whether or not to draw the horse jump bar.
@@ -98,12 +120,24 @@ public class HudHook
cancellable = true)
public void startJumpbar(int x, CallbackInfo callbackInfo)
{
logger.debug("Starting jumpbar");
if (TimerUtils.drawJumpbar(MinecraftClient.getInstance().getTickDelta()))
LOGGER.debug("Starting jumpbar");
try
{
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);
}
}
/**
* Resets any changes from drawing the horse jump bar.
@@ -118,13 +152,24 @@ public class HudHook
int x,
CallbackInfo callbackInfo)
{
logger.debug("Finishing jumpbar");
LOGGER.debug("Finishing jumpbar");
try
{
GlStateManager.popMatrix();
/*
* 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);
}
}
/**
* Determines whether or not to draw the experience bar.
@@ -138,12 +183,24 @@ public class HudHook
cancellable = true)
public void startExperience(int x, CallbackInfo callbackInfo)
{
logger.debug("Starting experience bar");
if (TimerUtils.drawExperience(MinecraftClient.getInstance().getTickDelta()))
LOGGER.debug("Starting experience bar");
try
{
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);
}
}
/**
* Resets any changes from drawing the experience bar.
@@ -156,27 +213,50 @@ public class HudHook
@Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
public void finishExperience(int x, CallbackInfo callbackInfo)
{
logger.debug("Finishing experience bar");
LOGGER.debug("Finishing experience bar");
try
{
GlStateManager.popMatrix();
/*
* 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
* and down.
*
*
* @return The same matrix stack, with a new matrix pushed onto it.
*/
@Inject(method = "renderStatusBars", at = @At("HEAD"))
public void startStatus(CallbackInfo info)
{
logger.debug("Starting status bars");
LOGGER.debug("Starting status bars");
try
{
GlStateManager.pushMatrix();
GlStateManager.translatef(0F, TimerUtils.getHealthTranslation(), 0F);
GlStateManager.translatef(0F,
TimerUtils.getHealthTranslation(),
0F);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
}
/**
@@ -190,12 +270,23 @@ public class HudHook
"(Ljava/lang/String;)V"))
public void renderArmor(CallbackInfo callbackInfo)
{
logger.debug("Rendering armor");
LOGGER.debug("Rendering armor");
try
{
if (TimerUtils.drawArmor())
{
TimerUtils.setAlpha(0F);
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
}
/**
* Adjusts the health GUI.
@@ -209,61 +300,111 @@ public class HudHook
ordinal = 0))
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()))
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);
}
}
/**
* Adjusts the food GUI.
*
* @param callbackInfo
*/
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE", target = "Lnet" +
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
target = "Lnet" +
"/minecraft/util/profiler/Profiler;swap" +
"(Ljava/lang/String;)V",
ordinal = 1))
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()))
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);
}
}
/**
* Resets the air GUI.
*
* @param callbackInfo
*/
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE", target = "Lnet" +
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
target = "Lnet" +
"/minecraft/util/profiler/Profiler;swap" +
"(Ljava/lang/String;)V",
ordinal = 2))
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);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
}
@Inject(method = "renderStatusBars", at = @At("TAIL"))
public void finishStatus(CallbackInfo info)
{
logger.debug("Finishing status bars");
LOGGER.debug("Finishing status bars");
try
{
GlStateManager.popMatrix();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
}
/**
* Determines whether or not to draw the mount's health.
@@ -277,13 +418,25 @@ public class HudHook
cancellable = true)
public void startMountHealth(CallbackInfo callbackInfo)
{
if (TimerUtils.drawMountHealth(MinecraftClient.getInstance().getTickDelta()))
try
{
if (TimerUtils.drawMountHealth(MinecraftClient.getInstance()
.getTickDelta()))
{
callbackInfo.cancel();
}
else
{
logger.debug("Starting mount health");
LOGGER.debug("Starting mount health");
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountHealth " +
"event",
e);
}
}
@@ -298,13 +451,24 @@ public class HudHook
@Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
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.
*/
GlStateManager.popMatrix();
TimerUtils.resetAlpha();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountHealth " +
"event",
e);
}
}
/**
* Makes the actual adjustment to the hotbar as needed.
@@ -316,11 +480,22 @@ public class HudHook
@At(value = "HEAD", shift = At.Shift.AFTER))
public void startPotion(CallbackInfo info)
{
logger.debug("Starting potions");
LOGGER.debug("Starting potions");
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);
}
}
/**
* Makes the actual adjustment to the hotbar as needed.
@@ -335,11 +510,23 @@ public class HudHook
"shouldShowIcon()Z"))
public boolean shouldRenderPotion(StatusEffectInstance effect)
{
logger.debug("Updating potions");
LOGGER.debug("Updating potions");
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;
}
/**
* Makes the actual adjustment to the hotbar as needed.
@@ -353,9 +540,21 @@ public class HudHook
@At(value = "STORE"))
public float updatePotion(float f)
{
logger.debug("Adjusting potions");
LOGGER.debug("Adjusting potions");
try
{
return TimerUtils.getPotionAlpha(currentEffect);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusEffectOverlay " +
"event",
e);
}
return 1F;
}
/**
* Resets any changes from drawing the potion effects.
@@ -368,12 +567,23 @@ public class HudHook
@Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL"))
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();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusEffectOverlay " +
"event",
e);
}
}
/**
* Determines whether or not to draw the hotbar.
@@ -389,12 +599,23 @@ public class HudHook
public void startHotbar(float tickDelta,
CallbackInfo callbackInfo)
{
logger.debug("Starting hotbar");
LOGGER.debug("Starting hotbar");
try
{
if (TimerUtils.updateHotbar(tickDelta))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderHotbar " +
"event",
e);
}
}
/**
* Makes the actual adjustment to the hotbar as needed.
@@ -411,9 +632,20 @@ public class HudHook
public void adjustHotbar(float tickDelta,
CallbackInfo callbackInfo)
{
logger.debug("Adjusting hotbar");
LOGGER.debug("Adjusting hotbar");
try
{
TimerUtils.recolorHotbar();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderHotbar " +
"event",
e);
}
}
/**
* Resets any changes from drawing the hotbar.
@@ -428,11 +660,21 @@ public class HudHook
public void finishHotbar(float tickDelta,
CallbackInfo callbackInfo)
{
logger.debug("Finishing hotbar");
LOGGER.debug("Finishing hotbar");
try
{
GlStateManager.popMatrix();
/*
* 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.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"