Compare commits
3 Commits
v1.1.1-1.1
...
1.16.4-fab
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cdc1139658 | ||
|
|
2b2c81aa45 | ||
|
|
5d7f44636b |
@@ -11,6 +11,6 @@ cloth_version=4.11.14
|
|||||||
modmenu_version=1.16.8
|
modmenu_version=1.16.8
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.1.1
|
mod_version = 1.2
|
||||||
maven_group = markil3
|
maven_group = markil3
|
||||||
archives_base_name = immersive_hud
|
archives_base_name = immersive_hud
|
||||||
|
|||||||
@@ -1,11 +1,19 @@
|
|||||||
package markil3.immersive_hud;
|
package markil3.immersive_hud;
|
||||||
|
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.Items;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
import net.minecraft.util.math.MathHelper;
|
import net.minecraft.util.math.MathHelper;
|
||||||
|
import net.minecraft.util.registry.Registry;
|
||||||
|
|
||||||
import me.shedaniel.autoconfig.AutoConfig;
|
import me.shedaniel.autoconfig.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.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration manager of this mod, which reads from and writes to this mod's
|
* Configuration manager of this mod, which reads from and writes to this mod's
|
||||||
* configuration file.
|
* configuration file.
|
||||||
@@ -88,6 +96,7 @@ public class ConfigManager
|
|||||||
private boolean showArmor = true;
|
private boolean showArmor = true;
|
||||||
private double minHealth = 0.5;
|
private double minHealth = 0.5;
|
||||||
private int minHunger = 17;
|
private int minHunger = 17;
|
||||||
|
private Identifier[] ignoredItems = new Identifier[]{Registry.ITEM.getId(Items.FIREWORK_ROCKET)};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the instance of this class.
|
* Returns the instance of this class.
|
||||||
@@ -247,6 +256,26 @@ public class ConfigManager
|
|||||||
return this.minHunger;
|
return this.minHunger;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Obtains a collection of items that won't cause hands and crosshairs to show when used.
|
||||||
|
*
|
||||||
|
* @return A set of ignored items.
|
||||||
|
*/
|
||||||
|
public Set<Item> getIgnoredItems()
|
||||||
|
{
|
||||||
|
return Arrays.stream(ignoredItems).map(Registry.ITEM::get).collect(Collectors.toSet());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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.
|
||||||
*
|
*
|
||||||
@@ -318,6 +347,26 @@ public class ConfigManager
|
|||||||
{
|
{
|
||||||
this.minHunger = MathHelper.clamp(boundary, 0, 20);
|
this.minHunger = MathHelper.clamp(boundary, 0, 20);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets which items won't cause the hands and crosshairs to show when used.
|
||||||
|
*
|
||||||
|
* @param items - A set of ignored items.
|
||||||
|
*/
|
||||||
|
public void setIgnoredItems(Item... items)
|
||||||
|
{
|
||||||
|
this.ignoredItems = Arrays.stream(items).map(Registry.ITEM::getId).toArray(Identifier[]::new);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -3,7 +3,11 @@ package markil3.immersive_hud;
|
|||||||
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
||||||
import com.terraformersmc.modmenu.api.ModMenuApi;
|
import com.terraformersmc.modmenu.api.ModMenuApi;
|
||||||
|
|
||||||
|
import net.minecraft.item.Items;
|
||||||
import net.minecraft.text.TranslatableText;
|
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.autoconfig.AutoConfig;
|
||||||
import me.shedaniel.clothconfig2.api.ConfigBuilder;
|
import me.shedaniel.clothconfig2.api.ConfigBuilder;
|
||||||
@@ -13,6 +17,11 @@ import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
|
|||||||
|
|
||||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
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
|
public class ModMenu implements ModMenuApi
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -29,42 +38,45 @@ public class ModMenu implements ModMenuApi
|
|||||||
"option.immersive_hud." + name +
|
"option.immersive_hud." + name +
|
||||||
"MaxTime"),
|
"MaxTime"),
|
||||||
(float) value.getMaxTime() / TICKS_PER_SECOND)
|
(float) value.getMaxTime() / TICKS_PER_SECOND)
|
||||||
.setDefaultValue(SHOW_TIME)
|
.setDefaultValue(SHOW_TIME)
|
||||||
.setMin(0)
|
.setMin(0)
|
||||||
.setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
|
.setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
|
||||||
.setTooltip(new TranslatableText(
|
.setTooltip(new TranslatableText(
|
||||||
"tooltip.immersive_hud." + name +
|
"tooltip.immersive_hud." + name +
|
||||||
"MaxTime"))
|
"MaxTime"))
|
||||||
.setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
|
.setSaveConsumer(val -> value
|
||||||
.build();
|
.setMaxTime((int) (val * TICKS_PER_SECOND)))
|
||||||
|
.build();
|
||||||
|
|
||||||
DoubleListEntry fadeIn =
|
DoubleListEntry fadeIn =
|
||||||
entryBuilder.startDoubleField(new TranslatableText(
|
entryBuilder.startDoubleField(new TranslatableText(
|
||||||
"option.immersive_hud." + name +
|
"option.immersive_hud." + name +
|
||||||
"FadeIn"),
|
"FadeIn"),
|
||||||
(float) value.getFadeInTime() / TICKS_PER_SECOND)
|
(float) value.getFadeInTime() / TICKS_PER_SECOND)
|
||||||
.setDefaultValue(FADE_IN)
|
.setDefaultValue(FADE_IN)
|
||||||
.setMin(0)
|
.setMin(0)
|
||||||
.setMax(10 * 60 * TICKS_PER_SECOND)
|
.setMax(10 * 60 * TICKS_PER_SECOND)
|
||||||
.setTooltip(new TranslatableText(
|
.setTooltip(new TranslatableText(
|
||||||
"tooltip.immersive_hud." + name +
|
"tooltip.immersive_hud." + name +
|
||||||
"FadeIn"))
|
"FadeIn"))
|
||||||
.setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND)))
|
.setSaveConsumer(val -> value
|
||||||
.build();
|
.setFadeInTime((int) (val * TICKS_PER_SECOND)))
|
||||||
|
.build();
|
||||||
|
|
||||||
DoubleListEntry fadeOut =
|
DoubleListEntry fadeOut =
|
||||||
entryBuilder.startDoubleField(new TranslatableText(
|
entryBuilder.startDoubleField(new TranslatableText(
|
||||||
"option.immersive_hud." + name +
|
"option.immersive_hud." + name +
|
||||||
"FadeOut"),
|
"FadeOut"),
|
||||||
(float) value.getFadeOutTime() / TICKS_PER_SECOND)
|
(float) value.getFadeOutTime() / TICKS_PER_SECOND)
|
||||||
.setDefaultValue(FADE_OUT)
|
.setDefaultValue(FADE_OUT)
|
||||||
.setMin(0)
|
.setMin(0)
|
||||||
.setMax(10 * 60 * TICKS_PER_SECOND)
|
.setMax(10 * 60 * TICKS_PER_SECOND)
|
||||||
.setTooltip(new TranslatableText(
|
.setTooltip(new TranslatableText(
|
||||||
"tooltip.immersive_hud." + name +
|
"tooltip.immersive_hud." + name +
|
||||||
"FadeOut"))
|
"FadeOut"))
|
||||||
.setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
|
.setSaveConsumer(val -> value
|
||||||
.build();
|
.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
|
||||||
|
.build();
|
||||||
|
|
||||||
cat.addEntry(maxTime);
|
cat.addEntry(maxTime);
|
||||||
cat.addEntry(fadeIn);
|
cat.addEntry(fadeIn);
|
||||||
@@ -79,23 +91,25 @@ public class ModMenu implements ModMenuApi
|
|||||||
ConfigEntryBuilder entryBuilder;
|
ConfigEntryBuilder entryBuilder;
|
||||||
ConfigManager instance = ConfigManager.getInstance();
|
ConfigManager instance = ConfigManager.getInstance();
|
||||||
final ConfigBuilder builder = ConfigBuilder.create()
|
final ConfigBuilder builder = ConfigBuilder.create()
|
||||||
.setParentScreen(screen)
|
.setParentScreen(screen)
|
||||||
.setTitle(new TranslatableText(
|
.setTitle(new TranslatableText(
|
||||||
"immersive_hud.configGui.title"))
|
"immersive_hud.configGui.title"))
|
||||||
.setSavingRunnable(() -> {
|
.setSavingRunnable(() -> {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
if (Class
|
||||||
{
|
.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
||||||
AutoConfig.getConfigHolder(ConfigManagerCloth.class)
|
{
|
||||||
.save();
|
AutoConfig
|
||||||
}
|
.getConfigHolder(ConfigManagerCloth.class)
|
||||||
}
|
.save();
|
||||||
catch (ClassNotFoundException e)
|
}
|
||||||
{
|
}
|
||||||
// Do nothing
|
catch (ClassNotFoundException e)
|
||||||
}
|
{
|
||||||
});
|
// Do nothing
|
||||||
|
}
|
||||||
|
});
|
||||||
general =
|
general =
|
||||||
builder.getOrCreateCategory(new TranslatableText(
|
builder.getOrCreateCategory(new TranslatableText(
|
||||||
"category.immersive_hud.general"));
|
"category.immersive_hud.general"));
|
||||||
@@ -124,65 +138,92 @@ public class ModMenu implements ModMenuApi
|
|||||||
"option.immersive_hud" +
|
"option.immersive_hud" +
|
||||||
".crosshairTime"),
|
".crosshairTime"),
|
||||||
(float) instance.getCrosshairTime() / TICKS_PER_SECOND)
|
(float) instance.getCrosshairTime() / TICKS_PER_SECOND)
|
||||||
.setDefaultValue(6)
|
.setDefaultValue(6)
|
||||||
.setTooltip(new TranslatableText(
|
.setTooltip(new TranslatableText(
|
||||||
"tooltip.immersive_hud" +
|
"tooltip.immersive_hud" +
|
||||||
".crosshairTime"))
|
".crosshairTime"))
|
||||||
.setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
|
.setSaveConsumer(val -> instance
|
||||||
.build());
|
.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
|
||||||
|
.build());
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
||||||
"option.immersive_hud.hideCrosshair"),
|
"option.immersive_hud.hideCrosshair"),
|
||||||
instance.hideCrosshair())
|
instance.hideCrosshair())
|
||||||
.setDefaultValue(true)
|
.setDefaultValue(true)
|
||||||
.setTooltip(new TranslatableText(
|
.setTooltip(new TranslatableText(
|
||||||
"tooltip.immersive_hud.hideCrosshair"))
|
"tooltip.immersive_hud.hideCrosshair"))
|
||||||
.setSaveConsumer(val -> instance.hideCrosshair(val))
|
.setSaveConsumer(val -> instance.hideCrosshair(val))
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
||||||
"option.immersive_hud.handTime"),
|
"option.immersive_hud.handTime"),
|
||||||
(float) instance.getHandTime() / TICKS_PER_SECOND)
|
(float) instance.getHandTime() / TICKS_PER_SECOND)
|
||||||
.setDefaultValue(30)
|
.setDefaultValue(30)
|
||||||
.setTooltip(new TranslatableText(
|
.setTooltip(new TranslatableText(
|
||||||
"tooltip.immersive_hud.handTime"))
|
"tooltip.immersive_hud.handTime"))
|
||||||
.setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
|
.setSaveConsumer(val -> instance
|
||||||
.build());
|
.setHandTime((int) (val * TICKS_PER_SECOND)))
|
||||||
|
.build());
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
||||||
"option.immersive_hud.hideHands"),
|
"option.immersive_hud.hideHands"),
|
||||||
instance.hideHands())
|
instance.hideHands())
|
||||||
.setDefaultValue(true)
|
.setDefaultValue(true)
|
||||||
.setTooltip(new TranslatableText(
|
.setTooltip(new TranslatableText(
|
||||||
"tooltip.immersive_hud.hideHands"))
|
"tooltip.immersive_hud.hideHands"))
|
||||||
.setSaveConsumer(val -> instance.hideHands(val))
|
.setSaveConsumer(val -> instance.hideHands(val))
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
||||||
"option.immersive_hud.minHealth"),
|
"option.immersive_hud.minHealth"),
|
||||||
instance.getMinHealth())
|
instance.getMinHealth())
|
||||||
.setDefaultValue(0.5)
|
.setDefaultValue(0.5)
|
||||||
.setTooltip(new TranslatableText(
|
.setTooltip(new TranslatableText(
|
||||||
"tooltip.immersive_hud.minHealth"))
|
"tooltip.immersive_hud.minHealth"))
|
||||||
.setSaveConsumer(val -> instance.setMinHealth(val))
|
.setSaveConsumer(val -> instance.setMinHealth(val))
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startIntField(new TranslatableText(
|
general.addEntry(entryBuilder.startIntField(new TranslatableText(
|
||||||
"option.immersive_hud.minHunger"),
|
"option.immersive_hud.minHunger"),
|
||||||
instance.getMinHunger())
|
instance.getMinHunger())
|
||||||
.setDefaultValue(17)
|
.setDefaultValue(17)
|
||||||
.setTooltip(new TranslatableText(
|
.setTooltip(new TranslatableText(
|
||||||
"tooltip.immersive_hud.minHunger"))
|
"tooltip.immersive_hud.minHunger"))
|
||||||
.setSaveConsumer(val -> instance.setMinHunger(val))
|
.setSaveConsumer(val -> instance.setMinHunger(val))
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
||||||
"option.immersive_hud.showArmor"),
|
"option.immersive_hud.showArmor"),
|
||||||
instance.shouldShowArmor())
|
instance.shouldShowArmor())
|
||||||
.setDefaultValue(true)
|
.setDefaultValue(true)
|
||||||
.setTooltip(new TranslatableText(
|
.setTooltip(new TranslatableText(
|
||||||
"tooltip.immersive_hud.showArmor"))
|
"tooltip.immersive_hud.showArmor"))
|
||||||
.setSaveConsumer(val -> instance.shouldShowArmor(val))
|
.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());
|
.build());
|
||||||
|
|
||||||
return builder.build();
|
return builder.build();
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ import java.util.HashMap;
|
|||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Contains the logic for changing the HUD.
|
* Contains the logic for changing the HUD.
|
||||||
@@ -250,6 +251,8 @@ public class TimerUtils
|
|||||||
ConfigManager.getInstance().getExperienceTime();
|
ConfigManager.getInstance().getExperienceTime();
|
||||||
ConfigManager.TimeValues jump =
|
ConfigManager.TimeValues jump =
|
||||||
ConfigManager.getInstance().getJumpTime();
|
ConfigManager.getInstance().getJumpTime();
|
||||||
|
ConfigManager.TimeValues healthTimes = ConfigManager.getInstance().getHealthTime();
|
||||||
|
ConfigManager.TimeValues hungerTimes = ConfigManager.getInstance().getHungerTime();
|
||||||
|
|
||||||
float hotbarAlpha = Main.getAlpha(hotbarTime,
|
float hotbarAlpha = Main.getAlpha(hotbarTime,
|
||||||
hotbar.getMaxTime(),
|
hotbar.getMaxTime(),
|
||||||
@@ -263,8 +266,21 @@ public class TimerUtils
|
|||||||
jump.getMaxTime(),
|
jump.getMaxTime(),
|
||||||
jump.getFadeInTime(),
|
jump.getFadeInTime(),
|
||||||
jump.getFadeOutTime());
|
jump.getFadeOutTime());
|
||||||
|
float statusAlpha = Main.getAlpha(healthTime,
|
||||||
|
healthTimes.getMaxTime(),
|
||||||
|
healthTimes.getFadeInTime(),
|
||||||
|
healthTimes.getFadeOutTime());
|
||||||
|
statusAlpha = Math.max(statusAlpha, Main.getAlpha(hungerTime,
|
||||||
|
hungerTimes.getMaxTime(),
|
||||||
|
hungerTimes.getFadeInTime(),
|
||||||
|
hungerTimes.getFadeOutTime()));
|
||||||
|
/*
|
||||||
|
* Draw it in its standard location until it is completely transparent, then move it
|
||||||
|
* instantly.
|
||||||
|
*/
|
||||||
|
statusAlpha = (float) Math.ceil(statusAlpha);
|
||||||
return 7 * (1 - Math.max(experienceAlpha,
|
return 7 * (1 - Math.max(experienceAlpha,
|
||||||
jumpAlpha)) + 22 * (1 - hotbarAlpha);
|
jumpAlpha)) + 22 * (1 - hotbarAlpha) + 42 * (1 - statusAlpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -272,9 +288,8 @@ public class TimerUtils
|
|||||||
* view, and briefly brings the health and hunger into view if the held item
|
* view, and briefly brings the health and hunger into view if the held item
|
||||||
* is food.
|
* is food.
|
||||||
*
|
*
|
||||||
* @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)
|
||||||
@@ -289,6 +304,7 @@ public class TimerUtils
|
|||||||
LivingEntity entity;
|
LivingEntity entity;
|
||||||
Item item;
|
Item item;
|
||||||
Iterator<ItemStack> hands;
|
Iterator<ItemStack> hands;
|
||||||
|
Set<Item> ignored;
|
||||||
if (mc.getCameraEntity() instanceof LivingEntity)
|
if (mc.getCameraEntity() instanceof LivingEntity)
|
||||||
{
|
{
|
||||||
entity = (LivingEntity) mc.getCameraEntity();
|
entity = (LivingEntity) mc.getCameraEntity();
|
||||||
@@ -314,6 +330,14 @@ public class TimerUtils
|
|||||||
.map(ItemStack::getItem)
|
.map(ItemStack::getItem)
|
||||||
.orElse(null);
|
.orElse(null);
|
||||||
}
|
}
|
||||||
|
if (item != null)
|
||||||
|
{
|
||||||
|
ignored = ConfigManager.getInstance().getIgnoredItems();
|
||||||
|
if (ignored.contains(item))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
crosshairTime = ConfigManager.getInstance().getCrosshairTime();
|
crosshairTime = ConfigManager.getInstance().getCrosshairTime();
|
||||||
if (hand == Hand.MAIN_HAND)
|
if (hand == Hand.MAIN_HAND)
|
||||||
{
|
{
|
||||||
@@ -330,11 +354,11 @@ public class TimerUtils
|
|||||||
if (item.isFood())
|
if (item.isFood())
|
||||||
{
|
{
|
||||||
healthTime = health.getMaxTime() - (healthTime > 0 ?
|
healthTime = health.getMaxTime() - (healthTime > 0 ?
|
||||||
health.getFadeInTime() :
|
health.getFadeInTime() :
|
||||||
0);
|
0);
|
||||||
hungerTime = hunger.getMaxTime() - (hungerTime > 0 ?
|
hungerTime = hunger.getMaxTime() - (hungerTime > 0 ?
|
||||||
hunger.getFadeInTime() :
|
hunger.getFadeInTime() :
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -347,11 +371,9 @@ public class TimerUtils
|
|||||||
* Run whenever a hand is rendered in 1st person. This brings the player
|
* Run whenever a hand is rendered in 1st person. This brings the player
|
||||||
* 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.
|
* @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,
|
||||||
@@ -417,7 +439,6 @@ 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,8 +475,8 @@ public class TimerUtils
|
|||||||
> 0)
|
> 0)
|
||||||
{
|
{
|
||||||
setAlpha(Main.getAlpha(crosshairTime > 0 ?
|
setAlpha(Main.getAlpha(crosshairTime > 0 ?
|
||||||
crosshairTime :
|
crosshairTime :
|
||||||
CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
|
CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -474,7 +495,6 @@ 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(MatrixStack stack, float ticks)
|
||||||
@@ -518,8 +538,8 @@ public class TimerUtils
|
|||||||
if (changed)
|
if (changed)
|
||||||
{
|
{
|
||||||
mountTime = healthTimes.getMaxTime() - (mountTime > 0 ?
|
mountTime = healthTimes.getMaxTime() - (mountTime > 0 ?
|
||||||
healthTimes.getFadeInTime() :
|
healthTimes.getFadeInTime() :
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
else if (mountTime > 0)
|
else if (mountTime > 0)
|
||||||
{
|
{
|
||||||
@@ -606,7 +626,6 @@ 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)
|
||||||
@@ -618,7 +637,8 @@ public class TimerUtils
|
|||||||
if (effectinstance.getDuration() <= BLINK_TIME)
|
if (effectinstance.getDuration() <= BLINK_TIME)
|
||||||
{
|
{
|
||||||
effectAlpha =
|
effectAlpha =
|
||||||
MathHelper.sin(7000F / (effectinstance.getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
|
MathHelper.sin(7000F / (effectinstance
|
||||||
|
.getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
|
||||||
.getDuration() + 100F) + 0.5F;
|
.getDuration() + 100F) + 0.5F;
|
||||||
}
|
}
|
||||||
else if (effectinstance.getDuration() <= BLINK_TIME + potion.getFadeInTime())
|
else if (effectinstance.getDuration() <= BLINK_TIME + potion.getFadeInTime())
|
||||||
@@ -643,7 +663,6 @@ 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()
|
||||||
@@ -671,7 +690,6 @@ 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)
|
||||||
@@ -715,8 +733,8 @@ public class TimerUtils
|
|||||||
if (changed)
|
if (changed)
|
||||||
{
|
{
|
||||||
healthTime = healthTimes.getMaxTime() - (healthTime > 0 ?
|
healthTime = healthTimes.getMaxTime() - (healthTime > 0 ?
|
||||||
healthTimes.getFadeInTime() :
|
healthTimes.getFadeInTime() :
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
else if (healthTime > 0)
|
else if (healthTime > 0)
|
||||||
{
|
{
|
||||||
@@ -747,7 +765,6 @@ 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)
|
||||||
@@ -794,8 +811,8 @@ public class TimerUtils
|
|||||||
if (changed)
|
if (changed)
|
||||||
{
|
{
|
||||||
hungerTime = hungerTimes.getMaxTime() - (hungerTime > 0 ?
|
hungerTime = hungerTimes.getMaxTime() - (hungerTime > 0 ?
|
||||||
hungerTimes.getFadeInTime() :
|
hungerTimes.getFadeInTime() :
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
else if (hungerTime > 0)
|
else if (hungerTime > 0)
|
||||||
{
|
{
|
||||||
@@ -826,9 +843,7 @@ public class TimerUtils
|
|||||||
* as needed.
|
* as needed.
|
||||||
*
|
*
|
||||||
* @param stack
|
* @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(MatrixStack stack, float ticks)
|
||||||
@@ -850,8 +865,8 @@ public class TimerUtils
|
|||||||
if (entity.method_3151() > 0)
|
if (entity.method_3151() > 0)
|
||||||
{
|
{
|
||||||
jumpTime = jump.getMaxTime() - (jumpTime > 0 ?
|
jumpTime = jump.getMaxTime() - (jumpTime > 0 ?
|
||||||
jump.getFadeInTime() :
|
jump.getFadeInTime() :
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
else if (jumpTime > 0)
|
else if (jumpTime > 0)
|
||||||
{
|
{
|
||||||
@@ -875,7 +890,6 @@ 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(MatrixStack stack, float ticks)
|
||||||
@@ -904,8 +918,8 @@ public class TimerUtils
|
|||||||
if (changed)
|
if (changed)
|
||||||
{
|
{
|
||||||
experienceTime = experience.getMaxTime() - (experienceTime > 0 ?
|
experienceTime = experience.getMaxTime() - (experienceTime > 0 ?
|
||||||
experience.getFadeInTime() :
|
experience.getFadeInTime() :
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
else if (experienceTime > 0)
|
else if (experienceTime > 0)
|
||||||
{
|
{
|
||||||
@@ -930,7 +944,6 @@ 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(MatrixStack)
|
||||||
* @since 0.1-1.16.4-fabric
|
* @since 0.1-1.16.4-fabric
|
||||||
*/
|
*/
|
||||||
@@ -1039,7 +1052,7 @@ public class TimerUtils
|
|||||||
{
|
{
|
||||||
if (entity.isUsingItem() && entity
|
if (entity.isUsingItem() && entity
|
||||||
.getActiveHand() != null && entity.getActiveHand()
|
.getActiveHand() != null && entity.getActiveHand()
|
||||||
.ordinal() == i)
|
.ordinal() == i)
|
||||||
{
|
{
|
||||||
switch (i)
|
switch (i)
|
||||||
{
|
{
|
||||||
@@ -1102,11 +1115,11 @@ public class TimerUtils
|
|||||||
if (item.isFood())
|
if (item.isFood())
|
||||||
{
|
{
|
||||||
healthTime = health.getMaxTime() - (healthTime > 0 ?
|
healthTime = health.getMaxTime() - (healthTime > 0 ?
|
||||||
health.getFadeInTime() :
|
health.getFadeInTime() :
|
||||||
0);
|
0);
|
||||||
hungerTime = hunger.getMaxTime() - (hungerTime > 0 ?
|
hungerTime = hunger.getMaxTime() - (hungerTime > 0 ?
|
||||||
hunger.getFadeInTime() :
|
hunger.getFadeInTime() :
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
if (i == 0)
|
if (i == 0)
|
||||||
{
|
{
|
||||||
@@ -1135,8 +1148,8 @@ public class TimerUtils
|
|||||||
if (changed)
|
if (changed)
|
||||||
{
|
{
|
||||||
hotbarTime = hotbar.getMaxTime() - (hotbarTime > 0 ?
|
hotbarTime = hotbar.getMaxTime() - (hotbarTime > 0 ?
|
||||||
hotbar.getFadeInTime() :
|
hotbar.getFadeInTime() :
|
||||||
0);
|
0);
|
||||||
}
|
}
|
||||||
else if (hotbarTime > 0)
|
else if (hotbarTime > 0)
|
||||||
{
|
{
|
||||||
@@ -1151,7 +1164,6 @@ 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(MatrixStack stack)
|
||||||
|
|||||||
@@ -338,7 +338,7 @@ public class HudHook
|
|||||||
@Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
@Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
||||||
"/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
|
"/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
|
||||||
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
|
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
|
||||||
ordinal = 1))
|
ordinal = 1, shift = At.Shift.BY, by = 3))
|
||||||
public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
|
public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
"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",
|
||||||
@@ -49,5 +50,8 @@
|
|||||||
"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"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user