commit d4d07f2b6f422044aa25cc39c3f8364b9558c645 Author: Evie Viau Date: Mon Aug 22 13:03:07 2022 -0400 Initial commit (port to 1.19) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..0908154 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,34 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +tab_width = 4 +trim_trailing_whitespace = true + +[*.gradle] +indent_style = tab + +[*.java] +indent_style = tab + +[*.json] +indent_style = space +indent_size = 2 + +[quilt.mod.json] +indent_style = tab +tab_width = 2 + +[*.toml] +indent_style = tab +tab_width = 2 + +[*.properties] +indent_style = space +indent_size = 2 + +[.editorconfig] +indent_style = space +indent_size = 4 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3819565 --- /dev/null +++ b/.gitignore @@ -0,0 +1,30 @@ +# Gradle +.gradle/ +build/ +out/ +classes/ + +# Quilt Loom +run/ + +# Eclipse +*.launch + +# IntelliJ Idea +.idea/ +*.iml +*.ipr +*.iws + +# Visual Studio Code +.settings/ +.vscode/ +bin/ +.classpath +.project + +# Eclipse JDT LS +workspace/ + +# macOS +*.DS_Store diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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 + + http://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. diff --git a/README.md b/README.md new file mode 100644 index 0000000..cd4dd30 --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +# imgui-quilt + +Quilt interface for [imgui-java](https://github.com/SpaiR/imgui-java), an updated version of [imgui-mc](https://github.com/mjwells2002/imgui-mc). + +## Quick Usage +Add `Renderables` to `ImGuiQuilt.renderstack` for them to be rendered. + +Use ImGui methods in `render()` of the `Renderables` interface. + +Example: +```java + ImGuiQuilt.renderstack.add(new Renderable() { + @Override + public String getName() { + return "Profiling Name"; + } + + @Override + public Theme getTheme() { + return null; + } + + @Override + public void render() { + ImGui.text("Example Text Element"); + } + }); +``` diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..33215d5 --- /dev/null +++ b/build.gradle @@ -0,0 +1,117 @@ +plugins { + id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'maven-publish' + alias(libs.plugins.quilt.loom) +} + +archivesBaseName = project.archives_base_name +version = project.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. +} + +// All the dependencies are declared at gradle/libs.version.toml and referenced with "libs." +// See https://docs.gradle.org/current/userguide/platforms.html for information on how version catalogs work. +dependencies { + minecraft libs.minecraft + mappings loom.layered { + addLayer quiltMappings.mappings("org.quiltmc:quilt-mappings:${libs.versions.quilt.mappings.get()}:v2") + // officialMojangMappings() // Uncomment if you want to use Mojang mappings as your primary mappings, falling back on QM for parameters and Javadocs + } + modImplementation libs.quilt.loader + + // QSL is not a complete API; You will need Quilted Fabric API to fill in the gaps. + // Quilted Fabric API will automatically pull in the correct QSL version. + modImplementation libs.quilted.fabric.api + // modImplementation libs.bundles.quilted.fabric.api // If you wish to use Fabric API's deprecated modules, you can replace the above line with this one + + implementation 'com.google.code.findbugs:jsr305:3.0.2' + + implementation "io.github.spair:imgui-java-binding:${project.imguiVersion}" + shadow "io.github.spair:imgui-java-binding:${project.imguiVersion}" + implementation "io.github.spair:imgui-java-lwjgl3:${project.imguiVersion}" + shadow "io.github.spair:imgui-java-lwjgl3:${project.imguiVersion}" + + implementation "io.github.spair:imgui-java-natives-windows:${project.imguiVersion}" + shadow "io.github.spair:imgui-java-natives-windows:${project.imguiVersion}" + implementation "io.github.spair:imgui-java-natives-linux:${project.imguiVersion}" + shadow "io.github.spair:imgui-java-natives-linux:${project.imguiVersion}" + implementation "io.github.spair:imgui-java-natives-macos:${project.imguiVersion}" + shadow "io.github.spair:imgui-java-natives-macos:${project.imguiVersion}" +} + +processResources { + inputs.property "version", version + + filesMatching('quilt.mod.json') { + expand "version": version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding = "UTF-8" + // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. + it.options.release = 17 +} + +java { + // Still required by IDEs such as Eclipse and Visual Studio Code + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + + // 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() + + // If this mod is going to be a library, then it should also generate Javadocs in order to aid with development. + // Uncomment this line to generate them. + // withJavadocJar() +} + +// If you plan to use a different file for the license, don't forget to change the file name here! +jar { + from("LICENSE") { + rename { "${it}_${archivesBaseName}" } + } +} + +shadowJar { + configurations = [project.configurations.shadow] + classifier 'shadow-dev' + dependencies { + exclude(dependency('org.lwjgl:lwjgl')) + exclude(dependency('org.lwjgl:lwjgl-glfw')) + exclude(dependency('org.lwjgl:lwjgl-opengl')) + } +} + +remapJar { + dependsOn shadowJar + mustRunAfter shadowJar + + inputFile = tasks.shadowJar.archiveFile +} + +// Configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + java.withSourcesJar() + } + } + + // 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..8f4fcc2 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,11 @@ +# Gradle Properties +org.gradle.jvmargs = -Xmx1G +org.gradle.parallel = true + +# Mod Properties +version = 1.0.0+1.19 +maven_group = gay.eviee +archives_base_name = imguiquilt + +# Dependencies are managed at gradle/libs.versions.toml +imguiVersion = 1.86.4 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..df58212 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,22 @@ +[versions] +# The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html +minecraft = "1.19.2" +quilt_mappings = "1.19.2+build.3" +quilt_loader = "0.17.1" + +quilted_fabric_api = "4.0.0-beta.7+0.59.0-1.19.2" + +[libraries] +minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } +quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_mappings" } +quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" } + +quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" } +quilted_fabric_api_deprecated = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated", version.ref = "quilted_fabric_api" } + +# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example". +[bundles] +quilted_fabric_api = ["quilted_fabric_api", "quilted_fabric_api_deprecated"] + +[plugins] +quilt_loom = { id = "org.quiltmc.loom", version = "0.12.+" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 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..ae04661 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..a69d9cb --- /dev/null +++ b/gradlew @@ -0,0 +1,240 @@ +#!/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 \ + "$@" + +# 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..f127cfd --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@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% 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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d969e34 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + maven { + name = 'Quilt' + url = 'https://maven.quiltmc.org/repository/release' + } + // Currently needed for Intermediary and other temporary dependencies + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/gay/eviee/imguiquilt/ImGuiQuilt.java b/src/main/java/gay/eviee/imguiquilt/ImGuiQuilt.java new file mode 100644 index 0000000..7347a8b --- /dev/null +++ b/src/main/java/gay/eviee/imguiquilt/ImGuiQuilt.java @@ -0,0 +1,34 @@ +package gay.eviee.imguiquilt; + +import gay.eviee.imguiquilt.interfaces.Renderable; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.quiltmc.loader.api.ModContainer; +import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer; +import java.util.ArrayList; + +@Environment(EnvType.CLIENT) +public class ImGuiQuilt implements ClientModInitializer { + public static final String MODID = "imgui-mc"; + public static final Logger LOGGER = LogManager.getLogger(MODID); + public static final MinecraftClient MINECRAFT = MinecraftClient.getInstance(); + public static ArrayList renderstack = new ArrayList<>(); + + @Override + public void onInitializeClient(ModContainer mod) { + + } + + public static Renderable pushRenderable(Renderable renderable) { + renderstack.add(renderable); + return renderable; + } + + public static Renderable pullRenderable(Renderable renderable) { + renderstack.remove(renderable); + return renderable; + } +} diff --git a/src/main/java/gay/eviee/imguiquilt/imgui/ImguiLoader.java b/src/main/java/gay/eviee/imguiquilt/imgui/ImguiLoader.java new file mode 100644 index 0000000..1171e93 --- /dev/null +++ b/src/main/java/gay/eviee/imguiquilt/imgui/ImguiLoader.java @@ -0,0 +1,97 @@ +package gay.eviee.imguiquilt.imgui; + +import gay.eviee.imguiquilt.ImGuiQuilt; +import gay.eviee.imguiquilt.interfaces.Renderable; +import imgui.*; +import imgui.flag.ImGuiCol; +import imgui.flag.ImGuiConfigFlags; +import imgui.gl3.ImGuiImplGl3; +import imgui.glfw.ImGuiImplGlfw; + +import static org.lwjgl.glfw.GLFW.*; + +public class ImguiLoader { + private static final ImGuiImplGlfw imGuiGlfw = new ImGuiImplGlfw(); + + private static final ImGuiImplGl3 imGuiGl3 = new ImGuiImplGl3(); + + private static long windowHandle; + + public static void onGlfwInit(long handle) { + initializeImGui(handle); + imGuiGlfw.init(handle,true); + imGuiGl3.init(); + windowHandle = handle; + } + + public static void onFrameRender() { + imGuiGlfw.newFrame(); + ImGui.newFrame(); + + //user render code + + for (Renderable renderable: ImGuiQuilt.renderstack) { + ImGuiQuilt.MINECRAFT.getProfiler().push("ImGui Render" + (renderable.getName() != null ? ("/" + renderable.getName()) : "")); + + if (renderable.getTheme() != null) { + renderable.getTheme().preRender(); + } + + renderable.render(); + + if (renderable.getTheme() != null) { + renderable.getTheme().postRender(); + } + + ImGuiQuilt.MINECRAFT.getProfiler().pop(); + } + + //end of user code + + ImGui.render(); + endFrame(windowHandle); + } + + private static void initializeImGui(long glHandle) { + ImGui.createContext(); + + final ImGuiIO io = ImGui.getIO(); + + io.setIniFilename(null); // We don't want to save .ini file + io.addConfigFlags(ImGuiConfigFlags.NavEnableKeyboard); // Enable Keyboard Controls + io.addConfigFlags(ImGuiConfigFlags.DockingEnable); // Enable Docking + io.addConfigFlags(ImGuiConfigFlags.ViewportsEnable); // Enable Multi-Viewport / Platform Windows + io.setConfigViewportsNoTaskBarIcon(true); + + final ImFontAtlas fontAtlas = io.getFonts(); + final ImFontConfig fontConfig = new ImFontConfig(); // Natively allocated object, should be explicitly destroyed + + fontConfig.setGlyphRanges(fontAtlas.getGlyphRangesCyrillic()); + + fontAtlas.addFontDefault(); + + fontConfig.setMergeMode(true); // When enabled, all fonts added with this config would be merged with the previously added font + fontConfig.setPixelSnapH(true); + + fontConfig.destroy(); + + if (io.hasConfigFlags(ImGuiConfigFlags.ViewportsEnable)) { + final ImGuiStyle style = ImGui.getStyle(); + style.setWindowRounding(0.0f); + style.setColor(ImGuiCol.WindowBg, ImGui.getColorU32(ImGuiCol.WindowBg, 1)); + } + } + + private static void endFrame(long windowPtr) { + // After Dear ImGui prepared a draw data, we use it in the LWJGL3 renderer. + // At that moment ImGui will be rendered to the current OpenGL context. + imGuiGl3.renderDrawData(ImGui.getDrawData()); + + if (ImGui.getIO().hasConfigFlags(ImGuiConfigFlags.ViewportsEnable)) { + final long backupWindowPtr = glfwGetCurrentContext(); + ImGui.updatePlatformWindows(); + ImGui.renderPlatformWindowsDefault(); + glfwMakeContextCurrent(backupWindowPtr); + } + } +} diff --git a/src/main/java/gay/eviee/imguiquilt/interfaces/Renderable.java b/src/main/java/gay/eviee/imguiquilt/interfaces/Renderable.java new file mode 100644 index 0000000..dd56680 --- /dev/null +++ b/src/main/java/gay/eviee/imguiquilt/interfaces/Renderable.java @@ -0,0 +1,9 @@ +package gay.eviee.imguiquilt.interfaces; + +public interface Renderable { + String getName(); + + Theme getTheme(); + + void render(); +} diff --git a/src/main/java/gay/eviee/imguiquilt/interfaces/Theme.java b/src/main/java/gay/eviee/imguiquilt/interfaces/Theme.java new file mode 100644 index 0000000..59778a3 --- /dev/null +++ b/src/main/java/gay/eviee/imguiquilt/interfaces/Theme.java @@ -0,0 +1,6 @@ +package gay.eviee.imguiquilt.interfaces; + +public interface Theme { + void preRender(); + void postRender(); +} diff --git a/src/main/java/gay/eviee/imguiquilt/mixin/GLFWInitMixin.java b/src/main/java/gay/eviee/imguiquilt/mixin/GLFWInitMixin.java new file mode 100644 index 0000000..39a0874 --- /dev/null +++ b/src/main/java/gay/eviee/imguiquilt/mixin/GLFWInitMixin.java @@ -0,0 +1,28 @@ +package gay.eviee.imguiquilt.mixin; + +import com.mojang.blaze3d.glfw.Window; +import com.mojang.blaze3d.glfw.WindowEventHandler; +import com.mojang.blaze3d.glfw.WindowSettings; +import com.mojang.blaze3d.glfw.monitor.MonitorTracker; +import gay.eviee.imguiquilt.ImGuiQuilt; +import gay.eviee.imguiquilt.imgui.ImguiLoader; +import gay.eviee.imguiquilt.interfaces.Renderable; +import gay.eviee.imguiquilt.interfaces.Theme; +import imgui.ImGui; +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(Window.class) +public class GLFWInitMixin { + @Shadow + @Final private long handle; + + @Inject(at = @At("TAIL"), method = "", remap = false) + private void onGLFWInit(WindowEventHandler windowEventHandler, MonitorTracker monitorTracker, WindowSettings windowSettings, String string, String string2, CallbackInfo ci){ + ImguiLoader.onGlfwInit(handle); + } +} diff --git a/src/main/java/gay/eviee/imguiquilt/mixin/TailRenderMixin.java b/src/main/java/gay/eviee/imguiquilt/mixin/TailRenderMixin.java new file mode 100644 index 0000000..9ff9d4c --- /dev/null +++ b/src/main/java/gay/eviee/imguiquilt/mixin/TailRenderMixin.java @@ -0,0 +1,19 @@ +package gay.eviee.imguiquilt.mixin; + +import com.mojang.blaze3d.systems.RenderSystem; +import gay.eviee.imguiquilt.ImGuiQuilt; +import gay.eviee.imguiquilt.imgui.ImguiLoader; +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(value = RenderSystem.class, remap = false) +public class TailRenderMixin { + @Inject(at = @At("HEAD"), method="flipFrame") + private static void runTickTail(CallbackInfo ci) { + ImGuiQuilt.MINECRAFT.getProfiler().push("ImGui Render"); + ImguiLoader.onFrameRender(); + ImGuiQuilt.MINECRAFT.getProfiler().pop(); + } +} diff --git a/src/main/resources/assets/imguiquilt/icon.png b/src/main/resources/assets/imguiquilt/icon.png new file mode 100644 index 0000000..da48188 Binary files /dev/null and b/src/main/resources/assets/imguiquilt/icon.png differ diff --git a/src/main/resources/imguiquilt.mixins.json b/src/main/resources/imguiquilt.mixins.json new file mode 100644 index 0000000..14cd1f4 --- /dev/null +++ b/src/main/resources/imguiquilt.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "gay.eviee.imguiquilt.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [], + "client": [ + "GLFWInitMixin", + "TailRenderMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json new file mode 100644 index 0000000..c6e79ec --- /dev/null +++ b/src/main/resources/quilt.mod.json @@ -0,0 +1,45 @@ +{ + "schema_version": 1, + "quilt_loader": { + "group": "gay.eviee", + "id": "imguiquilt", + "version": "${version}", + "license": "Apache-2.0", + "metadata": { + "name": "ImGui for Quilt", + "description": "An interface for ImGui for Quilt.", + "contributors": { + "Evie Viau": "Author" + }, + "contact": { + "sources": "https://git.sr.ht/~eviee/imgui-quilt" + }, + "icon": "assets/imguiquilt/icon.png" + }, + "intermediate_mappings": "net.fabricmc:intermediary", + "entrypoints": { + "client_init": "gay.eviee.imguiquilt.ImGuiQuilt" + }, + "depends": [ + { + "id": "quilt_loader", + "versions": ">=0.17.0-" + }, + { + "id": "quilted_fabric_api", + "versions": ">=4.0.0-" + }, + { + "id": "minecraft", + "versions": ">=1.19.2" + } + ] + }, + "mixin": "imguiquilt.mixins.json", + "minecraft": { + "environment": "client" + }, + "modmenu": { + "badges": ["library"] + } +}