Compare commits

..

22 Commits

Author SHA1 Message Date
Markil3
f054a5aa20 Gets ready for release 1.1 2021-04-01 13:07:40 -06:00
Markil3
93548ae7a7 Adds the ability to always show hands and crosshairs.
Apparently, @rflambert doesn't want the hands to fade. It seemed like a good idea, so I added a configurable option to the main repo.
2021-03-26 11:21:22 -06:00
Markil3
7195d8ac0d Catches any errors that occur when triggering events.
It is pretty annoying for the game to crash because of a GUI mod. This should reduce that.
2021-03-26 10:18:00 -06:00
Markil3
a6b05ba15a Fixes a ClassCastException (#1) 2021-03-25 17:12:38 -06:00
Markil3
238d32a27a Fixes the configuration code not triggering. 2021-03-02 15:32:01 -07:00
Markil3
30d3eb9880 Stabilizes the mod for 1.15 2021-03-02 15:28:37 -07:00
Markil3
b9d0d3eaf9 Sets the mod to use 1.15 2021-03-02 15:28:16 -07:00
Markil3
d2252917b6 Gets ready for version 1.0 release. 2021-03-02 11:26:32 -07:00
Markil3
95111de1aa Updates the URLs to point to the appropriate locations. 2021-03-02 11:26:06 -07:00
Markil3
7be634fc47 Makes both the Cloth and the ModMenu APIs optional.
We want users to be able to use this with as few dependencies as possible.
2021-03-02 11:18:20 -07:00
Markil3
ddd266a0ab Removes the Fabric API dependency.
We didn't need it.
2021-03-02 11:11:45 -07:00
Markil3
c560e50288 Adjusts the health and hunger to always show under wither, poison, and hunger. 2021-03-02 10:41:53 -07:00
Markil3
fb52f20d14 Tweaks potions some more 2021-03-02 10:35:45 -07:00
Markil3
8798691dc0 Moves the status bar adjustments to HudHook
They really do belong there. Hooking into the profiler was just a crutch.
2021-03-02 10:27:29 -07:00
Markil3
37df8eef93 Removed the need for the "name" field.
It kept getting picked up by the autoconfig API.
2021-03-02 10:07:51 -07:00
Markil3
9cd7488f67 Adds support for configuring the timings via Clith Config and Mod Menu. 2021-03-02 09:42:28 -07:00
Markil3
3b42b1729d Makes the hotbar and experience/jump bars slide in and out. 2021-03-01 18:54:47 -07:00
Markil3
1bf31b7bcd Makes potion icons fade over time 2021-03-01 17:18:41 -07:00
Markil3
b66a152603 Locks down some fieldsso that they are now private. 2021-02-27 09:18:29 -07:00
Markil3
a54ec64baa Renames EventBus to TimerUtils.
It makes more sense.
2021-02-27 09:17:14 -07:00
Markil3
c11bf47f17 Makes some changes to make the methods here resemble that of the Forge implementation more. 2021-02-27 09:15:37 -07:00
Markil3
b6221b50d9 Fully functional mod for 1.16.4 fabric. 2021-02-24 11:16:35 -07:00
23 changed files with 3240 additions and 110 deletions

41
.github/workflows/build.yml vendored Normal file
View File

@@ -0,0 +1,41 @@
# Automatically build the project and run any configured tests for every push
# and submitted pull request. This can help catch issues that only occur on
# certain platforms or Java versions, and provides a first line of defence
# against bad commits.
name: build
on: [pull_request, push]
jobs:
build:
strategy:
matrix:
# Use these Java versions
java: [
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]
runs-on: ${{ matrix.os }}
steps:
- name: checkout repository
uses: actions/checkout@v2
- name: validate gradle wrapper
uses: gradle/wrapper-validation-action@v1
- name: setup jdk ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- name: make gradle wrapper executable
if: ${{ runner.os != 'Windows' }}
run: chmod +x ./gradlew
- name: build
run: ./gradlew build
- name: capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '11' }} # Only upload artifacts built from LTS java on one OS
uses: actions/upload-artifact@v2
with:
name: Artifacts
path: build/libs/

44
.gitignore vendored
View File

@@ -1,26 +1,34 @@
# gradle
.gradle/
build/
out/
classes/
# eclipse # eclipse
bin
*.launch *.launch
.settings
.metadata # idea
.idea/
*.iml
*.ipr
*.iws
# vscode
.settings/
.vscode/
bin/
.classpath .classpath
.project .project
# idea # macos
out
*.ipr
*.iws
*.iml
.idea
# gradle *.DS_Store
build
.gradle
# other # fabric
eclipse
run
# Files from Forge MDK run/
forge*changelog.txt /logs/
/local.properties

View File

