7195d8ac0d
It is pretty annoying for the game to crash because of a GUI mod. This should reduce that.
677 lines
19 KiB
Java
677 lines
19 KiB
Java
/**
|
|
* Copyright (C) 2021 Markil 3
|
|
* <p>
|
|
* This program is free software: you can redistribute it and/or modify it under
|
|
* the terms of the GNU General Public License as published by the Free Software
|
|
* Foundation, either version 3 of the License, or (at your option) any later
|
|
* version.
|
|
* <p>
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
* details.
|
|
* <p>
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
package markil3.immersive_hud.mixin;
|
|
|
|
import com.mojang.blaze3d.systems.RenderSystem;
|
|
|
|
import net.minecraft.client.MinecraftClient;
|
|
import net.minecraft.client.gui.hud.InGameHud;
|
|
import net.minecraft.client.network.ClientPlayerEntity;
|
|
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;
|
|
import org.spongepowered.asm.mixin.injection.ModifyVariable;
|
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
|
|
import markil3.immersive_hud.TimerUtils;
|
|
|
|
/**
|
|
* This mixin hooks into the HUD class to modify most of the HUD elements. Note
|
|
* that most of the logic can be found in {@link TimerUtils}.
|
|
*
|
|
* @author Markil 3
|
|
* @version 0.1-1.16.4-fabric
|
|
*/
|
|
@Mixin(InGameHud.class)
|
|
public class HudHook
|
|
{
|
|
private static final Logger LOGGER = LogManager.getLogger(HudHook.class);
|
|
|
|
private StatusEffectInstance currentEffect;
|
|
|
|
/**
|
|
* Determines whether or not to draw the crosshair.
|
|
*
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderCrosshair", at = @At(value = "HEAD"),
|
|
cancellable = true)
|
|
public void startCrosshair(CallbackInfo callbackInfo)
|
|
{
|
|
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.
|
|
*
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
|
|
public void finishCrosshair(CallbackInfo callbackInfo)
|
|
{
|
|
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.
|
|
*
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
|
|
cancellable = true)
|
|
public void startJumpbar(int x, CallbackInfo callbackInfo)
|
|
{
|
|
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.
|
|
*
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderMountJumpBar", at = @At(value = "TAIL"))
|
|
public void finishJumpbar(
|
|
int x,
|
|
CallbackInfo callbackInfo)
|
|
{
|
|
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.
|
|
*
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderExperienceBar", at = @At(value = "HEAD"),
|
|
cancellable = true)
|
|
public void startExperience(int x, CallbackInfo callbackInfo)
|
|
{
|
|
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.
|
|
*
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
|
|
public void finishExperience(int x, CallbackInfo callbackInfo)
|
|
{
|
|
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");
|
|
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.
|
|
*
|
|
* @param callbackInfo
|
|
*/
|
|
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
|
|
target = "Lnet" +
|
|
"/minecraft/util/profiler/Profiler;push" +
|
|
"(Ljava/lang/String;)V"))
|
|
public void renderArmor(CallbackInfo callbackInfo)
|
|
{
|
|
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.
|
|
*
|
|
* @param callbackInfo
|
|
*/
|
|
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
|
|
target = "Lnet" +
|
|
"/minecraft/util/profiler/Profiler;swap" +
|
|
"(Ljava/lang/String;)V",
|
|
ordinal = 0))
|
|
public void renderHealth(CallbackInfo callbackInfo)
|
|
{
|
|
LOGGER.debug("Rendering health");
|
|
try
|
|
{
|
|
/*
|
|
* 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);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* 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",
|
|
ordinal = 1))
|
|
public void renderFood(CallbackInfo callbackInfo)
|
|
{
|
|
LOGGER.debug("Rendering food");
|
|
try
|
|
{
|
|
/*
|
|
* 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);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* 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",
|
|
ordinal = 2))
|
|
public void renderAir(CallbackInfo callbackInfo)
|
|
{
|
|
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");
|
|
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.
|
|
*
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
|
|
cancellable = true)
|
|
public void startMountHealth(CallbackInfo callbackInfo)
|
|
{
|
|
try
|
|
{
|
|
if (TimerUtils.drawMountHealth(MinecraftClient.getInstance()
|
|
.getTickDelta()))
|
|
{
|
|
callbackInfo.cancel();
|
|
}
|
|
else
|
|
{
|
|
LOGGER.debug("Starting mount health");
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
LOGGER.error(
|
|
"Error in running net.minecraft.client.gui.hud" +
|
|
".InGameHud#renderMountHealth " +
|
|
"event",
|
|
e);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Resets any changes from drawing the mount's health.
|
|
*
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
|
|
public void finishMountHealth(CallbackInfo callbackInfo)
|
|
{
|
|
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.
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderStatusEffectOverlay()V", at =
|
|
@At(value = "HEAD", shift = At.Shift.AFTER))
|
|
public void startPotion(CallbackInfo info)
|
|
{
|
|
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.
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Redirect(method = "renderStatusEffectOverlay()V", at =
|
|
@At(value = "INVOKE",
|
|
target =
|
|
"Lnet/minecraft/entity/effect/StatusEffectInstance;" +
|
|
"shouldShowIcon()Z"))
|
|
public boolean shouldRenderPotion(StatusEffectInstance effect)
|
|
{
|
|
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.
|
|
*
|
|
* @param f - The original transparency
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@ModifyVariable(method = "renderStatusEffectOverlay()V", at =
|
|
@At(value = "STORE"))
|
|
public float updatePotion(float f)
|
|
{
|
|
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.
|
|
*
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.2-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL"))
|
|
public void finishPotion(CallbackInfo callbackInfo)
|
|
{
|
|
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.
|
|
*
|
|
* @param tickDelta
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable =
|
|
true)
|
|
public void startHotbar(float tickDelta,
|
|
CallbackInfo callbackInfo)
|
|
{
|
|
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.
|
|
*
|
|
* @param tickDelta
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderHotbar", at = @At(value = "INVOKE", target =
|
|
"Lcom/mojang/blaze3d/systems/RenderSystem;color4f(FFFF)V", shift
|
|
= At.Shift.AFTER))
|
|
public void adjustHotbar(float tickDelta,
|
|
CallbackInfo callbackInfo)
|
|
{
|
|
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.
|
|
*
|
|
* @param tickDelta
|
|
* @param callbackInfo
|
|
*
|
|
* @version 0.2-1.16.4-fabric
|
|
* @since 0.1-1.16.4-fabric
|
|
*/
|
|
@Inject(method = "renderHotbar", at = @At(value = "TAIL"))
|
|
public void finishHotbar(float tickDelta,
|
|
CallbackInfo callbackInfo)
|
|
{
|
|
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);
|
|
}
|
|
}
|
|
}
|