Compare commits
23 Commits
v0.1-1.16.
...
v1.1.1-1.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7664f7447d | ||
|
|
929aeec7ba | ||
|
|
2eff4a4bb2 | ||
|
|
83d17c1037 | ||
|
|
b2329a34a9 | ||
|
|
be64f84832 | ||
|
|
238d32a27a | ||
|
|
30d3eb9880 | ||
|
|
b9d0d3eaf9 | ||
|
|
d2252917b6 | ||
|
|
95111de1aa | ||
|
|
7be634fc47 | ||
|
|
ddd266a0ab | ||
|
|
c560e50288 | ||
|
|
fb52f20d14 | ||
|
|
8798691dc0 | ||
|
|
37df8eef93 | ||
|
|
9cd7488f67 | ||
|
|
3b42b1729d | ||
|
|
1bf31b7bcd | ||
|
|
b66a152603 | ||
|
|
a54ec64baa | ||
|
|
c11bf47f17 |
14
build.gradle
14
build.gradle
@@ -1,5 +1,5 @@
|
||||
plugins {
|
||||
id 'fabric-loom' version '0.5-SNAPSHOT'
|
||||
id 'fabric-loom' version '0.6-SNAPSHOT'
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
@@ -11,11 +11,8 @@ version = project.mod_version + "-" + project.minecraft_version + "-fabric"
|
||||
group = project.maven_group
|
||||
|
||||
repositories {
|
||||
// Add repositories to retrieve artifacts from in here.
|
||||
// You should only use this when depending on other mods because
|
||||
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
|
||||
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
|
||||
// for more information about repositories.
|
||||
maven { url "https://maven.shedaniel.me/" }
|
||||
maven { url "https://maven.terraformersmc.com/" }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -24,8 +21,9 @@ dependencies {
|
||||
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
|
||||
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
||||
|
||||
// Fabric API. This is technically optional, but you probably want it anyway.
|
||||
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
||||
// modApi "me.shedaniel.cloth:config-2:${project.cloth_version}"
|
||||
modApi "me.sargunvohra.mcmods:autoconfig1u:${project.autoconfig_version}"
|
||||
// modImplementation "io.github.prospector:modmenu:${project.modmenu_version}"
|
||||
|
||||
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
|
||||
// You may need to force-disable transitiveness on them.
|
||||
|
||||
@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
|
||||
|
||||
# Fabric Properties
|
||||
# check these on https://fabricmc.net/use
|
||||
minecraft_version=1.16.4
|
||||
yarn_mappings=1.16.4+build.9
|
||||
loader_version=0.11.1
|
||||
minecraft_version=1.14.3
|
||||
yarn_mappings=1.14.3+build.13
|
||||
loader_version=0.11.2
|
||||
|
||||
cloth_version=2.9.3
|
||||
modmenu_version=1.6.3-95
|
||||
autoconfig_version=2.2.0
|
||||
|
||||
# Mod Properties
|
||||
mod_version = 0.1
|
||||
mod_version = 1.1.1
|
||||
maven_group = markil3
|
||||
archives_base_name = immersive_hud
|
||||
|
||||
# Dependencies
|
||||
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
||||
fabric_version=0.30.3+1.16
|
||||
|
||||
331
src/main/java/markil3/immersive_hud/ConfigManager.java
Normal file
331
src/main/java/markil3/immersive_hud/ConfigManager.java
Normal file
@@ -0,0 +1,331 @@
|
||||
package markil3.immersive_hud;
|
||||
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
|
||||
//import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||
|
||||
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||
|
||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
||||
|
||||
/**
|
||||
* Configuration manager of this mod, which reads from and writes to this mod's
|
||||
* configuration file.
|
||||
* <p>
|
||||
* The methods that change this mod's configuration do not automatically write
|
||||
* those changes to the configuration file on disk. Instead, they only update
|
||||
* the configuration in memory.
|
||||
*
|
||||
* @author Markil 3
|
||||
*/
|
||||
public class ConfigManager
|
||||
{
|
||||
public static class TimeValues
|
||||
{
|
||||
private static final int SHOW_TIME = 6 * TICKS_PER_SECOND;
|
||||
private static final int FADE_IN = TICKS_PER_SECOND / 2;
|
||||
private static final int FADE_OUT = TICKS_PER_SECOND;
|
||||
|
||||
private int maxTime = SHOW_TIME;
|
||||
private int fadeIn = FADE_IN;
|
||||
private int fadeOut = FADE_OUT;
|
||||
|
||||
/**
|
||||
* Obtains the maximum time that the hotbar can be on the screen,
|
||||
* including fading.
|
||||
*
|
||||
* @return The maximum hotbar display time.
|
||||
*/
|
||||
public int getMaxTime()
|
||||
{
|
||||
return this.maxTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains the time that the hotbar takes to fade in.
|
||||
*
|
||||
* @return The hotbar fade in time.
|
||||
*/
|
||||
public int getFadeInTime()
|
||||
{
|
||||
return this.fadeIn;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains the time that the hotbar takes to fade out.
|
||||
*
|
||||
* @return The hotbar fade out time.
|
||||
*/
|
||||
public int getFadeOutTime()
|
||||
{
|
||||
return this.fadeOut;
|
||||
}
|
||||
|
||||
public void setMaxTime(int time)
|
||||
{
|
||||
this.maxTime = time;
|
||||
}
|
||||
|
||||
public void setFadeInTime(int time)
|
||||
{
|
||||
this.fadeIn = time;
|
||||
}
|
||||
|
||||
public void setFadeOutTime(int time)
|
||||
{
|
||||
this.fadeOut = time;
|
||||
}
|
||||
}
|
||||
|
||||
private TimeValues hotbarTime = new TimeValues();
|
||||
private TimeValues experienceTime = new TimeValues();
|
||||
private TimeValues jumpTime = new TimeValues();
|
||||
private TimeValues healthTime = new TimeValues();
|
||||
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;
|
||||
|
||||
/**
|
||||
* Returns the instance of this class.
|
||||
*
|
||||
* @return the instance of this class
|
||||
*/
|
||||
public static ConfigManager getInstance()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
|
||||
{
|
||||
return AutoConfig.getConfigHolder(ConfigManagerCloth.class)
|
||||
.getConfig();
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new ClassNotFoundException();
|
||||
}
|
||||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
return new ConfigManager();
|
||||
}
|
||||
}
|
||||
|
||||
// Validations
|
||||
|
||||
/**
|
||||
* Obtains time values related to the hotbar.
|
||||
*
|
||||
* @return The hotbar display time values.
|
||||
*/
|
||||
public TimeValues getHotbarTime()
|
||||
{
|
||||
return this.hotbarTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains time values related to the experience bar.
|
||||
*
|
||||
* @return The experience bar display time values.
|
||||
*/
|
||||
public TimeValues getExperienceTime()
|
||||
{
|
||||
return this.experienceTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains time values related to the jump bar.
|
||||
*
|
||||
* @return The jump display time values.
|
||||
*/
|
||||
public TimeValues getJumpTime()
|
||||
{
|
||||
return this.jumpTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains time values related to the health bar.
|
||||
*
|
||||
* @return The health display time values.
|
||||
*/
|
||||
public TimeValues getHealthTime()
|
||||
{
|
||||
return this.healthTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains time values related to the hunger bar.
|
||||
*
|
||||
* @return The hunger display time values.
|
||||
*/
|
||||
public TimeValues getHungerTime()
|
||||
{
|
||||
return this.hungerTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains time values related to potion effects.
|
||||
*
|
||||
* @return Potion display time values.
|
||||
*/
|
||||
public TimeValues getPotionTime()
|
||||
{
|
||||
return this.effectTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains the time that the crosshairs are allowed to display.
|
||||
*
|
||||
* @return The crosshair display time values.
|
||||
*/
|
||||
public int getCrosshairTime()
|
||||
{
|
||||
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.
|
||||
*
|
||||
* @return The hand display time values.
|
||||
*/
|
||||
public int getHandTime()
|
||||
{
|
||||
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.
|
||||
*
|
||||
* @return Whether or not armor shows on the HUD.
|
||||
*/
|
||||
public boolean shouldShowArmor()
|
||||
{
|
||||
return this.showArmor;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains the minimum health for fading. Anything below that and the health
|
||||
* always displays.
|
||||
*
|
||||
* @return The health boundary, from 0 to 1.
|
||||
*/
|
||||
public double getMinHealth()
|
||||
{
|
||||
return this.minHealth;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains the minimum hunger for fading. Anything below that and the hunger
|
||||
* always displays.
|
||||
*
|
||||
* @return The hunger boundary, from 0 to 20.
|
||||
*/
|
||||
public int getMinHunger()
|
||||
{
|
||||
return this.minHunger;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the time that the hands are allowed to display.
|
||||
*
|
||||
* @param time - The hand display time values.
|
||||
*/
|
||||
public void setCrosshairTime(int time)
|
||||
{
|
||||
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.
|
||||
*
|
||||
* @param time - The hand display time values.
|
||||
*/
|
||||
public void setHandTime(int time)
|
||||
{
|
||||
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.
|
||||
*
|
||||
* @param show - Whether or not armor shows on the HUD.
|
||||
*/
|
||||
public void shouldShowArmor(boolean show)
|
||||
{
|
||||
this.showArmor = show;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the minimum health for fading. Anything below that and the health
|
||||
* always displays.
|
||||
*
|
||||
* @param boundary - The health boundary, from 0 to 1.
|
||||
*/
|
||||
public void setMinHealth(double boundary)
|
||||
{
|
||||
this.minHealth = MathHelper.clamp(boundary, 0, 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the minimum hunger for fading. Anything below that and the hunger
|
||||
* always displays.
|
||||
*
|
||||
* @param boundary - The hunger boundary, from 0 to 20.
|
||||
*/
|
||||
public void setMinHunger(int boundary)
|
||||
{
|
||||
this.minHunger = MathHelper.clamp(boundary, 0, 20);
|
||||
}
|
||||
/**
|
||||
* Saves changes to this mod's configuration.
|
||||
*/
|
||||
// public void save()
|
||||
// {
|
||||
// SPEC.save();
|
||||
// }
|
||||
}
|
||||
14
src/main/java/markil3/immersive_hud/ConfigManagerCloth.java
Normal file
14
src/main/java/markil3/immersive_hud/ConfigManagerCloth.java
Normal file
@@ -0,0 +1,14 @@
|
||||
package markil3.immersive_hud;
|
||||
|
||||
import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
|
||||
|
||||
@Config(name = "immersive_hud")
|
||||
public class ConfigManagerCloth extends ConfigManager implements ConfigData
|
||||
{
|
||||
@Override
|
||||
public void validatePostLoad() throws ConfigData.ValidationException
|
||||
{
|
||||
this.setMinHealth(this.getMinHealth());
|
||||
}
|
||||
}
|
||||
@@ -18,8 +18,12 @@
|
||||
package markil3.immersive_hud;
|
||||
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
import net.minecraft.client.gui.DrawableHelper;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
|
||||
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.serializer.Toml4jConfigSerializer;
|
||||
|
||||
//import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||
//import me.sargunvohra.mcmods.autoconfig1u.serializer.Toml4jConfigSerializer;
|
||||
|
||||
/**
|
||||
* The main entry point for the Immersive HUD mod.
|
||||
@@ -29,9 +33,23 @@ import net.minecraft.client.util.math.MatrixStack;
|
||||
*/
|
||||
public class Main implements ModInitializer
|
||||
{
|
||||
public static final int TICKS_PER_SECOND = 20;
|
||||
|
||||
@Override
|
||||
public void onInitialize()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
|
||||
{
|
||||
AutoConfig.register(ConfigManagerCloth.class,
|
||||
Toml4jConfigSerializer::new);
|
||||
}
|
||||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
// Do nothing
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -45,9 +63,19 @@ public class Main implements ModInitializer
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
static float getAlpha(int renderTime)
|
||||
static float getAlpha(double renderTime,
|
||||
double maxTime,
|
||||
double fadeInTime,
|
||||
double fadeOutTime)
|
||||
{
|
||||
return Math.min(renderTime / 20.0F,
|
||||
1.0F);
|
||||
if (renderTime <= fadeOutTime)
|
||||
{
|
||||
return (float) (renderTime / fadeOutTime);
|
||||
}
|
||||
else if (renderTime > maxTime - fadeInTime)
|
||||
{
|
||||
return (float) ((maxTime - renderTime) / fadeInTime);
|
||||
}
|
||||
return 1F;
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -17,25 +17,22 @@
|
||||
package markil3.immersive_hud.mixin;
|
||||
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.network.AbstractClientPlayerEntity;
|
||||
import net.minecraft.client.network.ClientPlayerEntity;
|
||||
import net.minecraft.client.render.VertexConsumerProvider;
|
||||
import net.minecraft.client.render.item.HeldItemRenderer;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
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;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import markil3.immersive_hud.EventBus;
|
||||
import markil3.immersive_hud.TimerUtils;
|
||||
|
||||
/**
|
||||
* This mixin hooks into the client player class to check for when the hands
|
||||
* move. Note that most of the logic can be found in {@link EventBus}.
|
||||
* move. Note that most of the logic can be found in {@link TimerUtils}.
|
||||
*
|
||||
* @author Markil 3
|
||||
* @version 0.1-1.16.4-fabric
|
||||
@@ -43,6 +40,9 @@ import markil3.immersive_hud.EventBus;
|
||||
@Mixin(ClientPlayerEntity.class)
|
||||
public class ClientPlayerHook
|
||||
{
|
||||
private static final Logger LOGGER =
|
||||
LogManager.getLogger(ClientPlayerHook.class);
|
||||
|
||||
/**
|
||||
* Updates hand timing every time an attack is initiated.
|
||||
*
|
||||
@@ -54,7 +54,18 @@ public class ClientPlayerHook
|
||||
@Inject(method = "swingHand", at = @At(value = "TAIL"))
|
||||
public void swingHand(Hand hand, CallbackInfo callbackInfo)
|
||||
{
|
||||
EventBus.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);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -68,7 +79,18 @@ public class ClientPlayerHook
|
||||
@Inject(method = "setCurrentHand", at = @At(value = "TAIL"))
|
||||
public void setCurrentHand(Hand hand, CallbackInfo callbackInfo)
|
||||
{
|
||||
EventBus.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);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -81,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
|
||||
{
|
||||
EventBus.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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,69 +16,70 @@
|
||||
*/
|
||||
package markil3.immersive_hud.mixin;
|
||||
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
|
||||
import net.minecraft.client.gui.hud.InGameHud;
|
||||
import net.minecraft.client.network.AbstractClientPlayerEntity;
|
||||
import net.minecraft.client.render.VertexConsumerProvider;
|
||||
import net.minecraft.client.render.item.HeldItemRenderer;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
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;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import markil3.immersive_hud.EventBus;
|
||||
import markil3.immersive_hud.TimerUtils;
|
||||
|
||||
/**
|
||||
* This mixin hooks into the hand renderer to make the hands move in and out of
|
||||
* view. Note that most of the logic can be found in {@link EventBus}.
|
||||
* view. Note that most of the logic can be found in {@link TimerUtils}.
|
||||
*
|
||||
* @author Markil 3
|
||||
* @version 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Mixin(HeldItemRenderer.class)
|
||||
@Mixin(FirstPersonRenderer.class)
|
||||
public class HeldItemHook
|
||||
{
|
||||
private static final Logger LOGGER = LogManager.getLogger(HeldItemHook.class);
|
||||
|
||||
/**
|
||||
* Determines whether or not to render a certain hand.
|
||||
*
|
||||
* @param player
|
||||
* @param tickDelta
|
||||
* @param pitch
|
||||
* @param hand
|
||||
* @param swingProgress
|
||||
* @param item
|
||||
* @param equipProgress
|
||||
* @param matrices
|
||||
* @param vertexConsumers
|
||||
* @param light
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/client/util/math/MatrixStack;push()V",
|
||||
shift = At.Shift.AFTER), cancellable = true)
|
||||
public void renderHand(AbstractClientPlayerEntity player,
|
||||
float tickDelta,
|
||||
float pitch,
|
||||
@Inject(method = "renderFirstPersonItem" +
|
||||
"(Lnet/minecraft/client/network/AbstractClientPlayerEntity;" +
|
||||
"FFLnet/minecraft/util/Hand;FLnet/minecraft/item/ItemStack;F)V",
|
||||
at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform" +
|
||||
"/GlStateManager;pushMatrix()V", shift = At.Shift.AFTER),
|
||||
cancellable = true)
|
||||
public void renderHand(AbstractClientPlayerEntity abstractClientPlayerEntity,
|
||||
float f,
|
||||
float g,
|
||||
Hand hand,
|
||||
float swingProgress,
|
||||
ItemStack item,
|
||||
float equipProgress,
|
||||
MatrixStack matrices,
|
||||
VertexConsumerProvider vertexConsumers,
|
||||
int light,
|
||||
float h,
|
||||
ItemStack itemStack,
|
||||
float i,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
if (EventBus.onRenderHand(hand, matrices))
|
||||
try
|
||||
{
|
||||
if (TimerUtils.onRenderHand(hand, f))
|
||||
{
|
||||
callbackInfo.cancel();
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error(
|
||||
"Error in running net.minecraft.client.render" +
|
||||
".FirstPersonRenderer#renderFirstPersonItem " +
|
||||
"event",
|
||||
e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -16,22 +16,27 @@
|
||||
*/
|
||||
package markil3.immersive_hud.mixin;
|
||||
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.hud.InGameHud;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.util.profiler.DummyProfiler;
|
||||
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.EventBus;
|
||||
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 EventBus}.
|
||||
* that most of the logic can be found in {@link TimerUtils}.
|
||||
*
|
||||
* @author Markil 3
|
||||
* @version 0.1-1.16.4-fabric
|
||||
@@ -39,160 +44,576 @@ import markil3.immersive_hud.EventBus;
|
||||
@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 stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderCrosshair", at = @At(value = "HEAD"))
|
||||
public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
@Inject(method = "renderCrosshair", at = @At(value = "HEAD"),
|
||||
cancellable = true)
|
||||
public void startCrosshair(CallbackInfo callbackInfo)
|
||||
{
|
||||
EventBus.drawCrosshair();
|
||||
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 stack - The matrix drawing stack.
|
||||
* @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(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
public void finishCrosshair(CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
RenderSystem.color4f(1, 1, 1, 1F);
|
||||
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 stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"))
|
||||
public void startJumpbar(MatrixStack stack,
|
||||
int x,
|
||||
CallbackInfo callbackInfo)
|
||||
@Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
|
||||
cancellable = true)
|
||||
public void startJumpbar(int x, CallbackInfo callbackInfo)
|
||||
{
|
||||
EventBus.drawJumpbar();
|
||||
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 stack - The matrix drawing stack.
|
||||
* @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(MatrixStack stack,
|
||||
int x,
|
||||
CallbackInfo callbackInfo)
|
||||
public void finishJumpbar(
|
||||
int x,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
RenderSystem.color4f(1, 1, 1, 1F);
|
||||
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.
|
||||
*
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @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(MatrixStack stack,
|
||||
int x,
|
||||
CallbackInfo callbackInfo)
|
||||
public void startExperience(int x, CallbackInfo callbackInfo)
|
||||
{
|
||||
if (EventBus.drawExperience())
|
||||
LOGGER.debug("Starting experience bar");
|
||||
try
|
||||
{
|
||||
callbackInfo.cancel();
|
||||
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 stack - The matrix drawing stack.
|
||||
* @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(MatrixStack stack,
|
||||
int x,
|
||||
CallbackInfo callbackInfo)
|
||||
public void finishExperience(int x, CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
RenderSystem.color4f(1, 1, 1, 1F);
|
||||
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");
|
||||
try
|
||||
{
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.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
|
||||
{
|
||||
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.
|
||||
*
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderMountHealth", at = @At(value = "HEAD"))
|
||||
public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
@Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
|
||||
cancellable = true)
|
||||
public void startMountHealth(CallbackInfo callbackInfo)
|
||||
{
|
||||
EventBus.drawMountHealth();
|
||||
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 stack - The matrix drawing stack.
|
||||
* @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(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
public void finishMountHealth(CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
RenderSystem.color4f(1, 1, 1, 1F);
|
||||
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.
|
||||
*
|
||||
* @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 matrices - The matrix drawing stack.
|
||||
* @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,
|
||||
MatrixStack matrices,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
if (EventBus.updateHotbar())
|
||||
LOGGER.debug("Starting hotbar");
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -200,38 +621,60 @@ public class HudHook
|
||||
* Makes the actual adjustment to the hotbar as needed.
|
||||
*
|
||||
* @param tickDelta
|
||||
* @param matrices - The matrix drawing stack.
|
||||
* @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
|
||||
"Lcom/mojang/blaze3d/platform/GlStateManager;color4f(FFFF)V", shift
|
||||
= At.Shift.AFTER))
|
||||
public void adjustHotbar(float tickDelta,
|
||||
MatrixStack matrices,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
EventBus.recolorHotbar();
|
||||
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 matrices - The matrix drawing stack.
|
||||
* @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,
|
||||
MatrixStack matrices,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
RenderSystem.color4f(1, 1, 1, 1F);
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
/**
|
||||
* 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.util.profiler.DummyProfiler;
|
||||
|
||||
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.callback.CallbackInfo;
|
||||
|
||||
import markil3.immersive_hud.EventBus;
|
||||
|
||||
/**
|
||||
* This class hooks into the profiler to trigger color changes for the status
|
||||
* indicators.
|
||||
*
|
||||
* @author Markil 3
|
||||
* @version 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Mixin(DummyProfiler.class)
|
||||
public class ProfilerHook
|
||||
{
|
||||
/**
|
||||
* Hooks into the profiler to add logic to drawing armor.
|
||||
*
|
||||
* @param section - The profiler section
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "push", at = @At(value = "TAIL"))
|
||||
public void renderArmor(String section, CallbackInfo callbackInfo)
|
||||
{
|
||||
if (section.equals("armor"))
|
||||
{
|
||||
EventBus.drawArmor();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Hooks into the profiler to add logic to drawing status bars besides
|
||||
* armor.
|
||||
*
|
||||
* @param section - The profiler section
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "swap", at = @At(value = "TAIL"))
|
||||
public void renderStatus(String section, CallbackInfo callbackInfo)
|
||||
{
|
||||
switch (section)
|
||||
{
|
||||
case "health":
|
||||
EventBus.drawHealth();
|
||||
break;
|
||||
case "food":
|
||||
EventBus.drawHunger();
|
||||
break;
|
||||
case "air":
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
RenderSystem.color4f(1, 1, 1, 1F);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
53
src/main/resources/assets/immersive_hud/lang/en_us.json
Normal file
53
src/main/resources/assets/immersive_hud/lang/en_us.json
Normal file
@@ -0,0 +1,53 @@
|
||||
{
|
||||
"immersive_hud.configGui.title": "Immersive HUD Configuration",
|
||||
"option.immersive_hud.hotbarMaxTime": "Hotbar Display Time",
|
||||
"option.immersive_hud.hotbarFadeIn": "Hotbar Fade In Time",
|
||||
"option.immersive_hud.hotbarFadeOut": "Hotbar Fade Out Time",
|
||||
"option.immersive_hud.experienceMaxTime": "Experience Display Time",
|
||||
"option.immersive_hud.experienceFadeIn": "Experience Fade In Time",
|
||||
"option.immersive_hud.experienceFadeOut": "Experience Fade Out Time",
|
||||
"option.immersive_hud.jumpMaxTime": "Jump Bar Display Time",
|
||||
"option.immersive_hud.jumpFadeIn": "Jump Bar Fade In Time",
|
||||
"option.immersive_hud.jumpFadeOut": "Jump Bar Fade Out Time",
|
||||
"option.immersive_hud.healthMaxTime": "Health Bar Display Time",
|
||||
"option.immersive_hud.healthFadeIn": "Health Bar Fade In Time",
|
||||
"option.immersive_hud.healthFadeOut": "Health Bar Fade Out Time",
|
||||
"option.immersive_hud.hungerMaxTime": "Hunger Bar Display Time",
|
||||
"option.immersive_hud.hungerFadeIn": "Hunger Bar Fade In Time",
|
||||
"option.immersive_hud.hungerFadeOut": "Hunger Bar Fade Out Time",
|
||||
"option.immersive_hud.effectMaxTime": "Potion Display Time",
|
||||
"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",
|
||||
"tooltip.immersive_hud.hotbarMaxTime": "How long the hotbar can be displayed on screen in seconds",
|
||||
"tooltip.immersive_hud.hotbarFadeIn": "How many seconds it takes for the hotbar to fade in",
|
||||
"tooltip.immersive_hud.hotbarFadeOut": "How many seconds it takes for the hotbar to move out",
|
||||
"tooltip.immersive_hud.experienceMaxTime": "How long the experience bar can be displayed on screen in seconds",
|
||||
"tooltip.immersive_hud.experienceFadeIn": "How many seconds it takes for the experience bar to fade in",
|
||||
"tooltip.immersive_hud.experienceFadeOut": "How many seconds it takes for the experience bar to move out",
|
||||
"tooltip.immersive_hud.jumpMaxTime": "How long the horse jump bar can be displayed on screen in seconds",
|
||||
"tooltip.immersive_hud.jumpFadeIn": "How many seconds it takes for the horse jump bar to fade in",
|
||||
"tooltip.immersive_hud.jumpFadeOut": "How many seconds it takes for the horse jump bar to fade out",
|
||||
"tooltip.immersive_hud.healthMaxTime": "How long the health bar can be displayed on screen in seconds",
|
||||
"tooltip.immersive_hud.healthFadeIn": "How many seconds it takes for the health bar to fade in",
|
||||
"tooltip.immersive_hud.healthFadeOut": "How many seconds it takes for the health bar to fade out",
|
||||
"tooltip.immersive_hud.hungerMaxTime": "How long the hunger bar can be displayed on screen in seconds",
|
||||
"tooltip.immersive_hud.hungerFadeIn": "How many seconds it takes for the hunger bar to fade in",
|
||||
"tooltip.immersive_hud.hungerFadeOut": "How many seconds it takes for the hunger bar to fade out",
|
||||
"tooltip.immersive_hud.effectMaxTime": "How long potion icons can be displayed on screen in seconds",
|
||||
"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"
|
||||
}
|
||||
@@ -9,8 +9,9 @@
|
||||
"Markil 3"
|
||||
],
|
||||
"contact": {
|
||||
"homepage": "https://fabricmc.net/",
|
||||
"sources": "https://github.com/FabricMC/fabric-example-mod"
|
||||
"homepage": "https://www.planetminecraft.com/mod/immersive-hud/",
|
||||
"sources": "https://github.com/Markil3/MinecraftImmersiveHUD",
|
||||
"issues": "https://github.com/Markil3/MinecraftImmersiveHUD/issues"
|
||||
},
|
||||
|
||||
"license": "GPL-3.0-only",
|
||||
@@ -20,18 +21,24 @@
|
||||
"entrypoints": {
|
||||
"main": [
|
||||
"markil3.immersive_hud.Main"
|
||||
],
|
||||
"modmenu": [
|
||||
"markil3.immersive_hud.ModMenu"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
{
|
||||
"config": "modid.mixins.json",
|
||||
"config": "immersive_hud.mixins.json",
|
||||
"environment": "client"
|
||||
}
|
||||
],
|
||||
|
||||
"depends": {
|
||||
"fabricloader": ">=0.7.4",
|
||||
"fabric": "*",
|
||||
"minecraft": "1.16.x"
|
||||
"minecraft": "1.14.x"
|
||||
},
|
||||
"suggests": {
|
||||
"modmenu": "*",
|
||||
"cloth-config2": "*"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,8 +8,7 @@
|
||||
"client": [
|
||||
"ClientPlayerHook",
|
||||
"HeldItemHook",
|
||||
"HudHook",
|
||||
"ProfilerHook"
|
||||
"HudHook"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
Reference in New Issue
Block a user