Initial commit
This commit is contained in:
commit
1f482b2a58
18
.gitignore
vendored
Normal file
18
.gitignore
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
*
|
||||
|
||||
!src
|
||||
!src/**/*
|
||||
|
||||
!images
|
||||
!images/**/*
|
||||
|
||||
!gradle
|
||||
!gradle/**/*
|
||||
|
||||
!.gitignore
|
||||
!build.gradle
|
||||
!gradle.properties
|
||||
!gradlew
|
||||
!gradlew.bat
|
||||
!README.md
|
||||
!settings.gradle
|
16
README.md
Normal file
16
README.md
Normal file
@ -0,0 +1,16 @@
|
||||
# Keystrokes for Fabric
|
||||
|
||||
This mod adds the well-known keystrokes overlay (https://sk1er.club/mods/keystrokesmod), for modern minecraft versions.
|
||||
|
||||
## Screenshots
|
||||
|
||||
<img width="400" src="images/1.png" alt="Example 1"/>
|
||||
<img width="400" src="images/2.png" alt="Example 1"/>
|
||||
|
||||
## Features
|
||||
|
||||
For now, this mod is in early alpha, so only one default preset is ever present. In the future, more features will be added to this mod, for example:
|
||||
- Configurable positioning
|
||||
- More overlays (CPS, FPS, TPS, Latency, etc.)
|
||||
- Rainbow colors
|
||||
- ...and more
|
87
build.gradle
Normal file
87
build.gradle
Normal file
@ -0,0 +1,87 @@
|
||||
plugins {
|
||||
id 'fabric-loom' version '0.9-SNAPSHOT'
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_16
|
||||
targetCompatibility = JavaVersion.VERSION_16
|
||||
|
||||
archivesBaseName = project.archives_base_name
|
||||
version = project.mod_version
|
||||
group = project.maven_group
|
||||
|
||||
repositories {
|
||||
// Add repositories to retrieve artifacts from in here.
|
||||
// You should only use this when depending on other mods because
|
||||
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
|
||||
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
|
||||
// for more information about repositories.
|
||||
}
|
||||
|
||||
dependencies {
|
||||
minecraft "com.mojang:minecraft:1.16.5"
|
||||
mappings "net.fabricmc:yarn:1.16.5+build.10:v2"
|
||||
modImplementation "net.fabricmc:fabric-loader:0.11.6"
|
||||
|
||||
//Fabric api
|
||||
modImplementation "net.fabricmc.fabric-api:fabric-api:0.38.2+1.16"
|
||||
}
|
||||
|
||||
processResources {
|
||||
inputs.property "version", project.version
|
||||
|
||||
filesMatching("fabric.mod.json") {
|
||||
expand "version": project.version
|
||||
}
|
||||
}
|
||||
|
||||
loom {
|
||||
accessWidener = file("src/main/resources/keystrokes.accesswidener")
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
// ensure that the encoding is set to UTF-8, no matter what the system default is
|
||||
// this fixes some edge cases with special characters not displaying correctly
|
||||
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
|
||||
// If Javadoc is generated, this must be specified in that task too.
|
||||
it.options.encoding = "UTF-8"
|
||||
|
||||
// Minecraft 1.17 (21w19a) upwards uses Java 16.
|
||||
it.options.release = 16
|
||||
}
|
||||
|
||||
java {
|
||||
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
|
||||
// if it is present.
|
||||
// If you remove this line, sources will not be generated.
|
||||
withSourcesJar()
|
||||
}
|
||||
|
||||
jar {
|
||||
from("LICENSE") {
|
||||
rename { "${it}_${project.archivesBaseName}"}
|
||||
}
|
||||
}
|
||||
|
||||
// configure the maven publication
|
||||
publishing {
|
||||
publications {
|
||||
mavenJava(MavenPublication) {
|
||||
// add all the jars that should be included when publishing to maven
|
||||
artifact(remapJar) {
|
||||
builtBy remapJar
|
||||
}
|
||||
artifact(sourcesJar) {
|
||||
builtBy remapSourcesJar
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
||||
repositories {
|
||||
// Add repositories to publish to here.
|
||||
// Notice: This block does NOT have the same function as the block in the top level.
|
||||
// The repositories here will be used for publishing your artifact, not for
|
||||
// retrieving dependencies.
|
||||
}
|
||||
}
|
13
gradle.properties
Normal file
13
gradle.properties
Normal file
@ -0,0 +1,13 @@
|
||||
# Done to increase the memory available to gradle.
|
||||
org.gradle.jvmargs=-Xmx1G
|
||||
|
||||
minecraft_version=1.16.5
|
||||
yarn_mappings=1.16.5+build.10
|
||||
loader_version=0.11.6
|
||||
|
||||
# Deps
|
||||
fabric_version=0.38.2+1.16
|
||||
|
||||
mod_version = 0.1.0
|
||||
maven_group = me.topchetoeu.keystrokes
|
||||
archives_base_name = keystrokes
|
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-7.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
185
gradlew
vendored
Normal file
185
gradlew
vendored
Normal file
@ -0,0 +1,185 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MSYS* | MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
case $i in
|
||||
0) set -- ;;
|
||||
1) set -- "$args0" ;;
|
||||
2) set -- "$args0" "$args1" ;;
|
||||
3) set -- "$args0" "$args1" "$args2" ;;
|
||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
|
||||
exec "$JAVACMD" "$@"
|
89
gradlew.bat
vendored
Normal file
89
gradlew.bat
vendored
Normal file
@ -0,0 +1,89 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
BIN
images/1.png
Normal file
BIN
images/1.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 280 KiB |
BIN
images/2.png
Normal file
BIN
images/2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 245 KiB |
9
settings.gradle
Normal file
9
settings.gradle
Normal file
@ -0,0 +1,9 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
maven {
|
||||
name = 'Fabric'
|
||||
url = 'https://maven.fabricmc.net/'
|
||||
}
|
||||
gradlePluginPortal()
|
||||
}
|
||||
}
|
57
src/main/java/me/topchetoeu/keystrokes/Keystrokes.java
Normal file
57
src/main/java/me/topchetoeu/keystrokes/Keystrokes.java
Normal file
@ -0,0 +1,57 @@
|
||||
package me.topchetoeu.keystrokes;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import me.topchetoeu.keystrokes.engine.Button;
|
||||
import me.topchetoeu.keystrokes.engine.ButtonStyle;
|
||||
import me.topchetoeu.keystrokes.engine.Buttons;
|
||||
import me.topchetoeu.keystrokes.engine.Color;
|
||||
import me.topchetoeu.keystrokes.engine.KeyBindings;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
|
||||
import net.minecraft.client.option.KeyBinding;
|
||||
import net.minecraft.client.util.InputUtil;
|
||||
|
||||
public class Keystrokes implements ClientModInitializer {
|
||||
private static Keystrokes instance;
|
||||
public static Keystrokes getInstance() { return instance; }
|
||||
|
||||
private Buttons buttons;
|
||||
|
||||
public Buttons getButtons() { return buttons; }
|
||||
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
instance = this;
|
||||
buttons = new Buttons(new File("config/keystrokes/conf.bin"));
|
||||
|
||||
ButtonStyle style = new ButtonStyle();
|
||||
style.passiveColor = Color.make(0f, 0f, 0f, 0.5f);
|
||||
style.activeColor = Color.make(1f, 1f, 1f, 0.5f);
|
||||
style.textColor = Color.make(1f, 1f, 1f);
|
||||
style.fadeoutDuration = .2f;
|
||||
|
||||
ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
|
||||
|
||||
KeyBinding w = KeyBindings.get(GLFW.GLFW_KEY_W);
|
||||
KeyBinding a = KeyBindings.get(GLFW.GLFW_KEY_A);
|
||||
KeyBinding s = KeyBindings.get(GLFW.GLFW_KEY_S);
|
||||
KeyBinding d = KeyBindings.get(GLFW.GLFW_KEY_D);
|
||||
KeyBinding space = KeyBindings.get(GLFW.GLFW_KEY_SPACE);
|
||||
KeyBinding shift = KeyBindings.get(GLFW.GLFW_KEY_LEFT_SHIFT);
|
||||
KeyBinding lbm = KeyBindings.get(InputUtil.Type.MOUSE, GLFW.GLFW_MOUSE_BUTTON_1);
|
||||
KeyBinding rbm = KeyBindings.get(InputUtil.Type.MOUSE, GLFW.GLFW_MOUSE_BUTTON_2);
|
||||
|
||||
buttons.register(new Button(style, w, "W", 27, 5, 20, 20));
|
||||
buttons.register(new Button(style, a, "A", 5, 27, 20, 20));
|
||||
buttons.register(new Button(style, s, "S", 27, 27, 20, 20));
|
||||
buttons.register(new Button(style, d, "D", 49, 27, 20, 20));
|
||||
buttons.register(new Button(style, space, "Space", 5, 52, 42, 20));
|
||||
buttons.register(new Button(style, shift, "SFT", 49, 52, 20, 20));
|
||||
buttons.register(new Button(style, lbm, "LMB", 5, 77, 31, 20));
|
||||
buttons.register(new Button(style, rbm, "RMB", 38, 77, 31, 20));
|
||||
});
|
||||
}
|
||||
}
|
143
src/main/java/me/topchetoeu/keystrokes/engine/Button.java
Normal file
143
src/main/java/me/topchetoeu/keystrokes/engine/Button.java
Normal file
@ -0,0 +1,143 @@
|
||||
package me.topchetoeu.keystrokes.engine;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.DrawableHelper;
|
||||
import net.minecraft.client.option.KeyBinding;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
|
||||
public class Button {
|
||||
public static enum Align {
|
||||
TopLeft,
|
||||
BottomLeft,
|
||||
TopRight,
|
||||
BottomRight,
|
||||
}
|
||||
|
||||
public ButtonStyle style;
|
||||
|
||||
public int x = 0, y = 0, width = 20, height = 20;
|
||||
public Align alignment = Align.TopLeft;
|
||||
|
||||
public KeyBinding key;
|
||||
public String text;
|
||||
|
||||
public int getRealX(int screenWidth) {
|
||||
switch (alignment) {
|
||||
case TopRight:
|
||||
case BottomRight:
|
||||
return screenWidth - width - x;
|
||||
default:
|
||||
return x;
|
||||
}
|
||||
}
|
||||
public int getRealY(int screenHeight) {
|
||||
switch (alignment) {
|
||||
case BottomLeft:
|
||||
case BottomRight:
|
||||
return screenHeight - height - y;
|
||||
default:
|
||||
return y;
|
||||
}
|
||||
}
|
||||
|
||||
public void write(List<ButtonStyle> styles, OutputStream w) throws IOException {
|
||||
var str = new DataOutputStream(w);
|
||||
str.writeInt(x);
|
||||
str.writeInt(y);
|
||||
str.writeInt(width);
|
||||
str.writeInt(height);
|
||||
str.writeInt(alignment.ordinal());
|
||||
str.writeInt(styles.indexOf(style));
|
||||
str.writeUTF(text);
|
||||
str.writeUTF(key.getTranslationKey());
|
||||
}
|
||||
public void read(List<ButtonStyle> styles, InputStream r) throws IOException {
|
||||
var str = new DataInputStream(r);
|
||||
x = str.readInt();
|
||||
y = str.readInt();
|
||||
width = str.readInt();
|
||||
height = str.readInt();
|
||||
alignment = Align.values()[str.readInt()];
|
||||
style = styles.get(str.readInt());
|
||||
text = str.readUTF();
|
||||
key = KeyBindings.get(str.readUTF());
|
||||
}
|
||||
|
||||
private float lastTime = System.nanoTime() / 10000000000f;
|
||||
private float time;
|
||||
private boolean activated = false;
|
||||
|
||||
public boolean isActivated() { return activated; }
|
||||
|
||||
public void update() {
|
||||
float curr = System.nanoTime() / 1000000000f;
|
||||
float delta = curr - lastTime;
|
||||
lastTime = curr;
|
||||
activated = key.isPressed();
|
||||
|
||||
if (activated) time = 0;
|
||||
else time += delta;
|
||||
if (time > style.fadeoutDuration) time = style.fadeoutDuration;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public void draw(MatrixStack stack, int screenWidth, int screenHeight) {
|
||||
var textRenderer = MinecraftClient.getInstance().textRenderer;
|
||||
update();
|
||||
|
||||
int x = getRealX(screenWidth);
|
||||
int y = getRealY(screenHeight);
|
||||
|
||||
stack.push();
|
||||
stack.translate(x, y, 0);
|
||||
|
||||
DrawableHelper.fill(stack, 0, 0, width, height, style.getColor(time));
|
||||
int textWidth = textRenderer.getWidth(text);
|
||||
int textHeight = (int)(textRenderer.fontHeight / 1.5f);
|
||||
|
||||
textRenderer.draw(
|
||||
stack, text,
|
||||
(width - textWidth) / 2,
|
||||
(height - textHeight) / 2,
|
||||
style.textColor
|
||||
);
|
||||
|
||||
stack.pop();
|
||||
}
|
||||
|
||||
|
||||
public Button(ButtonStyle style, KeyBinding key, String text, int x, int y, int w, int h, Align alignment) {
|
||||
this.style = style;
|
||||
this.key = key;
|
||||
this.text = text;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.width = w;
|
||||
this.height = h;
|
||||
this.alignment = alignment;
|
||||
}
|
||||
public Button(ButtonStyle style, KeyBinding key, String text, int x, int y, int w, int h) {
|
||||
this.style = style;
|
||||
this.key = key;
|
||||
this.text = text;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.width = w;
|
||||
this.height = h;
|
||||
}
|
||||
public Button(ButtonStyle style, KeyBinding key, String text) {
|
||||
this.style = style;
|
||||
this.key = key;
|
||||
this.text = text;
|
||||
}
|
||||
public Button(List<ButtonStyle> styles, InputStream r) throws IOException {
|
||||
read(styles, r);
|
||||
}
|
||||
}
|
@ -0,0 +1,39 @@
|
||||
package me.topchetoeu.keystrokes.engine;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
|
||||
public class ButtonStyle {
|
||||
public int passiveColor = Color.make(0f, 0f, 0f, 0.5f);
|
||||
public int activeColor = Color.make(1f, 1f, 1f, 0.5f);
|
||||
public int textColor = Color.make(1f, 1f, 1f);
|
||||
public float fadeoutDuration = .2f;
|
||||
|
||||
public float getRatio(float time) { return (fadeoutDuration - time) / fadeoutDuration; }
|
||||
public int getColor(float time) { return Color.mix(passiveColor, activeColor, getRatio(time)); }
|
||||
|
||||
public void write(OutputStream w) throws IOException {
|
||||
var str = new DataOutputStream(w);
|
||||
str.writeInt(passiveColor);
|
||||
str.writeInt(activeColor);
|
||||
str.writeInt(textColor);
|
||||
str.writeFloat(fadeoutDuration);
|
||||
}
|
||||
public void read(InputStream r) throws IOException {
|
||||
var str = new DataInputStream(r);
|
||||
passiveColor = str.readInt();
|
||||
activeColor = str.readInt();
|
||||
textColor = str.readInt();
|
||||
fadeoutDuration = str.readFloat();
|
||||
}
|
||||
|
||||
public ButtonStyle() {
|
||||
|
||||
}
|
||||
public ButtonStyle(InputStream r) throws IOException {
|
||||
read(r);
|
||||
}
|
||||
}
|
64
src/main/java/me/topchetoeu/keystrokes/engine/Buttons.java
Normal file
64
src/main/java/me/topchetoeu/keystrokes/engine/Buttons.java
Normal file
@ -0,0 +1,64 @@
|
||||
package me.topchetoeu.keystrokes.engine;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
|
||||
public class Buttons {
|
||||
private HashSet<Button> buttons = new HashSet<>();
|
||||
public final File confFile;
|
||||
|
||||
public void register(Button btn) {
|
||||
buttons.add(btn);
|
||||
}
|
||||
|
||||
public Set<Button> get() {
|
||||
return Collections.unmodifiableSet(buttons);
|
||||
}
|
||||
|
||||
public void read() throws IOException {
|
||||
var styles = new ArrayList<ButtonStyle>();
|
||||
var f = new FileInputStream(confFile);
|
||||
var str = new DataInputStream(f);
|
||||
int n = str.readInt();
|
||||
|
||||
for (int i = 0; i < n; i++) {
|
||||
styles.add(new ButtonStyle(f));
|
||||
}
|
||||
|
||||
n = str.readInt();
|
||||
|
||||
buttons.clear();
|
||||
|
||||
for (int i = 0; i < n; i++) {
|
||||
buttons.add(new Button(styles, f));
|
||||
}
|
||||
|
||||
f.close();
|
||||
}
|
||||
public void write() throws IOException {
|
||||
var res = new ArrayList<ButtonStyle>();
|
||||
var f = new FileOutputStream(confFile);
|
||||
for (var btn : buttons) {
|
||||
if (!res.contains(btn.style)) {
|
||||
res.add(btn.style);
|
||||
btn.style.write(f);
|
||||
}
|
||||
}
|
||||
for (var btn : buttons) {
|
||||
btn.write(res, f);
|
||||
}
|
||||
f.close();
|
||||
}
|
||||
|
||||
public Buttons(File confFile) {
|
||||
this.confFile = confFile;
|
||||
}
|
||||
}
|
39
src/main/java/me/topchetoeu/keystrokes/engine/Color.java
Normal file
39
src/main/java/me/topchetoeu/keystrokes/engine/Color.java
Normal file
@ -0,0 +1,39 @@
|
||||
package me.topchetoeu.keystrokes.engine;
|
||||
|
||||
public class Color {
|
||||
private Color() { }
|
||||
|
||||
public static float getR(int col) { return (col & 0xFF) / 255f; }
|
||||
public static float getG(int col) { return ((col >> 8) & 0xFF) / 255f; }
|
||||
public static float getB(int col) { return ((col >> 16) & 0xFF) / 255f; }
|
||||
public static float getA(int col) { return ((col >> 24) & 0xFF) / 255f; }
|
||||
|
||||
public static float setR(int col, float r) { return (col & 0xFFFFFF00) | (int)(r * 255); }
|
||||
public static float setG(int col, float g) { return (col & 0xFFFF00FF) | ((int)(g * 255) << 8); }
|
||||
public static float setB(int col, float b) { return (col & 0xFF00FFFF) | ((int)(b * 255) << 16); }
|
||||
public static float setA(int col, float a) { return (col & 0x00FFFFFF) | ((int)(a * 255) << 24); }
|
||||
|
||||
public static int make(float r, float g, float b, float a) {
|
||||
return
|
||||
(int)(r * 255) |
|
||||
((int)(g * 255) << 8) |
|
||||
((int)(b * 255) << 16) |
|
||||
((int)(a * 255) << 24);
|
||||
}
|
||||
public static int make(float r, float g, float b) {
|
||||
return make(r, g, b, 1);
|
||||
}
|
||||
|
||||
private static float mix(float a, float b, float ratio) {
|
||||
return a * (1 - ratio) + b * ratio;
|
||||
}
|
||||
|
||||
public static int mix(int col1, int col2, float ratio) {
|
||||
return Color.make(
|
||||
mix(getR(col1), getR(col2), ratio),
|
||||
mix(getG(col1), getG(col2), ratio),
|
||||
mix(getB(col1), getB(col2), ratio),
|
||||
mix(getA(col1), getA(col2), ratio)
|
||||
);
|
||||
}
|
||||
}
|
@ -0,0 +1,39 @@
|
||||
package me.topchetoeu.keystrokes.engine;
|
||||
|
||||
public class Fadeout {
|
||||
public float slope;
|
||||
public float duration;
|
||||
|
||||
private boolean near(float f) {
|
||||
return near(slope, f);
|
||||
}
|
||||
private boolean near(float a, float b) {
|
||||
return Math.abs(a - b) < 0.001f;
|
||||
}
|
||||
|
||||
public float calculate(float delta) {
|
||||
if (delta > duration) return 0;
|
||||
|
||||
if (near(0)) return 1;
|
||||
if (near(1)) return 1 - delta / duration;
|
||||
if (near(2)) return 1 - (float)Math.sqrt(delta / duration);
|
||||
|
||||
float pow = 1 / slope;
|
||||
|
||||
if (near(pow, Math.round(pow))) {
|
||||
float a = delta / duration;
|
||||
float b = 1;
|
||||
|
||||
for (int i = 0; i < pow; i++) b *= a;
|
||||
|
||||
return 1 - b;
|
||||
}
|
||||
|
||||
return 1 - (float)Math.pow(delta / duration, pow);
|
||||
}
|
||||
|
||||
public Fadeout(float slope, float duration) {
|
||||
this.slope = slope;
|
||||
this.duration = duration;
|
||||
}
|
||||
}
|
@ -0,0 +1,16 @@
|
||||
package me.topchetoeu.keystrokes.engine;
|
||||
|
||||
import net.minecraft.client.option.KeyBinding;
|
||||
import net.minecraft.client.util.InputUtil;
|
||||
|
||||
public class KeyBindings {
|
||||
public static KeyBinding get(String name) {
|
||||
return KeyBinding.keysById.get(name);
|
||||
}
|
||||
public static KeyBinding get(int code) {
|
||||
return KeyBinding.keyToBindings.get(InputUtil.Type.KEYSYM.createFromCode(code));
|
||||
}
|
||||
public static KeyBinding get(InputUtil.Type type, int code) {
|
||||
return KeyBinding.keyToBindings.get(type.createFromCode(code));
|
||||
}
|
||||
}
|
@ -0,0 +1,21 @@
|
||||
package me.topchetoeu.keystrokes.mixins;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import me.topchetoeu.keystrokes.Keystrokes;
|
||||
import me.topchetoeu.keystrokes.engine.Button;
|
||||
import net.minecraft.client.gui.hud.InGameHud;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
|
||||
@Mixin(InGameHud.class)
|
||||
public abstract class InGameHudMixin {
|
||||
@Inject(method = { "render" }, at = { @At("TAIL") })
|
||||
private void render(MatrixStack matrices, float tickDelta, CallbackInfo info) {
|
||||
for (Button button : Keystrokes.getInstance().getButtons().get()) {
|
||||
button.draw(matrices, ((InGameHud)(Object)this).scaledWidth, ((InGameHud)(Object)this).scaledHeight);
|
||||
}
|
||||
}
|
||||
}
|
BIN
src/main/resources/assets/keystrokes/icon.png
Normal file
BIN
src/main/resources/assets/keystrokes/icon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 453 B |
29
src/main/resources/fabric.mod.json
Normal file
29
src/main/resources/fabric.mod.json
Normal file
@ -0,0 +1,29 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "keystrokes",
|
||||
"version": "${version}",
|
||||
|
||||
"name": "Keystrokes for Fabric",
|
||||
"description": "The same as the Keystrokes Forge mod, but for Fabric",
|
||||
"authors": [ "TopchetoEU" ],
|
||||
|
||||
"license": "GPL3",
|
||||
"icon": "assets/keystrokes/icon.png",
|
||||
|
||||
"environment": "*",
|
||||
"entrypoints": {
|
||||
"client": [
|
||||
"me.topchetoeu.keystrokes.Keystrokes"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"keystrokes.mixins.json"
|
||||
],
|
||||
|
||||
"depends": {
|
||||
"fabricloader": ">=0.11.3",
|
||||
"fabric": "*",
|
||||
"minecraft": "1.16.x",
|
||||
"java": ">=16"
|
||||
}
|
||||
}
|
6
src/main/resources/keystrokes.accesswidener
Normal file
6
src/main/resources/keystrokes.accesswidener
Normal file
@ -0,0 +1,6 @@
|
||||
accessWidener v1 named
|
||||
|
||||
accessible field net/minecraft/client/gui/hud/InGameHud scaledWidth I
|
||||
accessible field net/minecraft/client/gui/hud/InGameHud scaledHeight I
|
||||
accessible field net/minecraft/client/option/KeyBinding keyToBindings Ljava/util/Map;
|
||||
accessible field net/minecraft/client/option/KeyBinding keysById Ljava/util/Map;
|
14
src/main/resources/keystrokes.mixins.json
Normal file
14
src/main/resources/keystrokes.mixins.json
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
"required": true,
|
||||
"minVersion": "0.8",
|
||||
"package": "me.topchetoeu.keystrokes.mixins",
|
||||
"compatibilityLevel": "JAVA_16",
|
||||
"mixins": [ ],
|
||||
"client": [
|
||||
"InGameHudMixin"
|
||||
],
|
||||
"server": [],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user