commit 4ace4b3ba5abf064659fb2a59a7d0f4774ae4de3 Author: LambdAurora Date: Tue Nov 26 16:32:07 2019 +0100 :tada: Initial commit. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cfe83db --- /dev/null +++ b/.gitignore @@ -0,0 +1,67 @@ +# +# LambdAurora's ignore file +# +# v0.11 + +# JetBrains +.idea/ +*.iml +## Intellij IDEA +out/ +## CLion +cmake-build-debug*/ +cmake-build-release*/ +## Eclipse +eclipse +*.launch +.settings +.metadata +.classpath +.project +## Visual Studio +.vs/ +CMakeSettings.json + +# Build system +## Cargo +Cargo.lock +## CMake +CMakeCache.txt +CMakeFiles/ +## Gradle +.gradle/ +## Node.JS +node_modules/ + +# Editors +## VSCode +.vscode/ + +# Logging +logs/ + +# Languages +## Java +classes/ +## Python +__pycache__/ +## Rust +**/*.rs.bk + +# OS +## Windows +desktop.ini + +# File types +*.dll +*.so +*.dylib +*.lib +lib*.a + +# Common +bin/ +build/ +dist/ +run/ +target/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1041c79 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright © 2019 LambdAurora + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..96168f6 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# LambdaControls + +A Fabric Minecraft mod which add better controls. +It allows the use of a controller or the touchscreen. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..1f805ac --- /dev/null +++ b/build.gradle @@ -0,0 +1,99 @@ +plugins { + id 'fabric-loom' version '0.2.6-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +minecraft { +} + +repositories { + mavenLocal() + mavenCentral() + maven { url = 'https://aperlambda.github.io/maven' } + maven { + name = 'CottonMC' + url = 'http://server.bbkr.space:8081/artifactory/libs-snapshot' + } +} + +dependencies { + //to change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}" + modCompile "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modCompile "io.github.cottonmc:cotton-client-commands:0.4.2+1.14.3-SNAPSHOT" + + implementation "org.jetbrains:annotations:17.0.0" + implementation "org.aperlambda:lambdajcommon:1.7.2" + implementation "com.electronwill.night-config:core:3.5.3" + implementation "com.electronwill.night-config:toml:3.5.3" + include "org.jetbrains:annotations:17.0.0" + include "org.aperlambda:lambdajcommon:1.7.2" + include "com.electronwill.night-config:core:3.5.3" + include "com.electronwill.night-config:toml:3.5.3" + + // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. + // You may need to force-disable transitiveness on them. +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = "sources" + from sourceSets.main.allSource +} + +jar { + from "LICENSE" +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + mavenLocal() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5cb7827 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://fabricmc.net/use + minecraft_version=1.14.4 + yarn_mappings=1.14.4+build.15:v2 + loader_version=0.7.1+build.173 + +# Mod Properties + mod_version = 1.0.0-SNAPSHOT + maven_group = me.lambdaurora + archives_base_name = lambdacontrols + +# Dependencies + # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api + fabric_version=0.4.1+build.245-1.14 + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf 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..03d4db9 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Oct 28 18:23:18 CET 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..8e25e6c --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@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 Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5b60df3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java b/src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java new file mode 100644 index 0000000..fc8686d --- /dev/null +++ b/src/main/java/me/lambdaurora/lambdacontrols/ControlsMode.java @@ -0,0 +1,51 @@ +/* + * Copyright © 2019 LambdAurora + * + * This file is part of LambdaControls. + * + * Licensed under the MIT license. For more information, + * see the LICENSE file. + */ + +package me.lambdaurora.lambdacontrols; + +import net.minecraft.client.resource.language.I18n; +import org.aperlambda.lambdacommon.utils.Nameable; +import org.jetbrains.annotations.NotNull; + +/** + * Represents the controls mode. + */ +public enum ControlsMode implements Nameable +{ + ; + + /** + * Returns the next controls mode available. + * + * @return The next available controls mode. + */ + public ControlsMode next() + { + ControlsMode[] v = values(); + if (v.length == this.ordinal() + 1) + return v[0]; + return v[this.ordinal() + 1]; + } + + /** + * Gets the translated name of this controls mode. + * + * @return The translated name of this controls mode. + */ + public String get_translated_name() + { + return I18n.translate("lambdacontrols.controls_mode." + this.get_name()); + } + + @Override + public @NotNull String get_name() + { + return this.name().toLowerCase(); + } +} diff --git a/src/main/java/me/lambdaurora/lambdacontrols/LambdaControls.java b/src/main/java/me/lambdaurora/lambdacontrols/LambdaControls.java new file mode 100644 index 0000000..efd75ff --- /dev/null +++ b/src/main/java/me/lambdaurora/lambdacontrols/LambdaControls.java @@ -0,0 +1,93 @@ +/* + * Copyright © 2019 LambdAurora + * + * This file is part of LambdaControls. + * + * Licensed under the MIT license. For more information, + * see the LICENSE file. + */ + +package me.lambdaurora.lambdacontrols; + +import me.lambdaurora.lambdacontrols.util.LambdaKeyBinding; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.event.client.ClientTickCallback; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.options.KeyBinding; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.lwjgl.glfw.GLFW; + +import java.nio.ByteBuffer; + +import static org.lwjgl.glfw.GLFW.GLFW_JOYSTICK_1; + + +/** + * Represents the LambdaControls mod. + */ +public class LambdaControls implements ClientModInitializer +{ + private static LambdaControls INSTANCE; + public final Logger logger = LogManager.getLogger("LambdaControls"); + public final LambdaControlsConfig config = new LambdaControlsConfig(this); + private int cid = GLFW_JOYSTICK_1; + + @Override + public void onInitializeClient() + { + INSTANCE = this; + this.log("Initializing LambdaControls..."); + this.config.load(); + } + + /** + * This method is called when Minecraft is initializing. + */ + public void on_mc_init() + { + GLFW.glfwSetJoystickCallback((jid, event) -> { + if (event == GLFW.GLFW_CONNECTED) { + this.log("CONNECTED " + jid); + cid = jid; + } + }); + } + + /** + * This method is called every Minecraft tick. + * + * @param client The client instance. + */ + public void on_tick(MinecraftClient client) + { + ByteBuffer buffer = GLFW.glfwGetJoystickButtons(GLFW.GLFW_JOYSTICK_3); + if (buffer == null) + return; + //this.log(String.valueOf(buffer.get())); + if (buffer.get() == (byte) 1) { + this.log("uwu"); + ((LambdaKeyBinding) client.options.keyJump).lambdacontrols_press(); + } + } + + /** + * Prints a message to the terminal. + * + * @param info The message to print. + */ + public void log(String info) + { + this.logger.info("[LambdaControls] " + info); + } + + /** + * Gets the LambdaControls instance. + * + * @return The LambdaControls instance. + */ + public static LambdaControls get() + { + return INSTANCE; + } +} diff --git a/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConfig.java b/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConfig.java new file mode 100644 index 0000000..5ddc9c9 --- /dev/null +++ b/src/main/java/me/lambdaurora/lambdacontrols/LambdaControlsConfig.java @@ -0,0 +1,39 @@ +/* + * Copyright © 2019 LambdAurora + * + * This file is part of LambdaControls. + * + * Licensed under the MIT license. For more information, + * see the LICENSE file. + */ + +package me.lambdaurora.lambdacontrols; + +import com.electronwill.nightconfig.core.file.FileConfig; +import org.jetbrains.annotations.NotNull; + +/** + * Represents LambdaControls configuration. + */ +public class LambdaControlsConfig +{ + private final FileConfig config = FileConfig.builder("config/lambdacontrols.toml").concurrent().defaultResource("/config.toml").build(); + private final LambdaControls mod; + + public LambdaControlsConfig(@NotNull LambdaControls mod) + { + this.mod = mod; + } + + public void load() + { + this.config.load(); + this.mod.log("Configuration loaded."); + } + + public void save() + { + this.config.save(); + this.mod.log("Configuration saved."); + } +} diff --git a/src/main/java/me/lambdaurora/lambdacontrols/gui/LambdaControlsHud.java b/src/main/java/me/lambdaurora/lambdacontrols/gui/LambdaControlsHud.java new file mode 100644 index 0000000..79947e9 --- /dev/null +++ b/src/main/java/me/lambdaurora/lambdacontrols/gui/LambdaControlsHud.java @@ -0,0 +1,33 @@ +/* + * Copyright © 2019 LambdAurora + * + * This file is part of LambdaControls. + * + * Licensed under the MIT license. For more information, + * see the LICENSE file. + */ + +package me.lambdaurora.lambdacontrols.gui; + +import me.lambdaurora.lambdacontrols.LambdaControls; +import net.minecraft.client.MinecraftClient; +import org.jetbrains.annotations.NotNull; + +/** + * Represents the LambdaControls HUD. + */ +public class LambdaControlsHud +{ + private final MinecraftClient client; + private final LambdaControls mod; + + public LambdaControlsHud(@NotNull MinecraftClient client, @NotNull LambdaControls mod) + { + this.client = client; + this.mod = mod; + } + + public void render() { + + } +} diff --git a/src/main/java/me/lambdaurora/lambdacontrols/mixin/KeyBindingMixin.java b/src/main/java/me/lambdaurora/lambdacontrols/mixin/KeyBindingMixin.java new file mode 100644 index 0000000..90fd318 --- /dev/null +++ b/src/main/java/me/lambdaurora/lambdacontrols/mixin/KeyBindingMixin.java @@ -0,0 +1,37 @@ +/* + * Copyright © 2019 LambdAurora + * + * This file is part of LambdaControls. + * + * Licensed under the MIT license. For more information, + * see the LICENSE file. + */ + +package me.lambdaurora.lambdacontrols.mixin; + +import me.lambdaurora.lambdacontrols.util.LambdaKeyBinding; +import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.util.InputUtil; +import org.jetbrains.annotations.NotNull; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(KeyBinding.class) +public class KeyBindingMixin implements LambdaKeyBinding +{ + @Shadow private InputUtil.KeyCode keyCode; + + @Shadow private int timesPressed; + + @Override + public @NotNull InputUtil.KeyCode get_key_code() + { + return this.keyCode; + } + + @Override + public void lambdacontrols_press() + { + ++this.timesPressed; + } +} diff --git a/src/main/java/me/lambdaurora/lambdacontrols/mixin/MinecraftClientMixin.java b/src/main/java/me/lambdaurora/lambdacontrols/mixin/MinecraftClientMixin.java new file mode 100644 index 0000000..17c8c25 --- /dev/null +++ b/src/main/java/me/lambdaurora/lambdacontrols/mixin/MinecraftClientMixin.java @@ -0,0 +1,33 @@ +/* + * Copyright © 2019 LambdAurora + * + * This file is part of LambdaControls. + * + * Licensed under the MIT license. For more information, + * see the LICENSE file. + */ + +package me.lambdaurora.lambdacontrols.mixin; + +import me.lambdaurora.lambdacontrols.LambdaControls; +import net.minecraft.client.MinecraftClient; +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(MinecraftClient.class) +public class MinecraftClientMixin +{ + @Inject(method = "init", at = @At("RETURN")) + private void on_init(CallbackInfo ci) + { + LambdaControls.get().on_mc_init(); + } + + @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GLX;pollEvents()V")) + private void on_poll_events(boolean fullRender, CallbackInfo ci) + { + LambdaControls.get().on_tick((MinecraftClient) (Object) this); + } +} diff --git a/src/main/java/me/lambdaurora/lambdacontrols/util/LambdaKeyBinding.java b/src/main/java/me/lambdaurora/lambdacontrols/util/LambdaKeyBinding.java new file mode 100644 index 0000000..dea0cee --- /dev/null +++ b/src/main/java/me/lambdaurora/lambdacontrols/util/LambdaKeyBinding.java @@ -0,0 +1,23 @@ +/* + * Copyright © 2019 LambdAurora + * + * This file is part of LambdaControls. + * + * Licensed under the MIT license. For more information, + * see the LICENSE file. + */ + +package me.lambdaurora.lambdacontrols.util; + +import net.minecraft.client.util.InputUtil; +import org.jetbrains.annotations.NotNull; + +/** + * Represents a Minecraft keybinding with extra access. + */ +public interface LambdaKeyBinding +{ + @NotNull InputUtil.KeyCode get_key_code(); + + void lambdacontrols_press(); +} diff --git a/src/main/resources/config.toml b/src/main/resources/config.toml new file mode 100644 index 0000000..d1059b2 --- /dev/null +++ b/src/main/resources/config.toml @@ -0,0 +1,15 @@ +# LambdaControls configuration. + +# The controls mode. Available modes: default, controller, touchscreen +controls = "default" + +[hud] +# Dertermines which side is used depending of the main hand. +side = "right_handed" + +# Colors +[colors] +normal = "#ffffffff" +pressed = "#ffa000ff" +background_normal = "#000000aa" +background_pressed = "#555555aa" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..e13dedb --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,37 @@ +{ + "schemaVersion": 1, + "id": "lambdacontrols", + "name": "LambdaControls", + "version": "${version}", + "description": "Add better controls: controller and touchscreen support.", + "authors": [ + "LambdAurora" + ], + "contact": { + "homepage": "https://www.curseforge.com/minecraft/mc-mods/lambdacontrols", + "sources": "https://github.com/LambdAurora/LambdaControls.git", + "issues": "https://github.com/LambdAurora/LambdaControls/issues" + }, + "license": "MIT", + "icon": "assets/aurora_keystrokes/icon.png", + "environment": "client", + "entrypoints": { + "client": [ + "me.lambdaurora.lambdacontrols.LambdaControls" + ] + }, + "mixins": [ + "lambdacontrols.mixins.json" + ], + "depends": { + "fabricloader": ">=0.4.0", + "fabric": "*", + "minecraft": "1.14.x" + }, + "suggests": { + "flamingo": "*" + }, + "custom": { + "modmenu:clientsideOnly": true + } +} diff --git a/src/main/resources/lambdacontrols.mixins.json b/src/main/resources/lambdacontrols.mixins.json new file mode 100644 index 0000000..807bad4 --- /dev/null +++ b/src/main/resources/lambdacontrols.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "me.lambdaurora.lambdacontrols.mixin", + "compatibilityLevel": "JAVA_8", + "client": [ + "MinecraftClientMixin", + "KeyBindingMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file