commit 52e9cd679b8a4540e525512c1d56a3b9a27d176c Author: c0repwn3r Date: Sat Dec 3 18:38:53 2022 -0500 [flight] Flight 1.0.0 with vanilla bypass diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e2fa68a --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,40 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [pull_request, push] + +jobs: + build: + strategy: + matrix: + # Use these Java versions + java: [ + 17, # Current Java LTS & minimum supported by Minecraft + ] + # and run on both Linux and Windows + os: [ubuntu-22.04, windows-2022] + runs-on: ${{ matrix.os }} + steps: + - name: checkout repository + uses: actions/checkout@v3 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - name: make gradle wrapper executable + if: ${{ runner.os != 'Windows' }} + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS + uses: actions/upload-artifact@v3 + with: + name: Artifacts + path: build/libs/ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..b0d64d9 --- /dev/null +++ b/build.gradle @@ -0,0 +1,75 @@ +plugins { + id 'fabric-loom' version '1.0-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 + +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 { + // 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}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. + + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. + it.options.release = 17 +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}"} + } +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // 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. + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..1808e1b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# Fabric Properties + # check these on https://fabricmc.net/develop + minecraft_version=1.19.2 + yarn_mappings=1.19.2+build.28 + loader_version=0.14.10 + +# Mod Properties + mod_version = 1.0.0 + maven_group = dev.coredoes + archives_base_name = clientmod + +# Dependencies + fabric_version=0.67.0+1.19.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..943f0cb Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..f398c33 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..65dcd68 --- /dev/null +++ b/gradlew @@ -0,0 +1,244 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# 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*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + 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 \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/remappedSrc/net/fabricmc/example/ExampleMod.java b/remappedSrc/net/fabricmc/example/ExampleMod.java new file mode 100644 index 0000000..a964189 --- /dev/null +++ b/remappedSrc/net/fabricmc/example/ExampleMod.java @@ -0,0 +1,21 @@ +package net.fabricmc.example; + +import net.fabricmc.api.ModInitializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ExampleMod implements ModInitializer { + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Logger LOGGER = LoggerFactory.getLogger("modid"); + + @Override + public void onInitialize() { + // This code runs as soon as Minecraft is in a mod-load-ready state. + // However, some things (like resources) may still be uninitialized. + // Proceed with mild caution. + + LOGGER.info("Hello Fabric world!"); + } +} diff --git a/remappedSrc/net/fabricmc/example/mixin/ExampleMixin.java b/remappedSrc/net/fabricmc/example/mixin/ExampleMixin.java new file mode 100644 index 0000000..356cb38 --- /dev/null +++ b/remappedSrc/net/fabricmc/example/mixin/ExampleMixin.java @@ -0,0 +1,16 @@ +package net.fabricmc.example.mixin; + +import net.fabricmc.example.ExampleMod; +import net.minecraft.client.gui.screen.TitleScreen; +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(TitleScreen.class) +public class ExampleMixin { + @Inject(at = @At("HEAD"), method = "init()V") + private void init(CallbackInfo info) { + ExampleMod.LOGGER.info("This line is printed by an example mod mixin!"); + } +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..b02216b --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} diff --git a/src/main/java/dev/coredoes/clientmod/ClientMod.java b/src/main/java/dev/coredoes/clientmod/ClientMod.java new file mode 100644 index 0000000..56b4e50 --- /dev/null +++ b/src/main/java/dev/coredoes/clientmod/ClientMod.java @@ -0,0 +1,23 @@ +package dev.coredoes.clientmod; + +import dev.coredoes.clientmod.modules.Flight; +import dev.coredoes.clientmod.modules.ModuleManager; +import net.fabricmc.api.ModInitializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ClientMod implements ModInitializer { + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Logger LOGGER = LoggerFactory.getLogger("coreclientmod"); + + public static ModuleManager moduleManager = new ModuleManager(); + + @Override + public void onInitialize() { + LOGGER.info("Loaded ClientMod; initializing modules"); + moduleManager.registerModule(new Flight()); + moduleManager.registerEvents(); + } +} diff --git a/src/main/java/dev/coredoes/clientmod/mixin/GameMenuScreenMixin.java b/src/main/java/dev/coredoes/clientmod/mixin/GameMenuScreenMixin.java new file mode 100644 index 0000000..8b06820 --- /dev/null +++ b/src/main/java/dev/coredoes/clientmod/mixin/GameMenuScreenMixin.java @@ -0,0 +1,28 @@ +package dev.coredoes.clientmod.mixin; + +import dev.coredoes.clientmod.ClientMod; +import dev.coredoes.clientmod.modmenu.ModMenu; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.GameMenuScreen; +import net.minecraft.client.gui.widget.ButtonWidget; + +import net.minecraft.text.Text; +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(GameMenuScreen.class) +public class GameMenuScreenMixin extends Screen { + public GameMenuScreenMixin(Text title) { + super(title); + } + + @Inject(at = @At("TAIL"), method = "initWidgets()V") + private void initWidgets(CallbackInfo ci) { + this.addDrawableChild(new ButtonWidget(5, 5, 70, 20, Text.of("ClientMod"), (button) -> { + // show the menu, but not yet + this.client.setScreen(new ModMenu(this, this.client.options)); + })); + } +} diff --git a/src/main/java/dev/coredoes/clientmod/modmenu/ModMenu.java b/src/main/java/dev/coredoes/clientmod/modmenu/ModMenu.java new file mode 100644 index 0000000..0241917 --- /dev/null +++ b/src/main/java/dev/coredoes/clientmod/modmenu/ModMenu.java @@ -0,0 +1,43 @@ +package dev.coredoes.clientmod.modmenu; + +import dev.coredoes.clientmod.ClientMod; +import dev.coredoes.clientmod.modules.Module; +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.option.GameOptions; +import net.minecraft.screen.ScreenTexts; +import net.minecraft.text.Text; + +import java.util.ArrayList; + +public class ModMenu extends Screen { + private final Screen parent; + private final GameOptions settings; + + private int lastHeight = 0; + + public ModMenu(Screen parent, GameOptions gameOptions) { + super(Text.of("CoreClientMod")); + this.parent = parent; + this.settings = gameOptions; + this.lastHeight = 0; + } + + protected void init() { + this.addDrawableChild(new ButtonWidget(5, this.height - 25, 40, 20, ScreenTexts.BACK, (button) -> { + this.client.setScreen(this.parent); + })); + + for (Module module : ClientMod.moduleManager.getModules().values()) { + Screen moduleUI = module.getUI(this, this.settings); + if (moduleUI != null) { + this.addDrawableChild(new ButtonWidget(5, lastHeight + 5, 40, 20, Text.of(module.getId()), (button) -> { + this.client.setScreen(moduleUI); + })); + this.lastHeight += 5; + } + } + } +} diff --git a/src/main/java/dev/coredoes/clientmod/modules/Flight.java b/src/main/java/dev/coredoes/clientmod/modules/Flight.java new file mode 100644 index 0000000..14936df --- /dev/null +++ b/src/main/java/dev/coredoes/clientmod/modules/Flight.java @@ -0,0 +1,102 @@ +package dev.coredoes.clientmod.modules; + +import dev.coredoes.clientmod.ClientMod; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.option.GameOptions; +import net.minecraft.entity.Entity; +import net.minecraft.screen.ScreenTexts; +import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; + +public class Flight implements Module { + + protected boolean isEnabled = false; + protected boolean isVanillaBypassEnabled = true; + + protected int vanillaBypassTickCounter; + protected int vanillaBypassTickResetCounter = 0; + protected final int vanillaBypassResetTimeout = 7; + + @Override + public void startTick(MinecraftClient client) { + Module.super.startTick(client); + + ClientMod.LOGGER.info(String.valueOf(vanillaBypassTickCounter)); + + if (!isEnabled) return; + + if (client.player != null) { + if (vanillaBypassTickCounter > 60) { + Vec3d velocity = client.player.getVelocity(); + client.player.setVelocity(new Vec3d(velocity.getX(), velocity.getY() - 0.4, velocity.getZ())); + vanillaBypassTickCounter = -vanillaBypassResetTimeout; + } + if (vanillaBypassTickCounter < 0 && isVanillaBypassEnabled) { + vanillaBypassTickCounter++; + return; + } + + if (client.player.input.jumping && !client.player.isOnGround()) { + vanillaBypassTickResetCounter = 0; + vanillaBypassTickCounter++; + Vec3d velocity = client.player.getVelocity(); + + client.player.setVelocity(new Vec3d(velocity.getX(), velocity.getY() + 0.1, velocity.getZ())); + } else { + vanillaBypassTickResetCounter++; + if (vanillaBypassTickResetCounter > vanillaBypassResetTimeout) { + vanillaBypassTickCounter = 0; + vanillaBypassTickResetCounter = 0; + } + } + } + + + } + + @Override + public String getId() { + return "Flight"; + } + + @Override + public String getVersion() { + return "1.0.0"; + } + + @Override + public Screen getUI(Screen parent, GameOptions options) { + return new FlightUI(parent, options, this); + } + class FlightUI extends Screen { + private final Screen parent; + private final GameOptions settings; + private Flight parentModule; + + public FlightUI(Screen parent, GameOptions gameOptions, Flight parentModule) { + super(Text.of("FlightModule")); + this.parent = parent; + this.settings = gameOptions; + this.parentModule = parentModule; + } + + protected void init() { + this.addDrawableChild(new ButtonWidget(5, 5, 70, 20, Text.of("Enabled: " + (this.parentModule.isEnabled ? "yes" : "no")), (button) -> { + this.parentModule.isEnabled = !this.parentModule.isEnabled; + button.setMessage(Text.of("Enabled: " + (this.parentModule.isEnabled ? "yes" : "no"))); + })); + + this.addDrawableChild(new ButtonWidget(5, 30, 170, 20, Text.of("Vanilla Bypass Enabled: " + (this.parentModule.isVanillaBypassEnabled ? "yes" : "no")), (button) -> { + this.parentModule.isVanillaBypassEnabled = !this.parentModule.isVanillaBypassEnabled; + button.setMessage(Text.of("Vanilla Bypass Enabled: " + (this.parentModule.isVanillaBypassEnabled ? "yes" : "no"))); + })); + + this.addDrawableChild(new ButtonWidget(5, this.height - 25, 40, 20, ScreenTexts.BACK, (button) -> { + this.client.setScreen(this.parent); + })); + } + } +} diff --git a/src/main/java/dev/coredoes/clientmod/modules/Module.java b/src/main/java/dev/coredoes/clientmod/modules/Module.java new file mode 100644 index 0000000..94e44bd --- /dev/null +++ b/src/main/java/dev/coredoes/clientmod/modules/Module.java @@ -0,0 +1,27 @@ +package dev.coredoes.clientmod.modules; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.option.GameOptions; + +import java.util.ArrayList; + +public interface Module { + // Events + default void preRegister() {} + default void postRegister() {} + default void preUnregister() {} + default void postUnregister() {} + + default void startTick(MinecraftClient client) {} + default void endTick(MinecraftClient client) {} + + // Manager stuff + String getId(); + String getVersion(); + + default Screen getUI(Screen parent, GameOptions options) { return null; } +} diff --git a/src/main/java/dev/coredoes/clientmod/modules/ModuleManager.java b/src/main/java/dev/coredoes/clientmod/modules/ModuleManager.java new file mode 100644 index 0000000..52bb77f --- /dev/null +++ b/src/main/java/dev/coredoes/clientmod/modules/ModuleManager.java @@ -0,0 +1,118 @@ +package dev.coredoes.clientmod.modules; + +import dev.coredoes.clientmod.ClientMod; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.option.GameOptions; +import net.minecraft.screen.ScreenTexts; +import net.minecraft.text.Text; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +public class ModuleManager { + protected HashMap modules; + + public ModuleManager() { + this.modules = new HashMap(); + ClientMod.LOGGER.info("ModuleManager initialized"); + } + + /** PUBLIC API **/ + public void registerModule(Module module) { + if (module == null) { + ClientMod.LOGGER.error("Asked to register a null module; ignoring request"); + } + ClientMod.LOGGER.info(String.format("registering module %s-%s", module.getId(), module.getVersion())); + // is the module already registered? + if (isModuleregistered(module)) { + ClientMod.LOGGER.info(String.format("Module %s-%s is already registered, use ModuleManager#reregisterModule() to reregister it", module.getId(), module.getVersion())); + return; + } + // register the module + _registerModuleRoutine(module); + } + public void unregisterModule(Module module) { + if (module == null) { + ClientMod.LOGGER.error("Asked to unregister a null module; ignoring request"); + } + ClientMod.LOGGER.info(String.format("Unregistering module %s-%s", module.getId(), module.getVersion())); + // is this module registered at all? + if (!isModuleregistered(module)) { + ClientMod.LOGGER.info(String.format("Module %s-%s is not registered, use ModuleManager#registerModule() to register it", module.getId(), module.getVersion())); + } + // unregister the module + _unregisterModuleRoutine(module); + } + public void unregisterModule(String moduleId) { + unregisterModule(getModuleById(moduleId)); + } + public void reRegisterModule(Module module) { + ClientMod.LOGGER.info(String.format("Reregistering module %s-%s", module.getId(), module.getVersion())); + unregisterModule(module); + registerModule(module); + } + public void reRegisterModule(String moduleId) { + reRegisterModule(getModuleById(moduleId)); + } + public void reRegisterModules() { + for (Module module : this.modules.values()) { + reRegisterModule(module); + } + } + + /** MODULE register CHECKS **/ + + public boolean isModuleregistered(Module module) { + return isModuleregistered(module.getId()) || this.modules.containsValue(module); + } + public boolean isModuleregistered(String moduleId) { + return this.modules.containsKey(moduleId); + } + + /** FETCHERS **/ + public Module getModuleById(String moduleId) { + for (Map.Entry entry : this.modules.entrySet()) { + if (Objects.equals(entry.getKey(), moduleId)) { + return entry.getValue(); + } + } + return null; + } + + public HashMap getModules() { + return this.modules; + } + + /** PRIVATE ROUTINES **/ + + private void _registerModuleRoutine(Module module) { + module.preRegister(); + this.modules.put(module.getId(), module); + module.postRegister(); + } + private void _unregisterModuleRoutine(Module module) { + module.preUnregister(); + this.modules.remove(module.getId()); + module.postUnregister(); + } + + /** EVENTS! **/ + public void registerEvents() { + ClientTickEvents.START_CLIENT_TICK.register(this::startTick); + ClientTickEvents.END_CLIENT_TICK.register(this::endTick); + } + + public void startTick(MinecraftClient client) { + for (Module module : this.modules.values()) { module.startTick(client); } + } + public void endTick(MinecraftClient client) { + for (Module module : this.modules.values()) { + module.endTick(client); + } + } +} \ No newline at end of file diff --git a/src/main/java/dev/coredoes/clientmod/modules/NoFall.java b/src/main/java/dev/coredoes/clientmod/modules/NoFall.java new file mode 100644 index 0000000..2fa5fc1 --- /dev/null +++ b/src/main/java/dev/coredoes/clientmod/modules/NoFall.java @@ -0,0 +1,27 @@ +package dev.coredoes.clientmod.modules; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.option.GameOptions; + +public class NoFall implements Module { + @Override + public void startTick(MinecraftClient client) { + Module.super.startTick(client); + } + + @Override + public String getId() { + return "NoFall"; + } + + @Override + public String getVersion() { + return "1.0.0"; + } + + @Override + public Screen getUI(Screen parent, GameOptions options) { + return Module.super.getUI(parent, options); + } +} diff --git a/src/main/resources/assets/coreclientmod/icon.png b/src/main/resources/assets/coreclientmod/icon.png new file mode 100644 index 0000000..047b91f Binary files /dev/null and b/src/main/resources/assets/coreclientmod/icon.png differ diff --git a/src/main/resources/coreclientmod.mixins.json b/src/main/resources/coreclientmod.mixins.json new file mode 100644 index 0000000..5327577 --- /dev/null +++ b/src/main/resources/coreclientmod.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "dev.coredoes.clientmod.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + "GameMenuScreenMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..3565f09 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,35 @@ +{ + "schemaVersion": 1, + "id": "coreclientmod", + "version": "${version}", + + "name": "ClientMod", + "description": "A totally legitimate client mod for fabric", + "authors": [ + "c0repwn3r" + ], + "contact": { + "homepage": "https://coredoes.dev", + "sources": "https://git.coredoes.dev/c0repwn3r/clientmod" + }, + + "license": "CC0-1.0", + "icon": "assets/coreclientmod/icon.png", + + "environment": "*", + "entrypoints": { + "main": [ + "dev.coredoes.clientmod.ClientMod" + ] + }, + "mixins": [ + "coreclientmod.mixins.json" + ], + + "depends": { + "fabricloader": ">=0.14.10", + "fabric-api": "*", + "minecraft": "~1.19", + "java": ">=17" + } +}