@@ -17,21 +17,6 @@ The following elements will only show up under certain conditions:
* The crosshair will only show when you are looking at something or you are using a bow, crossbow, shield, or trident or holding a throwable item. * The crosshair will only show when you are looking at something or you are using a bow, crossbow, shield, or trident or holding a throwable item.
* The hands will show only when you use an item or are holding/using one of the above specified items, or a map. * The hands will show only when you use an item or are holding/using one of the above specified items, or a map.
# An update on the future of this mod.
*Hello, everyone.*
*I've recently taken on a new job, and, due to the demands of a full-time developer job, I will no longer be able to maintain this project. I've had a lot of fun with it, but continuing it for the future is simply unfeasible.*
*With that said, I am willing to transfer the project, copyright and all, to someone else who is willing to maintain it. If you happen to be interested, email me at markil3@tutanota.com and we can discuss it.*
*Once a transfer is complete, I will post an update here and on the PlanetMinecraft page.*
*I thank you all for the support you've shown in this.*
*May God bless you all,*
*Markil 3*
# Installing # Installing
There are two variants of this mod: One for Forge, and the other for Fabric. Each [release](https://github.com/Markil3/MinecraftImmersiveHUD/releases) comes with jar files for both. You can download the appropriate jar file and place it within the "mods" folder within your Minecraft installation. For more details, see the README files of the appropriate branches. There are two variants of this mod: One for Forge, and the other for Fabric. Each [release](https://github.com/Markil3/MinecraftImmersiveHUD/releases) comes with jar files for both. You can download the appropriate jar file and place it within the "mods" folder within your Minecraft installation. For more details, see the README files of the appropriate branches.

90
build.gradle Normal file
View File

@@ -0,0 +1,90 @@
plugins {
id 'fabric-loom' version '0.5-SNAPSHOT'
id 'maven-publish'
}
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
archivesBaseName = project.archives_base_name
version = project.mod_version + "-" + project.minecraft_version + "-fabric"
group = project.maven_group
repositories {
maven { url "https://maven.shedaniel.me/" }
maven { url "https://maven.terraformersmc.com/" }
}
dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_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.
}
processResources {
inputs.property "version", project.version
filesMatching("fabric.mod.json") {
expand "version": project.version
}
}
tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8"
// 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 {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
}
jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
}
}
// configure the maven publication
publishing {
publications {
mavenJava(MavenPublication) {
// add all the jars that should be included when publishing to maven
artifact(remapJar) {
builtBy remapJar
}
artifact(sourcesJar) {
builtBy remapSourcesJar
}
}
}
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
}
}

17
gradle.properties Normal file
View File

@@ -0,0 +1,17 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.15
yarn_mappings=1.15+build.2
loader_version=0.11.2
cloth_version=2.9.3
modmenu_version=1.8.4+build.20
autoconfig_version=2.2.0
# Mod Properties
mod_version = 1.1
maven_group = markil3
archives_base_name = immersive_hud

BIN
gradle/wrapper/gradle-wrapper.jar vendored Normal file

Binary file not shown.

View File

@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

185
gradlew vendored Executable file
View File

@@ -0,0 +1,185 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
exec "$JAVACMD" "$@"

89
gradlew.bat vendored Normal file
View File

@@ -0,0 +1,89 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

9
settings.gradle Normal file
View File

@@ -0,0 +1,9 @@
pluginManagement {
repositories {
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
gradlePluginPortal()
}
}

View File

