markil3/MinecraftImmersiveHUD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catches any errors that occur when triggering events.

Browse Source 
It is pretty annoying for the game to crash because of a GUI mod. This should reduce that.
This commit is contained in:
Markil3
2021-03-26 10:18:00 -06:00
parent a6b05ba15a
commit 7195d8ac0d
3 changed files with 393 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/markil3/immersive_hud/mixin/ClientPlayerHook.java
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);
}
}
}

16
src/main/java/markil3/immersive_hud/mixin/HeldItemHook.java
View File

@@ -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.
*
@@ -71,11 +76,22 @@ public class HeldItemHook
VertexConsumerProvider vertexConsumers,
int light,
CallbackInfo callbackInfo)
{
try
{
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);
}
}
}

298
src/main/java/markil3/immersive_hud/mixin/HudHook.java
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
{
RenderSystem.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,28 +213,49 @@ 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
{
RenderSystem.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
{
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);
}
}
/**
* Adjusts the armor GUI.
@@ -190,12 +268,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 +298,109 @@ 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" +
@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" +
@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
{
RenderSystem.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 +414,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 +447,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.
*/
RenderSystem.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 +476,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 +506,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 +536,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 +563,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 +595,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 +628,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 +656,21 @@ public class HudHook
public void finishHotbar(float tickDelta,
CallbackInfo callbackInfo)
{
logger.debug("Finishing hotbar");
LOGGER.debug("Finishing hotbar");
try
{
RenderSystem.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);
}
}
}