Initial work on the 1.15.2 Fabric port of this mod
This commit is contained in:
parent
182592e051
commit
7f253fd09a
17 changed files with 753 additions and 0 deletions
5
.gitignore
vendored
Normal file
5
.gitignore
vendored
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
build/
|
||||||
|
.gradle/
|
||||||
|
out/
|
||||||
|
.idea/
|
||||||
|
run/
|
20
README.md
Normal file
20
README.md
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# Better Ping Display - Fabric Edition
|
||||||
|
|
||||||
|
[](https://curseforge.com/minecraft/mc-mods/better-ping-display-fabric) [](https://curseforge.com/minecraft/mc-mods/better-ping-display-fabric)
|
||||||
|
|
||||||
|
A [Fabric](https://fabricmc.net/) mod for Minecraft to display each player's ping in the player list as a number. There is also a config file
|
||||||
|
for changing the text color and format.
|
||||||
|
|
||||||
|
Go [**here**](https://github.com/vladmarica/better-ping-display) for the Minecraft Forge edition of this mod.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
This is a client-side mod. The server doesn't need to have it installed. It works even when playing on vanilla servers.
|
||||||
|
|
||||||
|
## Supported Minecraft Versions
|
||||||
|
* **1.15.2**
|
||||||
|
* **1.16.2**
|
||||||
|
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
* [Fabric](https://fabricmc.net/)
|
74
build.gradle
Normal file
74
build.gradle
Normal file
|
@ -0,0 +1,74 @@
|
||||||
|
plugins {
|
||||||
|
id 'fabric-loom' version '0.4-SNAPSHOT'
|
||||||
|
id 'maven-publish'
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
|
||||||
|
archivesBaseName = project.archives_base_name
|
||||||
|
version = project.mod_version
|
||||||
|
group = project.maven_group
|
||||||
|
|
||||||
|
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}"
|
||||||
|
|
||||||
|
// Fabric API. This is technically optional, but you probably want it anyway.
|
||||||
|
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
||||||
|
}
|
||||||
|
|
||||||
|
processResources {
|
||||||
|
inputs.property "version", project.version
|
||||||
|
|
||||||
|
from(sourceSets.main.resources.srcDirs) {
|
||||||
|
include "fabric.mod.json"
|
||||||
|
expand "version": project.version
|
||||||
|
}
|
||||||
|
|
||||||
|
from(sourceSets.main.resources.srcDirs) {
|
||||||
|
exclude "fabric.mod.json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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
|
||||||
|
tasks.withType(JavaCompile) {
|
||||||
|
options.encoding = "UTF-8"
|
||||||
|
}
|
||||||
|
|
||||||
|
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
|
||||||
|
// if it is present.
|
||||||
|
// If you remove this task, sources will not be generated.
|
||||||
|
task sourcesJar(type: Jar, dependsOn: classes) {
|
||||||
|
classifier = "sources"
|
||||||
|
from sourceSets.main.allSource
|
||||||
|
}
|
||||||
|
|
||||||
|
jar {
|
||||||
|
from "LICENSE"
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// select the repositories you want to publish to
|
||||||
|
repositories {
|
||||||
|
// uncomment to publish to the local maven
|
||||||
|
// mavenLocal()
|
||||||
|
}
|
||||||
|
}
|
17
gradle.properties
Normal file
17
gradle.properties
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
# Done to increase the memory available to gradle.
|
||||||
|
org.gradle.jvmargs=-Xmx1G
|
||||||
|
|
||||||
|
# Fabric Properties
|
||||||
|
# check these on https://fabricmc.net/use
|
||||||
|
minecraft_version=1.15.2
|
||||||
|
yarn_mappings=1.15.2+build.17
|
||||||
|
loader_version=0.9.2+build.206
|
||||||
|
|
||||||
|
# Mod Properties
|
||||||
|
mod_version = 1.0.0
|
||||||
|
maven_group = com.vladmarica
|
||||||
|
archives_base_name = better-ping-display
|
||||||
|
|
||||||
|
# Dependencies
|
||||||
|
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
||||||
|
fabric_version=0.19.0+build.325-1.15
|
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
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
183
gradlew
vendored
Executable file
183
gradlew
vendored
Executable file
|
@ -0,0 +1,183 @@
|
||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright 2015 the original author or authors.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
##
|
||||||
|
## Gradle start up script for UN*X
|
||||||
|
##
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
PRG="$0"
|
||||||
|
# Need this for relative symlinks.
|
||||||
|
while [ -h "$PRG" ] ; do
|
||||||
|
ls=`ls -ld "$PRG"`
|
||||||
|
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||||
|
if expr "$link" : '/.*' > /dev/null; then
|
||||||
|
PRG="$link"
|
||||||
|
else
|
||||||
|
PRG=`dirname "$PRG"`"/$link"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
SAVED="`pwd`"
|
||||||
|
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||||
|
APP_HOME="`pwd -P`"
|
||||||
|
cd "$SAVED" >/dev/null
|
||||||
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
|
APP_BASE_NAME=`basename "$0"`
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD="maximum"
|
||||||
|
|
||||||
|
warn () {
|
||||||
|
echo "$*"
|
||||||
|
}
|
||||||
|
|
||||||
|
die () {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
nonstop=false
|
||||||
|
case "`uname`" in
|
||||||
|
CYGWIN* )
|
||||||
|
cygwin=true
|
||||||
|
;;
|
||||||
|
Darwin* )
|
||||||
|
darwin=true
|
||||||
|
;;
|
||||||
|
MINGW* )
|
||||||
|
msys=true
|
||||||
|
;;
|
||||||
|
NONSTOP* )
|
||||||
|
nonstop=true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||||
|
else
|
||||||
|
JAVACMD="$JAVA_HOME/bin/java"
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD="java"
|
||||||
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||||
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
|
if [ $? -eq 0 ] ; then
|
||||||
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||||
|
MAX_FD="$MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
ulimit -n $MAX_FD
|
||||||
|
if [ $? -ne 0 ] ; then
|
||||||
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Darwin, add options to specify how the application appears in the dock
|
||||||
|
if $darwin; then
|
||||||
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
|
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||||
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
|
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||||
|
SEP=""
|
||||||
|
for dir in $ROOTDIRSRAW ; do
|
||||||
|
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||||
|
SEP="|"
|
||||||
|
done
|
||||||
|
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||||
|
# Add a user-defined pattern to the cygpath arguments
|
||||||
|
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||||
|
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||||
|
fi
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
i=0
|
||||||
|
for arg in "$@" ; do
|
||||||
|
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||||
|
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||||
|
|
||||||
|
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||||
|
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||||
|
else
|
||||||
|
eval `echo args$i`="\"$arg\""
|
||||||
|
fi
|
||||||
|
i=`expr $i + 1`
|
||||||
|
done
|
||||||
|
case $i in
|
||||||
|
0) set -- ;;
|
||||||
|
1) set -- "$args0" ;;
|
||||||
|
2) set -- "$args0" "$args1" ;;
|
||||||
|
3) set -- "$args0" "$args1" "$args2" ;;
|
||||||
|
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||||
|
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||||
|
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||||
|
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||||
|
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||||
|
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Escape application args
|
||||||
|
save () {
|
||||||
|
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||||
|
echo " "
|
||||||
|
}
|
||||||
|
APP_ARGS=`save "$@"`
|
||||||
|
|
||||||
|
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||||
|
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||||
|
|
||||||
|
exec "$JAVACMD" "$@"
|
103
gradlew.bat
vendored
Normal file
103
gradlew.bat
vendored
Normal file
|
@ -0,0 +1,103 @@
|
||||||
|
@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 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
|
10
settings.gradle
Normal file
10
settings.gradle
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
pluginManagement {
|
||||||
|
repositories {
|
||||||
|
jcenter()
|
||||||
|
maven {
|
||||||
|
name = 'Fabric'
|
||||||
|
url = 'https://maven.fabricmc.net/'
|
||||||
|
}
|
||||||
|
gradlePluginPortal()
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,15 @@
|
||||||
|
package com.vladmarica.betterpingdisplay;
|
||||||
|
|
||||||
|
import net.fabricmc.api.ModInitializer;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
public class BetterPingDisplayMod implements ModInitializer {
|
||||||
|
public static final String MODID = "betterpingdisplay";
|
||||||
|
public static final Logger LOGGER = LogManager.getLogger(MODID);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onInitialize() {
|
||||||
|
LOGGER.info("BetterPingDisplay mod loaded");
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,201 @@
|
||||||
|
package com.vladmarica.betterpingdisplay.hud;
|
||||||
|
|
||||||
|
import com.google.common.collect.ComparisonChain;
|
||||||
|
import com.google.common.collect.Ordering;
|
||||||
|
import com.mojang.authlib.GameProfile;
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import com.vladmarica.betterpingdisplay.mixin.PlayerListHudAccessor;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
|
import net.fabricmc.api.EnvType;
|
||||||
|
import net.fabricmc.api.Environment;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.font.TextRenderer;
|
||||||
|
import net.minecraft.client.gui.DrawableHelper;
|
||||||
|
import net.minecraft.client.gui.hud.PlayerListHud;
|
||||||
|
import net.minecraft.client.network.ClientPlayNetworkHandler;
|
||||||
|
import net.minecraft.client.network.PlayerListEntry;
|
||||||
|
import net.minecraft.client.render.entity.PlayerModelPart;
|
||||||
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.scoreboard.Scoreboard;
|
||||||
|
import net.minecraft.scoreboard.ScoreboardCriterion;
|
||||||
|
import net.minecraft.scoreboard.ScoreboardObjective;
|
||||||
|
import net.minecraft.scoreboard.Team;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.minecraft.util.Formatting;
|
||||||
|
import net.minecraft.world.GameMode;
|
||||||
|
|
||||||
|
public final class CustomPlayerListHud {
|
||||||
|
private static final Ordering<PlayerListEntry> ENTRY_ORDERING = Ordering.from(new EntryOrderComparator());
|
||||||
|
|
||||||
|
public static void render(PlayerListHud hud, int width, Scoreboard scoreboard, ScoreboardObjective obj) {
|
||||||
|
MinecraftClient mc = MinecraftClient.getInstance();
|
||||||
|
TextRenderer textRenderer = mc.textRenderer;
|
||||||
|
Text header = PlayerListHudUtil.getHeader(hud);
|
||||||
|
Text footer = PlayerListHudUtil.getFooter(hud);
|
||||||
|
|
||||||
|
ClientPlayNetworkHandler clientPlayNetworkHandler = mc.player.networkHandler;
|
||||||
|
List<PlayerListEntry> playerList = ENTRY_ORDERING.sortedCopy(clientPlayNetworkHandler.getPlayerList());
|
||||||
|
int i = 0;
|
||||||
|
int j = 0;
|
||||||
|
Iterator playerListIterator = playerList.iterator();
|
||||||
|
|
||||||
|
int n;
|
||||||
|
while(playerListIterator.hasNext()) {
|
||||||
|
PlayerListEntry playerListEntry = (PlayerListEntry)playerListIterator.next();
|
||||||
|
n = mc.textRenderer.getStringWidth(hud.getPlayerName(playerListEntry).asFormattedString());
|
||||||
|
i = Math.max(i, n);
|
||||||
|
if (obj != null && obj.getRenderType() != ScoreboardCriterion.RenderType.HEARTS) {
|
||||||
|
n = textRenderer.getStringWidth(" " + scoreboard.getPlayerScore(playerListEntry.getProfile().getName(), obj).getScore());
|
||||||
|
j = Math.max(j, n);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
playerList = playerList.subList(0, Math.min(playerList.size(), 80));
|
||||||
|
int l = playerList.size();
|
||||||
|
int m = l;
|
||||||
|
|
||||||
|
for(n = 1; m > 20; m = (l + n - 1) / n) {
|
||||||
|
++n;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean bl = mc.isInSingleplayer() || mc.getNetworkHandler().getConnection().isEncrypted();
|
||||||
|
int q;
|
||||||
|
if (obj != null) {
|
||||||
|
if (obj.getRenderType() == ScoreboardCriterion.RenderType.HEARTS) {
|
||||||
|
q = 90;
|
||||||
|
} else {
|
||||||
|
q = j;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
q = 0;
|
||||||
|
}
|
||||||
|
int r = Math.min(n * ((bl ? 9 : 0) + i + q + 13), width - 50) / n;
|
||||||
|
int s = width / 2 - (r * n + (n - 1) * 5) / 2;
|
||||||
|
int t = 10;
|
||||||
|
int u = r * n + (n - 1) * 5;
|
||||||
|
List<String> list2 = null;
|
||||||
|
if (header != null) {
|
||||||
|
list2 = mc.textRenderer.wrapStringToWidthAsList(header.asFormattedString(), width - 50);
|
||||||
|
|
||||||
|
String string;
|
||||||
|
for(Iterator var18 = list2.iterator(); var18.hasNext(); u = Math.max(u, mc.textRenderer.getStringWidth(string))) {
|
||||||
|
string = (String)var18.next();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
List<String> list3 = null;
|
||||||
|
String string3;
|
||||||
|
Iterator var36;
|
||||||
|
if (footer != null) {
|
||||||
|
list3 = mc.textRenderer.wrapStringToWidthAsList(footer.asFormattedString(), width - 50);
|
||||||
|
|
||||||
|
for(var36 = list3.iterator(); var36.hasNext(); u = Math.max(u, mc.textRenderer.getStringWidth(string3))) {
|
||||||
|
string3 = (String)var36.next();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int var10000;
|
||||||
|
int var10001;
|
||||||
|
int var10002;
|
||||||
|
int var10004;
|
||||||
|
int y;
|
||||||
|
if (list2 != null) {
|
||||||
|
var10000 = width / 2 - u / 2 - 1;
|
||||||
|
var10001 = t - 1;
|
||||||
|
var10002 = width / 2 + u / 2 + 1;
|
||||||
|
var10004 = list2.size();
|
||||||
|
DrawableHelper.fill(var10000, var10001, var10002, t + var10004 * 9, Integer.MIN_VALUE);
|
||||||
|
|
||||||
|
for(var36 = list2.iterator(); var36.hasNext(); t += 9) {
|
||||||
|
string3 = (String)var36.next();
|
||||||
|
y = mc.textRenderer.getStringWidth(string3);
|
||||||
|
mc.textRenderer.drawWithShadow(string3, (float)(width / 2 - y / 2), (float)t, -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
++t;
|
||||||
|
}
|
||||||
|
|
||||||
|
DrawableHelper.fill(width / 2 - u / 2 - 1, t - 1, width / 2 + u / 2 + 1, t + m * 9, Integer.MIN_VALUE);
|
||||||
|
int w = mc.options.getTextBackgroundColor(553648127);
|
||||||
|
|
||||||
|
int ai;
|
||||||
|
for(int x = 0; x < l; ++x) {
|
||||||
|
y = x / m;
|
||||||
|
ai = x % m;
|
||||||
|
int aa = s + y * r + y * 5;
|
||||||
|
int ab = t + ai * 9;
|
||||||
|
DrawableHelper.fill(aa, ab, aa + r, ab + 8, w);
|
||||||
|
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
RenderSystem.enableAlphaTest();
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
RenderSystem.defaultBlendFunc();
|
||||||
|
if (x < playerList.size()) {
|
||||||
|
PlayerListEntry player = playerList.get(x);
|
||||||
|
GameProfile gameProfile = player.getProfile();
|
||||||
|
int ah;
|
||||||
|
if (bl) {
|
||||||
|
PlayerEntity playerEntity = mc.world.getPlayerByUuid(gameProfile.getId());
|
||||||
|
boolean bl2 = playerEntity != null && playerEntity.isPartVisible(PlayerModelPart.CAPE) && ("Dinnerbone".equals(gameProfile.getName()) || "Grumm".equals(gameProfile.getName()));
|
||||||
|
mc.getTextureManager().bindTexture(player.getSkinTexture());
|
||||||
|
ah = 8 + (bl2 ? 8 : 0);
|
||||||
|
int ad = 8 * (bl2 ? -1 : 1);
|
||||||
|
DrawableHelper.blit(aa, ab, 8, 8, 8.0F, (float)ah, 8, ad, 64, 64);
|
||||||
|
if (playerEntity != null && playerEntity.isPartVisible(PlayerModelPart.HAT)) {
|
||||||
|
int ae = 8 + (bl2 ? 8 : 0);
|
||||||
|
int af = 8 * (bl2 ? -1 : 1);
|
||||||
|
DrawableHelper.blit(aa, ab, 8, 8, 40.0F, (float)ae, 8, af, 64, 64);
|
||||||
|
}
|
||||||
|
|
||||||
|
aa += 9;
|
||||||
|
}
|
||||||
|
|
||||||
|
String string4 = hud.getPlayerName(player).asFormattedString();
|
||||||
|
if (player.getGameMode() == GameMode.SPECTATOR) {
|
||||||
|
mc.textRenderer.drawWithShadow(Formatting.ITALIC + string4, (float)aa, (float)ab, -1862270977);
|
||||||
|
} else {
|
||||||
|
mc.textRenderer.drawWithShadow(string4, (float)aa, (float)ab, -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (obj != null && player.getGameMode() != GameMode.SPECTATOR) {
|
||||||
|
int ag = aa + i + 1;
|
||||||
|
ah = ag + q;
|
||||||
|
if (ah - ag > 5) {
|
||||||
|
PlayerListHudUtil.renderScoreboardObjective(hud, obj, ab, gameProfile.getName(), ag, ah, player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
PlayerListHudUtil.renderLatencyIcon(hud, r, aa - (bl ? 9 : 0), ab, player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (list3 != null) {
|
||||||
|
t += m * 9 + 1;
|
||||||
|
var10000 = width / 2 - u / 2 - 1;
|
||||||
|
var10001 = t - 1;
|
||||||
|
var10002 = width / 2 + u / 2 + 1;
|
||||||
|
var10004 = list3.size();
|
||||||
|
DrawableHelper.fill(var10000, var10001, var10002, t + var10004 * 9, Integer.MIN_VALUE);
|
||||||
|
|
||||||
|
for(Iterator var39 = list3.iterator(); var39.hasNext(); t += 9) {
|
||||||
|
String string5 = (String)var39.next();
|
||||||
|
ai = textRenderer.getStringWidth(string5);
|
||||||
|
textRenderer.drawWithShadow(string5, (float)(width / 2 - ai / 2), (float)t, -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Environment(EnvType.CLIENT)
|
||||||
|
static class EntryOrderComparator implements Comparator<PlayerListEntry> {
|
||||||
|
public int compare(PlayerListEntry p1, PlayerListEntry p2) {
|
||||||
|
Team team = p1.getScoreboardTeam();
|
||||||
|
Team team2 = p2.getScoreboardTeam();
|
||||||
|
return ComparisonChain.start()
|
||||||
|
.compareTrueFirst(p1.getGameMode() != GameMode.SPECTATOR, p2.getGameMode() != GameMode.SPECTATOR)
|
||||||
|
.compare(team != null ? team.getName() : "", team2 != null ? team2.getName() : "")
|
||||||
|
.compare(p1.getProfile().getName(), p2.getProfile().getName(), String::compareToIgnoreCase)
|
||||||
|
.result();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,25 @@
|
||||||
|
package com.vladmarica.betterpingdisplay.hud;
|
||||||
|
|
||||||
|
import com.vladmarica.betterpingdisplay.mixin.PlayerListHudAccessor;
|
||||||
|
import net.minecraft.client.gui.hud.PlayerListHud;
|
||||||
|
import net.minecraft.client.network.PlayerListEntry;
|
||||||
|
import net.minecraft.scoreboard.ScoreboardObjective;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
|
public class PlayerListHudUtil {
|
||||||
|
static void renderLatencyIcon(PlayerListHud hud, int x, int offsetX, int y, PlayerListEntry player) {
|
||||||
|
((PlayerListHudAccessor) hud).invokeRenderLatencyIcon(x, offsetX, y, player);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void renderScoreboardObjective(PlayerListHud hud, ScoreboardObjective obj, int i, String str, int j, int k, PlayerListEntry player) {
|
||||||
|
((PlayerListHudAccessor) hud).invokeRenderScoreboardObjective(obj, i, str, j, k, player);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Text getHeader(PlayerListHud hud) {
|
||||||
|
return ((PlayerListHudAccessor) hud).getHeader();
|
||||||
|
}
|
||||||
|
|
||||||
|
static Text getFooter(PlayerListHud hud) {
|
||||||
|
return ((PlayerListHudAccessor) hud).getFooter();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
package com.vladmarica.betterpingdisplay.mixin;
|
||||||
|
|
||||||
|
import com.vladmarica.betterpingdisplay.hud.CustomPlayerListHud;
|
||||||
|
import net.minecraft.client.gui.hud.InGameHud;
|
||||||
|
import net.minecraft.client.gui.hud.PlayerListHud;
|
||||||
|
import net.minecraft.scoreboard.Scoreboard;
|
||||||
|
import net.minecraft.scoreboard.ScoreboardObjective;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
|
|
||||||
|
@Mixin(InGameHud.class)
|
||||||
|
abstract class InGameHudMixin {
|
||||||
|
@Redirect(method = "render",
|
||||||
|
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/PlayerListHud;render(ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreboardObjective;)V"))
|
||||||
|
private void render(PlayerListHud hud, int width, Scoreboard scoreboard, ScoreboardObjective objective) {
|
||||||
|
CustomPlayerListHud.render(hud, width, scoreboard, objective);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
package com.vladmarica.betterpingdisplay.mixin;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.hud.PlayerListHud;
|
||||||
|
import net.minecraft.client.network.PlayerListEntry;
|
||||||
|
import net.minecraft.scoreboard.ScoreboardObjective;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||||
|
|
||||||
|
@Mixin(PlayerListHud.class)
|
||||||
|
public interface PlayerListHudAccessor {
|
||||||
|
@Invoker
|
||||||
|
void invokeRenderLatencyIcon(int x, int offsetX, int y, PlayerListEntry player);
|
||||||
|
|
||||||
|
@Invoker
|
||||||
|
void invokeRenderScoreboardObjective(ScoreboardObjective obj, int i, String str, int j, int k, PlayerListEntry player);
|
||||||
|
|
||||||
|
@Accessor("header")
|
||||||
|
Text getHeader();
|
||||||
|
|
||||||
|
@Accessor("footer")
|
||||||
|
Text getFooter();
|
||||||
|
}
|
BIN
src/main/resources/assets/betterpingdisplay/icon.png
Normal file
BIN
src/main/resources/assets/betterpingdisplay/icon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.1 KiB |
15
src/main/resources/betterpingdisplay.mixins.json
Normal file
15
src/main/resources/betterpingdisplay.mixins.json
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{
|
||||||
|
"required": true,
|
||||||
|
"minVersion": "0.8",
|
||||||
|
"package": "com.vladmarica.betterpingdisplay.mixin",
|
||||||
|
"compatibilityLevel": "JAVA_8",
|
||||||
|
"mixins": [
|
||||||
|
],
|
||||||
|
"client": [
|
||||||
|
"InGameHudMixin",
|
||||||
|
"PlayerListHudAccessor"
|
||||||
|
],
|
||||||
|
"injectors": {
|
||||||
|
"defaultRequire": 1
|
||||||
|
}
|
||||||
|
}
|
37
src/main/resources/fabric.mod.json
Normal file
37
src/main/resources/fabric.mod.json
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
{
|
||||||
|
"schemaVersion": 1,
|
||||||
|
"id": "modid",
|
||||||
|
"version": "${version}",
|
||||||
|
|
||||||
|
"name": "Better Ping Display",
|
||||||
|
"description": "This is an example description! Tell everyone what your mod is about!",
|
||||||
|
"authors": [
|
||||||
|
"Quintinity"
|
||||||
|
],
|
||||||
|
"contact": {
|
||||||
|
"homepage": "https://github.com/vladmarica/better-ping-display-fabric",
|
||||||
|
"sources": "https://github.com/vladmarica/better-ping-display-fabric"
|
||||||
|
},
|
||||||
|
|
||||||
|
"license": "MIT",
|
||||||
|
"icon": "assets/modid/icon.png",
|
||||||
|
|
||||||
|
"environment": "client",
|
||||||
|
"entrypoints": {
|
||||||
|
"main": [
|
||||||
|
"com.vladmarica.betterpingdisplay.BetterPingDisplayMod"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"mixins": [
|
||||||
|
"betterpingdisplay.mixins.json"
|
||||||
|
],
|
||||||
|
|
||||||
|
"depends": {
|
||||||
|
"fabricloader": ">=0.7.4",
|
||||||
|
"fabric": "*",
|
||||||
|
"minecraft": "1.15.x"
|
||||||
|
},
|
||||||
|
"suggests": {
|
||||||
|
"flamingo": "*"
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue