diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b722415 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +[*] +charset = utf-8 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true +indent_size = 4 + +[*.{json, yml}] +indent_size = 2 + +[*.md] +trim_trailing_whitespace = false diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml new file mode 100644 index 0000000..672d502 --- /dev/null +++ b/.github/workflows/dev_build.yml @@ -0,0 +1,23 @@ +name: Publish Development Build +on: push + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2 + with: + java-version: 17 + distribution: adopt + - name: Build + run: ./gradlew build + - name: Release + uses: marvinpinto/action-automatic-releases@latest + with: + repo_token: '${{ secrets.GITHUB_TOKEN }}' + automatic_release_tag: latest + prerelease: true + title: Dev Build + files: | + ./build/libs/*.jar diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 0000000..e60e76d --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,19 @@ +name: Build Pull Request +on: pull_request + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2 + with: + java-version: 17 + distribution: adopt + - name: Build + run: ./gradlew build + - name: Upload artifacts + uses: actions/upload-artifact@v2.2.4 + with: + name: build-artifacts + path: build/libs diff --git a/.gitignore b/.gitignore index 524f096..09cbca1 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* replay_pid* + +run/ +build/ \ No newline at end of file diff --git a/.gradle/8.6/checksums/checksums.lock b/.gradle/8.6/checksums/checksums.lock new file mode 100644 index 0000000..08bd211 Binary files /dev/null and b/.gradle/8.6/checksums/checksums.lock differ diff --git a/.gradle/8.6/checksums/md5-checksums.bin b/.gradle/8.6/checksums/md5-checksums.bin new file mode 100644 index 0000000..8755eda Binary files /dev/null and b/.gradle/8.6/checksums/md5-checksums.bin differ diff --git a/.gradle/8.6/checksums/sha1-checksums.bin b/.gradle/8.6/checksums/sha1-checksums.bin new file mode 100644 index 0000000..57c1772 Binary files /dev/null and b/.gradle/8.6/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.6/dependencies-accessors/gc.properties b/.gradle/8.6/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/8.6/executionHistory/executionHistory.bin b/.gradle/8.6/executionHistory/executionHistory.bin new file mode 100644 index 0000000..ee37960 Binary files /dev/null and b/.gradle/8.6/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.6/executionHistory/executionHistory.lock b/.gradle/8.6/executionHistory/executionHistory.lock new file mode 100644 index 0000000..52ea4c7 Binary files /dev/null and b/.gradle/8.6/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.6/fileChanges/last-build.bin b/.gradle/8.6/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/8.6/fileChanges/last-build.bin differ diff --git a/.gradle/8.6/fileHashes/fileHashes.bin b/.gradle/8.6/fileHashes/fileHashes.bin new file mode 100644 index 0000000..24df741 Binary files /dev/null and b/.gradle/8.6/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.6/fileHashes/fileHashes.lock b/.gradle/8.6/fileHashes/fileHashes.lock new file mode 100644 index 0000000..95a65ba Binary files /dev/null and b/.gradle/8.6/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.6/fileHashes/resourceHashesCache.bin b/.gradle/8.6/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..cc9f239 Binary files /dev/null and b/.gradle/8.6/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/8.6/gc.properties b/.gradle/8.6/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..fef015a Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..4e808e8 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Mon Apr 22 17:47:02 MDT 2024 +gradle.version=8.6 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..762884b Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe new file mode 100644 index 0000000..1fae123 Binary files /dev/null and b/.gradle/file-system.probe differ diff --git a/.gradle/loom-cache/launch.cfg b/.gradle/loom-cache/launch.cfg new file mode 100644 index 0000000..b34e15c --- /dev/null +++ b/.gradle/loom-cache/launch.cfg @@ -0,0 +1,11 @@ +commonProperties + fabric.development=true + fabric.remapClasspathFile=/home/astatin3/Documents/GitHub/meteor-addon-template/.gradle/loom-cache/remapClasspath.txt + log4j.configurationFile=/home/astatin3/Documents/GitHub/meteor-addon-template/.gradle/loom-cache/log4j.xml + log4j2.formatMsgNoLookups=true + fabric.log.disableAnsi=false +clientArgs + --assetIndex + 1.20.4-12 + --assetsDir + /home/astatin3/.gradle/caches/fabric-loom/assets \ No newline at end of file diff --git a/.gradle/loom-cache/log4j.xml b/.gradle/loom-cache/log4j.xml new file mode 100644 index 0000000..9ebf46d --- /dev/null +++ b/.gradle/loom-cache/log4j.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.gradle/loom-cache/minecraftMaven/net/minecraft/minecraft-merged-3848b19350/1.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.2-v2/minecraft-merged-3848b19350-1.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.2-v2.pom b/.gradle/loom-cache/minecraftMaven/net/minecraft/minecraft-merged-3848b19350/1.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.2-v2/minecraft-merged-3848b19350-1.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.2-v2.pom new file mode 100644 index 0000000..97900ae --- /dev/null +++ b/.gradle/loom-cache/minecraftMaven/net/minecraft/minecraft-merged-3848b19350/1.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.2-v2/minecraft-merged-3848b19350-1.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.2-v2.pom @@ -0,0 +1,8 @@ + + + 4.0.0 + net.minecraft + minecraft-merged-3848b19350 + 1.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.2-v2 + diff --git a/.gradle/loom-cache/remapClasspath.txt b/.gradle/loom-cache/remapClasspath.txt new file mode 100644 index 0000000..10c254d --- /dev/null +++ b/.gradle/loom-cache/remapClasspath.txt @@ -0,0 +1 @@ +/home/astatin3/.gradle/caches/modules-2/files-2.1/com.github.oshi/oshi-core/6.4.5/943ba26de047eb6b28fff47f5ee939a34eb5fc8e/oshi-core-6.4.5.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.52/65085e2eb921c4a3ebdde3d248637f1776e6d80d/authlib-6.0.52.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/6.0.8/3ba4a30557a9b057760af4011f909ba619fc5125/datafixerupper-6.0.8.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/com.mojang/logging/1.1.1/832b8e6674a9b325a5175a3a6267dfaf34c85139/logging-1.1.1.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.13.0/8bb2bc9b4df17e2411533a0708a69f983bf5e83b/commons-io-2.13.0.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.13.0/88e9a306715e9379f3122415ef4ae759a352640d/jna-platform-5.13.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/5.13.0/1200e7ebeedbe0d10062093f32925a912020e747/jna-5.13.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.22/691a8b4e6cf4248c3bc72c8b719337d5cb7359fa/commons-compress-1.22.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.13.0/b7263237aa89c1f99b327197c41d0669707a462e/commons-lang3-3.13.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.19.0/ea1b37f38c327596b216542bc636cfdc0b8036fa/log4j-api-2.19.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.19.0/3b6eeb4de4c49c0fe38a4ee27188ff5fee44d0bb/log4j-core-2.19.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j2-impl/2.19.0/5c04bfdd63ce9dceb2e284b81e96b6a70010ee10/log4j-slf4j2-impl-2.19.0.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-glfw/3.3.2/757920418805fb90bfebb3d46b1d9e7669fca2eb/lwjgl-glfw-3.3.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-jemalloc/3.3.2/877e17e39ebcd58a9c956dc3b5b777813de0873a/lwjgl-jemalloc-3.3.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-openal/3.3.2/ae5357ed6d934546d3533993ea84c0cfb75eed95/lwjgl-openal-3.3.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-opengl/3.3.2/ee8e95be0b438602038bc1f02dc5e3d011b1b216/lwjgl-opengl-3.3.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-stb/3.3.2/a2550795014d622b686e9caac50b14baa87d2c70/lwjgl-stb-3.3.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl-tinyfd/3.3.2/9f65c248dd77934105274fcf8351abb75b34327c/lwjgl-tinyfd-3.3.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.lwjgl/lwjgl/3.3.2/4421d94af68e35dcaa31737a6fc59136a1e61b94/lwjgl-3.3.2.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/2.0.7/41eb7184ea9d556f23e18b5cb99cad1f8581fc00/slf4j-api-2.0.7.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/meteordevelopment/meteor-client/0.5.6-SNAPSHOT/ac412b256c3856ba45c4aff362a9d0aaf4994bdd/meteor-client-0.5.6-SNAPSHOT.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.fabricmc/fabric-loader/0.15.2/c162baeb16a88d36812884f31d7c24f58a223a77/fabric-loader-0.15.2.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.0/efbe8c9dbfc3b812e73ded11021682969396754d/WaybackAuthLib-1.0.0.jar:/home/astatin3/.gradle/caches/modules-2/files-2.1/net.fabricmc.fabric-api/fabric-resource-loader-v0/0.11.17+707e4d1b4f/a1fc0d3df14d51d550ff761191e76d848bd35904/fabric-resource-loader-v0-0.11.17+707e4d1b4f.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.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.2-v2/minecraft-merged-intermediary-1.20.4-net.fabricmc.yarn.1_20_4.1.20.4+build.2-v2.jar \ No newline at end of file diff --git a/.gradle/loom-cache/remapped_mods/net_fabricmc_yarn_1_20_4_1_20_4_build_2_v2/meteordevelopment/meteor-client/0.5.6-SNAPSHOT/meteor-client-0.5.6-SNAPSHOT.pom b/.gradle/loom-cache/remapped_mods/net_fabricmc_yarn_1_20_4_1_20_4_build_2_v2/meteordevelopment/meteor-client/0.5.6-SNAPSHOT/meteor-client-0.5.6-SNAPSHOT.pom new file mode 100644 index 0000000..6d75fd6 --- /dev/null +++ b/.gradle/loom-cache/remapped_mods/net_fabricmc_yarn_1_20_4_1_20_4_build_2_v2/meteordevelopment/meteor-client/0.5.6-SNAPSHOT/meteor-client-0.5.6-SNAPSHOT.pom @@ -0,0 +1,8 @@ + + + 4.0.0 + net_fabricmc_yarn_1_20_4_1_20_4_build_2_v2.meteordevelopment + meteor-client + 0.5.6-SNAPSHOT + diff --git a/.gradle/loom-cache/remapped_mods/net_fabricmc_yarn_1_20_4_1_20_4_build_2_v2/net/fabricmc/fabric-api/fabric-resource-loader-v0/0.11.17+707e4d1b4f/fabric-resource-loader-v0-0.11.17+707e4d1b4f.pom b/.gradle/loom-cache/remapped_mods/net_fabricmc_yarn_1_20_4_1_20_4_build_2_v2/net/fabricmc/fabric-api/fabric-resource-loader-v0/0.11.17+707e4d1b4f/fabric-resource-loader-v0-0.11.17+707e4d1b4f.pom new file mode 100644 index 0000000..25f7fa9 --- /dev/null +++ b/.gradle/loom-cache/remapped_mods/net_fabricmc_yarn_1_20_4_1_20_4_build_2_v2/net/fabricmc/fabric-api/fabric-resource-loader-v0/0.11.17+707e4d1b4f/fabric-resource-loader-v0-0.11.17+707e4d1b4f.pom @@ -0,0 +1,8 @@ + + + 4.0.0 + net_fabricmc_yarn_1_20_4_1_20_4_build_2_v2.net.fabricmc.fabric-api + fabric-resource-loader-v0 + 0.11.17+707e4d1b4f + diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..f9163b4 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..2ffa0ca --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..de0c428 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Minecraft_Client.xml b/.idea/runConfigurations/Minecraft_Client.xml new file mode 100644 index 0000000..755a088 --- /dev/null +++ b/.idea/runConfigurations/Minecraft_Client.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Minecraft_Server.xml b/.idea/runConfigurations/Minecraft_Server.xml new file mode 100644 index 0000000..c418e11 --- /dev/null +++ b/.idea/runConfigurations/Minecraft_Server.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..05190da --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 1621b26..5ffef9e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,17 @@ -# Randar - (WIP) Quick and dirty radar meteor addon thing using the Randar exploit +# Randar-Minimap + +A Quick and dirty minimap using the Randar exploit + +100% of the credit for this goes to https://github.com/spawnmason/randar-explanation +Their work is really cool. + +##### How do I run this? +- Add the mod alongside Meteor client as an addon +##### If Meteor client is on the latest version and the Randar exploit only works on versions up until 1.12.2, then how can I possibly use this? +- Use: https://modrinth.com/mod/viafabricplus (Another really cool mod) + +Also quick note: +- I have never made a Minecraft mod before +- I have never worked with Fabric before +- I have never made a Meteor client addon before +- So if there is anything that can be made better, leave an issue! diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..55d4ace --- /dev/null +++ b/build.gradle @@ -0,0 +1,40 @@ +plugins { + id "fabric-loom" version "1.6-SNAPSHOT" +} + +sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +repositories { + maven { + name = "Meteor Dev Releases" + url = "https://maven.meteordev.org/releases" + } + maven { + name = "Meteor Dev Snapshots" + url = "https://maven.meteordev.org/snapshots" + } +} + +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}" + + // Meteor + modImplementation "meteordevelopment:meteor-client:${project.meteor_version}" +} + +processResources { + filesMatching("fabric.mod.json") { + expand "version": project.version, "mc_version": project.minecraft_version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding("UTF-8") +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..1438b6a --- /dev/null +++ b/gradle.properties @@ -0,0 +1,16 @@ +org.gradle.jvmargs=-Xmx2G + +# Fabric Properties (https://fabricmc.net/develop) +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.2 +loader_version=0.15.1 + +# Mod Properties +mod_version=0.1.0 +maven_group=com.example +archives_base_name=addon-template + +# Dependencies + +# Meteor (https://maven.meteordev.org) +meteor_version=0.5.6-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..509c4a2 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..65dcd68 --- /dev/null +++ b/gradlew @@ -0,0 +1,244 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..b02216b --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} diff --git a/src/main/java/com/astatin3/randarminimap/Addon.java b/src/main/java/com/astatin3/randarminimap/Addon.java new file mode 100644 index 0000000..8fb3139 --- /dev/null +++ b/src/main/java/com/astatin3/randarminimap/Addon.java @@ -0,0 +1,37 @@ +package com.astatin3.randarminimap; + +import com.astatin3.randarminimap.modules.Randar; +import com.astatin3.randarminimap.commands.RandarCMD; +import com.mojang.logging.LogUtils; +import meteordevelopment.meteorclient.addons.MeteorAddon; +import meteordevelopment.meteorclient.commands.Commands; +import meteordevelopment.meteorclient.systems.modules.Category; +import meteordevelopment.meteorclient.systems.modules.Modules; +import org.slf4j.Logger; + +public class Addon extends MeteorAddon { + public static final Logger LOG = LogUtils.getLogger(); + public static final Category CATEGORY = new Category("Exploits"); + + @Override + public void onInitialize() { + LOG.info("Initializing Randar Minimap"); + + // Modules + final Randar r = new Randar(); + Modules.get().add(r); + + // Commands + Commands.add(new RandarCMD(r)); + } + + @Override + public void onRegisterCategories() { + Modules.registerCategory(CATEGORY); + } + + @Override + public String getPackage() { + return "com.astatin3.randarminimap"; + } +} diff --git a/src/main/java/com/astatin3/randarminimap/commands/RandarCMD.java b/src/main/java/com/astatin3/randarminimap/commands/RandarCMD.java new file mode 100644 index 0000000..3458bcf --- /dev/null +++ b/src/main/java/com/astatin3/randarminimap/commands/RandarCMD.java @@ -0,0 +1,26 @@ +package com.astatin3.randarminimap.commands; + +import com.astatin3.randarminimap.modules.Randar; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import meteordevelopment.meteorclient.commands.Command; +import net.minecraft.command.CommandSource; + +import static com.mojang.brigadier.Command.SINGLE_SUCCESS; + +public class RandarCMD extends Command { + final Randar randar; + + public RandarCMD(Randar randar) { + super("randar-clear", "Clear Randar map."); + this.randar = randar; + } + + @Override + public void build(LiteralArgumentBuilder builder) { + builder.executes(context -> { + info("Map cleared!"); + this.randar.clearMap(); + return SINGLE_SUCCESS; + }); + } +} diff --git a/src/main/java/com/astatin3/randarminimap/modules/Randar.java b/src/main/java/com/astatin3/randarminimap/modules/Randar.java new file mode 100644 index 0000000..ea49253 --- /dev/null +++ b/src/main/java/com/astatin3/randarminimap/modules/Randar.java @@ -0,0 +1,291 @@ +package com.astatin3.randarminimap.modules; + +import com.astatin3.randarminimap.Addon; +import meteordevelopment.meteorclient.events.packets.PacketEvent; +import meteordevelopment.meteorclient.events.render.Render2DEvent; +import meteordevelopment.meteorclient.renderer.Renderer2D; +import meteordevelopment.meteorclient.settings.*; +import meteordevelopment.meteorclient.systems.modules.Module; +import meteordevelopment.meteorclient.utils.player.ChatUtils; +import meteordevelopment.orbit.EventHandler; +import net.minecraft.entity.EntityType; +import meteordevelopment.meteorclient.utils.render.color.Color; +import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket; +import net.minecraft.util.Formatting; + +import java.util.ArrayList; + +public class Randar extends Module { + public Randar() { + super(Addon.CATEGORY, "Randar", "A Quick and dirty minimap using the Randar exploit"); + } + + @Override + public void onActivate() {} + + @Override + public void onDeactivate() {} + + public void clearMap(){ + positonRanges = new ArrayList<>(); + } + + + private class positonRange { + public final int startX; + public final int startY; + public final int endX; + public final int endY; + + public positonRange(int startX, int startY, int endX, int endY){ + this.startX = startX; + this.startY = startY; + this.endX = endX; + this.endY = endY; + } + } + + private final SettingGroup sgGeneral = settings.getDefaultGroup(); + private positonRange nextPositonRange; + + + public enum Corner { + Top_Left, + Top_Right, + Bottom_Left, + Bottom_Right + } + + private final Setting seed = sgGeneral.add(new StringSetting.Builder() + .name("Seed") + .description("The seed of the server to crack positions") + .defaultValue("-1337") + .visible(() -> true) + .build() + ); + + private final Setting mapCorner = sgGeneral.add(new EnumSetting.Builder() + .name("Map Corner") + .description("The corner that the map is in") + .defaultValue(Corner.Bottom_Left) + .visible(() -> true) + .build() + ); + + private final Setting mapScale = sgGeneral.add(new IntSetting.Builder() + .name("Map Range") + .description("The bounds of the visualization (blocks)") + .defaultValue(10000) + .min(1) + .max(30000000) + .sliderMax(500000) + .visible(() -> true) + .build() + ); + + private final Setting mapSize = sgGeneral.add(new IntSetting.Builder() + .name("Size") + .description("The scale of the map in pixels") + .defaultValue(150) + .min(1) + .sliderMax(500) + .visible(() -> true) + .build() + ); + + private final Setting smearSetting = sgGeneral.add(new IntSetting.Builder() + .name("Smear") + .description("Smear invisible map areas to make them more visible") + .defaultValue(1) + .min(0) + .sliderMax(10) + .visible(() -> true) + .build() + ); + + private final Setting radarMode = sgGeneral.add(new BoolSetting.Builder() + .name("Radar Mode") + .description("Centers the visualization around the player, not [0,0].") + .defaultValue(true) + .visible(() -> true) + .build() + ); + + private final Setting verboseMode = sgGeneral.add(new BoolSetting.Builder() + .name("Verbose") + .description("Print the output of scanning.") + .defaultValue(false) + .visible(() -> true) + .build() + ); + + + + + @EventHandler + private void onReceivePacket(PacketEvent.Receive event) { + if(!isActive()){return;} + if(!(event.packet instanceof EntitySpawnS2CPacket)){return;} + final EntitySpawnS2CPacket packet = (EntitySpawnS2CPacket) event.packet; + if(!(packet.getEntityType() == EntityType.ITEM)){return;} + if(!(packet.getVelocityY() == 0.2)){return;} + + + new Thread(() -> crackItemDropCoordinate(packet.getX(), packet.getY(), packet.getZ())).start(); +// ChatUtils.sendMsg(Formatting.AQUA, "X: " + packet.getX() + " Y: " + packet.getY() + " Z: " + packet.getZ()); +// ChatUtils.sendMsg(Formatting.AQUA, "Y: " + packet.getVelocityY()); + } + + private static int clamp(long val, int min, int max) { + return (int)Math.max(min, Math.min(max, val)); + } + + private static int map(long val, int oldRange, int newRange) { + return (int) Math.round(((double)val/oldRange)*newRange); + } + + ArrayList positonRanges = new ArrayList<>(); + final int crosshair_tickness = 5; + + @EventHandler + public void onRender2D(Render2DEvent event){ + if(!(isActive())){return;} + + final int boxX; + final int boxY; + final int width = mapSize.get(); + final int height = mapSize.get(); + + switch (mapCorner.get()){ + case Top_Left: + boxX = 0; + boxY = 0; + break; + case Top_Right: + boxX = mc.getWindow().getFramebufferWidth()-mapSize.get(); + boxY = 0; + break; + case Bottom_Left: + boxX = 0; + boxY = mc.getWindow().getFramebufferHeight()-mapSize.get(); + break; + case Bottom_Right: + boxX = mc.getWindow().getFramebufferWidth()-mapSize.get(); + boxY = mc.getWindow().getFramebufferHeight()-mapSize.get(); + break; + default: + boxX = 0; + boxY = 0; + break; + } + + final int centerX; + final int centerY; + if(radarMode.get()){ + centerX = (int)mc.player.getX(); + centerY = (int)mc.player.getZ(); + }else{ + centerX = 0; + centerY = 0; + } + + + + Renderer2D.COLOR.begin(); + + Renderer2D.COLOR.quad(boxX,boxY,width,height,new Color(0,0,0)); + + final int mapBound = mapScale.get(); + final int smear = smearSetting.get(); + + if(nextPositonRange != null){ + // This weirdness is to avoid a ConcurrentModificationException + positonRanges.add(nextPositonRange); + nextPositonRange = null; + } + + for(positonRange posRange: positonRanges){ +// int scaledX = boxX + (posRange.startX + mapBound) * width / (2 * mapBound); +// int scaledY = boxY + (posRange.startY + mapBound) * height / (2 * mapBound); +// int scaledWidth = (posRange.endX - startX) * width / (2 * mapBound); +// int scaledHeight = (posRange.endY - startY) * height / (2 * mapBound); + + int x = boxX+(width/2)+map(posRange.startX-centerX, mapBound, width); + int y = boxY+(height/2)+map(posRange.startY-centerY, mapBound, height); + int w = map(Math.abs(posRange.endX-posRange.startX), mapBound, width); + int h = map(Math.abs(posRange.endY-posRange.startY), mapBound, height); + +// System.out.println(x + " " + y + " " + w + " " + h); + + Renderer2D.COLOR.quad( + x-smear, y-smear, + w+(smear*2), h+(smear*2), + new Color(255,255,255)); + } + + Renderer2D.COLOR.quad(boxX+(int)((width+ crosshair_tickness)/2),boxY, crosshair_tickness,height,new Color(255,255,255, 64)); + Renderer2D.COLOR.quad(boxX,boxY+(int)((height+ crosshair_tickness)/2),width, crosshair_tickness,new Color(255,255,255, 64)); + + + Renderer2D.COLOR.render(null); + + } + +// private static long WORLD_SEED = Long.parseLong("-3010010539417993252"); + + + private void crackItemDropCoordinate(double dropX, double dropY, double dropZ) { + float spawnX = ((float) (dropX - (int) Math.floor(dropX) - 0.25d)) * 2; + float spawnY = ((float) (dropY - (int) Math.floor(dropY) - 0.25d)) * 2; + float spawnZ = ((float) (dropZ - (int) Math.floor(dropZ) - 0.25d)) * 2; + if (spawnX <= 0 || spawnX >= 1 || spawnY <= 0 || spawnY >= 1 || spawnZ <= 0 || spawnZ >= 1) { + if(verboseMode.get()) { + ChatUtils.sendMsg(Formatting.AQUA, "[Randar] Skipping this item because its coordinates are out of bounds. This probably means that the item only coincidentally looked like an item that was dropped from mining a block. Other ways to drop items (e.g. dropping from a player's inventory) can sometimes cause false positives like this."); + } + return; + } + int measurement1 = (int) (spawnX * (1 << 24)); + int measurement2 = (int) (spawnY * (1 << 24)); + int measurement3 = (int) (spawnZ * (1 << 24)); + long cubeCenterX = ((long) measurement1 << 24) + 8388608L; + long cubeCenterY = ((long) measurement2 << 24) + 8388597L; + long cubeCenterZ = ((long) measurement3 << 24) - 277355554490L; + double basisCoeff0 = 9.555378710501827E-11 * cubeCenterX + -2.5481838861196593E-10 * cubeCenterY + 1.184083942007419E-10 * cubeCenterZ; + double basisCoeff1 = -1.2602185961441137E-10 * cubeCenterX + 6.980727107475104E-11 * cubeCenterY + 1.5362999761237006E-10 * cubeCenterZ; + double basisCoeff2 = -1.5485213111787743E-10 * cubeCenterX + -1.2997958265259513E-10 * cubeCenterY + -5.6285642813236336E-11 * cubeCenterZ; + long locSeed = Math.round(basisCoeff0) * 1270789291L + Math.round(basisCoeff1) * -2355713969L + Math.round(basisCoeff2) * -3756485696L & 281474976710655L; + long next = locSeed * 25214903917L + 11L & 281474976710655L; + long nextNext = next * 25214903917L + 11L & 281474976710655L; + if ((locSeed >> 24 ^ measurement1 | next >> 24 ^ measurement2 | nextNext >> 24 ^ measurement3) != 0L) { + if(verboseMode.get()) { + ChatUtils.sendMsg(Formatting.AQUA, "[Randar] Failed to crack the locSeed. This probably means that the item only coincidentally looked like an item that was dropped from mining a block. Other ways to drop items (e.g. dropping from a player's inventory) can sometimes cause false positives like this."); + } + return; + } + long origSeed = locSeed; + for (int i = 0; i < 5000; i++) { + for (int x = -23440; x <= 23440; x++) { + long z = (((locSeed ^ 25214903917L) - Long.parseLong(seed.get()) - 10387319 - x * 341873128712L) * 211541297333629L) << 16 >> 16; + if (z >= -23440 && z <= 23440) { + if(verboseMode.get()) { + ChatUtils.sendMsg(Formatting.AQUA, "[Randar] Item drop appeared at " + dropX + " " + dropY + " " + dropZ); + ChatUtils.sendMsg(Formatting.AQUA, "[Randar] RNG measurements are therefore " + measurement1 + " " + measurement2 + " " + measurement3); + ChatUtils.sendMsg(Formatting.AQUA, "[Randar] This indicates the java.util.Random internal locSeed must have been " + origSeed); + ChatUtils.sendMsg(Formatting.AQUA, "[Randar] Found a woodland match at woodland region " + x + " " + z + " which would have set the locSeed to " + locSeed); + } + final int startX = (int)(x * 1280 - 128); + final int startY = (int)(z * 1280 - 128); + final int endX = (int)(z * 1280 - 128); + final int endY = (int)(z * 1280 + 1151); + nextPositonRange = new positonRange(startX, startY, endX, endY); + ChatUtils.sendMsg(Formatting.AQUA, "[Randar] Located someone between " + startX + "," + startY + " and " + endX + "," + endY); + return; + } + } + locSeed = (locSeed * 246154705703781L + 107048004364969L) & 281474976710655L; + } + if(verboseMode.get()) { + ChatUtils.sendMsg(Formatting.AQUA, "[Randar] Failed to crack. This probably means that your world locSeed is incorrect, or there were no chunk loads recently."); + } + } +} diff --git a/src/main/resources/assets/template/icon.png b/src/main/resources/assets/template/icon.png new file mode 100644 index 0000000..3fb2e7f Binary files /dev/null and b/src/main/resources/assets/template/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..5f8553d --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,33 @@ +{ + "schemaVersion": 1, + "id": "randar-minimap", + "version": "${version}", + "name": "Randar Minmap", + "description": "A Quick and dirty minimap using the Randar exploit", + "website": "https://github.com/astatin3/randar-minimap", + "issues": "https://github.com/astatin3/randar-minimap/issues", + "authors": [ + "ASTATIN3" + ], + "contact": { + "repo": "https://github.com/astatin3/Randar-minimap" + }, + "icon": "assets/template/icon.png", + "environment": "client", + "entrypoints": { + "meteor": [ + "com.astatin3.randarminimap.Addon" + ] + }, + "mixins": [ + "randar-minimap.mixins.json" + ], + "custom": { + "meteor-client:color": "225,25,25" + }, + "depends": { + "java": ">=17", + "minecraft": ">=${mc_version}", + "meteor-client": "*" + } +} diff --git a/src/main/resources/randar-minimap.mixins.json b/src/main/resources/randar-minimap.mixins.json new file mode 100644 index 0000000..8d5dc3c --- /dev/null +++ b/src/main/resources/randar-minimap.mixins.json @@ -0,0 +1,9 @@ +{ + "required": true, + "package": "com.astatin3.randar.mixin", + "compatibilityLevel": "JAVA_17", + "client": [], + "injectors": { + "defaultRequire": 1 + } +}