diff --git a/.gitignore b/.gitignore index a95f6f0..0ba30f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,10 @@ +.gradle +.gradlew/ +run run/ +run/* build/ +.idea # Compiled class file *.class diff --git a/.gradle/8.8/checksums/checksums.lock b/.gradle/8.8/checksums/checksums.lock index eccf1de..771f604 100644 Binary files a/.gradle/8.8/checksums/checksums.lock and b/.gradle/8.8/checksums/checksums.lock differ diff --git a/.gradle/8.8/checksums/md5-checksums.bin b/.gradle/8.8/checksums/md5-checksums.bin index ed02684..b48c9e0 100644 Binary files a/.gradle/8.8/checksums/md5-checksums.bin and b/.gradle/8.8/checksums/md5-checksums.bin differ diff --git a/.gradle/8.8/checksums/sha1-checksums.bin b/.gradle/8.8/checksums/sha1-checksums.bin index 716eafe..7f4ccd3 100644 Binary files a/.gradle/8.8/checksums/sha1-checksums.bin and b/.gradle/8.8/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.8/executionHistory/executionHistory.bin b/.gradle/8.8/executionHistory/executionHistory.bin index 0419600..652bdae 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.bin and b/.gradle/8.8/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.8/executionHistory/executionHistory.lock b/.gradle/8.8/executionHistory/executionHistory.lock index be92baa..ee2aa24 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.lock and b/.gradle/8.8/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.8/fileHashes/fileHashes.bin b/.gradle/8.8/fileHashes/fileHashes.bin index df0dd3d..7c7ffe2 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.bin and b/.gradle/8.8/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.8/fileHashes/fileHashes.lock b/.gradle/8.8/fileHashes/fileHashes.lock index 6cdd386..e3d891a 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.lock and b/.gradle/8.8/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.8/fileHashes/resourceHashesCache.bin b/.gradle/8.8/fileHashes/resourceHashesCache.bin index 2d30297..0ac023e 100644 Binary files a/.gradle/8.8/fileHashes/resourceHashesCache.bin and b/.gradle/8.8/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index fdef46c..f42d4c6 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 0cfefcc..bfb5d1d 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/loom-cache/launch.cfg b/.gradle/loom-cache/launch.cfg index 47738c9..2b92f91 100644 --- a/.gradle/loom-cache/launch.cfg +++ b/.gradle/loom-cache/launch.cfg @@ -1,11 +1,15 @@ commonProperties fabric.development=true - fabric.remapClasspathFile=/home/astatin3/GitHub/no-more-render/.gradle/loom-cache/remapClasspath.txt - log4j.configurationFile=/home/astatin3/GitHub/no-more-render/.gradle/loom-cache/log4j.xml + fabric.remapClasspathFile=/home/astatin3/Documents/GitHub/no-more-render/.gradle/loom-cache/remapClasspath.txt + log4j.configurationFile=/home/astatin3/Documents/GitHub/no-more-render/.gradle/loom-cache/log4j.xml log4j2.formatMsgNoLookups=true + fabric.gameJarPath=/home/astatin3/.gradle/caches/fabric-loom/minecraftMaven/net/minecraft/minecraft-common/1.21-net.fabricmc.yarn.1_21.1.21+build.2-v2/minecraft-common-1.21-net.fabricmc.yarn.1_21.1.21+build.2-v2.jar + fabric.classPathGroups=/home/astatin3/Documents/GitHub/no-more-render/build/classes/java/main:/home/astatin3/Documents/GitHub/no-more-render/build/resources/main:/home/astatin3/Documents/GitHub/no-more-render/build/classes/java/client:/home/astatin3/Documents/GitHub/no-more-render/build/resources/client fabric.log.disableAnsi=false clientArgs --assetIndex 1.21-17 --assetsDir - /home/astatin3/.gradle/caches/fabric-loom/assets \ No newline at end of file + /home/astatin3/.gradle/caches/fabric-loom/assets +clientProperties + fabric.gameJarPath.client=/home/astatin3/.gradle/caches/fabric-loom/minecraftMaven/net/minecraft/minecraft-clientonly/1.21-net.fabricmc.yarn.1_21.1.21+build.2-v2/minecraft-clientonly-1.21-net.fabricmc.yarn.1_21.1.21+build.2-v2.jar \ No newline at end of file diff --git a/.gradle/loom-cache/remapClasspath.txt b/.gradle/loom-cache/remapClasspath.txt index 659786e..f9dbe74 100644 --- a/.gradle/loom-cache/remapClasspath.txt +++ b/.gradle/loom-cache/remapClasspath.txt @@ -1 +1 @@ -/home/astatin3/.gradle/caches/modules-2/files-2.1/com.github.oshi/oshi-core/6.4.10/b1d8ab82d11d92fd639b56d639f8f46f739dd5fa/oshi-core-6.4.10.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.10.1/b3add478d4382b78ea20b1671390a858002feb6c/gson-2.10.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/32.1.2-jre/5e64ec7e056456bef3a4bc4c6fdaef71e8ab6318/guava-32.1.2-jre.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.ibm.icu/icu4j/73.2/61ad4ef7f9131fcf6d25c34b817f90d6da06c9e9/icu4j-73.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/6.0.54/de8bc95660e1b2fe8793fd427a7a10dcec5b3ea7/authlib-6.0.54.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/blocklist/1.0.10/5c685c5ffa94c4cd39496c7184c1d122e515ecef/blocklist-1.0.10.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/brigadier/1.2.9/73e324f2ee541493a5179abf367237faa782ed21/brigadier-1.2.9.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/datafixerupper/8.0.16/67d4de6d7f95d89bcf5862995fb854ebaec02a34/datafixerupper-8.0.16.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/logging/1.2.7/24cb95ffb0e3433fd6e844c04e68009e504ca1c0/logging-1.2.7.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/patchy/2.2.10/da05971b07cbb379d002cf7eaec6a2048211fefc/patchy-2.2.10.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/text2speech/1.17.9/3cad216e3a7f0c19b4b394388bc9ffc446f13b14/text2speech-1.17.9.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.16.0/4e3eb3d79888d76b54e28b350915b5dc3919c9de/commons-codec-1.16.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.15.1/f11560da189ab563a5c8e351941415430e9304ea/commons-io-2.15.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/4bfc12adfe4842bf07b657f0369c4cb522955686/commons-logging-1.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-buffer/4.1.97.Final/f8f3d8644afa5e6e1a40a3a6aeb9d9aa970ecb4f/netty-buffer-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-codec/4.1.97.Final/384ba4d75670befbedb45c4d3b497a93639c206d/netty-codec-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-common/4.1.97.Final/7cceacaf11df8dc63f23d0fb58e9d4640fc88404/netty-common-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-handler/4.1.97.Final/abb86c6906bf512bf2b797a41cd7d2e8d3cd7c36/netty-handler-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-resolver/4.1.97.Final/cec8348108dc76c47cf87c669d514be52c922144/netty-resolver-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-classes-epoll/4.1.97.Final/795da37ded759e862457a82d9d92c4d39ce8ecee/netty-transport-classes-epoll-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-native-epoll/4.1.97.Final/5514744c588190ffda076b35a9b8c9f24946a960/netty-transport-native-epoll-4.1.97.Final-linux-aarch_64.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-native-epoll/4.1.97.Final/54188f271e388e7f313aea995e82f58ce2cdb809/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-native-unix-common/4.1.97.Final/d469d84265ab70095b01b40886cabdd433b6e664/netty-transport-native-unix-common-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport/4.1.97.Final/f37380d23c9bb079bc702910833b2fd532c9abd0/netty-transport-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/it.unimi.dsi/fastutil/8.5.12/c24946d46824bd528054bface3231d2ecb7e95e8/fastutil-8.5.12.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna-platform/5.14.0/28934d48aed814f11e4c584da55c49fa7032b31b/jna-platform-5.14.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/5.14.0/67bf3eaea4f0718cb376a181a629e5f88fa1c9dd/jna-5.14.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.sf.jopt-simple/jopt-simple/5.0.4/4fdac2fbe92dfad86aa6e9301736f6b4342a3f5c/jopt-simple-5.0.4.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.26.0/659feffdd12280201c8aacb8f7be94f9a883c824/commons-compress-1.26.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.14.0/1ed471194b02f2c6cb734a0cd6f6f107c673afae/commons-lang3-3.14.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.5.13/e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada/httpclient-4.5.13.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.4.16/51cf043c87253c9f58b539c9f7e44c8894223850/httpcore-4.4.16.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.22.1/bea6fede6328fabafd7e68363161a7ea6605abd1/log4j-api-2.22.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.22.1/7183a25510a02ad00cc6a95d3b3d2a7d3c5a8dc4/log4j-core-2.22.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j2-impl/2.22.1/d7e6693c2606cb7e7335047d7bb96dec52db5665/log4j-slf4j2-impl-2.22.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.jcraft/jorbis/0.0.17/8872d22b293e8f5d7d56ff92be966e6dc28ebdc6/jorbis-0.0.17.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.joml/joml/1.10.5/22566d58af70ad3d72308bab63b8339906deb649/joml-1.10.5.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-freetype/3.3.3/a0db6c84a8becc8ca05f9dbfa985edc348a824c7/lwjgl-freetype-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-glfw/3.3.3/efa1eb78c5ccd840e9f329717109b5e892d72f8e/lwjgl-glfw-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-jemalloc/3.3.3/b543467b7ff3c6920539a88ee602d34098628be5/lwjgl-jemalloc-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-openal/3.3.3/daada81ceb5fc0c291fbfdd4433cb8d9423577f2/lwjgl-openal-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-opengl/3.3.3/2f6b0147078396a58979125a4c947664e98293a/lwjgl-opengl-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-stb/3.3.3/25dd6161988d7e65f71d5065c99902402ee32746/lwjgl-stb-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-tinyfd/3.3.3/82d755ca94b102e9ca77283b9e2dc46d1b15fbe5/lwjgl-tinyfd-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl/3.3.3/29589b5f87ed335a6c7e7ee6a5775f81f97ecb84/lwjgl-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lz4/lz4-java/1.8.0/4b986a99445e49ea5fbf5d149c4b63f6ed6c6780/lz4-java-1.8.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/2.0.9/7cf2726fdcfbc8610f9a71fb3ed639871f315340/slf4j-api-2.0.9.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/meteordevelopment/meteor-client/0.5.8-SNAPSHOT/1e573492b4357333945edeafb205a2bf97456471/meteor-client-0.5.8-SNAPSHOT.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.fabricmc/fabric-loader/0.15.11/9c2be53d84ec5c4fb58bb5b8d9c8a629047c9ee9/fabric-loader-0.15.11.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/meteordevelopment/orbit/0.2.4/3a5ba3b5d3d5a43eda3b145bbe81cd5607f86422/orbit-0.2.4.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/meteordevelopment/starscript/0.2.2/96b21475b67901392a1be38871ea4dfc2011b7d9/starscript-0.2.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/meteordevelopment/discord-ipc/1.1/cb36df2976623c8aa350c77d70ba0ddf55fe764f/discord-ipc-1.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.reflections/reflections/0.10.2/b638d7ca0e0fe0146b60a0e7ba232ad852a73b31/reflections-0.10.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-handler-proxy/4.1.90.Final/6ab526a43a14f7796434fa6a705c34201603235f/netty-handler-proxy-4.1.90.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-codec-socks/4.1.90.Final/7397535a4e03d2f74c71aa2282eb7a2760ffc37b/netty-codec-socks-4.1.90.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/de.florianmichael/WaybackAuthLib/1.0.1/37e3517188c78e0459a9923f1249d88476119238/WaybackAuthLib-1.0.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-resource-loader-v0/1.1.4+cb5ced13d1/4edff2de99008769263835f90fa36377c4d24025/fabric-resource-loader-v0-1.1.4+cb5ced13d1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.javassist/javassist/3.28.0-GA/9a958811a88381bb159cc2f5ed79c34a45c4af7a/javassist-3.28.0-GA.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.32/cdcff33940d9f2de763bc41ea05a0be5941176c3/slf4j-api-1.7.32.jar:/home/astatin3/.gradle/caches/fabric-loom/minecraftMaven/net/minecraft/minecraft-merged-intermediary/1.21-net.fabricmc.yarn.1_21.1.21+build.8-v2/minecraft-merged-intermediary-1.21-net.fabricmc.yarn.1_21.1.21+build.8-v2.jar \ No newline at end of file +/home/astatin3/.gradle/caches/modules-2/files-2.1/com.github.oshi/oshi-core/6.4.10/b1d8ab82d11d92fd639b56d639f8f46f739dd5fa/oshi-core-6.4.10.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.10.1/b3add478d4382b78ea20b1671390a858002feb6c/gson-2.10.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.google.guava/failureaccess/1.0.1/1dcf1de382a0bf95a3d8b0849546c88bac1292c9/failureaccess-1.0.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/32.1.2-jre/5e64ec7e056456bef3a4bc4c6fdaef71e8ab6318/guava-32.1.2-jre.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.ibm.icu/icu4j/73.2/61ad4ef7f9131fcf6d25c34b817f90d6da06c9e9/icu4j-73.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/6.0.54/de8bc95660e1b2fe8793fd427a7a10dcec5b3ea7/authlib-6.0.54.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/blocklist/1.0.10/5c685c5ffa94c4cd39496c7184c1d122e515ecef/blocklist-1.0.10.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/brigadier/1.2.9/73e324f2ee541493a5179abf367237faa782ed21/brigadier-1.2.9.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/datafixerupper/8.0.16/67d4de6d7f95d89bcf5862995fb854ebaec02a34/datafixerupper-8.0.16.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/logging/1.2.7/24cb95ffb0e3433fd6e844c04e68009e504ca1c0/logging-1.2.7.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/patchy/2.2.10/da05971b07cbb379d002cf7eaec6a2048211fefc/patchy-2.2.10.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/text2speech/1.17.9/3cad216e3a7f0c19b4b394388bc9ffc446f13b14/text2speech-1.17.9.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.16.0/4e3eb3d79888d76b54e28b350915b5dc3919c9de/commons-codec-1.16.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.15.1/f11560da189ab563a5c8e351941415430e9304ea/commons-io-2.15.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/4bfc12adfe4842bf07b657f0369c4cb522955686/commons-logging-1.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-buffer/4.1.97.Final/f8f3d8644afa5e6e1a40a3a6aeb9d9aa970ecb4f/netty-buffer-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-codec/4.1.97.Final/384ba4d75670befbedb45c4d3b497a93639c206d/netty-codec-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-common/4.1.97.Final/7cceacaf11df8dc63f23d0fb58e9d4640fc88404/netty-common-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-handler/4.1.97.Final/abb86c6906bf512bf2b797a41cd7d2e8d3cd7c36/netty-handler-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-resolver/4.1.97.Final/cec8348108dc76c47cf87c669d514be52c922144/netty-resolver-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-classes-epoll/4.1.97.Final/795da37ded759e862457a82d9d92c4d39ce8ecee/netty-transport-classes-epoll-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-native-epoll/4.1.97.Final/5514744c588190ffda076b35a9b8c9f24946a960/netty-transport-native-epoll-4.1.97.Final-linux-aarch_64.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-native-epoll/4.1.97.Final/54188f271e388e7f313aea995e82f58ce2cdb809/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport-native-unix-common/4.1.97.Final/d469d84265ab70095b01b40886cabdd433b6e664/netty-transport-native-unix-common-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/io.netty/netty-transport/4.1.97.Final/f37380d23c9bb079bc702910833b2fd532c9abd0/netty-transport-4.1.97.Final.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/it.unimi.dsi/fastutil/8.5.12/c24946d46824bd528054bface3231d2ecb7e95e8/fastutil-8.5.12.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna-platform/5.14.0/28934d48aed814f11e4c584da55c49fa7032b31b/jna-platform-5.14.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/5.14.0/67bf3eaea4f0718cb376a181a629e5f88fa1c9dd/jna-5.14.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.sf.jopt-simple/jopt-simple/5.0.4/4fdac2fbe92dfad86aa6e9301736f6b4342a3f5c/jopt-simple-5.0.4.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.26.0/659feffdd12280201c8aacb8f7be94f9a883c824/commons-compress-1.26.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.14.0/1ed471194b02f2c6cb734a0cd6f6f107c673afae/commons-lang3-3.14.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.5.13/e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada/httpclient-4.5.13.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.4.16/51cf043c87253c9f58b539c9f7e44c8894223850/httpcore-4.4.16.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.22.1/bea6fede6328fabafd7e68363161a7ea6605abd1/log4j-api-2.22.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.22.1/7183a25510a02ad00cc6a95d3b3d2a7d3c5a8dc4/log4j-core-2.22.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j2-impl/2.22.1/d7e6693c2606cb7e7335047d7bb96dec52db5665/log4j-slf4j2-impl-2.22.1.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.jcraft/jorbis/0.0.17/8872d22b293e8f5d7d56ff92be966e6dc28ebdc6/jorbis-0.0.17.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.joml/joml/1.10.5/22566d58af70ad3d72308bab63b8339906deb649/joml-1.10.5.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-freetype/3.3.3/a0db6c84a8becc8ca05f9dbfa985edc348a824c7/lwjgl-freetype-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-glfw/3.3.3/efa1eb78c5ccd840e9f329717109b5e892d72f8e/lwjgl-glfw-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-jemalloc/3.3.3/b543467b7ff3c6920539a88ee602d34098628be5/lwjgl-jemalloc-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-openal/3.3.3/daada81ceb5fc0c291fbfdd4433cb8d9423577f2/lwjgl-openal-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-opengl/3.3.3/2f6b0147078396a58979125a4c947664e98293a/lwjgl-opengl-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-stb/3.3.3/25dd6161988d7e65f71d5065c99902402ee32746/lwjgl-stb-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-tinyfd/3.3.3/82d755ca94b102e9ca77283b9e2dc46d1b15fbe5/lwjgl-tinyfd-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl/3.3.3/29589b5f87ed335a6c7e7ee6a5775f81f97ecb84/lwjgl-3.3.3.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lz4/lz4-java/1.8.0/4b986a99445e49ea5fbf5d149c4b63f6ed6c6780/lz4-java-1.8.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/2.0.9/7cf2726fdcfbc8610f9a71fb3ed639871f315340/slf4j-api-2.0.9.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.fabricmc/fabric-loader/0.15.11/9c2be53d84ec5c4fb58bb5b8d9c8a629047c9ee9/fabric-loader-0.15.11.jar:/home/astatin3/.gradle/caches/fabric-loom/minecraftMaven/net/minecraft/minecraft-common-intermediary/1.21-net.fabricmc.yarn.1_21.1.21+build.2-v2/minecraft-common-intermediary-1.21-net.fabricmc.yarn.1_21.1.21+build.2-v2.jar:/home/astatin3/.gradle/caches/fabric-loom/minecraftMaven/net/minecraft/minecraft-clientonly-intermediary/1.21-net.fabricmc.yarn.1_21.1.21+build.2-v2/minecraft-clientonly-intermediary-1.21-net.fabricmc.yarn.1_21.1.21+build.2-v2.jar \ No newline at end of file diff --git a/.idea/modules/no-more-render.main.iml b/.idea/modules/no-more-render.main.iml index 0eeab82..bf0cfc1 100644 --- a/.idea/modules/no-more-render.main.iml +++ b/.idea/modules/no-more-render.main.iml @@ -4,9 +4,8 @@ - MIXIN - MCP FABRIC + MIXIN 1 diff --git a/.idea/modules/no-more-render.test.iml b/.idea/modules/no-more-render.test.iml index 0eeab82..bf0cfc1 100644 --- a/.idea/modules/no-more-render.test.iml +++ b/.idea/modules/no-more-render.test.iml @@ -4,9 +4,8 @@ - MIXIN - MCP FABRIC + MIXIN 1 diff --git a/.idea/runConfigurations/Minecraft_Server.xml b/.idea/runConfigurations/Minecraft_Server.xml index d18714e..1ddd8d9 100644 --- a/.idea/runConfigurations/Minecraft_Server.xml +++ b/.idea/runConfigurations/Minecraft_Server.xml @@ -12,5 +12,5 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 33ef2ca..6718cdc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,59 +1,88 @@ plugins { - id "fabric-loom" version "1.7-SNAPSHOT" + id 'fabric-loom' version '1.7-SNAPSHOT' + id 'maven-publish' } +version = project.mod_version +group = project.maven_group + base { - archivesBaseName = project.archives_base_name - version = project.mod_version - group = project.maven_group + archivesName = project.archives_base_name } repositories { - maven { - name = "Meteor Dev Releases" - url = "https://maven.meteordev.org/releases" - } - maven { - name = "Meteor Dev Snapshots" - url = "https://maven.meteordev.org/snapshots" - } + // 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. +} + +loom { + splitEnvironmentSourceSets() + + mods { + "modid" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } + } dependencies { - // Fabric - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + // 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}" + + // Fabric API. This is technically optional, but you probably want it anyway. +// modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - // Meteor - modImplementation "meteordevelopment:meteor-client:${project.meteor_version}" } -tasks { - processResources { - def propertyMap = [ - "version" : project.version, - "mc_version": project.minecraft_version, - ] +processResources { + inputs.property "version", project.version - filesMatching("fabric.mod.json") { - expand(propertyMap) - } - } - - jar { - from("LICENSE") { - rename { "${it}_${project.base.archivesBaseName}" } - } - } - - java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 - } - - tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" - it.options.release = 21 - } + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 21 +} + +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() + + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + 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/build/classes/java/main/addon-template-refmap.json b/build/classes/java/main/addon-template-refmap.json deleted file mode 100644 index 1237ee2..0000000 --- a/build/classes/java/main/addon-template-refmap.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "mappings": { - "com/example/addon/mixin/MixinGameRenderer": { - "addSelectableChild": "Lnet/minecraft/class_437;method_25429(Lnet/minecraft/class_364;)Lnet/minecraft/class_364;" - } - }, - "data": { - "named:intermediary": { - "com/example/addon/mixin/MixinGameRenderer": { - "addSelectableChild": "Lnet/minecraft/class_437;method_25429(Lnet/minecraft/class_364;)Lnet/minecraft/class_364;" - } - } - } -} \ No newline at end of file diff --git a/build/loom-cache/mixin-map-net.fabricmc.yarn.1_21.1.21+build.8-v2.main.tiny b/build/loom-cache/mixin-map-net.fabricmc.yarn.1_21.1.21+build.8-v2.main.tiny deleted file mode 100644 index afd84f3..0000000 --- a/build/loom-cache/mixin-map-net.fabricmc.yarn.1_21.1.21+build.8-v2.main.tiny +++ /dev/null @@ -1 +0,0 @@ -v1 named intermediary diff --git a/build/resources/main/addon-template.mixins.json b/build/resources/main/addon-template.mixins.json deleted file mode 100644 index 48e5186..0000000 --- a/build/resources/main/addon-template.mixins.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "required": true, - "package": "com.example.addon.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "HeadlessWindow", - "HeadlessMinecraftClient", - "HeadlessWidgetAccessor" - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/build/resources/main/assets/template/icon.png b/build/resources/main/assets/template/icon.png deleted file mode 100644 index 3fb2e7f..0000000 Binary files a/build/resources/main/assets/template/icon.png and /dev/null differ diff --git a/build/resources/main/fabric.mod.json b/build/resources/main/fabric.mod.json deleted file mode 100644 index 4cca568..0000000 --- a/build/resources/main/fabric.mod.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "schemaVersion": 1, - "id": "addon-template", - "version": "0.1.0", - "name": "Addon Template", - "description": "An addon template for Meteor Client addons.", - "authors": [ - "seasnail" - ], - "contact": { - "repo": "https://github.com/MeteorDevelopment/meteor-addon-template" - }, - "icon": "assets/template/icon.png", - "environment": "client", - "entrypoints": { - "meteor": [ - "com.example.addon.AddonTemplate" - ] - }, - "mixins": [ - "addon-template.mixins.json" - ], - "custom": { - "meteor-client:color": "225,25,25" - }, - "depends": { - "java": ">=21", - "minecraft": ["1.21"], - "meteor-client": "*" - } -} diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin deleted file mode 100644 index 2470637..0000000 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ diff --git a/build/tmp/jar/MANIFEST.MF b/build/tmp/jar/MANIFEST.MF deleted file mode 100644 index 59499bc..0000000 --- a/build/tmp/jar/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/build/tmp/remapJar/MANIFEST.MF b/build/tmp/remapJar/MANIFEST.MF deleted file mode 100644 index 59499bc..0000000 --- a/build/tmp/remapJar/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/gradle.properties b/gradle.properties index 7728107..83130b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,17 @@ -org.gradle.jvmargs=-Xmx2G +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true -# Fabric Properties (https://fabricmc.net/develop) +# Fabric Properties +# check these on https://fabricmc.net/develop minecraft_version=1.21 -yarn_mappings=1.21+build.8 +yarn_mappings=1.21+build.2 loader_version=0.15.11 # Mod Properties -mod_version=0.1.0 -maven_group=com.example -archives_base_name=addon-template +mod_version=1.0.0 +maven_group=com.astatin3 +archives_base_name=nomorerender # Dependencies - -# Meteor (https://maven.meteordev.org) -meteor_version=0.5.8-SNAPSHOT +fabric_version=0.100.3+1.21 diff --git a/gradlew b/gradlew index 65dcd68..b740cf1 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # 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 +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,10 +83,8 @@ 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ 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. + if ! command -v java >/dev/null 2>&1 + then + 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 fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ 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 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then 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. + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle b/settings.gradle index b02216b..75c4d72 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - mavenCentral() - gradlePluginPortal() - } -} + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/client/java/com/astatin3/nomorerender/clientEntrypoint.java b/src/client/java/com/astatin3/nomorerender/clientEntrypoint.java new file mode 100644 index 0000000..de0bbe9 --- /dev/null +++ b/src/client/java/com/astatin3/nomorerender/clientEntrypoint.java @@ -0,0 +1,10 @@ +package com.astatin3.nomorerender; + +import net.fabricmc.api.ClientModInitializer; + +public class clientEntrypoint implements ClientModInitializer { + @Override + public void onInitializeClient() { + // This entrypoint is suitable for setting up client-specific logic, such as rendering. + } +} diff --git a/src/main/java/com/example/addon/mixin/HeadlessMinecraftClient.java b/src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessMinecraftClient.java similarity index 99% rename from src/main/java/com/example/addon/mixin/HeadlessMinecraftClient.java rename to src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessMinecraftClient.java index 3a2db63..21eb0e5 100644 --- a/src/main/java/com/example/addon/mixin/HeadlessMinecraftClient.java +++ b/src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessMinecraftClient.java @@ -1,4 +1,4 @@ -package com.example.addon.mixin; +package com.astatin3.nomorerender.mixin.client; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/com/example/addon/mixin/HeadlessWidgetAccessor.java b/src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessWidgetAccessor.java similarity index 89% rename from src/main/java/com/example/addon/mixin/HeadlessWidgetAccessor.java rename to src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessWidgetAccessor.java index 7ae56c7..dfca33b 100644 --- a/src/main/java/com/example/addon/mixin/HeadlessWidgetAccessor.java +++ b/src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessWidgetAccessor.java @@ -1,4 +1,4 @@ -package com.example.addon.mixin; +package com.astatin3.nomorerender.mixin.client; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; diff --git a/src/main/java/com/example/addon/mixin/HeadlessWindow.java b/src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessWindow.java similarity index 96% rename from src/main/java/com/example/addon/mixin/HeadlessWindow.java rename to src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessWindow.java index 1391c27..337c031 100644 --- a/src/main/java/com/example/addon/mixin/HeadlessWindow.java +++ b/src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessWindow.java @@ -1,4 +1,4 @@ -package com.example.addon.mixin; +package com.astatin3.nomorerender.mixin.client; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.util.Window; diff --git a/src/client/resources/assets/nomorerender/icon.png b/src/client/resources/assets/nomorerender/icon.png new file mode 100644 index 0000000..fa1bc4d Binary files /dev/null and b/src/client/resources/assets/nomorerender/icon.png differ diff --git a/src/client/resources/fabric.mod.json b/src/client/resources/fabric.mod.json new file mode 100644 index 0000000..6d1d216 --- /dev/null +++ b/src/client/resources/fabric.mod.json @@ -0,0 +1,36 @@ +{ + "schemaVersion": 1, + "id": "nomorerender", + "version": "${version}", + "name": "No More Render", + "description": "This is an example description! Tell everyone what your mod is about!", + "authors": [ + "Me!" + ], + "contact": { + "homepage": "https://fabricmc.net/", + "sources": "https://github.com/FabricMC/fabric-example-mod" + }, + "license": "CC0-1.0", + "icon": "assets/nomorerender/icon.png", + "environment": "*", + "entrypoints": { + "client": [ + "com.astatin3.nomorerender.clientEntrypoint" + ] + }, + "mixins": [ + { + "config": "nomorerender.client.mixins.json", + "environment": "client" + } + ], + "depends": { + "fabricloader": ">=0.15.11", + "minecraft": "~1.21", + "java": ">=21" + }, + "suggests": { + "another-mod": "*" + } +} diff --git a/src/client/resources/nomorerender.client.mixins.json b/src/client/resources/nomorerender.client.mixins.json new file mode 100644 index 0000000..7f0768f --- /dev/null +++ b/src/client/resources/nomorerender.client.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "package": "com.astatin3.nomorerender.mixin.client", + "compatibilityLevel": "JAVA_21", + "client": [ + "HeadlessMinecraftClient", + "HeadlessWidgetAccessor", + "HeadlessWindow" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/java/com/example/addon/AddonTemplate.java b/src/main/java/com/example/addon/AddonTemplate.java deleted file mode 100644 index 3bd07af..0000000 --- a/src/main/java/com/example/addon/AddonTemplate.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.example.addon; - -import com.example.addon.commands.CommandExample; -import com.example.addon.hud.HudExample; -import com.example.addon.modules.ModuleExample; -import com.mojang.logging.LogUtils; -import meteordevelopment.meteorclient.addons.GithubRepo; -import meteordevelopment.meteorclient.addons.MeteorAddon; -import meteordevelopment.meteorclient.commands.Commands; -import meteordevelopment.meteorclient.systems.hud.Hud; -import meteordevelopment.meteorclient.systems.hud.HudGroup; -import meteordevelopment.meteorclient.systems.modules.Category; -import meteordevelopment.meteorclient.systems.modules.Modules; -import org.slf4j.Logger; - -public class AddonTemplate extends MeteorAddon { - public static final Logger LOG = LogUtils.getLogger(); - public static final Category CATEGORY = new Category("Example"); - public static final HudGroup HUD_GROUP = new HudGroup("Example"); - - @Override - public void onInitialize() { - LOG.info("Initializing Meteor Addon Template"); - - // Modules - Modules.get().add(new ModuleExample()); - - // Commands - Commands.add(new CommandExample()); - - // HUD - Hud.get().register(HudExample.INFO); - } - - @Override - public void onRegisterCategories() { - Modules.registerCategory(CATEGORY); - } - - @Override - public String getPackage() { - return "com.example.addon"; - } - - @Override - public GithubRepo getRepo() { - return new GithubRepo("MeteorDevelopment", "meteor-addon-template"); - } -} diff --git a/src/main/java/com/example/addon/commands/CommandExample.java b/src/main/java/com/example/addon/commands/CommandExample.java deleted file mode 100644 index 06ec3ae..0000000 --- a/src/main/java/com/example/addon/commands/CommandExample.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.example.addon.commands; - -import com.mojang.brigadier.arguments.StringArgumentType; -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import meteordevelopment.meteorclient.commands.Command; -import net.minecraft.command.CommandSource; - -import static com.mojang.brigadier.Command.SINGLE_SUCCESS; - -/** - * The Meteor Client command API uses the same command system as Minecraft does. - */ -public class CommandExample extends Command { - /** - * The {@code name} parameter should be in kebab-case. - */ - public CommandExample() { - super("example", "Sends a message."); - } - - @Override - public void build(LiteralArgumentBuilder builder) { - builder.executes(context -> { - info("hi"); - return SINGLE_SUCCESS; - }); - - builder.then(literal("name").then(argument("nameArgument", StringArgumentType.word()).executes(context -> { - String argument = StringArgumentType.getString(context, "nameArgument"); - info("hi, " + argument); - return SINGLE_SUCCESS; - }))); - } -} diff --git a/src/main/java/com/example/addon/hud/HudExample.java b/src/main/java/com/example/addon/hud/HudExample.java deleted file mode 100644 index bdf5928..0000000 --- a/src/main/java/com/example/addon/hud/HudExample.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.example.addon.hud; - -import com.example.addon.AddonTemplate; -import meteordevelopment.meteorclient.systems.hud.HudElement; -import meteordevelopment.meteorclient.systems.hud.HudElementInfo; -import meteordevelopment.meteorclient.systems.hud.HudRenderer; -import meteordevelopment.meteorclient.utils.render.color.Color; - -public class HudExample extends HudElement { - /** - * The {@code name} parameter should be in kebab-case. - */ - public static final HudElementInfo INFO = new HudElementInfo<>(AddonTemplate.HUD_GROUP, "example", "HUD element example.", HudExample::new); - - public HudExample() { - super(INFO); - } - - @Override - public void render(HudRenderer renderer) { - setSize(renderer.textWidth("Example element", true), renderer.textHeight(true)); - - // Render background - renderer.quad(x, y, getWidth(), getHeight(), Color.LIGHT_GRAY); - - // Render text - renderer.text("Example element", x, y, Color.WHITE, true); - } -} diff --git a/src/main/java/com/example/addon/mixin/HeadlessGameRenderer.java b/src/main/java/com/example/addon/mixin/HeadlessGameRenderer.java deleted file mode 100644 index 2ebf283..0000000 --- a/src/main/java/com/example/addon/mixin/HeadlessGameRenderer.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.example.addon.mixin; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.BufferBuilderStorage; -import net.minecraft.client.render.GameRenderer; -import net.minecraft.client.render.RenderTickCounter; -import net.minecraft.client.render.item.HeldItemRenderer; -import net.minecraft.resource.ResourceManager; - -public class HeadlessGameRenderer extends GameRenderer { - - public HeadlessGameRenderer(MinecraftClient client, HeldItemRenderer heldItemRenderer, ResourceManager resourceManager, BufferBuilderStorage buffers) { - super(client, heldItemRenderer, resourceManager, buffers); - } - - @Override - public void render(RenderTickCounter tickCounter, boolean tick) { - super.render(tickCounter, tick); - System.out.println("Haha custom code"); - } -} diff --git a/src/main/java/com/example/addon/mixin/MixinGameRenderer.java b/src/main/java/com/example/addon/mixin/MixinGameRenderer.java deleted file mode 100644 index b627faf..0000000 --- a/src/main/java/com/example/addon/mixin/MixinGameRenderer.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.example.addon.mixin; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.AbstractParentElement; -import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.narration.ScreenNarrator; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -/** - * Example Mixin class. - * For more resources, visit: - * - */ - -@Mixin(ScreenNarrator.class) -public abstract class MixinGameRenderer { - - Screen self = (Screen)(Object) this; -// MinecraftClient client = self.getClient(); - - - - @Inject(method="addSelectableChild", at = @At("HEAD")) - public void addSelectableChild(T child, CallbackInfoReturnable cir){ - System.out.println("Button!"); - } - -} diff --git a/src/main/java/com/example/addon/modules/ModuleExample.java b/src/main/java/com/example/addon/modules/ModuleExample.java deleted file mode 100644 index 10a4bb6..0000000 --- a/src/main/java/com/example/addon/modules/ModuleExample.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.example.addon.modules; - -import com.example.addon.AddonTemplate; -import meteordevelopment.meteorclient.events.render.Render3DEvent; -import meteordevelopment.meteorclient.renderer.ShapeMode; -import meteordevelopment.meteorclient.settings.ColorSetting; -import meteordevelopment.meteorclient.settings.DoubleSetting; -import meteordevelopment.meteorclient.settings.Setting; -import meteordevelopment.meteorclient.settings.SettingGroup; -import meteordevelopment.meteorclient.systems.modules.Module; -import meteordevelopment.meteorclient.utils.render.color.Color; -import meteordevelopment.meteorclient.utils.render.color.SettingColor; -import meteordevelopment.orbit.EventHandler; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; - -public class ModuleExample extends Module { - private final SettingGroup sgGeneral = this.settings.getDefaultGroup(); - private final SettingGroup sgRender = this.settings.createGroup("Render"); - - /** - * Example setting. - * The {@code name} parameter should be in kebab-case. - * If you want to access the setting from another class, simply make the setting {@code public}, and use - * {@link meteordevelopment.meteorclient.systems.modules.Modules#get(Class)} to access the {@link Module} object. - */ - private final Setting scale = sgGeneral.add(new DoubleSetting.Builder() - .name("scale") - .description("The size of the marker.") - .defaultValue(2.0d) - .range(0.5d, 10.0d) - .build() - ); - - private final Setting color = sgRender.add(new ColorSetting.Builder() - .name("color") - .description("The color of the marker.") - .defaultValue(Color.MAGENTA) - .build() - ); - - /** - * The {@code name} parameter should be in kebab-case. - */ - public ModuleExample() { - super(AddonTemplate.CATEGORY, "world-origin", "An example module that highlights the center of the world."); - } - - /** - * Example event handling method. - * Requires {@link AddonTemplate#getPackage()} to be setup correctly, will fail silently otherwise. - */ - @EventHandler - private void onRender3d(Render3DEvent event) { - // Create & stretch the marker object - Box marker = new Box(BlockPos.ORIGIN); - marker.stretch( - scale.get() * marker.getLengthX(), - scale.get() * marker.getLengthY(), - scale.get() * marker.getLengthZ() - ); - - // Render the marker based on the color setting - event.renderer.box(marker, color.get(), color.get(), ShapeMode.Both, 0); - } -} diff --git a/src/main/resources/addon-template.mixins.json b/src/main/resources/addon-template.mixins.json deleted file mode 100644 index 48e5186..0000000 --- a/src/main/resources/addon-template.mixins.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "required": true, - "package": "com.example.addon.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "HeadlessWindow", - "HeadlessMinecraftClient", - "HeadlessWidgetAccessor" - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/src/main/resources/assets/template/icon.png b/src/main/resources/assets/template/icon.png deleted file mode 100644 index 3fb2e7f..0000000 Binary files a/src/main/resources/assets/template/icon.png and /dev/null differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json deleted file mode 100644 index bb8c721..0000000 --- a/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "schemaVersion": 1, - "id": "addon-template", - "version": "${version}", - "name": "Addon Template", - "description": "An addon template for Meteor Client addons.", - "authors": [ - "seasnail" - ], - "contact": { - "repo": "https://github.com/MeteorDevelopment/meteor-addon-template" - }, - "icon": "assets/template/icon.png", - "environment": "client", - "entrypoints": { - "meteor": [ - "com.example.addon.AddonTemplate" - ] - }, - "mixins": [ - "addon-template.mixins.json" - ], - "custom": { - "meteor-client:color": "225,25,25" - }, - "depends": { - "java": ">=21", - "minecraft": ["${mc_version}"], - "meteor-client": "*" - } -}