@@ -0,0 +1,329 @@
package markil3.immersive_hud;
import net.minecraft.util.math.MathHelper;
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
/**
* Configuration manager of this mod, which reads from and writes to this mod's
* configuration file.
* <p>
* The methods that change this mod's configuration do not automatically write
* those changes to the configuration file on disk. Instead, they only update
* the configuration in memory.
*
* @author Markil 3
*/
public class ConfigManager
{
public static class TimeValues
{
private static final int SHOW_TIME = 6 * TICKS_PER_SECOND;
private static final int FADE_IN = TICKS_PER_SECOND / 2;
private static final int FADE_OUT = TICKS_PER_SECOND;
private int maxTime = SHOW_TIME;
private int fadeIn = FADE_IN;
private int fadeOut = FADE_OUT;
/**
* Obtains the maximum time that the hotbar can be on the screen,
* including fading.
*
* @return The maximum hotbar display time.
*/
public int getMaxTime()
{
return this.maxTime;
}
/**
* Obtains the time that the hotbar takes to fade in.
*
* @return The hotbar fade in time.
*/
public int getFadeInTime()
{
return this.fadeIn;
}
/**
* Obtains the time that the hotbar takes to fade out.
*
* @return The hotbar fade out time.
*/
public int getFadeOutTime()
{
return this.fadeOut;
}
public void setMaxTime(int time)
{
this.maxTime = time;
}
public void setFadeInTime(int time)
{
this.fadeIn = time;
}
public void setFadeOutTime(int time)
{
this.fadeOut = time;
}
}
private TimeValues hotbarTime = new TimeValues();
private TimeValues experienceTime = new TimeValues();
private TimeValues jumpTime = new TimeValues();
private TimeValues healthTime = new TimeValues();
private TimeValues hungerTime = new TimeValues();
private TimeValues effectTime = new TimeValues();
private int crosshairTime = 6 * TICKS_PER_SECOND;
private boolean hideCrosshair = true;
private int handTime = 30 * TICKS_PER_SECOND;
private boolean hideHands = true;
private boolean showArmor = true;
private double minHealth = 0.5;
private int minHunger = 17;
/**
* Returns the instance of this class.
*
* @return the instance of this class
*/
public static ConfigManager getInstance()
{
try
{
if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
{
return AutoConfig.getConfigHolder(ConfigManagerCloth.class)
.getConfig();
}
else
{
throw new ClassNotFoundException();
}
}
catch (ClassNotFoundException e)
{
return new ConfigManager();
}
}
// Validations
/**
* Obtains time values related to the hotbar.
*
* @return The hotbar display time values.
*/
public TimeValues getHotbarTime()
{
return this.hotbarTime;
}
/**
* Obtains time values related to the experience bar.
*
* @return The experience bar display time values.
*/
public TimeValues getExperienceTime()
{
return this.experienceTime;
}
/**
* Obtains time values related to the jump bar.
*
* @return The jump display time values.
*/
public TimeValues getJumpTime()
{
return this.jumpTime;
}
/**
* Obtains time values related to the health bar.
*
* @return The health display time values.
*/
public TimeValues getHealthTime()
{
return this.healthTime;
}
/**
* Obtains time values related to the hunger bar.
*
* @return The hunger display time values.
*/
public TimeValues getHungerTime()
{
return this.hungerTime;
}
/**
* Obtains time values related to potion effects.
*
* @return Potion display time values.
*/
public TimeValues getPotionTime()
{
return this.effectTime;
}
/**
* Obtains the time that the crosshairs are allowed to display.
*
* @return The crosshair display time values.
*/
public int getCrosshairTime()
{
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.
*
* @return The hand display time values.
*/
public int getHandTime()
{
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.
*
* @return Whether or not armor shows on the HUD.
*/
public boolean shouldShowArmor()
{
return this.showArmor;
}
/**
* Obtains the minimum health for fading. Anything below that and the health
* always displays.
*
* @return The health boundary, from 0 to 1.
*/
public double getMinHealth()
{
return this.minHealth;
}
/**
* Obtains the minimum hunger for fading. Anything below that and the hunger
* always displays.
*
* @return The hunger boundary, from 0 to 20.
*/
public int getMinHunger()
{
return this.minHunger;
}
/**
* Sets the time that the hands are allowed to display.
*
* @param time - The hand display time values.
*/
public void setCrosshairTime(int 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.
*
* @param time - The hand display time values.
*/
public void setHandTime(int 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.
*
* @param show - Whether or not armor shows on the HUD.
*/
public void shouldShowArmor(boolean show)
{
this.showArmor = show;
}
/**
* Sets the minimum health for fading. Anything below that and the health
* always displays.
*
* @param boundary - The health boundary, from 0 to 1.
*/
public void setMinHealth(double boundary)
{
this.minHealth = MathHelper.clamp(boundary, 0, 1);
}
/**
* Sets the minimum hunger for fading. Anything below that and the hunger
* always displays.
*
* @param boundary - The hunger boundary, from 0 to 20.
*/
public void setMinHunger(int boundary)
{
this.minHunger = MathHelper.clamp(boundary, 0, 20);
}
/**
* Saves changes to this mod's configuration.
*/
// public void save()
// {
// SPEC.save();
// }
}

View File

@@ -0,0 +1,14 @@
package markil3.immersive_hud;
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 ConfigData.ValidationException
{
this.setMinHealth(this.getMinHealth());
}
}

View File

@@ -0,0 +1,78 @@
/**
* This Minecraft mod aims to move the ingame HUD out of the way whenever
* possible. Copyright (C) 2021 Markil 3
* <p>
* This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later
* version.
* <p>
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
* <p>
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
package markil3.immersive_hud;
import net.fabricmc.api.ModInitializer;
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
import me.sargunvohra.mcmods.autoconfig1u.serializer.Toml4jConfigSerializer;
/**
* The main entry point for the Immersive HUD mod.
*
* @author Markil 3
* @version 0.1-1.16.4-fabric
*/
public class Main implements ModInitializer
{
public static final int TICKS_PER_SECOND = 20;
@Override
public void onInitialize()
{
try
{
if (Class.forName("me.sargunvohra.mcmods.autoconfig1u.AutoConfig") != null)
{
AutoConfig.register(ConfigManagerCloth.class,
Toml4jConfigSerializer::new);
}
}
catch (ClassNotFoundException e)
{
// Do nothing
}
}
/**
* A utility method to handle the transparency timing. It will (for the most
* part), make
*
* @param renderTime - How many ticks until the element entirely
* disappears.
*
* @return The new alpha value.
*
* @since 0.1-1.16.4-fabric
*/
static float getAlpha(double renderTime,
double maxTime,
double fadeInTime,
double fadeOutTime)
{
if (renderTime <= fadeOutTime)
{
return (float) (renderTime / fadeOutTime);
}
else if (renderTime > maxTime - fadeInTime)
{
return (float) ((maxTime - renderTime) / fadeInTime);
}
return 1F;
}
}

View File

@@ -0,0 +1,184 @@
package markil3.immersive_hud;
import net.minecraft.client.gui.screen.Screen;
import java.util.function.Function;
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;
import me.shedaniel.clothconfig2.gui.entries.DoubleListEntry;
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
public class ModMenu implements ModMenuApi
{
private void startTimeField(String name, ConfigEntryBuilder entryBuilder,
ConfigCategory cat,
ConfigManager.TimeValues value)
{
final float SHOW_TIME = 6;
final float FADE_IN = 0.25F;
final float FADE_OUT = 0.5F;
DoubleListEntry maxTime =
entryBuilder.startDoubleField("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("tooltip.immersive_hud." + name +
"MaxTime")
.setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
.build();
DoubleListEntry 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("tooltip.immersive_hud." + name +
"FadeIn")
.setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND)))
.build();
DoubleListEntry 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("tooltip.immersive_hud." + name +
"FadeOut")
.setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
.build();
cat.addEntry(maxTime);
cat.addEntry(fadeIn);
cat.addEntry(fadeOut);
}
@Override
public String getModId()
{
return "immersive_hud";
}
@Override
public Function<Screen, ? extends Screen> getConfigScreenFactory()
{
return screen -> {
ConfigCategory general;
ConfigEntryBuilder entryBuilder;
ConfigManager instance = ConfigManager.getInstance();
final ConfigBuilder builder = ConfigBuilder.create()
.setParentScreen(screen)
.setTitle("immersive_hud.configGui.title")
.setSavingRunnable(() -> {
try
{
if (Class.forName(
"me.sargunvohra.mcmods.autoconfig1u" +
".AutoConfig") != null)
{
((me.sargunvohra.mcmods.autoconfig1u.ConfigManager<ConfigManagerCloth>) AutoConfig
.getConfigHolder(
ConfigManagerCloth.class)).save();
}
}
catch (ClassNotFoundException e)
{
// Do nothing
}
});
general =
builder.getOrCreateCategory("category.immersive_hud" +
".general");
entryBuilder = builder.entryBuilder();
startTimeField("hotbar", entryBuilder,
general,
instance.getHotbarTime());
startTimeField("experience", entryBuilder,
general,
instance.getExperienceTime());
startTimeField("jump", entryBuilder,
general,
instance.getJumpTime());
startTimeField("jump", entryBuilder,
general,
instance.getHealthTime());
startTimeField("hunger", entryBuilder,
general,
instance.getHungerTime());
startTimeField("effect", entryBuilder,
general,
instance.getPotionTime());
general.addEntry(entryBuilder.startDoubleField(
"option.immersive_hud.crosshairTime",
(float) instance.getCrosshairTime() / TICKS_PER_SECOND)
.setDefaultValue(6)
.setTooltip("tooltip.immersive_hud.crosshairTime")
.setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
.build());
general.addEntry(entryBuilder.startBooleanToggle(
"option.immersive_hud.hideCrosshair",
instance.hideCrosshair())
.setDefaultValue(true)
.setTooltip("tooltip.immersive_hud.hideCrosshair")
.setSaveConsumer(val -> instance.hideCrosshair(val))
.build());
general.addEntry(entryBuilder.startDoubleField(
"option.immersive_hud.handTime",
(float) instance.getHandTime() / TICKS_PER_SECOND)
.setDefaultValue(30)
.setTooltip("tooltip.immersive_hud.handTime")
.setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
.build());
general.addEntry(entryBuilder.startBooleanToggle(
"option.immersive_hud.hideHands",
instance.hideHands())
.setDefaultValue(true)
.setTooltip("tooltip.immersive_hud.hideHands")
.setSaveConsumer(val -> instance.hideHands(val))
.build());
general.addEntry(entryBuilder.startDoubleField(
"option.immersive_hud.minHealth",
instance.getMinHealth())
.setDefaultValue(0.5)
.setTooltip("tooltip.immersive_hud.minHealth")
.setSaveConsumer(val -> instance.setMinHealth(val))
.build());
general.addEntry(entryBuilder.startIntField(
"option.immersive_hud.minHunger",
instance.getMinHunger())
.setDefaultValue(17)
.setTooltip("tooltip.immersive_hud.minHunger")
.setSaveConsumer(val -> instance.setMinHunger(val))
.build());
general.addEntry(entryBuilder.startBooleanToggle(
"option.immersive_hud.showArmor",
instance.shouldShowArmor())
.setDefaultValue(true)
.setTooltip("tooltip.immersive_hud.showArmor")
.setSaveConsumer(val -> instance.shouldShowArmor(val))
.build());
return builder.build();
};
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,123 @@
/**
* Copyright (C) 2021 Markil 3
* <p>
* This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later
* version.
* <p>
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
* <p>
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
package markil3.immersive_hud.mixin;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.entity.LivingEntity;
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.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import markil3.immersive_hud.TimerUtils;
/**
* This mixin hooks into the client player class to check for when the hands
* move. Note that most of the logic can be found in {@link TimerUtils}.
*
* @author Markil 3
* @version 0.1-1.16.4-fabric
*/
@Mixin(ClientPlayerEntity.class)
public class ClientPlayerHook
{
private static final Logger LOGGER =
LogManager.getLogger(ClientPlayerHook.class);
/**
* Updates hand timing every time an attack is initiated.
*
* @param hand - The attacking hand.
* @param callbackInfo
*
* @since 0.1-1.16.4-fabric
*/
@Inject(method = "swingHand", at = @At(value = "TAIL"))
public void swingHand(Hand hand, CallbackInfo callbackInfo)
{
try
{
TimerUtils.onClick(hand, hand == null);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.network" +
".ClientPlayerEntity#swingHand " +
"event",
e);
}
}
/**
* Updates hand timing every time an item is used.
*
* @param hand - The using hand.
* @param callbackInfo
*
* @since 0.1-1.16.4-fabric
*/
@Inject(method = "setCurrentHand", at = @At(value = "TAIL"))
public void setCurrentHand(Hand hand, CallbackInfo callbackInfo)
{
try
{
TimerUtils.onClick(hand, hand == null);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.network" +
".ClientPlayerEntity#setCurrentHand " +
"event",
e);
}
}
/**
* Updates hand timing every the hand is no longer being used.
*
* @param callbackInfo
*
* @since 0.1-1.16.4-fabric
*/
@Inject(method = "clearActiveItem", at = @At(value = "HEAD"))
public void clearActiveItem(CallbackInfo callbackInfo)
{
try
{
if (MinecraftClient.getInstance().cameraEntity instanceof LivingEntity)
{
TimerUtils.onClick(((LivingEntity) MinecraftClient.getInstance().cameraEntity)
.getActiveHand(), true);
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.network" +
".ClientPlayerEntity#clearActiveItem " +
"event",
e);
}
}
}

