Compare commits
4 Commits
1.18-fabri
...
readme-pat
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d5f5e1bb9b | ||
|
|
2641ce4f17 | ||
|
|
630f0c5a0b | ||
|
|
80966e90ad |
41
.github/workflows/build.yml
vendored
@@ -1,41 +0,0 @@
|
|||||||
# 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.17, # Minimum supported by Minecraft
|
|
||||||
17, # Current Java LTS
|
|
||||||
17 # 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/
|
|
||||||
51
.gitignore
vendored
Executable file → Normal file
@@ -1,41 +1,26 @@
|
|||||||
# gradle
|
|
||||||
|
|
||||||
.gradle/
|
|
||||||
build/
|
|
||||||
out/
|
|
||||||
classes/
|
|
||||||
|
|
||||||
# eclipse
|
# eclipse
|
||||||
|
bin
|
||||||
*.launch
|
*.launch
|
||||||
|
.settings
|
||||||
# idea
|
.metadata
|
||||||
|
|
||||||
.idea/
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
*.iws
|
|
||||||
|
|
||||||
# vscode
|
|
||||||
|
|
||||||
.settings/
|
|
||||||
.vscode/
|
|
||||||
bin/
|
|
||||||
.classpath
|
.classpath
|
||||||
.project
|
.project
|
||||||
|
|
||||||
# macos
|
# idea
|
||||||
|
out
|
||||||
|
*.ipr
|
||||||
|
*.iws
|
||||||
|
*.iml
|
||||||
|
.idea
|
||||||
|
|
||||||
*.DS_Store
|
# gradle
|
||||||
|
build
|
||||||
|
.gradle
|
||||||
|
|
||||||
# fabric
|
# other
|
||||||
|
eclipse
|
||||||
|
run
|
||||||
|
|
||||||
run/
|
# Files from Forge MDK
|
||||||
/logs/
|
forge*changelog.txt
|
||||||
local.properties
|
/local.properties
|
||||||
remappedSrc/
|
|
||||||
MinecraftImmersiveHUD.mcpack
|
|
||||||
manifest.json
|
|
||||||
pack_icon.png
|
|
||||||
scripts/
|
|
||||||
subpacks/
|
|
||||||
|
|||||||
86
build.gradle
@@ -1,86 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id 'fabric-loom' version '0.11-SNAPSHOT'
|
|
||||||
id 'maven-publish'
|
|
||||||
}
|
|
||||||
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
|
||||||
targetCompatibility = JavaVersion.VERSION_17
|
|
||||||
|
|
||||||
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:cloth-config-fabric:${project.cloth_version}"
|
|
||||||
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
|
|
||||||
|
|
||||||
// Fabric API. This is technically optional, but you probably want it anyway.
|
|
||||||
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_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"
|
|
||||||
|
|
||||||
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
|
|
||||||
it.options.release = 17
|
|
||||||
}
|
|
||||||
|
|
||||||
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.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
0
demo.gif
Executable file → Normal file
|
Before Width: | Height: | Size: 37 MiB After Width: | Height: | Size: 37 MiB |
@@ -1,17 +0,0 @@
|
|||||||
# Done to increase the memory available to gradle.
|
|
||||||
org.gradle.jvmargs=-Xmx4G
|
|
||||||
|
|
||||||
# Fabric Properties
|
|
||||||
# check these on https://fabricmc.net/use
|
|
||||||
minecraft_version=1.18.1
|
|
||||||
yarn_mappings=1.18.1+build.22
|
|
||||||
loader_version=0.12.12
|
|
||||||
|
|
||||||
cloth_version=6.1.48
|
|
||||||
modmenu_version=3.0.1
|
|
||||||
fabric_version=0.46.2+1.18
|
|
||||||
|
|
||||||
# Mod Properties
|
|
||||||
mod_version = 1.3
|
|
||||||
maven_group = markil3
|
|
||||||
archives_base_name = immersive_hud
|
|
||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
5
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +0,0 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
||||||
234
gradlew
vendored
@@ -1,234 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright © 2015-2021 the original 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 POSIX generated by Gradle.
|
|
||||||
#
|
|
||||||
# Important for running:
|
|
||||||
#
|
|
||||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
|
||||||
# noncompliant, but you have some other compliant shell such as ksh or
|
|
||||||
# bash, then to run this script, type that shell name before the whole
|
|
||||||
# command line, like:
|
|
||||||
#
|
|
||||||
# ksh Gradle
|
|
||||||
#
|
|
||||||
# Busybox and similar reduced shells will NOT work, because this script
|
|
||||||
# requires all of these POSIX shell features:
|
|
||||||
# * functions;
|
|
||||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
|
||||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
|
||||||
# * compound commands having a testable exit status, especially «case»;
|
|
||||||
# * various built-in commands including «command», «set», and «ulimit».
|
|
||||||
#
|
|
||||||
# Important for patching:
|
|
||||||
#
|
|
||||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
|
||||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
|
||||||
#
|
|
||||||
# The "traditional" practice of packing multiple parameters into a
|
|
||||||
# space-separated string is a well documented source of bugs and security
|
|
||||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
|
||||||
# options in "$@", and eventually passing that to Java.
|
|
||||||
#
|
|
||||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
|
||||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
|
||||||
# see the in-line comments for details.
|
|
||||||
#
|
|
||||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
|
||||||
# Darwin, MinGW, and NonStop.
|
|
||||||
#
|
|
||||||
# (3) This script is generated from the Groovy template
|
|
||||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
|
||||||
# within the Gradle project.
|
|
||||||
#
|
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
|
||||||
app_path=$0
|
|
||||||
|
|
||||||
# Need this for daisy-chained symlinks.
|
|
||||||
while
|
|
||||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
|
||||||
[ -h "$app_path" ]
|
|
||||||
do
|
|
||||||
ls=$( ls -ld "$app_path" )
|
|
||||||
link=${ls#*' -> '}
|
|
||||||
case $link in #(
|
|
||||||
/*) app_path=$link ;; #(
|
|
||||||
*) app_path=$APP_HOME$link ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=${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 "$*"
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
die () {
|
|
||||||
echo
|
|
||||||
echo "$*"
|
|
||||||
echo
|
|
||||||
exit 1
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
# 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 ;; #(
|
|
||||||
MSYS* | 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" && ! "$darwin" && ! "$nonstop" ; then
|
|
||||||
case $MAX_FD in #(
|
|
||||||
max*)
|
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
|
||||||
warn "Could not query maximum file descriptor limit"
|
|
||||||
esac
|
|
||||||
case $MAX_FD in #(
|
|
||||||
'' | soft) :;; #(
|
|
||||||
*)
|
|
||||||
ulimit -n "$MAX_FD" ||
|
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Collect all arguments for the java command, stacking in reverse order:
|
|
||||||
# * args from the command line
|
|
||||||
# * the main class name
|
|
||||||
# * -classpath
|
|
||||||
# * -D...appname settings
|
|
||||||
# * --module-path (only if needed)
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if "$cygwin" || "$msys" ; then
|
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
|
||||||
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
for arg do
|
|
||||||
if
|
|
||||||
case $arg in #(
|
|
||||||
-*) false ;; # don't mess with options #(
|
|
||||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
|
||||||
[ -e "$t" ] ;; #(
|
|
||||||
*) false ;;
|
|
||||||
esac
|
|
||||||
then
|
|
||||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
|
||||||
fi
|
|
||||||
# Roll the args list around exactly as many times as the number of
|
|
||||||
# args, so each arg winds up back in the position where it started, but
|
|
||||||
# possibly modified.
|
|
||||||
#
|
|
||||||
# NB: a `for` loop captures its iteration list before it begins, so
|
|
||||||
# changing the positional parameters here affects neither the number of
|
|
||||||
# iterations, nor the values presented in `arg`.
|
|
||||||
shift # remove old arg
|
|
||||||
set -- "$@" "$arg" # push replacement arg
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
|
||||||
# double quotes to make sure that they get re-expanded; and
|
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
|
||||||
|
|
||||||
set -- \
|
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
|
||||||
-classpath "$CLASSPATH" \
|
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
|
||||||
"$@"
|
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args.
|
|
||||||
#
|
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
|
||||||
#
|
|
||||||
# In Bash we could simply go:
|
|
||||||
#
|
|
||||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
|
||||||
# set -- "${ARGS[@]}" "$@"
|
|
||||||
#
|
|
||||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
|
||||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
|
||||||
# character that might be a shell metacharacter, then use eval to reverse
|
|
||||||
# that process (while maintaining the separation between arguments), and wrap
|
|
||||||
# the whole thing up as a single "set" statement.
|
|
||||||
#
|
|
||||||
# This will of course break if any of these variables contains a newline or
|
|
||||||
# an unmatched quote.
|
|
||||||
#
|
|
||||||
|
|
||||||
eval "set -- $(
|
|
||||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
|
||||||
xargs -n1 |
|
|
||||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
|
||||||
tr '\n' ' '
|
|
||||||
)" '"$@"'
|
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
|
||||||
89
gradlew.bat
vendored
@@ -1,89 +0,0 @@
|
|||||||
@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
|
|
||||||
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 |
@@ -1,9 +0,0 @@
|
|||||||
pluginManagement {
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
name = 'Fabric'
|
|
||||||
url = 'https://maven.fabricmc.net/'
|
|
||||||
}
|
|
||||||
gradlePluginPortal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,450 +0,0 @@
|
|||||||
package markil3.immersive_hud;
|
|
||||||
|
|
||||||
import static markil3.immersive_hud.Main.TICKS_PER_SECOND;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
import net.minecraft.block.Blocks;
|
|
||||||
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.shedaniel.autoconfig.AutoConfig;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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 airTime = 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;
|
|
||||||
private int minAir = 300;
|
|
||||||
private Identifier[] ignoredItems = new Identifier[]{Registry.ITEM.getId(Items.FIREWORK_ROCKET)};
|
|
||||||
private Identifier[] enchantingBlocks = new Identifier[]{Registry.BLOCK.getId(Blocks.ENCHANTING_TABLE), Registry.BLOCK.getId(Blocks.ANVIL), Registry.BLOCK.getId(Blocks.BOOKSHELF), Registry.BLOCK.getId(Blocks.FURNACE), Registry.BLOCK.getId(Blocks.BLAST_FURNACE), Registry.BLOCK.getId(Blocks.SMOKER), Registry.BLOCK.getId(Blocks.GRINDSTONE)};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the instance of this class.
|
|
||||||
*
|
|
||||||
* @return the instance of this class
|
|
||||||
*/
|
|
||||||
public static ConfigManager getInstance()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (Class.forName("me.shedaniel.autoconfig.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;
|
|
||||||
}
|
|
||||||
|
|
||||||
public TimeValues getAirTime()
|
|
||||||
{
|
|
||||||
return this.airTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Obtains the minimum oxygen for fading. Anything below that and the oxygen
|
|
||||||
* always displays.
|
|
||||||
*
|
|
||||||
* @return The oxygen boundary, from 0 to 20.
|
|
||||||
*/
|
|
||||||
public int getMinAir()
|
|
||||||
{
|
|
||||||
return this.minAir;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Obtains a collection of items that will display the enchantment bar when hovered over.
|
|
||||||
*
|
|
||||||
* @return A set of blocks.
|
|
||||||
*/
|
|
||||||
public Set<Block> getEnchantingItems()
|
|
||||||
{
|
|
||||||
return Arrays.stream(enchantingBlocks).map(Registry.BLOCK::get).collect(Collectors.toSet());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Obtains a collection of items that will display the enchantment bar when hovered over.
|
|
||||||
*
|
|
||||||
* @return An array blocks.
|
|
||||||
*/
|
|
||||||
public Identifier[] getEnchantingdentifiers()
|
|
||||||
{
|
|
||||||
return this.enchantingBlocks;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the minimum oxygen value for fading. Anything below that and the
|
|
||||||
* air bar always displays.
|
|
||||||
*
|
|
||||||
* @param boundary - The air boundary, from 0 to 20.
|
|
||||||
*/
|
|
||||||
public void setMinAir(int boundary)
|
|
||||||
{
|
|
||||||
this.minAir = 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets which items will display the experience bar when hovered over.
|
|
||||||
*
|
|
||||||
* @param items - A set of ignored items.
|
|
||||||
*/
|
|
||||||
public void setEnchantingItems(Block... items)
|
|
||||||
{
|
|
||||||
this.enchantingBlocks = Arrays.stream(items).map(Registry.BLOCK::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 setEnchantingItems(String... items)
|
|
||||||
{
|
|
||||||
this.enchantingBlocks = Arrays.stream(items).map(Identifier::new).filter(i -> Registry.BLOCK.getOrEmpty(i).isPresent()).toArray(Identifier[]::new);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Saves changes to this mod's configuration.
|
|
||||||
*/
|
|
||||||
// public void save()
|
|
||||||
// {
|
|
||||||
// SPEC.save();
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package markil3.immersive_hud;
|
|
||||||
|
|
||||||
import me.shedaniel.autoconfig.ConfigData;
|
|
||||||
import me.shedaniel.autoconfig.annotation.Config;
|
|
||||||
|
|
||||||
@Config(name = "immersive_hud")
|
|
||||||
public class ConfigManagerCloth extends ConfigManager implements ConfigData
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
public void validatePostLoad() throws ValidationException
|
|
||||||
{
|
|
||||||
this.setMinHealth(this.getMinHealth());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/**
|
|
||||||
* 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.shedaniel.autoconfig.AutoConfig;
|
|
||||||
import me.shedaniel.autoconfig.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.shedaniel.autoconfig.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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,262 +0,0 @@
|
|||||||
package markil3.immersive_hud;
|
|
||||||
|
|
||||||
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
|
||||||
import com.terraformersmc.modmenu.api.ModMenuApi;
|
|
||||||
|
|
||||||
import net.minecraft.block.Blocks;
|
|
||||||
import net.minecraft.item.Items;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import net.minecraft.util.InvalidIdentifierException;
|
|
||||||
import net.minecraft.util.registry.Registry;
|
|
||||||
|
|
||||||
import me.shedaniel.autoconfig.AutoConfig;
|
|
||||||
import me.shedaniel.clothconfig2.api.ConfigBuilder;
|
|
||||||
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;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
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(new TranslatableText(
|
|
||||||
"option.immersive_hud." + name +
|
|
||||||
"MaxTime"),
|
|
||||||
(float) value.getMaxTime() / TICKS_PER_SECOND)
|
|
||||||
.setDefaultValue(SHOW_TIME)
|
|
||||||
.setMin(0)
|
|
||||||
.setMax(10 * 60 * TICKS_PER_SECOND) // 10 Minutes
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud." + name +
|
|
||||||
"MaxTime"))
|
|
||||||
.setSaveConsumer(val -> value.setMaxTime((int) (val * TICKS_PER_SECOND)))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
DoubleListEntry fadeIn =
|
|
||||||
entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud." + name +
|
|
||||||
"FadeIn"),
|
|
||||||
(float) value.getFadeInTime() / TICKS_PER_SECOND)
|
|
||||||
.setDefaultValue(FADE_IN)
|
|
||||||
.setMin(0)
|
|
||||||
.setMax(10 * 60 * TICKS_PER_SECOND)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud." + name +
|
|
||||||
"FadeIn"))
|
|
||||||
.setSaveConsumer(val -> value.setFadeInTime((int) (val * TICKS_PER_SECOND)))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
DoubleListEntry fadeOut =
|
|
||||||
entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud." + name +
|
|
||||||
"FadeOut"),
|
|
||||||
(float) value.getFadeOutTime() / TICKS_PER_SECOND)
|
|
||||||
.setDefaultValue(FADE_OUT)
|
|
||||||
.setMin(0)
|
|
||||||
.setMax(10 * 60 * TICKS_PER_SECOND)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud." + name +
|
|
||||||
"FadeOut"))
|
|
||||||
.setSaveConsumer(val -> value.setFadeOutTime((int) (val * TICKS_PER_SECOND)))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
cat.addEntry(maxTime);
|
|
||||||
cat.addEntry(fadeIn);
|
|
||||||
cat.addEntry(fadeOut);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ConfigScreenFactory<?> getModConfigScreenFactory()
|
|
||||||
{
|
|
||||||
return screen -> {
|
|
||||||
ConfigCategory general;
|
|
||||||
ConfigEntryBuilder entryBuilder;
|
|
||||||
ConfigManager instance = ConfigManager.getInstance();
|
|
||||||
final ConfigBuilder builder = ConfigBuilder.create()
|
|
||||||
.setParentScreen(screen)
|
|
||||||
.setTitle(new TranslatableText(
|
|
||||||
"immersive_hud.configGui.title"))
|
|
||||||
.setSavingRunnable(() -> {
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (Class.forName("me.shedaniel.autoconfig.AutoConfig") != null)
|
|
||||||
{
|
|
||||||
AutoConfig.getConfigHolder(ConfigManagerCloth.class)
|
|
||||||
.save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (ClassNotFoundException e)
|
|
||||||
{
|
|
||||||
// Do nothing
|
|
||||||
}
|
|
||||||
});
|
|
||||||
general =
|
|
||||||
builder.getOrCreateCategory(new TranslatableText(
|
|
||||||
"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("air", entryBuilder,
|
|
||||||
general,
|
|
||||||
instance.getAirTime());
|
|
||||||
startTimeField("effect", entryBuilder,
|
|
||||||
general,
|
|
||||||
instance.getPotionTime());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud" +
|
|
||||||
".crosshairTime"),
|
|
||||||
(float) instance.getCrosshairTime() / TICKS_PER_SECOND)
|
|
||||||
.setDefaultValue(6)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud" +
|
|
||||||
".crosshairTime"))
|
|
||||||
.setSaveConsumer(val -> instance.setCrosshairTime((int) (val * TICKS_PER_SECOND)))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
|
||||||
"option.immersive_hud.hideCrosshair"),
|
|
||||||
instance.hideCrosshair())
|
|
||||||
.setDefaultValue(true)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.hideCrosshair"))
|
|
||||||
.setSaveConsumer(val -> instance.hideCrosshair(val))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud.handTime"),
|
|
||||||
(float) instance.getHandTime() / TICKS_PER_SECOND)
|
|
||||||
.setDefaultValue(30)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.handTime"))
|
|
||||||
.setSaveConsumer(val -> instance.setHandTime((int) (val * TICKS_PER_SECOND)))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
|
||||||
"option.immersive_hud.hideHands"),
|
|
||||||
instance.hideHands())
|
|
||||||
.setDefaultValue(true)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.hideHands"))
|
|
||||||
.setSaveConsumer(val -> instance.hideHands(val))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startDoubleField(new TranslatableText(
|
|
||||||
"option.immersive_hud.minHealth"),
|
|
||||||
instance.getMinHealth())
|
|
||||||
.setDefaultValue(0.5)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.minHealth"))
|
|
||||||
.setSaveConsumer(val -> instance.setMinHealth(val))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startIntField(new TranslatableText(
|
|
||||||
"option.immersive_hud.minHunger"),
|
|
||||||
instance.getMinHunger())
|
|
||||||
.setDefaultValue(17)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.minHunger"))
|
|
||||||
.setSaveConsumer(val -> instance.setMinHunger(val))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startIntField(new TranslatableText(
|
|
||||||
"option.immersive_hud.minAir"),
|
|
||||||
instance.getMinAir())
|
|
||||||
.setDefaultValue(300)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.minAir"))
|
|
||||||
.setSaveConsumer(val -> instance.setMinAir(val))
|
|
||||||
.build());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(
|
|
||||||
"option.immersive_hud.showArmor"),
|
|
||||||
instance.shouldShowArmor())
|
|
||||||
.setDefaultValue(true)
|
|
||||||
.setTooltip(new TranslatableText(
|
|
||||||
"tooltip.immersive_hud.showArmor"))
|
|
||||||
.setSaveConsumer(val -> instance.shouldShowArmor(val))
|
|
||||||
.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());
|
|
||||||
|
|
||||||
general.addEntry(entryBuilder
|
|
||||||
.startStrList(new TranslatableText("option.immersive_hud.enchantingList"), Arrays
|
|
||||||
.asList(instance
|
|
||||||
.getEnchantingdentifiers()).stream().map(Identifier::toString)
|
|
||||||
.collect(Collectors.toList()))
|
|
||||||
.setDefaultValue(Arrays
|
|
||||||
.asList(Blocks.ENCHANTING_TABLE, Blocks.ANVIL, Blocks.BOOKSHELF, Blocks.FURNACE, Blocks.BLAST_FURNACE, Blocks.SMOKER, Blocks.GRINDSTONE).stream().map(b -> Registry.BLOCK.getId(b).toString()).toList())
|
|
||||||
.setTooltip(new TranslatableText("tooltip.immersive_hud.enchantingList"))
|
|
||||||
.setSaveConsumer(val -> instance.setIgnoredItems(val.toArray(new String[0]))).setErrorSupplier(val -> {
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Optional<String> item = val.stream().filter(i -> !Registry.BLOCK.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();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,123 +0,0 @@
|
|||||||
/**
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
/**
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,698 +0,0 @@
|
|||||||
/**
|
|
||||||
* 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.client.util.math.MatrixStack;
|
|
||||||
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 1.1.1-1.17-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 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 = "HEAD"),
|
|
||||||
cancellable = true)
|
|
||||||
public void startCrosshair(MatrixStack stack, CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (TimerUtils.drawCrosshair(MinecraftClient.getInstance()
|
|
||||||
.getTickDelta()))
|
|
||||||
{
|
|
||||||
callbackInfo.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
LOGGER.error(
|
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
|
||||||
".InGameHud#startCrosshair " +
|
|
||||||
"event",
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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)
|
|
||||||
{
|
|
||||||
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 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 = "HEAD"),
|
|
||||||
cancellable = true)
|
|
||||||
public void startJumpbar(MatrixStack stack,
|
|
||||||
int x,
|
|
||||||
CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (TimerUtils.drawJumpbar(stack,
|
|
||||||
MinecraftClient.getInstance().getTickDelta()))
|
|
||||||
{
|
|
||||||
callbackInfo.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
LOGGER.error(
|
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
|
||||||
".InGameHud#renderMountJumpBar " +
|
|
||||||
"event",
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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,
|
|
||||||
int x,
|
|
||||||
CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
stack.pop();
|
|
||||||
/*
|
|
||||||
* 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 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 = "HEAD"),
|
|
||||||
cancellable = true)
|
|
||||||
public void startExperience(MatrixStack stack,
|
|
||||||
int x,
|
|
||||||
CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (TimerUtils.drawExperience(stack,
|
|
||||||
MinecraftClient.getInstance().getTickDelta()))
|
|
||||||
{
|
|
||||||
callbackInfo.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
LOGGER.error(
|
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
|
||||||
".InGameHud#renderExperienceBar " +
|
|
||||||
"event",
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
stack.pop();
|
|
||||||
/*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
* @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)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
float trans = TimerUtils.getHealthTranslation();
|
|
||||||
stack.push();
|
|
||||||
stack.translate(0F, trans, 0F);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
LOGGER.error(
|
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
|
||||||
".InGameHud#renderStatusBars " +
|
|
||||||
"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)
|
|
||||||
{
|
|
||||||
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 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",
|
|
||||||
ordinal = 0))
|
|
||||||
public void renderHealth(MatrixStack matrices, CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Resets the transparency from the previous call.
|
|
||||||
*/
|
|
||||||
TimerUtils.setAlpha(1F);
|
|
||||||
if (TimerUtils.drawHealth(MinecraftClient.getInstance()
|
|
||||||
.getTickDelta()))
|
|
||||||
{
|
|
||||||
TimerUtils.setAlpha(0F);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
LOGGER.error(
|
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
|
||||||
".InGameHud#renderStatusBars " +
|
|
||||||
"event",
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Adjusts the food 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",
|
|
||||||
ordinal = 1, shift = At.Shift.BY, by = 3))
|
|
||||||
public void renderFood(MatrixStack matrices, CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Resets the transparency from the previous call.
|
|
||||||
*/
|
|
||||||
TimerUtils.setAlpha(1F);
|
|
||||||
if (TimerUtils.drawHunger(MinecraftClient.getInstance()
|
|
||||||
.getTickDelta()))
|
|
||||||
{
|
|
||||||
TimerUtils.setAlpha(0F);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
LOGGER.error(
|
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
|
||||||
".InGameHud#renderStatusBars " +
|
|
||||||
"event",
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resets the air 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",
|
|
||||||
ordinal = 2))
|
|
||||||
public void renderAir(MatrixStack matrices, CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Resets the color so that nothing else is bothered.
|
|
||||||
*/
|
|
||||||
TimerUtils.setAlpha(1F);
|
|
||||||
if (TimerUtils.drawAir(MinecraftClient.getInstance().getTickDelta()))
|
|
||||||
{
|
|
||||||
TimerUtils.setAlpha(0F);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
LOGGER.error(
|
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
|
||||||
".InGameHud#renderStatusBars " +
|
|
||||||
"event",
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ModifyVariable(method = "renderStatusBars(Lnet/minecraft/client/util" +
|
|
||||||
"/math/MatrixStack;)V", at = @At("TAIL"))
|
|
||||||
public MatrixStack finishStatus(MatrixStack stack)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
TimerUtils.setAlpha(1F);
|
|
||||||
stack.pop();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
LOGGER.error(
|
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
|
||||||
".InGameHud#renderStatusBars " +
|
|
||||||
"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
|
|
||||||
* @since 0.1-1.16.4-fabric
|
|
||||||
*/
|
|
||||||
@Inject(method = "renderMountHealth", at = @At(value = "HEAD"),
|
|
||||||
cancellable = true)
|
|
||||||
public void startMountHealth(MatrixStack stack, CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (TimerUtils.drawMountHealth(stack,
|
|
||||||
MinecraftClient.getInstance().getTickDelta()))
|
|
||||||
{
|
|
||||||
callbackInfo.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
LOGGER.error(
|
|
||||||
"Error in running net.minecraft.client.gui.hud" +
|
|
||||||
".InGameHud#renderMountHealth " +
|
|
||||||
"event",
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Resets the color so that nothing else is bothered.
|
|
||||||
*/
|
|
||||||
stack.pop();
|
|
||||||
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" +
|
|
||||||
"(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
|
|
||||||
@At(value = "HEAD", shift = At.Shift.AFTER))
|
|
||||||
public void startPotion(MatrixStack effect, CallbackInfo info)
|
|
||||||
{
|
|
||||||
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" +
|
|
||||||
"(Lnet/minecraft/client/util/math/MatrixStack;)V", at =
|
|
||||||
@At(value = "INVOKE",
|
|
||||||
target =
|
|
||||||
"Lnet/minecraft/entity/effect/StatusEffectInstance;" +
|
|
||||||
"shouldShowIcon()Z"))
|
|
||||||
public boolean shouldRenderPotion(StatusEffectInstance effect)
|
|
||||||
{
|
|
||||||
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
|
|
||||||
* @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 =
|
|
||||||
@At(value = "STORE"))
|
|
||||||
public float updatePotion(float f,
|
|
||||||
MatrixStack stack)
|
|
||||||
{
|
|
||||||
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 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)
|
|
||||||
{
|
|
||||||
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 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 = "HEAD"), cancellable =
|
|
||||||
true)
|
|
||||||
public void startHotbar(float tickDelta,
|
|
||||||
MatrixStack matrices,
|
|
||||||
CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
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 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
|
|
||||||
= At.Shift.AFTER))
|
|
||||||
public void adjustHotbar(float tickDelta,
|
|
||||||
MatrixStack matrices,
|
|
||||||
CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
TimerUtils.recolorHotbar(matrices);
|
|
||||||
}
|
|
||||||
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 stack - The matrix drawing stack.
|
|
||||||
* @param callbackInfo
|
|
||||||
*
|
|
||||||
* @version 1.1.1-1.17-fabric
|
|
||||||
* @since 0.1-1.16.4-fabric
|
|
||||||
*/
|
|
||||||
@Inject(method = "renderHotbar", at = @At(value = "TAIL"))
|
|
||||||
public void finishHotbar(float tickDelta,
|
|
||||||
MatrixStack stack,
|
|
||||||
CallbackInfo callbackInfo)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
stack.pop();
|
|
||||||
stack = RenderSystem.getModelViewStack();
|
|
||||||
stack.pop();
|
|
||||||
RenderSystem.applyModelViewMatrix();
|
|
||||||
/*
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
Before Width: | Height: | Size: 380 KiB |
@@ -1,67 +0,0 @@
|
|||||||
{
|
|
||||||
"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.airMaxTime": "Oxygen Bar Display Time",
|
|
||||||
"option.immersive_hud.airFadeIn": "Oxygen Bar Fade In Time",
|
|
||||||
"option.immersive_hud.airFadeOut": "Oxygen 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.minAir": "Minimum Oxygen Fade",
|
|
||||||
"option.immersive_hud.showArmor": "Show Armor",
|
|
||||||
"option.immersive_hud.ignoreList": "Ignored Items",
|
|
||||||
"option.immersive_hud.enchantingList": "Experience Blocks",
|
|
||||||
"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.airMaxTime": "How long the hunger bar can be oxygen on screen in seconds",
|
|
||||||
"tooltip.immersive_hud.airFadeIn": "How many seconds it takes for the oxygen bar to fade in",
|
|
||||||
"tooltip.immersive_hud.airFadeOut": "How many seconds it takes for the oxygen 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.minAir": "When the oxygen level goes below this level, the oxygen 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",
|
|
||||||
"tooltip.immersive_hud.enchantingList": "Which blocks will show the experience bar when looked at.",
|
|
||||||
"error.immersive_hud.ignoreList.unknownItem": "Unknown item %s",
|
|
||||||
"error.immersive_hud.ignoreList.illegalId": "%s is not a legal item identifier"
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
{
|
|
||||||
"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": "immersive_hud.mixins.json",
|
|
||||||
"environment": "client"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
|
|
||||||
"depends": {
|
|
||||||
"fabricloader": ">=0.12.12",
|
|
||||||
"minecraft": "1.18.x",
|
|
||||||
"java": ">=17"
|
|
||||||
},
|
|
||||||
"suggests": {
|
|
||||||
"modmenu": "*",
|
|
||||||
"cloth-config2": "*"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
"required": true,
|
|
||||||
"minVersion": "0.8",
|
|
||||||
"package": "markil3.immersive_hud.mixin",
|
|
||||||
"compatibilityLevel": "JAVA_16",
|
|
||||||
"mixins": [
|
|
||||||
],
|
|
||||||
"client": [
|
|
||||||
"ClientPlayerHook",
|
|
||||||
"HeldItemHook",
|
|
||||||
"HudHook"
|
|
||||||
],
|
|
||||||
"injectors": {
|
|
||||||
"defaultRequire": 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||