Compare commits
3 Commits
v1.1.1-1.1
...
1.16.4-fab
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cdc1139658 | ||
|
|
2b2c81aa45 | ||
|
|
5d7f44636b |
0
.github/workflows/build.yml
vendored
Executable file → Normal file
2
.gitignore
vendored
Executable file → Normal file
@@ -32,5 +32,3 @@ bin/
|
||||
|
||||
run/
|
||||
/logs/
|
||||
local.properties
|
||||
remappedSrc/
|
||||
|
||||
15
build.gradle
Executable file → Normal file
@@ -1,10 +1,10 @@
|
||||
plugins {
|
||||
id 'fabric-loom' version '0.8-SNAPSHOT'
|
||||
id 'fabric-loom' version '0.5-SNAPSHOT'
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_16
|
||||
targetCompatibility = JavaVersion.VERSION_16
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
|
||||
archivesBaseName = project.archives_base_name
|
||||
version = project.mod_version + "-" + project.minecraft_version + "-fabric"
|
||||
@@ -43,8 +43,13 @@ tasks.withType(JavaCompile).configureEach {
|
||||
// If Javadoc is generated, this must be specified in that task too.
|
||||
it.options.encoding = "UTF-8"
|
||||
|
||||
// Minecraft 1.17 (21w19a) upwards uses Java 16.
|
||||
it.options.release = 16
|
||||
// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
|
||||
// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
|
||||
// We'll use that if it's available, but otherwise we'll use the older option.
|
||||
def targetVersion = 8
|
||||
if (JavaVersion.current().isJava9Compatible()) {
|
||||
it.options.release = targetVersion
|
||||
}
|
||||
}
|
||||
|
||||
java {
|
||||
|
||||
0
demo.gif
Executable file → Normal file
|
Before Width: | Height: | Size: 37 MiB After Width: | Height: | Size: 37 MiB |
12
gradle.properties
Executable file → Normal file
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
|
||||
|
||||
# Fabric Properties
|
||||
# check these on https://fabricmc.net/use
|
||||
minecraft_version=1.17
|
||||
yarn_mappings=1.17+build.1
|
||||
loader_version=0.11.3
|
||||
minecraft_version=1.16.4
|
||||
yarn_mappings=1.16.4+build.9
|
||||
loader_version=0.11.1
|
||||
|
||||
cloth_version=5.0.34
|
||||
modmenu_version=2.0.2
|
||||
cloth_version=4.11.14
|
||||
modmenu_version=1.16.8
|
||||
|
||||
# Mod Properties
|
||||
mod_version = 1.1.1
|
||||
mod_version = 1.2
|
||||
maven_group = markil3
|
||||
archives_base_name = immersive_hud
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
0
screenshot1.png
Executable file → Normal file
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.3 MiB |
0
screenshot2.png
Executable file → Normal file
|
Before Width: | Height: | Size: 767 KiB After Width: | Height: | Size: 767 KiB |
0
screenshot3.png
Executable file → Normal file
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 1.4 MiB |
0
screenshot4.png
Executable file → Normal file
|
Before Width: | Height: | Size: 983 KiB After Width: | Height: | Size: 983 KiB |
0
screenshot5.png
Executable file → Normal file
|
Before Width: | Height: | Size: 405 KiB After Width: | Height: | Size: 405 KiB |
0
settings.gradle
Executable file → Normal file
49
src/main/java/markil3/immersive_hud/ConfigManager.java
Executable file → Normal file
@@ -1,11 +1,19 @@
|
||||
package markil3.immersive_hud;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
||||
import me.shedaniel.autoconfig.AutoConfig;
|
||||
|
||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Configuration manager of this mod, which reads from and writes to this mod's
|
||||
* configuration file.
|
||||
@@ -88,6 +96,7 @@ public class ConfigManager
|
||||
private boolean showArmor = true;
|
||||
private double minHealth = 0.5;
|
||||
private int minHunger = 17;
|
||||
private Identifier[] ignoredItems = new Identifier[]{Registry.ITEM.getId(Items.FIREWORK_ROCKET)};
|
||||
|
||||
/**
|
||||
* Returns the instance of this class.
|
||||
@@ -247,6 +256,26 @@ public class ConfigManager
|
||||
return this.minHunger;
|
||||
}
|
||||
|
||||
/**
|
||||
* Obtains a collection of items that won't cause hands and crosshairs to show when used.
|
||||
*
|
||||
* @return A set of ignored items.
|
||||
*/
|
||||
public Set<Item> getIgnoredItems()
|
||||
{
|
||||
return Arrays.stream(ignoredItems).map(Registry.ITEM::get).collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*
|
||||
@@ -318,6 +347,26 @@ public class ConfigManager
|
||||
{
|
||||
this.minHunger = MathHelper.clamp(boundary, 0, 20);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets which items won't cause the hands and crosshairs to show when used.
|
||||
*
|
||||
* @param items - A set of ignored items.
|
||||
*/
|
||||
public void setIgnoredItems(Item... items)
|
||||
{
|
||||
this.ignoredItems = Arrays.stream(items).map(Registry.ITEM::getId).toArray(Identifier[]::new);
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
|
||||
0
src/main/java/markil3/immersive_hud/ConfigManagerCloth.java
Executable file → Normal file
0
src/main/java/markil3/immersive_hud/Main.java
Executable file → Normal file
193
src/main/java/markil3/immersive_hud/ModMenu.java
Executable file → Normal file
@@ -3,7 +3,11 @@ package markil3.immersive_hud;
|
||||
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
||||
import com.terraformersmc.modmenu.api.ModMenuApi;
|
||||
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.InvalidIdentifierException;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
|
||||
import me.shedaniel.autoconfig.AutoConfig;
|
||||
import me.shedaniel.clothconfig2.api.ConfigBuilder;
|
||||
@@ -13,6 +17,11 @@ import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
|
||||
|
||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ModMenu implements ModMenuApi
|
||||
{
|
||||
|
||||
@@ -29,42 +38,45 @@ public class ModMenu implements ModMenuApi
|
||||
"option.immersive_hud." + name +
|
||||
"MaxTime"),
|
||||
(float) value.getMaxTime() / TICKS_PER_SECOND)
|
||||
.setDefaultValue(SHOW_TIME)
|
||||
.setMin(0)
|
||||
.setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud." + name +
|
||||
"MaxTime"))
|
||||
.setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build();
|
||||
.setDefaultValue(SHOW_TIME)
|
||||
.setMin(0)
|
||||
.setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud." + name +
|
||||
"MaxTime"))
|
||||
.setSaveConsumer(val -> value
|
||||
.setMaxTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build();
|
||||
|
||||
DoubleListEntry fadeIn =
|
||||
entryBuilder.startDoubleField(new TranslatableText(
|
||||
"option.immersive_hud." + name +
|
||||
"FadeIn"),
|
||||
(float) value.getFadeInTime() / TICKS_PER_SECOND)
|
||||
.setDefaultValue(FADE_IN)
|
||||
.setMin(0)
|
||||
.setMax(10 * 60 * TICKS_PER_SECOND)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud." + name +
|
||||
"FadeIn"))
|
||||
.setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build();
|
||||
.setDefaultValue(FADE_IN)
|
||||
.setMin(0)
|
||||
.setMax(10 * 60 * TICKS_PER_SECOND)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud." + name +
|
||||
"FadeIn"))
|
||||
.setSaveConsumer(val -> value
|
||||
.setFadeInTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build();
|
||||
|
||||
DoubleListEntry fadeOut =
|
||||
entryBuilder.startDoubleField(new TranslatableText(
|
||||
"option.immersive_hud." + name +
|
||||
"FadeOut"),
|
||||
(float) value.getFadeOutTime() / TICKS_PER_SECOND)
|
||||
.setDefaultValue(FADE_OUT)
|
||||
.setMin(0)
|
||||
.setMax(10 * 60 * TICKS_PER_SECOND)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud." + name +
|
||||
"FadeOut"))
|
||||
.setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build();
|
||||
.setDefaultValue(FADE_OUT)
|
||||
.setMin(0)
|
||||
.setMax(10 * 60 * TICKS_PER_SECOND)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud." + name +
|
||||
"FadeOut"))
|
||||
.setSaveConsumer(val -> value
|
||||
.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build();
|
||||
|
||||
cat.addEntry(maxTime);
|
||||
cat.addEntry(fadeIn);
|
||||
@@ -79,23 +91,25 @@ public class ModMenu implements ModMenuApi
|
||||
ConfigEntryBuilder entryBuilder;
|
||||
ConfigManager instance = ConfigManager.getInstance();
|
||||
final ConfigBuilder builder = ConfigBuilder.create()
|
||||
.setParentScreen(screen)
|
||||
.setTitle(new TranslatableText(
|
||||
"immersive_hud.configGui.title"))
|
||||
.setSavingRunnable(() -> {
|
||||
try
|
||||
{
|
||||
if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
||||
{
|
||||
AutoConfig.getConfigHolder(ConfigManagerCloth.class)
|
||||
.save();
|
||||
}
|
||||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
// Do nothing
|
||||
}
|
||||
});
|
||||
.setParentScreen(screen)
|
||||
.setTitle(new TranslatableText(
|
||||
"immersive_hud.configGui.title"))
|
||||
.setSavingRunnable(() -> {
|
||||
try
|
||||
{
|
||||
if (Class
|
||||
.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
||||
{
|
||||
AutoConfig
|
||||
.getConfigHolder(ConfigManagerCloth.class)
|
||||
.save();
|
||||
}
|
||||
}
|
||||
catch (ClassNotFoundException e)
|
||||
{
|
||||
// Do nothing
|
||||
}
|
||||
});
|
||||
general =
|
||||
builder.getOrCreateCategory(new TranslatableText(
|
||||
"category.immersive_hud.general"));
|
||||
@@ -124,65 +138,92 @@ public class ModMenu implements ModMenuApi
|
||||
"option.immersive_hud" +
|
||||
".crosshairTime"),
|
||||
(float) instance.getCrosshairTime() / TICKS_PER_SECOND)
|
||||
.setDefaultValue(6)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud" +
|
||||
".crosshairTime"))
|
||||
.setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build());
|
||||
.setDefaultValue(6)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud" +
|
||||
".crosshairTime"))
|
||||
.setSaveConsumer(val -> instance
|
||||
.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
||||
"option.immersive_hud.hideCrosshair"),
|
||||
instance.hideCrosshair())
|
||||
.setDefaultValue(true)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.hideCrosshair"))
|
||||
.setSaveConsumer(val -> instance.hideCrosshair(val))
|
||||
.build());
|
||||
.setDefaultValue(true)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.hideCrosshair"))
|
||||
.setSaveConsumer(val -> instance.hideCrosshair(val))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
||||
"option.immersive_hud.handTime"),
|
||||
(float) instance.getHandTime() / TICKS_PER_SECOND)
|
||||
.setDefaultValue(30)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.handTime"))
|
||||
.setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build());
|
||||
.setDefaultValue(30)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.handTime"))
|
||||
.setSaveConsumer(val -> instance
|
||||
.setHandTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
||||
"option.immersive_hud.hideHands"),
|
||||
instance.hideHands())
|
||||
.setDefaultValue(true)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.hideHands"))
|
||||
.setSaveConsumer(val -> instance.hideHands(val))
|
||||
.build());
|
||||
.setDefaultValue(true)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.hideHands"))
|
||||
.setSaveConsumer(val -> instance.hideHands(val))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
||||
"option.immersive_hud.minHealth"),
|
||||
instance.getMinHealth())
|
||||
.setDefaultValue(0.5)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.minHealth"))
|
||||
.setSaveConsumer(val -> instance.setMinHealth(val))
|
||||
.build());
|
||||
.setDefaultValue(0.5)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.minHealth"))
|
||||
.setSaveConsumer(val -> instance.setMinHealth(val))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startIntField(new TranslatableText(
|
||||
"option.immersive_hud.minHunger"),
|
||||
instance.getMinHunger())
|
||||
.setDefaultValue(17)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.minHunger"))
|
||||
.setSaveConsumer(val -> instance.setMinHunger(val))
|
||||
.build());
|
||||
.setDefaultValue(17)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.minHunger"))
|
||||
.setSaveConsumer(val -> instance.setMinHunger(val))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
||||
"option.immersive_hud.showArmor"),
|
||||
instance.shouldShowArmor())
|
||||
.setDefaultValue(true)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.showArmor"))
|
||||
.setSaveConsumer(val -> instance.shouldShowArmor(val))
|
||||
.setDefaultValue(true)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.showArmor"))
|
||||
.setSaveConsumer(val -> instance.shouldShowArmor(val))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder
|
||||
.startStrList(new TranslatableText("option.immersive_hud.ignoreList"), Arrays
|
||||
.asList(instance
|
||||
.getIgnoredIdentifiers()).stream().map(Identifier::toString)
|
||||
.collect(Collectors.toList()))
|
||||
.setDefaultValue(Arrays
|
||||
.asList(Registry.ITEM.getId(Items.FIREWORK_ROCKET).toString()))
|
||||
.setTooltip(new TranslatableText("tooltip.immersive_hud.ignoreList"))
|
||||
.setSaveConsumer(val -> instance.setIgnoredItems(val.toArray(new String[0]))).setErrorSupplier(val -> {
|
||||
try
|
||||
{
|
||||
Optional<String> item = val.stream().filter(i -> !Registry.ITEM.getOrEmpty(new Identifier(i)).isPresent()).findFirst();
|
||||
if (item.isPresent())
|
||||
{
|
||||
return Optional.of(new TranslatableText("error.immersive_hud.ignoreList.unknownItem"));
|
||||
}
|
||||
}
|
||||
catch (InvalidIdentifierException e)
|
||||
{
|
||||
return Optional.of(new TranslatableText("error.immersive_hud.ignoreList.illegalId"));
|
||||
}
|
||||
return Optional.empty();
|
||||
})
|
||||
.build());
|
||||
|
||||
return builder.build();
|
||||
|
||||
115
src/main/java/markil3/immersive_hud/TimerUtils.java
Executable file → Normal file
@@ -49,12 +49,13 @@ import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Contains the logic for changing the HUD.
|
||||
*
|
||||
* @author Markil 3
|
||||
* @version 1.1.1-1.17-fabric
|
||||
* @version 0.1-1.16.4-fabric
|
||||
*/
|
||||
public class TimerUtils
|
||||
{
|
||||
@@ -173,7 +174,7 @@ public class TimerUtils
|
||||
*/
|
||||
public static void setAlpha(float alpha)
|
||||
{
|
||||
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
|
||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -250,6 +251,8 @@ public class TimerUtils
|
||||
ConfigManager.getInstance().getExperienceTime();
|
||||
ConfigManager.TimeValues jump =
|
||||
ConfigManager.getInstance().getJumpTime();
|
||||
ConfigManager.TimeValues healthTimes = ConfigManager.getInstance().getHealthTime();
|
||||
ConfigManager.TimeValues hungerTimes = ConfigManager.getInstance().getHungerTime();
|
||||
|
||||
float hotbarAlpha = Main.getAlpha(hotbarTime,
|
||||
hotbar.getMaxTime(),
|
||||
@@ -263,8 +266,21 @@ public class TimerUtils
|
||||
jump.getMaxTime(),
|
||||
jump.getFadeInTime(),
|
||||
jump.getFadeOutTime());
|
||||
float statusAlpha = Main.getAlpha(healthTime,
|
||||
healthTimes.getMaxTime(),
|
||||
healthTimes.getFadeInTime(),
|
||||
healthTimes.getFadeOutTime());
|
||||
statusAlpha = Math.max(statusAlpha, Main.getAlpha(hungerTime,
|
||||
hungerTimes.getMaxTime(),
|
||||
hungerTimes.getFadeInTime(),
|
||||
hungerTimes.getFadeOutTime()));
|
||||
/*
|
||||
* Draw it in its standard location until it is completely transparent, then move it
|
||||
* instantly.
|
||||
*/
|
||||
statusAlpha = (float) Math.ceil(statusAlpha);
|
||||
return 7 * (1 - Math.max(experienceAlpha,
|
||||
jumpAlpha)) + 22 * (1 - hotbarAlpha);
|
||||
jumpAlpha)) + 22 * (1 - hotbarAlpha) + 42 * (1 - statusAlpha);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -272,9 +288,8 @@ public class TimerUtils
|
||||
* view, and briefly brings the health and hunger into view if the held item
|
||||
* is food.
|
||||
*
|
||||
* @param hand - The hand being triggered
|
||||
* @param hand - The hand being triggered
|
||||
* @param clear - Whether the hand it being enabled or disabled.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static void onClick(Hand hand, boolean clear)
|
||||
@@ -289,6 +304,7 @@ public class TimerUtils
|
||||
LivingEntity entity;
|
||||
Item item;
|
||||
Iterator<ItemStack> hands;
|
||||
Set<Item> ignored;
|
||||
if (mc.getCameraEntity() instanceof LivingEntity)
|
||||
{
|
||||
entity = (LivingEntity) mc.getCameraEntity();
|
||||
@@ -314,6 +330,14 @@ public class TimerUtils
|
||||
.map(ItemStack::getItem)
|
||||
.orElse(null);
|
||||
}
|
||||
if (item != null)
|
||||
{
|
||||
ignored = ConfigManager.getInstance().getIgnoredItems();
|
||||
if (ignored.contains(item))
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
crosshairTime = ConfigManager.getInstance().getCrosshairTime();
|
||||
if (hand == Hand.MAIN_HAND)
|
||||
{
|
||||
@@ -330,11 +354,11 @@ public class TimerUtils
|
||||
if (item.isFood())
|
||||
{
|
||||
healthTime = health.getMaxTime() - (healthTime > 0 ?
|
||||
health.getFadeInTime() :
|
||||
0);
|
||||
health.getFadeInTime() :
|
||||
0);
|
||||
hungerTime = hunger.getMaxTime() - (hungerTime > 0 ?
|
||||
hunger.getFadeInTime() :
|
||||
0);
|
||||
hunger.getFadeInTime() :
|
||||
0);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -347,11 +371,9 @@ public class TimerUtils
|
||||
* Run whenever a hand is rendered in 1st person. This brings the player
|
||||
* hands into and out of view as needed.
|
||||
*
|
||||
* @param hand - The hand being rendered.
|
||||
* @param hand - The hand being rendered.
|
||||
* @param matrixStack - The rendering stack.
|
||||
*
|
||||
* @return If true, then don't render this hand at all.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean onRenderHand(Hand hand,
|
||||
@@ -417,7 +439,6 @@ public class TimerUtils
|
||||
* needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the crosshair.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawCrosshair(float ticks)
|
||||
@@ -454,8 +475,8 @@ public class TimerUtils
|
||||
> 0)
|
||||
{
|
||||
setAlpha(Main.getAlpha(crosshairTime > 0 ?
|
||||
crosshairTime :
|
||||
CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
|
||||
crosshairTime :
|
||||
CROSSHAIR_TIME, CROSSHAIR_TIME, 0, 0));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -474,7 +495,6 @@ public class TimerUtils
|
||||
* as needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the mount health bar.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawMountHealth(MatrixStack stack, float ticks)
|
||||
@@ -518,8 +538,8 @@ public class TimerUtils
|
||||
if (changed)
|
||||
{
|
||||
mountTime = healthTimes.getMaxTime() - (mountTime > 0 ?
|
||||
healthTimes.getFadeInTime() :
|
||||
0);
|
||||
healthTimes.getFadeInTime() :
|
||||
0);
|
||||
}
|
||||
else if (mountTime > 0)
|
||||
{
|
||||
@@ -606,7 +626,6 @@ public class TimerUtils
|
||||
* Obtains how transparent
|
||||
*
|
||||
* @param effectinstance
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public static float getPotionAlpha(StatusEffectInstance effectinstance)
|
||||
@@ -618,7 +637,8 @@ public class TimerUtils
|
||||
if (effectinstance.getDuration() <= BLINK_TIME)
|
||||
{
|
||||
effectAlpha =
|
||||
MathHelper.sin(7000F / (effectinstance.getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
|
||||
MathHelper.sin(7000F / (effectinstance
|
||||
.getDuration() + 16F * (float) Math.PI)) * 50F / (effectinstance
|
||||
.getDuration() + 100F) + 0.5F;
|
||||
}
|
||||
else if (effectinstance.getDuration() <= BLINK_TIME + potion.getFadeInTime())
|
||||
@@ -643,7 +663,6 @@ public class TimerUtils
|
||||
* needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the armor bar.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawArmor()
|
||||
@@ -671,7 +690,6 @@ public class TimerUtils
|
||||
* needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the health.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawHealth(float ticks)
|
||||
@@ -715,8 +733,8 @@ public class TimerUtils
|
||||
if (changed)
|
||||
{
|
||||
healthTime = healthTimes.getMaxTime() - (healthTime > 0 ?
|
||||
healthTimes.getFadeInTime() :
|
||||
0);
|
||||
healthTimes.getFadeInTime() :
|
||||
0);
|
||||
}
|
||||
else if (healthTime > 0)
|
||||
{
|
||||
@@ -747,7 +765,6 @@ public class TimerUtils
|
||||
* needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the hunger bar.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawHunger(float ticks)
|
||||
@@ -794,8 +811,8 @@ public class TimerUtils
|
||||
if (changed)
|
||||
{
|
||||
hungerTime = hungerTimes.getMaxTime() - (hungerTime > 0 ?
|
||||
hungerTimes.getFadeInTime() :
|
||||
0);
|
||||
hungerTimes.getFadeInTime() :
|
||||
0);
|
||||
}
|
||||
else if (hungerTime > 0)
|
||||
{
|
||||
@@ -826,9 +843,7 @@ public class TimerUtils
|
||||
* as needed.
|
||||
*
|
||||
* @param stack
|
||||
*
|
||||
* @return If true, then cancel drawing the jump bar.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawJumpbar(MatrixStack stack, float ticks)
|
||||
@@ -847,11 +862,11 @@ public class TimerUtils
|
||||
return true;
|
||||
}
|
||||
|
||||
if (entity.getMountJumpStrength() > 0)
|
||||
if (entity.method_3151() > 0)
|
||||
{
|
||||
jumpTime = jump.getMaxTime() - (jumpTime > 0 ?
|
||||
jump.getFadeInTime() :
|
||||
0);
|
||||
jump.getFadeInTime() :
|
||||
0);
|
||||
}
|
||||
else if (jumpTime > 0)
|
||||
{
|
||||
@@ -875,7 +890,6 @@ public class TimerUtils
|
||||
* as needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the experience bar.
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawExperience(MatrixStack stack, float ticks)
|
||||
@@ -904,8 +918,8 @@ public class TimerUtils
|
||||
if (changed)
|
||||
{
|
||||
experienceTime = experience.getMaxTime() - (experienceTime > 0 ?
|
||||
experience.getFadeInTime() :
|
||||
0);
|
||||
experience.getFadeInTime() :
|
||||
0);
|
||||
}
|
||||
else if (experienceTime > 0)
|
||||
{
|
||||
@@ -930,7 +944,6 @@ public class TimerUtils
|
||||
* or not to draw it.
|
||||
*
|
||||
* @return If true, then cancel drawing the hotbar.
|
||||
*
|
||||
* @see #recolorHotbar(MatrixStack)
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@@ -1039,7 +1052,7 @@ public class TimerUtils
|
||||
{
|
||||
if (entity.isUsingItem() && entity
|
||||
.getActiveHand() != null && entity.getActiveHand()
|
||||
.ordinal() == i)
|
||||
.ordinal() == i)
|
||||
{
|
||||
switch (i)
|
||||
{
|
||||
@@ -1102,11 +1115,11 @@ public class TimerUtils
|
||||
if (item.isFood())
|
||||
{
|
||||
healthTime = health.getMaxTime() - (healthTime > 0 ?
|
||||
health.getFadeInTime() :
|
||||
0);
|
||||
health.getFadeInTime() :
|
||||
0);
|
||||
hungerTime = hunger.getMaxTime() - (hungerTime > 0 ?
|
||||
hunger.getFadeInTime() :
|
||||
0);
|
||||
hunger.getFadeInTime() :
|
||||
0);
|
||||
}
|
||||
if (i == 0)
|
||||
{
|
||||
@@ -1125,9 +1138,9 @@ public class TimerUtils
|
||||
/*
|
||||
* Checks for a change in what slot is used.
|
||||
*/
|
||||
if (selectedHotbarSlot != entity.getInventory().selectedSlot)
|
||||
if (selectedHotbarSlot != entity.inventory.selectedSlot)
|
||||
{
|
||||
selectedHotbarSlot = entity.getInventory().selectedSlot;
|
||||
selectedHotbarSlot = entity.inventory.selectedSlot;
|
||||
mainHandTime = handTime;
|
||||
changed = true;
|
||||
}
|
||||
@@ -1135,8 +1148,8 @@ public class TimerUtils
|
||||
if (changed)
|
||||
{
|
||||
hotbarTime = hotbar.getMaxTime() - (hotbarTime > 0 ?
|
||||
hotbar.getFadeInTime() :
|
||||
0);
|
||||
hotbar.getFadeInTime() :
|
||||
0);
|
||||
}
|
||||
else if (hotbarTime > 0)
|
||||
{
|
||||
@@ -1150,25 +1163,19 @@ public class TimerUtils
|
||||
* Determines whether or not to draw the crosshair, adjusting the alpha as
|
||||
* needed.
|
||||
*
|
||||
* @return If true, then cancel drawing the crosshair.
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static void recolorHotbar(MatrixStack stack)
|
||||
{
|
||||
ConfigManager.TimeValues hotbar =
|
||||
ConfigManager.getInstance().getHotbarTime();
|
||||
// RenderSystem.pushMatrix();
|
||||
RenderSystem.pushMatrix();
|
||||
stack.push();
|
||||
stack.translate(0F, TimerUtils.getHotbarTranslation(), 0F);
|
||||
RenderSystem.translatef(0F, TimerUtils.getHotbarTranslation(), 0F);
|
||||
setAlpha(Main.getAlpha(hotbarTime,
|
||||
hotbar.getMaxTime(),
|
||||
hotbar.getFadeInTime(),
|
||||
hotbar.getFadeOutTime()));
|
||||
/*
|
||||
* Update the hotbar item matrix
|
||||
*/
|
||||
stack = RenderSystem.getModelViewStack();
|
||||
stack.push();
|
||||
stack.translate(0F, TimerUtils.getHotbarTranslation(), 0F);
|
||||
RenderSystem.applyModelViewMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
0
src/main/java/markil3/immersive_hud/mixin/ClientPlayerHook.java
Executable file → Normal file
0
src/main/java/markil3/immersive_hud/mixin/HeldItemHook.java
Executable file → Normal file
12
src/main/java/markil3/immersive_hud/mixin/HudHook.java
Executable file → Normal file
@@ -40,7 +40,7 @@ import markil3.immersive_hud.TimerUtils;
|
||||
* that most of the logic can be found in {@link TimerUtils}.
|
||||
*
|
||||
* @author Markil 3
|
||||
* @version 1.1.1-1.17-fabric
|
||||
* @version 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Mixin(InGameHud.class)
|
||||
public class HudHook
|
||||
@@ -338,7 +338,7 @@ public class HudHook
|
||||
@Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
||||
"/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
|
||||
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
|
||||
ordinal = 1))
|
||||
ordinal = 1, shift = At.Shift.BY, by = 3))
|
||||
public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||
{
|
||||
try
|
||||
@@ -634,7 +634,7 @@ public class HudHook
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderHotbar", at = @At(value = "INVOKE", target =
|
||||
"Lcom/mojang/blaze3d/systems/RenderSystem;setShaderColor(FFFF)V", shift
|
||||
"Lcom/mojang/blaze3d/systems/RenderSystem;color4f(FFFF)V", shift
|
||||
= At.Shift.AFTER))
|
||||
public void adjustHotbar(float tickDelta,
|
||||
MatrixStack matrices,
|
||||
@@ -661,7 +661,7 @@ public class HudHook
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 1.1.1-1.17-fabric
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderHotbar", at = @At(value = "TAIL"))
|
||||
@@ -671,10 +671,8 @@ public class HudHook
|
||||
{
|
||||
try
|
||||
{
|
||||
RenderSystem.popMatrix();
|
||||
stack.pop();
|
||||
stack = RenderSystem.getModelViewStack();
|
||||
stack.pop();
|
||||
RenderSystem.applyModelViewMatrix();
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
|
||||
0
src/main/resources/assets/immersive_hud/icon.png
Executable file → Normal file
|
Before Width: | Height: | Size: 380 KiB After Width: | Height: | Size: 380 KiB |
6
src/main/resources/assets/immersive_hud/lang/en_us.json
Executable file → Normal file
@@ -25,6 +25,7 @@
|
||||
"option.immersive_hud.minHealth": "Minimum Health Fade",
|
||||
"option.immersive_hud.minHunger": "Minimum Hunger Fade",
|
||||
"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.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",
|
||||
@@ -49,5 +50,8 @@
|
||||
"tooltip.immersive_hud.hideHands": "Whether or not hands should be hidden after a period of time",
|
||||
"tooltip.immersive_hud.minHealth": "When the percentage of health goes below this level, the health bar won't fade away",
|
||||
"tooltip.immersive_hud.minHunger": "When the hunger level goes below this level, the hunger bar won't fade away",
|
||||
"tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD"
|
||||
"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"
|
||||
}
|
||||
@@ -34,9 +34,8 @@
|
||||
],
|
||||
|
||||
"depends": {
|
||||
"fabricloader": ">=0.11.3",
|
||||
"minecraft": "1.17.x",
|
||||
"java": ">=16"
|
||||
"fabricloader": ">=0.7.4",
|
||||
"minecraft": "1.16.x"
|
||||
},
|
||||
"suggests": {
|
||||
"modmenu": "*",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"required": true,
|
||||
"minVersion": "0.8",
|
||||
"package": "markil3.immersive_hud.mixin",
|
||||
"compatibilityLevel": "JAVA_16",
|
||||
"compatibilityLevel": "JAVA_8",
|
||||
"mixins": [
|
||||
],
|
||||
"client": [
|
||||
|
||||