View File

@@ -0,0 +1,97 @@
/**
* Copyright (C) 2021 Markil 3
* <p>
* This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later
* version.
* <p>
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
* <p>
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
package markil3.immersive_hud.mixin;
import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.item.HeldItemRenderer;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.item.ItemStack;
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.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import markil3.immersive_hud.TimerUtils;
/**
* This mixin hooks into the hand renderer to make the hands move in and out of
* view. Note that most of the logic can be found in {@link TimerUtils}.
*
* @author Markil 3
* @version 0.1-1.16.4-fabric
*/
@Mixin(HeldItemRenderer.class)
public class HeldItemHook
{
private static final Logger LOGGER =
LogManager.getLogger(HeldItemHook.class);
/**
* Determines whether or not to render a certain hand.
*
* @param player
* @param tickDelta
* @param pitch
* @param hand
* @param swingProgress
* @param item
* @param equipProgress
* @param matrices
* @param vertexConsumers
* @param light
* @param callbackInfo
*
* @since 0.1-1.16.4-fabric
*/
@Inject(method = "renderFirstPersonItem", at = @At(value = "INVOKE",
target = "Lnet/minecraft/client/util/math/MatrixStack;push()V",
shift = At.Shift.AFTER), cancellable = true)
public void renderHand(AbstractClientPlayerEntity player,
float tickDelta,
float pitch,
Hand hand,
float swingProgress,
ItemStack item,
float equipProgress,
MatrixStack matrices,
VertexConsumerProvider vertexConsumers,
int light,
CallbackInfo callbackInfo)
{
try
{
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);
}
}
}

