Compare commits
8 Commits
v1.2-1.17-
...
v1.1.1-1.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7d67a0445a | ||
|
|
f054a5aa20 | ||
|
|
93548ae7a7 | ||
|
|
7195d8ac0d | ||
|
|
a6b05ba15a | ||
|
|
238d32a27a | ||
|
|
30d3eb9880 | ||
|
|
b9d0d3eaf9 |
6
.github/workflows/build.yml
vendored
Executable file → Normal file
@@ -12,9 +12,9 @@ jobs:
|
||||
matrix:
|
||||
# Use these Java versions
|
||||
java: [
|
||||
1.16, # Minimum supported by Minecraft
|
||||
16, # Current Java LTS
|
||||
16 # Latest version
|
||||
1.8, # Minimum supported by Minecraft
|
||||
11, # Current Java LTS
|
||||
15 # Latest version
|
||||
]
|
||||
# and run on both Linux and Windows
|
||||
os: [ubuntu-20.04, windows-latest]
|
||||
|
||||
2
.gitignore
vendored
Executable file → Normal file
@@ -32,5 +32,3 @@ bin/
|
||||
|
||||
run/
|
||||
/logs/
|
||||
local.properties
|
||||
remappedSrc/
|
||||
|
||||
20
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"
|
||||
@@ -21,8 +21,9 @@ dependencies {
|
||||
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
|
||||
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
||||
|
||||
modApi "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}"
|
||||
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
|
||||
modApi "me.shedaniel.cloth:config-2:${project.cloth_version}"
|
||||
modApi "me.sargunvohra.mcmods:autoconfig1u:${project.autoconfig_version}"
|
||||
modImplementation "io.github.prospector:modmenu:${project.modmenu_version}"
|
||||
|
||||
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
|
||||
// You may need to force-disable transitiveness on them.
|
||||
@@ -43,8 +44,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 |
13
gradle.properties
Executable file → Normal file
@@ -3,14 +3,15 @@ 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.15
|
||||
yarn_mappings=1.15+build.2
|
||||
loader_version=0.11.2
|
||||
|
||||
cloth_version=5.0.34
|
||||
modmenu_version=2.0.2
|
||||
cloth_version=2.9.3
|
||||
modmenu_version=1.8.4+build.20
|
||||
autoconfig_version=2.2.0
|
||||
|
||||
# Mod Properties
|
||||
mod_version = 1.2
|
||||
mod_version = 1.1.1
|
||||
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
56
src/main/java/markil3/immersive_hud/ConfigManager.java
Executable file → Normal file
@@ -1,18 +1,10 @@
|
||||
package markil3.immersive_hud;
|
||||
|
||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
||||
|
||||
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 java.util.Arrays;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||
|
||||
import me.shedaniel.autoconfig.AutoConfig;
|
||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
||||
|
||||
/**
|
||||
* Configuration manager of this mod, which reads from and writes to this mod's
|
||||
@@ -96,7 +88,6 @@ 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.
|
||||
@@ -107,7 +98,7 @@ public class ConfigManager
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
||||
if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
|
||||
{
|
||||
return AutoConfig.getConfigHolder(ConfigManagerCloth.class)
|
||||
.getConfig();
|
||||
@@ -194,6 +185,7 @@ public class ConfigManager
|
||||
{
|
||||
return this.crosshairTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether the crosshairs should be hidden after a period of time.
|
||||
*
|
||||
@@ -256,26 +248,6 @@ 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.
|
||||
*
|
||||
@@ -347,26 +319,6 @@ 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.
|
||||
*/
|
||||
|
||||
6
src/main/java/markil3/immersive_hud/ConfigManagerCloth.java
Executable file → Normal file
@@ -1,13 +1,13 @@
|
||||
package markil3.immersive_hud;
|
||||
|
||||
import me.shedaniel.autoconfig.ConfigData;
|
||||
import me.shedaniel.autoconfig.annotation.Config;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
|
||||
|
||||
@Config(name = "immersive_hud")
|
||||
public class ConfigManagerCloth extends ConfigManager implements ConfigData
|
||||
{
|
||||
@Override
|
||||
public void validatePostLoad() throws ValidationException
|
||||
public void validatePostLoad() throws ConfigData.ValidationException
|
||||
{
|
||||
this.setMinHealth(this.getMinHealth());
|
||||
}
|
||||
|
||||
6
src/main/java/markil3/immersive_hud/Main.java
Executable file → Normal file
@@ -19,8 +19,8 @@ package markil3.immersive_hud;
|
||||
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
|
||||
import me.shedaniel.autoconfig.AutoConfig;
|
||||
import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.serializer.Toml4jConfigSerializer;
|
||||
|
||||
/**
|
||||
* The main entry point for the Immersive HUD mod.
|
||||
@@ -37,7 +37,7 @@ public class Main implements ModInitializer
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
||||
if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
|
||||
{
|
||||
AutoConfig.register(ConfigManagerCloth.class,
|
||||
Toml4jConfigSerializer::new);
|
||||
|
||||
146
src/main/java/markil3/immersive_hud/ModMenu.java
Executable file → Normal file
@@ -1,15 +1,11 @@
|
||||
package markil3.immersive_hud;
|
||||
|
||||
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
||||
import com.terraformersmc.modmenu.api.ModMenuApi;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
|
||||
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 java.util.function.Function;
|
||||
|
||||
import me.shedaniel.autoconfig.AutoConfig;
|
||||
import io.github.prospector.modmenu.api.ModMenuApi;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||
import me.shedaniel.clothconfig2.api.ConfigBuilder;
|
||||
import me.shedaniel.clothconfig2.api.ConfigCategory;
|
||||
import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
|
||||
@@ -17,10 +13,6 @@ import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
|
||||
|
||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ModMenu implements ModMenuApi
|
||||
{
|
||||
|
||||
@@ -33,44 +25,38 @@ public class ModMenu implements ModMenuApi
|
||||
final float FADE_OUT = 0.5F;
|
||||
|
||||
DoubleListEntry maxTime =
|
||||
entryBuilder.startDoubleField(new TranslatableText(
|
||||
"option.immersive_hud." + name +
|
||||
"MaxTime"),
|
||||
entryBuilder.startDoubleField("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"))
|
||||
.setTooltip("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"),
|
||||
entryBuilder.startDoubleField("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"))
|
||||
.setTooltip("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"),
|
||||
entryBuilder.startDoubleField("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"))
|
||||
.setTooltip("tooltip.immersive_hud." + name +
|
||||
"FadeOut")
|
||||
.setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build();
|
||||
|
||||
@@ -80,7 +66,13 @@ public class ModMenu implements ModMenuApi
|
||||
}
|
||||
|
||||
@Override
|
||||
public ConfigScreenFactory<?> getModConfigScreenFactory()
|
||||
public String getModId()
|
||||
{
|
||||
return "immersive_hud";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Function<Screen, ? extends Screen> getConfigScreenFactory()
|
||||
{
|
||||
return screen -> {
|
||||
ConfigCategory general;
|
||||
@@ -88,15 +80,17 @@ public class ModMenu implements ModMenuApi
|
||||
ConfigManager instance = ConfigManager.getInstance();
|
||||
final ConfigBuilder builder = ConfigBuilder.create()
|
||||
.setParentScreen(screen)
|
||||
.setTitle(new TranslatableText(
|
||||
"immersive_hud.configGui.title"))
|
||||
.setTitle("immersive_hud.configGui.title")
|
||||
.setSavingRunnable(() -> {
|
||||
try
|
||||
{
|
||||
if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
||||
if (Class.forName(
|
||||
"me.sargunvohra.mcmods.autoconfig1u" +
|
||||
".AutoConfig") != null)
|
||||
{
|
||||
AutoConfig.getConfigHolder(ConfigManagerCloth.class)
|
||||
.save();
|
||||
((me.sargunvohra.mcmods.autoconfig1u.ConfigManager<ConfigManagerCloth>) AutoConfig
|
||||
.getConfigHolder(
|
||||
ConfigManagerCloth.class)).save();
|
||||
}
|
||||
}
|
||||
catch (ClassNotFoundException e)
|
||||
@@ -105,8 +99,8 @@ public class ModMenu implements ModMenuApi
|
||||
}
|
||||
});
|
||||
general =
|
||||
builder.getOrCreateCategory(new TranslatableText(
|
||||
"category.immersive_hud.general"));
|
||||
builder.getOrCreateCategory("category.immersive_hud" +
|
||||
".general");
|
||||
entryBuilder = builder.entryBuilder();
|
||||
|
||||
startTimeField("hotbar", entryBuilder,
|
||||
@@ -128,96 +122,62 @@ public class ModMenu implements ModMenuApi
|
||||
general,
|
||||
instance.getPotionTime());
|
||||
|
||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
||||
"option.immersive_hud" +
|
||||
".crosshairTime"),
|
||||
general.addEntry(entryBuilder.startDoubleField(
|
||||
"option.immersive_hud.crosshairTime",
|
||||
(float) instance.getCrosshairTime() / TICKS_PER_SECOND)
|
||||
.setDefaultValue(6)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud" +
|
||||
".crosshairTime"))
|
||||
.setTooltip("tooltip.immersive_hud.crosshairTime")
|
||||
.setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
||||
"option.immersive_hud.hideCrosshair"),
|
||||
general.addEntry(entryBuilder.startBooleanToggle(
|
||||
"option.immersive_hud.hideCrosshair",
|
||||
instance.hideCrosshair())
|
||||
.setDefaultValue(true)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.hideCrosshair"))
|
||||
.setTooltip("tooltip.immersive_hud.hideCrosshair")
|
||||
.setSaveConsumer(val -> instance.hideCrosshair(val))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
||||
"option.immersive_hud.handTime"),
|
||||
general.addEntry(entryBuilder.startDoubleField(
|
||||
"option.immersive_hud.handTime",
|
||||
(float) instance.getHandTime() / TICKS_PER_SECOND)
|
||||
.setDefaultValue(30)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.handTime"))
|
||||
.setTooltip("tooltip.immersive_hud.handTime")
|
||||
.setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
||||
"option.immersive_hud.hideHands"),
|
||||
general.addEntry(entryBuilder.startBooleanToggle(
|
||||
"option.immersive_hud.hideHands",
|
||||
instance.hideHands())
|
||||
.setDefaultValue(true)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.hideHands"))
|
||||
.setTooltip("tooltip.immersive_hud.hideHands")
|
||||
.setSaveConsumer(val -> instance.hideHands(val))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
||||
"option.immersive_hud.minHealth"),
|
||||
general.addEntry(entryBuilder.startDoubleField(
|
||||
"option.immersive_hud.minHealth",
|
||||
instance.getMinHealth())
|
||||
.setDefaultValue(0.5)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.minHealth"))
|
||||
.setTooltip("tooltip.immersive_hud.minHealth")
|
||||
.setSaveConsumer(val -> instance.setMinHealth(val))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startIntField(new TranslatableText(
|
||||
"option.immersive_hud.minHunger"),
|
||||
general.addEntry(entryBuilder.startIntField(
|
||||
"option.immersive_hud.minHunger",
|
||||
instance.getMinHunger())
|
||||
.setDefaultValue(17)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.minHunger"))
|
||||
.setTooltip("tooltip.immersive_hud.minHunger")
|
||||
.setSaveConsumer(val -> instance.setMinHunger(val))
|
||||
.build());
|
||||
|
||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
||||
"option.immersive_hud.showArmor"),
|
||||
general.addEntry(entryBuilder.startBooleanToggle(
|
||||
"option.immersive_hud.showArmor",
|
||||
instance.shouldShowArmor())
|
||||
.setDefaultValue(true)
|
||||
.setTooltip(new TranslatableText(
|
||||
"tooltip.immersive_hud.showArmor"))
|
||||
.setTooltip("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();
|
||||
};
|
||||
}
|
||||
|
||||
95
src/main/java/markil3/immersive_hud/TimerUtils.java
Executable file → Normal file
@@ -49,13 +49,12 @@ 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
|
||||
{
|
||||
@@ -174,7 +173,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -251,8 +250,6 @@ 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(),
|
||||
@@ -266,21 +263,8 @@ 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) + 42 * (1 - statusAlpha);
|
||||
jumpAlpha)) + 22 * (1 - hotbarAlpha);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -305,7 +289,6 @@ public class TimerUtils
|
||||
LivingEntity entity;
|
||||
Item item;
|
||||
Iterator<ItemStack> hands;
|
||||
Set<Item> ignored;
|
||||
if (mc.getCameraEntity() instanceof LivingEntity)
|
||||
{
|
||||
entity = (LivingEntity) mc.getCameraEntity();
|
||||
@@ -331,14 +314,6 @@ 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)
|
||||
{
|
||||
@@ -362,10 +337,6 @@ public class TimerUtils
|
||||
0);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
System.out.println("Unusing hand " + hand);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -502,7 +473,7 @@ public class TimerUtils
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawMountHealth(MatrixStack stack, float ticks)
|
||||
public static boolean drawMountHealth(float ticks)
|
||||
{
|
||||
/*
|
||||
* When the health percentage falls to this level or below, the
|
||||
@@ -534,9 +505,9 @@ public class TimerUtils
|
||||
mountHealth = mount.getHealth();
|
||||
changed = true;
|
||||
}
|
||||
if (mountMaxHealth != mount.getMaxHealth())
|
||||
if (mountMaxHealth != mount.getMaximumHealth())
|
||||
{
|
||||
mountMaxHealth = mount.getMaxHealth();
|
||||
mountMaxHealth = mount.getMaximumHealth();
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
@@ -557,10 +528,10 @@ public class TimerUtils
|
||||
*/
|
||||
if (mountHealth / mountMaxHealth > HEALTH_BOUNDARY)
|
||||
{
|
||||
if (mountTime > 0)
|
||||
if (tmp != null && mountTime > 0)
|
||||
{
|
||||
stack.push();
|
||||
stack.translate(0F,
|
||||
RenderSystem.pushMatrix();
|
||||
RenderSystem.translatef(0F,
|
||||
getHealthTranslation(),
|
||||
0F);
|
||||
setAlpha(Main.getAlpha(mountTime,
|
||||
@@ -571,8 +542,8 @@ public class TimerUtils
|
||||
}
|
||||
return true;
|
||||
}
|
||||
stack.push();
|
||||
stack.translate(0F,
|
||||
RenderSystem.pushMatrix();
|
||||
RenderSystem.translatef(0F,
|
||||
getHealthTranslation(),
|
||||
0F);
|
||||
return false;
|
||||
@@ -732,9 +703,9 @@ public class TimerUtils
|
||||
health = entity.getHealth();
|
||||
changed = true;
|
||||
}
|
||||
if (maxHealth != entity.getMaxHealth())
|
||||
if (maxHealth != entity.getMaximumHealth())
|
||||
{
|
||||
maxHealth = entity.getMaxHealth();
|
||||
maxHealth = entity.getMaximumHealth();
|
||||
changed = true;
|
||||
}
|
||||
if (changed)
|
||||
@@ -850,13 +821,11 @@ public class TimerUtils
|
||||
* Determines whether or not to draw the horse jump bar, adjusting the alpha
|
||||
* 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)
|
||||
public static boolean drawJumpbar(float ticks)
|
||||
{
|
||||
ConfigManager.TimeValues jump =
|
||||
ConfigManager.getInstance().getJumpTime();
|
||||
@@ -872,7 +841,7 @@ public class TimerUtils
|
||||
return true;
|
||||
}
|
||||
|
||||
if (entity.getMountJumpStrength() > 0)
|
||||
if (entity.method_3151() > 0)
|
||||
{
|
||||
jumpTime = jump.getMaxTime() - (jumpTime > 0 ?
|
||||
jump.getFadeInTime() :
|
||||
@@ -884,8 +853,8 @@ public class TimerUtils
|
||||
}
|
||||
if (jumpTime > 0)
|
||||
{
|
||||
stack.push();
|
||||
stack.translate(0F, TimerUtils.getJumpTranslation(), 0F);
|
||||
RenderSystem.pushMatrix();
|
||||
RenderSystem.translatef(0F, TimerUtils.getJumpTranslation(), 0F);
|
||||
setAlpha(Main.getAlpha(jumpTime,
|
||||
jump.getMaxTime(),
|
||||
jump.getFadeInTime(),
|
||||
@@ -903,7 +872,7 @@ public class TimerUtils
|
||||
*
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean drawExperience(MatrixStack stack, float ticks)
|
||||
public static boolean drawExperience(float ticks)
|
||||
{
|
||||
ConfigManager.TimeValues experience =
|
||||
ConfigManager.getInstance().getExperienceTime();
|
||||
@@ -938,8 +907,10 @@ public class TimerUtils
|
||||
}
|
||||
if (experienceTime > 0)
|
||||
{
|
||||
stack.push();
|
||||
stack.translate(0F, TimerUtils.getExperienceTranslation(), 0F);
|
||||
RenderSystem.pushMatrix();
|
||||
RenderSystem.translatef(0F,
|
||||
TimerUtils.getExperienceTranslation(),
|
||||
0F);
|
||||
setAlpha(Main.getAlpha(experienceTime,
|
||||
experience.getMaxTime(),
|
||||
experience.getFadeInTime(),
|
||||
@@ -956,7 +927,7 @@ public class TimerUtils
|
||||
*
|
||||
* @return If true, then cancel drawing the hotbar.
|
||||
*
|
||||
* @see #recolorHotbar(MatrixStack)
|
||||
* @see #recolorHotbar()
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
public static boolean updateHotbar(float ticks)
|
||||
@@ -1150,9 +1121,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;
|
||||
}
|
||||
@@ -1175,25 +1146,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)
|
||||
public static void recolorHotbar()
|
||||
{
|
||||
ConfigManager.TimeValues hotbar =
|
||||
ConfigManager.getInstance().getHotbarTime();
|
||||
// RenderSystem.pushMatrix();
|
||||
stack.push();
|
||||
stack.translate(0F, TimerUtils.getHotbarTranslation(), 0F);
|
||||
RenderSystem.pushMatrix();
|
||||
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
172
src/main/java/markil3/immersive_hud/mixin/HudHook.java
Executable file → Normal file
@@ -21,7 +21,6 @@ import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.hud.InGameHud;
|
||||
import net.minecraft.client.network.ClientPlayerEntity;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.effect.StatusEffectInstance;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
@@ -40,7 +39,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
|
||||
@@ -52,7 +51,6 @@ public class HudHook
|
||||
/**
|
||||
* Determines whether or not to draw the crosshair.
|
||||
*
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
@@ -60,8 +58,9 @@ public class HudHook
|
||||
*/
|
||||
@Inject(method = "renderCrosshair", at = @At(value = "HEAD"),
|
||||
cancellable = true)
|
||||
public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
public void startCrosshair(CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Starting crosshair");
|
||||
try
|
||||
{
|
||||
if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
|
||||
@@ -74,7 +73,7 @@ public class HudHook
|
||||
{
|
||||
LOGGER.error(
|
||||
"Error in running net.minecraft.client.gui.hud" +
|
||||
".InGameHud#startCrosshair " +
|
||||
".InGameHud#renderCrosshair " +
|
||||
"event",
|
||||
e);
|
||||
}
|
||||
@@ -83,15 +82,15 @@ public class HudHook
|
||||
/**
|
||||
* Resets any changes from drawing the crosshair.
|
||||
*
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderCrosshair", at = @At(value = "TAIL"))
|
||||
public void finishCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
public void finishCrosshair(CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Finishing crosshair");
|
||||
try
|
||||
{
|
||||
/*
|
||||
@@ -112,7 +111,6 @@ public class HudHook
|
||||
/**
|
||||
* Determines whether or not to draw the horse jump bar.
|
||||
*
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
@@ -120,14 +118,13 @@ public class HudHook
|
||||
*/
|
||||
@Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
|
||||
cancellable = true)
|
||||
public void startJumpbar(MatrixStack stack,
|
||||
int x,
|
||||
CallbackInfo callbackInfo)
|
||||
public void startJumpbar(int x, CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Starting jumpbar");
|
||||
try
|
||||
{
|
||||
if (TimerUtils.drawJumpbar(stack,
|
||||
MinecraftClient.getInstance().getTickDelta()))
|
||||
if (TimerUtils.drawJumpbar(MinecraftClient.getInstance()
|
||||
.getTickDelta()))
|
||||
{
|
||||
callbackInfo.cancel();
|
||||
}
|
||||
@@ -145,20 +142,20 @@ public class HudHook
|
||||
/**
|
||||
* Resets any changes from drawing the horse jump bar.
|
||||
*
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderMountJumpBar", at = @At(value = "TAIL"))
|
||||
public void finishJumpbar(MatrixStack stack,
|
||||
public void finishJumpbar(
|
||||
int x,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Finishing jumpbar");
|
||||
try
|
||||
{
|
||||
stack.pop();
|
||||
RenderSystem.popMatrix();
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
@@ -177,7 +174,6 @@ public class HudHook
|
||||
/**
|
||||
* Determines whether or not to draw the experience bar.
|
||||
*
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
@@ -185,14 +181,13 @@ public class HudHook
|
||||
*/
|
||||
@Inject(method = "renderExperienceBar", at = @At(value = "HEAD"),
|
||||
cancellable = true)
|
||||
public void startExperience(MatrixStack stack,
|
||||
int x,
|
||||
CallbackInfo callbackInfo)
|
||||
public void startExperience(int x, CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Starting experience bar");
|
||||
try
|
||||
{
|
||||
if (TimerUtils.drawExperience(stack,
|
||||
MinecraftClient.getInstance().getTickDelta()))
|
||||
if (TimerUtils.drawExperience(MinecraftClient.getInstance()
|
||||
.getTickDelta()))
|
||||
{
|
||||
callbackInfo.cancel();
|
||||
}
|
||||
@@ -210,20 +205,18 @@ public class HudHook
|
||||
/**
|
||||
* Resets any changes from drawing the experience bar.
|
||||
*
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderExperienceBar", at = @At(value = "TAIL"))
|
||||
public void finishExperience(MatrixStack stack,
|
||||
int x,
|
||||
CallbackInfo callbackInfo)
|
||||
public void finishExperience(int x, CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Finishing experience bar");
|
||||
try
|
||||
{
|
||||
stack.pop();
|
||||
RenderSystem.popMatrix();
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
@@ -243,18 +236,16 @@ public class HudHook
|
||||
* Changes the position of the status bars as the ones below them move up
|
||||
* and down.
|
||||
*
|
||||
* @param stack - The matrix stack used.
|
||||
*
|
||||
* @return The same matrix stack, with a new matrix pushed onto it.
|
||||
*/
|
||||
@ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
||||
"/math/MatrixStack;)V", at = @At("HEAD"))
|
||||
public MatrixStack startStatus(MatrixStack stack)
|
||||
@Inject(method = "renderStatusBars", at = @At("HEAD"))
|
||||
public void startStatus(CallbackInfo info)
|
||||
{
|
||||
LOGGER.debug("Starting status bars");
|
||||
try
|
||||
{
|
||||
stack.push();
|
||||
stack.translate(0F, TimerUtils.getHealthTranslation(), 0F);
|
||||
RenderSystem.pushMatrix();
|
||||
RenderSystem.translatef(0F, TimerUtils.getHealthTranslation(), 0F);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -264,20 +255,20 @@ public class HudHook
|
||||
"event",
|
||||
e);
|
||||
}
|
||||
return stack;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adjusts the armor GUI.
|
||||
*
|
||||
* @param matrices
|
||||
* @param callbackInfo
|
||||
*/
|
||||
@Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
||||
"/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
|
||||
"/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
|
||||
public void renderArmor(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
|
||||
target = "Lnet" +
|
||||
"/minecraft/util/profiler/Profiler;push" +
|
||||
"(Ljava/lang/String;)V"))
|
||||
public void renderArmor(CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Rendering armor");
|
||||
try
|
||||
{
|
||||
if (TimerUtils.drawArmor())
|
||||
@@ -298,15 +289,16 @@ public class HudHook
|
||||
/**
|
||||
* Adjusts the health GUI.
|
||||
*
|
||||
* @param matrices
|
||||
* @param callbackInfo
|
||||
*/
|
||||
@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",
|
||||
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
|
||||
target = "Lnet" +
|
||||
"/minecraft/util/profiler/Profiler;swap" +
|
||||
"(Ljava/lang/String;)V",
|
||||
ordinal = 0))
|
||||
public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||
public void renderHealth(CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Rendering health");
|
||||
try
|
||||
{
|
||||
/*
|
||||
@@ -332,15 +324,15 @@ public class HudHook
|
||||
/**
|
||||
* Adjusts the food GUI.
|
||||
*
|
||||
* @param matrices
|
||||
* @param callbackInfo
|
||||
*/
|
||||
@Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
||||
"/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
|
||||
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
|
||||
target = "Lnet" +
|
||||
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
|
||||
ordinal = 1, shift = At.Shift.BY, by = 3))
|
||||
public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||
ordinal = 1))
|
||||
public void renderFood(CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Rendering food");
|
||||
try
|
||||
{
|
||||
/*
|
||||
@@ -366,15 +358,15 @@ public class HudHook
|
||||
/**
|
||||
* Resets the air GUI.
|
||||
*
|
||||
* @param matrices
|
||||
* @param callbackInfo
|
||||
*/
|
||||
@Inject(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
||||
"/math/MatrixStack;)V", at = @At(value = "INVOKE", target = "Lnet" +
|
||||
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
|
||||
target = "Lnet" +
|
||||
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
|
||||
ordinal = 2))
|
||||
public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
|
||||
public void renderAir(CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Rendering air");
|
||||
try
|
||||
{
|
||||
/*
|
||||
@@ -392,13 +384,13 @@ public class HudHook
|
||||
}
|
||||
}
|
||||
|
||||
@ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
||||
"/math/MatrixStack;)V", at = @At("TAIL"))
|
||||
public MatrixStack finishStatus(MatrixStack stack)
|
||||
@Inject(method = "renderStatusBars", at = @At("TAIL"))
|
||||
public void finishStatus(CallbackInfo info)
|
||||
{
|
||||
LOGGER.debug("Finishing status bars");
|
||||
try
|
||||
{
|
||||
stack.pop();
|
||||
RenderSystem.popMatrix();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -408,13 +400,11 @@ public class HudHook
|
||||
"event",
|
||||
e);
|
||||
}
|
||||
return stack;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines whether or not to draw the mount's health.
|
||||
*
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
@@ -422,15 +412,19 @@ public class HudHook
|
||||
*/
|
||||
@Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
|
||||
cancellable = true)
|
||||
public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
public void startMountHealth(CallbackInfo callbackInfo)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (TimerUtils.drawMountHealth(stack,
|
||||
MinecraftClient.getInstance().getTickDelta()))
|
||||
if (TimerUtils.drawMountHealth(MinecraftClient.getInstance()
|
||||
.getTickDelta()))
|
||||
{
|
||||
callbackInfo.cancel();
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGGER.debug("Starting mount health");
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -445,21 +439,21 @@ public class HudHook
|
||||
/**
|
||||
* Resets any changes from drawing the mount's health.
|
||||
*
|
||||
* @param stack - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderMountHealth", at = @At(value = "TAIL"))
|
||||
public void finishMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
||||
public void finishMountHealth(CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Finishing mount health");
|
||||
try
|
||||
{
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
stack.pop();
|
||||
RenderSystem.popMatrix();
|
||||
TimerUtils.resetAlpha();
|
||||
}
|
||||
catch (Exception e)
|
||||
@@ -478,11 +472,11 @@ public class HudHook
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderStatusEffectOverlay" +
|
||||
"(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
|
||||
@Inject(method = "renderStatusEffectOverlay()V", at =
|
||||
@At(value = "HEAD", shift = At.Shift.AFTER))
|
||||
public void startPotion(MatrixStack effect, CallbackInfo info)
|
||||
public void startPotion(CallbackInfo info)
|
||||
{
|
||||
LOGGER.debug("Starting potions");
|
||||
try
|
||||
{
|
||||
TimerUtils.updatePotions(MinecraftClient.getInstance().cameraEntity instanceof ClientPlayerEntity ?
|
||||
@@ -505,14 +499,14 @@ public class HudHook
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Redirect(method = "renderStatusEffectOverlay" +
|
||||
"(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
|
||||
@Redirect(method = "renderStatusEffectOverlay()V", at =
|
||||
@At(value = "INVOKE",
|
||||
target =
|
||||
"Lnet/minecraft/entity/effect/StatusEffectInstance;" +
|
||||
"shouldShowIcon()Z"))
|
||||
public boolean shouldRenderPotion(StatusEffectInstance effect)
|
||||
{
|
||||
LOGGER.debug("Updating potions");
|
||||
try
|
||||
{
|
||||
currentEffect = effect;
|
||||
@@ -534,17 +528,15 @@ public class HudHook
|
||||
* Makes the actual adjustment to the hotbar as needed.
|
||||
*
|
||||
* @param f - The original transparency
|
||||
* @param stack - The matrix stack
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@ModifyVariable(method = "renderStatusEffectOverlay" +
|
||||
"(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
|
||||
@ModifyVariable(method = "renderStatusEffectOverlay()V", at =
|
||||
@At(value = "STORE"))
|
||||
public float updatePotion(float f,
|
||||
MatrixStack stack)
|
||||
public float updatePotion(float f)
|
||||
{
|
||||
LOGGER.debug("Adjusting potions");
|
||||
try
|
||||
{
|
||||
return TimerUtils.getPotionAlpha(currentEffect);
|
||||
@@ -563,16 +555,15 @@ public class HudHook
|
||||
/**
|
||||
* Resets any changes from drawing the potion effects.
|
||||
*
|
||||
* @param matrices - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.2-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderStatusEffectOverlay", at = @At(value = "TAIL"))
|
||||
public void finishPotion(MatrixStack matrices,
|
||||
CallbackInfo callbackInfo)
|
||||
public void finishPotion(CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Finishing potions");
|
||||
try
|
||||
{
|
||||
/*
|
||||
@@ -594,7 +585,6 @@ public class HudHook
|
||||
* Determines whether or not to draw the hotbar.
|
||||
*
|
||||
* @param tickDelta
|
||||
* @param matrices - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
@@ -603,9 +593,9 @@ public class HudHook
|
||||
@Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable =
|
||||
true)
|
||||
public void startHotbar(float tickDelta,
|
||||
MatrixStack matrices,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Starting hotbar");
|
||||
try
|
||||
{
|
||||
if (TimerUtils.updateHotbar(tickDelta))
|
||||
@@ -627,22 +617,21 @@ public class HudHook
|
||||
* Makes the actual adjustment to the hotbar as needed.
|
||||
*
|
||||
* @param tickDelta
|
||||
* @param matrices - The matrix drawing stack.
|
||||
* @param callbackInfo
|
||||
*
|
||||
* @version 0.2-1.16.4-fabric
|
||||
* @since 0.1-1.16.4-fabric
|
||||
*/
|
||||
@Inject(method = "renderHotbar", at = @At(value = "INVOKE", target =
|
||||
"Lcom/mojang/blaze3d/systems/RenderSystem;setShaderColor(FFFF)V", shift
|
||||
"Lcom/mojang/blaze3d/systems/RenderSystem;color4f(FFFF)V", shift
|
||||
= At.Shift.AFTER))
|
||||
public void adjustHotbar(float tickDelta,
|
||||
MatrixStack matrices,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Adjusting hotbar");
|
||||
try
|
||||
{
|
||||
TimerUtils.recolorHotbar(matrices);
|
||||
TimerUtils.recolorHotbar();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -658,23 +647,19 @@ public class HudHook
|
||||
* Resets any changes from drawing the hotbar.
|
||||
*
|
||||
* @param tickDelta
|
||||
* @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"))
|
||||
public void finishHotbar(float tickDelta,
|
||||
MatrixStack stack,
|
||||
CallbackInfo callbackInfo)
|
||||
{
|
||||
LOGGER.debug("Finishing hotbar");
|
||||
try
|
||||
{
|
||||
stack.pop();
|
||||
stack = RenderSystem.getModelViewStack();
|
||||
stack.pop();
|
||||
RenderSystem.applyModelViewMatrix();
|
||||
RenderSystem.popMatrix();
|
||||
/*
|
||||
* Resets the color so that nothing else is bothered.
|
||||
*/
|
||||
@@ -683,8 +668,7 @@ public class HudHook
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error(
|
||||
"Error in running net.minecraft.client.gui.hud" +
|
||||
".InGameHud#renderHotbar " +
|
||||
"Error in running net.minecraft.client.gui.hud.InGameHud#renderHotbar " +
|
||||
"event",
|
||||
e);
|
||||
}
|
||||
|
||||
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,7 +25,6 @@
|
||||
"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",
|
||||
@@ -50,8 +49,5 @@
|
||||
"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.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"
|
||||
"tooltip.immersive_hud.showArmor": "Whether or not the armor bar should display on the HUD"
|
||||
}
|
||||
@@ -34,9 +34,8 @@
|
||||
],
|
||||
|
||||
"depends": {
|
||||
"fabricloader": ">=0.11.3",
|
||||
"minecraft": "1.17.x",
|
||||
"java": ">=16"
|
||||
"fabricloader": ">=0.7.4",
|
||||
"minecraft": "1.15.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": [
|
||||
|
||||