Compare commits
8 Commits
v1.1.1-1.1
...
v1.2-1.15-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70f534e033 | ||
|
|
50fad9acfd | ||
|
|
2403546896 | ||
|
|
7d67a0445a | ||
|
|
f054a5aa20 | ||
|
|
93548ae7a7 | ||
|
|
7195d8ac0d | ||
|
|
a6b05ba15a |
@@ -12,6 +12,6 @@ modmenu_version=1.8.4+build.20
|
||||
autoconfig_version=2.2.0
|
||||
|
||||
# Mod Properties
|
||||
mod_version = 1.0
|
||||
mod_version = 1.2
|
||||
maven_group = markil3
|
||||
archives_base_name = immersive_hud
|
||||
|
||||
@@ -1,11 +1,19 @@
|
||||
package markil3.immersive_hud;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
||||
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||
|
||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Configuration manager of this mod, which reads from and writes to this mod's
|
||||
* configuration file.
|
||||
@@ -82,10 +90,13 @@ 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;
|
||||
private Identifier[] ignoredItems = new Identifier[]{Registry.ITEM.getId(Items.FIREWORK_ROCKET)};
|
||||
|
||||
/**
|
||||
* Returns the instance of this class.
|
||||
@@ -184,6 +195,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.
|
||||
*
|
||||
@@ -194,6 +215,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.
|
||||
*
|
||||
@@ -226,6 +257,16 @@ public class ConfigManager
|
||||
return this.minHunger;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains a collection of items that won't cause hands and crosshairs to show when used.
|
||||
*
|
||||
* @return A set of ignored items.
|
||||
*/
|
||||
public Set<Item> getIgnoredItems()
|
||||
{
|
||||
return Arrays.stream(ignoredItems).map(Registry.ITEM::get).collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the time that the hands are allowed to display.
|
||||
*
|
||||
@@ -236,6 +277,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 +297,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.
|
||||
*
|
||||
@@ -277,6 +338,16 @@ public class ConfigManager
|
||||
{
|
||||
this.minHunger = MathHelper.clamp(boundary, 0, 20);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets which items won't cause the hands and crosshairs to show when used.
|
||||
*
|
||||
* @param items - A set of ignored items.
|
||||
*/
|
||||
public void setIgnoredItems(Item... items)
|
||||
{
|
||||
this.ignoredItems = Arrays.stream(items).map(Registry.ITEM::getId).toArray(Identifier[]::new);
|
||||
}
|
||||
/**
|
||||
* Saves changes to this mod's configuration.
|
||||
*/
|
||||
|
||||
@@ -130,6 +130,14 @@ public class ModMenu implements ModMenuApi
|
||||
.setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
|
||||
.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(
|
||||
"option.immersive_hud.handTime",
|
||||
(float) instance.getHandTime() / TICKS_PER_SECOND)
|
||||
@@ -138,6 +146,14 @@ public class ModMenu implements ModMenuApi
|
||||
.setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
|
||||
.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(
|
||||
"option.immersive_hud.minHealth",
|
||||
instance.getMinHealth())
|
||||
|
||||
@@ -49,6 +49,7 @@ import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Contains the logic for changing the HUD.
|
||||
@@ -250,6 +251,8 @@ public class TimerUtils
|
||||
ConfigManager.getInstance().getExperienceTime();
|
||||
ConfigManager.TimeValues jump =
|
||||
ConfigManager.getInstance().getJumpTime();
|
||||
ConfigManager.TimeValues healthTimes = ConfigManager.getInstance().getHealthTime();
|
||||
ConfigManager.TimeValues hungerTimes = ConfigManager.getInstance().getHungerTime();
|
||||
|
||||
float hotbarAlpha = Main.getAlpha(hotbarTime,
|
||||
hotbar.getMaxTime(),
|
||||
@@ -263,8 +266,21 @@ public class TimerUtils
|
||||
jump.getMaxTime(),
|
||||
jump.getFadeInTime(),
|
||||
jump.getFadeOutTime());
|
||||
float statusAlpha = Main.getAlpha(healthTime,
|
||||
healthTimes.getMaxTime(),
|
||||
healthTimes.getFadeInTime(),
|
||||
healthTimes.getFadeOutTime());
|
||||
statusAlpha = Math.max(statusAlpha, Main.getAlpha(hungerTime,
|
||||
hungerTimes.getMaxTime(),
|
||||
hungerTimes.getFadeInTime(),
|
||||
hungerTimes.getFadeOutTime()));
|
||||
/*
|
||||
* Draw it in its standard location until it is completely transparent, then move it
|
||||
* instantly.
|
||||
*/
|
||||
statusAlpha = (float) Math.ceil(statusAlpha);
|
||||
return 7 * (1 - Math.max(experienceAlpha,
|
||||
jumpAlpha)) + 22 * (1 - hotbarAlpha);
|
||||
jumpAlpha)) + 22 * (1 - hotbarAlpha) + 42 * (1 - statusAlpha);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -274,7 +290,6 @@ public class TimerUtils
|
||||
*
|
||||
* @param hand - The hand being triggered
|
||||
* @param clear - Whether the hand it being enabled or disabled.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static void onClick(Hand hand, boolean clear)
|
||||
@@ -289,6 +304,7 @@ public class TimerUtils
|
||||
LivingEntity entity;
|
||||
Item item;
|
||||
Iterator<ItemStack> hands;
|
||||
Set<Item> ignored;
|
||||
if (mc.getCameraEntity() instanceof LivingEntity)
|
||||
{
|
||||
entity = (LivingEntity) mc.getCameraEntity();
|
||||
@@ -314,6 +330,14 @@ public class TimerUtils
|
||||
.map(ItemStack::getItem)
|
||||
.orElse(null);
|
||||
}
|
||||
if (item != null)
|
||||
{
|
||||
ignored = ConfigManager.getInstance().getIgnoredItems();
|
||||
if (ignored.contains(item))
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
crosshairTime = ConfigManager.getInstance().getCrosshairTime();
|
||||
if (hand == Hand.MAIN_HAND)
|
||||
{
|
||||
@@ -345,9 +369,7 @@ public class TimerUtils
|
||||
*
|
||||
* @param hand - The hand being rendered.
|
||||
* @param matrixStack - The rendering stack.
|
||||
*
|
||||
* @return If true, then don't render this hand at all.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean onRenderHand(Hand hand,
|
||||
@@ -356,6 +378,9 @@ public class TimerUtils
|
||||
{
|
||||
final float HAND_UP_TIME = 20F;
|
||||
|
||||
boolean hideHands = ConfigManager.getInstance().hideHands();
|
||||
if (hideHands)
|
||||
{
|
||||
switch (hand)
|
||||
{
|
||||
case OFF_HAND:
|
||||
@@ -401,6 +426,7 @@ public class TimerUtils
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -409,7 +435,6 @@ public class TimerUtils
|
||||
* needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the crosshair.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawCrosshair(float ticks)
|
||||
@@ -422,6 +447,9 @@ public class TimerUtils
|
||||
boolean changed = false;
|
||||
boolean canceled = false;
|
||||
|
||||
boolean hideCrosshair = ConfigManager.getInstance().hideCrosshair();
|
||||
if (hideCrosshair)
|
||||
{
|
||||
if (mc.crosshairTarget != null && mc.crosshairTarget
|
||||
.getType() != HitResult.Type.MISS)
|
||||
{
|
||||
@@ -454,6 +482,7 @@ public class TimerUtils
|
||||
{
|
||||
crosshairTime -= ticks;
|
||||
}
|
||||
}
|
||||
return canceled;
|
||||
}
|
||||
|
||||
@@ -462,7 +491,6 @@ public class TimerUtils
|
||||
* as needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the mount health bar.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawMountHealth(float ticks)
|
||||
@@ -484,7 +512,7 @@ public class TimerUtils
|
||||
LivingEntity mount;
|
||||
boolean changed = false;
|
||||
|
||||
if (tmp == null)
|
||||
if (tmp == null || !(tmp instanceof LivingEntity))
|
||||
{
|
||||
mountHealth = -1;
|
||||
mountMaxHealth = -1;
|
||||
@@ -594,7 +622,6 @@ public class TimerUtils
|
||||
* Obtains how transparent
|
||||
*
|
||||
* @param effectinstance
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public static float getPotionAlpha(StatusEffectInstance effectinstance)
|
||||
@@ -606,7 +633,8 @@ public class TimerUtils
|
||||
if (effectinstance.getDuration() <= BLINK_TIME)
|
||||
{
|
||||
effectAlpha =
|
||||
MathHelper.sin(7000F / (effectinstance.getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
|
||||
MathHelper.sin(7000F / (effectinstance
|
||||
.getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
|
||||
.getDuration() + 100F) + 0.5F;
|
||||
}
|
||||
else if (effectinstance.getDuration() <= BLINK_TIME + potion.getFadeInTime())
|
||||
@@ -631,7 +659,6 @@ public class TimerUtils
|
||||
* needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the armor bar.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawArmor()
|
||||
@@ -659,7 +686,6 @@ public class TimerUtils
|
||||
* needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the health.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawHealth(float ticks)
|
||||
@@ -735,7 +761,6 @@ public class TimerUtils
|
||||
* needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the hunger bar.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawHunger(float ticks)
|
||||
@@ -814,7 +839,6 @@ public class TimerUtils
|
||||
* as needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the jump bar.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawJumpbar(float ticks)
|
||||
@@ -861,7 +885,6 @@ public class TimerUtils
|
||||
* as needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the experience bar.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawExperience(float ticks)
|
||||
@@ -900,7 +923,9 @@ public class TimerUtils
|
||||
if (experienceTime > 0)
|
||||
{
|
||||
RenderSystem.pushMatrix();
|
||||
RenderSystem.translatef(0F, TimerUtils.getExperienceTranslation(), 0F);
|
||||
RenderSystem.translatef(0F,
|
||||
TimerUtils.getExperienceTranslation(),
|
||||
0F);
|
||||
setAlpha(Main.getAlpha(experienceTime,
|
||||
experience.getMaxTime(),
|
||||
experience.getFadeInTime(),
|
||||
@@ -916,7 +941,6 @@ public class TimerUtils
|
||||
* or not to draw it.
|
||||
*
|
||||
* @return If true, then cancel drawing the hotbar.
|
||||
*
|
||||
* @see #recolorHotbar()
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@@ -1137,7 +1161,6 @@ public class TimerUtils
|
||||
* needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the crosshair.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static void recolorHotbar()
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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))
|
||||
ordinal = 1, shift = At.Shift.BY, by = 3))
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
},
|
||||
"mixins": [
|
||||
{
|
||||
"config": "modid.mixins.json",
|
||||
"config": "immersive_hud.mixins.json",
|
||||
"environment": "client"
|
||||
}
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user