View File

@@ -0,0 +1,676 @@
/**
* Copyright (C) 2021 Markil 3
* <p>
* This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later
* version.
* <p>
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
* <p>
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <https://www.gnu.org/licenses/>.
*/
package markil3.immersive_hud.mixin;
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.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.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import markil3.immersive_hud.TimerUtils;
/**
* This mixin hooks into the HUD class to modify most of the HUD elements. Note
* that most of the logic can be found in {@link TimerUtils}.
*
* @author Markil 3
* @version 0.1-1.16.4-fabric
*/
@Mixin(InGameHud.class)
public class HudHook
{
private static final Logger LOGGER = LogManager.getLogger(HudHook.class);
private StatusEffectInstance currentEffect;
/**
* Determines whether or not to draw the crosshair.
*
* @param callbackInfo
*
* @version 0.2-1.16.4-fabric
* @since 0.1-1.16.4-fabric
*/
@Inject(method = "renderCrosshair", at = @At(value = "HEAD"),
cancellable = true)
public void startCrosshair(CallbackInfo callbackInfo)
{
LOGGER.debug("Starting crosshair");
try
{
if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
.getTickDelta()))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderCrosshair " +
"event",
e);
}
}
/**
* Resets any changes from drawing the crosshair.
*
* @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(CallbackInfo callbackInfo)
{
LOGGER.debug("Finishing crosshair");
try
{
/*
* 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);
}
}
/**
* Determines whether or not to draw the horse jump bar.
*
* @param callbackInfo
*
* @version 0.2-1.16.4-fabric
* @since 0.1-1.16.4-fabric
*/
@Inject(method = "renderMountJumpBar", at = @At(value = "HEAD"),
cancellable = true)
public void startJumpbar(int x, CallbackInfo callbackInfo)
{
LOGGER.debug("Starting jumpbar");
try
{
if (TimerUtils.drawJumpbar(MinecraftClient.getInstance()
.getTickDelta()))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountJumpBar " +
"event",
e);
}
}
/**
* Resets any changes from drawing the horse jump bar.
*
* @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(
int x,
CallbackInfo callbackInfo)
{
LOGGER.debug("Finishing jumpbar");
try
{
RenderSystem.popMatrix();
/*
* 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);
}
}
/**
* Determines whether or not to draw the experience bar.
*
* @param callbackInfo
*
* @version 0.2-1.16.4-fabric
* @since 0.1-1.16.4-fabric
*/
@Inject(method = "renderExperienceBar", at = @At(value = "HEAD"),
cancellable = true)
public void startExperience(int x, CallbackInfo callbackInfo)
{
LOGGER.debug("Starting experience bar");
try
{
if (TimerUtils.drawExperience(MinecraftClient.getInstance()
.getTickDelta()))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderExperienceBar " +
"event",
e);
}
}
/**
* Resets any changes from drawing the experience bar.
*
* @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(int x, CallbackInfo callbackInfo)
{
LOGGER.debug("Finishing experience bar");
try
{
RenderSystem.popMatrix();
/*
* 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);
}
}
/**
* Changes the position of the status bars as the ones below them move up
* and down.
*
* @return The same matrix stack, with a new matrix pushed onto it.
*/
@Inject(method = "renderStatusBars", at = @At("HEAD"))
public void startStatus(CallbackInfo info)
{
LOGGER.debug("Starting status bars");
try
{
RenderSystem.pushMatrix();
RenderSystem.translatef(0F, TimerUtils.getHealthTranslation(), 0F);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
}
/**
* Adjusts the armor GUI.
*
* @param 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())
{
TimerUtils.setAlpha(0F);
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
}
/**
* Adjusts the health GUI.
*
* @param callbackInfo
*/
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
target = "Lnet" +
"/minecraft/util/profiler/Profiler;swap" +
"(Ljava/lang/String;)V",
ordinal = 0))
public void renderHealth(CallbackInfo callbackInfo)
{
LOGGER.debug("Rendering health");
try
{
/*
* 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);
}
}
/**
* Adjusts the food GUI.
*
* @param callbackInfo
*/
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
target = "Lnet" +
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
ordinal = 1))
public void renderFood(CallbackInfo callbackInfo)
{
LOGGER.debug("Rendering food");
try
{
/*
* 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);
}
}
/**
* Resets the air GUI.
*
* @param callbackInfo
*/
@Inject(method = "renderStatusBars()V", at = @At(value = "INVOKE",
target = "Lnet" +
"/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V",
ordinal = 2))
public void renderAir(CallbackInfo callbackInfo)
{
LOGGER.debug("Rendering air");
try
{
/*
* 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);
}
}
@Inject(method = "renderStatusBars", at = @At("TAIL"))
public void finishStatus(CallbackInfo info)
{
LOGGER.debug("Finishing status bars");
try
{
RenderSystem.popMatrix();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusBars " +
"event",
e);
}
}
/**
* Determines whether or not to draw the mount's health.
*
* @param callbackInfo
*
* @version 0.2-1.16.4-fabric
* @since 0.1-1.16.4-fabric
*/
@Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
cancellable = true)
public void startMountHealth(CallbackInfo callbackInfo)
{
try
{
if (TimerUtils.drawMountHealth(MinecraftClient.getInstance()
.getTickDelta()))
{
callbackInfo.cancel();
}
else
{
LOGGER.debug("Starting mount health");
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountHealth " +
"event",
e);
}
}
/**
* Resets any changes from drawing the mount's health.
*
* @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(CallbackInfo callbackInfo)
{
LOGGER.debug("Finishing mount health");
try
{
/*
* Resets the color so that nothing else is bothered.
*/
RenderSystem.popMatrix();
TimerUtils.resetAlpha();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderMountHealth " +
"event",
e);
}
}
/**
* Makes the actual adjustment to the hotbar as needed.
*
* @version 0.2-1.16.4-fabric
* @since 0.1-1.16.4-fabric
*/
@Inject(method = "renderStatusEffectOverlay()V", at =
@At(value = "HEAD", shift = At.Shift.AFTER))
public void startPotion(CallbackInfo info)
{
LOGGER.debug("Starting potions");
try
{
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);
}
}
/**
* Makes the actual adjustment to the hotbar as needed.
*
* @version 0.2-1.16.4-fabric
* @since 0.1-1.16.4-fabric
*/
@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;
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;
}
/**
* Makes the actual adjustment to the hotbar as needed.
*
* @param f - The original transparency
*
* @version 0.2-1.16.4-fabric
* @since 0.1-1.16.4-fabric
*/
@ModifyVariable(method = "renderStatusEffectOverlay()V", at =
@At(value = "STORE"))
public float updatePotion(float f)
{
LOGGER.debug("Adjusting potions");
try
{
return TimerUtils.getPotionAlpha(currentEffect);
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderStatusEffectOverlay " +
"event",
e);
}
return 1F;
}
/**
* Resets any changes from drawing the potion effects.
*
* @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(CallbackInfo callbackInfo)
{
LOGGER.debug("Finishing potions");
try
{
/*
* 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);
}
}
/**
* Determines whether or not to draw the hotbar.
*
* @param tickDelta
* @param callbackInfo
*
* @version 0.2-1.16.4-fabric
* @since 0.1-1.16.4-fabric
*/
@Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable =
true)
public void startHotbar(float tickDelta,
CallbackInfo callbackInfo)
{
LOGGER.debug("Starting hotbar");
try
{
if (TimerUtils.updateHotbar(tickDelta))
{
callbackInfo.cancel();
}
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderHotbar " +
"event",
e);
}
}
/**
* Makes the actual adjustment to the hotbar as needed.
*
* @param tickDelta
* @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;color4f(FFFF)V", shift
= At.Shift.AFTER))
public void adjustHotbar(float tickDelta,
CallbackInfo callbackInfo)
{
LOGGER.debug("Adjusting hotbar");
try
{
TimerUtils.recolorHotbar();
}
catch (Exception e)
{
LOGGER.error(
"Error in running net.minecraft.client.gui.hud" +
".InGameHud#renderHotbar " +
"event",
e);
}
}
/**
* Resets any changes from drawing the hotbar.
*
* @param tickDelta
* @param callbackInfo
*
* @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,
CallbackInfo callbackInfo)
{
LOGGER.debug("Finishing hotbar");
try
{
RenderSystem.popMatrix();
/*
* 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);
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 380 KiB

View File

@@ -0,0 +1,53 @@
{
"immersive_hud.configGui.title": "Immersive HUD Configuration",
"option.immersive_hud.hotbarMaxTime": "Hotbar Display Time",
"option.immersive_hud.hotbarFadeIn": "Hotbar Fade In Time",
"option.immersive_hud.hotbarFadeOut": "Hotbar Fade Out Time",
"option.immersive_hud.experienceMaxTime": "Experience Display Time",
"option.immersive_hud.experienceFadeIn": "Experience Fade In Time",
"option.immersive_hud.experienceFadeOut": "Experience Fade Out Time",
"option.immersive_hud.jumpMaxTime": "Jump Bar Display Time",
"option.immersive_hud.jumpFadeIn": "Jump Bar Fade In Time",
"option.immersive_hud.jumpFadeOut": "Jump Bar Fade Out Time",
"option.immersive_hud.healthMaxTime": "Health Bar Display Time",
"option.immersive_hud.healthFadeIn": "Health Bar Fade In Time",
"option.immersive_hud.healthFadeOut": "Health Bar Fade Out Time",
"option.immersive_hud.hungerMaxTime": "Hunger Bar Display Time",
"option.immersive_hud.hungerFadeIn": "Hunger Bar Fade In Time",
"option.immersive_hud.hungerFadeOut": "Hunger Bar Fade Out Time",
"option.immersive_hud.effectMaxTime": "Potion Display Time",
"option.immersive_hud.effectFadeIn": "Potion Fade In Time",
"option.immersive_hud.effectFadeOut": "Potion Fade Out Time",
"option.immersive_hud.crosshairTime": "Crosshair Display Time",
"option.immersive_hud.hideCrosshair": "Hide Crosshair",
"option.immersive_hud.handTime": "Hand Display Time",
"option.immersive_hud.hideHands": "Hide Hands",
"option.immersive_hud.minHealth": "Minimum Health Fade",
"option.immersive_hud.minHunger": "Minimum Hunger Fade",
"option.immersive_hud.showArmor": "Show Armor",
"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",
"tooltip.immersive_hud.experienceMaxTime": "How long the experience bar can be displayed on screen in seconds",
"tooltip.immersive_hud.experienceFadeIn": "How many seconds it takes for the experience bar to fade in",
"tooltip.immersive_hud.experienceFadeOut": "How many seconds it takes for the experience bar to move out",
"tooltip.immersive_hud.jumpMaxTime": "How long the horse jump bar can be displayed on screen in seconds",
"tooltip.immersive_hud.jumpFadeIn": "How many seconds it takes for the horse jump bar to fade in",
"tooltip.immersive_hud.jumpFadeOut": "How many seconds it takes for the horse jump bar to fade out",
"tooltip.immersive_hud.healthMaxTime": "How long the health bar can be displayed on screen in seconds",
"tooltip.immersive_hud.healthFadeIn": "How many seconds it takes for the health bar to fade in",
"tooltip.immersive_hud.healthFadeOut": "How many seconds it takes for the health bar to fade out",
"tooltip.immersive_hud.hungerMaxTime": "How long the hunger bar can be displayed on screen in seconds",
"tooltip.immersive_hud.hungerFadeIn": "How many seconds it takes for the hunger bar to fade in",
"tooltip.immersive_hud.hungerFadeOut": "How many seconds it takes for the hunger bar to fade out",
"tooltip.immersive_hud.effectMaxTime": "How long potion icons can be displayed on screen in seconds",
"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.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.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"
}

View File

@@ -0,0 +1,44 @@
{
"schemaVersion": 1,
"id": "immersive_hud",
"version": "${version}",
"name": "Immersive HUD",
"description": "This mod aims to move the ingame HUD out of the way whenever possible. Whenever an element updates (i.e., health changes, you swap items, you look at something, etc.), the respective item will show up. However, once you've been able to see the information, it will fade away and allow you to enjoy your game without the clutter of unneeded HUD elements.\n\nNote that the following elements are unaffected:\n* The F3 Menu. Honestly, anyone who uses this isn't in the need for immersion at the moment.\n* The chat. This will automatically fade away by itself.\n* The oxygen bar. This will disappear as soon as it is filled, anyway.\n* Boss health. It is helpful to have this available in a hectic situation.\n* Sub-maximum health or hunger. In hectic battles, it can be convenient to see health at a glance.",
"authors": [
"Markil 3"
],
"contact": {
"homepage": "https://www.planetminecraft.com/mod/immersive-hud/",
"sources": "https://github.com/Markil3/MinecraftImmersiveHUD",
"issues": "https://github.com/Markil3/MinecraftImmersiveHUD/issues"
},
"license": "GPL-3.0-only",
"icon": "assets/immersive_hud/icon.png",
"environment": "client",
"entrypoints": {
"main": [
"markil3.immersive_hud.Main"
],
"modmenu": [
"markil3.immersive_hud.ModMenu"
]
},
"mixins": [
{
"config": "modid.mixins.json",
"environment": "client"
}
],
"depends": {
"fabricloader": ">=0.7.4",
"minecraft": "1.15.x"
},
"suggests": {
"modmenu": "*",
"cloth-config2": "*"
}
}

View File

@@ -0,0 +1,16 @@
{
"required": true,
"minVersion": "0.8",
"package": "markil3.immersive_hud.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [
],
"client": [
"ClientPlayerHook",
"HeldItemHook",
"HudHook"
],
"injectors": {
"defaultRequire": 1
}
}

View File

@@ -1,77 +0,0 @@
{
"homepage": "https://github.com/Markil3/MinecraftImmersiveHUD/releases",
"1.14": {
"1.0-1.14-forge": "Removes support for Cloth Config.",
"1.1-1.14-forge": "Gives players the option of preventing hands and crosshairs from fading.",
"1.1.1-1.14-forge": "Bug fixes."
},
"1.14.1": {
"1.0-1.14-forge": "Removes support for Cloth Config.",
"1.1-1.14-forge": "Gives players the option of preventing hands and crosshairs from fading.",
"1.1.1-1.14-forge": "Bug fixes."
},
"1.14.2": {
"1.0-1.14-forge": "Removes support for Cloth Config.",
"1.1-1.14-forge": "Gives players the option of preventing hands and crosshairs from fading.",
"1.1.1-1.14-forge": "Bug fixes."
},
"1.14.3": {
"1.0-1.14-forge": "Removes support for Cloth Config.",
"1.1-1.14-forge": "Gives players the option of preventing hands and crosshairs from fading.",
"1.1.1-1.14-forge": "Bug fixes."
},
"1.14.4": {
"1.0-1.14-forge": "Removes support for Cloth Config.",
"1.1-1.14-forge": "Gives players the option of preventing hands and crosshairs from fading.",
"1.1.1-1.14-forge": "Bug fixes."
},
"1.15": {
"1.0-1.15-forge": "Removes support for Cloth Config.",
"1.1-1.15-forge": "Gives players the option of preventing hands and crosshairs from fading.",
"1.1.1-1.15-forge": "Bug fixes."
},
"1.15.1": {
"1.0-1.15-forge": "Removes support for Cloth Config.",
"1.1-1.15-forge": "Gives players the option of preventing hands and crosshairs from fading.",
"1.1.1-1.15-forge": "Bug fixes."
},
"1.15.2": {
"1.0-1.15.2-forge": "Removes support for Cloth Config.",
"1.1-1.15.2-forge": "Gives players the option of preventing hands and crosshairs from fading.",
"1.1.1-1.15.2-forge": "Bug fixes."
},
"1.16.4": {
"0.1-1.16.4-forge": "Initial release",
"1.0-1.16.4-forge": "Causes potion effects to fade, adds sliding animations to the hotbar, experience, and jump bars, and adds support for configuring the timings.",
"1.1-1.16.4-forge": "Gives players the option of preventing hands and crosshairs from fading.",
"1.1.1-1.16.4-forge": "Bug fixes."
},
"1.16.5": {
"0.1-1.16.4-forge": "Initial release",
"1.0-1.16.4-forge": "Causes potion effects to fade, adds sliding animations to the hotbar, experience, and jump bars, and adds support for configuring the timings.",
"1.1-1.16.4-forge": "Gives players the option of preventing hands and crosshairs from fading.",
"1.1.1-1.16.4-forge": "Bug fixes."
},
"promos": {
"1.14-latest": "1.1.1-1.14-forge",
"1.14-recommended": "1.1.1-1.14-forge",
"1.14.1-latest": "1.1.1-1.14-forge",
"1.14.1-recommended": "1.1.1-1.14-forge",
"1.14.2-latest": "1.1.1-1.14-forge",
"1.14.2-recommended": "1.1.1-1.14-forge",
"1.14.3-latest": "1.1.1-1.14-forge",
"1.14.3-recommended": "1.1.1-1.14-forge",
"1.14.4-latest": "1.1.1-1.14-forge",
"1.14.4-recommended": "1.1.1-1.14-forge",
"1.15-latest": "1.1.1-1.15-forge",
"1.15-recommended": "1.1.1-1.15-forge",
"1.15.1-latest": "1.1.1-1.15-forge",
"1.15.1-recommended": "1.1.10-1.15-forge",
"1.15.2-latest": "1.1.1-1.15.2-forge",
"1.15.2-recommended": "1.1.1-1.15.2-forge",
"1.16.4-latest": "1.1.1-1.16.4-forge",
"1.16.4-recommended": "1.1.1-1.16.4-forge",
"1.16.5-latest": "1.1.1-1.16.4-forge",
"1.16.5-recommended": "1.1.1-1.16.4-forge"
}
}