Compare commits
8 Commits
v1.1-1.14-
...
v1.2-1.16.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cdc1139658 | ||
|
|
2b2c81aa45 | ||
|
|
5d7f44636b | ||
|
|
cf4ed2d4af | ||
|
|
93767421ee | ||
|
|
96718b2b57 | ||
|
|
e3c0f1d533 | ||
|
|
6daf696e01 |
@@ -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.0
|
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.
|
||||||
@@ -82,10 +90,13 @@ public class ConfigManager
|
|||||||
private TimeValues hungerTime = new TimeValues();
|
private TimeValues hungerTime = new TimeValues();
|
||||||
private TimeValues effectTime = new TimeValues();
|
private TimeValues effectTime = new TimeValues();
|
||||||
private int crosshairTime = 6 * TICKS_PER_SECOND;
|
private int crosshairTime = 6 * TICKS_PER_SECOND;
|
||||||
|
private boolean hideCrosshair = true;
|
||||||
private int handTime = 30 * TICKS_PER_SECOND;
|
private int handTime = 30 * TICKS_PER_SECOND;
|
||||||
|
private boolean hideHands = true;
|
||||||
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.
|
||||||
@@ -183,6 +194,15 @@ public class ConfigManager
|
|||||||
{
|
{
|
||||||
return this.crosshairTime;
|
return this.crosshairTime;
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* Checks whether the crosshairs should be hidden after a period of time.
|
||||||
|
*
|
||||||
|
* @return - Whether or not crosshairs will be hidden.
|
||||||
|
*/
|
||||||
|
public boolean hideCrosshair()
|
||||||
|
{
|
||||||
|
return this.hideCrosshair;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Obtains the time that the hands are allowed to display.
|
* Obtains the time that the hands are allowed to display.
|
||||||
@@ -194,6 +214,16 @@ public class ConfigManager
|
|||||||
return this.handTime;
|
return this.handTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks whether hands should be hidden after a period of time.
|
||||||
|
*
|
||||||
|
* @return - Whether or not hands will be hidden.
|
||||||
|
*/
|
||||||
|
public boolean hideHands()
|
||||||
|
{
|
||||||
|
return this.hideHands;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks whether the armor bar should render.
|
* Checks whether the armor bar should render.
|
||||||
*
|
*
|
||||||
@@ -226,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.
|
||||||
*
|
*
|
||||||
@@ -236,6 +286,16 @@ public class ConfigManager
|
|||||||
this.crosshairTime = time;
|
this.crosshairTime = time;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets whether the crosshairs should be hidden after a period of time.
|
||||||
|
*
|
||||||
|
* @param hide - Whether or not crosshairs will be hidden.
|
||||||
|
*/
|
||||||
|
public void hideCrosshair(boolean hide)
|
||||||
|
{
|
||||||
|
this.hideCrosshair = hide;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the time that the hands are allowed to display.
|
* Sets the time that the hands are allowed to display.
|
||||||
*
|
*
|
||||||
@@ -246,6 +306,16 @@ public class ConfigManager
|
|||||||
this.handTime = time;
|
this.handTime = time;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets whether hands should be hidden after a period of time.
|
||||||
|
*
|
||||||
|
* @param hide - Whether or not hands will be hidden.
|
||||||
|
*/
|
||||||
|
public void hideHands(boolean hide)
|
||||||
|
{
|
||||||
|
this.hideHands = hide;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines whether the armor bar should render.
|
* Determines whether the armor bar should render.
|
||||||
*
|
*
|
||||||
@@ -277,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,47 +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(
|
||||||
|
"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(
|
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(
|
||||||
|
"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(
|
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,
|
||||||
@@ -360,50 +382,54 @@ public class TimerUtils
|
|||||||
{
|
{
|
||||||
final float HAND_UP_TIME = 20F;
|
final float HAND_UP_TIME = 20F;
|
||||||
|
|
||||||
switch (hand)
|
boolean hideHands = ConfigManager.getInstance().hideHands();
|
||||||
|
if (hideHands)
|
||||||
{
|
{
|
||||||
case OFF_HAND:
|
switch (hand)
|
||||||
if (offHandTime == 0 && !offHandLock)
|
|
||||||
{
|
{
|
||||||
return true;
|
case OFF_HAND:
|
||||||
}
|
if (offHandTime == 0 && !offHandLock)
|
||||||
else if (!offHandLock && (mapLock & 0b01) == 0)
|
|
||||||
{
|
|
||||||
if (offHandTime > 0)
|
|
||||||
{
|
{
|
||||||
offHandTime -= ticks;
|
return true;
|
||||||
}
|
}
|
||||||
if (offHandTime < HAND_UP_TIME)
|
else if (!offHandLock && (mapLock & 0b01) == 0)
|
||||||
{
|
{
|
||||||
matrixStack
|
if (offHandTime > 0)
|
||||||
.translate(0,
|
{
|
||||||
-1.0F * (HAND_UP_TIME - offHandTime) /
|
offHandTime -= ticks;
|
||||||
HAND_UP_TIME,
|
}
|
||||||
0);
|
if (offHandTime < HAND_UP_TIME)
|
||||||
|
{
|
||||||
|
matrixStack
|
||||||
|
.translate(0,
|
||||||
|
-1.0F * (HAND_UP_TIME - offHandTime) /
|
||||||
|
HAND_UP_TIME,
|
||||||
|
0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
break;
|
||||||
break;
|
case MAIN_HAND:
|
||||||
case MAIN_HAND:
|
if (mainHandTime == 0 && !mainHandLock)
|
||||||
if (mainHandTime == 0 && !mainHandLock)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
else if (!mainHandLock && (mapLock & 0b10) == 0)
|
|
||||||
{
|
|
||||||
if (mainHandTime > 0)
|
|
||||||
{
|
{
|
||||||
mainHandTime -= ticks;
|
return true;
|
||||||
}
|
}
|
||||||
if (mainHandTime < HAND_UP_TIME)
|
else if (!mainHandLock && (mapLock & 0b10) == 0)
|
||||||
{
|
{
|
||||||
matrixStack
|
if (mainHandTime > 0)
|
||||||
.translate(0,
|
{
|
||||||
-1.0F * (HAND_UP_TIME - mainHandTime) /
|
mainHandTime -= ticks;
|
||||||
HAND_UP_TIME,
|
}
|
||||||
0);
|
if (mainHandTime < HAND_UP_TIME)
|
||||||
|
{
|
||||||
|
matrixStack
|
||||||
|
.translate(0,
|
||||||
|
-1.0F * (HAND_UP_TIME - mainHandTime) /
|
||||||
|
HAND_UP_TIME,
|
||||||
|
0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -413,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)
|
||||||
@@ -426,37 +451,41 @@ public class TimerUtils
|
|||||||
boolean changed = false;
|
boolean changed = false;
|
||||||
boolean canceled = false;
|
boolean canceled = false;
|
||||||
|
|
||||||
if (mc.crosshairTarget != null && mc.crosshairTarget
|
boolean hideCrosshair = ConfigManager.getInstance().hideCrosshair();
|
||||||
.getType() != HitResult.Type.MISS)
|
if (hideCrosshair)
|
||||||
{
|
{
|
||||||
if (mc.crosshairTarget.getType() == HitResult.Type
|
if (mc.crosshairTarget != null && mc.crosshairTarget
|
||||||
.ENTITY)
|
.getType() != HitResult.Type.MISS)
|
||||||
{
|
{
|
||||||
if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
|
if (mc.crosshairTarget.getType() == HitResult.Type
|
||||||
.getVehicle())
|
.ENTITY)
|
||||||
|
{
|
||||||
|
if (((EntityHitResult) mc.crosshairTarget).getEntity() != entity
|
||||||
|
.getVehicle())
|
||||||
|
{
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (changed || mainHandLock || offHandLock || crosshairTime
|
||||||
|
> 0)
|
||||||
|
{
|
||||||
|
setAlpha(Main.getAlpha(crosshairTime > 0 ?
|
||||||
|
crosshairTime :
|
||||||
|
CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
changed = true;
|
canceled = true;
|
||||||
|
}
|
||||||
|
if (crosshairTime > 0)
|
||||||
|
{
|
||||||
|
crosshairTime -= ticks;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (changed || mainHandLock || offHandLock || crosshairTime
|
|
||||||
> 0)
|
|
||||||
{
|
|
||||||
setAlpha(Main.getAlpha(crosshairTime > 0 ?
|
|
||||||
crosshairTime :
|
|
||||||
CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
canceled = true;
|
|
||||||
}
|
|
||||||
if (crosshairTime > 0)
|
|
||||||
{
|
|
||||||
crosshairTime -= ticks;
|
|
||||||
}
|
}
|
||||||
return canceled;
|
return canceled;
|
||||||
}
|
}
|
||||||
@@ -466,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)
|
||||||
@@ -488,7 +516,7 @@ public class TimerUtils
|
|||||||
LivingEntity mount;
|
LivingEntity mount;
|
||||||
boolean changed = false;
|
boolean changed = false;
|
||||||
|
|
||||||
if (tmp == null)
|
if (tmp == null || !(tmp instanceof LivingEntity))
|
||||||
{
|
{
|
||||||
mountHealth = -1;
|
mountHealth = -1;
|
||||||
mountMaxHealth = -1;
|
mountMaxHealth = -1;
|
||||||
@@ -510,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)
|
||||||
{
|
{
|
||||||
@@ -598,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)
|
||||||
@@ -610,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())
|
||||||
@@ -635,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()
|
||||||
@@ -663,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)
|
||||||
@@ -707,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)
|
||||||
{
|
{
|
||||||
@@ -739,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)
|
||||||
@@ -786,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)
|
||||||
{
|
{
|
||||||
@@ -818,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)
|
||||||
@@ -842,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)
|
||||||
{
|
{
|
||||||
@@ -867,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)
|
||||||
@@ -896,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)
|
||||||
{
|
{
|
||||||
@@ -922,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
|
||||||
*/
|
*/
|
||||||
@@ -1031,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)
|
||||||
{
|
{
|
||||||
@@ -1094,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)
|
||||||
{
|
{
|
||||||
@@ -1127,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)
|
||||||
{
|
{
|
||||||
@@ -1143,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)
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
|
|||||||
import net.minecraft.entity.LivingEntity;
|
import net.minecraft.entity.LivingEntity;
|
||||||
import net.minecraft.util.Hand;
|
import net.minecraft.util.Hand;
|
||||||
|
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
@@ -38,6 +40,9 @@ import markil3.immersive_hud.TimerUtils;
|
|||||||
@Mixin(ClientPlayerEntity.class)
|
@Mixin(ClientPlayerEntity.class)
|
||||||
public class ClientPlayerHook
|
public class ClientPlayerHook
|
||||||
{
|
{
|
||||||
|
private static final Logger LOGGER =
|
||||||
|
LogManager.getLogger(ClientPlayerHook.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Updates hand timing every time an attack is initiated.
|
* Updates hand timing every time an attack is initiated.
|
||||||
*
|
*
|
||||||
@@ -49,7 +54,18 @@ public class ClientPlayerHook
|
|||||||
@Inject(method = "swingHand", at = @At(value = "TAIL"))
|
@Inject(method = "swingHand", at = @At(value = "TAIL"))
|
||||||
public void swingHand(Hand hand, CallbackInfo callbackInfo)
|
public void swingHand(Hand hand, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
TimerUtils.onClick(hand, hand == null);
|
try
|
||||||
|
{
|
||||||
|
TimerUtils.onClick(hand, hand == null);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.network" +
|
||||||
|
".ClientPlayerEntity#swingHand " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -63,7 +79,18 @@ public class ClientPlayerHook
|
|||||||
@Inject(method = "setCurrentHand", at = @At(value = "TAIL"))
|
@Inject(method = "setCurrentHand", at = @At(value = "TAIL"))
|
||||||
public void setCurrentHand(Hand hand, CallbackInfo callbackInfo)
|
public void setCurrentHand(Hand hand, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
TimerUtils.onClick(hand, hand == null);
|
try
|
||||||
|
{
|
||||||
|
TimerUtils.onClick(hand, hand == null);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.network" +
|
||||||
|
".ClientPlayerEntity#setCurrentHand " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -76,10 +103,21 @@ public class ClientPlayerHook
|
|||||||
@Inject(method = "clearActiveItem", at = @At(value = "HEAD"))
|
@Inject(method = "clearActiveItem", at = @At(value = "HEAD"))
|
||||||
public void clearActiveItem(CallbackInfo callbackInfo)
|
public void clearActiveItem(CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
|
try
|
||||||
{
|
{
|
||||||
TimerUtils.onClick(((LivingEntity) MinecraftClient.getInstance().cameraEntity)
|
if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
|
||||||
.getActiveHand(), true);
|
{
|
||||||
|
TimerUtils.onClick(((LivingEntity) MinecraftClient.getInstance().cameraEntity)
|
||||||
|
.getActiveHand(), true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.network" +
|
||||||
|
".ClientPlayerEntity#clearActiveItem " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ import net.minecraft.client.util.math.MatrixStack;
|
|||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.Hand;
|
import net.minecraft.util.Hand;
|
||||||
|
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
@@ -40,6 +42,9 @@ import markil3.immersive_hud.TimerUtils;
|
|||||||
@Mixin(HeldItemRenderer.class)
|
@Mixin(HeldItemRenderer.class)
|
||||||
public class HeldItemHook
|
public class HeldItemHook
|
||||||
{
|
{
|
||||||
|
private static final Logger LOGGER =
|
||||||
|
LogManager.getLogger(HeldItemHook.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines whether or not to render a certain hand.
|
* Determines whether or not to render a certain hand.
|
||||||
*
|
*
|
||||||
@@ -72,9 +77,20 @@ public class HeldItemHook
|
|||||||
int light,
|
int light,
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
if (TimerUtils.onRenderHand(hand, matrices, tickDelta))
|
try
|
||||||
{
|
{
|
||||||
callbackInfo.cancel();
|
if (TimerUtils.onRenderHand(hand, matrices, tickDelta))
|
||||||
|
{
|
||||||
|
callbackInfo.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.render.item" +
|
||||||
|
".HeldItemRenderer#renderFirstPersonItem " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ import net.minecraft.client.network.ClientPlayerEntity;
|
|||||||
import net.minecraft.client.util.math.MatrixStack;
|
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.Logger;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
@@ -43,6 +45,8 @@ import markil3.immersive_hud.TimerUtils;
|
|||||||
@Mixin(InGameHud.class)
|
@Mixin(InGameHud.class)
|
||||||
public class HudHook
|
public class HudHook
|
||||||
{
|
{
|
||||||
|
private static final Logger LOGGER = LogManager.getLogger(HudHook.class);
|
||||||
|
|
||||||
private StatusEffectInstance currentEffect;
|
private StatusEffectInstance currentEffect;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -58,10 +62,21 @@ public class HudHook
|
|||||||
cancellable = true)
|
cancellable = true)
|
||||||
public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
|
try
|
||||||
.getTickDelta()))
|
|
||||||
{
|
{
|
||||||
callbackInfo.cancel();
|
if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
|
||||||
|
.getTickDelta()))
|
||||||
|
{
|
||||||
|
callbackInfo.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#startCrosshair " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,10 +92,21 @@ public class HudHook
|
|||||||
@Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
|
@Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
|
||||||
public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
/*
|
try
|
||||||
* Resets the color so that nothing else is bothered.
|
{
|
||||||
*/
|
/*
|
||||||
TimerUtils.resetAlpha();
|
* Resets the color so that nothing else is bothered.
|
||||||
|
*/
|
||||||
|
TimerUtils.resetAlpha();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderCrosshair " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -98,10 +124,21 @@ public class HudHook
|
|||||||
int x,
|
int x,
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
if (TimerUtils.drawJumpbar(stack,
|
try
|
||||||
MinecraftClient.getInstance().getTickDelta()))
|
|
||||||
{
|
{
|
||||||
callbackInfo.cancel();
|
if (TimerUtils.drawJumpbar(stack,
|
||||||
|
MinecraftClient.getInstance().getTickDelta()))
|
||||||
|
{
|
||||||
|
callbackInfo.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderMountJumpBar " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,11 +156,22 @@ public class HudHook
|
|||||||
int x,
|
int x,
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
stack.pop();
|
try
|
||||||
/*
|
{
|
||||||
* Resets the color so that nothing else is bothered.
|
stack.pop();
|
||||||
*/
|
/*
|
||||||
TimerUtils.resetAlpha();
|
* Resets the color so that nothing else is bothered.
|
||||||
|
*/
|
||||||
|
TimerUtils.resetAlpha();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderMountJumpBar " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -141,10 +189,21 @@ public class HudHook
|
|||||||
int x,
|
int x,
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
if (TimerUtils.drawExperience(stack,
|
try
|
||||||
MinecraftClient.getInstance().getTickDelta()))
|
|
||||||
{
|
{
|
||||||
callbackInfo.cancel();
|
if (TimerUtils.drawExperience(stack,
|
||||||
|
MinecraftClient.getInstance().getTickDelta()))
|
||||||
|
{
|
||||||
|
callbackInfo.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderExperienceBar " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -162,11 +221,22 @@ public class HudHook
|
|||||||
int x,
|
int x,
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
stack.pop();
|
try
|
||||||
/*
|
{
|
||||||
* Resets the color so that nothing else is bothered.
|
stack.pop();
|
||||||
*/
|
/*
|
||||||
TimerUtils.resetAlpha();
|
* Resets the color so that nothing else is bothered.
|
||||||
|
*/
|
||||||
|
TimerUtils.resetAlpha();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderExperienceBar " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -181,8 +251,19 @@ public class HudHook
|
|||||||
"/math/MatrixStack;)V", at = @At("HEAD"))
|
"/math/MatrixStack;)V", at = @At("HEAD"))
|
||||||
public MatrixStack startStatus(MatrixStack stack)
|
public MatrixStack startStatus(MatrixStack stack)
|
||||||
{
|
{
|
||||||
stack.push();
|
try
|
||||||
stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
|
{
|
||||||
|
stack.push();
|
||||||
|
stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderStatusBars " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
return stack;
|
return stack;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -197,9 +278,20 @@ public class HudHook
|
|||||||
"/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
|
"/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
|
||||||
public void renderArmor(MatrixStack matrices, CallbackInfo callbackInfo)
|
public void renderArmor(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
if (TimerUtils.drawArmor())
|
try
|
||||||
{
|
{
|
||||||
TimerUtils.setAlpha(0F);
|
if (TimerUtils.drawArmor())
|
||||||
|
{
|
||||||
|
TimerUtils.setAlpha(0F);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderStatusBars " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -215,13 +307,25 @@ public class HudHook
|
|||||||
ordinal = 0))
|
ordinal = 0))
|
||||||
public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
|
public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
/*
|
try
|
||||||
* Resets the transparency from the previous call.
|
|
||||||
*/
|
|
||||||
TimerUtils.setAlpha(1F);
|
|
||||||
if (TimerUtils.drawHealth(MinecraftClient.getInstance().getTickDelta()))
|
|
||||||
{
|
{
|
||||||
TimerUtils.setAlpha(0F);
|
/*
|
||||||
|
* Resets the transparency from the previous call.
|
||||||
|
*/
|
||||||
|
TimerUtils.setAlpha(1F);
|
||||||
|
if (TimerUtils.drawHealth(MinecraftClient.getInstance()
|
||||||
|
.getTickDelta()))
|
||||||
|
{
|
||||||
|
TimerUtils.setAlpha(0F);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderStatusBars " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -234,16 +338,28 @@ 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
|
||||||
* Resets the transparency from the previous call.
|
|
||||||
*/
|
|
||||||
TimerUtils.setAlpha(1F);
|
|
||||||
if (TimerUtils.drawHunger(MinecraftClient.getInstance().getTickDelta()))
|
|
||||||
{
|
{
|
||||||
TimerUtils.setAlpha(0F);
|
/*
|
||||||
|
* Resets the transparency from the previous call.
|
||||||
|
*/
|
||||||
|
TimerUtils.setAlpha(1F);
|
||||||
|
if (TimerUtils.drawHunger(MinecraftClient.getInstance()
|
||||||
|
.getTickDelta()))
|
||||||
|
{
|
||||||
|
TimerUtils.setAlpha(0F);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderStatusBars " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -259,17 +375,39 @@ public class HudHook
|
|||||||
ordinal = 2))
|
ordinal = 2))
|
||||||
public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
|
public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
/*
|
try
|
||||||
* Resets the color so that nothing else is bothered.
|
{
|
||||||
*/
|
/*
|
||||||
TimerUtils.setAlpha(1F);
|
* Resets the color so that nothing else is bothered.
|
||||||
|
*/
|
||||||
|
TimerUtils.setAlpha(1F);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderStatusBars " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
@ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
||||||
"/math/MatrixStack;)V", at = @At("TAIL"))
|
"/math/MatrixStack;)V", at = @At("TAIL"))
|
||||||
public MatrixStack finishStatus(MatrixStack stack)
|
public MatrixStack finishStatus(MatrixStack stack)
|
||||||
{
|
{
|
||||||
stack.pop();
|
try
|
||||||
|
{
|
||||||
|
stack.pop();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderStatusBars " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
return stack;
|
return stack;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -286,10 +424,21 @@ public class HudHook
|
|||||||
cancellable = true)
|
cancellable = true)
|
||||||
public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
if (TimerUtils.drawMountHealth(stack,
|
try
|
||||||
MinecraftClient.getInstance().getTickDelta()))
|
|
||||||
{
|
{
|
||||||
callbackInfo.cancel();
|
if (TimerUtils.drawMountHealth(stack,
|
||||||
|
MinecraftClient.getInstance().getTickDelta()))
|
||||||
|
{
|
||||||
|
callbackInfo.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderMountHealth " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -305,11 +454,22 @@ public class HudHook
|
|||||||
@Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
|
@Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
|
||||||
public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
/*
|
try
|
||||||
* Resets the color so that nothing else is bothered.
|
{
|
||||||
*/
|
/*
|
||||||
stack.pop();
|
* Resets the color so that nothing else is bothered.
|
||||||
TimerUtils.resetAlpha();
|
*/
|
||||||
|
stack.pop();
|
||||||
|
TimerUtils.resetAlpha();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderMountHealth " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -323,9 +483,20 @@ public class HudHook
|
|||||||
@At(value = "HEAD", shift = At.Shift.AFTER))
|
@At(value = "HEAD", shift = At.Shift.AFTER))
|
||||||
public void startPotion(MatrixStack effect, CallbackInfo info)
|
public void startPotion(MatrixStack effect, CallbackInfo info)
|
||||||
{
|
{
|
||||||
TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
|
try
|
||||||
((ClientPlayerEntity) MinecraftClient.getInstance().cameraEntity) :
|
{
|
||||||
null);
|
TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
|
||||||
|
((ClientPlayerEntity) MinecraftClient.getInstance().cameraEntity) :
|
||||||
|
null);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderStatusEffectOverlay " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -342,9 +513,21 @@ public class HudHook
|
|||||||
"shouldShowIcon()Z"))
|
"shouldShowIcon()Z"))
|
||||||
public boolean shouldRenderPotion(StatusEffectInstance effect)
|
public boolean shouldRenderPotion(StatusEffectInstance effect)
|
||||||
{
|
{
|
||||||
currentEffect = effect;
|
try
|
||||||
return TimerUtils.updatePotion(effect,
|
{
|
||||||
MinecraftClient.getInstance().getTickDelta());
|
currentEffect = effect;
|
||||||
|
return TimerUtils.updatePotion(effect,
|
||||||
|
MinecraftClient.getInstance().getTickDelta());
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderStatusEffectOverlay " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -362,7 +545,19 @@ public class HudHook
|
|||||||
public float updatePotion(float f,
|
public float updatePotion(float f,
|
||||||
MatrixStack stack)
|
MatrixStack stack)
|
||||||
{
|
{
|
||||||
return TimerUtils.getPotionAlpha(currentEffect);
|
try
|
||||||
|
{
|
||||||
|
return TimerUtils.getPotionAlpha(currentEffect);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderStatusEffectOverlay " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
|
return 1F;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -378,10 +573,21 @@ public class HudHook
|
|||||||
public void finishPotion(MatrixStack matrices,
|
public void finishPotion(MatrixStack matrices,
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
/*
|
try
|
||||||
* Resets the color so that nothing else is bothered.
|
{
|
||||||
*/
|
/*
|
||||||
TimerUtils.resetAlpha();
|
* Resets the color so that nothing else is bothered.
|
||||||
|
*/
|
||||||
|
TimerUtils.resetAlpha();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderStatusEffectOverlay " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -400,9 +606,20 @@ public class HudHook
|
|||||||
MatrixStack matrices,
|
MatrixStack matrices,
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
if (TimerUtils.updateHotbar(tickDelta))
|
try
|
||||||
{
|
{
|
||||||
callbackInfo.cancel();
|
if (TimerUtils.updateHotbar(tickDelta))
|
||||||
|
{
|
||||||
|
callbackInfo.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderHotbar " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -423,7 +640,18 @@ public class HudHook
|
|||||||
MatrixStack matrices,
|
MatrixStack matrices,
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
TimerUtils.recolorHotbar(matrices);
|
try
|
||||||
|
{
|
||||||
|
TimerUtils.recolorHotbar(matrices);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderHotbar " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -441,11 +669,22 @@ public class HudHook
|
|||||||
MatrixStack stack,
|
MatrixStack stack,
|
||||||
CallbackInfo callbackInfo)
|
CallbackInfo callbackInfo)
|
||||||
{
|
{
|
||||||
RenderSystem.popMatrix();
|
try
|
||||||
stack.pop();
|
{
|
||||||
/*
|
RenderSystem.popMatrix();
|
||||||
* Resets the color so that nothing else is bothered.
|
stack.pop();
|
||||||
*/
|
/*
|
||||||
TimerUtils.resetAlpha();
|
* Resets the color so that nothing else is bothered.
|
||||||
|
*/
|
||||||
|
TimerUtils.resetAlpha();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
LOGGER.error(
|
||||||
|
"Error in running net.minecraft.client.gui.hud" +
|
||||||
|
".InGameHud#renderHotbar " +
|
||||||
|
"event",
|
||||||
|
e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,10 +19,13 @@
|
|||||||
"option.immersive_hud.effectFadeIn": "Potion Fade In Time",
|
"option.immersive_hud.effectFadeIn": "Potion Fade In Time",
|
||||||
"option.immersive_hud.effectFadeOut": "Potion Fade Out Time",
|
"option.immersive_hud.effectFadeOut": "Potion Fade Out Time",
|
||||||
"option.immersive_hud.crosshairTime": "Crosshair Display Time",
|
"option.immersive_hud.crosshairTime": "Crosshair Display Time",
|
||||||
|
"option.immersive_hud.hideCrosshair": "Hide Crosshair",
|
||||||
"option.immersive_hud.handTime": "Hand Display Time",
|
"option.immersive_hud.handTime": "Hand Display Time",
|
||||||
|
"option.immersive_hud.hideHands": "Hide Hands",
|
||||||
"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",
|
||||||
@@ -42,8 +45,13 @@
|
|||||||
"tooltip.immersive_hud.effectFadeIn": "How many seconds it takes for potion icons to fade in",
|
"tooltip.immersive_hud.effectFadeIn": "How many seconds it takes for potion icons to fade in",
|
||||||
"tooltip.immersive_hud.effectFadeOut": "How many seconds it takes for potion icons to fade out",
|
"tooltip.immersive_hud.effectFadeOut": "How many seconds it takes for potion icons to fade out",
|
||||||
"tooltip.immersive_hud.crosshairTime": "How many seconds the crosshairs can be on screen",
|
"tooltip.immersive_hud.crosshairTime": "How many seconds the crosshairs can be on screen",
|
||||||
|
"tooltip.immersive_hud.hideCrosshair": "Whether or not the crosshairs should be hidden after a period of time",
|
||||||
"tooltip.immersive_hud.handTime": "How many seconds the hands can be on screen",
|
"tooltip.immersive_hud.handTime": "How many seconds the hands can be on screen",
|
||||||
|
"tooltip.immersive_hud.hideHands": "Whether or not hands should be hidden after a period of time",
|
||||||
"tooltip.immersive_hud.minHealth": "When the percentage of health goes below this level, the health bar won't fade away",
|
"tooltip.immersive_hud.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"
|
||||||
}
|
}
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
},
|
},
|
||||||
"mixins": [
|
"mixins": [
|
||||||
{
|
{
|
||||||
"config": "modid.mixins.json",
|
"config": "immersive_hud.mixins.json",
|
||||||
"environment": "client"
|
"environment": "client"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user