Compare commits
12 Commits
v1.2-1.16.
...
1.14-fabri
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed84dbd6c7 | ||
|
|
c5d703e748 | ||
|
|
9a2a120352 | ||
|
|
7664f7447d | ||
|
|
929aeec7ba | ||
|
|
2eff4a4bb2 | ||
|
|
83d17c1037 | ||
|
|
b2329a34a9 | ||
|
|
be64f84832 | ||
|
|
238d32a27a | ||
|
|
30d3eb9880 | ||
|
|
b9d0d3eaf9 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -32,3 +32,4 @@ bin/
|
|||||||
|
|
||||||
run/
|
run/
|
||||||
/logs/
|
/logs/
|
||||||
|
/remappedSrc/
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '0.5-SNAPSHOT'
|
id 'fabric-loom' version '0.6-SNAPSHOT'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -21,8 +21,9 @@ dependencies {
|
|||||||
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
|
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
|
||||||
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
||||||
|
|
||||||
modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}"
|
// modApi "me.shedaniel.cloth:config-2:${project.cloth_version}"
|
||||||
modImplementation "com.terraformersmc:modmenu:${project.modmenu_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.
|
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
|
||||||
// You may need to force-disable transitiveness on them.
|
// You may need to force-disable transitiveness on them.
|
||||||
|
|||||||
@@ -3,12 +3,13 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/use
|
# check these on https://fabricmc.net/use
|
||||||
minecraft_version=1.16.4
|
minecraft_version=1.14.3
|
||||||
yarn_mappings=1.16.4+build.9
|
yarn_mappings=1.14.3+build.13
|
||||||
loader_version=0.11.1
|
loader_version=0.11.2
|
||||||
|
|
||||||
cloth_version=4.11.14
|
cloth_version=2.9.3
|
||||||
modmenu_version=1.16.8
|
modmenu_version=1.6.3-95
|
||||||
|
autoconfig_version=2.2.0
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.2
|
mod_version = 1.2
|
||||||
|
|||||||
@@ -6,11 +6,15 @@ import net.minecraft.util.Identifier;
|
|||||||
import net.minecraft.util.math.MathHelper;
|
import net.minecraft.util.math.MathHelper;
|
||||||
import net.minecraft.util.registry.Registry;
|
import net.minecraft.util.registry.Registry;
|
||||||
|
|
||||||
import me.shedaniel.autoconfig.AutoConfig;
|
//import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||||
|
|
||||||
|
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||||
|
|
||||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@@ -107,7 +111,7 @@ public class ConfigManager
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
|
||||||
{
|
{
|
||||||
return AutoConfig.getConfigHolder(ConfigManagerCloth.class)
|
return AutoConfig.getConfigHolder(ConfigManagerCloth.class)
|
||||||
.getConfig();
|
.getConfig();
|
||||||
@@ -194,6 +198,7 @@ public class ConfigManager
|
|||||||
{
|
{
|
||||||
return this.crosshairTime;
|
return this.crosshairTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks whether the crosshairs should be hidden after a period of time.
|
* Checks whether the crosshairs should be hidden after a period of time.
|
||||||
*
|
*
|
||||||
@@ -266,16 +271,6 @@ public class ConfigManager
|
|||||||
return Arrays.stream(ignoredItems).map(Registry.ITEM::get).collect(Collectors.toSet());
|
return Arrays.stream(ignoredItems).map(Registry.ITEM::get).collect(Collectors.toSet());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Obtains a collection of items that won't cause hands and crosshairs to show when used.
|
|
||||||
*
|
|
||||||
* @return An array of identifiers.
|
|
||||||
*/
|
|
||||||
public Identifier[] getIgnoredIdentifiers()
|
|
||||||
{
|
|
||||||
return this.ignoredItems;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the time that the hands are allowed to display.
|
* Sets the time that the hands are allowed to display.
|
||||||
*
|
*
|
||||||
@@ -357,16 +352,6 @@ public class ConfigManager
|
|||||||
{
|
{
|
||||||
this.ignoredItems = Arrays.stream(items).map(Registry.ITEM::getId).toArray(Identifier[]::new);
|
this.ignoredItems = Arrays.stream(items).map(Registry.ITEM::getId).toArray(Identifier[]::new);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets which items won't cause the hands and crosshairs to show when used.
|
|
||||||
*
|
|
||||||
* @param items - A set of ignored items.
|
|
||||||
*/
|
|
||||||
public void setIgnoredItems(String... items)
|
|
||||||
{
|
|
||||||
this.ignoredItems = Arrays.stream(items).map(Identifier::new).filter(i -> Registry.ITEM.getOrEmpty(i).isPresent()).toArray(Identifier[]::new);
|
|
||||||
}
|
|
||||||
/**
|
/**
|
||||||
* Saves changes to this mod's configuration.
|
* Saves changes to this mod's configuration.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
package markil3.immersive_hud;
|
package markil3.immersive_hud;
|
||||||
|
|
||||||
import me.shedaniel.autoconfig.ConfigData;
|
import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
|
||||||
import me.shedaniel.autoconfig.annotation.Config;
|
import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
|
||||||
|
|
||||||
@Config(name = "immersive_hud")
|
@Config(name = "immersive_hud")
|
||||||
public class ConfigManagerCloth extends ConfigManager implements ConfigData
|
public class ConfigManagerCloth extends ConfigManager implements ConfigData
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public void validatePostLoad() throws ValidationException
|
public void validatePostLoad() throws ConfigData.ValidationException
|
||||||
{
|
{
|
||||||
this.setMinHealth(this.getMinHealth());
|
this.setMinHealth(this.getMinHealth());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,8 +19,11 @@ package markil3.immersive_hud;
|
|||||||
|
|
||||||
import net.fabricmc.api.ModInitializer;
|
import net.fabricmc.api.ModInitializer;
|
||||||
|
|
||||||
import me.shedaniel.autoconfig.AutoConfig;
|
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||||
import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
|
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.
|
* The main entry point for the Immersive HUD mod.
|
||||||
@@ -37,7 +40,7 @@ public class Main implements ModInitializer
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
|
||||||
{
|
{
|
||||||
AutoConfig.register(ConfigManagerCloth.class,
|
AutoConfig.register(ConfigManagerCloth.class,
|
||||||
Toml4jConfigSerializer::new);
|
Toml4jConfigSerializer::new);
|
||||||
|
|||||||
@@ -1,232 +0,0 @@
|
|||||||
package markil3.immersive_hud;
|
|
||||||
|
|
||||||
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
|
||||||
import com.terraformersmc.modmenu.api.ModMenuApi;
|
|
||||||
|
|
||||||
import net.minecraft.item.Items;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.InvalidIdentifierException;
|
|
||||||
import net.minecraft.util.registry.Registry;
|
|
||||||
|
|
||||||
import me.shedaniel.autoconfig.AutoConfig;
|
|
||||||
import me.shedaniel.clothconfig2.api.ConfigBuilder;
|
|
||||||
import me.shedaniel.clothconfig2.api.ConfigCategory;
|
|
||||||
import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
|
|
||||||
import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
|
|
||||||
|
|
||||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
public class ModMenu implements ModMenuApi
|
|
||||||
{
|
|
||||||
|
|
||||||
private void startTimeField(String name, ConfigEntryBuilder entryBuilder,
|
|
||||||
ConfigCategory cat,
|
|
||||||
ConfigManager.TimeValues value)
|
|
||||||
{
|
|
||||||
final float SHOW_TIME = 6;
|
|
||||||
final float FADE_IN = 0.25F;
|
|
||||||
final float FADE_OUT = 0.5F;
|
|
||||||
|
|
||||||
DoubleListEntry maxTime =
|
|
||||||
entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud." + name +
|
|
||||||
"MaxTime"),
|
|
||||||
(float) value.getMaxTime() / TICKS_PER_SECOND)
|
|
||||||
.setDefaultValue(SHOW_TIME)
|
|
||||||
.setMin(0)
|
|
||||||
.setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud." + name +
|
|
||||||
"MaxTime"))
|
|
||||||
.setSaveConsumer(val -> value
|
|
||||||
.setMaxTime((int) (val * TICKS_PER_SECOND)))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
DoubleListEntry fadeIn =
|
|
||||||
entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud." + name +
|
|
||||||
"FadeIn"),
|
|
||||||
(float) value.getFadeInTime() / TICKS_PER_SECOND)
|
|
||||||
.setDefaultValue(FADE_IN)
|
|
||||||
.setMin(0)
|
|
||||||
.setMax(10 * 60 * TICKS_PER_SECOND)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud." + name +
|
|
||||||
"FadeIn"))
|
|
||||||
.setSaveConsumer(val -> value
|
|
||||||
.setFadeInTime((int) (val * TICKS_PER_SECOND)))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
DoubleListEntry fadeOut =
|
|
||||||
entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud." + name +
|
|
||||||
"FadeOut"),
|
|
||||||
(float) value.getFadeOutTime() / TICKS_PER_SECOND)
|
|
||||||
.setDefaultValue(FADE_OUT)
|
|
||||||
.setMin(0)
|
|
||||||
.setMax(10 * 60 * TICKS_PER_SECOND)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud." + name +
|
|
||||||
"FadeOut"))
|
|
||||||
.setSaveConsumer(val -> value
|
|
||||||
.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
cat.addEntry(maxTime);
|
|
||||||
cat.addEntry(fadeIn);
|
|
||||||
cat.addEntry(fadeOut);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ConfigScreenFactory<?> getModConfigScreenFactory()
|
|
||||||
{
|
|
||||||
return screen -> {
|
|
||||||
ConfigCategory general;
|
|
||||||
ConfigEntryBuilder entryBuilder;
|
|
||||||
ConfigManager instance = ConfigManager.getInstance();
|
|
||||||
final ConfigBuilder builder = ConfigBuilder.create()
|
|
||||||
.setParentScreen(screen)
|
|
||||||
.setTitle(new TranslatableText(
|
|
||||||
"immersive_hud.configGui.title"))
|
|
||||||
.setSavingRunnable(() -> {
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (Class
|
|
||||||
.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
|
||||||
{
|
|
||||||
AutoConfig
|
|
||||||
.getConfigHolder(ConfigManagerCloth.class)
|
|
||||||
.save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (ClassNotFoundException e)
|
|
||||||
{
|
|
||||||
// Do nothing
|
|
||||||
}
|
|
||||||
});
|
|
||||||
general =
|
|
||||||
builder.getOrCreateCategory(new TranslatableText(
|
|
||||||
"category.immersive_hud.general"));
|
|
||||||
entryBuilder = builder.entryBuilder();
|
|
||||||
|
|
||||||
startTimeField("hotbar", entryBuilder,
|
|
||||||
general,
|
|
||||||
instance.getHotbarTime());
|
|
||||||
startTimeField("experience", entryBuilder,
|
|
||||||
general,
|
|
||||||
instance.getExperienceTime());
|
|
||||||
startTimeField("jump", entryBuilder,
|
|
||||||
general,
|
|
||||||
instance.getJumpTime());
|
|
||||||
startTimeField("jump", entryBuilder,
|
|
||||||
general,
|
|
||||||
instance.getHealthTime());
|
|
||||||
startTimeField("hunger", entryBuilder,
|
|
||||||
general,
|
|
||||||
instance.getHungerTime());
|
|
||||||
startTimeField("effect", entryBuilder,
|
|
||||||
general,
|
|
||||||
instance.getPotionTime());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud" +
|
|
||||||
".crosshairTime"),
|
|
||||||
(float) instance.getCrosshairTime() / TICKS_PER_SECOND)
|
|
||||||
.setDefaultValue(6)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud" +
|
|
||||||
".crosshairTime"))
|
|
||||||
.setSaveConsumer(val -> instance
|
|
||||||
.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
|
||||||
"option.immersive_hud.hideCrosshair"),
|
|
||||||
instance.hideCrosshair())
|
|
||||||
.setDefaultValue(true)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.hideCrosshair"))
|
|
||||||
.setSaveConsumer(val -> instance.hideCrosshair(val))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud.handTime"),
|
|
||||||
(float) instance.getHandTime() / TICKS_PER_SECOND)
|
|
||||||
.setDefaultValue(30)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.handTime"))
|
|
||||||
.setSaveConsumer(val -> instance
|
|
||||||
.setHandTime((int) (val * TICKS_PER_SECOND)))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
|
||||||
"option.immersive_hud.hideHands"),
|
|
||||||
instance.hideHands())
|
|
||||||
.setDefaultValue(true)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.hideHands"))
|
|
||||||
.setSaveConsumer(val -> instance.hideHands(val))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud.minHealth"),
|
|
||||||
instance.getMinHealth())
|
|
||||||
.setDefaultValue(0.5)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.minHealth"))
|
|
||||||
.setSaveConsumer(val -> instance.setMinHealth(val))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startIntField(new TranslatableText(
|
|
||||||
"option.immersive_hud.minHunger"),
|
|
||||||
instance.getMinHunger())
|
|
||||||
.setDefaultValue(17)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.minHunger"))
|
|
||||||
.setSaveConsumer(val -> instance.setMinHunger(val))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
|
||||||
"option.immersive_hud.showArmor"),
|
|
||||||
instance.shouldShowArmor())
|
|
||||||
.setDefaultValue(true)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.showArmor"))
|
|
||||||
.setSaveConsumer(val -> instance.shouldShowArmor(val))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder
|
|
||||||
.startStrList(new TranslatableText("option.immersive_hud.ignoreList"), Arrays
|
|
||||||
.asList(instance
|
|
||||||
.getIgnoredIdentifiers()).stream().map(Identifier::toString)
|
|
||||||
.collect(Collectors.toList()))
|
|
||||||
.setDefaultValue(Arrays
|
|
||||||
.asList(Registry.ITEM.getId(Items.FIREWORK_ROCKET).toString()))
|
|
||||||
.setTooltip(new TranslatableText("tooltip.immersive_hud.ignoreList"))
|
|
||||||
.setSaveConsumer(val -> instance.setIgnoredItems(val.toArray(new String[0]))).setErrorSupplier(val -> {
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Optional<String> item = val.stream().filter(i -> !Registry.ITEM.getOrEmpty(new Identifier(i)).isPresent()).findFirst();
|
|
||||||
if (item.isPresent())
|
|
||||||
{
|
|
||||||
return Optional.of(new TranslatableText("error.immersive_hud.ignoreList.unknownItem"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (InvalidIdentifierException e)
|
|
||||||
{
|
|
||||||
return Optional.of(new TranslatableText("error.immersive_hud.ignoreList.illegalId"));
|
|
||||||
}
|
|
||||||
return Optional.empty();
|
|
||||||
})
|
|
||||||
.build());
|
|
||||||
|
|
||||||
return builder.build();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -16,11 +16,10 @@
|
|||||||
*/
|
*/
|
||||||
package markil3.immersive_hud;
|
package markil3.immersive_hud;
|
||||||
|
|
||||||
import com.mojang.blaze3d.systems.RenderSystem;
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.network.ClientPlayerEntity;
|
import net.minecraft.client.network.ClientPlayerEntity;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.LivingEntity;
|
import net.minecraft.entity.LivingEntity;
|
||||||
import net.minecraft.entity.effect.StatusEffect;
|
import net.minecraft.entity.effect.StatusEffect;
|
||||||
@@ -35,10 +34,11 @@ import net.minecraft.item.FilledMapItem;
|
|||||||
import net.minecraft.item.FishingRodItem;
|
import net.minecraft.item.FishingRodItem;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.item.LingeringPotionItem;
|
||||||
import net.minecraft.item.RangedWeaponItem;
|
import net.minecraft.item.RangedWeaponItem;
|
||||||
import net.minecraft.item.ShieldItem;
|
import net.minecraft.item.ShieldItem;
|
||||||
import net.minecraft.item.SnowballItem;
|
import net.minecraft.item.SnowballItem;
|
||||||
import net.minecraft.item.ThrowablePotionItem;
|
import net.minecraft.item.SplashPotionItem;
|
||||||
import net.minecraft.item.TridentItem;
|
import net.minecraft.item.TridentItem;
|
||||||
import net.minecraft.util.Hand;
|
import net.minecraft.util.Hand;
|
||||||
import net.minecraft.util.hit.EntityHitResult;
|
import net.minecraft.util.hit.EntityHitResult;
|
||||||
@@ -48,6 +48,7 @@ import net.minecraft.util.math.MathHelper;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
@@ -174,7 +175,7 @@ public class TimerUtils
|
|||||||
*/
|
*/
|
||||||
public static void setAlpha(float alpha)
|
public static void setAlpha(float alpha)
|
||||||
{
|
{
|
||||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
|
GlStateManager.color4f(1.0F, 1.0F, 1.0F, alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -290,6 +291,7 @@ public class TimerUtils
|
|||||||
*
|
*
|
||||||
* @param hand - The hand being triggered
|
* @param hand - The hand being triggered
|
||||||
* @param clear - Whether the hand it being enabled or disabled.
|
* @param clear - Whether the hand it being enabled or disabled.
|
||||||
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static void onClick(Hand hand, boolean clear)
|
public static void onClick(Hand hand, boolean clear)
|
||||||
@@ -361,10 +363,6 @@ public class TimerUtils
|
|||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
System.out.println("Unusing hand " + hand);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -372,12 +370,12 @@ public class TimerUtils
|
|||||||
* hands into and out of view as needed.
|
* hands into and out of view as needed.
|
||||||
*
|
*
|
||||||
* @param hand - The hand being rendered.
|
* @param hand - The hand being rendered.
|
||||||
* @param matrixStack - The rendering stack.
|
*
|
||||||
* @return If true, then don't render this hand at all.
|
* @return If true, then don't render this hand at all.
|
||||||
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static boolean onRenderHand(Hand hand,
|
public static boolean onRenderHand(Hand hand,
|
||||||
MatrixStack matrixStack,
|
|
||||||
float ticks)
|
float ticks)
|
||||||
{
|
{
|
||||||
final float HAND_UP_TIME = 20F;
|
final float HAND_UP_TIME = 20F;
|
||||||
@@ -400,10 +398,9 @@ public class TimerUtils
|
|||||||
}
|
}
|
||||||
if (offHandTime < HAND_UP_TIME)
|
if (offHandTime < HAND_UP_TIME)
|
||||||
{
|
{
|
||||||
matrixStack
|
GlStateManager.translatef(0,
|
||||||
.translate(0,
|
(float) (-1.0F * (HAND_UP_TIME - offHandTime) /
|
||||||
-1.0F * (HAND_UP_TIME - offHandTime) /
|
HAND_UP_TIME),
|
||||||
HAND_UP_TIME,
|
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -421,10 +418,9 @@ public class TimerUtils
|
|||||||
}
|
}
|
||||||
if (mainHandTime < HAND_UP_TIME)
|
if (mainHandTime < HAND_UP_TIME)
|
||||||
{
|
{
|
||||||
matrixStack
|
GlStateManager.translatef(0,
|
||||||
.translate(0,
|
(float) (-1.0F * (HAND_UP_TIME - mainHandTime) /
|
||||||
-1.0F * (HAND_UP_TIME - mainHandTime) /
|
HAND_UP_TIME),
|
||||||
HAND_UP_TIME,
|
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -439,6 +435,7 @@ public class TimerUtils
|
|||||||
* needed.
|
* needed.
|
||||||
*
|
*
|
||||||
* @return If true, then cancel drawing the crosshair.
|
* @return If true, then cancel drawing the crosshair.
|
||||||
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static boolean drawCrosshair(float ticks)
|
public static boolean drawCrosshair(float ticks)
|
||||||
@@ -454,13 +451,13 @@ public class TimerUtils
|
|||||||
boolean hideCrosshair = ConfigManager.getInstance().hideCrosshair();
|
boolean hideCrosshair = ConfigManager.getInstance().hideCrosshair();
|
||||||
if (hideCrosshair)
|
if (hideCrosshair)
|
||||||
{
|
{
|
||||||
if (mc.crosshairTarget != null && mc.crosshairTarget
|
if (mc.hitResult != null && mc.hitResult
|
||||||
.getType() != HitResult.Type.MISS)
|
.getType() != HitResult.Type.MISS)
|
||||||
{
|
{
|
||||||
if (mc.crosshairTarget.getType() == HitResult.Type
|
if (mc.hitResult.getType() == HitResult.Type
|
||||||
.ENTITY)
|
.ENTITY)
|
||||||
{
|
{
|
||||||
if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
|
if (((EntityHitResult) mc.hitResult).getEntity() != entity
|
||||||
.getVehicle())
|
.getVehicle())
|
||||||
{
|
{
|
||||||
changed = true;
|
changed = true;
|
||||||
@@ -495,9 +492,10 @@ public class TimerUtils
|
|||||||
* as needed.
|
* as needed.
|
||||||
*
|
*
|
||||||
* @return If true, then cancel drawing the mount health bar.
|
* @return If true, then cancel drawing the mount health bar.
|
||||||
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static boolean drawMountHealth(MatrixStack stack, float ticks)
|
public static boolean drawMountHealth(float ticks)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* When the health percentage falls to this level or below, the
|
* When the health percentage falls to this level or below, the
|
||||||
@@ -529,9 +527,9 @@ public class TimerUtils
|
|||||||
mountHealth = mount.getHealth();
|
mountHealth = mount.getHealth();
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
if (mountMaxHealth != mount.getMaxHealth())
|
if (mountMaxHealth != mount.getHealthMaximum())
|
||||||
{
|
{
|
||||||
mountMaxHealth = mount.getMaxHealth();
|
mountMaxHealth = mount.getHealthMaximum();
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -552,10 +550,10 @@ public class TimerUtils
|
|||||||
*/
|
*/
|
||||||
if (mountHealth / mountMaxHealth > HEALTH_BOUNDARY)
|
if (mountHealth / mountMaxHealth > HEALTH_BOUNDARY)
|
||||||
{
|
{
|
||||||
if (mountTime > 0)
|
if (tmp != null && mountTime > 0)
|
||||||
{
|
{
|
||||||
stack.push();
|
GlStateManager.pushMatrix();
|
||||||
stack.translate(0F,
|
GlStateManager.translatef(0F,
|
||||||
getHealthTranslation(),
|
getHealthTranslation(),
|
||||||
0F);
|
0F);
|
||||||
setAlpha(Main.getAlpha(mountTime,
|
setAlpha(Main.getAlpha(mountTime,
|
||||||
@@ -566,8 +564,8 @@ public class TimerUtils
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
stack.push();
|
GlStateManager.pushMatrix();
|
||||||
stack.translate(0F,
|
GlStateManager.translatef(0F,
|
||||||
getHealthTranslation(),
|
getHealthTranslation(),
|
||||||
0F);
|
0F);
|
||||||
return false;
|
return false;
|
||||||
@@ -626,6 +624,7 @@ public class TimerUtils
|
|||||||
* Obtains how transparent
|
* Obtains how transparent
|
||||||
*
|
*
|
||||||
* @param effectinstance
|
* @param effectinstance
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static float getPotionAlpha(StatusEffectInstance effectinstance)
|
public static float getPotionAlpha(StatusEffectInstance effectinstance)
|
||||||
@@ -637,8 +636,7 @@ public class TimerUtils
|
|||||||
if (effectinstance.getDuration() <= BLINK_TIME)
|
if (effectinstance.getDuration() <= BLINK_TIME)
|
||||||
{
|
{
|
||||||
effectAlpha =
|
effectAlpha =
|
||||||
MathHelper.sin(7000F / (effectinstance
|
MathHelper.sin(7000F / (effectinstance.getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
|
||||||
.getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
|
|
||||||
.getDuration() + 100F) + 0.5F;
|
.getDuration() + 100F) + 0.5F;
|
||||||
}
|
}
|
||||||
else if (effectinstance.getDuration() <= BLINK_TIME + potion.getFadeInTime())
|
else if (effectinstance.getDuration() <= BLINK_TIME + potion.getFadeInTime())
|
||||||
@@ -663,6 +661,7 @@ public class TimerUtils
|
|||||||
* needed.
|
* needed.
|
||||||
*
|
*
|
||||||
* @return If true, then cancel drawing the armor bar.
|
* @return If true, then cancel drawing the armor bar.
|
||||||
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static boolean drawArmor()
|
public static boolean drawArmor()
|
||||||
@@ -690,6 +689,7 @@ public class TimerUtils
|
|||||||
* needed.
|
* needed.
|
||||||
*
|
*
|
||||||
* @return If true, then cancel drawing the health.
|
* @return If true, then cancel drawing the health.
|
||||||
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static boolean drawHealth(float ticks)
|
public static boolean drawHealth(float ticks)
|
||||||
@@ -725,9 +725,9 @@ public class TimerUtils
|
|||||||
health = entity.getHealth();
|
health = entity.getHealth();
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
if (maxHealth != entity.getMaxHealth())
|
if (maxHealth != entity.getHealthMaximum())
|
||||||
{
|
{
|
||||||
maxHealth = entity.getMaxHealth();
|
maxHealth = entity.getHealthMaximum();
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
if (changed)
|
if (changed)
|
||||||
@@ -765,6 +765,7 @@ public class TimerUtils
|
|||||||
* needed.
|
* needed.
|
||||||
*
|
*
|
||||||
* @return If true, then cancel drawing the hunger bar.
|
* @return If true, then cancel drawing the hunger bar.
|
||||||
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static boolean drawHunger(float ticks)
|
public static boolean drawHunger(float ticks)
|
||||||
@@ -842,11 +843,11 @@ public class TimerUtils
|
|||||||
* Determines whether or not to draw the horse jump bar, adjusting the alpha
|
* Determines whether or not to draw the horse jump bar, adjusting the alpha
|
||||||
* as needed.
|
* as needed.
|
||||||
*
|
*
|
||||||
* @param stack
|
|
||||||
* @return If true, then cancel drawing the jump bar.
|
* @return If true, then cancel drawing the jump bar.
|
||||||
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static boolean drawJumpbar(MatrixStack stack, float ticks)
|
public static boolean drawJumpbar(float ticks)
|
||||||
{
|
{
|
||||||
ConfigManager.TimeValues jump =
|
ConfigManager.TimeValues jump =
|
||||||
ConfigManager.getInstance().getJumpTime();
|
ConfigManager.getInstance().getJumpTime();
|
||||||
@@ -874,8 +875,8 @@ public class TimerUtils
|
|||||||
}
|
}
|
||||||
if (jumpTime > 0)
|
if (jumpTime > 0)
|
||||||
{
|
{
|
||||||
stack.push();
|
GlStateManager.pushMatrix();
|
||||||
stack.translate(0F, TimerUtils.getJumpTranslation(), 0F);
|
GlStateManager.translatef(0F, TimerUtils.getJumpTranslation(), 0F);
|
||||||
setAlpha(Main.getAlpha(jumpTime,
|
setAlpha(Main.getAlpha(jumpTime,
|
||||||
jump.getMaxTime(),
|
jump.getMaxTime(),
|
||||||
jump.getFadeInTime(),
|
jump.getFadeInTime(),
|
||||||
@@ -890,9 +891,10 @@ public class TimerUtils
|
|||||||
* as needed.
|
* as needed.
|
||||||
*
|
*
|
||||||
* @return If true, then cancel drawing the experience bar.
|
* @return If true, then cancel drawing the experience bar.
|
||||||
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static boolean drawExperience(MatrixStack stack, float ticks)
|
public static boolean drawExperience(float ticks)
|
||||||
{
|
{
|
||||||
ConfigManager.TimeValues experience =
|
ConfigManager.TimeValues experience =
|
||||||
ConfigManager.getInstance().getExperienceTime();
|
ConfigManager.getInstance().getExperienceTime();
|
||||||
@@ -927,8 +929,10 @@ public class TimerUtils
|
|||||||
}
|
}
|
||||||
if (experienceTime > 0)
|
if (experienceTime > 0)
|
||||||
{
|
{
|
||||||
stack.push();
|
GlStateManager.pushMatrix();
|
||||||
stack.translate(0F, TimerUtils.getExperienceTranslation(), 0F);
|
GlStateManager.translatef(0F,
|
||||||
|
TimerUtils.getExperienceTranslation(),
|
||||||
|
0F);
|
||||||
setAlpha(Main.getAlpha(experienceTime,
|
setAlpha(Main.getAlpha(experienceTime,
|
||||||
experience.getMaxTime(),
|
experience.getMaxTime(),
|
||||||
experience.getFadeInTime(),
|
experience.getFadeInTime(),
|
||||||
@@ -944,7 +948,8 @@ public class TimerUtils
|
|||||||
* or not to draw it.
|
* or not to draw it.
|
||||||
*
|
*
|
||||||
* @return If true, then cancel drawing the hotbar.
|
* @return If true, then cancel drawing the hotbar.
|
||||||
* @see #recolorHotbar(MatrixStack)
|
*
|
||||||
|
* @see #recolorHotbar()
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static boolean updateHotbar(float ticks)
|
public static boolean updateHotbar(float ticks)
|
||||||
@@ -1069,7 +1074,7 @@ public class TimerUtils
|
|||||||
* Items that have the crosshairs enabled for as long
|
* Items that have the crosshairs enabled for as long
|
||||||
* as the item is being held at all.
|
* as the item is being held at all.
|
||||||
*/
|
*/
|
||||||
else if (item instanceof ThrowablePotionItem ||
|
else if (item instanceof SplashPotionItem || item instanceof LingeringPotionItem ||
|
||||||
item instanceof SnowballItem || item instanceof
|
item instanceof SnowballItem || item instanceof
|
||||||
EggItem || item instanceof EnderPearlItem || item
|
EggItem || item instanceof EnderPearlItem || item
|
||||||
instanceof FishingRodItem)
|
instanceof FishingRodItem)
|
||||||
@@ -1164,15 +1169,15 @@ public class TimerUtils
|
|||||||
* needed.
|
* needed.
|
||||||
*
|
*
|
||||||
* @return If true, then cancel drawing the crosshair.
|
* @return If true, then cancel drawing the crosshair.
|
||||||
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
public static void recolorHotbar(MatrixStack stack)
|
public static void recolorHotbar()
|
||||||
{
|
{
|
||||||
ConfigManager.TimeValues hotbar =
|
ConfigManager.TimeValues hotbar =
|
||||||
ConfigManager.getInstance().getHotbarTime();
|
ConfigManager.getInstance().getHotbarTime();
|
||||||
RenderSystem.pushMatrix();
|
GlStateManager.pushMatrix();
|
||||||
stack.push();
|
GlStateManager.translatef(0F, TimerUtils.getHotbarTranslation(), 0F);
|
||||||
RenderSystem.translatef(0F, TimerUtils.getHotbarTranslation(), 0F);
|
|
||||||
setAlpha(Main.getAlpha(hotbarTime,
|
setAlpha(Main.getAlpha(hotbarTime,
|
||||||
hotbar.getMaxTime(),
|
hotbar.getMaxTime(),
|
||||||
hotbar.getFadeInTime(),
|
hotbar.getFadeInTime(),
|
||||||
|
|||||||
@@ -17,9 +17,7 @@
|
|||||||
package markil3.immersive_hud.mixin;
|
package markil3.immersive_hud.mixin;
|
||||||
|
|
||||||
import net.minecraft.client.network.AbstractClientPlayerEntity;
|
import net.minecraft.client.network.AbstractClientPlayerEntity;
|
||||||
import net.minecraft.client.render.VertexConsumerProvider;
|
import net.minecraft.client.render.FirstPersonRenderer;
|
||||||
import net.minecraft.client.render.item.HeldItemRenderer;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.Hand;
|
import net.minecraft.util.Hand;
|
||||||
|
|
||||||
@@ -39,47 +37,37 @@ import markil3.immersive_hud.TimerUtils;
|
|||||||
* @author Markil 3
|
* @author Markil 3
|
||||||
* @version 0.1-1.16.4-fabric
|
* @version 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@Mixin(HeldItemRenderer.class)
|
@Mixin(FirstPersonRenderer.class)
|
||||||
public class HeldItemHook
|
public class HeldItemHook
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER =
|
private static final Logger LOGGER = LogManager.getLogger(HeldItemHook.class);
|
||||||
LogManager.getLogger(HeldItemHook.class);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines whether or not to render a certain hand.
|
* Determines whether or not to render a certain hand.
|
||||||
*
|
*
|
||||||
* @param player
|
|
||||||
* @param tickDelta
|
|
||||||
* @param pitch
|
|
||||||
* @param hand
|
* @param hand
|
||||||
* @param swingProgress
|
|
||||||
* @param item
|
|
||||||
* @param equipProgress
|
|
||||||
* @param matrices
|
|
||||||
* @param vertexConsumers
|
|
||||||
* @param light
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE",
|
@Inject(method = "renderFirstPersonItem" +
|
||||||
target = "Lnet/minecraft/client/util/math/MatrixStack;push()V",
|
"(Lnet/minecraft/client/network/AbstractClientPlayerEntity;" +
|
||||||
shift = At.Shift.AFTER), cancellable = true)
|
"FFLnet/minecraft/util/Hand;FLnet/minecraft/item/ItemStack;F)V",
|
||||||
public void renderHand(AbstractClientPlayerEntity player,
|
at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform" +
|
||||||
float tickDelta,
|
"/GlStateManager;pushMatrix()V", shift = At.Shift.AFTER),
|
||||||
float pitch,
|
cancellable = true)
|
||||||
|
public void renderHand(AbstractClientPlayerEntity abstractClientPlayerEntity,
|
||||||
|
float f,
|
||||||
|
float g,
|
||||||
Hand hand,
|
Hand hand,
|
||||||
float swingProgress,
|
float h,
|
||||||
ItemStack item,
|
ItemStack itemStack,
|
||||||
float equipProgress,
|
float i,
|
||||||
MatrixStack matrices,
|
|
||||||
VertexConsumerProvider vertexConsumers,
|
|
||||||
int light,
|
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (TimerUtils.onRenderHand(hand, matrices, tickDelta))
|
if (TimerUtils.onRenderHand(hand, f))
|
||||||
{
|
{
|
||||||
callbackInfo.cancel();
|
callbackInfo.cancel();
|
||||||
}
|
}
|
||||||
@@ -87,8 +75,8 @@ public class HeldItemHook
|
|||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
LOGGER.error(
|
LOGGER.error(
|
||||||
"Error in running net.minecraft.client.render.item" +
|
"Error in running net.minecraft.client.render" +
|
||||||
".HeldItemRenderer#renderFirstPersonItem " +
|
".FirstPersonRenderer#renderFirstPersonItem " +
|
||||||
"event",
|
"event",
|
||||||
e);
|
e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,12 +16,11 @@
|
|||||||
*/
|
*/
|
||||||
package markil3.immersive_hud.mixin;
|
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.MinecraftClient;
|
||||||
import net.minecraft.client.gui.hud.InGameHud;
|
import net.minecraft.client.gui.hud.InGameHud;
|
||||||
import net.minecraft.client.network.ClientPlayerEntity;
|
import net.minecraft.client.network.ClientPlayerEntity;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.entity.effect.StatusEffectInstance;
|
import net.minecraft.entity.effect.StatusEffectInstance;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
@@ -52,7 +51,6 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Determines whether or not to draw the crosshair.
|
* Determines whether or not to draw the crosshair.
|
||||||
*
|
*
|
||||||
* @param stack - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
@@ -60,8 +58,9 @@ public class HudHook
|
|||||||
*/
|
*/
|
||||||
@Inject(method = "renderCrosshair", at = @At(value = "HEAD"),
|
@Inject(method = "renderCrosshair", at = @At(value = "HEAD"),
|
||||||
cancellable = true)
|
cancellable = true)
|
||||||
public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
public void startCrosshair(CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Starting crosshair");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
|
if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
|
||||||
@@ -74,7 +73,7 @@ public class HudHook
|
|||||||
{
|
{
|
||||||
LOGGER.error(
|
LOGGER.error(
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
".InGameHud#startCrosshair " +
|
".InGameHud#renderCrosshair " +
|
||||||
"event",
|
"event",
|
||||||
e);
|
e);
|
||||||
}
|
}
|
||||||
@@ -83,15 +82,15 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Resets any changes from drawing the crosshair.
|
* Resets any changes from drawing the crosshair.
|
||||||
*
|
*
|
||||||
* @param stack - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
|
@Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
|
||||||
public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
public void finishCrosshair(CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Finishing crosshair");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@@ -112,7 +111,6 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Determines whether or not to draw the horse jump bar.
|
* Determines whether or not to draw the horse jump bar.
|
||||||
*
|
*
|
||||||
* @param stack - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
@@ -120,14 +118,13 @@ public class HudHook
|
|||||||
*/
|
*/
|
||||||
@Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
|
@Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
|
||||||
cancellable = true)
|
cancellable = true)
|
||||||
public void startJumpbar(MatrixStack stack,
|
public void startJumpbar(int x, CallbackInfo callbackInfo)
|
||||||
int x,
|
|
||||||
CallbackInfo callbackInfo)
|
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Starting jumpbar");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (TimerUtils.drawJumpbar(stack,
|
if (TimerUtils.drawJumpbar(MinecraftClient.getInstance()
|
||||||
MinecraftClient.getInstance().getTickDelta()))
|
.getTickDelta()))
|
||||||
{
|
{
|
||||||
callbackInfo.cancel();
|
callbackInfo.cancel();
|
||||||
}
|
}
|
||||||
@@ -145,20 +142,20 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Resets any changes from drawing the horse jump bar.
|
* Resets any changes from drawing the horse jump bar.
|
||||||
*
|
*
|
||||||
* @param stack - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderMountJumpBar", at = @At(value = "TAIL"))
|
@Inject(method = "renderMountJumpBar", at = @At(value = "TAIL"))
|
||||||
public void finishJumpbar(MatrixStack stack,
|
public void finishJumpbar(
|
||||||
int x,
|
int x,
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Finishing jumpbar");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
stack.pop();
|
GlStateManager.popMatrix();
|
||||||
/*
|
/*
|
||||||
* Resets the color so that nothing else is bothered.
|
* Resets the color so that nothing else is bothered.
|
||||||
*/
|
*/
|
||||||
@@ -177,7 +174,6 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Determines whether or not to draw the experience bar.
|
* Determines whether or not to draw the experience bar.
|
||||||
*
|
*
|
||||||
* @param stack - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
@@ -185,14 +181,13 @@ public class HudHook
|
|||||||
*/
|
*/
|
||||||
@Inject(method = "renderExperienceBar", at = @At(value = "HEAD"),
|
@Inject(method = "renderExperienceBar", at = @At(value = "HEAD"),
|
||||||
cancellable = true)
|
cancellable = true)
|
||||||
public void startExperience(MatrixStack stack,
|
public void startExperience(int x, CallbackInfo callbackInfo)
|
||||||
int x,
|
|
||||||
CallbackInfo callbackInfo)
|
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Starting experience bar");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (TimerUtils.drawExperience(stack,
|
if (TimerUtils.drawExperience(MinecraftClient.getInstance()
|
||||||
MinecraftClient.getInstance().getTickDelta()))
|
.getTickDelta()))
|
||||||
{
|
{
|
||||||
callbackInfo.cancel();
|
callbackInfo.cancel();
|
||||||
}
|
}
|
||||||
@@ -210,20 +205,18 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Resets any changes from drawing the experience bar.
|
* Resets any changes from drawing the experience bar.
|
||||||
*
|
*
|
||||||
* @param stack - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
|
@Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
|
||||||
public void finishExperience(MatrixStack stack,
|
public void finishExperience(int x, CallbackInfo callbackInfo)
|
||||||
int x,
|
|
||||||
CallbackInfo callbackInfo)
|
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Finishing experience bar");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
stack.pop();
|
GlStateManager.popMatrix();
|
||||||
/*
|
/*
|
||||||
* Resets the color so that nothing else is bothered.
|
* Resets the color so that nothing else is bothered.
|
||||||
*/
|
*/
|
||||||
@@ -243,18 +236,18 @@ public class HudHook
|
|||||||
* Changes the position of the status bars as the ones below them move up
|
* Changes the position of the status bars as the ones below them move up
|
||||||
* and down.
|
* and down.
|
||||||
*
|
*
|
||||||
* @param stack - The matrix stack used.
|
|
||||||
*
|
|
||||||
* @return The same matrix stack, with a new matrix pushed onto it.
|
* @return The same matrix stack, with a new matrix pushed onto it.
|
||||||
*/
|
*/
|
||||||
@ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
@Inject(method = "renderStatusBars", at = @At("HEAD"))
|
||||||
"/math/MatrixStack;)V", at = @At("HEAD"))
|
public void startStatus(CallbackInfo info)
|
||||||
public MatrixStack startStatus(MatrixStack stack)
|
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Starting status bars");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
stack.push();
|
GlStateManager.pushMatrix();
|
||||||
stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
|
GlStateManager.translatef(0F,
|
||||||
|
TimerUtils.getHealthTranslation(),
|
||||||
|
0F);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
@@ -264,20 +257,20 @@ public class HudHook
|
|||||||
"event",
|
"event",
|
||||||
e);
|
e);
|
||||||
}
|
}
|
||||||
return stack;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adjusts the armor GUI.
|
* Adjusts the armor GUI.
|
||||||
*
|
*
|
||||||
* @param matrices
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
|
||||||
"/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
|
target = "Lnet" +
|
||||||
"/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
|
"/minecraft/util/profiler/Profiler;push" +
|
||||||
public void renderArmor(MatrixStack matrices, CallbackInfo callbackInfo)
|
"(Ljava/lang/String;)V"))
|
||||||
|
public void renderArmor(CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Rendering armor");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (TimerUtils.drawArmor())
|
if (TimerUtils.drawArmor())
|
||||||
@@ -298,15 +291,16 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Adjusts the health GUI.
|
* Adjusts the health GUI.
|
||||||
*
|
*
|
||||||
* @param matrices
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
|
||||||
"/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
|
target = "Lnet" +
|
||||||
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
|
"/minecraft/util/profiler/Profiler;swap" +
|
||||||
|
"(Ljava/lang/String;)V",
|
||||||
ordinal = 0))
|
ordinal = 0))
|
||||||
public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
|
public void renderHealth(CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Rendering health");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@@ -332,15 +326,15 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Adjusts the food GUI.
|
* Adjusts the food GUI.
|
||||||
*
|
*
|
||||||
* @param matrices
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
|
||||||
"/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
|
target = "Lnet" +
|
||||||
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
|
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
|
||||||
ordinal = 1, shift = At.Shift.BY, by = 3))
|
ordinal = 1, shift = At.Shift.BY, by = 3))
|
||||||
public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
|
public void renderFood(CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Rendering food");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@@ -366,15 +360,16 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Resets the air GUI.
|
* Resets the air GUI.
|
||||||
*
|
*
|
||||||
* @param matrices
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
|
||||||
"/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
|
target = "Lnet" +
|
||||||
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
|
"/minecraft/util/profiler/Profiler;swap" +
|
||||||
|
"(Ljava/lang/String;)V",
|
||||||
ordinal = 2))
|
ordinal = 2))
|
||||||
public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
|
public void renderAir(CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Rendering air");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@@ -392,13 +387,13 @@ public class HudHook
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
@Inject(method = "renderStatusBars", at = @At("TAIL"))
|
||||||
"/math/MatrixStack;)V", at = @At("TAIL"))
|
public void finishStatus(CallbackInfo info)
|
||||||
public MatrixStack finishStatus(MatrixStack stack)
|
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Finishing status bars");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
stack.pop();
|
GlStateManager.popMatrix();
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
@@ -408,13 +403,11 @@ public class HudHook
|
|||||||
"event",
|
"event",
|
||||||
e);
|
e);
|
||||||
}
|
}
|
||||||
return stack;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines whether or not to draw the mount's health.
|
* Determines whether or not to draw the mount's health.
|
||||||
*
|
*
|
||||||
* @param stack - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
@@ -422,15 +415,19 @@ public class HudHook
|
|||||||
*/
|
*/
|
||||||
@Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
|
@Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
|
||||||
cancellable = true)
|
cancellable = true)
|
||||||
public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
public void startMountHealth(CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (TimerUtils.drawMountHealth(stack,
|
if (TimerUtils.drawMountHealth(MinecraftClient.getInstance()
|
||||||
MinecraftClient.getInstance().getTickDelta()))
|
.getTickDelta()))
|
||||||
{
|
{
|
||||||
callbackInfo.cancel();
|
callbackInfo.cancel();
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LOGGER.debug("Starting mount health");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
@@ -445,21 +442,21 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Resets any changes from drawing the mount's health.
|
* Resets any changes from drawing the mount's health.
|
||||||
*
|
*
|
||||||
* @param stack - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
|
@Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
|
||||||
public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
public void finishMountHealth(CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Finishing mount health");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Resets the color so that nothing else is bothered.
|
* Resets the color so that nothing else is bothered.
|
||||||
*/
|
*/
|
||||||
stack.pop();
|
GlStateManager.popMatrix();
|
||||||
TimerUtils.resetAlpha();
|
TimerUtils.resetAlpha();
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
@@ -478,11 +475,11 @@ public class HudHook
|
|||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderStatusEffectOverlay" +
|
@Inject(method = "renderStatusEffectOverlay()V", at =
|
||||||
"(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
|
|
||||||
@At(value = "HEAD", shift = At.Shift.AFTER))
|
@At(value = "HEAD", shift = At.Shift.AFTER))
|
||||||
public void startPotion(MatrixStack effect, CallbackInfo info)
|
public void startPotion(CallbackInfo info)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Starting potions");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
|
TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
|
||||||
@@ -505,14 +502,14 @@ public class HudHook
|
|||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@Redirect(method = "renderStatusEffectOverlay" +
|
@Redirect(method = "renderStatusEffectOverlay()V", at =
|
||||||
"(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
|
|
||||||
@At(value = "INVOKE",
|
@At(value = "INVOKE",
|
||||||
target =
|
target =
|
||||||
"Lnet/minecraft/entity/effect/StatusEffectInstance;" +
|
"Lnet/minecraft/entity/effect/StatusEffectInstance;" +
|
||||||
"shouldShowIcon()Z"))
|
"shouldShowIcon()Z"))
|
||||||
public boolean shouldRenderPotion(StatusEffectInstance effect)
|
public boolean shouldRenderPotion(StatusEffectInstance effect)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Updating potions");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
currentEffect = effect;
|
currentEffect = effect;
|
||||||
@@ -534,17 +531,15 @@ public class HudHook
|
|||||||
* Makes the actual adjustment to the hotbar as needed.
|
* Makes the actual adjustment to the hotbar as needed.
|
||||||
*
|
*
|
||||||
* @param f - The original transparency
|
* @param f - The original transparency
|
||||||
* @param stack - The matrix stack
|
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@ModifyVariable(method = "renderStatusEffectOverlay" +
|
@ModifyVariable(method = "renderStatusEffectOverlay()V", at =
|
||||||
"(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
|
|
||||||
@At(value = "STORE"))
|
@At(value = "STORE"))
|
||||||
public float updatePotion(float f,
|
public float updatePotion(float f)
|
||||||
MatrixStack stack)
|
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Adjusting potions");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return TimerUtils.getPotionAlpha(currentEffect);
|
return TimerUtils.getPotionAlpha(currentEffect);
|
||||||
@@ -563,16 +558,15 @@ public class HudHook
|
|||||||
/**
|
/**
|
||||||
* Resets any changes from drawing the potion effects.
|
* Resets any changes from drawing the potion effects.
|
||||||
*
|
*
|
||||||
* @param matrices - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
* @since 0.2-1.16.4-fabric
|
* @since 0.2-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL"))
|
@Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL"))
|
||||||
public void finishPotion(MatrixStack matrices,
|
public void finishPotion(CallbackInfo callbackInfo)
|
||||||
CallbackInfo callbackInfo)
|
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Finishing potions");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@@ -594,7 +588,6 @@ public class HudHook
|
|||||||
* Determines whether or not to draw the hotbar.
|
* Determines whether or not to draw the hotbar.
|
||||||
*
|
*
|
||||||
* @param tickDelta
|
* @param tickDelta
|
||||||
* @param matrices - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
@@ -603,9 +596,9 @@ public class HudHook
|
|||||||
@Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable =
|
@Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable =
|
||||||
true)
|
true)
|
||||||
public void startHotbar(float tickDelta,
|
public void startHotbar(float tickDelta,
|
||||||
MatrixStack matrices,
|
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Starting hotbar");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (TimerUtils.updateHotbar(tickDelta))
|
if (TimerUtils.updateHotbar(tickDelta))
|
||||||
@@ -627,22 +620,21 @@ public class HudHook
|
|||||||
* Makes the actual adjustment to the hotbar as needed.
|
* Makes the actual adjustment to the hotbar as needed.
|
||||||
*
|
*
|
||||||
* @param tickDelta
|
* @param tickDelta
|
||||||
* @param matrices - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@Inject(method = "renderHotbar", at = @At(value = "INVOKE", target =
|
@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))
|
= At.Shift.AFTER))
|
||||||
public void adjustHotbar(float tickDelta,
|
public void adjustHotbar(float tickDelta,
|
||||||
MatrixStack matrices,
|
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Adjusting hotbar");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
TimerUtils.recolorHotbar(matrices);
|
TimerUtils.recolorHotbar();
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
@@ -658,7 +650,6 @@ public class HudHook
|
|||||||
* Resets any changes from drawing the hotbar.
|
* Resets any changes from drawing the hotbar.
|
||||||
*
|
*
|
||||||
* @param tickDelta
|
* @param tickDelta
|
||||||
* @param stack - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
* @param callbackInfo
|
||||||
*
|
*
|
||||||
* @version 0.2-1.16.4-fabric
|
* @version 0.2-1.16.4-fabric
|
||||||
@@ -666,13 +657,12 @@ public class HudHook
|
|||||||
*/
|
*/
|
||||||
@Inject(method = "renderHotbar", at = @At(value = "TAIL"))
|
@Inject(method = "renderHotbar", at = @At(value = "TAIL"))
|
||||||
public void finishHotbar(float tickDelta,
|
public void finishHotbar(float tickDelta,
|
||||||
MatrixStack stack,
|
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
|
LOGGER.debug("Finishing hotbar");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
RenderSystem.popMatrix();
|
GlStateManager.popMatrix();
|
||||||
stack.pop();
|
|
||||||
/*
|
/*
|
||||||
* Resets the color so that nothing else is bothered.
|
* Resets the color so that nothing else is bothered.
|
||||||
*/
|
*/
|
||||||
@@ -681,8 +671,7 @@ public class HudHook
|
|||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
LOGGER.error(
|
LOGGER.error(
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
"Error in running net.minecraft.client.gui.hud.InGameHud#renderHotbar " +
|
||||||
".InGameHud#renderHotbar " +
|
|
||||||
"event",
|
"event",
|
||||||
e);
|
e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
"option.immersive_hud.minHealth": "Minimum Health Fade",
|
"option.immersive_hud.minHealth": "Minimum Health Fade",
|
||||||
"option.immersive_hud.minHunger": "Minimum Hunger Fade",
|
"option.immersive_hud.minHunger": "Minimum Hunger Fade",
|
||||||
"option.immersive_hud.showArmor": "Show Armor",
|
"option.immersive_hud.showArmor": "Show Armor",
|
||||||
"option.immersive_hud.ignoreList": "Ignored Items",
|
|
||||||
"tooltip.immersive_hud.hotbarMaxTime": "How long the hotbar can be displayed on screen in seconds",
|
"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.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.hotbarFadeOut": "How many seconds it takes for the hotbar to move out",
|
||||||
@@ -50,8 +49,5 @@
|
|||||||
"tooltip.immersive_hud.hideHands": "Whether or not hands should be hidden after a period of time",
|
"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.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.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",
|
"tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD"
|
||||||
"tooltip.immersive_hud.ignoreList": "Which items will not trigger the arm and crosshairs when used",
|
|
||||||
"error.immersive_hud.ignoreList.unknownItem": "Unknown item %s",
|
|
||||||
"error.immersive_hud.ignoreList.illegalId": "%s is not a legal item identifier"
|
|
||||||
}
|
}
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.7.4",
|
"fabricloader": ">=0.7.4",
|
||||||
"minecraft": "1.16.x"
|
"minecraft": "1.14.x"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
"modmenu": "*",
|
"modmenu": "*",
|
||||||
|
|||||||
Reference in New Issue
Block a user