Compare commits
3 Commits
readme-pat
...
v0.1-1.16.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5b4c6c40c2 | ||
|
|
c6c2e2ba17 | ||
|
|
7b780f1964 |
5
.gitattributes
vendored
Normal file
5
.gitattributes
vendored
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
# Disable autocrlf on generated files, they always generate with LF
|
||||||
|
# Add any extra files or paths here to make git stop saying they
|
||||||
|
# are changed when only line endings change.
|
||||||
|
src/generated/**/.cache/cache text eol=lf
|
||||||
|
src/generated/**/*.json text eol=lf
|
||||||
160
build.gradle
Normal file
160
build.gradle
Normal file
@@ -0,0 +1,160 @@
|
|||||||
|
buildscript {
|
||||||
|
repositories {
|
||||||
|
maven { url = 'https://files.minecraftforge.net/maven' }
|
||||||
|
jcenter()
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
apply plugin: 'net.minecraftforge.gradle'
|
||||||
|
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
|
||||||
|
apply plugin: 'eclipse'
|
||||||
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
|
archivesBaseName = project.archives_base_name
|
||||||
|
version = project.mod_version + "-" + project.minecraft_version + "-forge"
|
||||||
|
group = project.maven_group // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||||
|
|
||||||
|
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
|
||||||
|
|
||||||
|
println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
|
||||||
|
minecraft {
|
||||||
|
// The mappings can be changed at any time, and must be in the following format.
|
||||||
|
// snapshot_YYYYMMDD Snapshot are built nightly.
|
||||||
|
// stable_# Stables are built at the discretion of the MCP team.
|
||||||
|
// Use non-default mappings at your own risk. they may not always work.
|
||||||
|
// Simply re-run your setup task after changing the mappings to update your workspace.
|
||||||
|
mappings channel: 'snapshot', version: project.mappings
|
||||||
|
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
|
||||||
|
|
||||||
|
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
|
||||||
|
|
||||||
|
// Default run configurations.
|
||||||
|
// These can be tweaked, removed, or duplicated as needed.
|
||||||
|
runs {
|
||||||
|
client {
|
||||||
|
workingDirectory project.file('run')
|
||||||
|
|
||||||
|
// Recommended logging data for a userdev environment
|
||||||
|
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
|
||||||
|
|
||||||
|
// Recommended logging level for the console
|
||||||
|
property 'forge.logging.console.level', 'debug'
|
||||||
|
|
||||||
|
mods {
|
||||||
|
examplemod {
|
||||||
|
source sourceSets.main
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
workingDirectory project.file('run')
|
||||||
|
|
||||||
|
// Recommended logging data for a userdev environment
|
||||||
|
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
|
||||||
|
|
||||||
|
// Recommended logging level for the console
|
||||||
|
property 'forge.logging.console.level', 'debug'
|
||||||
|
|
||||||
|
mods {
|
||||||
|
examplemod {
|
||||||
|
source sourceSets.main
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
data {
|
||||||
|
workingDirectory project.file('run')
|
||||||
|
|
||||||
|
// Recommended logging data for a userdev environment
|
||||||
|
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
|
||||||
|
|
||||||
|
// Recommended logging level for the console
|
||||||
|
property 'forge.logging.console.level', 'debug'
|
||||||
|
|
||||||
|
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
|
||||||
|
args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
|
||||||
|
|
||||||
|
mods {
|
||||||
|
examplemod {
|
||||||
|
source sourceSets.main
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Include resources generated by data generators.
|
||||||
|
sourceSets.main.resources { srcDir 'src/generated/resources' }
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
|
||||||
|
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
|
||||||
|
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
|
||||||
|
minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
|
||||||
|
|
||||||
|
// You may put jars on which you depend on in ./libs or you may define them like so..
|
||||||
|
// compile "some.group:artifact:version:classifier"
|
||||||
|
// compile "some.group:artifact:version"
|
||||||
|
|
||||||
|
// Real examples
|
||||||
|
// compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
|
||||||
|
// compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
|
||||||
|
|
||||||
|
// The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
|
||||||
|
// provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
|
||||||
|
|
||||||
|
// These dependencies get remapped to your current MCP mappings
|
||||||
|
// deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
|
||||||
|
|
||||||
|
// For more info...
|
||||||
|
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
||||||
|
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
task sourcesJar(type: Jar, dependsOn: classes) {
|
||||||
|
classifier = 'sources'
|
||||||
|
from sourceSets.main.allSource
|
||||||
|
}
|
||||||
|
|
||||||
|
artifacts {
|
||||||
|
archives sourcesJar
|
||||||
|
}
|
||||||
|
|
||||||
|
// Example for how to get properties into the manifest for reading by the runtime..
|
||||||
|
jar {
|
||||||
|
manifest {
|
||||||
|
attributes([
|
||||||
|
"Specification-Title": project.archivesBaseName,
|
||||||
|
"Specification-Vendor": "Markil 3",
|
||||||
|
"Specification-Version": project.version,
|
||||||
|
"Implementation-Title": project.name,
|
||||||
|
"Implementation-Version": "${version}",
|
||||||
|
"Implementation-Vendor" :"Markil 3",
|
||||||
|
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
|
||||||
|
])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Example configuration to allow publishing using the maven-publish task
|
||||||
|
// This is the preferred method to reobfuscate your jar file
|
||||||
|
jar.finalizedBy('reobfJar')
|
||||||
|
// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
|
||||||
|
//publish.dependsOn('reobfJar')
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
mavenJava(MavenPublication) {
|
||||||
|
artifact jar
|
||||||
|
}
|
||||||
|
}
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
url "file:///${project.projectDir}/mcmodsrepo"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
14
gradle.properties
Normal file
14
gradle.properties
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
|
||||||
|
# This is required to provide enough memory for the Minecraft decompilation process.
|
||||||
|
org.gradle.jvmargs=-Xmx3G
|
||||||
|
org.gradle.daemon=false
|
||||||
|
|
||||||
|
# Forge Properties
|
||||||
|
minecraft_version=1.16.4
|
||||||
|
mappings=20201028-1.16.3
|
||||||
|
forge_version=35.1.37
|
||||||
|
|
||||||
|
# Mod Properties
|
||||||
|
mod_version = 0.1
|
||||||
|
maven_group = markil3
|
||||||
|
archives_base_name = immersive_hud
|
||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
5
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
5
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
|
||||||
172
gradlew
vendored
Executable file
172
gradlew
vendored
Executable file
@@ -0,0 +1,172 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
##
|
||||||
|
## 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=""
|
||||||
|
|
||||||
|
# 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, switch paths to Windows format before running java
|
||||||
|
if $cygwin ; 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=$((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"
|
||||||
|
|
||||||
|
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||||
|
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec "$JAVACMD" "$@"
|
||||||
84
gradlew.bat
vendored
Normal file
84
gradlew.bat
vendored
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
@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 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=
|
||||||
|
|
||||||
|
@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 init
|
||||||
|
|
||||||
|
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 init
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
:init
|
||||||
|
@rem Get command-line arguments, handling Windows variants
|
||||||
|
|
||||||
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||||
|
|
||||||
|
:win9xME_args
|
||||||
|
@rem Slurp the command line arguments.
|
||||||
|
set CMD_LINE_ARGS=
|
||||||
|
set _SKIP=2
|
||||||
|
|
||||||
|
:win9xME_args_slurp
|
||||||
|
if "x%~1" == "x" goto execute
|
||||||
|
|
||||||
|
set CMD_LINE_ARGS=%*
|
||||||
|
|
||||||
|
: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 %CMD_LINE_ARGS%
|
||||||
|
|
||||||
|
: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
|
||||||
775
src/main/java/markil3/immersive_hud/EventBus.java
Normal file
775
src/main/java/markil3/immersive_hud/EventBus.java
Normal file
@@ -0,0 +1,775 @@
|
|||||||
|
/**
|
||||||
|
* 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 com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.Entity;
|
||||||
|
import net.minecraft.entity.LivingEntity;
|
||||||
|
import net.minecraft.item.BowItem;
|
||||||
|
import net.minecraft.item.CrossbowItem;
|
||||||
|
import net.minecraft.item.EggItem;
|
||||||
|
import net.minecraft.item.EnderPearlItem;
|
||||||
|
import net.minecraft.item.FilledMapItem;
|
||||||
|
import net.minecraft.item.FishingRodItem;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.item.ShieldItem;
|
||||||
|
import net.minecraft.item.ShootableItem;
|
||||||
|
import net.minecraft.item.SnowballItem;
|
||||||
|
import net.minecraft.item.ThrowablePotionItem;
|
||||||
|
import net.minecraft.item.TridentItem;
|
||||||
|
import net.minecraft.potion.Effects;
|
||||||
|
import net.minecraft.util.Hand;
|
||||||
|
import net.minecraft.util.math.RayTraceResult;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
||||||
|
import net.minecraftforge.client.event.RenderHandEvent;
|
||||||
|
import net.minecraftforge.event.entity.EntityMountEvent;
|
||||||
|
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||||
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
import net.minecraftforge.fml.DistExecutor;
|
||||||
|
import net.minecraftforge.fml.common.Mod;
|
||||||
|
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Contains the logic for changing the HUD.
|
||||||
|
*
|
||||||
|
* @author Markil 3
|
||||||
|
* @version 0.1-1.16.4-forge
|
||||||
|
*/
|
||||||
|
@Mod.EventBusSubscriber(Dist.CLIENT)
|
||||||
|
public class EventBus
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Class logger
|
||||||
|
*/
|
||||||
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The number of ticks that the hand will be onscreen. Every tick is 1/20th
|
||||||
|
* of a second.
|
||||||
|
*/
|
||||||
|
static final int HAND_TIME = 10 * 20;
|
||||||
|
/**
|
||||||
|
* The number of ticks most elements will be onscreen. Every tick is 1/20th
|
||||||
|
* of a second.
|
||||||
|
*/
|
||||||
|
static final int VISUAL_TIME = 6 * 20;
|
||||||
|
/**
|
||||||
|
* The number of ticks that the health and hunger bars will be onscreen.
|
||||||
|
* Every tick is 1/20th of a second.
|
||||||
|
*/
|
||||||
|
static final int HEALTH_TIME = (int) ((float) VISUAL_TIME * 2.5);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many more ticks the hand will be onscreen. Every tick is 1/20th of a
|
||||||
|
* second.
|
||||||
|
*/
|
||||||
|
private static int mainHandTime, offHandTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many more ticks the crosshair will be onscreen. Every tick is 1/20th
|
||||||
|
* of a second.
|
||||||
|
*/
|
||||||
|
private static int crosshairTime;
|
||||||
|
/**
|
||||||
|
* If true, then the hand (and crosshairs) will be locked onto the screen
|
||||||
|
* without disappearing until this flag is updated.
|
||||||
|
*/
|
||||||
|
private static boolean mainHandLock, offHandLock;
|
||||||
|
/**
|
||||||
|
* A bitmask that will lock the corresponding hand without necessarily
|
||||||
|
* showing the crosshairs. The first bit will be the main hand, and the
|
||||||
|
* second will be the offhand.
|
||||||
|
*/
|
||||||
|
private static int mapLock;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many more ticks the hotbar will be onscreen. Every tick is 1/20th of
|
||||||
|
* a second.
|
||||||
|
*/
|
||||||
|
private static int hotbarTime;
|
||||||
|
/**
|
||||||
|
* The last hotbar slot that was selected. This is used to check for a
|
||||||
|
* change in the hotbar slot.
|
||||||
|
*/
|
||||||
|
private static int selectedHotbarSlot = -1;
|
||||||
|
/**
|
||||||
|
* The last item that was in this hand. This is used to check for a change
|
||||||
|
* in what was equipped.
|
||||||
|
*/
|
||||||
|
private static Item mainHandItem = null, offHandItem = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many more ticks the health bar will be onscreen. Every tick is 1/20th
|
||||||
|
* of a second.
|
||||||
|
*/
|
||||||
|
private static int healthTime;
|
||||||
|
/**
|
||||||
|
* Records what the health was previously. Used to check for a change in the
|
||||||
|
* health.
|
||||||
|
* <p>
|
||||||
|
* Note that the display of the armor is linked to this.
|
||||||
|
*/
|
||||||
|
private static float health = -1;
|
||||||
|
/**
|
||||||
|
* Records what the maximum health was previously. Used to check for a
|
||||||
|
* change in the health.
|
||||||
|
*/
|
||||||
|
private static float maxHealth = -1;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many more ticks the hunger bar will be onscreen. Every tick is 1/20th
|
||||||
|
* of a second.
|
||||||
|
*/
|
||||||
|
private static int hungerTime;
|
||||||
|
/**
|
||||||
|
* Records what the hunger level was previously. Used to check for a change
|
||||||
|
* in hunger.
|
||||||
|
*/
|
||||||
|
private static int hunger = -1;
|
||||||
|
/**
|
||||||
|
* Records whether or not there was food poisoning. Used to check for a
|
||||||
|
* change in hunger.
|
||||||
|
*/
|
||||||
|
private static boolean isFoodPoisoned = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many more ticks the mount's health bar will be onscreen. Every tick
|
||||||
|
* is 1/20th of a second.
|
||||||
|
*/
|
||||||
|
private static int mountTime;
|
||||||
|
/**
|
||||||
|
* Records what the health of the mount was previously. Used to check for a
|
||||||
|
* change in the health.
|
||||||
|
*/
|
||||||
|
private static float mountHealth = -1;
|
||||||
|
/**
|
||||||
|
* Records what the maximum health of the mount was previously. Used to
|
||||||
|
* check for a change in the health.
|
||||||
|
*/
|
||||||
|
private static float mountMaxHealth = -1;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many more ticks the mount's jump bar will be onscreen. Every tick is
|
||||||
|
* 1/20th of a second.
|
||||||
|
*/
|
||||||
|
private static int jumpTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How many more ticks the experience bar will be onscreen. Every tick is
|
||||||
|
* 1/20th of a second.
|
||||||
|
*/
|
||||||
|
private static int experienceTime;
|
||||||
|
/**
|
||||||
|
* Records what the experience was previously. Used to check for a change in
|
||||||
|
* the health.
|
||||||
|
*/
|
||||||
|
private static float experienceProgress = -1;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run whenever the player clicks a mouse button. This brings the hands into
|
||||||
|
* view, and briefly brings the health and hunger into view if the held item
|
||||||
|
* is food.
|
||||||
|
*
|
||||||
|
* @param event - event data
|
||||||
|
*/
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onClick(final PlayerInteractEvent event)
|
||||||
|
{
|
||||||
|
DistExecutor.safeRunWhenOn(Dist.CLIENT,
|
||||||
|
(DistExecutor.SafeSupplier<DistExecutor.SafeRunnable>) () -> new DistExecutor.SafeRunnable()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
Item item =
|
||||||
|
Optional.ofNullable(event.getItemStack())
|
||||||
|
.map(ItemStack::getItem)
|
||||||
|
.orElse(null);
|
||||||
|
crosshairTime = VISUAL_TIME;
|
||||||
|
if (event.getHand() == Hand.MAIN_HAND)
|
||||||
|
{
|
||||||
|
mainHandTime = HAND_TIME;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
offHandTime = HAND_TIME;
|
||||||
|
}
|
||||||
|
if (item != null)
|
||||||
|
{
|
||||||
|
if (item.isFood())
|
||||||
|
{
|
||||||
|
healthTime = HEALTH_TIME;
|
||||||
|
hungerTime = HEALTH_TIME;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run whenever the player mounts something. This brings the mount's health
|
||||||
|
* bar into view.
|
||||||
|
* <p>
|
||||||
|
* While this event is called on both client and server, only on the client
|
||||||
|
* will anything happen.
|
||||||
|
*
|
||||||
|
* @param event - event data
|
||||||
|
*/
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onMount(final EntityMountEvent event)
|
||||||
|
{
|
||||||
|
DistExecutor.safeRunWhenOn(Dist.CLIENT,
|
||||||
|
(DistExecutor.SafeSupplier<DistExecutor.SafeRunnable>) () -> new DistExecutor.SafeRunnable()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void run()
|
||||||
|
{
|
||||||
|
mountTime = VISUAL_TIME;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run whenever a hand is rendered in 1st person. This brings the player
|
||||||
|
* hands into and out of view as needed.
|
||||||
|
*
|
||||||
|
* @param event - event data
|
||||||
|
*/
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onRenderHand(final RenderHandEvent event)
|
||||||
|
{
|
||||||
|
final int HAND_UP_TIME = 20;
|
||||||
|
switch (event.getHand())
|
||||||
|
{
|
||||||
|
case OFF_HAND:
|
||||||
|
if (mainHandTime > 0 && mainHandTime < HAND_UP_TIME)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Undo the transformation of the previous hand
|
||||||
|
*/
|
||||||
|
event.getMatrixStack()
|
||||||
|
.translate(0,
|
||||||
|
1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME,
|
||||||
|
0);
|
||||||
|
}
|
||||||
|
if (offHandTime == 0)
|
||||||
|
{
|
||||||
|
event.setCanceled(true);
|
||||||
|
}
|
||||||
|
else if (!offHandLock && (mapLock & 0b01) == 0)
|
||||||
|
{
|
||||||
|
offHandTime--;
|
||||||
|
if (offHandTime < HAND_UP_TIME)
|
||||||
|
{
|
||||||
|
event.getMatrixStack()
|
||||||
|
.translate(0,
|
||||||
|
-1.0F * (HAND_UP_TIME - offHandTime) / HAND_UP_TIME,
|
||||||
|
0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case MAIN_HAND:
|
||||||
|
if (mainHandTime == 0)
|
||||||
|
{
|
||||||
|
event.setCanceled(true);
|
||||||
|
}
|
||||||
|
else if (!mainHandLock && (mapLock & 0b10) == 0)
|
||||||
|
{
|
||||||
|
mainHandTime--;
|
||||||
|
if (mainHandTime < HAND_UP_TIME)
|
||||||
|
{
|
||||||
|
event.getMatrixStack()
|
||||||
|
.translate(0,
|
||||||
|
-1.0F * (HAND_UP_TIME - mainHandTime) / HAND_UP_TIME,
|
||||||
|
0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called whenever we are drawing a part of the GUI. This is where most of
|
||||||
|
* the change checks are made and adjustments or overrides are done.
|
||||||
|
*
|
||||||
|
* @param event - event data
|
||||||
|
*/
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onGUIDraw(final RenderGameOverlayEvent event)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* When the health percentage falls to this level or below, the
|
||||||
|
* health bar won't disappear, allowing the player to be constantly
|
||||||
|
* reminded of their low health.
|
||||||
|
*/
|
||||||
|
final float CONST_BOUNDARY = 0.5F;
|
||||||
|
/*
|
||||||
|
* When hunger falls to this level or below, the hunger bar won't
|
||||||
|
* disappear, allowing the player to be constantly reminded of their
|
||||||
|
* low hunger.
|
||||||
|
*/
|
||||||
|
final int HUNGER_BOUNDARY = 15;
|
||||||
|
|
||||||
|
Minecraft mc = Minecraft.getInstance();
|
||||||
|
boolean changed = false;
|
||||||
|
int hotbarSlot;
|
||||||
|
Item item, handItem = null;
|
||||||
|
switch (event.getType())
|
||||||
|
{
|
||||||
|
case CROSSHAIRS:
|
||||||
|
if (event instanceof RenderGameOverlayEvent.Pre)
|
||||||
|
{
|
||||||
|
if (mc.objectMouseOver != null && mc.objectMouseOver.getType() != RayTraceResult.Type.MISS)
|
||||||
|
{
|
||||||
|
if (mc.objectMouseOver.getType() == RayTraceResult.Type.ENTITY)
|
||||||
|
{
|
||||||
|
if (mc.objectMouseOver.hitInfo == null || mc.objectMouseOver.hitInfo != mc.player
|
||||||
|
.getRidingEntity())
|
||||||
|
{
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (changed || mainHandLock || offHandLock || crosshairTime > 0)
|
||||||
|
{
|
||||||
|
RenderSystem.color4f(1.0F,
|
||||||
|
1.0F,
|
||||||
|
1.0F,
|
||||||
|
RenderUtils.getAlpha(crosshairTime > 0 ?
|
||||||
|
crosshairTime :
|
||||||
|
VISUAL_TIME));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
event.setCanceled(true);
|
||||||
|
}
|
||||||
|
if (crosshairTime > 0)
|
||||||
|
{
|
||||||
|
crosshairTime--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (event instanceof RenderGameOverlayEvent.Post)
|
||||||
|
{
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case HOTBAR:
|
||||||
|
if (event instanceof RenderGameOverlayEvent.Pre)
|
||||||
|
{
|
||||||
|
mainHandLock = offHandLock = false;
|
||||||
|
mapLock = 0;
|
||||||
|
event.setCanceled(true);
|
||||||
|
for (int i = 0, l = Hand.values().length; i < l; i++)
|
||||||
|
{
|
||||||
|
item =
|
||||||
|
Optional.ofNullable(mc.player.getHeldItem(Hand.values()[i]))
|
||||||
|
.map(ItemStack::getItem)
|
||||||
|
.orElse(null);
|
||||||
|
if (item != null)
|
||||||
|
{
|
||||||
|
if (item instanceof ShootableItem)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Enables the crosshairs and lock the hand
|
||||||
|
* whenever the bow is drawn.
|
||||||
|
*/
|
||||||
|
if (item instanceof BowItem)
|
||||||
|
{
|
||||||
|
if (mc.player.isHandActive() && mc.player.getActiveHand()
|
||||||
|
.ordinal() == i)
|
||||||
|
{
|
||||||
|
switch (i)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
mainHandLock = true;
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
offHandLock = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* Enables the crosshairs and lock the hand
|
||||||
|
* whenever a loaded crossbow is equipped.
|
||||||
|
*/
|
||||||
|
else if (item instanceof CrossbowItem)
|
||||||
|
{
|
||||||
|
if (CrossbowItem.isCharged(mc.player.getHeldItem(
|
||||||
|
Hand.values()[i])))
|
||||||
|
{
|
||||||
|
switch (i)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
mainHandLock = true;
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
offHandLock = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* We don't know how modded items behave
|
||||||
|
* exactly, so we keep it safe and enable the
|
||||||
|
* crosshairs at all times for any shootable
|
||||||
|
* items.
|
||||||
|
*/
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (i)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
mainHandLock = true;
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
offHandLock = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Items that have the crosshairs enabled for as long
|
||||||
|
* as the item is actively being used.
|
||||||
|
*/
|
||||||
|
else if (item instanceof TridentItem || item instanceof ShieldItem)
|
||||||
|
{
|
||||||
|
if (mc.player.isHandActive() && mc.player.getActiveHand()
|
||||||
|
.ordinal() == i)
|
||||||
|
{
|
||||||
|
switch (i)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
mainHandLock = true;
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
offHandLock = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Items that have the crosshairs enabled for as long
|
||||||
|
* as the item is being held at all.
|
||||||
|
*/
|
||||||
|
else if (item instanceof ThrowablePotionItem || item instanceof SnowballItem || item instanceof EggItem || item instanceof EnderPearlItem || item instanceof FishingRodItem)
|
||||||
|
{
|
||||||
|
switch (i)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
mainHandLock = true;
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
offHandLock = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Maps get special treatment. The hand is locked,
|
||||||
|
* but the crosshairs are not enabled.
|
||||||
|
*/
|
||||||
|
else if (item instanceof FilledMapItem)
|
||||||
|
{
|
||||||
|
mapLock = mapLock | (2 - i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Checks for a change in the item
|
||||||
|
*/
|
||||||
|
if (i == 0)
|
||||||
|
{
|
||||||
|
handItem = mainHandItem;
|
||||||
|
}
|
||||||
|
else if (i == 1)
|
||||||
|
{
|
||||||
|
handItem = offHandItem;
|
||||||
|
}
|
||||||
|
if (item != handItem)
|
||||||
|
{
|
||||||
|
changed = true;
|
||||||
|
/*
|
||||||
|
* Briefly shows the health and hunger bar whenever
|
||||||
|
* food is switched to.
|
||||||
|
*/
|
||||||
|
if (item.isFood())
|
||||||
|
{
|
||||||
|
healthTime = HEALTH_TIME;
|
||||||
|
hungerTime = HEALTH_TIME;
|
||||||
|
}
|
||||||
|
if (i == 0)
|
||||||
|
{
|
||||||
|
mainHandItem = item;
|
||||||
|
mainHandTime = HAND_TIME;
|
||||||
|
}
|
||||||
|
else if (i == 1)
|
||||||
|
{
|
||||||
|
offHandItem = item;
|
||||||
|
offHandTime = HAND_TIME;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Checks for a change in what slot is used.
|
||||||
|
*/
|
||||||
|
hotbarSlot = mc.player.inventory.currentItem;
|
||||||
|
if (selectedHotbarSlot != hotbarSlot)
|
||||||
|
{
|
||||||
|
selectedHotbarSlot = hotbarSlot;
|
||||||
|
mainHandTime = HAND_TIME;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (changed)
|
||||||
|
{
|
||||||
|
hotbarTime = VISUAL_TIME;
|
||||||
|
}
|
||||||
|
else if (hotbarTime > 0)
|
||||||
|
{
|
||||||
|
hotbarTime--;
|
||||||
|
}
|
||||||
|
RenderUtils.renderHotbar(mc, mc.ingameGUI,
|
||||||
|
event.getMatrixStack(),
|
||||||
|
event.getPartialTicks(), hotbarTime);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case HEALTH:
|
||||||
|
if (event instanceof RenderGameOverlayEvent.Pre)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Skip healthy bars that haven't updated in awhile.
|
||||||
|
*/
|
||||||
|
if (healthTime == 0 && health / maxHealth > CONST_BOUNDARY)
|
||||||
|
{
|
||||||
|
event.setCanceled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks for a change in current or max health.
|
||||||
|
*/
|
||||||
|
if (health != mc.player.getHealth())
|
||||||
|
{
|
||||||
|
health = mc.player.getHealth();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (maxHealth != mc.player.getMaxHealth())
|
||||||
|
{
|
||||||
|
maxHealth = mc.player.getMaxHealth();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (changed)
|
||||||
|
{
|
||||||
|
healthTime = HEALTH_TIME;
|
||||||
|
}
|
||||||
|
else if (healthTime > 0)
|
||||||
|
{
|
||||||
|
healthTime--;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* Only makes a change if the player is healthy. Otherwise,
|
||||||
|
* the bar is shown.
|
||||||
|
*/
|
||||||
|
if (health / maxHealth > CONST_BOUNDARY)
|
||||||
|
{
|
||||||
|
RenderSystem.color4f(1.0F,
|
||||||
|
1.0F,
|
||||||
|
1.0F,
|
||||||
|
RenderUtils.getAlpha(healthTime));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* Reset the transparency.
|
||||||
|
*/
|
||||||
|
else if (event instanceof RenderGameOverlayEvent.Post)
|
||||||
|
{
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case FOOD:
|
||||||
|
if (event instanceof RenderGameOverlayEvent.Pre)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Skip satisfied bars that haven't updated in awhile.
|
||||||
|
*/
|
||||||
|
if (hungerTime == 0 && hunger > HUNGER_BOUNDARY)
|
||||||
|
{
|
||||||
|
event.setCanceled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hunger != mc.player.getFoodStats().getFoodLevel())
|
||||||
|
{
|
||||||
|
hunger = mc.player.getFoodStats().getFoodLevel();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (isFoodPoisoned != mc.player.isPotionActive(Effects.HUNGER))
|
||||||
|
{
|
||||||
|
isFoodPoisoned =
|
||||||
|
mc.player.isPotionActive(Effects.HUNGER);
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (hunger <= HUNGER_BOUNDARY)
|
||||||
|
{
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (changed)
|
||||||
|
{
|
||||||
|
hungerTime = HEALTH_TIME;
|
||||||
|
RenderSystem.color4f(1.0F,
|
||||||
|
1.0F,
|
||||||
|
1.0F,
|
||||||
|
RenderUtils.getAlpha(hungerTime));
|
||||||
|
}
|
||||||
|
else if (hungerTime > 0)
|
||||||
|
{
|
||||||
|
hungerTime--;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* Only makes a change if the player is satisfied. Otherwise,
|
||||||
|
* the bar is shown.
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* Reset the transparency.
|
||||||
|
*/
|
||||||
|
else if (event instanceof RenderGameOverlayEvent.Post)
|
||||||
|
{
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ARMOR:
|
||||||
|
if (event instanceof RenderGameOverlayEvent.Pre)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Renders armor along with health.
|
||||||
|
*/
|
||||||
|
if (healthTime > 0)
|
||||||
|
{
|
||||||
|
RenderSystem.color4f(1.0F,
|
||||||
|
1.0F,
|
||||||
|
1.0F,
|
||||||
|
RenderUtils.getAlpha(healthTime));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
event.setCanceled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* Reset the transparency.
|
||||||
|
*/
|
||||||
|
else if (event instanceof RenderGameOverlayEvent.Post)
|
||||||
|
{
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case HEALTHMOUNT:
|
||||||
|
if (event instanceof RenderGameOverlayEvent.Pre)
|
||||||
|
{
|
||||||
|
Entity tmp = mc.player.getRidingEntity();
|
||||||
|
if (tmp == null)
|
||||||
|
{
|
||||||
|
mountHealth = -1;
|
||||||
|
mountMaxHealth = -1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LivingEntity mount = (LivingEntity) tmp;
|
||||||
|
if (mountHealth != mount.getHealth())
|
||||||
|
{
|
||||||
|
mountHealth = mount.getHealth();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (mountMaxHealth != mount.getMaxHealth())
|
||||||
|
{
|
||||||
|
mountMaxHealth = mount.getMaxHealth();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (changed)
|
||||||
|
{
|
||||||
|
mountTime = VISUAL_TIME;
|
||||||
|
}
|
||||||
|
else if (mountTime > 0)
|
||||||
|
{
|
||||||
|
mountTime--;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* Renders it along with health.
|
||||||
|
*/
|
||||||
|
RenderSystem.color4f(1.0F,
|
||||||
|
1.0F,
|
||||||
|
1.0F,
|
||||||
|
RenderUtils.getAlpha(mountTime));
|
||||||
|
}
|
||||||
|
else if (event instanceof RenderGameOverlayEvent.Post)
|
||||||
|
{
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case JUMPBAR:
|
||||||
|
if (event instanceof RenderGameOverlayEvent.Pre)
|
||||||
|
{
|
||||||
|
event.setCanceled(true);
|
||||||
|
if (mc.player.getHorseJumpPower() > 0)
|
||||||
|
{
|
||||||
|
jumpTime = VISUAL_TIME;
|
||||||
|
}
|
||||||
|
else if (jumpTime > 0)
|
||||||
|
{
|
||||||
|
jumpTime--;
|
||||||
|
}
|
||||||
|
RenderUtils.renderHorseJumpBar(mc, mc.ingameGUI,
|
||||||
|
event.getMatrixStack(), jumpTime);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case EXPERIENCE:
|
||||||
|
if (event instanceof RenderGameOverlayEvent.Pre)
|
||||||
|
{
|
||||||
|
event.setCanceled(true);
|
||||||
|
if (experienceProgress != mc.player.experience)
|
||||||
|
{
|
||||||
|
experienceProgress = mc.player.experience;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if (changed)
|
||||||
|
{
|
||||||
|
experienceTime = VISUAL_TIME;
|
||||||
|
}
|
||||||
|
else if (experienceTime > 0)
|
||||||
|
{
|
||||||
|
experienceTime--;
|
||||||
|
}
|
||||||
|
RenderUtils.renderExperience(mc, mc.ingameGUI,
|
||||||
|
event.getMatrixStack(), experienceTime);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
52
src/main/java/markil3/immersive_hud/Main.java
Normal file
52
src/main/java/markil3/immersive_hud/Main.java
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
/**
|
||||||
|
* 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.minecraftforge.fml.ExtensionPoint;
|
||||||
|
import net.minecraftforge.fml.ModLoadingContext;
|
||||||
|
import net.minecraftforge.fml.common.Mod;
|
||||||
|
import net.minecraftforge.fml.network.FMLNetworkConstants;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.tuple.Pair;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The main entry point for the Immersive HUD mod.
|
||||||
|
*
|
||||||
|
* @author Markil 3
|
||||||
|
* @version 0.1-1.16.4-forge
|
||||||
|
*/
|
||||||
|
@Mod("immersive_hud")
|
||||||
|
public class Main
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Class logger.
|
||||||
|
*/
|
||||||
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
|
||||||
|
public Main()
|
||||||
|
{
|
||||||
|
//Make sure the mod being absent on the other network side does not
|
||||||
|
// cause the client to display the server as incompatible
|
||||||
|
ModLoadingContext.get()
|
||||||
|
.registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair
|
||||||
|
.of(() -> FMLNetworkConstants.IGNORESERVERONLY,
|
||||||
|
(a, b) -> true));
|
||||||
|
}
|
||||||
|
}
|
||||||
499
src/main/java/markil3/immersive_hud/RenderUtils.java
Normal file
499
src/main/java/markil3/immersive_hud/RenderUtils.java
Normal file
@@ -0,0 +1,499 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2009-2021 Mojang Studios
|
||||||
|
*
|
||||||
|
* Players are free to create, build, and mod within Minecraft if the
|
||||||
|
* branding usage guidelines are followed. Fan art, logos, videos, and screen
|
||||||
|
* shots are acceptable as long as they are not used to falsely represent
|
||||||
|
* Mojang Minecraft assets. If you intend to use any portion of the name in
|
||||||
|
* relation to services, products, or distribution, you must adhere to the
|
||||||
|
* following requirements.
|
||||||
|
*
|
||||||
|
* Mojang's terms of service and brand guidelines are designed to let you
|
||||||
|
* know in plain terms what you can and cannot do with your game, the Mojang
|
||||||
|
* brand or Mojang assets.
|
||||||
|
* https://account.mojang.com/documents/minecraft_eula
|
||||||
|
*/
|
||||||
|
package markil3.immersive_hud;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.AbstractGui;
|
||||||
|
import net.minecraft.client.gui.IngameGui;
|
||||||
|
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||||
|
import net.minecraft.client.renderer.RenderHelper;
|
||||||
|
import net.minecraft.client.renderer.model.IBakedModel;
|
||||||
|
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||||
|
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||||
|
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||||
|
import net.minecraft.client.renderer.texture.TextureManager;
|
||||||
|
import net.minecraft.client.settings.AttackIndicatorStatus;
|
||||||
|
import net.minecraft.crash.CrashReport;
|
||||||
|
import net.minecraft.crash.CrashReportCategory;
|
||||||
|
import net.minecraft.crash.ReportedException;
|
||||||
|
import net.minecraft.entity.LivingEntity;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.HandSide;
|
||||||
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Contains methods for rendering various HUD elements. Most of these methods
|
||||||
|
* come from {@link IngameGui} and
|
||||||
|
* {@link net.minecraft.client.renderer.ItemRenderer},
|
||||||
|
* with some tweaks to make the mod work.
|
||||||
|
*
|
||||||
|
* @author Mojang Studios
|
||||||
|
* @author Markil 3
|
||||||
|
* @version 0.1-1.16.4-forge
|
||||||
|
*/
|
||||||
|
public class RenderUtils
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* @author Markil 3
|
||||||
|
*/
|
||||||
|
static float getAlpha(int renderTime)
|
||||||
|
{
|
||||||
|
return Math.min(renderTime / 20.0F,
|
||||||
|
1.0F);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders the horse jump bar.
|
||||||
|
*
|
||||||
|
* @param mc - A Minecraft instance.
|
||||||
|
* @param gui - The GUI.
|
||||||
|
* @param matrixStack - The rendering transformation matrix stack.
|
||||||
|
* @param renderTime - How much time before this element becomes fully
|
||||||
|
* transparent.
|
||||||
|
*
|
||||||
|
* @see IngameGui#renderHorseJumpBar(MatrixStack, int)
|
||||||
|
*/
|
||||||
|
public static void renderHorseJumpBar(Minecraft mc,
|
||||||
|
IngameGui gui,
|
||||||
|
MatrixStack matrixStack,
|
||||||
|
int renderTime)
|
||||||
|
{
|
||||||
|
if (renderTime == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
float alpha = getAlpha(renderTime);
|
||||||
|
int scaledWidth = mc.getMainWindow().getScaledWidth();
|
||||||
|
int scaledHeight = mc.getMainWindow().getScaledHeight();
|
||||||
|
int xPosition = scaledWidth / 2 - 91;
|
||||||
|
|
||||||
|
mc.getProfiler().startSection("jumpBar");
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
|
||||||
|
mc.getTextureManager().bindTexture(AbstractGui.GUI_ICONS_LOCATION);
|
||||||
|
float f = mc.player.getHorseJumpPower();
|
||||||
|
int i = 182;
|
||||||
|
int j = (int) (f * 183.0F);
|
||||||
|
int k = scaledHeight - 32 + 3;
|
||||||
|
gui.blit(matrixStack, xPosition, k, 0, 84, 182, 5);
|
||||||
|
if (j > 0)
|
||||||
|
{
|
||||||
|
gui.blit(matrixStack, xPosition, k, 0, 89, j, 5);
|
||||||
|
}
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
|
||||||
|
RenderSystem.disableBlend();
|
||||||
|
mc.getProfiler().endSection();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders the experience bar.
|
||||||
|
*
|
||||||
|
* @param mc - A Minecraft instance.
|
||||||
|
* @param gui - The GUI.
|
||||||
|
* @param matrixStack - The rendering transformation matrix stack.
|
||||||
|
* @param renderTime - How much time before this element becomes fully
|
||||||
|
* transparent.
|
||||||
|
*
|
||||||
|
* @see IngameGui#func_238454_b_(MatrixStack, int)
|
||||||
|
*/
|
||||||
|
public static void renderExperience(Minecraft mc,
|
||||||
|
IngameGui gui,
|
||||||
|
MatrixStack matrixStack,
|
||||||
|
int renderTime)
|
||||||
|
{
|
||||||
|
if (renderTime == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
float alpha = getAlpha(renderTime);
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
|
||||||
|
|
||||||
|
if (mc.playerController.gameIsSurvivalOrAdventure())
|
||||||
|
{
|
||||||
|
int scaledWidth = mc.getMainWindow().getScaledWidth();
|
||||||
|
int scaledHeight = mc.getMainWindow().getScaledHeight();
|
||||||
|
int x = scaledWidth / 2 - 91;
|
||||||
|
|
||||||
|
mc.getProfiler().startSection("expBar");
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
mc.getTextureManager().bindTexture(AbstractGui.GUI_ICONS_LOCATION);
|
||||||
|
int i = mc.player.xpBarCap();
|
||||||
|
if (i > 0)
|
||||||
|
{
|
||||||
|
int j = 182;
|
||||||
|
int k = (int) (mc.player.experience * 183.0F);
|
||||||
|
int l = scaledHeight - 32 + 3;
|
||||||
|
gui.blit(matrixStack, x, l, 0, 64, 182, 5);
|
||||||
|
if (k > 0)
|
||||||
|
{
|
||||||
|
gui.blit(matrixStack, x, l, 0, 69, k, 5);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RenderSystem.disableBlend();
|
||||||
|
mc.getProfiler().endSection();
|
||||||
|
if (mc.player.experienceLevel > 0)
|
||||||
|
{
|
||||||
|
mc.getProfiler().startSection("expLevel");
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
String s = "" + mc.player.experienceLevel;
|
||||||
|
int i1 = (scaledWidth - gui.getFontRenderer()
|
||||||
|
.getStringWidth(s)) / 2;
|
||||||
|
int j1 = scaledHeight - 31 - 4;
|
||||||
|
gui.getFontRenderer()
|
||||||
|
.drawString(matrixStack,
|
||||||
|
s,
|
||||||
|
(float) (i1 + 1),
|
||||||
|
(float) j1,
|
||||||
|
0);
|
||||||
|
gui.getFontRenderer()
|
||||||
|
.drawString(matrixStack,
|
||||||
|
s,
|
||||||
|
(float) (i1 - 1),
|
||||||
|
(float) j1,
|
||||||
|
0);
|
||||||
|
gui.getFontRenderer()
|
||||||
|
.drawString(matrixStack,
|
||||||
|
s,
|
||||||
|
(float) i1,
|
||||||
|
(float) (j1 + 1),
|
||||||
|
0);
|
||||||
|
gui.getFontRenderer()
|
||||||
|
.drawString(matrixStack,
|
||||||
|
s,
|
||||||
|
(float) i1,
|
||||||
|
(float) (j1 - 1),
|
||||||
|
0);
|
||||||
|
gui.getFontRenderer()
|
||||||
|
.drawString(matrixStack,
|
||||||
|
s,
|
||||||
|
(float) i1,
|
||||||
|
(float) j1,
|
||||||
|
8453920);
|
||||||
|
RenderSystem.disableBlend();
|
||||||
|
mc.getProfiler().endSection();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders the hotbar and all the items in it.
|
||||||
|
*
|
||||||
|
* @param mc - A Minecraft instance.
|
||||||
|
* @param gui - The GUI.
|
||||||
|
* @param matrixStack - The rendering transformation matrix stack.
|
||||||
|
* @param partialTicks
|
||||||
|
* @param renderTime - How much time before this element becomes fully
|
||||||
|
* transparent.
|
||||||
|
*
|
||||||
|
* @see IngameGui#renderHotbar(float, MatrixStack)
|
||||||
|
*/
|
||||||
|
public static void renderHotbar(Minecraft mc, IngameGui gui,
|
||||||
|
MatrixStack matrixStack,
|
||||||
|
float partialTicks, int renderTime)
|
||||||
|
{
|
||||||
|
final ResourceLocation WIDGETS_TEX_PATH =
|
||||||
|
new ResourceLocation("textures/gui/widgets.png");
|
||||||
|
PlayerEntity playerentity = mc.player;
|
||||||
|
|
||||||
|
if (renderTime == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
float alpha = getAlpha(renderTime);
|
||||||
|
|
||||||
|
int scaledWidth = mc.getMainWindow().getScaledWidth();
|
||||||
|
int scaledHeight = mc.getMainWindow().getScaledHeight();
|
||||||
|
if (playerentity != null)
|
||||||
|
{
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
|
||||||
|
mc.getTextureManager().bindTexture(WIDGETS_TEX_PATH);
|
||||||
|
ItemStack itemstack = playerentity.getHeldItemOffhand();
|
||||||
|
HandSide handside = playerentity.getPrimaryHand().opposite();
|
||||||
|
int i = scaledWidth / 2;
|
||||||
|
int j = gui.getBlitOffset();
|
||||||
|
int k = 182;
|
||||||
|
int l = 91;
|
||||||
|
gui.setBlitOffset(-90);
|
||||||
|
gui.blit(matrixStack, i - 91, scaledHeight - 22, 0, 0, 182, 22);
|
||||||
|
gui.blit(matrixStack,
|
||||||
|
i - 91 - 1 + playerentity.inventory.currentItem * 20,
|
||||||
|
scaledHeight - 22 - 1,
|
||||||
|
0,
|
||||||
|
22,
|
||||||
|
24,
|
||||||
|
22);
|
||||||
|
if (!itemstack.isEmpty())
|
||||||
|
{
|
||||||
|
if (handside == HandSide.LEFT)
|
||||||
|
{
|
||||||
|
gui.blit(matrixStack,
|
||||||
|
i - 91 - 29,
|
||||||
|
scaledHeight - 23,
|
||||||
|
24,
|
||||||
|
22,
|
||||||
|
29,
|
||||||
|
24);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
gui.blit(matrixStack,
|
||||||
|
i + 91,
|
||||||
|
scaledHeight - 23,
|
||||||
|
53,
|
||||||
|
22,
|
||||||
|
29,
|
||||||
|
24);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
gui.setBlitOffset(j);
|
||||||
|
RenderSystem.enableRescaleNormal();
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
RenderSystem.defaultBlendFunc();
|
||||||
|
|
||||||
|
for (int i1 = 0; i1 < 9; ++i1)
|
||||||
|
{
|
||||||
|
int j1 = i - 90 + i1 * 20 + 2;
|
||||||
|
int k1 = scaledHeight - 16 - 3;
|
||||||
|
renderHotbarItem(mc, alpha, j1,
|
||||||
|
k1,
|
||||||
|
partialTicks,
|
||||||
|
playerentity,
|
||||||
|
playerentity.inventory.mainInventory.get(i1));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!itemstack.isEmpty())
|
||||||
|
{
|
||||||
|
int i2 = scaledHeight - 16 - 3;
|
||||||
|
if (handside == HandSide.LEFT)
|
||||||
|
{
|
||||||
|
renderHotbarItem(mc, alpha, i - 91 - 26,
|
||||||
|
i2,
|
||||||
|
partialTicks,
|
||||||
|
playerentity,
|
||||||
|
itemstack);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
renderHotbarItem(mc, alpha, i + 91 + 10,
|
||||||
|
i2,
|
||||||
|
partialTicks,
|
||||||
|
playerentity,
|
||||||
|
itemstack);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mc.gameSettings.attackIndicator == AttackIndicatorStatus.HOTBAR)
|
||||||
|
{
|
||||||
|
float f = mc.player.getCooledAttackStrength(0.0F);
|
||||||
|
if (f < 1.0F)
|
||||||
|
{
|
||||||
|
int j2 = scaledHeight - 20;
|
||||||
|
int k2 = i + 91 + 6;
|
||||||
|
if (handside == HandSide.RIGHT)
|
||||||
|
{
|
||||||
|
k2 = i - 91 - 22;
|
||||||
|
}
|
||||||
|
|
||||||
|
mc.getTextureManager()
|
||||||
|
.bindTexture(AbstractGui.GUI_ICONS_LOCATION);
|
||||||
|
int l1 = (int) (f * 19.0F);
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
|
||||||
|
gui.blit(matrixStack, k2, j2, 0, 94, 18, 18);
|
||||||
|
gui.blit(matrixStack,
|
||||||
|
k2,
|
||||||
|
j2 + 18 - l1,
|
||||||
|
18,
|
||||||
|
112 - l1,
|
||||||
|
18,
|
||||||
|
l1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RenderSystem.disableRescaleNormal();
|
||||||
|
RenderSystem.disableBlend();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders a single item on the HUD.
|
||||||
|
*
|
||||||
|
* @param mc - A Minecraft instance.
|
||||||
|
* @param x - The x position of the item on the screen.
|
||||||
|
* @param y - The y position of the item on the screen
|
||||||
|
* @param partialTicks
|
||||||
|
* @param player - The player that the item is from.
|
||||||
|
* @param stack - The item to render.
|
||||||
|
*
|
||||||
|
* @see IngameGui#renderHotbarItem(int, int, float, PlayerEntity, ItemStack)
|
||||||
|
*/
|
||||||
|
static void renderHotbarItem(Minecraft mc, float alpha,
|
||||||
|
int x,
|
||||||
|
int y,
|
||||||
|
float partialTicks,
|
||||||
|
PlayerEntity player,
|
||||||
|
ItemStack stack)
|
||||||
|
{
|
||||||
|
if (!stack.isEmpty())
|
||||||
|
{
|
||||||
|
float f = (float) stack.getAnimationsToGo() - partialTicks;
|
||||||
|
RenderSystem.pushMatrix();
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
|
||||||
|
if (f > 0.0F)
|
||||||
|
{
|
||||||
|
RenderSystem.pushMatrix();
|
||||||
|
float f1 = 1.0F + f / 5.0F;
|
||||||
|
RenderSystem.translatef((float) (x + 8),
|
||||||
|
(float) (y + 12),
|
||||||
|
0.0F);
|
||||||
|
RenderSystem.scalef(1.0F / f1, (f1 + 1.0F) / 2.0F, 1.0F);
|
||||||
|
RenderSystem.translatef((float) (-(x + 8)),
|
||||||
|
(float) (-(y + 12)),
|
||||||
|
0.0F);
|
||||||
|
}
|
||||||
|
|
||||||
|
renderItemAndEffectIntoGUI(mc, alpha, player, stack, x, y);
|
||||||
|
if (f > 0.0F)
|
||||||
|
{
|
||||||
|
RenderSystem.popMatrix();
|
||||||
|
}
|
||||||
|
RenderSystem.popMatrix();
|
||||||
|
|
||||||
|
mc.getItemRenderer()
|
||||||
|
.renderItemOverlays(mc.fontRenderer, stack, x, y);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders a single item on the HUD.
|
||||||
|
*
|
||||||
|
* @param mc - A Minecraft instance.
|
||||||
|
* @param alpha - How transparent the item should be, on a scale from 0 to
|
||||||
|
* 1.
|
||||||
|
* @param ent - The player that the item is from.
|
||||||
|
* @param stack - The item to render.
|
||||||
|
* @param x - The x position of the item on the screen.
|
||||||
|
* @param y - The y position of the item on the screen
|
||||||
|
*
|
||||||
|
* @see net.minecraft.client.renderer.ItemRenderer#renderItemIntoGUI(LivingEntity,
|
||||||
|
* ItemStack, int, int)
|
||||||
|
*/
|
||||||
|
static void renderItemAndEffectIntoGUI(Minecraft mc,
|
||||||
|
float alpha,
|
||||||
|
PlayerEntity ent,
|
||||||
|
ItemStack stack,
|
||||||
|
int x,
|
||||||
|
int y)
|
||||||
|
{
|
||||||
|
TextureManager textureManager = mc.textureManager;
|
||||||
|
IBakedModel bakedmodel = mc.getItemRenderer()
|
||||||
|
.getItemModelWithOverrides(stack,
|
||||||
|
(World) null,
|
||||||
|
(LivingEntity) null);
|
||||||
|
if (!stack.isEmpty())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
RenderSystem.pushMatrix();
|
||||||
|
textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||||
|
textureManager.getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE)
|
||||||
|
.setBlurMipmapDirect(false, false);
|
||||||
|
RenderSystem.enableRescaleNormal();
|
||||||
|
// RenderSystem.enableAlphaTest();
|
||||||
|
// RenderSystem.defaultAlphaFunc();
|
||||||
|
// RenderSystem.enableBlend();
|
||||||
|
// RenderSystem.blendFunc(GlStateManager.SourceFactor
|
||||||
|
// .SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha);
|
||||||
|
RenderSystem.translatef((float) x, (float) y, 100.0F + 50F);
|
||||||
|
RenderSystem.translatef(8.0F, 8.0F, 0.0F);
|
||||||
|
RenderSystem.scalef(1.0F, -1.0F, 1.0F);
|
||||||
|
RenderSystem.scalef(16.0F, 16.0F, 16.0F);
|
||||||
|
MatrixStack matrixstack = new MatrixStack();
|
||||||
|
IRenderTypeBuffer.Impl irendertypebuffer$impl =
|
||||||
|
Minecraft.getInstance()
|
||||||
|
.getRenderTypeBuffers()
|
||||||
|
.getBufferSource();
|
||||||
|
boolean flag = !bakedmodel.isSideLit();
|
||||||
|
if (flag)
|
||||||
|
{
|
||||||
|
RenderHelper.setupGuiFlatDiffuseLighting();
|
||||||
|
}
|
||||||
|
|
||||||
|
mc.getItemRenderer()
|
||||||
|
.renderItem(stack,
|
||||||
|
ItemCameraTransforms.TransformType.GUI,
|
||||||
|
false,
|
||||||
|
matrixstack,
|
||||||
|
irendertypebuffer$impl,
|
||||||
|
15728880,
|
||||||
|
OverlayTexture.NO_OVERLAY,
|
||||||
|
bakedmodel);
|
||||||
|
irendertypebuffer$impl.finish();
|
||||||
|
RenderSystem.enableDepthTest();
|
||||||
|
if (flag)
|
||||||
|
{
|
||||||
|
RenderHelper.setupGui3DDiffuseLighting();
|
||||||
|
}
|
||||||
|
|
||||||
|
// RenderSystem.disableAlphaTest();
|
||||||
|
RenderSystem.disableRescaleNormal();
|
||||||
|
RenderSystem.popMatrix();
|
||||||
|
}
|
||||||
|
catch (Throwable throwable)
|
||||||
|
{
|
||||||
|
CrashReport crashreport = CrashReport.makeCrashReport(throwable,
|
||||||
|
"Rendering item");
|
||||||
|
CrashReportCategory crashreportcategory =
|
||||||
|
crashreport.makeCategory("Item being rendered");
|
||||||
|
crashreportcategory.addDetail("Item Type", () -> {
|
||||||
|
return String.valueOf((Object) stack.getItem());
|
||||||
|
});
|
||||||
|
crashreportcategory.addDetail("Registry Name",
|
||||||
|
() -> String.valueOf(stack.getItem()
|
||||||
|
.getRegistryName()));
|
||||||
|
crashreportcategory.addDetail("Item Damage", () -> {
|
||||||
|
return String.valueOf(stack.getDamage());
|
||||||
|
});
|
||||||
|
crashreportcategory.addDetail("Item NBT", () -> {
|
||||||
|
return String.valueOf((Object) stack.getTag());
|
||||||
|
});
|
||||||
|
crashreportcategory.addDetail("Item Foil", () -> {
|
||||||
|
return String.valueOf(stack.hasEffect());
|
||||||
|
});
|
||||||
|
throw new ReportedException(crashreport);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
65
src/main/resources/META-INF/mods.toml
Normal file
65
src/main/resources/META-INF/mods.toml
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
# This is an example mods.toml file. It contains the data relating to the loading mods.
|
||||||
|
# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
|
||||||
|
# The overall format is standard TOML format, v0.5.0.
|
||||||
|
# Note that there are a couple of TOML lists in this file.
|
||||||
|
# Find more information on toml format here: https://github.com/toml-lang/toml
|
||||||
|
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
||||||
|
modLoader="javafml" #mandatory
|
||||||
|
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
||||||
|
loaderVersion="[35,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
||||||
|
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
|
||||||
|
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
|
||||||
|
license="All rights reserved"
|
||||||
|
# A URL to refer people to when problems occur with this mod
|
||||||
|
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
|
||||||
|
# A list of mods - how many allowed here is determined by the individual mod loader
|
||||||
|
[[mods]] #mandatory
|
||||||
|
# The modid of the mod
|
||||||
|
modId="immersive_hud" #mandatory
|
||||||
|
# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
|
||||||
|
# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
|
||||||
|
# see the associated build.gradle script for how to populate this completely automatically during a build
|
||||||
|
version="${file.jarVersion}" #mandatory
|
||||||
|
# A display name for the mod
|
||||||
|
displayName="Immersive HUD" #mandatory
|
||||||
|
# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
|
||||||
|
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
|
||||||
|
# A URL for the "homepage" for this mod, displayed in the mod UI
|
||||||
|
#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
|
||||||
|
# A file name (in the root of the mod JAR) containing a logo for display
|
||||||
|
logoFile="immersive_hud_logo.png" #optional
|
||||||
|
# A text field displayed in the mod UI
|
||||||
|
credits="Minecraft Rendering Code (c) 2009-2021 Mojang Studios" #optional
|
||||||
|
# A text field displayed in the mod UI
|
||||||
|
authors="Markil 3" #optional
|
||||||
|
# The description text for the mod (multi line!) (#mandatory)
|
||||||
|
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.
|
||||||
|
|
||||||
|
Note that the following elements are unaffected:
|
||||||
|
* The F3 Menu. Honestly, anyone who uses this isn't in the need for immersion at the moment.
|
||||||
|
* The chat. This will automatically fade away by itself.
|
||||||
|
* The oxygen bar. This will disappear as soon as it is filled, anyway.
|
||||||
|
* Boss health. It is helpful to have this available in a hectic situation.
|
||||||
|
* Sub-maximum health or hunger. In hectic battles, it can be convenient to see health at a glance.
|
||||||
|
'''
|
||||||
|
# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
|
||||||
|
[[dependencies.immersive_hud]] #optional
|
||||||
|
# the modid of the dependency
|
||||||
|
modId="forge" #mandatory
|
||||||
|
# Does this dependency have to exist - if not, ordering below must be specified
|
||||||
|
mandatory=true #mandatory
|
||||||
|
# The version range of the dependency
|
||||||
|
versionRange="[35,)" #mandatory
|
||||||
|
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
|
||||||
|
ordering="NONE"
|
||||||
|
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
||||||
|
side="CLIENT"
|
||||||
|
# Here's another dependency
|
||||||
|
[[dependencies.immersive_hud]]
|
||||||
|
modId="minecraft"
|
||||||
|
mandatory=true
|
||||||
|
# This version range declares a minimum of the current minecraft version up to but not including the next major version
|
||||||
|
versionRange="[1.16.4,1.17)"
|
||||||
|
ordering="NONE"
|
||||||
|
side="CLIENT"
|
||||||
BIN
src/main/resources/immersive_hud_logo.png
Normal file
BIN
src/main/resources/immersive_hud_logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 487 KiB |
7
src/main/resources/pack.mcmeta
Normal file
7
src/main/resources/pack.mcmeta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"pack": {
|
||||||
|
"description": "immersive_hud resources",
|
||||||
|
"pack_format": 6,
|
||||||
|
"_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods."
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user