initial commit: begin base with mixin event hooking & imgui
This commit is contained in:
commit
54589651d1
26 changed files with 794 additions and 0 deletions
9
.editorconfig
Normal file
9
.editorconfig
Normal file
|
@ -0,0 +1,9 @@
|
|||
root = true
|
||||
|
||||
[*]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
end_of_line = lf
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = false
|
||||
insert_final_newline = true
|
11
.gitignore
vendored
Normal file
11
.gitignore
vendored
Normal file
|
@ -0,0 +1,11 @@
|
|||
/.gradle/
|
||||
/build/
|
||||
/out/
|
||||
/classes/
|
||||
|
||||
/.idea/
|
||||
*.iml
|
||||
*.ipr
|
||||
*.iws
|
||||
|
||||
/run/
|
3
README.md
Normal file
3
README.md
Normal file
|
@ -0,0 +1,3 @@
|
|||
# hibiscus client
|
||||
|
||||
:)
|
70
build.gradle.kts
Normal file
70
build.gradle.kts
Normal file
|
@ -0,0 +1,70 @@
|
|||
plugins {
|
||||
id("fabric-loom")
|
||||
val kotlinVersion: String by System.getProperties()
|
||||
kotlin("jvm").version(kotlinVersion)
|
||||
}
|
||||
|
||||
base {
|
||||
val archivesBaseName: String by project
|
||||
archivesName.set(archivesBaseName)
|
||||
}
|
||||
|
||||
val modVersion: String by project
|
||||
version = modVersion
|
||||
val mavenGroup: String by project
|
||||
group = mavenGroup
|
||||
|
||||
minecraft {}
|
||||
|
||||
repositories {}
|
||||
|
||||
dependencies {
|
||||
val minecraftVersion: String by project
|
||||
minecraft("com.mojang:minecraft:$minecraftVersion")
|
||||
val yarnMappings: String by project
|
||||
mappings("net.fabricmc:yarn:$yarnMappings:v2")
|
||||
val loaderVersion: String by project
|
||||
modImplementation("net.fabricmc:fabric-loader:$loaderVersion")
|
||||
val fabricVersion: String by project
|
||||
modImplementation("net.fabricmc.fabric-api:fabric-api:$fabricVersion")
|
||||
val fabricKotlinVersion: String by project
|
||||
modImplementation("net.fabricmc:fabric-language-kotlin:$fabricKotlinVersion")
|
||||
|
||||
val imguiVersion = "1.86.2"
|
||||
implementation("io.github.spair:imgui-java-binding:$imguiVersion")
|
||||
implementation("io.github.spair:imgui-java-lwjgl3:$imguiVersion") {
|
||||
exclude(group = "org.lwjgl")
|
||||
}
|
||||
implementation("io.github.spair:imgui-java-natives-windows-ft:$imguiVersion")
|
||||
}
|
||||
|
||||
tasks {
|
||||
val javaVersion = JavaVersion.VERSION_17
|
||||
|
||||
withType<JavaCompile> {
|
||||
options.encoding = "UTF-8"
|
||||
sourceCompatibility = javaVersion.toString()
|
||||
targetCompatibility = javaVersion.toString()
|
||||
options.release.set(javaVersion.toString().toInt())
|
||||
}
|
||||
|
||||
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
|
||||
kotlinOptions { jvmTarget = javaVersion.toString() }
|
||||
sourceCompatibility = javaVersion.toString()
|
||||
targetCompatibility = javaVersion.toString()
|
||||
}
|
||||
|
||||
jar { from("LICENSE") { rename { "${it}_${base.archivesName}" } } }
|
||||
|
||||
processResources {
|
||||
inputs.property("version", project.version)
|
||||
filesMatching("fabric.mod.json") { expand(mutableMapOf("version" to project.version)) }
|
||||
}
|
||||
|
||||
java {
|
||||
toolchain { languageVersion.set(JavaLanguageVersion.of(javaVersion.toString())) }
|
||||
sourceCompatibility = javaVersion
|
||||
targetCompatibility = javaVersion
|
||||
withSourcesJar()
|
||||
}
|
||||
}
|
17
gradle.properties
Normal file
17
gradle.properties
Normal file
|
@ -0,0 +1,17 @@
|
|||
kotlin.code.style=official
|
||||
org.gradle.jvmargs=-Xmx1G
|
||||
org.gradle.warning.mode=all
|
||||
# Check these on https://fabricmc.net/develop/
|
||||
minecraftVersion=1.18.1
|
||||
yarnMappings=1.18.1+build.22
|
||||
loaderVersion=0.12.12
|
||||
# Fabric API
|
||||
fabricVersion=0.46.1+1.18
|
||||
loomVersion=0.10-SNAPSHOT
|
||||
# Mod Properties
|
||||
modVersion=1.0.0
|
||||
mavenGroup=codes.som
|
||||
archivesBaseName=hibiscus-client
|
||||
# Kotlin
|
||||
systemProp.kotlinVersion=1.6.10
|
||||
fabricKotlinVersion=1.7.1+kotlin.1.6.10
|
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 @@
|
|||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
232
gradlew
vendored
Normal file
232
gradlew
vendored
Normal file
|
@ -0,0 +1,232 @@
|
|||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=${0##*/}
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
89
gradlew.bat
vendored
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
|
13
settings.gradle.kts
Normal file
13
settings.gradle.kts
Normal file
|
@ -0,0 +1,13 @@
|
|||
pluginManagement {
|
||||
repositories {
|
||||
maven("https://maven.fabricmc.net") { name = "Fabric" }
|
||||
mavenCentral()
|
||||
gradlePluginPortal()
|
||||
}
|
||||
plugins {
|
||||
val loomVersion: String by settings
|
||||
id("fabric-loom").version(loomVersion)
|
||||
val kotlinVersion: String by System.getProperties()
|
||||
kotlin("jvm").version(kotlinVersion)
|
||||
}
|
||||
}
|
|
@ -0,0 +1,17 @@
|
|||
package codes.som.hibiscus.mixins;
|
||||
|
||||
import codes.som.hibiscus.HibiscusMod;
|
||||
import codes.som.hibiscus.events.PlayerTickEvent;
|
||||
import net.minecraft.client.network.ClientPlayerEntity;
|
||||
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;
|
||||
|
||||
@Mixin(ClientPlayerEntity.class)
|
||||
public abstract class MixinClientPlayerEntity {
|
||||
@Inject(method = "tick", at = @At("RETURN"))
|
||||
private void onPostTick(CallbackInfo ci) {
|
||||
HibiscusMod.bus().fire(PlayerTickEvent.INSTANCE);
|
||||
}
|
||||
}
|
36
src/main/java/codes/som/hibiscus/mixins/MixinKeyboard.java
Normal file
36
src/main/java/codes/som/hibiscus/mixins/MixinKeyboard.java
Normal file
|
@ -0,0 +1,36 @@
|
|||
package codes.som.hibiscus.mixins;
|
||||
|
||||
import codes.som.hibiscus.HibiscusMod;
|
||||
import codes.som.hibiscus.events.CharEvent;
|
||||
import codes.som.hibiscus.events.KeyEvent;
|
||||
import net.minecraft.client.Keyboard;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(Keyboard.class)
|
||||
public abstract class MixinKeyboard {
|
||||
@Shadow
|
||||
@Final
|
||||
private MinecraftClient client;
|
||||
|
||||
@Inject(method = "onKey", at = @At("HEAD"))
|
||||
public void onKey(long window, int key, int scancode, int action, int mods, CallbackInfo ci) {
|
||||
if (window != this.client.getWindow().getHandle())
|
||||
return; // Just in case
|
||||
|
||||
HibiscusMod.bus().fire(new KeyEvent(key, action));
|
||||
}
|
||||
|
||||
@Inject(method = "onChar", at = @At("HEAD"))
|
||||
public void onChar(long window, int character, int mods, CallbackInfo ci) {
|
||||
if (window != this.client.getWindow().getHandle())
|
||||
return;
|
||||
|
||||
HibiscusMod.bus().fire(new CharEvent((char) character));
|
||||
}
|
||||
}
|
|
@ -0,0 +1,14 @@
|
|||
package site.hackery.unknit;
|
||||
|
||||
import net.minecraft.client.*;
|
||||
import org.spongepowered.asm.mixin.*;
|
||||
import org.spongepowered.asm.mixin.injection.*;
|
||||
import org.spongepowered.asm.mixin.injection.callback.*;
|
||||
|
||||
@Mixin(value = ClientBrandRetriever.class, remap = false)
|
||||
public abstract class MixinClientBrandRetriever {
|
||||
@Inject(method = "getClientModName", at = @At("HEAD"), cancellable = true, remap = false)
|
||||
private static void onGetClientModName(CallbackInfoReturnable<String> cir) {
|
||||
cir.setReturnValue("vanilla");
|
||||
}
|
||||
}
|
15
src/main/java/site/hackery/unknit/MixinMinecraftClient.java
Normal file
15
src/main/java/site/hackery/unknit/MixinMinecraftClient.java
Normal file
|
@ -0,0 +1,15 @@
|
|||
package site.hackery.unknit;
|
||||
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.util.ModStatus;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Mixin(MinecraftClient.class)
|
||||
public abstract class MixinMinecraftClient {
|
||||
@Redirect(method = "getWindowTitle", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/ModStatus;isModded()Z"))
|
||||
private boolean onGetIsModded(ModStatus instance) {
|
||||
return false;
|
||||
}
|
||||
}
|
77
src/main/java/site/hackery/unknit/MixinMinecraftMain.java
Normal file
77
src/main/java/site/hackery/unknit/MixinMinecraftMain.java
Normal file
|
@ -0,0 +1,77 @@
|
|||
package site.hackery.unknit;
|
||||
|
||||
|
||||
import com.mojang.authlib.*;
|
||||
import com.mojang.authlib.exceptions.*;
|
||||
import com.mojang.authlib.yggdrasil.*;
|
||||
import com.mojang.util.*;
|
||||
import net.minecraft.client.main.*;
|
||||
import net.minecraft.client.util.*;
|
||||
import org.spongepowered.asm.mixin.*;
|
||||
import org.spongepowered.asm.mixin.injection.*;
|
||||
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.nio.file.*;
|
||||
import java.util.*;
|
||||
|
||||
@Mixin(Main.class)
|
||||
public abstract class MixinMinecraftMain {
|
||||
private static void replace(List<String> arguments, String tag, String value) {
|
||||
int index = arguments.indexOf(tag);
|
||||
if (index != -1) {
|
||||
arguments.set(index + 1, value);
|
||||
}
|
||||
}
|
||||
|
||||
@ModifyVariable(method = "main", at = @At("HEAD"), argsOnly = true)
|
||||
private static String[] setArgs(String[] args) {
|
||||
List<String> arguments = new ArrayList<>(Arrays.asList(args));
|
||||
replace(arguments, "--version", "1.18.1");
|
||||
replace(arguments, "--versionType", "release");
|
||||
|
||||
try {
|
||||
String authFile = System.getenv("LOGIN_FILE");
|
||||
authFile = authFile == null ? "lastlogin.txt" : authFile;
|
||||
|
||||
List<String> loginDetails = Files.readAllLines(Paths.get(authFile));
|
||||
if (loginDetails.size() >= 2) {
|
||||
Session session = getAuthenticatedSession(loginDetails.get(0), loginDetails.get(1));
|
||||
replace(arguments, "--accessToken", session.getAccessToken());
|
||||
|
||||
arguments.add("--username");
|
||||
arguments.add(session.getUsername());
|
||||
|
||||
arguments.add("--uuid");
|
||||
arguments.add(session.getUuid());
|
||||
}
|
||||
} catch (AuthenticationException | IOException ignored) {
|
||||
}
|
||||
|
||||
return arguments.toArray(new String[0]);
|
||||
}
|
||||
|
||||
private static Session getAuthenticatedSession(String username, String password) throws AuthenticationException {
|
||||
YggdrasilUserAuthentication yggdrasilUserAuthentication = constructUserAuthentication(username, password);
|
||||
yggdrasilUserAuthentication.logIn();
|
||||
|
||||
GameProfile selectedProfile = yggdrasilUserAuthentication.getSelectedProfile();
|
||||
|
||||
return new Session(
|
||||
selectedProfile.getName(),
|
||||
UUIDTypeAdapter.fromUUID(selectedProfile.getId()),
|
||||
yggdrasilUserAuthentication.getAuthenticatedToken(),
|
||||
Optional.empty(),
|
||||
Optional.empty(),
|
||||
Session.AccountType.LEGACY // Why legacy?
|
||||
);
|
||||
}
|
||||
|
||||
private static YggdrasilUserAuthentication constructUserAuthentication(String username, String password) {
|
||||
YggdrasilUserAuthentication yggdrasilUserAuthentication = (YggdrasilUserAuthentication) new YggdrasilAuthenticationService(Proxy.NO_PROXY, "my epic client token").createUserAuthentication(Agent.MINECRAFT);
|
||||
yggdrasilUserAuthentication.setUsername(username);
|
||||
yggdrasilUserAuthentication.setPassword(password);
|
||||
|
||||
return yggdrasilUserAuthentication;
|
||||
}
|
||||
}
|
25
src/main/kotlin/codes/som/hibiscus/HibiscusMod.kt
Normal file
25
src/main/kotlin/codes/som/hibiscus/HibiscusMod.kt
Normal file
|
@ -0,0 +1,25 @@
|
|||
package codes.som.hibiscus
|
||||
|
||||
import codes.som.hibiscus.api.event.EventBus
|
||||
import codes.som.hibiscus.events.KeyEvent
|
||||
import codes.som.hibiscus.gui.ImGuiScreen
|
||||
import net.fabricmc.api.ModInitializer
|
||||
import org.lwjgl.glfw.GLFW.GLFW_KEY_RIGHT_SHIFT
|
||||
|
||||
@Suppress("UNUSED")
|
||||
object HibiscusMod : ModInitializer {
|
||||
private const val MOD_ID = "hibiscus_client"
|
||||
|
||||
@JvmStatic
|
||||
@get:JvmName("bus")
|
||||
val bus = EventBus()
|
||||
|
||||
override fun onInitialize() {
|
||||
bus.register { key: KeyEvent ->
|
||||
if (key.key != GLFW_KEY_RIGHT_SHIFT)
|
||||
return@register
|
||||
|
||||
mc.setScreen(ImGuiScreen)
|
||||
}
|
||||
}
|
||||
}
|
5
src/main/kotlin/codes/som/hibiscus/MinecraftAccessors.kt
Normal file
5
src/main/kotlin/codes/som/hibiscus/MinecraftAccessors.kt
Normal file
|
@ -0,0 +1,5 @@
|
|||
package codes.som.hibiscus
|
||||
|
||||
import net.minecraft.client.MinecraftClient
|
||||
|
||||
val mc: MinecraftClient inline get() = MinecraftClient.getInstance()
|
4
src/main/kotlin/codes/som/hibiscus/api/event/Event.kt
Normal file
4
src/main/kotlin/codes/som/hibiscus/api/event/Event.kt
Normal file
|
@ -0,0 +1,4 @@
|
|||
package codes.som.hibiscus.api.event
|
||||
|
||||
interface Event {
|
||||
}
|
27
src/main/kotlin/codes/som/hibiscus/api/event/EventBus.kt
Normal file
27
src/main/kotlin/codes/som/hibiscus/api/event/EventBus.kt
Normal file
|
@ -0,0 +1,27 @@
|
|||
package codes.som.hibiscus.api.event
|
||||
|
||||
import java.util.concurrent.CopyOnWriteArrayList
|
||||
|
||||
class EventBus {
|
||||
private val listenerMap = mutableMapOf<Class<out Event>, MutableList<Listener<*>>>()
|
||||
|
||||
inline fun <reified T : Event> register(listener: Listener<T>) {
|
||||
this.register(T::class.java, listener)
|
||||
}
|
||||
|
||||
fun <T : Event> register(type: Class<T>, listener: Listener<T>) {
|
||||
listenerMap.getOrPut(type, ::CopyOnWriteArrayList).add(listener)
|
||||
}
|
||||
|
||||
inline fun <reified T : Event> unregister(listener: Listener<T>) =
|
||||
unregister(T::class.java, listener)
|
||||
|
||||
fun <T : Event> unregister(type: Class<T>, listener: Listener<T>) =
|
||||
listenerMap[type]?.remove(listener)
|
||||
|
||||
fun <T : Event> fire(event: T) {
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
val listeners = (listenerMap[event.javaClass] ?: return) as List<Listener<T>>
|
||||
listeners.forEach { it.on(event) }
|
||||
}
|
||||
}
|
5
src/main/kotlin/codes/som/hibiscus/api/event/Listener.kt
Normal file
5
src/main/kotlin/codes/som/hibiscus/api/event/Listener.kt
Normal file
|
@ -0,0 +1,5 @@
|
|||
package codes.som.hibiscus.api.event
|
||||
|
||||
fun interface Listener<T : Event> {
|
||||
fun on(event: T)
|
||||
}
|
6
src/main/kotlin/codes/som/hibiscus/events/KeyEvent.kt
Normal file
6
src/main/kotlin/codes/som/hibiscus/events/KeyEvent.kt
Normal file
|
@ -0,0 +1,6 @@
|
|||
package codes.som.hibiscus.events
|
||||
|
||||
import codes.som.hibiscus.api.event.Event
|
||||
|
||||
data class KeyEvent(val key: Int, val action: Int) : Event
|
||||
data class CharEvent(val char: Char) : Event
|
|
@ -0,0 +1,5 @@
|
|||
package codes.som.hibiscus.events
|
||||
|
||||
import codes.som.hibiscus.api.event.Event
|
||||
|
||||
object PlayerTickEvent : Event
|
46
src/main/kotlin/codes/som/hibiscus/gui/ImGuiScreen.kt
Normal file
46
src/main/kotlin/codes/som/hibiscus/gui/ImGuiScreen.kt
Normal file
|
@ -0,0 +1,46 @@
|
|||
package codes.som.hibiscus.gui
|
||||
|
||||
import codes.som.hibiscus.mc
|
||||
import imgui.ImGui
|
||||
import imgui.flag.ImGuiConfigFlags
|
||||
import imgui.gl3.ImGuiImplGl3
|
||||
import imgui.glfw.ImGuiImplGlfw
|
||||
import net.minecraft.client.gui.screen.Screen
|
||||
import net.minecraft.client.util.math.MatrixStack
|
||||
import net.minecraft.text.Text
|
||||
import org.lwjgl.glfw.GLFW
|
||||
|
||||
|
||||
object ImGuiScreen : Screen(Text.of("hacker_menu")) {
|
||||
private val imGuiGlfw = ImGuiImplGlfw()
|
||||
private val imGuiGl3 = ImGuiImplGl3()
|
||||
|
||||
init {
|
||||
ImGui.createContext()
|
||||
imGuiGlfw.init(mc.window.handle, true)
|
||||
imGuiGl3.init()
|
||||
}
|
||||
|
||||
override fun render(matrices: MatrixStack?, mouseX: Int, mouseY: Int, delta: Float) {
|
||||
super.render(matrices, mouseX, mouseY, delta)
|
||||
|
||||
imGuiGlfw.newFrame()
|
||||
ImGui.newFrame()
|
||||
|
||||
ImGui.begin("hello")
|
||||
ImGui.text("you just got hacked by didi @ digitalgangster")
|
||||
ImGui.end()
|
||||
|
||||
ImGui.render()
|
||||
imGuiGl3.renderDrawData(ImGui.getDrawData())
|
||||
|
||||
if (ImGui.getIO().hasConfigFlags(ImGuiConfigFlags.ViewportsEnable)) {
|
||||
val backupWindowPtr = GLFW.glfwGetCurrentContext()
|
||||
ImGui.updatePlatformWindows()
|
||||
ImGui.renderPlatformWindowsDefault()
|
||||
GLFW.glfwMakeContextCurrent(backupWindowPtr)
|
||||
}
|
||||
}
|
||||
|
||||
override fun shouldPause() = false
|
||||
}
|
35
src/main/resources/fabric.mod.json
Normal file
35
src/main/resources/fabric.mod.json
Normal file
|
@ -0,0 +1,35 @@
|
|||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "hibiscus_client",
|
||||
"version": "${version}",
|
||||
"name": "hibiscus \uD83C\uDF3A",
|
||||
"description": "a cute lil minecraft client",
|
||||
"authors": [
|
||||
"charlotte \u2728"
|
||||
],
|
||||
"contact": {
|
||||
"homepage": "https://fabricmc.net/",
|
||||
"sources": "https://github.com/FabricMC/fabric-example-mod"
|
||||
},
|
||||
"license": "Be Gay Do Crimes",
|
||||
"environment": "client",
|
||||
"entrypoints": {
|
||||
"main": [
|
||||
{
|
||||
"adapter": "kotlin",
|
||||
"value": "codes.som.hibiscus.HibiscusMod"
|
||||
}
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"hibiscus.mixins.json",
|
||||
"unknit.mixins.json"
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.12.12",
|
||||
"fabric": "*",
|
||||
"fabric-language-kotlin": ">=1.7.1+kotlin.1.6.10",
|
||||
"minecraft": "1.18.x",
|
||||
"java": ">=17"
|
||||
}
|
||||
}
|
14
src/main/resources/hibiscus.mixins.json
Normal file
14
src/main/resources/hibiscus.mixins.json
Normal file
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
"required": true,
|
||||
"package": "codes.som.hibiscus.mixins",
|
||||
"compatibilityLevel": "JAVA_17",
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
},
|
||||
"mixins": [
|
||||
],
|
||||
"client": [
|
||||
"MixinClientPlayerEntity",
|
||||
"MixinKeyboard"
|
||||
]
|
||||
}
|
14
src/main/resources/unknit.mixins.json
Normal file
14
src/main/resources/unknit.mixins.json
Normal file
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
"required": true,
|
||||
"package": "site.hackery.unknit",
|
||||
"compatibilityLevel": "JAVA_17",
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
},
|
||||
"mixins": [],
|
||||
"client": [
|
||||
"MixinClientBrandRetriever",
|
||||
"MixinMinecraftClient",
|
||||
"MixinMinecraftMain"
|
||||
]
|
||||
}
|
Loading…
Reference in a new issue