diff --git a/.factorypath b/.factorypath deleted file mode 100644 index d0b65a4..0000000 --- a/.factorypath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml deleted file mode 100644 index 1968d26..0000000 --- a/.github/workflows/gradle.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Automate Gradlew Build - -on: - workflow_dispatch: - -permissions: - contents: read - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - distribution: "temurin" - java-version: "21" - check-latest: true - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: false - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Build (release) - run: ./gradlew clean build -x test --no-daemon --stacktrace - - - name: Remove sources JARs - run: | - rm -f build/libs/*sources*.jar - echo "Removed sources JARs from build/libs" - - - name: Upload build artifact - uses: actions/upload-artifact@v4 - with: - name: saturnclient-latest - path: build/libs/saturnclient-*.jar - if-no-files-found: error diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml deleted file mode 100644 index 5016b03..0000000 --- a/.github/workflows/push.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Push Builds - -on: - push: - branches: [ "master" ] - -permissions: - contents: read - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - distribution: "temurin" - java-version: "21" - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: false - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Build - run: ./gradlew clean build -x test --no-daemon --stacktrace - - - name: Remove sources JARs - run: | - rm -f build/libs/*sources*.jar - echo "Removed sources JARs from build/libs" - - - name: Create timestamped JAR - run: | - TIMESTAMP=$(date -u +"%Y%m%d-%H%M%S") - MAIN_JAR=$(ls build/libs/saturnclient-*.jar | head -1) - cp "$MAIN_JAR" "saturnclient-${TIMESTAMP}.jar" - echo "Created: saturnclient-${TIMESTAMP}.jar" - - - name: Upload timestamped artifact - uses: actions/upload-artifact@v4 - with: - name: saturnclient-${{ github.run_number }} - path: saturnclient-*.jar - if-no-files-found: error diff --git a/NOTICES.md b/NOTICES.md index a2b3383..1f2594c 100644 --- a/NOTICES.md +++ b/NOTICES.md @@ -1,6 +1,6 @@ # Licenses -This project is under [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0), but a lot of code taken from other open source projects that are under other licenses that need to be mentioned due to legal reasons. +This project is under [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0), but a lot of code taken from other open source projects that are under other licenses that need to be mentioned due to legal or ethical reasons. | File | License | | --------------------------------------------------------------------------------------- | ----------------------------------------------------------- | diff --git a/VERSION_GUIDE.md b/VERSION_GUIDE.md new file mode 100644 index 0000000..34b948e --- /dev/null +++ b/VERSION_GUIDE.md @@ -0,0 +1,3 @@ +# Version guide + +This guide will help you to add or edit minecraft versions. diff --git a/build.gradle b/build.gradle index dac203e..f93c9d6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,190 +1,37 @@ -/* - * ================================================================ - * Saturn Client - Fabric Mod Build Configuration - * ================================================================ - * - * This build file configures: - * - Fabric Loom (Minecraft mod development) - * - Dependency management - * - Resource processing - * - Java toolchain (Java 21) - * - Publishing setup - * - * All version values are defined in gradle.properties. - * ================================================================ - */ - -plugins { - // Fabric mod development plugin - id 'fabric-loom' version '1.9-SNAPSHOT' - - // Maven publishing support - id 'maven-publish' -} - -/* - * ================================================================ - * Project Metadata - * ================================================================ - */ - -version = project.mod_version -group = project.maven_group - -/* - * ================================================================ - * Repositories - * ================================================================ - * All dependency sources. - */ -repositories { - // Fabric - maven { url 'https://maven.fabricmc.net/' } - - // JitPack (GitHub releases) - maven { url 'https://jitpack.io' } - - // Parchment mappings (if needed later) - maven { url 'https://maven.parchmentmc.org' } - - // Player Animation Library - maven { name = "KoSmX Maven"; url = 'https://maven.kosmx.dev/' } - - // Central repository - mavenCentral() -} - -/* - * ================================================================ - * Dependencies - * ================================================================ - */ -dependencies { - - // ───────────────────────────────────────────── - // Minecraft Core - // ───────────────────────────────────────────── - minecraft "com.mojang:minecraft:${project.minecraft_version}" - - // Yarn mappings (named mappings for dev environment) - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - - // Fabric Loader - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - - - // ───────────────────────────────────────────── - // Rendering / Model Libraries - // ───────────────────────────────────────────── - - // OBJ Reading Library - implementation "de.javagl:obj:0.4.0" - include "de.javagl:obj:0.4.0" - - // SVG Rendering Library - include implementation("com.formdev:svgSalamander:1.1.4") - - - // ───────────────────────────────────────────── - // Animation - // ───────────────────────────────────────────── - - // Player Animation Library - include modImplementation( - "dev.kosmx.player-anim:player-animation-lib-fabric:${project.player_anim}" - ) - - // Optional: BendyLib - // include modRuntimeOnly( - // "io.github.kosmx.bendy-lib:bendy-lib-fabric:${project.bendylib_version}" - // ) - - - // ───────────────────────────────────────────── - // External Libraries - // ───────────────────────────────────────────── - - // Session Java (Saturn auth/session handling) - include implementation("com.github.selimaj-dev:session-java:0.1.6") -} - - -/* - * ================================================================ - * Resource Processing - * ================================================================ - * Injects version values into fabric.mod.json. - */ -processResources { - inputs.property "version", project.version - inputs.property "minecraft_version", project.minecraft_version - inputs.property "loader_version", project.loader_version - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand( - "version": project.version, - "minecraft_version": project.minecraft_version, - "loader_version": project.loader_version - ) - } -} - - -/* - * ================================================================ - * Java Configuration - * ================================================================ - * Targeting Java 21. - */ -def targetJavaVersion = 21 - -tasks.withType(JavaCompile).configureEach { - options.encoding = "UTF-8" - options.release.set(targetJavaVersion) -} - -java { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - - archivesBaseName = project.archives_base_name - withSourcesJar() -} - - -/* - * ================================================================ - * Jar Packaging - * ================================================================ - * Includes LICENSE and NOTICE inside the final jar. - */ -jar { - from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } - } - from("NOTICE") { - rename { "${it}_${project.archivesBaseName}" } - } -} - - -/* - * ================================================================ - * Publishing - * ================================================================ - * Configured but no remote repository defined yet. - */ -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } +subprojects { + apply plugin: "java" repositories { - // Add publishing repository here when needed + mavenCentral() + maven { url "https://maven.fabricmc.net/" } + maven { url "https://jitpack.io" } } -} \ No newline at end of file + + dependencies { + implementation "de.javagl:obj:0.4.0" + implementation "com.formdev:svgSalamander:1.1.4" + implementation "com.github.selimaj-dev:session-java:0.1.6" + } +} + +configure(subprojects.findAll { it.name != "common" }) { + dependencies { + implementation project(":common") + + sourceSets { + main { + resources { + srcDir project(":common").file("src/main/resources") + } + } + } + } +} + +configure(subprojects.findAll { it.name == "common" }) { + dependencies { + implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.17.0' + implementation 'com.fasterxml.jackson.core:jackson-core:2.17.0' + } +} diff --git a/common/.gitignore b/common/.gitignore new file mode 100644 index 0000000..192a912 --- /dev/null +++ b/common/.gitignore @@ -0,0 +1,35 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ +logs/ + diff --git a/common/LICENSE b/common/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/common/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/common/README.md b/common/README.md new file mode 100644 index 0000000..cac9730 --- /dev/null +++ b/common/README.md @@ -0,0 +1,2 @@ +# common +The cross-version code powering Saturn Client diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..1e091b0 --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,7 @@ +plugins { + id "java-library" +} + +java { + toolchain.languageVersion = JavaLanguageVersion.of(21) +} diff --git a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java b/common/src/main/java/org/saturnclient/client/ServiceClient.java similarity index 60% rename from src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java rename to common/src/main/java/org/saturnclient/client/ServiceClient.java index 4102704..c5a7cf4 100644 --- a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java +++ b/common/src/main/java/org/saturnclient/client/ServiceClient.java @@ -1,25 +1,22 @@ -package org.saturnclient.saturnclient.client; +package org.saturnclient.client; import java.util.UUID; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.TimeUnit; -import org.saturnclient.cosmetics.cloak.Cloaks; -import org.saturnclient.cosmetics.hat.Hats; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.common.minecraft.bindings.SaturnClientBindings; -import dev.kosmx.playerAnim.api.layered.AnimationStack; -import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; -import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationRegistry; import dev.selimaj.session.Session; -import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; -import net.minecraft.client.network.AbstractClientPlayerEntity; -import net.minecraft.util.Identifier; public class ServiceClient { private static Session session; public static UUID uuid; + public static final List availableCloaks = new ArrayList<>(); + public static final List availableHats = new ArrayList<>(); + public static boolean connectTimeout() { try { session = Session.connect("wss://saturn-server.selimaj.dev", 10, TimeUnit.SECONDS); @@ -30,31 +27,30 @@ public class ServiceClient { } public static boolean authenticate() { - ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> { - if (session != null) + SaturnClientBindings.platform().onClientStopping(() -> { + if (session != null) { try { session.close(); } catch (Exception e) { - SaturnClient.LOGGER.error("Unable to close Saturn session"); - + SaturnClientBindings.platform().logError("Unable to close Saturn session", e); } + } }); try { - var mcSession = SaturnClient.client.getSession(); - if (mcSession == null) { - SaturnClient.LOGGER.error("No active Minecraft session found"); + String accessToken = SaturnClientBindings.platform().getAccessToken(); + uuid = SaturnClientBindings.platform().getUuid(); + String username = SaturnClientBindings.platform().getUsername(); + + if (accessToken == null || uuid == null || username == null) { + SaturnClientBindings.platform().logError("No active Minecraft session found"); return false; } - String accessToken = mcSession.getAccessToken(); - uuid = mcSession.getUuidOrNull(); - String username = mcSession.getUsername(); - - SaturnClient.LOGGER.info("Authenticating with UUID: " + uuid); + SaturnClientBindings.platform().logInfo("Authenticating with UUID: " + uuid); if (!connectTimeout()) { - SaturnClient.LOGGER.error("Unable to authenticate: Session Server Timeout"); + SaturnClientBindings.platform().logError("Unable to authenticate: Session Server Timeout"); return false; } @@ -62,22 +58,20 @@ public class ServiceClient { .get(); for (String availableCloak : response.cloaks()) { - Cloaks.availableCloaks.add(availableCloak); + availableCloaks.add(availableCloak); } for (String availableHat : response.hats()) { - Hats.availableHats.add(availableHat); + availableHats.add(availableHat); } eventHandlers(); SaturnPlayer.set(new SaturnPlayer(uuid, username, response.cloak(), response.hat())); - Cloaks.loadCloak(uuid); - return true; } catch (Exception e) { - SaturnClient.LOGGER.error("Authentication failed", e); + SaturnClientBindings.platform().logError("Authentication failed", e); return false; } } @@ -97,7 +91,7 @@ public class ServiceClient { } }); } catch (Exception e) { - SaturnClient.LOGGER.error("Failed to set cloak (service): ", e); + SaturnClientBindings.platform().logError("Failed to set cloak (service): ", e); } } @@ -116,7 +110,7 @@ public class ServiceClient { } }); } catch (Exception e) { - SaturnClient.LOGGER.error("Failed to set hat (service): ", e); + SaturnClientBindings.platform().logError("Failed to set hat (service): ", e); } } @@ -126,11 +120,11 @@ public class ServiceClient { if (throwable != null) { throwable.printStackTrace(); } else { - Cloaks.availableCloaks.add(itemId); + availableCloaks.add(itemId); } }); } catch (Exception e) { - SaturnClient.LOGGER.error("Failed to buy cloak (service): ", e); + SaturnClientBindings.platform().logError("Failed to buy cloak (service): ", e); } } @@ -140,11 +134,11 @@ public class ServiceClient { if (throwable != null) { throwable.printStackTrace(); } else { - Hats.availableHats.add(itemId); + availableHats.add(itemId); } }); } catch (Exception e) { - SaturnClient.LOGGER.error("Failed to buy hat (service): ", e); + SaturnClientBindings.platform().logError("Failed to buy hat (service): ", e); } } @@ -158,27 +152,26 @@ public class ServiceClient { } }); } catch (Exception e) { - SaturnClient.LOGGER.error("Failed to emote (service): ", e); + SaturnClientBindings.platform().logError("Failed to emote (service): ", e); } } public static void eventHandlers() { session.onNotification(ServiceMethods.EmoteEvent, (data) -> { - for (AbstractClientPlayerEntity player : SaturnClient.client.world.getPlayers()) { - if (player.getUuidAsString().equals(data.from())) { - AnimationStack animationStack = PlayerAnimationAccess.getPlayerAnimLayer(player); - if (data.emote() != null && !data.emote().isEmpty()) { - if (animationStack.isActive() && animationStack.getPriority() == 1000) { - animationStack.removeLayer(1000); - } - animationStack.addAnimLayer(1000, - PlayerAnimationRegistry - .getAnimation(Identifier.of("saturnclient", data.emote())) - .playAnimation()); - } else { - animationStack.removeLayer(1000); - } - } + if (data == null) { + return; + } + UUID from; + try { + from = UUID.fromString(data.from()); + } catch (Exception e) { + return; + } + + if (data.emote() != null && !data.emote().isEmpty()) { + SaturnClientBindings.emotes().setEmote(from, data.emote()); + } else { + SaturnClientBindings.emotes().setEmote(from, null); } }); @@ -199,7 +192,7 @@ public class ServiceClient { } }); } catch (Exception e) { - SaturnClient.LOGGER.error("Failed to get player", e); + SaturnClientBindings.platform().logError("Failed to get player", e); } } } diff --git a/src/main/java/org/saturnclient/saturnclient/client/ServiceMethods.java b/common/src/main/java/org/saturnclient/client/ServiceMethods.java similarity index 94% rename from src/main/java/org/saturnclient/saturnclient/client/ServiceMethods.java rename to common/src/main/java/org/saturnclient/client/ServiceMethods.java index 0a09c53..ac77b4e 100644 --- a/src/main/java/org/saturnclient/saturnclient/client/ServiceMethods.java +++ b/common/src/main/java/org/saturnclient/client/ServiceMethods.java @@ -1,9 +1,9 @@ -package org.saturnclient.saturnclient.client; +package org.saturnclient.client; import java.util.UUID; -import org.saturnclient.saturnclient.client.ServiceMethods.Types.SendPlayerRequest; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.client.ServiceMethods.Types.SendPlayerRequest; +import org.saturnclient.client.player.SaturnPlayer; import dev.selimaj.session.types.Method; @@ -110,4 +110,4 @@ public class ServiceMethods { SendPlayerRequest.class, Void.class, String.class); -} \ No newline at end of file +} diff --git a/src/main/java/org/saturnclient/saturnclient/client/player/Roles.java b/common/src/main/java/org/saturnclient/client/player/Roles.java similarity index 65% rename from src/main/java/org/saturnclient/saturnclient/client/player/Roles.java rename to common/src/main/java/org/saturnclient/client/player/Roles.java index 219174b..38f4bc8 100644 --- a/src/main/java/org/saturnclient/saturnclient/client/player/Roles.java +++ b/common/src/main/java/org/saturnclient/client/player/Roles.java @@ -1,11 +1,9 @@ -package org.saturnclient.saturnclient.client.player; +package org.saturnclient.client.player; import java.util.Map; import java.util.UUID; -import org.saturnclient.saturnclient.config.Config; - -import net.minecraft.util.Formatting; +import org.saturnclient.config.Config; public class Roles { static enum Role { @@ -30,32 +28,32 @@ public class Roles { * - Contributor: Aqua * - Other/player: White */ - public static Formatting getIconColor(UUID uuid) { + public static int getIconColor(UUID uuid) { Role role = ROLES.get(uuid); if (role == null) { - return Formatting.WHITE; + return 0xFFFFFF; } switch (role) { case OWNER: - return Formatting.DARK_RED; + return 0xAA0000; case ADMIN: - return Formatting.RED; + return 0xFF5555; case PARTNER: - return Formatting.GOLD; + return 0xFFAA00; case CONTRIBUTOR: - return Formatting.AQUA; + return 0x55FFFF; default: - return Formatting.WHITE; + return 0xFFFFFF; } } public static String getSaturnIndicator() { - return Config.realisticLogo.value ? "" : ""; + return Config.realisticLogo.value ? "\uE003" : "\uE002"; } } diff --git a/src/main/java/org/saturnclient/saturnclient/client/player/SaturnPlayer.java b/common/src/main/java/org/saturnclient/client/player/SaturnPlayer.java similarity index 71% rename from src/main/java/org/saturnclient/saturnclient/client/player/SaturnPlayer.java rename to common/src/main/java/org/saturnclient/client/player/SaturnPlayer.java index f4c935e..dce3337 100644 --- a/src/main/java/org/saturnclient/saturnclient/client/player/SaturnPlayer.java +++ b/common/src/main/java/org/saturnclient/client/player/SaturnPlayer.java @@ -1,11 +1,10 @@ -package org.saturnclient.saturnclient.client.player; +package org.saturnclient.client.player; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.jetbrains.annotations.Nullable; -import org.saturnclient.saturnclient.client.ServiceClient; +import org.saturnclient.common.minecraft.bindings.SaturnClientBindings; public class SaturnPlayer { private static Map PLAYERS = new HashMap<>(); @@ -23,17 +22,18 @@ public class SaturnPlayer { this.name = name; } - @Nullable public static SaturnPlayer get() { - return PLAYERS.get(ServiceClient.uuid); + UUID self = SaturnClientBindings.platform().getUuid(); + if (self == null) { + return null; + } + return PLAYERS.get(self); } - @Nullable public static SaturnPlayer get(UUID uuid) { return PLAYERS.get(uuid); } - @Nullable public static SaturnPlayer get(String name) { UUID uuid = PLAYER_NAMES.get(name); if (uuid == null) @@ -47,7 +47,8 @@ public class SaturnPlayer { } public static String[] getExternalUUIDAsString() { - return PLAYERS.keySet().stream().filter(id -> !id.equals(ServiceClient.uuid)).map(UUID::toString) + UUID self = SaturnClientBindings.platform().getUuid(); + return PLAYERS.keySet().stream().filter(id -> self == null || !id.equals(self)).map(UUID::toString) .toArray(String[]::new); } diff --git a/common/src/main/java/org/saturnclient/common/minecraft/IMinecraftClient.java b/common/src/main/java/org/saturnclient/common/minecraft/IMinecraftClient.java new file mode 100644 index 0000000..c429de9 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/IMinecraftClient.java @@ -0,0 +1,16 @@ +package org.saturnclient.common.minecraft; + +import java.io.File; +import java.io.InputStream; + +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.minecraft.render.IWindow; + +public interface IMinecraftClient { + + public File getRunDirectory(); + + public InputStream getResource(SaturnIdentifier identifier); + + public IWindow getWindow(); +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/MinecraftBinding.java b/common/src/main/java/org/saturnclient/common/minecraft/MinecraftBinding.java new file mode 100644 index 0000000..7f96808 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/MinecraftBinding.java @@ -0,0 +1,18 @@ +package org.saturnclient.common.minecraft; + +public class MinecraftBinding { + public Object inner; + + public MinecraftBinding(Object binding) { + this.inner = binding; + } + + @SuppressWarnings("unchecked") + public T get() { + try { + return (T) inner; + } catch (ClassCastException e) { + return null; + } + } +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/MinecraftProvider.java b/common/src/main/java/org/saturnclient/common/minecraft/MinecraftProvider.java new file mode 100644 index 0000000..8d65972 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/MinecraftProvider.java @@ -0,0 +1,34 @@ +package org.saturnclient.common.minecraft; + +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.ui.SaturnScreen; + +import java.awt.image.BufferedImage; + +public abstract class MinecraftProvider { + public static MinecraftProvider PROVIDER; + + public static enum MinecraftScreen { + SelectWorld, + Multiplayer, + Options + } + + public abstract IMinecraftClient getClient(); + + public abstract void setScreen(SaturnScreen screen); + + public abstract void setScreen(MinecraftScreen screen); + + public abstract Object createIdentifier(String namespace, String path); + + public abstract boolean isKeyPressed(int key); + + public abstract int getWidth(String text, int font); + + public abstract void registerBufferedImageTexture(SaturnIdentifier i, BufferedImage bi); + + public abstract String getKeyName(int key); + + public abstract void stop(); +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnClientBindings.java b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnClientBindings.java new file mode 100644 index 0000000..cbec7a5 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnClientBindings.java @@ -0,0 +1,31 @@ +package org.saturnclient.common.minecraft.bindings; + +public final class SaturnClientBindings { + private static SaturnPlatformBindings platform; + private static SaturnEmoteBindings emotes; + + private SaturnClientBindings() { + } + + public static void setPlatform(SaturnPlatformBindings bindings) { + platform = bindings; + } + + public static SaturnPlatformBindings platform() { + if (platform == null) { + throw new IllegalStateException("SaturnPlatformBindings not initialized"); + } + return platform; + } + + public static void setEmotes(SaturnEmoteBindings bindings) { + emotes = bindings; + } + + public static SaturnEmoteBindings emotes() { + if (emotes == null) { + throw new IllegalStateException("SaturnEmoteBindings not initialized"); + } + return emotes; + } +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnEmoteBindings.java b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnEmoteBindings.java new file mode 100644 index 0000000..e987f70 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnEmoteBindings.java @@ -0,0 +1,7 @@ +package org.saturnclient.common.minecraft.bindings; + +import java.util.UUID; + +public interface SaturnEmoteBindings { + void setEmote(UUID fromPlayerUuid, String emoteIdOrNull); +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnIdentifier.java b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnIdentifier.java new file mode 100644 index 0000000..efcc765 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnIdentifier.java @@ -0,0 +1,33 @@ +package org.saturnclient.common.minecraft.bindings; + +import org.saturnclient.common.minecraft.MinecraftBinding; +import org.saturnclient.common.minecraft.MinecraftProvider; + +public class SaturnIdentifier extends MinecraftBinding { + public SaturnIdentifier(String namespace, String path) { + super(MinecraftProvider.PROVIDER.createIdentifier(namespace, path)); + } + + public SaturnIdentifier(Object o) { + super(o); + } + + public static SaturnIdentifier of(String namespace, String path) { + return new SaturnIdentifier(namespace, path); + } + + public static SaturnIdentifier of(String fullPath) { + String[] p = fullPath.split(":", 2); + + return new SaturnIdentifier(p[0], p[1]); + } + + public static SaturnIdentifier ofVanilla(String path) { + return new SaturnIdentifier("minecraft", path); + } + + @Override + public String toString() { + return this.inner.toString(); + } +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnItemStack.java b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnItemStack.java new file mode 100644 index 0000000..664cc97 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnItemStack.java @@ -0,0 +1,9 @@ +package org.saturnclient.common.minecraft.bindings; + +import org.saturnclient.common.minecraft.MinecraftBinding; + +public class SaturnItemStack extends MinecraftBinding { + public SaturnItemStack(Object binding) { + super(binding); + } +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnPlatformBindings.java b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnPlatformBindings.java new file mode 100644 index 0000000..46ba569 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnPlatformBindings.java @@ -0,0 +1,19 @@ +package org.saturnclient.common.minecraft.bindings; + +import java.util.UUID; + +public interface SaturnPlatformBindings { + String getAccessToken(); + + UUID getUuid(); + + String getUsername(); + + void onClientStopping(Runnable handler); + + void logInfo(String message); + + void logError(String message); + + void logError(String message, Throwable throwable); +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnQuaternionf.java b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnQuaternionf.java new file mode 100644 index 0000000..deba303 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnQuaternionf.java @@ -0,0 +1,9 @@ +package org.saturnclient.common.minecraft.bindings; + +import org.saturnclient.common.minecraft.MinecraftBinding; + +public class SaturnQuaternionf extends MinecraftBinding { + public SaturnQuaternionf(Object o) { + super(o); + } +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnSprite.java b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnSprite.java new file mode 100644 index 0000000..0db35df --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnSprite.java @@ -0,0 +1,9 @@ +package org.saturnclient.common.minecraft.bindings; + +import org.saturnclient.common.minecraft.MinecraftBinding; + +public class SaturnSprite extends MinecraftBinding { + public SaturnSprite(Object binding) { + super(binding); + } +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/render/IMatrixStack.java b/common/src/main/java/org/saturnclient/common/minecraft/render/IMatrixStack.java new file mode 100644 index 0000000..a588891 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/render/IMatrixStack.java @@ -0,0 +1,25 @@ +package org.saturnclient.common.minecraft.render; + +import org.saturnclient.common.minecraft.bindings.SaturnQuaternionf; + +public interface IMatrixStack { + public void translate(double x, double y, double z); + + public void translate(float x, float y, float z); + + public void scale(float x, float y, float z); + + public void multiply(SaturnQuaternionf quaternion); + + public void multiply(SaturnQuaternionf quaternion, float originX, float originY, float originZ); + + public void push(); + + public void pop(); + + public Object peek(); + + public boolean isEmpty(); + + public void loadIdentity(); +} diff --git a/common/src/main/java/org/saturnclient/common/minecraft/render/IWindow.java b/common/src/main/java/org/saturnclient/common/minecraft/render/IWindow.java new file mode 100644 index 0000000..c90b456 --- /dev/null +++ b/common/src/main/java/org/saturnclient/common/minecraft/render/IWindow.java @@ -0,0 +1,11 @@ +package org.saturnclient.common.minecraft.render; + +public interface IWindow { + public int getWidth(); + + public int getHeight(); + + public int getFramebufferWidth(); + + public int getFramebufferHeight(); +} diff --git a/src/main/java/org/saturnclient/saturnclient/config/AnimationConfig.java b/common/src/main/java/org/saturnclient/config/AnimationConfig.java similarity index 91% rename from src/main/java/org/saturnclient/saturnclient/config/AnimationConfig.java rename to common/src/main/java/org/saturnclient/config/AnimationConfig.java index 0c76f73..615b5c3 100644 --- a/src/main/java/org/saturnclient/saturnclient/config/AnimationConfig.java +++ b/common/src/main/java/org/saturnclient/config/AnimationConfig.java @@ -1,7 +1,7 @@ -package org.saturnclient.saturnclient.config; +package org.saturnclient.config; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Property; public class AnimationConfig { public static ConfigManager config; diff --git a/src/main/java/org/saturnclient/saturnclient/config/Config.java b/common/src/main/java/org/saturnclient/config/Config.java similarity index 62% rename from src/main/java/org/saturnclient/saturnclient/config/Config.java rename to common/src/main/java/org/saturnclient/config/Config.java index 109deea..d30852a 100644 --- a/src/main/java/org/saturnclient/saturnclient/config/Config.java +++ b/common/src/main/java/org/saturnclient/config/Config.java @@ -1,11 +1,13 @@ -package org.saturnclient.saturnclient.config; +package org.saturnclient.config; -import org.lwjgl.glfw.GLFW; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.resources.Textures; +import java.io.File; -import net.minecraft.util.Identifier; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Key; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.resources.Textures; public class Config { public static ConfigManager config; @@ -13,15 +15,17 @@ public class Config { public static Property realisticLogo = Property.bool(false); public static Property saturnTitleScreen = Property.bool(true); public static Property cloakPhysics = Property.bool(true); - public static Property openEmoteWheel = Property.keybinding(GLFW.GLFW_KEY_B); + public static Property openEmoteWheel = Property.keybinding(Key.GLFW_KEY_B); public static Property stagger = Property.bool(true); - public static Identifier getLogo() { + public static SaturnIdentifier getLogo() { return realisticLogo.value ? Textures.REALISTIC_LOGO : Textures.LOGO; } public static void init() { - config = new ConfigManager("Saturn Client"); + File configFile = new File(MinecraftProvider.PROVIDER.getClient().getRunDirectory(), "saturn.json"); + config = new ConfigManager(configFile, "Saturn Client"); + config.property("Realistic logo", realisticLogo); config.property("Saturn client title screen", saturnTitleScreen); config.property("Open Emote Wheel", openEmoteWheel); diff --git a/src/main/java/org/saturnclient/saturnclient/config/Theme.java b/common/src/main/java/org/saturnclient/config/Theme.java similarity index 94% rename from src/main/java/org/saturnclient/saturnclient/config/Theme.java rename to common/src/main/java/org/saturnclient/config/Theme.java index 6da4e1a..e1042a8 100644 --- a/src/main/java/org/saturnclient/saturnclient/config/Theme.java +++ b/common/src/main/java/org/saturnclient/config/Theme.java @@ -1,7 +1,7 @@ -package org.saturnclient.saturnclient.config; +package org.saturnclient.config; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Property; public class Theme { // Main UI background (slightly warm dark to match Saturn tone) diff --git a/src/main/java/org/saturnclient/saturnclient/config/manager/ConfigManager.java b/common/src/main/java/org/saturnclient/config/manager/ConfigManager.java similarity index 52% rename from src/main/java/org/saturnclient/saturnclient/config/manager/ConfigManager.java rename to common/src/main/java/org/saturnclient/config/manager/ConfigManager.java index 9bdc10d..6e2c829 100644 --- a/src/main/java/org/saturnclient/saturnclient/config/manager/ConfigManager.java +++ b/common/src/main/java/org/saturnclient/config/manager/ConfigManager.java @@ -1,7 +1,8 @@ -package org.saturnclient.saturnclient.config.manager; +package org.saturnclient.config.manager; -import com.google.gson.*; -import org.saturnclient.saturnclient.SaturnClient; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.File; import java.io.IOException; @@ -11,23 +12,36 @@ import java.util.Map; public class ConfigManager { - private static final File configFile = new File(SaturnClient.client.runDirectory, "saturn.json"); + private static final ObjectMapper MAPPER = new ObjectMapper(); + private static File configFile; // SINGLE ROOT TREE private static final Map> ROOT = new LinkedHashMap<>(); - private static JsonObject cachedJson = null; + private static JsonNode cachedJson = null; private final Map> currentMap; private final String[] path; + /** + * Creates a root namespace + */ + public ConfigManager(File configFile, String namespace) { + ConfigManager.configFile = configFile; + this.currentMap = new LinkedHashMap<>(); + this.path = new String[] { namespace }; + + ROOT.put(namespace, Property.namespace(currentMap)); + } + /** * Creates a root namespace */ public ConfigManager(String namespace) { this.currentMap = new LinkedHashMap<>(); - this.path = new String[] { namespace }; // Path is just ["namespace"] + this.path = new String[] { namespace }; + ROOT.put(namespace, Property.namespace(currentMap)); } @@ -37,7 +51,6 @@ public class ConfigManager { public ConfigManager(ConfigManager parent, String namespace) { this.currentMap = new LinkedHashMap<>(); - // Build new path: parent path + current namespace this.path = new String[parent.path.length + 1]; System.arraycopy(parent.path, 0, this.path, 0, parent.path.length); this.path[this.path.length - 1] = namespace; @@ -64,49 +77,45 @@ public class ConfigManager { /** * Load entire config */ - public static void load() { - SaturnClient.LOGGER.info("Loading config..."); - - JsonObject json = loadAndCache(); - if (json == null) + public void load() { + JsonNode json = loadAndCache(); + if (json == null || !json.isObject()) return; - loadRecursive(json, ROOT); + loadRecursive((ObjectNode) json, ROOT); } /** * Save entire config */ public static void save() { - SaturnClient.LOGGER.info("Saving config..."); - JsonObject rootJson = new JsonObject(); + ObjectNode rootJson = MAPPER.createObjectNode(); saveRecursive(rootJson, ROOT); try { - String formatted = new GsonBuilder() - .setPrettyPrinting() - .create() - .toJson(rootJson); - - Files.writeString(configFile.toPath(), formatted); - SaturnClient.LOGGER.info("Config saved successfully."); + MAPPER.writerWithDefaultPrettyPrinter().writeValue(configFile, rootJson); } catch (IOException e) { - SaturnClient.LOGGER.error("Error saving config file", e); + e.printStackTrace(); } } /** * Recursive save */ - private static void saveRecursive(JsonObject json, Map> map) { + private static void saveRecursive(ObjectNode json, Map> map) { map.forEach((name, prop) -> { if (prop.isNamespace()) { - JsonObject child = new JsonObject(); + + ObjectNode child = json.objectNode(); saveRecursive(child, prop.getNamespaceMap()); - json.add(name, child); + + json.set(name, child); + } else { - json.add(name, prop.toJson()); + + json.set(name, prop.toJson()); + } }); } @@ -114,42 +123,52 @@ public class ConfigManager { /** * Recursive load */ - private static void loadRecursive(JsonObject json, Map> map) { + private static void loadRecursive(ObjectNode json, Map> map) { + map.forEach((name, prop) -> { - JsonElement element = json.get(name); + + JsonNode element = json.get(name); if (element == null) return; - if (prop.isNamespace() && element.isJsonObject()) { - loadRecursive(element.getAsJsonObject(), prop.getNamespaceMap()); + if (prop.isNamespace() && element.isObject()) { + + loadRecursive((ObjectNode) element, prop.getNamespaceMap()); + } else { + prop.loadFromJson(element); + } + }); } /** - * Load only a single property immediately after creation, - * traversing the JSON tree based on this manager's path. + * Load only a single property immediately after creation */ private void loadSingleProperty(String name, Property prop) { - JsonObject source = cachedJson != null ? cachedJson : loadAndCache(); - if (source == null) + + JsonNode source = cachedJson != null ? cachedJson : loadAndCache(); + if (source == null || !source.isObject()) return; - // Traverse the tree to the correct namespace - JsonObject currentScope = source; + JsonNode currentScope = source; + for (String segment : path) { - JsonElement next = currentScope.get(segment); - if (next != null && next.isJsonObject()) { - currentScope = next.getAsJsonObject(); + + JsonNode next = currentScope.get(segment); + + if (next != null && next.isObject()) { + currentScope = next; } else { - return; // Path doesn't exist in config yet + return; } + } - // Now look for the property inside the correctly nested object - JsonElement element = currentScope.get(name); + JsonNode element = currentScope.get(name); + if (element != null) { prop.loadFromJson(element); } @@ -158,21 +177,26 @@ public class ConfigManager { /** * Reads file and caches json */ - private static JsonObject loadAndCache() { + private JsonNode loadAndCache() { + try { + if (!configFile.exists()) { + Files.writeString(configFile.toPath(), "{}"); - return new JsonObject(); + cachedJson = MAPPER.createObjectNode(); + return cachedJson; + } - String json = Files.readString(configFile.toPath()); - cachedJson = JsonParser.parseString(json).getAsJsonObject(); + cachedJson = MAPPER.readTree(configFile); return cachedJson; } catch (IOException e) { - SaturnClient.LOGGER.error("Error reading config file", e); + e.printStackTrace(); return null; } + } public Map> getProperties() { diff --git a/common/src/main/java/org/saturnclient/config/manager/Key.java b/common/src/main/java/org/saturnclient/config/manager/Key.java new file mode 100644 index 0000000..ae413ef --- /dev/null +++ b/common/src/main/java/org/saturnclient/config/manager/Key.java @@ -0,0 +1,152 @@ +package org.saturnclient.config.manager; + +public class Key { + /** Printable keys. */ + public static final int GLFW_KEY_SPACE = 32, + GLFW_KEY_APOSTROPHE = 39, + GLFW_KEY_COMMA = 44, + GLFW_KEY_MINUS = 45, + GLFW_KEY_PERIOD = 46, + GLFW_KEY_SLASH = 47, + GLFW_KEY_0 = 48, + GLFW_KEY_1 = 49, + GLFW_KEY_2 = 50, + GLFW_KEY_3 = 51, + GLFW_KEY_4 = 52, + GLFW_KEY_5 = 53, + GLFW_KEY_6 = 54, + GLFW_KEY_7 = 55, + GLFW_KEY_8 = 56, + GLFW_KEY_9 = 57, + GLFW_KEY_SEMICOLON = 59, + GLFW_KEY_EQUAL = 61, + GLFW_KEY_A = 65, + GLFW_KEY_B = 66, + GLFW_KEY_C = 67, + GLFW_KEY_D = 68, + GLFW_KEY_E = 69, + GLFW_KEY_F = 70, + GLFW_KEY_G = 71, + GLFW_KEY_H = 72, + GLFW_KEY_I = 73, + GLFW_KEY_J = 74, + GLFW_KEY_K = 75, + GLFW_KEY_L = 76, + GLFW_KEY_M = 77, + GLFW_KEY_N = 78, + GLFW_KEY_O = 79, + GLFW_KEY_P = 80, + GLFW_KEY_Q = 81, + GLFW_KEY_R = 82, + GLFW_KEY_S = 83, + GLFW_KEY_T = 84, + GLFW_KEY_U = 85, + GLFW_KEY_V = 86, + GLFW_KEY_W = 87, + GLFW_KEY_X = 88, + GLFW_KEY_Y = 89, + GLFW_KEY_Z = 90, + GLFW_KEY_LEFT_BRACKET = 91, + GLFW_KEY_BACKSLASH = 92, + GLFW_KEY_RIGHT_BRACKET = 93, + GLFW_KEY_GRAVE_ACCENT = 96, + GLFW_KEY_WORLD_1 = 161, + GLFW_KEY_WORLD_2 = 162; + + /** Function keys. */ + public static final int GLFW_KEY_ESCAPE = 256, + GLFW_KEY_ENTER = 257, + GLFW_KEY_TAB = 258, + GLFW_KEY_BACKSPACE = 259, + GLFW_KEY_INSERT = 260, + GLFW_KEY_DELETE = 261, + GLFW_KEY_RIGHT = 262, + GLFW_KEY_LEFT = 263, + GLFW_KEY_DOWN = 264, + GLFW_KEY_UP = 265, + GLFW_KEY_PAGE_UP = 266, + GLFW_KEY_PAGE_DOWN = 267, + GLFW_KEY_HOME = 268, + GLFW_KEY_END = 269, + GLFW_KEY_CAPS_LOCK = 280, + GLFW_KEY_SCROLL_LOCK = 281, + GLFW_KEY_NUM_LOCK = 282, + GLFW_KEY_PRINT_SCREEN = 283, + GLFW_KEY_PAUSE = 284, + GLFW_KEY_F1 = 290, + GLFW_KEY_F2 = 291, + GLFW_KEY_F3 = 292, + GLFW_KEY_F4 = 293, + GLFW_KEY_F5 = 294, + GLFW_KEY_F6 = 295, + GLFW_KEY_F7 = 296, + GLFW_KEY_F8 = 297, + GLFW_KEY_F9 = 298, + GLFW_KEY_F10 = 299, + GLFW_KEY_F11 = 300, + GLFW_KEY_F12 = 301, + GLFW_KEY_F13 = 302, + GLFW_KEY_F14 = 303, + GLFW_KEY_F15 = 304, + GLFW_KEY_F16 = 305, + GLFW_KEY_F17 = 306, + GLFW_KEY_F18 = 307, + GLFW_KEY_F19 = 308, + GLFW_KEY_F20 = 309, + GLFW_KEY_F21 = 310, + GLFW_KEY_F22 = 311, + GLFW_KEY_F23 = 312, + GLFW_KEY_F24 = 313, + GLFW_KEY_F25 = 314, + GLFW_KEY_KP_0 = 320, + GLFW_KEY_KP_1 = 321, + GLFW_KEY_KP_2 = 322, + GLFW_KEY_KP_3 = 323, + GLFW_KEY_KP_4 = 324, + GLFW_KEY_KP_5 = 325, + GLFW_KEY_KP_6 = 326, + GLFW_KEY_KP_7 = 327, + GLFW_KEY_KP_8 = 328, + GLFW_KEY_KP_9 = 329, + GLFW_KEY_KP_DECIMAL = 330, + GLFW_KEY_KP_DIVIDE = 331, + GLFW_KEY_KP_MULTIPLY = 332, + GLFW_KEY_KP_SUBTRACT = 333, + GLFW_KEY_KP_ADD = 334, + GLFW_KEY_KP_ENTER = 335, + GLFW_KEY_KP_EQUAL = 336, + GLFW_KEY_LEFT_SHIFT = 340, + GLFW_KEY_LEFT_CONTROL = 341, + GLFW_KEY_LEFT_ALT = 342, + GLFW_KEY_LEFT_SUPER = 343, + GLFW_KEY_RIGHT_SHIFT = 344, + GLFW_KEY_RIGHT_CONTROL = 345, + GLFW_KEY_RIGHT_ALT = 346, + GLFW_KEY_RIGHT_SUPER = 347, + GLFW_KEY_MENU = 348, + GLFW_KEY_LAST = GLFW_KEY_MENU; + + /** If this bit is set one or more Shift keys were held down. */ + public static final int GLFW_MOD_SHIFT = 0x1; + + /** If this bit is set one or more Control keys were held down. */ + public static final int GLFW_MOD_CONTROL = 0x2; + + /** If this bit is set one or more Alt keys were held down. */ + public static final int GLFW_MOD_ALT = 0x4; + + /** If this bit is set one or more Super keys were held down. */ + public static final int GLFW_MOD_SUPER = 0x8; + + /** + * If this bit is set the Caps Lock key is enabled and the + * {@link #GLFW_LOCK_KEY_MODS LOCK_KEY_MODS} input mode is set. + */ + public static final int GLFW_MOD_CAPS_LOCK = 0x10; + + /** + * If this bit is set the Num Lock key is enabled and the + * {@link #GLFW_LOCK_KEY_MODS LOCK_KEY_MODS} input mode is set. + */ + public static final int GLFW_MOD_NUM_LOCK = 0x20; +} diff --git a/src/main/java/org/saturnclient/saturnclient/config/manager/Property.java b/common/src/main/java/org/saturnclient/config/manager/Property.java similarity index 66% rename from src/main/java/org/saturnclient/saturnclient/config/manager/Property.java rename to common/src/main/java/org/saturnclient/config/manager/Property.java index 45ef2b5..0581d8f 100644 --- a/src/main/java/org/saturnclient/saturnclient/config/manager/Property.java +++ b/common/src/main/java/org/saturnclient/config/manager/Property.java @@ -1,15 +1,14 @@ -package org.saturnclient.saturnclient.config.manager; +package org.saturnclient.config.manager; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.saturnclient.common.minecraft.MinecraftProvider; import java.util.Map; -import org.lwjgl.glfw.GLFW; -import org.saturnclient.saturnclient.SaturnClient; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; - public class Property { + public static class NamedProperty { public String name; public Property prop; @@ -45,6 +44,7 @@ public class Property { } // ---------- Factory Methods ---------- + public static Property from(T value) { if (value instanceof Boolean) return new Property<>(value, PropertyType.BOOLEAN); @@ -98,6 +98,7 @@ public class Property { } // ---------- Select Helpers ---------- + public void next() { if (type == PropertyType.SELECT) { int i = (Integer) value; @@ -123,6 +124,7 @@ public class Property { } // ---------- Lifecycle ---------- + public void reset() { value = defaultValue; isReset = true; @@ -141,87 +143,108 @@ public class Property { } // ---------- JSON Serialization ---------- - /* - * BOOLEAN, - * INTEGER, - * FLOAT, - * STRING, - * HEX, - * NAMESPACE, - * SELECT, - * KEYBINDING, - */ - public JsonElement toJson() { + + public JsonNode toJson() { + switch (type) { + case BOOLEAN: - return new JsonPrimitive((Boolean) value); + return JsonNodeFactory.instance.booleanNode((Boolean) value); + case INTEGER: - return new JsonPrimitive((Integer) value); + return JsonNodeFactory.instance.numberNode((Integer) value); + case FLOAT: - return new JsonPrimitive((Float) value); - case NAMESPACE: - JsonObject nested = new JsonObject(); - getNamespaceValue().forEach((k, v) -> nested.add(k, v.toJson())); - return nested; + return JsonNodeFactory.instance.numberNode((Float) value); + + case STRING: + return JsonNodeFactory.instance.textNode((String) value); + case HEX: - return new JsonPrimitive(String.format("#%08X", (Integer) value)); + return JsonNodeFactory.instance.textNode( + String.format("#%08X", (Integer) value)); + case KEYBINDING: - return new JsonPrimitive((Integer) value); case SELECT: - return new JsonPrimitive((Integer) value); + return JsonNodeFactory.instance.numberNode((Integer) value); + + case NAMESPACE: + + ObjectNode nested = JsonNodeFactory.instance.objectNode(); + + getNamespaceValue().forEach((k, v) -> { + nested.set(k, v.toJson()); + }); + + return nested; + default: - return new JsonPrimitive(String.valueOf(value)); + return JsonNodeFactory.instance.textNode(String.valueOf(value)); } } - public void loadFromJson(JsonElement element) { + public void loadFromJson(JsonNode element) { + if (element == null) return; switch (type) { + case BOOLEAN: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isBoolean()) - setValue(element.getAsBoolean()); + if (element.isBoolean()) + setValue(element.booleanValue()); break; + case INTEGER: - if (element.isJsonPrimitive()) { - JsonPrimitive p = element.getAsJsonPrimitive(); - if (p.isNumber()) - setValue(p.getAsInt()); - else if (p.isString()) - setValue(parseHexToInt(p.getAsString())); - } + if (element.isInt()) + setValue(element.intValue()); + else if (element.isTextual()) + setValue(parseHexToInt(element.textValue())); break; + case FLOAT: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isNumber()) - setValue(element.getAsFloat()); + if (element.isNumber()) + setValue(element.floatValue()); break; + case STRING: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isString()) - setValue(element.getAsString()); + if (element.isTextual()) + setValue(element.textValue()); break; + case HEX: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isString()) - setValue(parseHexToInt(element.getAsString())); + if (element.isTextual()) + setValue(parseHexToInt(element.textValue())); break; + case NAMESPACE: - if (element.isJsonObject()) { - JsonObject obj = element.getAsJsonObject(); - getNamespaceValue().forEach((k, v) -> v.loadFromJson(obj.get(k))); + + if (element.isObject()) { + + ObjectNode obj = (ObjectNode) element; + + getNamespaceValue().forEach((k, v) -> { + v.loadFromJson(obj.get(k)); + }); + } + break; + case SELECT: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isNumber()) - setSelection(element.getAsInt()); + if (element.isInt()) + setSelection(element.intValue()); break; + case KEYBINDING: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isNumber()) - setValue(element.getAsInt()); + if (element.isInt()) + setValue(element.intValue()); break; } } // ---------- Utility ---------- + @Override public String toString() { return String.valueOf(value); @@ -246,53 +269,52 @@ public class Property { return new NamedProperty<>(name, this); } - // ---------- Keybindings ---------- + // ---------- Keybindings (no SaturnClient) ---------- + public boolean isKeyPressed() { + return (Integer) value != -1 && - GLFW.glfwGetKey(SaturnClient.client.getWindow().getHandle(), (Integer) value) == GLFW.GLFW_PRESS && - SaturnClient.client.currentScreen == null; + MinecraftProvider.PROVIDER.isKeyPressed((Integer) value); } public boolean wasKeyPressed() { boolean pressed = isKeyPressed(); + boolean result = pressed && !wasPressedLastTick; + wasPressedLastTick = pressed; + return result; } // ---------- HEX ---------- + public static int parseHexToInt(String hex) { + hex = hex.replace("#", ""); + if (hex.length() == 6) hex = "FF" + hex; + if (hex.length() != 8) - throw new IllegalArgumentException("Hex must be 6 or 8 chars long, got \'" + hex + "\'"); + throw new IllegalArgumentException( + "Hex must be 6 or 8 chars long, got '" + hex + "'"); + return (int) Long.parseLong(hex, 16); } - // Misc + // ---------- Misc ---------- + public Property copy() { return new Property<>(this.value, this.type); } - public void load(String name, JsonElement element) { - if (element != null && element.isJsonObject()) { - load(name, element.getAsJsonObject()); - } - } - - public void load(String name, JsonObject element) { - JsonElement value = element.get(name); - if (value != null) - this.loadFromJson(value); - } - public boolean isNamespace() { return type == PropertyType.NAMESPACE; } @SuppressWarnings("unchecked") public Map> getNamespaceMap() { - return isNamespace() ? (Map>) (Object) value : null; + return isNamespace() ? (Map>) value : null; } -} +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/cosmetics/Emotes.java b/common/src/main/java/org/saturnclient/cosmetics/Emotes.java similarity index 100% rename from src/main/java/org/saturnclient/cosmetics/Emotes.java rename to common/src/main/java/org/saturnclient/cosmetics/Emotes.java diff --git a/src/main/java/org/saturnclient/cosmetics/hat/Hats.java b/common/src/main/java/org/saturnclient/cosmetics/Hats.java similarity index 81% rename from src/main/java/org/saturnclient/cosmetics/hat/Hats.java rename to common/src/main/java/org/saturnclient/cosmetics/Hats.java index 6aee225..37a8f74 100644 --- a/src/main/java/org/saturnclient/cosmetics/hat/Hats.java +++ b/common/src/main/java/org/saturnclient/cosmetics/Hats.java @@ -1,11 +1,11 @@ -package org.saturnclient.cosmetics.hat; +package org.saturnclient.cosmetics; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import org.saturnclient.saturnclient.client.ServiceClient; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.client.ServiceClient; +import org.saturnclient.client.player.SaturnPlayer; public class Hats { public static final String[] ALL_HATS = { "horns_black", "horns_white", "halo", "halo_black" }; diff --git a/src/main/java/org/saturnclient/modules/HudMod.java b/common/src/main/java/org/saturnclient/modules/HudMod.java similarity index 83% rename from src/main/java/org/saturnclient/modules/HudMod.java rename to common/src/main/java/org/saturnclient/modules/HudMod.java index fa5b280..b8b09b5 100644 --- a/src/main/java/org/saturnclient/modules/HudMod.java +++ b/common/src/main/java/org/saturnclient/modules/HudMod.java @@ -1,6 +1,6 @@ package org.saturnclient.modules; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.RenderScope; public interface HudMod { public ModDimensions getDimensions(); diff --git a/src/main/java/org/saturnclient/modules/ModDimensions.java b/common/src/main/java/org/saturnclient/modules/ModDimensions.java similarity index 91% rename from src/main/java/org/saturnclient/modules/ModDimensions.java rename to common/src/main/java/org/saturnclient/modules/ModDimensions.java index 77f6e6f..472f97a 100644 --- a/src/main/java/org/saturnclient/modules/ModDimensions.java +++ b/common/src/main/java/org/saturnclient/modules/ModDimensions.java @@ -2,8 +2,8 @@ package org.saturnclient.modules; import java.util.Map; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.saturnclient.config.manager.Property.NamedProperty; +import org.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property.NamedProperty; public class ModDimensions { public Property x = Property.integer(0); diff --git a/common/src/main/java/org/saturnclient/modules/ModManager.java b/common/src/main/java/org/saturnclient/modules/ModManager.java new file mode 100644 index 0000000..fa3324c --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/ModManager.java @@ -0,0 +1,31 @@ +package org.saturnclient.modules; + +import java.util.ArrayList; +import java.util.List; + +public class ModManager { + public static List ENABLED_MODS = new ArrayList<>(); + public static Module[] MODS = {}; + + public static void init(ModuleProvider provider) { + MODS = provider.getMods(); + updateEnabledModules(); + } + + public static synchronized void updateEnabledModules() { + ENABLED_MODS.clear(); + for (Module m : MODS) { + if (m.isEnabled()) { + ENABLED_MODS.add(m); + } + } + } + + public static Module[] getAllMods() { + return MODS; + } + + public interface ModuleProvider { + Module[] getMods(); + } +} diff --git a/src/main/java/org/saturnclient/modules/Module.java b/common/src/main/java/org/saturnclient/modules/Module.java similarity index 78% rename from src/main/java/org/saturnclient/modules/Module.java rename to common/src/main/java/org/saturnclient/modules/Module.java index 6c719d6..c40da1a 100644 --- a/src/main/java/org/saturnclient/modules/Module.java +++ b/common/src/main/java/org/saturnclient/modules/Module.java @@ -1,11 +1,10 @@ package org.saturnclient.modules; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property.NamedProperty; -import org.saturnclient.ui2.RenderScope; - -import net.minecraft.util.Identifier; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Property.NamedProperty; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Textures; public abstract class Module { private final ModuleDetails details; @@ -38,7 +37,7 @@ public abstract class Module { return details.name; } - public Identifier getIconTexture() { + public SaturnIdentifier getIconTexture() { return Textures.getModIcon(details.namespace); } diff --git a/src/main/java/org/saturnclient/modules/ModuleDetails.java b/common/src/main/java/org/saturnclient/modules/ModuleDetails.java similarity index 100% rename from src/main/java/org/saturnclient/modules/ModuleDetails.java rename to common/src/main/java/org/saturnclient/modules/ModuleDetails.java diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java new file mode 100644 index 0000000..1c9124e --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java @@ -0,0 +1,32 @@ +package org.saturnclient.modules.interfaces; + +import org.saturnclient.common.minecraft.bindings.SaturnItemStack; + +public interface ArmorDisplayInterface { + + SaturnItemStack getMainHand(); + + SaturnItemStack getHelmet(); + + SaturnItemStack getChestplate(); + + SaturnItemStack getLeggings(); + + SaturnItemStack getBoots(); + + SaturnItemStack getDummyMainHand(); + + SaturnItemStack getDummyHelmet(); + + SaturnItemStack getDummyChestplate(); + + SaturnItemStack getDummyLeggings(); + + SaturnItemStack getDummyBoots(); + + boolean isEmpty(SaturnItemStack stack); + + int getMaxDamage(SaturnItemStack stack); + + int getDamage(SaturnItemStack stack); +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/AutoSprintInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/AutoSprintInterface.java new file mode 100644 index 0000000..58448b9 --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/AutoSprintInterface.java @@ -0,0 +1,20 @@ +package org.saturnclient.modules.interfaces; + +public interface AutoSprintInterface { + + boolean hasPlayer(); + + boolean hasNetwork(); + + boolean isForwardPressed(); + + boolean isBackPressed(); + + boolean isSneaking(); + + boolean hasHorizontalCollision(); + + boolean isUsingItem(); + + void setSprinting(boolean sprinting); +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/CoordinatesInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/CoordinatesInterface.java new file mode 100644 index 0000000..c144f1a --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/CoordinatesInterface.java @@ -0,0 +1,11 @@ +package org.saturnclient.modules.interfaces; + +public interface CoordinatesInterface { + + int getPlayerX(); + + int getPlayerY(); + + int getPlayerZ(); + +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/CrosshairInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/CrosshairInterface.java new file mode 100644 index 0000000..e658b64 --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/CrosshairInterface.java @@ -0,0 +1,7 @@ +package org.saturnclient.modules.interfaces; + +public interface CrosshairInterface { + + boolean isTargetingLivingEntity(); + +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/DayCounterInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/DayCounterInterface.java new file mode 100644 index 0000000..5b2c37f --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/DayCounterInterface.java @@ -0,0 +1,7 @@ +package org.saturnclient.modules.interfaces; + +public interface DayCounterInterface { + + long getDay(); + +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/FpsInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/FpsInterface.java new file mode 100644 index 0000000..b16f2e7 --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/FpsInterface.java @@ -0,0 +1,7 @@ +package org.saturnclient.modules.interfaces; + +public interface FpsInterface { + + int getFps(); + +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/FreelookInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/FreelookInterface.java new file mode 100644 index 0000000..67f0814 --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/FreelookInterface.java @@ -0,0 +1,11 @@ +package org.saturnclient.modules.interfaces; + +public interface FreelookInterface { + + boolean isFirstPerson(); + + void setFirstPerson(); + + void setThirdPersonBack(); + +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/HealthDisplayInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/HealthDisplayInterface.java new file mode 100644 index 0000000..cb8d20f --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/HealthDisplayInterface.java @@ -0,0 +1,7 @@ +package org.saturnclient.modules.interfaces; + +public interface HealthDisplayInterface { + + float getPlayerHealth(); + +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/KeystrokesInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/KeystrokesInterface.java new file mode 100644 index 0000000..5c220ef --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/KeystrokesInterface.java @@ -0,0 +1,13 @@ +package org.saturnclient.modules.interfaces; + +public interface KeystrokesInterface { + + boolean isForwardPressed(); + boolean isBackPressed(); + boolean isLeftPressed(); + boolean isRightPressed(); + boolean isJumpPressed(); + boolean isAttackPressed(); + boolean isUsePressed(); + +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/NametagsInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/NametagsInterface.java new file mode 100644 index 0000000..5834508 --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/NametagsInterface.java @@ -0,0 +1,23 @@ +package org.saturnclient.modules.interfaces; + +public interface NametagsInterface { + + public static interface EntityState { + + String getCustomName(); + + float getHealth(); + + float getMaxHealth(); + + EntityType getEntityType(); + } + + public static enum EntityType { + PLAYER, + PASSIVE, + HOSTILE, + OTHER + } + +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/PingInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/PingInterface.java new file mode 100644 index 0000000..2a93473 --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/PingInterface.java @@ -0,0 +1,8 @@ +package org.saturnclient.modules.interfaces; + +public interface PingInterface { + + /** Returns current player ping in milliseconds */ + int getPing(); + +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/SpeedometerInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/SpeedometerInterface.java new file mode 100644 index 0000000..da896bd --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/SpeedometerInterface.java @@ -0,0 +1,20 @@ +package org.saturnclient.modules.interfaces; + +public interface SpeedometerInterface { + + /** Returns the current player or vehicle velocity in blocks per tick */ + Velocity getVelocity(); + + /** Returns true if player or vehicle is on ground */ + boolean isOnGround(); + + class Velocity { + public final double x, y, z; + + public Velocity(double x, double y, double z) { + this.x = x; + this.y = y; + this.z = z; + } + } +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/interfaces/StatusEffectsInterface.java b/common/src/main/java/org/saturnclient/modules/interfaces/StatusEffectsInterface.java new file mode 100644 index 0000000..0ff0f54 --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/interfaces/StatusEffectsInterface.java @@ -0,0 +1,36 @@ +package org.saturnclient.modules.interfaces; + +import java.util.List; +import org.saturnclient.common.minecraft.bindings.SaturnSprite; + +public interface StatusEffectsInterface { + + /** Returns a list of currently active effects */ + List getActiveEffects(); + + /** Returns a dummy list of effects for dummy rendering */ + List getDummyEffects(); + + /** Represents a single effect for rendering purposes */ + class Effect { + private final SaturnSprite icon; + private final int durationSeconds; + private final boolean infinite; + private final boolean showIcon; + private final String infiniteText; + + public Effect(SaturnSprite icon, int durationSeconds, boolean infinite, boolean showIcon, String infiniteText) { + this.icon = icon; + this.durationSeconds = durationSeconds; + this.infinite = infinite; + this.showIcon = showIcon; + this.infiniteText = infiniteText; + } + + public SaturnSprite getIcon() { return icon; } + public int getDurationSeconds() { return durationSeconds; } + public boolean isInfinite() { return infinite; } + public boolean shouldShowIcon() { return showIcon; } + public String getInfiniteText() { return infiniteText; } + } +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java b/common/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java new file mode 100644 index 0000000..69cad5e --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java @@ -0,0 +1,118 @@ +package org.saturnclient.modules.mods; + +import org.saturnclient.modules.HudMod; +import org.saturnclient.modules.ModDimensions; +import org.saturnclient.modules.Module; +import org.saturnclient.modules.ModuleDetails; +import org.saturnclient.modules.interfaces.ArmorDisplayInterface; +import org.saturnclient.common.minecraft.bindings.SaturnItemStack; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.RenderScope; + +public class ArmorDisplay extends Module implements HudMod { + + private static Property enabled = Property.bool(false); + private static ModDimensions dimensions = new ModDimensions(40, 75); + private static Property useMainHand = Property.bool(true); + + private final ArmorDisplayInterface minecraft; + + public ArmorDisplay(ArmorDisplayInterface minecraft) { + super(new ModuleDetails("Armor Display", "armor") + .description("Displays armor durability") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + useMainHand.named("Use Main Hand"), + dimensions.prop()); + + this.minecraft = minecraft; + } + + public void renderArmor(RenderScope scope, + SaturnItemStack mainHand, + SaturnItemStack helmet, + SaturnItemStack chestplate, + SaturnItemStack leggings, + SaturnItemStack boots) { + + int row = 0; + + if (useMainHand.value && !minecraft.isEmpty(mainHand)) { + scope.drawItem(mainHand, 0, 15 * row); + renderHealth(scope, row, minecraft.getMaxDamage(mainHand), minecraft.getDamage(mainHand)); + row++; + } + + if (!minecraft.isEmpty(helmet)) { + scope.drawItem(helmet, 0, 15 * row); + renderHealth(scope, row, minecraft.getMaxDamage(helmet), minecraft.getDamage(helmet)); + row++; + } + + if (!minecraft.isEmpty(chestplate)) { + scope.drawItem(chestplate, 0, 15 * row); + renderHealth(scope, row, minecraft.getMaxDamage(chestplate), minecraft.getDamage(chestplate)); + row++; + } + + if (!minecraft.isEmpty(leggings)) { + scope.drawItem(leggings, 0, 15 * row); + renderHealth(scope, row, minecraft.getMaxDamage(leggings), minecraft.getDamage(leggings)); + row++; + } + + if (!minecraft.isEmpty(boots)) { + scope.drawItem(boots, 0, 15 * row); + renderHealth(scope, row, minecraft.getMaxDamage(boots), minecraft.getDamage(boots)); + row++; + } + } + + public void renderHealth(RenderScope scope, int i, int maxDamage, int damage) { + if (maxDamage > 0) { + scope.drawText( + 0.5f, + "" + (maxDamage - damage), + 17, + (15 * i) + 3, + dimensions.font.value, + dimensions.fgColor.value); + } + } + + @Override + public void renderHud(RenderScope scope) { + renderArmor(scope, + minecraft.getMainHand(), + minecraft.getHelmet(), + minecraft.getChestplate(), + minecraft.getLeggings(), + minecraft.getBoots()); + } + + @Override + public void renderDummy(RenderScope scope) { + renderArmor(scope, + minecraft.getDummyMainHand(), + minecraft.getDummyHelmet(), + minecraft.getDummyChestplate(), + minecraft.getDummyLeggings(), + minecraft.getDummyBoots()); + } + + @Override + public ModDimensions getDimensions() { + return dimensions; + } + + @Override + public boolean isEnabled() { + return enabled.value; + } + + @Override + public void onEnabled(boolean e) { + enabled.value = e; + } +} diff --git a/common/src/main/java/org/saturnclient/modules/mods/AutoSprint.java b/common/src/main/java/org/saturnclient/modules/mods/AutoSprint.java new file mode 100644 index 0000000..b256c55 --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/mods/AutoSprint.java @@ -0,0 +1,50 @@ +package org.saturnclient.modules.mods; + +import org.saturnclient.modules.Module; +import org.saturnclient.modules.ModuleDetails; +import org.saturnclient.modules.interfaces.AutoSprintInterface; +import org.saturnclient.config.manager.Property; + +public class AutoSprint extends Module { + + private static Property enabled = Property.bool(false); + + private final AutoSprintInterface minecraft; + + public AutoSprint(AutoSprintInterface minecraft) { + super( + new ModuleDetails("Auto Sprint", "sprint") + .description("Makes the player always sprint") + .tags("Movement") + .version("v0.1.0"), + enabled.named("Enabled")); + + this.minecraft = minecraft; + } + + @Override + public void tick() { + if (!minecraft.hasPlayer() || !minecraft.hasNetwork()) { + return; + } + + if (minecraft.isForwardPressed() + && !minecraft.isBackPressed() + && !minecraft.isSneaking() + && !minecraft.hasHorizontalCollision() + && !minecraft.isUsingItem()) { + + minecraft.setSprinting(true); + } + } + + @Override + public boolean isEnabled() { + return enabled.value; + } + + @Override + public void onEnabled(boolean e) { + enabled.value = e; + } +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/Clock.java b/common/src/main/java/org/saturnclient/modules/mods/Clock.java similarity index 60% rename from src/main/java/org/saturnclient/modules/mods/Clock.java rename to common/src/main/java/org/saturnclient/modules/mods/Clock.java index 2492162..7726401 100644 --- a/src/main/java/org/saturnclient/modules/mods/Clock.java +++ b/common/src/main/java/org/saturnclient/modules/mods/Clock.java @@ -7,9 +7,9 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Clock extends Module implements HudMod { private static Property enabled = Property.bool(false); @@ -19,14 +19,13 @@ public class Clock extends Module implements HudMod { public Clock() { super(new ModuleDetails("Clock", "clock") - .description("Displays the current real-world time") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - format.named("Format"), - seconds.named("Show seconds"), - dimensions.prop() - ); + .description("Displays the current real-world time") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + format.named("Format"), + seconds.named("Show seconds"), + dimensions.prop()); } @Override @@ -45,17 +44,23 @@ public class Clock extends Module implements HudMod { switch (format.value) { case 0: - if (seconds.value) { text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm:ss")); } - else { text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm")); } + if (seconds.value) { + text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm:ss")); + } else { + text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm")); + } break; - case 1: - if (seconds.value) { text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm:ss a")); } - else { text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm a")); } + case 1: + if (seconds.value) { + text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm:ss a")); + } else { + text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm a")); + } break; } scope.drawText(text, - 0, 0, dimensions.font.value, dimensions.fgColor.value); + 0, 0, dimensions.font.value, dimensions.fgColor.value); dimensions.width = Fonts.getWidth(text, dimensions.font.value); dimensions.height = 18 * text.split("\n").length; } diff --git a/src/main/java/org/saturnclient/modules/mods/Coordinates.java b/common/src/main/java/org/saturnclient/modules/mods/Coordinates.java similarity index 55% rename from src/main/java/org/saturnclient/modules/mods/Coordinates.java rename to common/src/main/java/org/saturnclient/modules/mods/Coordinates.java index 7ad5c0b..bfd1b9f 100644 --- a/src/main/java/org/saturnclient/modules/mods/Coordinates.java +++ b/common/src/main/java/org/saturnclient/modules/mods/Coordinates.java @@ -4,27 +4,36 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; - -import net.minecraft.util.math.Vec3d; +import org.saturnclient.modules.interfaces.CoordinatesInterface; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Coordinates extends Module implements HudMod { + private static Property enabled = Property.bool(false); - private static Property displayMethod = Property.select(0, "Flat", "Flat annotated", "Newline", "Newline annotated"); + + private static Property displayMethod = Property.select( + 0, + "Flat", + "Flat annotated", + "Newline", + "Newline annotated"); + private static ModDimensions dimensions = new ModDimensions(40, 18); - public Coordinates() { + private final CoordinatesInterface minecraft; + + public Coordinates(CoordinatesInterface minecraft) { super(new ModuleDetails("Coordinates", "coords") - .description("Displays your current coordinates") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - displayMethod.named("Display Method"), - dimensions.prop() - ); + .description("Displays your current coordinates") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + displayMethod.named("Display Method"), + dimensions.prop()); + + this.minecraft = minecraft; } @Override @@ -34,26 +43,40 @@ public class Coordinates extends Module implements HudMod { @Override public void renderHud(RenderScope scope) { - Vec3d pos = SaturnClient.client.player.getPos(); - renderCoords((int) pos.x, (int) pos.y, (int) pos.z, scope); + int x = minecraft.getPlayerX(); + int y = minecraft.getPlayerY(); + int z = minecraft.getPlayerZ(); + + renderCoords(x, y, z, scope); } public void renderCoords(int x, int y, int z, RenderScope scope) { - String f = "%d %d %d"; // Flat + + String f = "%d %d %d"; + switch (displayMethod.value) { - case 1: // Flat annotated + case 1: f = "X: %d Y: %d Z: %d"; break; - case 2: // Newline + + case 2: f = "%d\n%d\n%d"; break; - case 3: // Newline annotated + + case 3: f = "X: %d\nY: %d\nZ: %d"; break; } + String text = String.format(f, x, y, z); - scope.drawText(text, - 0, 0, dimensions.font.value, dimensions.fgColor.value); + + scope.drawText( + text, + 0, + 0, + dimensions.font.value, + dimensions.fgColor.value); + dimensions.width = Fonts.getWidth(text, dimensions.font.value); dimensions.height = 18 * text.split("\n").length; } @@ -72,4 +95,4 @@ public class Coordinates extends Module implements HudMod { public void onEnabled(boolean e) { enabled.value = e; } -} +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/mods/Crosshair.java b/common/src/main/java/org/saturnclient/modules/mods/Crosshair.java new file mode 100644 index 0000000..ad76b5e --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/mods/Crosshair.java @@ -0,0 +1,55 @@ +package org.saturnclient.modules.mods; + +import org.saturnclient.modules.Module; +import org.saturnclient.modules.ModuleDetails; +import org.saturnclient.modules.interfaces.CrosshairInterface; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Textures; + +public class Crosshair extends Module { + + public static Property enabled = Property.bool(false); + + private final CrosshairInterface minecraft; + + public Crosshair(CrosshairInterface minecraft) { + super( + new ModuleDetails("Crosshair", "crosshair") + .description("Changes the crosshair if you're aiming at a entity") + .tags("Visuals", "Utility") + .version("v0.1.0"), + enabled.named("Enabled")); + + this.minecraft = minecraft; + } + + @Override + public void render(RenderScope scope) { + + if (enabled.value && minecraft.isTargetingLivingEntity()) { + + int scaledWidth = 15; + int scaledHeight = 15; + + scope.drawTexture( + Textures.CROSSHAIR_RANGE, + (scope.getScaledWindowWidth() - scaledWidth) / 2, + (scope.getScaledWindowHeight() - scaledHeight) / 2, + 0.0F, + 0.0F, + scaledWidth, + scaledHeight); + } + } + + @Override + public boolean isEnabled() { + return enabled.value; + } + + @Override + public void onEnabled(boolean e) { + enabled.value = e; + } +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/DayCounter.java b/common/src/main/java/org/saturnclient/modules/mods/DayCounter.java similarity index 60% rename from src/main/java/org/saturnclient/modules/mods/DayCounter.java rename to common/src/main/java/org/saturnclient/modules/mods/DayCounter.java index bbb0b25..cdede7a 100644 --- a/src/main/java/org/saturnclient/modules/mods/DayCounter.java +++ b/common/src/main/java/org/saturnclient/modules/mods/DayCounter.java @@ -4,24 +4,29 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.modules.interfaces.DayCounterInterface; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class DayCounter extends Module implements HudMod { + private static Property enabled = Property.bool(false); private static ModDimensions dimensions = new ModDimensions(40, 18); + + private final DayCounterInterface minecraft; + long day = 0; - public DayCounter() { + public DayCounter(DayCounterInterface minecraft) { super(new ModuleDetails("DayCounter", "day") - .description("Displays the number of days that have passed") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - dimensions.prop() - ); + .description("Displays the number of days that have passed") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + dimensions.prop()); + + this.minecraft = minecraft; } @Override @@ -31,14 +36,20 @@ public class DayCounter extends Module implements HudMod { @Override public void renderHud(RenderScope scope) { - day = (SaturnClient.client.world.getTimeOfDay() / 24000L); + day = minecraft.getDay(); renderDay(day, scope); } public void renderDay(long day, RenderScope scope) { String text = "Day: " + day; - scope.drawText(text, - 0, 0, dimensions.font.value, dimensions.fgColor.value); + + scope.drawText( + text, + 0, + 0, + dimensions.font.value, + dimensions.fgColor.value); + dimensions.width = Fonts.getWidth(text, dimensions.font.value); dimensions.height = 18 * text.split("\n").length; } @@ -57,5 +68,4 @@ public class DayCounter extends Module implements HudMod { public void onEnabled(boolean e) { enabled.value = e; } -} - +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/Fps.java b/common/src/main/java/org/saturnclient/modules/mods/Fps.java similarity index 67% rename from src/main/java/org/saturnclient/modules/mods/Fps.java rename to common/src/main/java/org/saturnclient/modules/mods/Fps.java index f788e71..0c8c1a0 100644 --- a/src/main/java/org/saturnclient/modules/mods/Fps.java +++ b/common/src/main/java/org/saturnclient/modules/mods/Fps.java @@ -4,35 +4,46 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.modules.interfaces.FpsInterface; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Fps extends Module implements HudMod { + private static Property enabled = Property.bool(false); private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight()); - - public Fps() { + + private final FpsInterface minecraft; + + public Fps(FpsInterface minecraft) { super(new ModuleDetails("FPS Display", "fps") - .description("Displays current FPS") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - dimensions.prop()); + .description("Displays current FPS") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + dimensions.prop()); + + this.minecraft = minecraft; } @Override public void renderHud(RenderScope scope) { - String text = String.valueOf(SaturnClient.client.getCurrentFps()) + " FPS"; + int fps = minecraft.getFps(); + + String text = fps + " FPS"; + scope.drawText(text, 0, 0, dimensions.font.value, dimensions.fgColor.value); + dimensions.width = Fonts.getWidth(text, dimensions.font.value); } @Override public void renderDummy(RenderScope scope) { String text = "369 FPS"; + scope.drawText(text, 0, 0, dimensions.font.value, dimensions.fgColor.value); + dimensions.width = Fonts.getWidth(text, dimensions.font.value); } @@ -50,4 +61,4 @@ public class Fps extends Module implements HudMod { public ModDimensions getDimensions() { return dimensions; } -} +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/Freelook.java b/common/src/main/java/org/saturnclient/modules/mods/Freelook.java similarity index 60% rename from src/main/java/org/saturnclient/modules/mods/Freelook.java rename to common/src/main/java/org/saturnclient/modules/mods/Freelook.java index e894211..7d643ef 100644 --- a/src/main/java/org/saturnclient/modules/mods/Freelook.java +++ b/common/src/main/java/org/saturnclient/modules/mods/Freelook.java @@ -1,61 +1,78 @@ package org.saturnclient.modules.mods; -import org.lwjgl.glfw.GLFW; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; - -import net.minecraft.client.option.Perspective; +import org.saturnclient.modules.interfaces.FreelookInterface; +import org.saturnclient.config.manager.Key; +import org.saturnclient.config.manager.Property; public class Freelook extends Module { + private static Property enabled = Property.bool(false); private static Property toggle = Property.bool(true); - public static Property freelookKey = Property.keybinding(GLFW.GLFW_KEY_H); + + public static Property freelookKey = Property.keybinding(Key.GLFW_KEY_H); + public static boolean isFreeLooking = false; private static boolean was1stPerson = false; - - public Freelook() { + + private final FreelookInterface minecraft; + + public Freelook(FreelookInterface minecraft) { super( - new ModuleDetails("Freelook", "freelook") - .description("Allows you to look around freely without moving your character") - .tags("Movement", "Camera") - .version("0.1.0"), - enabled.named("Enabled"), - toggle.named("Toggle freelook"), - freelookKey.named("Freelook Keybinding") - ); + new ModuleDetails("Freelook", "freelook") + .description("Allows you to look around freely without moving your character") + .tags("Movement", "Camera") + .version("0.1.0"), + enabled.named("Enabled"), + toggle.named("Toggle freelook"), + freelookKey.named("Freelook Keybinding")); + + this.minecraft = minecraft; } - + @Override public void tick() { + if (toggle.value) { + if (freelookKey.wasKeyPressed()) { + if (isFreeLooking) { stopFreelook(); } else { startFreelook(); } + } + } else if (freelookKey.isKeyPressed()) { + if (!isFreeLooking) { startFreelook(); } + } else if (isFreeLooking) { + stopFreelook(); + } } private void startFreelook() { isFreeLooking = true; - was1stPerson = SaturnClient.client.options.getPerspective() == Perspective.FIRST_PERSON; - SaturnClient.client.options.setPerspective(Perspective.THIRD_PERSON_BACK); + + was1stPerson = minecraft.isFirstPerson(); + + minecraft.setThirdPersonBack(); } private void stopFreelook() { + if (was1stPerson) { - SaturnClient.client.options.setPerspective(Perspective.FIRST_PERSON); + minecraft.setFirstPerson(); } + isFreeLooking = false; } @@ -68,4 +85,4 @@ public class Freelook extends Module { public boolean isEnabled() { return enabled.value; } -} +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/Fullbright.java b/common/src/main/java/org/saturnclient/modules/mods/Fullbright.java similarity index 66% rename from src/main/java/org/saturnclient/modules/mods/Fullbright.java rename to common/src/main/java/org/saturnclient/modules/mods/Fullbright.java index 7c4a3d3..e067c37 100644 --- a/src/main/java/org/saturnclient/modules/mods/Fullbright.java +++ b/common/src/main/java/org/saturnclient/modules/mods/Fullbright.java @@ -2,7 +2,7 @@ package org.saturnclient.modules.mods; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; public class Fullbright extends Module { private static Property enabled = Property.bool(false); @@ -10,12 +10,12 @@ public class Fullbright extends Module { public Fullbright() { super( - new ModuleDetails("Fullbright", "fullbright") - .description("Allows you to see in the dark") - .tags("Camera") - .version("v0.1.0"), - enabled.named("Enabled"), - brightness.named("Brightness %")); + new ModuleDetails("Fullbright", "fullbright") + .description("Allows you to see in the dark") + .tags("Camera") + .version("v0.1.0"), + enabled.named("Enabled"), + brightness.named("Brightness %")); } @Override @@ -27,11 +27,11 @@ public class Fullbright extends Module { public void onEnabled(boolean e) { enabled.value = e; } - + public static boolean shouldOverrideBrightness() { return enabled.value; } - + public static float getBrightnessValue() { return brightness.value / 10; } diff --git a/src/main/java/org/saturnclient/modules/mods/HealthDisplay.java b/common/src/main/java/org/saturnclient/modules/mods/HealthDisplay.java similarity index 64% rename from src/main/java/org/saturnclient/modules/mods/HealthDisplay.java rename to common/src/main/java/org/saturnclient/modules/mods/HealthDisplay.java index e831ec2..b217101 100644 --- a/src/main/java/org/saturnclient/modules/mods/HealthDisplay.java +++ b/common/src/main/java/org/saturnclient/modules/mods/HealthDisplay.java @@ -4,32 +4,32 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; - -import net.minecraft.util.math.Vec3d; +import org.saturnclient.modules.interfaces.HealthDisplayInterface; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class HealthDisplay extends Module implements HudMod { + private static Property enabled = Property.bool(false); private static Property displayMode = Property.select(0, "Health", "Hearts"); private static Property decimals = Property.select(0, "0", "1", "2"); - private static ModDimensions dimensions = new ModDimensions(40, 18); - double speed = 0.; - Vec3d velocity; - double y = 0.; - public HealthDisplay() { + private static ModDimensions dimensions = new ModDimensions(40, 18); + + private final HealthDisplayInterface minecraft; + + public HealthDisplay(HealthDisplayInterface minecraft) { super(new ModuleDetails("Health display", "health") - .description("Displays your current health") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - displayMode.named("Display mode"), - decimals.named("Decimals"), - dimensions.prop() - ); + .description("Displays your current health") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + displayMode.named("Display mode"), + decimals.named("Decimals"), + dimensions.prop()); + + this.minecraft = minecraft; } @Override @@ -39,31 +39,43 @@ public class HealthDisplay extends Module implements HudMod { @Override public void renderHud(RenderScope scope) { - float health = SaturnClient.client.player.getHealth(); + float health = minecraft.getPlayerHealth(); + switch (displayMode.value) { case 1: health = health / 2; + break; } + renderHealth(health, scope); } public void renderHealth(float health, RenderScope scope) { + String text = ""; switch (decimals.value) { - case 0: + case 0: text = String.format("%.0f ", health); break; - case 1: + + case 1: text = String.format("%.1f ", health); break; - case 2: + + case 2: text = String.format("%.2f ", health); break; } - scope.drawText(text, - 0, 0, dimensions.font.value, dimensions.fgColor.value); + scope.drawText( + text, + 0, + 0, + dimensions.font.value, + dimensions.fgColor.value + ); + dimensions.width = Fonts.getWidth(text, dimensions.font.value); dimensions.height = 18 * text.split("\n").length; } @@ -82,4 +94,4 @@ public class HealthDisplay extends Module implements HudMod { public void onEnabled(boolean e) { enabled.value = e; } -} +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/Keystrokes.java b/common/src/main/java/org/saturnclient/modules/mods/Keystrokes.java similarity index 87% rename from src/main/java/org/saturnclient/modules/mods/Keystrokes.java rename to common/src/main/java/org/saturnclient/modules/mods/Keystrokes.java index f67e755..acf7256 100644 --- a/src/main/java/org/saturnclient/modules/mods/Keystrokes.java +++ b/common/src/main/java/org/saturnclient/modules/mods/Keystrokes.java @@ -3,10 +3,10 @@ package org.saturnclient.modules.mods; import org.saturnclient.modules.Module; import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; import org.saturnclient.modules.ModuleDetails; +import org.saturnclient.modules.interfaces.KeystrokesInterface; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.RenderScope; public class Keystrokes extends Module implements HudMod { @@ -19,6 +19,8 @@ public class Keystrokes extends Module implements HudMod { private static final ModDimensions dimensions = new ModDimensions(78, 54); + private final KeystrokesInterface minecraft; + // Key states private boolean w, a, s, d, lmb, rmb, space; @@ -29,7 +31,7 @@ public class Keystrokes extends Module implements HudMod { private static final int MOUSE_HEIGHT = 24; private static final int SPACE_HEIGHT = 19; - public Keystrokes() { + public Keystrokes(KeystrokesInterface minecraft) { super(new ModuleDetails("Keystrokes", "keystrokes") .description("Displays movement keystrokes") .version("v0.2.0") @@ -40,21 +42,22 @@ public class Keystrokes extends Module implements HudMod { showSpace.named("Show space"), dimensions.prop(), clickFg.named("Clicked fg"), - clickBg.named("Clicked bg") - ); + clickBg.named("Clicked bg")); + + this.minecraft = minecraft; dimensions.renderBackground = false; } @Override public void tick() { - w = SaturnClient.client.options.forwardKey.isPressed(); - a = SaturnClient.client.options.leftKey.isPressed(); - s = SaturnClient.client.options.backKey.isPressed(); - d = SaturnClient.client.options.rightKey.isPressed(); - lmb = SaturnClient.client.options.attackKey.isPressed(); - rmb = SaturnClient.client.options.useKey.isPressed(); - space = SaturnClient.client.options.jumpKey.isPressed(); + w = minecraft.isForwardPressed(); + a = minecraft.isLeftPressed(); + s = minecraft.isBackPressed(); + d = minecraft.isRightPressed(); + lmb = minecraft.isAttackPressed(); + rmb = minecraft.isUsePressed(); + space = minecraft.isJumpPressed(); updateHeight(); } diff --git a/common/src/main/java/org/saturnclient/modules/mods/Nametags.java b/common/src/main/java/org/saturnclient/modules/mods/Nametags.java new file mode 100644 index 0000000..17b5de2 --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/mods/Nametags.java @@ -0,0 +1,121 @@ +package org.saturnclient.modules.mods; + +import org.saturnclient.modules.Module; +import org.saturnclient.modules.ModuleDetails; +import org.saturnclient.config.manager.Property; +import org.saturnclient.modules.interfaces.NametagsInterface; + +public class Nametags extends Module { + + private static Property enabled = Property.bool(false); + private static Property healthDisplay = Property.bool(false); + private static Property players = Property.bool(true); + private static Property hostile = Property.bool(false); + private static Property passive = Property.bool(false); + private static Property heartEmoji = Property.bool(true); + private static Property obfuscate = Property.bool(false); + private static Property unit = Property.select(0, "Health", "Hearts"); + private static Property format = Property.select(0, "Value", "Value / Total", "%"); + private static Property nameColor = Property.select(15, + "Black","Dark Blue","Dark Green","Dark Aqua","Dark Red","Dark Purple","Gold","Gray", + "Dark Gray","Blue","Green","Aqua","Red","Light Purple","Yellow","White"); + private static Property healthColor = Property.select(12, + "Black","Dark Blue","Dark Green","Dark Aqua","Dark Red","Dark Purple","Gold","Gray", + "Dark Gray","Blue","Green","Aqua","Red","Light Purple","Yellow","White"); + + private static final String[] COLOR_CODES = { + "§0", "§1", "§2", "§3", "§4", "§5", "§6", "§7", + "§8", "§9", "§a", "§b", "§c", "§d", "§e", "§f" + }; + + public Nametags(NametagsInterface minecraft) { + super(new ModuleDetails("Nametags", "nametags") + .description("Allows you to modify entity nametags") + .tags("Camera", "Utility") + .version("0.1.0"), + enabled.named("Enabled"), + healthDisplay.named("Display health"), + players.named("Players"), + hostile.named("Hostile"), + passive.named("Passive"), + heartEmoji.named("Heart emoji"), + obfuscate.named("Obfuscate enemy names"), + unit.named("Unit"), + format.named("Format"), + nameColor.named("Name color"), + healthColor.named("Health color")); + } + + @Override + public void tick() { + // Currently unused + } + + public static String getHealthString(NametagsInterface.EntityState state, float health, float maxHealth) { + String ret = ""; + + switch (format.value) { + case 0: // value + ret = String.format("%.1f", health / (unit.value + 1)); + break; + + case 1: // value / total + ret = String.format("%.1f", health / (unit.value + 1)) + " / " + + String.format("%.1f", maxHealth / (unit.value + 1)); + break; + + case 2: // % + ret = String.format("%.0f%%", (health / maxHealth) * 100); + break; + } + + return ret; + } + + public static String getNametagString(NametagsInterface.EntityState state) { + if (state.getCustomName() == null) + return null; + + if (!healthDisplay.value) + return state.getCustomName(); // name only + + float health = state.getHealth(); + float maxHealth = state.getMaxHealth(); + NametagsInterface.EntityType type = state.getEntityType(); + + if (type == NametagsInterface.EntityType.PASSIVE && !passive.value) + return null; + if (type == NametagsInterface.EntityType.HOSTILE && !hostile.value) + return null; + if (type == NametagsInterface.EntityType.PLAYER && !players.value) + return null; + if (type == NametagsInterface.EntityType.OTHER) + return null; + + if (health < 0f || maxHealth < 0f || health > maxHealth) + return null; + + String hpColor = COLOR_CODES[healthColor.value]; + String color = COLOR_CODES[nameColor.value]; + String heart = heartEmoji.value ? " ❤" : ""; + String obf = obfuscate.value ? "§k" : ""; + String reset = "§r"; + + return color + obf + state.getCustomName() + reset + " " + hpColor + + getHealthString(state, health, maxHealth) + heart; + } + + public static boolean shouldReplaceName() { + return enabled.value; + } + + @Override + public void onEnabled(boolean e) { + enabled.value = e; + } + + @Override + public boolean isEnabled() { + return enabled.value; + } +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/NoFog.java b/common/src/main/java/org/saturnclient/modules/mods/NoFog.java similarity index 66% rename from src/main/java/org/saturnclient/modules/mods/NoFog.java rename to common/src/main/java/org/saturnclient/modules/mods/NoFog.java index bd8d17e..3b0ee88 100644 --- a/src/main/java/org/saturnclient/modules/mods/NoFog.java +++ b/common/src/main/java/org/saturnclient/modules/mods/NoFog.java @@ -2,7 +2,7 @@ package org.saturnclient.modules.mods; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; public class NoFog extends Module { private static Property enabled = Property.bool(false); @@ -10,12 +10,12 @@ public class NoFog extends Module { public NoFog() { super( - new ModuleDetails("No Fog", "nofog") - .description("Stops fog from rendering") - .tags("Camera") - .version("v0.1.0"), - enabled.named("Enabled"), - liquids.named("See through liquids")); + new ModuleDetails("No Fog", "nofog") + .description("Stops fog from rendering") + .tags("Camera") + .version("v0.1.0"), + enabled.named("Enabled"), + liquids.named("See through liquids")); } @Override diff --git a/src/main/java/org/saturnclient/modules/mods/Ping.java b/common/src/main/java/org/saturnclient/modules/mods/Ping.java similarity index 61% rename from src/main/java/org/saturnclient/modules/mods/Ping.java rename to common/src/main/java/org/saturnclient/modules/mods/Ping.java index 06c103d..7d84914 100644 --- a/src/main/java/org/saturnclient/modules/mods/Ping.java +++ b/common/src/main/java/org/saturnclient/modules/mods/Ping.java @@ -4,34 +4,33 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayNetworkHandler; +import org.saturnclient.config.manager.Property; +import org.saturnclient.modules.interfaces.PingInterface; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Ping extends Module implements HudMod { + private static Property enabled = Property.bool(false); private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight()); - - public Ping() { + + private final PingInterface pingProvider; + + public Ping(PingInterface pingProvider) { super(new ModuleDetails("Ping Display", "ping") - .description("Displays ping") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - dimensions.prop()); + .description("Displays ping") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + dimensions.prop()); + + this.pingProvider = pingProvider; } @Override public void renderHud(RenderScope scope) { - MinecraftClient client = MinecraftClient.getInstance(); - ClientPlayNetworkHandler handler = client.getNetworkHandler(); - String text = "0 ms"; - if (handler != null) { - text = String.valueOf(handler.getPlayerListEntry(client.player.getUuid()).getLatency()) + " ms"; - } + int ping = pingProvider.getPing(); + String text = ping + " ms"; scope.drawText(text, 0, 0, dimensions.font.value, dimensions.fgColor.value); dimensions.width = Fonts.getWidth(text, dimensions.font.value); } @@ -57,4 +56,4 @@ public class Ping extends Module implements HudMod { public ModDimensions getDimensions() { return dimensions; } -} +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/mods/Speedometer.java b/common/src/main/java/org/saturnclient/modules/mods/Speedometer.java new file mode 100644 index 0000000..b131ace --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/mods/Speedometer.java @@ -0,0 +1,96 @@ +package org.saturnclient.modules.mods; + +import org.saturnclient.modules.HudMod; +import org.saturnclient.modules.ModDimensions; +import org.saturnclient.modules.Module; +import org.saturnclient.modules.ModuleDetails; +import org.saturnclient.config.manager.Property; +import org.saturnclient.modules.interfaces.SpeedometerInterface; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; + +public class Speedometer extends Module implements HudMod { + + private static Property enabled = Property.bool(false); + private static Property axis = Property.select(1, "Absolute", "X axis", "Y axis"); + private static Property unitText = Property.select(0, "None", "Blocks/s", "blocks/s", "b/s"); + private static Property speedText = Property.bool(true); + private static ModDimensions dimensions = new ModDimensions(40, 18); + + private final SpeedometerInterface provider; + private double speed = 0.; + + public Speedometer(SpeedometerInterface provider) { + super(new ModuleDetails("Speedometer", "speed") + .description("Displays your current speed") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + axis.named("Speed type"), + unitText.named("Unit text"), + speedText.named("Show speed text"), + dimensions.prop()); + + this.provider = provider; + } + + @Override + public void renderDummy(RenderScope scope) { + renderSpeed(2.71, scope); + } + + @Override + public void renderHud(RenderScope scope) { + SpeedometerInterface.Velocity velocity = provider.getVelocity(); + boolean onGround = provider.isOnGround(); + + double y = onGround ? 0.0 : velocity.y; + + switch (axis.value) { + case 0: // Absolute + speed = Math.sqrt(Math.pow(velocity.x, 2) + Math.pow(y, 2) + Math.pow(velocity.z, 2)); + break; + case 1: // X axis + speed = Math.sqrt(Math.pow(velocity.x, 2) + Math.pow(velocity.z, 2)); + break; + case 2: // Y axis + speed = Math.abs(y); + break; + } + + renderSpeed(speed * 20, scope); // blocks/tick to blocks/s + } + + public void renderSpeed(double speed, RenderScope scope) { + String text = String.format("%.2f ", speed); + + switch (unitText.value) { + case 1 -> text += "Blocks/s"; + case 2 -> text += "blocks/s"; + case 3 -> text += "b/s"; + } + + if (speedText.value) { + text = "Speed: " + text; + } + + scope.drawText(text, 0, 0, dimensions.font.value, dimensions.fgColor.value); + dimensions.width = Fonts.getWidth(text, dimensions.font.value); + dimensions.height = 18 * text.split("\n").length; + } + + @Override + public boolean isEnabled() { + return enabled.value; + } + + @Override + public ModDimensions getDimensions() { + return dimensions; + } + + @Override + public void onEnabled(boolean e) { + enabled.value = e; + } +} \ No newline at end of file diff --git a/common/src/main/java/org/saturnclient/modules/mods/StatusEffects.java b/common/src/main/java/org/saturnclient/modules/mods/StatusEffects.java new file mode 100644 index 0000000..cbd8efe --- /dev/null +++ b/common/src/main/java/org/saturnclient/modules/mods/StatusEffects.java @@ -0,0 +1,86 @@ +package org.saturnclient.modules.mods; + +import java.util.List; + +import org.saturnclient.modules.HudMod; +import org.saturnclient.modules.ModDimensions; +import org.saturnclient.modules.Module; +import org.saturnclient.modules.ModuleDetails; +import org.saturnclient.modules.interfaces.StatusEffectsInterface; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.RenderScope; + +public class StatusEffects extends Module implements HudMod { + + public static Property enabled = Property.bool(false); + private static ModDimensions dimensions = new ModDimensions(60, 0); + + private final StatusEffectsInterface provider; + + public StatusEffects(StatusEffectsInterface provider) { + super(new ModuleDetails("Status effects", "effect") + .description("Displays status effects") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + dimensions.prop()); + + this.provider = provider; + } + + private void renderEffects(RenderScope scope, List effects) { + int row = 0; + + for (StatusEffectsInterface.Effect effect : effects) { + if (!effect.shouldShowIcon()) continue; + + scope.drawSpriteStretched(effect.getIcon(), 0, 18 * row, 16, 16); + scope.drawText(0.5f, getDurationAsString(effect), 18, 18 * row + 3, dimensions.font.value, -1); + row++; + } + + dimensions.height = 18 * row; + } + + @Override + public void renderHud(RenderScope scope) { + renderEffects(scope, provider.getActiveEffects()); + } + + @Override + public void renderDummy(RenderScope scope) { + renderEffects(scope, provider.getDummyEffects()); + } + + private String getDurationAsString(StatusEffectsInterface.Effect effect) { + if (effect.isInfinite()) { + return effect.getInfiniteText(); + } + + int totalSeconds = effect.getDurationSeconds(); + if (totalSeconds >= 3600) { + return totalSeconds / 3600 + "h"; + } else if (totalSeconds >= 60) { + int minutes = totalSeconds / 60; + int seconds = totalSeconds % 60; + return String.format("%d:%02d", minutes, seconds); + } else { + return totalSeconds + "s"; + } + } + + @Override + public ModDimensions getDimensions() { + return dimensions; + } + + @Override + public boolean isEnabled() { + return enabled.value; + } + + @Override + public void onEnabled(boolean e) { + enabled.value = e; + } +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/Tps.java b/common/src/main/java/org/saturnclient/modules/mods/Tps.java similarity index 78% rename from src/main/java/org/saturnclient/modules/mods/Tps.java rename to common/src/main/java/org/saturnclient/modules/mods/Tps.java index a8eb977..4f1acb4 100644 --- a/src/main/java/org/saturnclient/modules/mods/Tps.java +++ b/common/src/main/java/org/saturnclient/modules/mods/Tps.java @@ -4,9 +4,9 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Tps extends Module implements HudMod { private static Property enabled = Property.bool(false); @@ -26,12 +26,11 @@ public class Tps extends Module implements HudMod { public Tps() { super(new ModuleDetails("TPS Display", "tps") - .description("Displays the TPS") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - dimensions.prop() - ); + .description("Displays the TPS") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + dimensions.prop()); } public static void onTimePacket(long worldAge) { @@ -50,7 +49,8 @@ public class Tps extends Module implements HudMod { samplesFilled = Math.min(samplesFilled + 1, SAMPLE_COUNT); double sum = 0; - for (int i = 0; i < samplesFilled; i++) sum += samples[i]; + for (int i = 0; i < samplesFilled; i++) + sum += samples[i]; currentTps = sum / samplesFilled; } } @@ -64,8 +64,9 @@ public class Tps extends Module implements HudMod { lastRealTime = -1; currentTps = 20.0; sampleIndex = 0; - samplesFilled = SAMPLE_COUNT; - for (int i = 0; i < SAMPLE_COUNT; i++) samples[i] = 20.0; + samplesFilled = SAMPLE_COUNT; + for (int i = 0; i < SAMPLE_COUNT; i++) + samples[i] = 20.0; } @Override @@ -88,12 +89,12 @@ public class Tps extends Module implements HudMod { } @Override - public void onEnabled(boolean e) { - enabled.value = e; + public void onEnabled(boolean e) { + enabled.value = e; } @Override - public ModDimensions getDimensions() { - return dimensions; + public ModDimensions getDimensions() { + return dimensions; } } diff --git a/src/main/java/org/saturnclient/modules/mods/Zoom.java b/common/src/main/java/org/saturnclient/modules/mods/Zoom.java similarity index 66% rename from src/main/java/org/saturnclient/modules/mods/Zoom.java rename to common/src/main/java/org/saturnclient/modules/mods/Zoom.java index cd9d28a..77240bc 100644 --- a/src/main/java/org/saturnclient/modules/mods/Zoom.java +++ b/common/src/main/java/org/saturnclient/modules/mods/Zoom.java @@ -1,31 +1,30 @@ package org.saturnclient.modules.mods; -import org.lwjgl.glfw.GLFW; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Key; +import org.saturnclient.config.manager.Property; public class Zoom extends Module { private static Property enabled = Property.bool(false); private static Property toggle = Property.bool(false); - public static Property zoomKey = Property.keybinding(GLFW.GLFW_KEY_C); + public static Property zoomKey = Property.keybinding(Key.GLFW_KEY_C); public static Property zoomLevel = Property.floatProp(3.0f); - + public static boolean isZooming = false; - + public Zoom() { super( - new ModuleDetails("Zoom", "zoom") - .description("Allows you to zoom in for a closer view") - .tags("Camera", "Utility") - .version("0.1.0"), - enabled.named("Enabled"), - toggle.named("Toggle zoom"), - zoomKey.named("Zoom Keybinding"), - zoomLevel.named("Zoom Level") - ); + new ModuleDetails("Zoom", "zoom") + .description("Allows you to zoom in for a closer view") + .tags("Camera", "Utility") + .version("0.1.0"), + enabled.named("Enabled"), + toggle.named("Toggle zoom"), + zoomKey.named("Zoom Keybinding"), + zoomLevel.named("Zoom Level")); } - + @Override public void tick() { if (toggle.value) { @@ -41,7 +40,7 @@ public class Zoom extends Module { return zoomLevel.value; } - public static boolean shouldZoom() { + public static boolean shouldZoom() { return enabled.value; } diff --git a/src/main/java/org/saturnclient/ui2/Element.java b/common/src/main/java/org/saturnclient/ui/Element.java similarity index 96% rename from src/main/java/org/saturnclient/ui2/Element.java rename to common/src/main/java/org/saturnclient/ui/Element.java index 49e8a16..1b2f15b 100644 --- a/src/main/java/org/saturnclient/ui2/Element.java +++ b/common/src/main/java/org/saturnclient/ui/Element.java @@ -1,6 +1,6 @@ -package org.saturnclient.ui2; +package org.saturnclient.ui; -import org.saturnclient.ui2.anim.Animation; +import org.saturnclient.ui.anim.Animation; public class Element { public int x; diff --git a/src/main/java/org/saturnclient/ui2/ElementContext.java b/common/src/main/java/org/saturnclient/ui/ElementContext.java similarity index 96% rename from src/main/java/org/saturnclient/ui2/ElementContext.java rename to common/src/main/java/org/saturnclient/ui/ElementContext.java index def84dd..2077161 100644 --- a/src/main/java/org/saturnclient/ui2/ElementContext.java +++ b/common/src/main/java/org/saturnclient/ui/ElementContext.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2; +package org.saturnclient.ui; public class ElementContext { public int mouseX, mouseY; diff --git a/common/src/main/java/org/saturnclient/ui/ElementRenderer.java b/common/src/main/java/org/saturnclient/ui/ElementRenderer.java new file mode 100644 index 0000000..fb85aca --- /dev/null +++ b/common/src/main/java/org/saturnclient/ui/ElementRenderer.java @@ -0,0 +1,27 @@ +package org.saturnclient.ui; + +import java.util.List; + +public abstract class ElementRenderer { + public static ElementRenderer INSTANCE; + + public abstract void draw(List elements, Element element); + + public abstract void render(List elements, long elapsed, RenderScope renderScope, int mouseX, int mouseY); + + public abstract void mouseClicked(List elements, double mouseX, double mouseY, int button); + + public abstract void mouseScrolled( + List elements, + double mouseX, + double mouseY, + double horizontalAmount, + double verticalAmount); + + public abstract void keyPressed(List elements, int keyCode, int scanCode, int modifiers); + + public abstract void mouseDragged(List elements, double mouseX, double mouseY, int button, double deltaX, + double deltaY); + + public abstract void mouseReleased(List elements, double mouseX, double mouseY, int button); +} diff --git a/common/src/main/java/org/saturnclient/ui/RenderScope.java b/common/src/main/java/org/saturnclient/ui/RenderScope.java new file mode 100644 index 0000000..3467e58 --- /dev/null +++ b/common/src/main/java/org/saturnclient/ui/RenderScope.java @@ -0,0 +1,67 @@ +package org.saturnclient.ui; + +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.minecraft.bindings.SaturnItemStack; +import org.saturnclient.common.minecraft.bindings.SaturnSprite; +import org.saturnclient.common.minecraft.render.IMatrixStack; + +public interface RenderScope { + public IMatrixStack getMatrixStack(); + + public void setOpacity(float alpha); + + public int getColor(int color); + + public void drawRect(int x, int y, int width, int height, int color); + + public void drawText(String text, int x, int y, int font, int color); + + public void drawText(float scale, String text, int x, int y, int font, int color); + + public void drawRoundedRectangle(int x, int y, int width, int height, int radius, int color); + + public int getScaledWindowWidth(); + + public int getScaledWindowHeight(); + + /* Saturn common sprites */ + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, int color); + + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height); + + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, + int regionWith, + int regionHeight, int textureWidth, int textureHeight); + + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, + int regionWidth, + int regionHeight, int textureWidth, int textureHeight, int color); + + public void enableScissor(int x1, int y1, int x2, int y2); + + public void disableScissor(); + + public boolean scissorContains(int x, int y); + + public void draw(); + + public void drawItem(SaturnItemStack item, int x, int y); + + public void drawItem(SaturnItemStack stack, int x, int y, int seed); + + public void drawItem(SaturnItemStack stack, int x, int y, int seed, int z); + + public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y); + + public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y, int seed); + + public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height); + + public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height, int color); + + public void fill(int x1, int y1, int x2, int y2, int color); + + public void fill(int x1, int y1, int x2, int y2, int z, int color); + + public void drawBorder(int x, int y, int width, int height, int color); +} diff --git a/common/src/main/java/org/saturnclient/ui/SaturnScreen.java b/common/src/main/java/org/saturnclient/ui/SaturnScreen.java new file mode 100644 index 0000000..991c25b --- /dev/null +++ b/common/src/main/java/org/saturnclient/ui/SaturnScreen.java @@ -0,0 +1,121 @@ +package org.saturnclient.ui; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.List; + +public abstract class SaturnScreen { + public static interface ScreenProvider { + public void close(); + + public int getWidth(); + + public int getHeight(); + } + + // General + public int width; + public int height; + public String title; + + // Saturn Screen + public List elements = new ArrayList<>(); + public float backgroundOpacity = 1.0f; + protected Instant start = null; + public int backgroundBlur = 10; + + // Provider + public ScreenProvider provider; + + public SaturnScreen(String title) { + this.title = title; + } + + protected void init() { + elements.clear(); + width = provider.getWidth(); + height = provider.getHeight(); + ui(); // abstraction to render the saturn ui and also render extra stuff here + } + + public abstract void ui(); + + public void draw(Element element) { + ElementRenderer.INSTANCE.draw(elements, element); + } + + // -------------- + // Rendering + // -------------- + + public void render(RenderScope renderScope, int mouseX, int mouseY, float delta, long elapsed) { + renderScope.getMatrixStack().push(); + + renderScope.getMatrixStack().scale(0.5f, 0.5f, 0.5f); + + ElementRenderer.INSTANCE.render(new ArrayList<>(elements), elapsed, renderScope, mouseX, mouseY); + + renderScope.getMatrixStack().pop(); + } + + // -------------- + // Events + // -------------- + + public boolean mouseClicked(double mouseX, double mouseY, int button) { + mouseX *= 2; + mouseY *= 2; + + ElementRenderer.INSTANCE.mouseClicked(elements, mouseX, mouseY, button); + + return false; + } + + public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { + mouseX *= 2; + mouseY *= 2; + + ElementRenderer.INSTANCE.mouseDragged(elements, mouseX, mouseY, button, deltaX, deltaY); + + return false; + } + + public boolean mouseReleased(double mouseX, double mouseY, int button) { + mouseX *= 2; + mouseY *= 2; + + ElementRenderer.INSTANCE.mouseReleased(elements, mouseX, mouseY, button); + + return false; + } + + public boolean mouseScrolled( + double mouseX, + double mouseY, + double horizontalAmount, + double verticalAmount) { + mouseX *= 2; + mouseY *= 2; + + ElementRenderer.INSTANCE.mouseScrolled(elements, mouseX, mouseY, horizontalAmount, verticalAmount); + + return false; + } + + public void resize(int width, int height) { + init(); + } + + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + ElementRenderer.INSTANCE.keyPressed(elements, keyCode, scanCode, modifiers); + + return false; + } + + public boolean shouldPause() { + return true; + } + + public void onClose() { + } +} diff --git a/common/src/main/java/org/saturnclient/ui/Utils.java b/common/src/main/java/org/saturnclient/ui/Utils.java new file mode 100644 index 0000000..2887d0a --- /dev/null +++ b/common/src/main/java/org/saturnclient/ui/Utils.java @@ -0,0 +1,62 @@ +package org.saturnclient.ui; + +import java.util.List; + +import org.saturnclient.config.manager.Key; + +public class Utils { + public static boolean isHovering(int mouseX, int mouseY, int elementWidth, int elementHeight, float elementScale) { + return mouseX >= 0 && + mouseX <= (elementWidth * elementScale) && + mouseY >= 0 && + mouseY <= (elementHeight * elementScale); + } + + public static char getCharFromKey(int keyCode, int modifiers) { + boolean shift = (modifiers & Key.GLFW_MOD_SHIFT) != 0; + + // A-Z + if (keyCode >= Key.GLFW_KEY_A && keyCode <= Key.GLFW_KEY_Z) { + return (char) (shift + ? 'A' + (keyCode - Key.GLFW_KEY_A) + : 'a' + (keyCode - Key.GLFW_KEY_A)); + } + + // 0-9 + if (keyCode >= Key.GLFW_KEY_0 && keyCode <= Key.GLFW_KEY_9) { + return shift + ? ")!@#$%^&*(".charAt(keyCode - Key.GLFW_KEY_0) + : (char) ('0' + (keyCode - Key.GLFW_KEY_0)); + } + + // Special characters + return switch (keyCode) { + case Key.GLFW_KEY_SPACE -> ' '; + case Key.GLFW_KEY_PERIOD -> shift ? '>' : '.'; + case Key.GLFW_KEY_COMMA -> shift ? '<' : ','; + case Key.GLFW_KEY_MINUS -> shift ? '_' : '-'; + case Key.GLFW_KEY_EQUAL -> shift ? '+' : '='; + case Key.GLFW_KEY_SEMICOLON -> shift ? ':' : ';'; + case Key.GLFW_KEY_APOSTROPHE -> shift ? '"' : '\''; + case Key.GLFW_KEY_SLASH -> shift ? '?' : '/'; + case Key.GLFW_KEY_BACKSLASH -> shift ? '|' : '\\'; + case Key.GLFW_KEY_LEFT_BRACKET -> shift ? '{' : '['; + case Key.GLFW_KEY_RIGHT_BRACKET -> shift ? '}' : ']'; + case Key.GLFW_KEY_GRAVE_ACCENT -> shift ? '~' : '`'; + default -> '\0'; + }; + } + + public static T getOrNull(List list, int index) { + return (index >= 0 && index < list.size()) ? list.get(index) : null; + } + + // public static void notify(NotificationKind kind, String title, String toast) { + // if (SaturnClient.client.currentScreen instanceof SaturnScreen) { + // ((SaturnScreen) SaturnClient.client.currentScreen) + // .draw(new Notification(SaturnClient.client.currentScreen.width, + // SaturnClient.client.currentScreen.height, kind, + // title, toast)); + // } + // } +} diff --git a/src/main/java/org/saturnclient/ui2/anim/Animation.java b/common/src/main/java/org/saturnclient/ui/anim/Animation.java similarity index 86% rename from src/main/java/org/saturnclient/ui2/anim/Animation.java rename to common/src/main/java/org/saturnclient/ui/anim/Animation.java index 142ff78..55982ac 100644 --- a/src/main/java/org/saturnclient/ui2/anim/Animation.java +++ b/common/src/main/java/org/saturnclient/ui/anim/Animation.java @@ -1,9 +1,9 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; import java.util.function.Function; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.ui.Element; public abstract class Animation { public int duration; diff --git a/src/main/java/org/saturnclient/ui2/anim/Curve.java b/common/src/main/java/org/saturnclient/ui/anim/Curve.java similarity index 94% rename from src/main/java/org/saturnclient/ui2/anim/Curve.java rename to common/src/main/java/org/saturnclient/ui/anim/Curve.java index ab9b811..e19d503 100644 --- a/src/main/java/org/saturnclient/ui2/anim/Curve.java +++ b/common/src/main/java/org/saturnclient/ui/anim/Curve.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; public class Curve { public static double easeOutCubic(double x) { diff --git a/src/main/java/org/saturnclient/ui2/anim/Fade.java b/common/src/main/java/org/saturnclient/ui/anim/Fade.java similarity index 78% rename from src/main/java/org/saturnclient/ui2/anim/Fade.java rename to common/src/main/java/org/saturnclient/ui/anim/Fade.java index 68a0329..9a5ecef 100644 --- a/src/main/java/org/saturnclient/ui2/anim/Fade.java +++ b/common/src/main/java/org/saturnclient/ui/anim/Fade.java @@ -1,7 +1,7 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.ui.Element; public class Fade extends Animation { float targetOpacity; diff --git a/src/main/java/org/saturnclient/ui2/anim/FadeOut.java b/common/src/main/java/org/saturnclient/ui/anim/FadeOut.java similarity index 78% rename from src/main/java/org/saturnclient/ui2/anim/FadeOut.java rename to common/src/main/java/org/saturnclient/ui/anim/FadeOut.java index 76f39c9..4172883 100644 --- a/src/main/java/org/saturnclient/ui2/anim/FadeOut.java +++ b/common/src/main/java/org/saturnclient/ui/anim/FadeOut.java @@ -1,7 +1,7 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.ui.Element; public class FadeOut extends Animation { float targetOpacity; diff --git a/src/main/java/org/saturnclient/ui2/anim/SlideFade.java b/common/src/main/java/org/saturnclient/ui/anim/SlideFade.java similarity index 86% rename from src/main/java/org/saturnclient/ui2/anim/SlideFade.java rename to common/src/main/java/org/saturnclient/ui/anim/SlideFade.java index e0a24b4..1318287 100644 --- a/src/main/java/org/saturnclient/ui2/anim/SlideFade.java +++ b/common/src/main/java/org/saturnclient/ui/anim/SlideFade.java @@ -1,7 +1,7 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.ui.Element; public class SlideFade extends Animation { public Fade fade; diff --git a/src/main/java/org/saturnclient/ui2/anim/SlideX.java b/common/src/main/java/org/saturnclient/ui/anim/SlideX.java similarity index 84% rename from src/main/java/org/saturnclient/ui2/anim/SlideX.java rename to common/src/main/java/org/saturnclient/ui/anim/SlideX.java index b759865..82792ba 100644 --- a/src/main/java/org/saturnclient/ui2/anim/SlideX.java +++ b/common/src/main/java/org/saturnclient/ui/anim/SlideX.java @@ -1,7 +1,7 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.ui.Element; public class SlideX extends Animation { int offset = 20; diff --git a/src/main/java/org/saturnclient/ui2/anim/SlideY.java b/common/src/main/java/org/saturnclient/ui/anim/SlideY.java similarity index 84% rename from src/main/java/org/saturnclient/ui2/anim/SlideY.java rename to common/src/main/java/org/saturnclient/ui/anim/SlideY.java index 5c4ce09..0c0aa8a 100644 --- a/src/main/java/org/saturnclient/ui2/anim/SlideY.java +++ b/common/src/main/java/org/saturnclient/ui/anim/SlideY.java @@ -1,7 +1,7 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.ui.Element; public class SlideY extends Animation { int offset = 20; diff --git a/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java b/common/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java similarity index 65% rename from src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java rename to common/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java index 49ace16..2ae9d49 100644 --- a/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java +++ b/common/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java @@ -1,21 +1,19 @@ -package org.saturnclient.ui2.components; +package org.saturnclient.ui.components; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; - -import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.Identifier; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.config.Theme; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; public class CosmeticPreview extends Element { static int padding = 14; - Identifier sprite; + SaturnIdentifier sprite; private Runnable onClick; private boolean isSelected; - public CosmeticPreview(boolean isSelected, Identifier sprite, Runnable onClick) { + public CosmeticPreview(boolean isSelected, SaturnIdentifier sprite, Runnable onClick) { this.sprite = sprite; this.onClick = onClick; this.isSelected = isSelected; @@ -29,8 +27,6 @@ public class CosmeticPreview extends Element { renderScope.drawRoundedRectangle(0, 0, width, height, Theme.WIDGET_RADIUS.value, isSelected ? Theme.ACCENT.value : Theme.PRIMARY.value); - renderScope.setRenderLayer(RenderLayer::getGuiTextured); - int texWidth = width - padding; int texHeight = height - padding; diff --git a/src/main/java/org/saturnclient/ui2/components/ElementRenderer.java b/common/src/main/java/org/saturnclient/ui/components/ElementRendererImpl.java similarity index 69% rename from src/main/java/org/saturnclient/ui2/components/ElementRenderer.java rename to common/src/main/java/org/saturnclient/ui/components/ElementRendererImpl.java index 30842a1..ad664d8 100644 --- a/src/main/java/org/saturnclient/ui2/components/ElementRenderer.java +++ b/common/src/main/java/org/saturnclient/ui/components/ElementRendererImpl.java @@ -1,15 +1,16 @@ -package org.saturnclient.ui2.components; +package org.saturnclient.ui.components; import java.util.ArrayList; import java.util.List; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.Utils; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.ElementRenderer; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.Utils; -public class ElementRenderer { - public static void draw(List elements, Element element) { +public class ElementRendererImpl extends ElementRenderer { + public void draw(List elements, Element element) { synchronized (elements) { elements.add(element); } @@ -19,21 +20,20 @@ public class ElementRenderer { } } - public static void render(List elements, long elapsed, RenderScope renderScope, int mouseX, int mouseY) { + public void render(List elements, long elapsed, RenderScope renderScope, int mouseX, int mouseY) { for (Element element : elements) { element.playAnimationFrame(elapsed); - renderScope.matrices.push(); + renderScope.getMatrixStack().push(); renderScope.setOpacity(element.opacity); - renderScope.matrices.translate(element.x, element.y, 0); - renderScope.matrices.scale(element.scale, element.scale, 1.0f); + renderScope.getMatrixStack().translate(element.x, element.y, 0); + renderScope.getMatrixStack().scale(element.scale, element.scale, 1.0f); element.render(renderScope, new ElementContext(elapsed, mouseX, mouseY, element)); - renderScope.matrices.pop(); - renderScope.setRenderLayer(null); + renderScope.getMatrixStack().pop(); } } - public static void mouseClicked(List elements, double mouseX, double mouseY, int button) { + public void mouseClicked(List elements, double mouseX, double mouseY, int button) { if (button == 0) { for (Element element : new ArrayList<>(elements)) { element.focused = false; @@ -52,7 +52,7 @@ public class ElementRenderer { } } - public static void mouseScrolled( + public void mouseScrolled( List elements, double mouseX, double mouseY, @@ -70,7 +70,7 @@ public class ElementRenderer { } } - public static void keyPressed(List elements, int keyCode, int scanCode, int modifiers) { + public void keyPressed(List elements, int keyCode, int scanCode, int modifiers) { for (Element element : new ArrayList<>(elements)) { if (element.focused && element.opacity > 0) { element.keyPressed(keyCode, scanCode, modifiers); @@ -83,14 +83,14 @@ public class ElementRenderer { } } - public static void mouseDragged(List elements, double mouseX, double mouseY, int button, double deltaX, + public void mouseDragged(List elements, double mouseX, double mouseY, int button, double deltaX, double deltaY) { for (Element element : new ArrayList<>(elements)) { element.mouseDragged(mouseX - element.x, mouseY - element.y, button, deltaX, deltaY); } } - public static void mouseReleased(List elements, double mouseX, double mouseY, int button) { + public void mouseReleased(List elements, double mouseX, double mouseY, int button) { for (Element element : new ArrayList<>(elements)) { element.mouseReleased(mouseX - element.x, mouseY - element.y, button); } diff --git a/src/main/java/org/saturnclient/ui2/components/SaturnModule.java b/common/src/main/java/org/saturnclient/ui/components/SaturnModule.java similarity index 86% rename from src/main/java/org/saturnclient/ui2/components/SaturnModule.java rename to common/src/main/java/org/saturnclient/ui/components/SaturnModule.java index 21c8b1c..4ce7864 100644 --- a/src/main/java/org/saturnclient/ui2/components/SaturnModule.java +++ b/common/src/main/java/org/saturnclient/ui/components/SaturnModule.java @@ -1,17 +1,15 @@ -package org.saturnclient.ui2.components; +package org.saturnclient.ui.components; import org.saturnclient.modules.Module; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.resources.Fonts; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.screens.ConfigEditor; - -import net.minecraft.client.render.RenderLayer; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.config.Theme; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.Utils; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.Textures; +import org.saturnclient.ui.screens.ConfigEditor; public class SaturnModule extends Element { @@ -41,8 +39,6 @@ public class SaturnModule extends Element { getSettingsHitBox(), getSettingsHitBox()); - renderScope.setRenderLayer(RenderLayer::getGuiTextured); - // Resolve theme colors int bgColor = Theme.PRIMARY.value; int fgColor = hovered && !settingsHover ? Theme.ACCENT.value : Theme.PRIMARY_FG.value; @@ -145,7 +141,7 @@ public class SaturnModule extends Element { 1.0f); if (settingsHover) { - SaturnClient.client.setScreen(new ConfigEditor(mod.getConfig())); + MinecraftProvider.PROVIDER.setScreen(new ConfigEditor(mod.getConfig())); } else { mod.setEnabled(!mod.isEnabled()); } diff --git a/src/main/java/org/saturnclient/ui2/components/Sidebar.java b/common/src/main/java/org/saturnclient/ui/components/Sidebar.java similarity index 71% rename from src/main/java/org/saturnclient/ui2/components/Sidebar.java rename to common/src/main/java/org/saturnclient/ui/components/Sidebar.java index bbb7ef7..9a781ce 100644 --- a/src/main/java/org/saturnclient/ui2/components/Sidebar.java +++ b/common/src/main/java/org/saturnclient/ui/components/Sidebar.java @@ -1,28 +1,26 @@ -package org.saturnclient.ui2.components; +package org.saturnclient.ui.components; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.screens.ConfigEditor; -import org.saturnclient.ui2.screens.ModMenu; -import org.saturnclient.ui2.screens.cosmetics.CloakMenu; -import org.saturnclient.ui2.screens.store.CloakStore; - -import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.Identifier; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.config.Config; +import org.saturnclient.config.Theme; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.Utils; +import org.saturnclient.ui.resources.Textures; +import org.saturnclient.ui.screens.ConfigEditor; +import org.saturnclient.ui.screens.ModMenu; +import org.saturnclient.ui.screens.cosmetics.CloakMenu; +import org.saturnclient.ui.screens.store.CloakStore; public class Sidebar extends Element { public static class SidebarComponent { Runnable onClick; boolean end; - Identifier sprite; + SaturnIdentifier sprite; - public SidebarComponent(Identifier sprite, Runnable onClick, boolean end) { + public SidebarComponent(SaturnIdentifier sprite, Runnable onClick, boolean end) { this.onClick = onClick; this.end = end; this.sprite = sprite; @@ -32,14 +30,14 @@ public class Sidebar extends Element { Runnable onClose; SidebarComponent[] components = { new Sidebar.SidebarComponent(Textures.MODS_TAB, () -> { - SaturnClient.client.setScreen(new ModMenu()); + MinecraftProvider.PROVIDER.setScreen(new ModMenu()); }, false), new Sidebar.SidebarComponent(Textures.SETTINGS, () -> { - SaturnClient.client.setScreen(new ConfigEditor(Config.config)); + MinecraftProvider.PROVIDER.setScreen(new ConfigEditor(Config.config)); }, false), new Sidebar.SidebarComponent(Textures.SHIRT, () -> { - SaturnClient.client.setScreen(new CloakMenu()); + MinecraftProvider.PROVIDER.setScreen(new CloakMenu()); }, false), new Sidebar.SidebarComponent(Textures.CLOSE, () -> { @@ -47,7 +45,7 @@ public class Sidebar extends Element { }, true), new Sidebar.SidebarComponent(Textures.STORE, () -> { - SaturnClient.client.setScreen(new CloakStore()); + MinecraftProvider.PROVIDER.setScreen(new CloakStore()); }, true), }; int active = 0; @@ -70,8 +68,6 @@ public class Sidebar extends Element { int s = 30 - (padding * 2); int s2 = s + padding; - renderScope.setRenderLayer(RenderLayer::getGuiTextured); - renderScope.drawRoundedRectangle(0, 0, width, height, Theme.BG_RADIUS.value, Theme.BACKGROUND.value); int i = 0; diff --git a/common/src/main/java/org/saturnclient/ui/components/SkinPreview.java b/common/src/main/java/org/saturnclient/ui/components/SkinPreview.java new file mode 100644 index 0000000..1686c75 --- /dev/null +++ b/common/src/main/java/org/saturnclient/ui/components/SkinPreview.java @@ -0,0 +1,26 @@ +package org.saturnclient.ui.components; + +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; + +public class SkinPreview extends Element { + public static EntityDrawer DRAWER; + private boolean negativeAngle = false; + private float angle = 0.0f; + + public SkinPreview(float angle, boolean negativeAngle) { + this.angle = angle; + this.negativeAngle = negativeAngle; + } + + @Override + public void render(RenderScope renderScope, ElementContext ctx) { + DRAWER.render(renderScope, negativeAngle, angle, scale, ctx); + } + + public static interface EntityDrawer { + public void render(RenderScope renderScope, boolean negativeAngle, float angle, float scale, + ElementContext ctx); + } +} diff --git a/src/main/java/org/saturnclient/ui2/components/inputs/FloatInput.java b/common/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java similarity index 87% rename from src/main/java/org/saturnclient/ui2/components/inputs/FloatInput.java rename to common/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java index d1d3b37..234d189 100644 --- a/src/main/java/org/saturnclient/ui2/components/inputs/FloatInput.java +++ b/common/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java @@ -1,8 +1,8 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.resources.Fonts; public class FloatInput extends Input { public Property prop; diff --git a/src/main/java/org/saturnclient/ui2/components/inputs/HexInput.java b/common/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java similarity index 96% rename from src/main/java/org/saturnclient/ui2/components/inputs/HexInput.java rename to common/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java index 92830a1..e72d1a5 100644 --- a/src/main/java/org/saturnclient/ui2/components/inputs/HexInput.java +++ b/common/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java @@ -1,11 +1,11 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; import java.awt.Color; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; public class HexInput extends Element { public Property prop; diff --git a/src/main/java/org/saturnclient/ui2/components/inputs/Input.java b/common/src/main/java/org/saturnclient/ui/components/inputs/Input.java similarity index 83% rename from src/main/java/org/saturnclient/ui2/components/inputs/Input.java rename to common/src/main/java/org/saturnclient/ui/components/inputs/Input.java index fbd48d9..c1cd845 100644 --- a/src/main/java/org/saturnclient/ui2/components/inputs/Input.java +++ b/common/src/main/java/org/saturnclient/ui/components/inputs/Input.java @@ -1,12 +1,11 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; -import org.lwjgl.glfw.GLFW; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Key; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public abstract class Input extends Element { String text = ""; @@ -22,18 +21,18 @@ public abstract class Input extends Element { @Override public void keyPressed(int keyCode, int scanCode, int modifiers) { - if (keyCode == GLFW.GLFW_KEY_BACKSPACE) { + if (keyCode == Key.GLFW_KEY_BACKSPACE) { if (cursorPosition > 0 && validateBackspace()) { text = text.substring(0, cursorPosition - 1) + text.substring(cursorPosition); cursorPosition--; backspace(); } - } else if (keyCode == GLFW.GLFW_KEY_LEFT) { + } else if (keyCode == Key.GLFW_KEY_LEFT) { if (cursorPosition > 0) { cursorPosition--; } - } else if (keyCode == GLFW.GLFW_KEY_RIGHT) { + } else if (keyCode == Key.GLFW_KEY_RIGHT) { if (cursorPosition < text.length()) { cursorPosition++; } @@ -49,7 +48,7 @@ public abstract class Input extends Element { float textWidth = 0; for (int i = 0; i < visibleText.length(); i++) { - textWidth = SaturnClient.client.textRenderer.getWidth(visibleText.substring(0, i + 1)) * 0.6f; + textWidth = Fonts.getWidth(visibleText.substring(0, i + 1), Theme.FONT.value) * 0.6f; if (textWidth > mouseX) { break; diff --git a/src/main/java/org/saturnclient/ui2/components/inputs/IntInput.java b/common/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java similarity index 87% rename from src/main/java/org/saturnclient/ui2/components/inputs/IntInput.java rename to common/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java index af43dc8..4b8bea9 100644 --- a/src/main/java/org/saturnclient/ui2/components/inputs/IntInput.java +++ b/common/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java @@ -1,8 +1,8 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.resources.Fonts; public class IntInput extends Input { public Property prop; diff --git a/src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java b/common/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java similarity index 62% rename from src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java rename to common/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java index e4ebafc..f3e9910 100644 --- a/src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java +++ b/common/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java @@ -1,12 +1,13 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; -import org.lwjgl.glfw.GLFW; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Key; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class KeybindingSelector extends Element { Property prop; @@ -21,7 +22,7 @@ public class KeybindingSelector extends Element { public void render(RenderScope renderScope, ElementContext ctx) { int textColor = focused ? 0xFFFFFF : 0xAAAAAA; renderScope.drawRoundedRectangle(0, 0, width, height, 10, 0xFF000000); - String name = GLFW.glfwGetKeyName(prop.value, GLFW.glfwGetKeyScancode(prop.value)); + String name = MinecraftProvider.PROVIDER.getKeyName(prop.value); renderScope.drawText(0.6f, prop.value == -1 ? "" @@ -31,7 +32,7 @@ public class KeybindingSelector extends Element { @Override public void keyPressed(int keyCode, int scanCode, int modifiers) { - if (keyCode == GLFW.GLFW_KEY_BACKSPACE) { + if (keyCode == Key.GLFW_KEY_BACKSPACE) { prop.value = -1; } else { prop.value = keyCode; diff --git a/src/main/java/org/saturnclient/ui2/components/inputs/Select.java b/common/src/main/java/org/saturnclient/ui/components/inputs/Select.java similarity index 67% rename from src/main/java/org/saturnclient/ui2/components/inputs/Select.java rename to common/src/main/java/org/saturnclient/ui/components/inputs/Select.java index 59c2c65..ef62975 100644 --- a/src/main/java/org/saturnclient/ui2/components/inputs/Select.java +++ b/common/src/main/java/org/saturnclient/ui/components/inputs/Select.java @@ -1,13 +1,12 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.resources.Fonts; -import net.minecraft.client.render.RenderLayer; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.Utils; +import org.saturnclient.ui.resources.Fonts; public class Select extends Element { private Property prop; @@ -20,8 +19,6 @@ public class Select extends Element { @Override public void render(RenderScope renderScope, ElementContext ctx) { - renderScope.setRenderLayer(RenderLayer::getGuiTextured); - renderScope.drawText(0.8f, "<", 0, 0, Theme.FONT.value, Theme.FOREGROUND.value); String text = prop.getSelection(); diff --git a/src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java b/common/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java similarity index 71% rename from src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java rename to common/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java index 0ff8705..6c4f3ec 100644 --- a/src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java +++ b/common/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java @@ -1,10 +1,10 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; public class Toggle extends Element { private Property prop; diff --git a/src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java b/common/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java similarity index 63% rename from src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java rename to common/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java index f2b8778..3226e0f 100644 --- a/src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java +++ b/common/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java @@ -1,14 +1,14 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; import java.util.ArrayList; import java.util.List; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.components.ElementRenderer; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Config; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.ElementRenderer; +import org.saturnclient.ui.RenderScope; public class AnimationStagger extends Element { protected List children = new ArrayList<>(); @@ -31,7 +31,7 @@ public class AnimationStagger extends Element { element.animation.delay = delay * children.size(); } - ElementRenderer.draw(children, element); + ElementRenderer.INSTANCE.draw(children, element); this.height = Math.max(this.height, element.y + element.height); this.width = Math.max(this.width, element.x + element.width); @@ -39,28 +39,28 @@ public class AnimationStagger extends Element { @Override public void render(RenderScope renderScope, ElementContext ctx) { - ElementRenderer.render(children, ctx.elapsed, renderScope, + ElementRenderer.INSTANCE.render(children, ctx.elapsed, renderScope, ctx.mouseX, ctx.mouseY); } @Override public void mouseClicked(double mouseX, double mouseY, int button) { - ElementRenderer.mouseClicked(children, mouseX, mouseY, button); + ElementRenderer.INSTANCE.mouseClicked(children, mouseX, mouseY, button); } @Override public void keyPressed(int keyCode, int scanCode, int modifiers) { - ElementRenderer.keyPressed(children, keyCode, scanCode, modifiers); + ElementRenderer.INSTANCE.keyPressed(children, keyCode, scanCode, modifiers); } @Override public void mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - ElementRenderer.mouseDragged(children, mouseX, mouseY, button, deltaX, deltaY); + ElementRenderer.INSTANCE.mouseDragged(children, mouseX, mouseY, button, deltaX, deltaY); } @Override public void mouseReleased(double mouseX, double mouseY, int button) { - ElementRenderer.mouseReleased(children, mouseX, mouseY, button); + ElementRenderer.INSTANCE.mouseReleased(children, mouseX, mouseY, button); } } diff --git a/src/main/java/org/saturnclient/ui2/elements/Button.java b/common/src/main/java/org/saturnclient/ui/elements/Button.java similarity index 77% rename from src/main/java/org/saturnclient/ui2/elements/Button.java rename to common/src/main/java/org/saturnclient/ui/elements/Button.java index 4774f11..3c0d5ed 100644 --- a/src/main/java/org/saturnclient/ui2/elements/Button.java +++ b/common/src/main/java/org/saturnclient/ui/elements/Button.java @@ -1,10 +1,10 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.config.Theme; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Button extends Element { private String text; diff --git a/src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java b/common/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java similarity index 53% rename from src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java rename to common/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java index 877eeea..1347b6d 100644 --- a/src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java +++ b/common/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java @@ -1,25 +1,22 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; - -import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.Identifier; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.config.Theme; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; public class ClickableTexture extends Element { - Identifier sprite; + SaturnIdentifier sprite; private Runnable onClick; - public ClickableTexture(Identifier sprite, Runnable onClick) { + public ClickableTexture(SaturnIdentifier sprite, Runnable onClick) { this.sprite = sprite; this.onClick = onClick; } @Override public void render(RenderScope renderScope, ElementContext ctx) { - renderScope.setRenderLayer(RenderLayer::getGuiTextured); renderScope.drawTexture(sprite, 0, 0, 0, 0, width, height, ctx.isHovering() ? Theme.ACCENT.value : Theme.PRIMARY.value); } diff --git a/common/src/main/java/org/saturnclient/ui/elements/ImageTexture.java b/common/src/main/java/org/saturnclient/ui/elements/ImageTexture.java new file mode 100644 index 0000000..f10447f --- /dev/null +++ b/common/src/main/java/org/saturnclient/ui/elements/ImageTexture.java @@ -0,0 +1,38 @@ +package org.saturnclient.ui.elements; + +import org.saturnclient.common.minecraft.IMinecraftClient; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.SvgTexture; + +public class ImageTexture extends Element { + SaturnIdentifier sprite; + + public ImageTexture(SaturnIdentifier sprite) { + this.sprite = sprite; + } + + @Override + public void render(RenderScope renderScope, ElementContext ctx) { + if (sprite.toString().endsWith(".svg")) { + IMinecraftClient client = MinecraftProvider.PROVIDER.getClient(); + + int renderWidth = (int) (width * client.getWindow().getFramebufferWidth() / client.getWindow().getWidth()); + int renderHeight = (int) (height * client.getWindow().getFramebufferHeight() + / client.getWindow().getHeight()); + + SaturnIdentifier pngId = SvgTexture.getSvg(client, sprite, renderWidth * 2, renderHeight * 2); + + this.sprite = pngId; + if (pngId == null) { + System.err.println("Failed to render SVG: " + sprite); + return; + } + } + + renderScope.drawTexture(this.sprite, 0, 0, 0, 0, width, height); + } +} diff --git a/src/main/java/org/saturnclient/ui2/elements/Notification.java b/common/src/main/java/org/saturnclient/ui/elements/Notification.java similarity index 80% rename from src/main/java/org/saturnclient/ui2/elements/Notification.java rename to common/src/main/java/org/saturnclient/ui/elements/Notification.java index 72fae8d..110ff3c 100644 --- a/src/main/java/org/saturnclient/ui2/elements/Notification.java +++ b/common/src/main/java/org/saturnclient/ui/elements/Notification.java @@ -1,13 +1,13 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.anim.SlideX; -import org.saturnclient.ui2.resources.Fonts; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.anim.SlideX; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.Textures; public class Notification extends Element { private static Property error = Property.color(0xFFbf212f); diff --git a/src/main/java/org/saturnclient/ui2/elements/Scroll.java b/common/src/main/java/org/saturnclient/ui/elements/Scroll.java similarity index 74% rename from src/main/java/org/saturnclient/ui2/elements/Scroll.java rename to common/src/main/java/org/saturnclient/ui/elements/Scroll.java index 780e9b8..859e225 100644 --- a/src/main/java/org/saturnclient/ui2/elements/Scroll.java +++ b/common/src/main/java/org/saturnclient/ui/elements/Scroll.java @@ -1,14 +1,14 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; import java.util.ArrayList; import java.util.List; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.components.ElementRenderer; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.ElementRenderer; +import org.saturnclient.ui.RenderScope; public class Scroll extends Element { private static Property scrollBarRadius = Property.integer(10); @@ -26,7 +26,7 @@ public class Scroll extends Element { } public void draw(Element element) { - ElementRenderer.draw(children, element); + ElementRenderer.INSTANCE.draw(children, element); } @Override @@ -37,14 +37,14 @@ public class Scroll extends Element { Theme.BG_RADIUS.value, Theme.BACKGROUND.value); renderScope.enableScissor(padding, padding, width - padding, height - padding); - renderScope.matrices.push(); - renderScope.matrices.translate(padding, -scroll + padding, 0); + renderScope.getMatrixStack().push(); + renderScope.getMatrixStack().translate(padding, -scroll + padding, 0); - ElementRenderer.render(children, ctx.elapsed, renderScope, + ElementRenderer.INSTANCE.render(children, ctx.elapsed, renderScope, ctx.mouseX - padding, ctx.mouseY - padding + scroll); - renderScope.matrices.pop(); + renderScope.getMatrixStack().pop(); renderScope.disableScissor(); if (maxScroll > 0) { @@ -71,12 +71,12 @@ public class Scroll extends Element { @Override public Element dimensions(int width, int height) { super.dimensions(width, height); - + maxScroll = 0; for (Element element : children) { maxScroll = Math.max(maxScroll, (element.y + element.height + padding) - (height - padding * 2)); } - + return this; } @@ -88,7 +88,8 @@ public class Scroll extends Element { int calculateScrollBarY() { int scrollBarHeight = calculateScrollBarHeight(); - if (maxScroll <= 0) return scrollBarPadding.value; + if (maxScroll <= 0) + return scrollBarPadding.value; int y = (scroll * (height - scrollBarHeight - scrollBarPadding.value * 2)) / maxScroll + scrollBarPadding.value; return Math.min(y, height - scrollBarHeight - scrollBarPadding.value); } @@ -110,21 +111,22 @@ public class Scroll extends Element { @Override public void keyPressed(int keyCode, int scanCode, int modifiers) { - ElementRenderer.keyPressed(children, keyCode, scanCode, modifiers); + ElementRenderer.INSTANCE.keyPressed(children, keyCode, scanCode, modifiers); } @Override public void mouseClicked(double mouseX, double mouseY, int button) { - ElementRenderer.mouseClicked(children, mouseX - padding, mouseY - padding + scroll, button); + ElementRenderer.INSTANCE.mouseClicked(children, mouseX - padding, mouseY - padding + scroll, button); } @Override public void mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - ElementRenderer.mouseDragged(children, mouseX - padding, mouseY - padding + scroll, button, deltaX, deltaY); + ElementRenderer.INSTANCE.mouseDragged(children, mouseX - padding, mouseY - padding + scroll, button, deltaX, + deltaY); } @Override public void mouseReleased(double mouseX, double mouseY, int button) { - ElementRenderer.mouseReleased(children, mouseX - padding, mouseY - padding + scroll, button); + ElementRenderer.INSTANCE.mouseReleased(children, mouseX - padding, mouseY - padding + scroll, button); } } diff --git a/src/main/java/org/saturnclient/ui2/elements/TabMenu.java b/common/src/main/java/org/saturnclient/ui/elements/TabMenu.java similarity index 79% rename from src/main/java/org/saturnclient/ui2/elements/TabMenu.java rename to common/src/main/java/org/saturnclient/ui/elements/TabMenu.java index b41757b..b87040a 100644 --- a/src/main/java/org/saturnclient/ui2/elements/TabMenu.java +++ b/common/src/main/java/org/saturnclient/ui/elements/TabMenu.java @@ -1,19 +1,18 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.Utils; - -import net.minecraft.util.Identifier; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.config.Theme; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.Utils; public class TabMenu extends Element { public static class TabMenuComponent { Runnable onClick; - Identifier sprite; + SaturnIdentifier sprite; - public TabMenuComponent(Identifier sprite, Runnable onClick) { + public TabMenuComponent(SaturnIdentifier sprite, Runnable onClick) { this.onClick = onClick; this.sprite = sprite; } diff --git a/src/main/java/org/saturnclient/ui2/elements/Text.java b/common/src/main/java/org/saturnclient/ui/elements/Text.java similarity index 60% rename from src/main/java/org/saturnclient/ui2/elements/Text.java rename to common/src/main/java/org/saturnclient/ui/elements/Text.java index 285433d..7de1737 100644 --- a/src/main/java/org/saturnclient/ui2/elements/Text.java +++ b/common/src/main/java/org/saturnclient/ui/elements/Text.java @@ -1,10 +1,10 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.config.Theme; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Text extends Element { private String text; diff --git a/src/main/java/org/saturnclient/ui2/elements/TextureButton.java b/common/src/main/java/org/saturnclient/ui/elements/TextureButton.java similarity index 64% rename from src/main/java/org/saturnclient/ui2/elements/TextureButton.java rename to common/src/main/java/org/saturnclient/ui/elements/TextureButton.java index ccbf1ba..51ee39f 100644 --- a/src/main/java/org/saturnclient/ui2/elements/TextureButton.java +++ b/common/src/main/java/org/saturnclient/ui/elements/TextureButton.java @@ -1,19 +1,17 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; - -import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.Identifier; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.config.Theme; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; public class TextureButton extends Element { - Identifier sprite; + SaturnIdentifier sprite; private Runnable onClick; static int padding = 14; - public TextureButton(Identifier sprite, Runnable onClick) { + public TextureButton(SaturnIdentifier sprite, Runnable onClick) { this.sprite = sprite; this.onClick = onClick; } @@ -23,8 +21,6 @@ public class TextureButton extends Element { renderScope.drawRoundedRectangle(0, 0, width, height, Theme.WIDGET_RADIUS.value, ctx.isHovering() ? Theme.ACCENT.value : Theme.PRIMARY.value); - renderScope.setRenderLayer(RenderLayer::getGuiTextured); - int texWidth = width - padding; int texHeight = height - padding; diff --git a/common/src/main/java/org/saturnclient/ui/resources/Fonts.java b/common/src/main/java/org/saturnclient/ui/resources/Fonts.java new file mode 100644 index 0000000..3e935b6 --- /dev/null +++ b/common/src/main/java/org/saturnclient/ui/resources/Fonts.java @@ -0,0 +1,45 @@ +package org.saturnclient.ui.resources; + +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; + +public class Fonts { + public static final SaturnIdentifier INTER = SaturnIdentifier.of("saturnclient", "inter"); + public static final SaturnIdentifier INTER_BOLD = SaturnIdentifier.of("saturnclient", "inter_bold"); + public static final SaturnIdentifier DEFAULT = SaturnIdentifier.ofVanilla("default"); + + public static SaturnIdentifier getFont(int font) { + switch (font) { + case 0: + return DEFAULT; + case 1: + return INTER; + default: + return INTER_BOLD; + } + } + + public static int getWidth(String text, int font) { + int w = 0; + for (String line : text.split("\n")) { + w = Math.max(w, MinecraftProvider.PROVIDER.getWidth(line, font)); + } + if (font == 0) { + return w * 2; + } else { + return w; + } + } + + public static int getHeight() { + return 18; + } + + public static int centerX(int w, String text, int font) { + return (w - Fonts.getWidth(text, font)) / 2; + } + + public static int centerY(int h) { + return (h - 18) / 2; + } +} diff --git a/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java b/common/src/main/java/org/saturnclient/ui/resources/SvgTexture.java similarity index 72% rename from src/main/java/org/saturnclient/ui2/resources/SvgTexture.java rename to common/src/main/java/org/saturnclient/ui/resources/SvgTexture.java index 6cc79d3..c4f4ea6 100644 --- a/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java +++ b/common/src/main/java/org/saturnclient/ui/resources/SvgTexture.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2.resources; +package org.saturnclient.ui.resources; import java.awt.Graphics2D; import java.awt.RenderingHints; @@ -10,15 +10,13 @@ import java.util.List; import com.kitfox.svg.SVGDiagram; import com.kitfox.svg.SVGUniverse; -import org.jetbrains.annotations.Nullable; -import org.saturnclient.cosmetics.cloak.utils.IdentifierUtils; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.util.Identifier; +import org.saturnclient.common.minecraft.IMinecraftClient; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; public class SvgTexture { - private static List svgCache = new ArrayList<>(); + private static List svgCache = new ArrayList<>(); private static BufferedImage renderSvg(InputStream svgStream, int width, int height) throws Exception { // Load SVG @@ -52,23 +50,19 @@ public class SvgTexture { return image; } - @Nullable - public static Identifier getSvg(MinecraftClient client, Identifier svgImage, int width, int height) { - Identifier id = Identifier + public static SaturnIdentifier getSvg(IMinecraftClient client, SaturnIdentifier svgImage, int width, int height) { + SaturnIdentifier id = SaturnIdentifier .of(svgImage.toString().replaceAll("\\.svg$", (width + "_" + height).toString() + ".png")); if (svgCache.contains(id)) { return id; } - try (InputStream svgStream = client - .getResourceManager() - .getResource(svgImage).get() - .getInputStream()) { + try (InputStream svgStream = client.getResource(svgImage)) { BufferedImage image = renderSvg(svgStream, width, height); - IdentifierUtils.registerBufferedImageTexture(id, image); + MinecraftProvider.PROVIDER.registerBufferedImageTexture(id, image); return id; diff --git a/common/src/main/java/org/saturnclient/ui/resources/Textures.java b/common/src/main/java/org/saturnclient/ui/resources/Textures.java new file mode 100644 index 0000000..9a8ea74 --- /dev/null +++ b/common/src/main/java/org/saturnclient/ui/resources/Textures.java @@ -0,0 +1,80 @@ +package org.saturnclient.ui.resources; + +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; + +public class Textures { + public static final SaturnIdentifier CROSSHAIR_RANGE = new SaturnIdentifier("saturnclient", + "textures/gui/hud/crosshair_range.png"); + public static final SaturnIdentifier COSMETICS = new SaturnIdentifier("saturnclient", + "textures/gui/components/cosmetics.png"); + public static final SaturnIdentifier HUD_ICON = new SaturnIdentifier("saturnclient", + "textures/gui/components/hud.png"); + public static final SaturnIdentifier SEARCH = new SaturnIdentifier("saturnclient", + "textures/gui/components/search.png"); + public static final SaturnIdentifier CLOSE = new SaturnIdentifier("saturnclient", + "textures/gui/components/close.png"); + public static final SaturnIdentifier MODS_TAB = new SaturnIdentifier("saturnclient", + "textures/gui/components/mods_tab.png"); + public static final SaturnIdentifier SETTINGS = new SaturnIdentifier("saturnclient", + "textures/gui/components/settings.png"); + public static final SaturnIdentifier CLOAK = new SaturnIdentifier("saturnclient", + "textures/gui/components/cloak.png"); + public static final SaturnIdentifier HAT = new SaturnIdentifier("saturnclient", "textures/gui/components/hat.png"); + public static final SaturnIdentifier RESET = new SaturnIdentifier("saturnclient", + "textures/gui/components/reset.png"); + public static final SaturnIdentifier TOGGLE_INDICATOR = new SaturnIdentifier("saturnclient", + "textures/gui/components/toggle_indicator.png"); + public static final SaturnIdentifier LEFT = new SaturnIdentifier("saturnclient", + "textures/gui/components/left.png"); + public static final SaturnIdentifier RIGHT = new SaturnIdentifier("saturnclient", + "textures/gui/components/right.png"); + public static final SaturnIdentifier STORE = new SaturnIdentifier("saturnclient", + "textures/gui/components/store.png"); + public static final SaturnIdentifier COINS = new SaturnIdentifier("saturnclient", + "textures/gui/components/coins.png"); + public static final SaturnIdentifier SHIRT = new SaturnIdentifier("saturnclient", + "textures/gui/components/shirt.png"); + public static final SaturnIdentifier CIRCLE_X = new SaturnIdentifier("saturnclient", + "textures/gui/components/circle_x.png"); + public static final SaturnIdentifier INFO = new SaturnIdentifier("saturnclient", + "textures/gui/components/info.png"); + public static final SaturnIdentifier CHECK = new SaturnIdentifier("saturnclient", + "textures/gui/components/check.png"); + + public static final SaturnIdentifier LOGO = new SaturnIdentifier("saturnclient", "textures/logo/logo.png"); + public static final SaturnIdentifier REALISTIC_LOGO = new SaturnIdentifier("saturnclient", + "textures/logo/realistic.png"); + public static final SaturnIdentifier LOGO_TEXT = new SaturnIdentifier("saturnclient", "textures/logo/text.png"); + public static final SaturnIdentifier LOGO_TEXT_BIG = new SaturnIdentifier("saturnclient", + "textures/logo/text_big.png"); + public static final SaturnIdentifier SPLASH = new SaturnIdentifier("saturnclient", "textures/gui/splash.png"); + + // Widgets + public static final SaturnIdentifier BUTTON_BORDER = new SaturnIdentifier("saturnclient", "button_border"); + public static final SaturnIdentifier BUTTON = new SaturnIdentifier("saturnclient", "button"); + public static final SaturnIdentifier BUTTON_OP = new SaturnIdentifier("saturnclient", "button_op"); + public static final SaturnIdentifier SETTINGS_BG = new SaturnIdentifier("saturnclient", "settings_bg"); + public static final SaturnIdentifier RECT = new SaturnIdentifier("saturnclient", "rect"); + public static final SaturnIdentifier RECT_BORDER = new SaturnIdentifier("saturnclient", "rect_border"); + public static final SaturnIdentifier MOD = new SaturnIdentifier("saturnclient", "textures/gui/components/mod.png"); + public static final SaturnIdentifier MOD_BG = new SaturnIdentifier("saturnclient", + "textures/gui/components/mod_bg.png"); + + public static SaturnIdentifier getCloakPreview(String cloak) { + return new SaturnIdentifier("saturnclient", + "textures/gui/cloak/" + (cloak.isEmpty() ? "none" : cloak) + ".png"); + } + + public static SaturnIdentifier getHatPreview(String hat) { + return new SaturnIdentifier("saturnclient", "textures/gui/hat/" + (hat.isEmpty() ? "none" : hat) + ".png"); + } + + public static SaturnIdentifier getEmotePreview(String emote) { + return new SaturnIdentifier("saturnclient", "textures/gui/emote/" + (emote == null ? "none" : emote) + ".png"); + } + + public static SaturnIdentifier getModIcon(String modId) { + return new SaturnIdentifier("saturnclient", "textures/gui/mod/" + modId + ".svg"); + } + +} diff --git a/src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java b/common/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java similarity index 80% rename from src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java rename to common/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java index 52d2f55..4701989 100644 --- a/src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java +++ b/common/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java @@ -1,21 +1,21 @@ -package org.saturnclient.ui2.screens; +package org.saturnclient.ui.screens; import java.util.Map; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.components.inputs.FloatInput; -import org.saturnclient.ui2.components.inputs.HexInput; -import org.saturnclient.ui2.components.inputs.IntInput; -import org.saturnclient.ui2.components.inputs.KeybindingSelector; -import org.saturnclient.ui2.components.inputs.Select; -import org.saturnclient.ui2.components.inputs.Toggle; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.elements.Text; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Property; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.components.inputs.FloatInput; +import org.saturnclient.ui.components.inputs.HexInput; +import org.saturnclient.ui.components.inputs.IntInput; +import org.saturnclient.ui.components.inputs.KeybindingSelector; +import org.saturnclient.ui.components.inputs.Select; +import org.saturnclient.ui.components.inputs.Toggle; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.elements.Text; +import org.saturnclient.ui.resources.Fonts; public class ConfigEditor extends SaturnScreen { private ConfigManager config; @@ -39,7 +39,7 @@ public class ConfigEditor extends SaturnScreen { draw(scroll.dimensions(scrollWidth, 350).center(width, height)); - draw(new Sidebar(1, this::close).centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); + draw(new Sidebar(1, this.provider::close).centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); } @SuppressWarnings("unchecked") diff --git a/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java b/common/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java similarity index 60% rename from src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java rename to common/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java index 96fa7f6..1e10a31 100644 --- a/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java +++ b/common/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java @@ -1,23 +1,18 @@ -package org.saturnclient.ui2.screens; +package org.saturnclient.ui.screens; import org.saturnclient.cosmetics.Emotes; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.client.ServiceClient; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.TextureButton; -import org.saturnclient.ui2.resources.Textures; - -import dev.kosmx.playerAnim.api.layered.AnimationStack; -import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; -import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationRegistry; -import net.minecraft.util.Identifier; +import org.saturnclient.client.ServiceClient; +import org.saturnclient.common.minecraft.bindings.SaturnClientBindings; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Config; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.Utils; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.TextureButton; +import org.saturnclient.ui.resources.Textures; public class EmoteWheel extends SaturnScreen { int page = 1; @@ -87,27 +82,10 @@ public class EmoteWheel extends SaturnScreen { emoteStagger.draw( new TextureButton(Textures.getEmotePreview(emote), () -> { + if (emote != null) + SaturnClientBindings.emotes().setEmote(ServiceClient.uuid, emote); - if (emote == null) - return; - - AnimationStack animationStack = PlayerAnimationAccess.getPlayerAnimLayer( - SaturnClient.client.player); - - if (animationStack.isActive() - && animationStack.getPriority() == 1000) { - animationStack.removeLayer(1000); - } - - animationStack.addAnimLayer( - 1000, - PlayerAnimationRegistry - .getAnimation( - Identifier.of("saturnclient", emote)) - .playAnimation()); - - ServiceClient.emote(emote); - close(); + provider.close(); }) .dimensions(70, 70) .centerOffset(width, height, diff --git a/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java b/common/src/main/java/org/saturnclient/ui/screens/HudEditor.java similarity index 77% rename from src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java rename to common/src/main/java/org/saturnclient/ui/screens/HudEditor.java index 5e8e214..178d068 100644 --- a/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java +++ b/common/src/main/java/org/saturnclient/ui/screens/HudEditor.java @@ -1,23 +1,18 @@ -package org.saturnclient.saturnclient.menus; - -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.Text; +package org.saturnclient.ui.screens; import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.ModManager; import org.saturnclient.modules.Module; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.mixin.DrawContextAccessor; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.SaturnScreen; +import org.saturnclient.common.minecraft.render.IMatrixStack; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.SaturnScreen; import java.util.ArrayList; import java.util.List; -public class HudEditor extends Screen { +public class HudEditor extends SaturnScreen { private final List hudMods = new ArrayList<>(); private HudMod draggingMod = null; private boolean resizing = false; @@ -25,7 +20,7 @@ public class HudEditor extends Screen { private static final int RESIZE_MARGIN = 3; public HudEditor() { - super(Text.literal("HUD Editor")); + super("HUD Editor"); for (Module m : ModManager.ENABLED_MODS) { if (m.isEnabled() && m instanceof HudMod) { hudMods.add((HudMod) m); @@ -90,23 +85,21 @@ public class HudEditor extends Screen { } @Override - public void render(DrawContext context, int mouseX, int mouseY, float delta) { - if (client.world == null && client.getCurrentServerEntry() == null) { - SaturnScreen.ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, 1.0F, delta); - } - - RenderScope scope = new RenderScope(context.getMatrices(), ((DrawContextAccessor) context).getVertexConsumers()); + public void ui() { + } + @Override + public void render(RenderScope renderScope, int mouseX, int mouseY, float delta, long elapsed) { for (HudMod mod : hudMods) { ModDimensions dim = mod.getDimensions(); - MatrixStack matrices = context.getMatrices(); + IMatrixStack matrices = renderScope.getMatrixStack(); matrices.push(); matrices.translate(dim.x.value, dim.y.value, 0); matrices.scale(dim.scale.value, dim.scale.value, 1.0f); // Render the mod - mod.renderDummy(scope); + mod.renderDummy(renderScope); matrices.pop(); @@ -116,7 +109,7 @@ public class HudEditor extends Screen { int borderW = (int) (dim.width * dim.scale.value); int borderH = (int) (dim.height * dim.scale.value); - context.drawBorder(borderX, borderY, borderW, borderH, 0xFFFFFFFF); // White border + renderScope.drawBorder(borderX, borderY, borderW, borderH, 0xFFFFFFFF); // White border } } @@ -133,8 +126,7 @@ public class HudEditor extends Screen { } @Override - public void close() { + public void onClose() { ConfigManager.save(); - super.close(); } } diff --git a/src/main/java/org/saturnclient/ui2/screens/ModMenu.java b/common/src/main/java/org/saturnclient/ui/screens/ModMenu.java similarity index 63% rename from src/main/java/org/saturnclient/ui2/screens/ModMenu.java rename to common/src/main/java/org/saturnclient/ui/screens/ModMenu.java index 44b1aca..2c7e38c 100644 --- a/src/main/java/org/saturnclient/ui2/screens/ModMenu.java +++ b/common/src/main/java/org/saturnclient/ui/screens/ModMenu.java @@ -1,16 +1,16 @@ -package org.saturnclient.ui2.screens; +package org.saturnclient.ui.screens; import org.saturnclient.modules.ModManager; import org.saturnclient.modules.Module; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.anim.SlideFade; -import org.saturnclient.ui2.components.SaturnModule; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.SlideFade; +import org.saturnclient.ui.components.SaturnModule; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.resources.Textures; public class ModMenu extends SaturnScreen { public ModMenu() { @@ -29,7 +29,7 @@ public class ModMenu extends SaturnScreen { AnimationStagger moduleStagger = new AnimationStagger(AnimationConfig.modMenu); - for (Module mod : ModManager.ALL_MODS) { + for (Module mod : ModManager.MODS) { moduleStagger.draw( new SaturnModule(mod) .position((160 + g) * col, (50 + g) * row) @@ -49,7 +49,7 @@ public class ModMenu extends SaturnScreen { draw(scroll.dimensions(scrollWidth, 350).center(width, height)); - draw(new Sidebar(0, this::close).centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); + draw(new Sidebar(0, this.provider::close).centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); draw(new ImageTexture(Textures.LOGO_TEXT_BIG).dimensions(180, 18).position(width - 180 - 20, height - 18 - 20)); } diff --git a/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java b/common/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java similarity index 66% rename from src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java rename to common/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java index 185120b..fc2c062 100644 --- a/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java +++ b/common/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java @@ -1,18 +1,17 @@ -package org.saturnclient.ui2.screens; +package org.saturnclient.ui.screens; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.saturnclient.menus.HudEditor; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.screens.cosmetics.CloakMenu; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.Button; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.TextureButton; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Config; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.Button; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.TextureButton; +import org.saturnclient.ui.resources.Textures; +import org.saturnclient.ui.screens.cosmetics.CloakMenu; public class ShiftMenu extends SaturnScreen { public ShiftMenu() { @@ -42,17 +41,17 @@ public class ShiftMenu extends SaturnScreen { AnimationStagger stagger = new AnimationStagger(AnimationConfig.shiftMenu.stagger.value); stagger.draw(new TextureButton(Textures.HUD_ICON, () -> { - client.setScreen(new HudEditor()); + MinecraftProvider.PROVIDER.setScreen(new HudEditor()); }).dimensions(btnHeight, btnHeight).position(0, 0) .animation(new Fade(AnimationConfig.shiftMenu))); stagger.draw(new Button("Settings", () -> { - SaturnClient.client.setScreen(new ModMenu()); + MinecraftProvider.PROVIDER.setScreen(new ModMenu()); }).dimensions(btnWidth, btnHeight).position(btnHeight + spacing, 0) .animation(new Fade(AnimationConfig.shiftMenu))); stagger.draw(new TextureButton(Textures.COSMETICS, () -> { - client.setScreen(new CloakMenu()); + MinecraftProvider.PROVIDER.setScreen(new CloakMenu()); }).dimensions(btnHeight, btnHeight).position(btnWidth + btnHeight + (spacing * 2), 0) .animation(new Fade(AnimationConfig.shiftMenu))); diff --git a/src/main/java/org/saturnclient/ui2/screens/TitleMenu.java b/common/src/main/java/org/saturnclient/ui/screens/TitleMenu.java similarity index 62% rename from src/main/java/org/saturnclient/ui2/screens/TitleMenu.java rename to common/src/main/java/org/saturnclient/ui/screens/TitleMenu.java index aa7101e..1da39b5 100644 --- a/src/main/java/org/saturnclient/ui2/screens/TitleMenu.java +++ b/common/src/main/java/org/saturnclient/ui/screens/TitleMenu.java @@ -1,24 +1,20 @@ -package org.saturnclient.ui2.screens; +package org.saturnclient.ui.screens; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.saturnclient.menus.HudEditor; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.screens.cosmetics.CloakMenu; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideFade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.Button; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.TextureButton; -import org.saturnclient.ui2.resources.Fonts; - -import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; -import net.minecraft.client.gui.screen.option.OptionsScreen; -import net.minecraft.client.gui.screen.world.SelectWorldScreen; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.minecraft.MinecraftProvider.MinecraftScreen; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Config; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideFade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.Button; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.TextureButton; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.Textures; +import org.saturnclient.ui.screens.cosmetics.CloakMenu; public class TitleMenu extends SaturnScreen { public TitleMenu() { @@ -37,22 +33,22 @@ public class TitleMenu extends SaturnScreen { AnimationStagger mainButtonStagger = new AnimationStagger(AnimationConfig.mainMenu); mainButtonStagger.draw(new Button("SINGLEPLAYER", () -> { - client.setScreen(new SelectWorldScreen(new TitleMenu())); + MinecraftProvider.PROVIDER.setScreen(MinecraftScreen.SelectWorld); }).scale(0.69f).dimensions(420, 52).position(0, 0) .animation(new SlideFade(AnimationConfig.mainMenu, -10))); mainButtonStagger.draw(new Button("MULTIPLAYER", () -> { - client.setScreen(new MultiplayerScreen(new TitleMenu())); + MinecraftProvider.PROVIDER.setScreen(MinecraftScreen.Multiplayer); }).scale(0.69f).dimensions(420, 52).position(0, 40) .animation(new SlideFade(AnimationConfig.mainMenu, -10))); mainButtonStagger.draw(new Button("OPTIONS", () -> { - client.setScreen(new OptionsScreen(new TitleMenu(), SaturnClient.client.options)); + MinecraftProvider.PROVIDER.setScreen(MinecraftScreen.Options); }).scale(0.69f).dimensions(206, 52).position(0, 80) .animation(new SlideFade(AnimationConfig.mainMenu, -10))); mainButtonStagger.draw(new Button("QUIT", () -> { - client.scheduleStop(); + MinecraftProvider.PROVIDER.stop(); }).scale(0.69f).dimensions(206, 52).position(146, 80) .animation(new SlideFade(AnimationConfig.mainMenu, -10))); @@ -63,16 +59,16 @@ public class TitleMenu extends SaturnScreen { AnimationStagger saturnStagger = new AnimationStagger(AnimationConfig.mainMenu.stagger.value); saturnStagger.draw(new TextureButton(Textures.HUD_ICON, () -> { - client.setScreen(new HudEditor()); + MinecraftProvider.PROVIDER.setScreen(new HudEditor()); }).dimensions(s, s).position(0, 0).animation(new SlideFade(AnimationConfig.mainMenu, s + 8))); saturnStagger.draw(new TextureButton(Textures.SETTINGS, () -> { - SaturnClient.client.setScreen(new ModMenu()); + MinecraftProvider.PROVIDER.setScreen(new ModMenu()); }).dimensions(s, s).position(s + 2, 0) .animation(new SlideFade(AnimationConfig.mainMenu, s + 8))); saturnStagger.draw(new TextureButton(Textures.CLOAK, () -> { - client.setScreen(new CloakMenu()); + MinecraftProvider.PROVIDER.setScreen(new CloakMenu()); }).dimensions(s, s).position((s + 2) * 2, 0) .animation(new SlideFade(AnimationConfig.mainMenu, s + 8))); diff --git a/common/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java b/common/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java new file mode 100644 index 0000000..73338b8 --- /dev/null +++ b/common/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java @@ -0,0 +1,82 @@ +package org.saturnclient.ui.screens.cosmetics; + +import org.saturnclient.client.player.SaturnPlayer; +// import org.saturnclient.cosmetics.cloak.Cloaks; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.components.CosmeticPreview; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.components.SkinPreview; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.elements.TabMenu; +import org.saturnclient.ui.elements.TabMenu.TabMenuComponent; +import org.saturnclient.ui.resources.Textures; + +public class CloakMenu extends SaturnScreen { + public CloakMenu() { + super("Cloaks Menu"); + } + + @Override + public void ui() { + int p = 10; + int g = 10; + + Scroll scroll = new Scroll(p); + + int row = 0; + int col = 0; + + SaturnPlayer player = SaturnPlayer.get(); + + AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu); + + if (player != null) { + // for (String cloak : Cloaks.availableCloaks) { + + // stagger.draw( + // new CosmeticPreview( + // cloak == player.cloak, + // Textures.getCloakPreview(cloak), + // () -> Cloaks.setCloak(cloak)) + // .position((50 + g) * col, (111 + g) * row) + // .animation(new SlideY(AnimationConfig.cosmeticsMenu, 14))); + + // if (col == 5) { + // col = 0; + // row++; + // } else { + // col++; + // } + // } + } + + scroll.draw(stagger); + + int scrollWidth = 480 + 10 + (g * 2) + (p * 2); + + draw(scroll + .dimensions(scrollWidth, 350) + .center(width, height)); + + draw(new SkinPreview(-30.0f, false) + .scale(3.5f) + .position(scroll.x + (scrollWidth - 220), scroll.y + 40) + .animation(new Fade(500))); + + draw(new Sidebar(2, this.provider::close) + .centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); + + draw(new TabMenu(0, + new TabMenuComponent(Textures.CLOAK, () -> { + }), + new TabMenuComponent(Textures.HAT, () -> { + MinecraftProvider.PROVIDER.setScreen(new HatMenu()); + })) + .centerOffset(width, height, 0, -195)); + } +} diff --git a/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java b/common/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java similarity index 65% rename from src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java rename to common/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java index f21723a..ac24d38 100644 --- a/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java +++ b/common/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java @@ -1,20 +1,20 @@ -package org.saturnclient.ui2.screens.cosmetics; +package org.saturnclient.ui.screens.cosmetics; -import org.saturnclient.cosmetics.hat.Hats; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.components.CosmeticPreview; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.components.SkinPreview; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.elements.TabMenu; -import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; +import org.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.cosmetics.Hats; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.components.CosmeticPreview; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.components.SkinPreview; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.elements.TabMenu; +import org.saturnclient.ui.elements.TabMenu.TabMenuComponent; +import org.saturnclient.ui.resources.Textures; public class HatMenu extends SaturnScreen { public HatMenu() { @@ -37,7 +37,6 @@ public class HatMenu extends SaturnScreen { if (player != null) { for (String hat : Hats.availableHats) { - stagger.draw( new CosmeticPreview( hat == player.hat, @@ -69,13 +68,12 @@ public class HatMenu extends SaturnScreen { .position(scroll.x + (scrollWidth - 220), scroll.y + 40) .animation(new Fade(500))); - draw(new Sidebar(2, this::close) - .centerOffset(width, height, -(scrollWidth / 2 + 20), 0) - .animation(new Fade(400))); + draw(new Sidebar(2, this.provider::close) + .centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); draw(new TabMenu(1, new TabMenuComponent(Textures.CLOAK, () -> { - SaturnClient.client.setScreen(new CloakMenu()); + MinecraftProvider.PROVIDER.setScreen(new CloakMenu()); }), new TabMenuComponent(Textures.HAT, () -> { })) diff --git a/common/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java b/common/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java new file mode 100644 index 0000000..eef8406 --- /dev/null +++ b/common/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java @@ -0,0 +1,141 @@ +package org.saturnclient.ui.screens.store; + +// import org.saturnclient.cosmetics.cloak.Cloaks; +import org.saturnclient.client.ServiceClient; +import org.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Theme; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.components.CosmeticPreview; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.elements.TabMenu; +import org.saturnclient.ui.elements.Text; +import org.saturnclient.ui.elements.TabMenu.TabMenuComponent; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.Textures; + +// import com.mojang.blaze3d.systems.RenderSystem; + +public class CloakStore extends SaturnScreen { + private long lastPurchaseTime = 0; + + public CloakStore() { + super("Cloak Store"); + } + + public CloakStore(long lastPurchaseTime) { + super("Cloak Store"); + this.lastPurchaseTime = lastPurchaseTime; + } + + @Override + public void ui() { + int p = 10; + int gx = 10; + int gy = 20; + + Scroll scroll = new Scroll(p); + + int row = 0; + int col = 0; + + SaturnPlayer player = SaturnPlayer.get(); + + AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu); + + if (player != null) { + // for (String cloak : Cloaks.ALL_CLOAKS) { + // if (!Cloaks.availableCloaks.contains(cloak)) { + + // int x = (50 + gx) * col; + // int y = (111 + gy) * row; + + // stagger.draw( + // new CosmeticPreview( + // cloak == player.cloak, + // Textures.getCloakPreview(cloak), + // () -> handlePurchase(cloak)) + // .position(x, y) + // .animation(new SlideY(AnimationConfig.cosmeticsMenu, 16))); + + // String t = "100"; + + // stagger.draw( + // new Text(t) + // .position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 113) + // .scale(0.5f) + // .animation(new Fade(400))); + + // stagger.draw( + // new ImageTexture(Textures.COINS) + // .dimensions(16, 16) + // .position(x + Fonts.getWidth(t, Theme.FONT.value) - 1, y + 112) + // .scale(0.5f) + // .animation(new Fade(400))); + + // if (col == 8) { + // col = 0; + // row++; + // } else { + // col++; + // } + // } + // } + } + + scroll.draw(stagger); + + int scrollWidth = 480 + 40 + (gx * 2) + (p * 2); + + draw(scroll + .dimensions(scrollWidth, 350) + .centerOffset(width, height, 15, 0)); + + draw(new Sidebar(5, this.provider::close) + .centerOffset(width, height, -((scrollWidth - 30) / 2 + 20), 0)); + + draw(new TabMenu(0, + new TabMenuComponent(Textures.CLOAK, () -> { + }), + new TabMenuComponent(Textures.HAT, () -> { + MinecraftProvider.PROVIDER.setScreen(new HatStore()); + })) + .centerOffset(width, height, 0, -195)); + } + + private void handlePurchase(String cloak) { + long now = System.currentTimeMillis(); + + if (now - lastPurchaseTime >= 3000) { + // Utils.notify(NotificationKind.Info, "Purchase processing", "Please wait"); + + ServiceClient.buyCloak(cloak); + lastPurchaseTime = now; + + new Thread(() -> { + try { + Thread.sleep(5000); + } catch (InterruptedException ignored) { + } + + // RenderSystem.recordRenderCall(() -> { + // MinecraftProvider.PROVIDER.setScreen(new CloakStore(now)); + // // Utils.notify(NotificationKind.Success, + // // "Purchase complete", + // // "Congrats, enjoy your new cloak!"); + // }); + }).start(); + + } else { + // Utils.notify(NotificationKind.Error, + // "Timeout error", + // "Please wait 3 seconds"); + } + } +} diff --git a/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java b/common/src/main/java/org/saturnclient/ui/screens/store/HatStore.java similarity index 63% rename from src/main/java/org/saturnclient/ui2/screens/store/HatStore.java rename to common/src/main/java/org/saturnclient/ui/screens/store/HatStore.java index 328f701..f0fd11b 100644 --- a/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java +++ b/common/src/main/java/org/saturnclient/ui/screens/store/HatStore.java @@ -1,28 +1,26 @@ -package org.saturnclient.ui2.screens.store; +package org.saturnclient.ui.screens.store; -import org.saturnclient.cosmetics.hat.Hats; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.client.ServiceClient; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.components.CosmeticPreview; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.Notification.NotificationKind; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.elements.TabMenu; -import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; -import org.saturnclient.ui2.elements.Text; -import org.saturnclient.ui2.resources.Fonts; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.client.ServiceClient; +import org.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Theme; +import org.saturnclient.cosmetics.Hats; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.components.CosmeticPreview; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.elements.TabMenu; +import org.saturnclient.ui.elements.Text; +import org.saturnclient.ui.elements.TabMenu.TabMenuComponent; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.Textures; -import com.mojang.blaze3d.systems.RenderSystem; +// import com.mojang.blaze3d.systems.RenderSystem; public class HatStore extends SaturnScreen { private long lastPurchaseTime = 0; @@ -100,13 +98,12 @@ public class HatStore extends SaturnScreen { .dimensions(scrollWidth, 350) .centerOffset(width, height, 15, 0)); - draw(new Sidebar(5, this::close) - .centerOffset(width, height, -((scrollWidth - 30) / 2 + 20), 0) - .animation(new Fade(400))); + draw(new Sidebar(5, this.provider::close) + .centerOffset(width, height, -((scrollWidth - 30) / 2 + 20), 0)); draw(new TabMenu(1, new TabMenuComponent(Textures.CLOAK, () -> { - SaturnClient.client.setScreen(new CloakStore()); + MinecraftProvider.PROVIDER.setScreen(new CloakStore()); }), new TabMenuComponent(Textures.HAT, () -> { })) @@ -117,7 +114,7 @@ public class HatStore extends SaturnScreen { long now = System.currentTimeMillis(); if (now - lastPurchaseTime >= 3000) { - Utils.notify(NotificationKind.Info, "Purchase processing", "Please wait"); + // Utils.notify(NotificationKind.Info, "Purchase processing", "Please wait"); ServiceClient.buyHat(hat); lastPurchaseTime = now; @@ -128,18 +125,18 @@ public class HatStore extends SaturnScreen { } catch (InterruptedException ignored) { } - RenderSystem.recordRenderCall(() -> { - SaturnClient.client.setScreen(new HatStore(now)); - Utils.notify(NotificationKind.Success, - "Purchase complete", - "Congrats, enjoy your new hat!"); - }); + // RenderSystem.recordRenderCall(() -> { + // MinecraftProvider.PROVIDER.setScreen(new HatStore(now)); + // // Utils.notify(NotificationKind.Success, + // // "Purchase complete", + // // "Congrats, enjoy your new hat!"); + // }); }).start(); } else { - Utils.notify(NotificationKind.Error, - "Timeout error", - "Please wait 3 seconds"); + // Utils.notify(NotificationKind.Error, + // "Timeout error", + // "Please wait 3 seconds"); } } } diff --git a/src/main/resources/assets/minecraft/font/fonts.json b/common/src/main/resources/assets/minecraft/font/fonts.json similarity index 100% rename from src/main/resources/assets/minecraft/font/fonts.json rename to common/src/main/resources/assets/minecraft/font/fonts.json diff --git a/src/main/resources/assets/minecraft/font/include/default.json b/common/src/main/resources/assets/minecraft/font/include/default.json similarity index 100% rename from src/main/resources/assets/minecraft/font/include/default.json rename to common/src/main/resources/assets/minecraft/font/include/default.json diff --git a/src/main/resources/assets/minecraft/textures/font/custom/saturn.png b/common/src/main/resources/assets/minecraft/textures/font/custom/saturn.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/font/custom/saturn.png rename to common/src/main/resources/assets/minecraft/textures/font/custom/saturn.png diff --git a/src/main/resources/assets/minecraft/textures/font/custom/saturn_realistic.png b/common/src/main/resources/assets/minecraft/textures/font/custom/saturn_realistic.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/font/custom/saturn_realistic.png rename to common/src/main/resources/assets/minecraft/textures/font/custom/saturn_realistic.png diff --git a/src/main/resources/assets/saturnclient/font/README.md b/common/src/main/resources/assets/saturnclient/font/README.md similarity index 100% rename from src/main/resources/assets/saturnclient/font/README.md rename to common/src/main/resources/assets/saturnclient/font/README.md diff --git a/src/main/resources/assets/saturnclient/font/inter.json b/common/src/main/resources/assets/saturnclient/font/inter.json similarity index 100% rename from src/main/resources/assets/saturnclient/font/inter.json rename to common/src/main/resources/assets/saturnclient/font/inter.json diff --git a/src/main/resources/assets/saturnclient/font/inter.ttf b/common/src/main/resources/assets/saturnclient/font/inter.ttf similarity index 100% rename from src/main/resources/assets/saturnclient/font/inter.ttf rename to common/src/main/resources/assets/saturnclient/font/inter.ttf diff --git a/src/main/resources/assets/saturnclient/font/inter_bold.json b/common/src/main/resources/assets/saturnclient/font/inter_bold.json similarity index 100% rename from src/main/resources/assets/saturnclient/font/inter_bold.json rename to common/src/main/resources/assets/saturnclient/font/inter_bold.json diff --git a/src/main/resources/assets/saturnclient/font/inter_bold.ttf b/common/src/main/resources/assets/saturnclient/font/inter_bold.ttf similarity index 100% rename from src/main/resources/assets/saturnclient/font/inter_bold.ttf rename to common/src/main/resources/assets/saturnclient/font/inter_bold.ttf diff --git a/src/main/resources/assets/saturnclient/icon.png b/common/src/main/resources/assets/saturnclient/icon.png similarity index 100% rename from src/main/resources/assets/saturnclient/icon.png rename to common/src/main/resources/assets/saturnclient/icon.png diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.json b/common/src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.json similarity index 100% rename from src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.json rename to common/src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.json diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.obj b/common/src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.obj similarity index 100% rename from src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.obj rename to common/src/main/resources/assets/saturnclient/models/cosmetic/hat/halo/model.obj diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.json b/common/src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.json similarity index 100% rename from src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.json rename to common/src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.json diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.obj b/common/src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.obj similarity index 100% rename from src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.obj rename to common/src/main/resources/assets/saturnclient/models/cosmetic/hat/horns/model.obj diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/materials/black.mtl b/common/src/main/resources/assets/saturnclient/models/cosmetic/materials/black.mtl similarity index 100% rename from src/main/resources/assets/saturnclient/models/cosmetic/materials/black.mtl rename to common/src/main/resources/assets/saturnclient/models/cosmetic/materials/black.mtl diff --git a/src/main/resources/assets/saturnclient/models/cosmetic/materials/white.mtl b/common/src/main/resources/assets/saturnclient/models/cosmetic/materials/white.mtl similarity index 100% rename from src/main/resources/assets/saturnclient/models/cosmetic/materials/white.mtl rename to common/src/main/resources/assets/saturnclient/models/cosmetic/materials/white.mtl diff --git a/src/main/resources/assets/saturnclient/player_animations/back_flip.json b/common/src/main/resources/assets/saturnclient/player_animations/back_flip.json similarity index 100% rename from src/main/resources/assets/saturnclient/player_animations/back_flip.json rename to common/src/main/resources/assets/saturnclient/player_animations/back_flip.json diff --git a/src/main/resources/assets/saturnclient/player_animations/cry.json b/common/src/main/resources/assets/saturnclient/player_animations/cry.json similarity index 100% rename from src/main/resources/assets/saturnclient/player_animations/cry.json rename to common/src/main/resources/assets/saturnclient/player_animations/cry.json diff --git a/src/main/resources/assets/saturnclient/player_animations/facepalm.json b/common/src/main/resources/assets/saturnclient/player_animations/facepalm.json similarity index 100% rename from src/main/resources/assets/saturnclient/player_animations/facepalm.json rename to common/src/main/resources/assets/saturnclient/player_animations/facepalm.json diff --git a/src/main/resources/assets/saturnclient/player_animations/front_flip.json b/common/src/main/resources/assets/saturnclient/player_animations/front_flip.json similarity index 100% rename from src/main/resources/assets/saturnclient/player_animations/front_flip.json rename to common/src/main/resources/assets/saturnclient/player_animations/front_flip.json diff --git a/src/main/resources/assets/saturnclient/player_animations/giga_chad.json b/common/src/main/resources/assets/saturnclient/player_animations/giga_chad.json similarity index 100% rename from src/main/resources/assets/saturnclient/player_animations/giga_chad.json rename to common/src/main/resources/assets/saturnclient/player_animations/giga_chad.json diff --git a/src/main/resources/assets/saturnclient/player_animations/tpose.json b/common/src/main/resources/assets/saturnclient/player_animations/tpose.json similarity index 100% rename from src/main/resources/assets/saturnclient/player_animations/tpose.json rename to common/src/main/resources/assets/saturnclient/player_animations/tpose.json diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/amg.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/amg.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/amg.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/amg.png diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/amg_petronas.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/amg_petronas.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/amg_petronas.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/amg_petronas.png diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_amethyst.gif b/common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_amethyst.gif similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/black_hole_amethyst.gif rename to common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_amethyst.gif diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_amethyst.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_amethyst.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/black_hole_amethyst.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_amethyst.png diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_flame.gif b/common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_flame.gif similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/black_hole_flame.gif rename to common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_flame.gif diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_flame.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_flame.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/black_hole_flame.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_flame.png diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_white.gif b/common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_white.gif similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/black_hole_white.gif rename to common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_white.gif diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_white.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_white.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/black_hole_white.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/black_hole_white.png diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/bmw.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/bmw.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/bmw.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/bmw.png diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/crimson_mark.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/crimson_mark.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/crimson_mark.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/crimson_mark.png diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/ferrari.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/ferrari.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/ferrari.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/ferrari.png diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/glitch.gif b/common/src/main/resources/assets/saturnclient/textures/cloaks/glitch.gif similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/glitch.gif rename to common/src/main/resources/assets/saturnclient/textures/cloaks/glitch.gif diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/glitch.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/glitch.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/glitch.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/glitch.png diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/mercedes_flow.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/mercedes_flow.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/mercedes_flow.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/mercedes_flow.png diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/redbull.png b/common/src/main/resources/assets/saturnclient/textures/cloaks/redbull.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/cloaks/redbull.png rename to common/src/main/resources/assets/saturnclient/textures/cloaks/redbull.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/amg.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/amg.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/amg.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/amg.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/amg_petronas.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/amg_petronas.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/amg_petronas.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/amg_petronas.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_amethyst.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_amethyst.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_amethyst.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_amethyst.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_flame.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_flame.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_flame.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_flame.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_white.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_white.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_white.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/black_hole_white.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/bmw.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/bmw.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/bmw.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/bmw.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/crimson_mark.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/crimson_mark.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/crimson_mark.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/crimson_mark.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/ferrari.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/ferrari.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/ferrari.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/ferrari.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/glitch.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/glitch.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/glitch.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/glitch.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/mercedes_flow.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/mercedes_flow.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/mercedes_flow.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/mercedes_flow.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/none.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/none.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/none.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/none.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/redbull.png b/common/src/main/resources/assets/saturnclient/textures/gui/cloak/redbull.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/cloak/redbull.png rename to common/src/main/resources/assets/saturnclient/textures/gui/cloak/redbull.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/check.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/check.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/check.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/check.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/circle_x.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/circle_x.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/circle_x.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/circle_x.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/cloak.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/cloak.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/cloak.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/cloak.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/close.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/close.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/close.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/close.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/coins.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/coins.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/coins.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/coins.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/cosmetics.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/cosmetics.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/cosmetics.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/cosmetics.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/hat.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/hat.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/hat.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/hat.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/hud.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/hud.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/hud.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/hud.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/info.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/info.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/info.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/info.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/left.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/left.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/left.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/left.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/mods_tab.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/mods_tab.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/mods_tab.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/mods_tab.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/reset.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/reset.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/reset.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/reset.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/right.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/right.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/right.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/right.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/search.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/search.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/search.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/search.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/settings.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/settings.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/settings.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/settings.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/shirt.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/shirt.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/shirt.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/shirt.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/store.png b/common/src/main/resources/assets/saturnclient/textures/gui/components/store.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/components/store.png rename to common/src/main/resources/assets/saturnclient/textures/gui/components/store.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/back_flip.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/back_flip.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/back_flip.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/back_flip.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/cry.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/cry.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/cry.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/cry.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/facepalm.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/facepalm.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/facepalm.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/facepalm.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/giga_chad.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/giga_chad.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/giga_chad.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/giga_chad.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/none.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/none.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/none.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/none.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/tpose.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/tpose.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/tpose.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/tpose.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/back_flip.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/back_flip.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/back_flip.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/back_flip.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/cry.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/cry.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/cry.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/cry.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/facepalm.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/facepalm.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/facepalm.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/facepalm.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/giga_chad.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/giga_chad.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/giga_chad.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/giga_chad.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/tpose.png b/common/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/tpose.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/tpose.png rename to common/src/main/resources/assets/saturnclient/textures/gui/emote/with_bg/tpose.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/hat/halo.png b/common/src/main/resources/assets/saturnclient/textures/gui/hat/halo.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/hat/halo.png rename to common/src/main/resources/assets/saturnclient/textures/gui/hat/halo.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/hat/halo_black.png b/common/src/main/resources/assets/saturnclient/textures/gui/hat/halo_black.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/hat/halo_black.png rename to common/src/main/resources/assets/saturnclient/textures/gui/hat/halo_black.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/hat/horns_black.png b/common/src/main/resources/assets/saturnclient/textures/gui/hat/horns_black.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/hat/horns_black.png rename to common/src/main/resources/assets/saturnclient/textures/gui/hat/horns_black.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/hat/horns_white.png b/common/src/main/resources/assets/saturnclient/textures/gui/hat/horns_white.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/hat/horns_white.png rename to common/src/main/resources/assets/saturnclient/textures/gui/hat/horns_white.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/hat/none.png b/common/src/main/resources/assets/saturnclient/textures/gui/hat/none.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/hat/none.png rename to common/src/main/resources/assets/saturnclient/textures/gui/hat/none.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/hud/crosshair_range.png b/common/src/main/resources/assets/saturnclient/textures/gui/hud/crosshair_range.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/hud/crosshair_range.png rename to common/src/main/resources/assets/saturnclient/textures/gui/hud/crosshair_range.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/armor.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/armor.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/armor.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/armor.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/clock.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/clock.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/clock.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/clock.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/coords.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/coords.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/coords.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/coords.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/crosshair.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/crosshair.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/crosshair.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/crosshair.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/day.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/day.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/day.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/day.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/effect.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/effect.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/effect.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/effect.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/fps.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/fps.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/fps.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/fps.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/freelook.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/freelook.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/freelook.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/freelook.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/fullbright.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/fullbright.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/fullbright.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/fullbright.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/health.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/health.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/health.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/health.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/keystrokes.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/keystrokes.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/keystrokes.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/keystrokes.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/nametags.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/nametags.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/nametags.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/nametags.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/nofog.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/nofog.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/nofog.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/nofog.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/particles.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/particles.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/particles.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/particles.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/ping.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/ping.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/ping.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/ping.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/speed.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/speed.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/speed.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/speed.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/sprint.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/sprint.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/sprint.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/sprint.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/tps.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/tps.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/tps.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/tps.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/mod/zoom.svg b/common/src/main/resources/assets/saturnclient/textures/gui/mod/zoom.svg similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/mod/zoom.svg rename to common/src/main/resources/assets/saturnclient/textures/gui/mod/zoom.svg diff --git a/src/main/resources/assets/saturnclient/textures/gui/splash.png b/common/src/main/resources/assets/saturnclient/textures/gui/splash.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/splash.png rename to common/src/main/resources/assets/saturnclient/textures/gui/splash.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_0.png b/common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_0.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_0.png rename to common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_0.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_1.png b/common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_1.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_1.png rename to common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_1.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_2.png b/common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_2.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_2.png rename to common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_2.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_3.png b/common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_3.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_3.png rename to common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_3.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_4.png b/common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_4.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_4.png rename to common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_4.png diff --git a/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_5.png b/common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_5.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_5.png rename to common/src/main/resources/assets/saturnclient/textures/gui/title/background/panorama_5.png diff --git a/src/main/resources/assets/saturnclient/textures/item/halo.png b/common/src/main/resources/assets/saturnclient/textures/item/halo.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/item/halo.png rename to common/src/main/resources/assets/saturnclient/textures/item/halo.png diff --git a/src/main/resources/assets/saturnclient/textures/item/halo_black.png b/common/src/main/resources/assets/saturnclient/textures/item/halo_black.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/item/halo_black.png rename to common/src/main/resources/assets/saturnclient/textures/item/halo_black.png diff --git a/src/main/resources/assets/saturnclient/textures/logo/logo.png b/common/src/main/resources/assets/saturnclient/textures/logo/logo.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/logo/logo.png rename to common/src/main/resources/assets/saturnclient/textures/logo/logo.png diff --git a/src/main/resources/assets/saturnclient/textures/logo/realistic.png b/common/src/main/resources/assets/saturnclient/textures/logo/realistic.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/logo/realistic.png rename to common/src/main/resources/assets/saturnclient/textures/logo/realistic.png diff --git a/src/main/resources/assets/saturnclient/textures/logo/text.png b/common/src/main/resources/assets/saturnclient/textures/logo/text.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/logo/text.png rename to common/src/main/resources/assets/saturnclient/textures/logo/text.png diff --git a/src/main/resources/assets/saturnclient/textures/logo/text_big.png b/common/src/main/resources/assets/saturnclient/textures/logo/text_big.png similarity index 100% rename from src/main/resources/assets/saturnclient/textures/logo/text_big.png rename to common/src/main/resources/assets/saturnclient/textures/logo/text_big.png diff --git a/dev-resources/cape_creation_tool_v1.3.bbmodel b/dev-resources/cape_creation_tool_v1.3.bbmodel deleted file mode 100644 index 6918472..0000000 --- a/dev-resources/cape_creation_tool_v1.3.bbmodel +++ /dev/null @@ -1 +0,0 @@ -{"meta":{"format_version":"4.10","model_format":"free","box_uv":false},"name":"cape_creation_tool_v1.3","model_identifier":"cape_creation_tool","visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":32},"elements":[{"name":"Cape","box_uv":false,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-3,8,6.5],"to":[7,24,7.5],"autouv":0,"color":1,"rotation":[-8,0,0],"origin":[2,0,5],"faces":{"north":{"uv":[8,8,88,136],"texture":0},"east":{"uv":[0,8,8,136],"texture":0},"south":{"uv":[96,8,176,136],"texture":0},"west":{"uv":[88,8,96,136],"texture":0},"up":{"uv":[8,0,88,8],"texture":0},"down":{"uv":[88,0,168,8],"texture":0}},"type":"cube","uuid":"af762848-2927-8398-4982-bae7b24f659f"}],"outliner":[{"name":"Cape","origin":[0,24,2],"rotation":[15,-180,0],"color":0,"uuid":"91d65ecf-f78b-6339-d66f-548e29eb89d3","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"selected":false,"children":["af762848-2927-8398-4982-bae7b24f659f"]}],"textures":[{"path":"/Users/klestiselimaj/Developer/saturnclient/saturnclient/src/main/resources/assets/saturnclient/textures/cloaks/amg.png","name":"amg.png","folder":"Lurker Cape","namespace":"","id":"1","group":"","width":924,"height":714,"uv_width":176,"uv_height":138,"particle":false,"use_as_default":false,"layers_enabled":false,"sync_to_project":"","render_mode":"normal","render_sides":"auto","pbr_channel":"color","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"2b83f02b-3d64-344b-bcf1-d698baf94d11","relative_path":"../src/main/resources/assets/saturnclient/textures/cloaks/amg.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA5wAAALKCAYAAABeEl6PAAAAAXNSR0IArs4c6QAAIABJREFUeF7s3Qu8ffWc//GvKJdckss0xqWLoRmhcRuM0VwUijLuImVCUZQZQozCVK4jpjCGXDLulIbcu5AkRqlch2oShkgZmS7o/3gu/0+zWvY5e59z9vn99u73Xo/Hfuxz9l7ru77f13et/fi+1/vz/Xyv1Vq7smULgRAIgRAIgRAIgRAIgRAIgRAIgSkTuFYE55SJprgQCIEQCIEQCIEQCIEQCIEQCIGOQARnLoQQCIEQCIEQCIEQCIEQCIEQCIFVIRDBuSpY56PQjTbaqG299dbd63a3u13z/5VXXtnOO++89rOf/ax99atfbaeffnq76KKL5qNBqWUIhEAIhEAIhEAIhEAIhMBMEYjgnKnuWP3KEJW77bZb22mnndo222zzW4F5/g/aGd/4Zrv44p93E3pvd+s/aL93i5u1O2yxeVtvvfXaCSec0N72tre1t7/97atfwZwhBEIgBEIgBEIgBEIgBELgGkMggvMa05XjG7LPPvu0Aw44oLVrrdf+7QNHt4986rh29rnntvWv1dp1rrNee+Bf/1U7+ZRT2/9c8ov2v5de0X71m9budtet2hMf/fB2r7tt3S7931+2Aw88MMJzPOrsEQIhEAIhEAIhEAIhEAIhkDmc68Y1sOmmm7ajjjqq3W7TzdrhRxzZ3nzku9vNbnS9dv31rmw//dEP24U/u7Bd8otL2mGvf0N7y9uPbKd98eR2wxvesN30pjdtG9/y99qVG2zYrr/hDdvjHrFTe8h2D2infvnL7am7/2370Y9+tG4ATCtDIARCIARCIARCIARCIASWRSAO57Kwzc9Bu+66azv00EPbV7/+rfbM5x/Q1r/y8nbFzy9s3/j619sVV1xxtYZ86rgT26GHv6F99IPvudrnG264Ydt8i83b+je+WdvkD27b9t93r7bZ7W7TnrDLbu34z3xyfmCkpiEQAiEQAiEQAiEQAiEQAmuUQATnGsW9Zk8mfNbr4EMPb//6tiPbLa5/7fbV077crrj86kJTra59nes0gvONb3lre9/b3zyyohvecMN2+zts2a51w43bXk/erT1s+we1XXbdrX38o/++ZhuWs4VACIRACIRACIRACIRACMwFgQjOueimpVeSs/nWt761HfSaw9v7P/ShdtlPf9C+9c1vLVjQDW54o3bql77cXvKyV7aPfvC97ZJf/M+C+95xyzu2m99mi7bbE57QHrbDA9t2D3pQO+3LX1p6JXNECIRACIRACIRACIRACITANZpABOc1sHvN2TzttNPaYUcc2Y7+8DHtwvO/2845+5xFW7rRzW/Zvv2Nr7e9n/289vnjP92+f965i+6/+eabt022+KO25+67tTtusVnbYYcd2k9+nDmd18DLKU0KgRAIgRAIgRAIgRAIgWUTiOBcNrrZPfCcc85p5/7gv9tT9tmvXfsXP17U2axW3Plu92yf+cTHOsF5+pdOad/++lljG8jpvNltbt8Of/XL2xe/eErb8ylPHntMdgiBEAiBEAiBEAiBEAiBEFh3CERwXsP62hqb//SaQ9t2j3xCu+RH/9W+cdaZE7Vwux12bO955zvanvs+u337G2e10089ZaLjttzqzu3Od79PO+yV/9h2+ptHtFM+/7mJjpvGTre97W3bYYcd1u53v/utqLi99967vetd7+rKeO5zn9v23HPPdpOb3GTBMt/4xje2/fffv/v+cY97XDv44INH7n/xxRe3zTbb7Kpy1PfII49sd77zna9Wdr88X1S7vNf27ne/u7385S+/Wlna3t9nRRCWcLB2YXbmmb+9trA65phjFmRw7LHHXq3uSzjVknfVH16juAzrrfATTzxx0b5ecgWmeAC+u+yyyxRLTFEhEAIhEAIhEAIhsOYJRHCueearekbu5r8d9ZH2oQ9+sJ156ud/JxPtQid/yMMf0/7tbW9u+7/4oPbV0/6jnXTcpyaq5wYbbNDu94AHtd122aVteIPrtZ0f86h22aWXTnTsSnc6/fTTVyy4zjvvvLb11lt3VSFUDj/88EWrZf9tttmmES9EjTostBGlxGRto+rbL6/2IyR33nnnq46zz4477ti810bgrVRor4T/Xnvt1Yhg2zgO9hnVhpWcf3jspA8fllrvadZxOWVtvPHGyzksx4RACIRACIRACITAzBCI4JyZrlh5RcrdfMAjdm4XnfvNdvbZZ09c6J77PKe9/KUv6gTnueee+ztLoyxW0F3uetd2x63v1Q575UFt2wdt3874ypcnPu9yd+REeq1kIxqJR2KIYJnE7SJOS/gtJniJMeKmtoXq2y/PvtxVjml/6zuwPp9G21fCzbHLFW5c2r5Tu9J6OH77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a7+58sr2r0e8vR36ypf9zrzOzbfYvN3jfn/dnv93z2wPecgOU1kWZTi/cTlo+g7bJG7pMPRWHRZaGmToWo6aazlqTubQMR21z2qEZy6H30LHrFRwKnepYbZVl5rbSKSP2taW4Kw2LYXzDjvs0A466KAFD4ngXArN7BsCIRACIRACITCLBCI4Z7FXllGnjTbaqFsK5UGP2a2d983T2zfO+OpVpWy6+Rbt5a/6p3b/+967fe4LX2wf++Sn2yW//GW74vLL27e/cVb79te/1q64/LKrnXXDG96obXSzm7cb3myTtsF1r9eubK09/f+H2X7quBPaIS99STv3nO9edcw9/vQ+7a8euH2705Z3aE/9213bZZdeuoxW/N8h03DAlDbpPMw684477tiFqNoWS9YzdC0Xqm+/PGWOckyHGWan1fYVdcCYg6chOOsUO++8c9tvv/3GJhUaFT47a4JzOcwvvPDCCM7lgMsxIRACIRACIRACc0EggnMuummySh5//PHtrO/8V3vTm9/cvnXaqe3yyy9vf7Xdg9o/v/a17dzzvtc+cPQxndAsN/PH//3DiQre8MYbtZve8vfbRrfYpAuzJTw3u91t25Ofukf70sm/zYhrSZR99n56e+/73t+O+JfXT1TuQjuNmt+4nAL7DuQkbml/DuVSlkAxL5EjOdyGczJHZbqdZJ/ltH21j5mm4FRXLjIxzoUeZiMmNI899tgufJYbPG6blsM5TOA07rzL+X5c9uM4nMuhmmNCIARCIARCIARmiUAE5yz1xgrrsu+++7YXHXBg+5O/3L7dYoNftYf9zSPa9ts/uB1z7CfaV884c0E3c9LTcjqJz1veerN2u802bfs+7cntU5/4RPvIMUe3u/3ZX7Tdd9m5PXPvZ7Rvfv3MSYv8nf2mNXex70BO4hgK09xmm21+K57HJOvpu5YL1bdfXjVy6JgOE+pMktCI+FL2mthWI2nQmqj3tAQn1tNOxjRsvz5fKGTbvhGca+KKyTlCIARCIARCIARWk0AE52rSXcNlC6s955xz2mFHHNm2vtMftf847fR24okndHMzJ3UzJ61yuZ677rpru82t/6Bd8LOL2gU/+H573ateNmkRI/dbLCPspAX350RO4pYO520OE/r0zzt0JEfVd9SczGFCGUKGwO07duPavppLoIxiu5grPG2Hc9K+nWS/aQnOSc61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VDkEQiAEQiAEQiAEQiAEQiAE5oFABOc89FLqGAIhEAIhEAIhEAIhEAIhEAJzSCCCcw47LVUOgRAIgRAIgRAIgRAIgRAIgXkgEME5D72UOoZACIRACIRACIRACIRACITAHBKI4JzDTkuVf0vgtre9bTvssMPa/e53vxUh2Xvvvdu73vWuroznPve5bc8992w3uclNFizzjW98Y9t///277x/3uMe1gw8+eOT+F198cdtss82uKkd9jzzyyHbnO9/5amX3y+u3y/61vfvd724vf/nLr1aWtvf3WRGEJRysXZideeaZ3VFYHXPMMQsyOPbYY69W9yWcasm76g+vUVyG9Vb4iSeeuGhfL7kCUzwA31122WWKJaaoEAiBEAiBEAiBEFjzBCI41zzznHFKBE4//fQVC67zzjuvbb311leJx8MPP3zR2tl/m222acQLUaMOC21EKTFZ26j69sur/QjJnXfe+arj7LPjjjs277UReCsV2ivphr322qsRwbZxHOwzqg0rOf/w2EkfPiy13tOs43LK2njjjZdzWI4JgRAIgRAIgRAIgZkhEME5M12RiiyFACfSayUb0Ug8EkMEyyRuF3Fawm8xwUuMETe1LVTffnn25a5yTPtb34H1+TTavhJujl2ucOPS9p3aldbD8dtvv33zoGAxV7rOs9x6T6OeyykjgnM51HJMCIRACIRACITALBGI4Jyl3khdJiLA2ePwrXTrO5CTuKV9sUQUEoejtqGbJ8RzlHM6FF+jnMJJ9lkph+UcvxLhNi23k8DkBu+www4TN2El9Z74JFPcMYJzijBTVAiEQAiEQAiEwFohEMG5VrDnpMslQJQRmyudu9h3ICdxDE866aQurNW2kICsNnFNa37jQvXtl1fHDUVvP9zXPtNq+3LZ94+bhnBbidu5FFdz2vWeBr9Jyhj2/yTHZJ8QCIEQCIEQCIEQmDUCEZyz1iOpz6IEhvMbl4Or77BN4pb29x8n+oYiatRcy1EO39Ax7Yf7VhvHtV25r3jFK64213M5fOoYCY4WClOdhuB0nqW6nctxNZcrODngZ5111koQruhYDy1cB9lCIARCIARCIARCYJ4JRHDOc++tY3UfNb9xOQjKgRwnHqvs/hzKxZL1EAjKrm0h53Q4J3OUYzpMODSu7UsVbpNwW6yt0xKcVY9J3E4PB1aamXcp9U446yRXSfYJ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NvsltQqBEAiBEAiBEAiBEAiBEAiBuScQwTn3XZgGhMDaIXCta12rXXnlla3/riY+G7cNj6n969j63uej/l7o+3HnzfchEAIhEAIhEAIhEAJrlkAE55rlnbOFwDWCAME3FIlLbVhfNC732GnUY6nnzv4hEAIhEAIhEAIhEAKTE4jgnJxV9gyBaxyB5Yi+9dZbr93gBjdoN73pTdttbnObtummm7bb3va27fd///fbrW9967bJJpt0393oRjfq9ttggw3ata997eY4m3fnLbFYrqb3ev36179uv/rVr9rll1/efvnLX7Zf/OIX7Sc/+Un77//+7+71wx/+sH3/+99v5557bvf+s5/9rNvniiuuWLSPltPea1ynp0EhEAIhEAIhEAIhsAYJRHCuQdg5VQjMGgECjAD8zW9+c7VQ2Otd73pts802a3e6053afe9733aPe9yj+/+Wt7xlJyAvu+yy9r//+7+d8PvBD37Qzj///O7v733ve93rpz/9afv5z3/evYhA+zoHIUlU9s9XdSgxSpw6R70IV69b3OIWnbD9gz/4g64et7rVrbrX7/3e73XfX/e61+3K/p//+Z/2ox/9qJ1zzjntC1/4QvvKV77SvvOd73TCVH36W4le7+qULQRCIARCIARCIARCYLoEIjinyzOlhcBMExi6iip785vfvN3vfvdrj3rUo9qf//mfd8KO2OMkfvvb326nnHJKO/XUU9s3v/nNdt5553Vik/u42tsoN3Ixh5JwXn/99Tt3lTC9wx3u0InlrbfeunNiCVNilhP6n//5n+2zn/1s++IXv9g+9rGPdZ/1BWec0NXu3ZQfAiEQAiEQAiGwrhCI4FxXejrtXOcIVAirhleoqs/+8A//sO2yyy5t55137lxLIaunn356O+aYY9onPvGJdvbZZ/+OE6iMYZKgPtDrXOc6zYtQvf71r9+J1hvf+Mad61gvrql9KrxWefYXNkvAErLq961vfatzRX1OBF566aXdcZdccklXV5+PCp0dJaaHnU6QCv3dcsst24Mf/OAuHPiv/uqvOof04osvbl//+tfbhz70oY6Dv0uEVtuLafFc5y6qNDgEQiAEQiAEQiAElkgggnOJwLJ7CMwDgb74IqYe/vCHt/3226/98R//cbvgggva0Ucf3Y444ohOaBJ0JShLnA7buOGGG3YiklN45zvfud3whjfs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y162u+51r9u94Q1v6L9b1BGFsr3nec5znu4rX/lKd5GLXKQ77bTTurvc5S7d/e9//97pO/bYY7uPfvSj3eUud7meMFztalfrXv7yl/ekE0lwLLJ96ad2Wlt0+9vfvnvrW9/a/exnP+u/ipOHcF7hClfoCXBLNM9xjnN0e+21V3f66af3AYf1aNuixmIr3if2k7b/6le/6s573vN2z33uc3vMBS1gjkxe7GIX6wnn5z//+e7qV7969453vKN79KMf3V3pSlfqbn3rW3cPfOADux/+8IfdpS51qe6Vr3xl96pXvaq3q/Wyqa2I93q02Rje+c537j772c92X/jCF870iElE6ZKXvGR3wxvesHvjG9+48Hk1tKu///u/723lohe96I75jUSeeuqp/f673/jGN3qSqUL5t771rd5uPvOZz/Q25/CuYnMUzl//+tcLzxTRXnZ+73vfu3vnO9/Zfe9739uBY95Hk97tix7TaWmxJ554YnfTm950x2MrpXbRI1D3KwQKgUKgEFhGBDaccALhpJNO6lNsl23PzsMPP7xfc3rBC16wu8UtbtHtt99+3a1udav+3xwJyiOVc5EHh0jEX+Rfutkee+zRHXjggd3+++/f//7ud7/bO3L3uc99ekfqE5/4RH+O1LVrXeta3ZOf/OT++zhZ2jd0GNfa3hBOigUVAyF+05ve1KuviM1Vr3rVngS/7W1v65VXDvRd73rX3gmlkHCqPv3pTy/cMV5rv7by9bGbKE5IJYf+F7/4Rfeud72re8xjHtN98pOf3NFFwYG99967u8Md7tCrVYIZgig+/9jHPtaTzhe/+MXdPe5xj55EvPCFL+zPdSSt29+Ltq2tPAaLaLs5/773va+72c1u1hN+f5tXfpvTeScJJNzylrfs9t133z6Ic/GLX7wnqbvuuutC30mxq/yOwonI3eY2t9nRZfalvccdd1z3iEc8ok+/poA6/5GPfGT/npCVwY68S9/97nf357Xp22xvEfaUVF41A+D0zW9+sw+onHDCCd0HP/jBfilHslfWOw25COciZkXdoxAoBAqBQmC7IbAphBOIyCbSiXwuy/G0pz2tJ32HHHLIDieOssgpErk/5phjeqUv6+XW2m73RWaplB/60Id2pJtRDCibJ598cp8OeY1rXKN73vOe1z396U/vqA3Xu971+kff97737ZUHlQw5WXHe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CoHVILDookF77rln5//MOgqBQqAQKAQKga2MwNyE88c//nHfX2szbX/SFjUQ2T3++ONnSrFt9+zcygBW2wuBQqAQKAQKAQjUtihlB4VAIVAIFAKFwJkRWDXhdKvh9ic+sz6T2nnPe95zKt7DPTunXlAnFAKFQCFQCBQCS4pAEc4lHZhqViFQCBQChcCmIrAmwpmWD9dm+vwhD3lIX1DofOc734odrJShTR3/enghUAgUAoXAghAowrkgIOs2hUAhUAgUAtsKgbkJpzWcYyRS8R+VaNsCQLPs2VlVarePPZ3lLGfp/u///q/z25G/h79955z//d//3XFuzs937fXtd9sHrerJdkQgtt/2bdI8GPt8DJN2Pm1HzLZTn4pwbqfRrL4UAoVAIVAILAqBuQnnSsWBkM2xtZkrXVOEc1FDub3vEzK7vXtZvdvKCGwWMay5sTxWU4RzecaiWlIIFAKFQCGwPAjMTTg1fVq67FiK7aQ9O4twrq8xDJ3R9t/zOqp//ud/3vk529nO1u2yyy690n3BC16wO//5z9+d5zzn6c573vP2n+W3v51/jnOco/uzP/uzHdfm71//+tfdb3/72+4Pf/hD95vf/KZXPP37l7/8ZffTn/60+9nPftb/+Pt//ud/ut/97nf9ec7x428q0e9///v+x3306exnP3t3znOes//tR3v/4i/+ogf6rGc965+osK16OqZOre/obN7d9VUBsItc5CL9+Jxwwgndr371q81r0Do/eZLq3o7/rE1gS7Frds/OL3CBC+yYB5kb+c73rvHD9tkkO/R9bJlts2H/ZtPsPfaf3z//+c/7z3/yk5/0c8K//ZgHrjd/5jnG3gXzvhPmed7OcO6JJ5644hZhKs7OU3X2Wc96VlV03xkMp/pYCBQChcA2R2BVhBMm09JlJxUUGu7ZWYRzfS0sBGuSY80JRhA5zFe4whW6q1/96t3Vrna17opXvGJ3iUtcorv4xS/ekzekjZPNGQ4p/MUvftFXKeYQI4n5N4fYZ5xjJAYR5BD77VqONSeZ480Bz71DZs997nOfibhy4hEjzvu5znWuzjkhsvqgnzk85wc/+EF3xhln9D8cvK9//evdd7/73e7b3/52f5prPde9/O3w/NUQkPUdwcXfHakwPve97327l7/85d2lL33p7j3veU8nALAdD/1tiRQbHh7sSfDkUpe6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cccdu4997GObSKQPSMWDHvSg7na3u1130UUXNTKpFMKv//qvd895znM6x/7Kr/xKd8YZZ3Rnn312d9ZZZzVj3X7rcZs1lmpY6vtGK4uy3377dccdd9ymhQgfQqhudrObNaK1XsdcXxBG7d9+++27008/vdt66603TV9kU/+Uz/jDP/zD7h/+4R+6+93vfq0uqflywAEHdJ/61KcaHuedd1535plndu9973vX4/S/SZuRSv3OYkK//uvmSDjT+WHpk/m62FqUSgbbdT8JqgOFQCFQCBQCGxaBIpwjh36pCWcMrr6xfac73an77ne/u0nl6+8zspkrthuDeFIfNODII4/sXvSiF3W/+qu/umkfZNPfH/7wh7vtttuufX/00Ud3//qv/9oUHJkd99hjj+5b3/pWM8CRzpNPPrm78MILN/XJMVFI1jI2/UG47W1v2/37v/9795Of/OQmBMsfCOdGq8Opv/vuu+8mwomAbbPNNt3jH//4Ngd+9rOfdfe5z31WbB4v9YWibCJWD3/4w9scVye1v73pTW/qPve5z7X5bfvCF77Q5rx75Oqrr+7uec97drvuumv33Oc+t9tpp53aQkwU0vWqdN797nfvrr/++u6CCy7okLDLLrus+6d/+qfWf4QTTi984QtHD8darcM5KU/BpNInYxMKrZccB6MHrnYsBAqBQqAQ2JAIFOEcOexLTThd9la3ulUzRrlZPfKRj2xudTe/+c1Htmjt7BZVU4ui4FxyySWtT7YofTfccEP32c9+tjvhhBO6T37yk92rX/3q7vLLL+++8Y1vdEcddVT3x3/8x834hMsxxxzTvfGNb+yuu+66pvbMUgvXDho3bckhhxzSnXLKKd0nPvGJ7pxzzunOP//87sYbb2w73f/+9+/udre7de9617sW1Xxz6M53vvOiz7OQRuy+++7dt7/97e6KK66YebgxtOhgMeLHP/5x9+QnP7n1/xa3uEVbZOFe/eUvf7l7+ctf3t3xjnds55tEsNbiYoN+UTPNZRvyqE9//dd/3e28886bsHGPf+973+sOOuigbu+9924qKAUUAUNWxft98YtfbC6Z+++/f3fSSSe12D/YwIIifuCBB7aFmuGiz8wBWKUdqL23v/3tu5e97GWNOHtG2Mwb98KJJ57Y3eMe9+he9apXjW7heiKc6VS/9ImSKdROYznXVoRz9JSo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UDKe/P2c5zynO/bYY7vvf//7rXwKtecJT3hCd/XVV7ff/O3zGWecsWHIyrRZYa4hJpRfdUptIe9I+/bbb9/d5S536d71rnet+MTaY489uhtvvLG79tpru1/+5V9u9WRlJqbMbL311i1p2HHHHbfi7VqNC3KPNS4IUhS60047rdXd/Na3vtWaBAsE02LMO97xju7II4/sXvnKV3Zvf/vbuwc/+MHdD37wg84xlE3Pk1122aV9tm20DLc/+9nP2qKUuWVue26o2WtTw/elL31pI+RrafM8W8qtstQuJZp1rkKgECgECoHVQqAI50jkQzjtfqtb3ap70IMe1DG2GYR3uMMdNql4I0+3We3Wd3/jSsgVUPH6888/vzvmmGNaPU2b/dSd9B1F52//9m+7+93vfs2ovO6667p73/vejWQyvG95y1t2H/nIRxrOIVgbRSWbNDkOOeSQpoxJvMX9Up1SRB1297nPfVrd07POOmvF59VjHvOY7h73uEd38MEHd3e9613b9Y0TpRoBvfTSS7uPfexjrSzI5rxRco844oimZPbdh88999y2gPLtb3+7kVFJ1IzbTjvt1FRh2bzV6Nx33307C1eeJ1/72te6N7/5zd0zn/nMVqPV74njpIzuv//+TR3dnO8HOFJ69ZH7vZcNtqeeemoj4y94wQtugvVamF/vf//7m1K9VFsRzqVCss5TCBQChUAhsJoIFOEciT7CScU86qijGhmiNlhdzwr70Ucf3d385jfflDBk5GnX9W6M4K985SvNBTZb3N4e9ahHNRLCYEpyFMoPN7nDDz+8GdiUi/ve977t0GuuuaaV06FiiHtDVi6//PJNhNM+SNVBBx3UVNGNtFF6EG9YMrQZ35l/yAmljGr2wQ9+cMVhsegi9vD6669viiZytNtuu3VbbbVVa+OLXvSi7vjjj2+EaXPfzG8EqU8EEc7DDjusuR0nAZDnByLuvrGIQP1ENm92s5t1n/70pzvlMLikU4533nnnFu/p72Ht1s0ZT8/VH/3oR21xj8eERSseExdddFH3jW98Y80qnDw7kM5hvemFjlURzoUiV8cVAoVAIVAIrCUEinCOHA3uny972cuaUS02a/fdd+/uda97NeP/pz/9aXN53AhGdR+uuA9Ss/qJfhjOVBxGNOL485//vB0mLuvud797U3z222+/pmqKafO75CnbbLNN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OaXbZpttNpHRNdilalIhUAgUAoVAIVAIFAKFwAZEoAjnZjboEsvYEBKf8z78btjt7Ov7/ueVhGd43X77+/1Jm9LXfhtDxFay3Ut9rZDNv/iLv2gE8/DDD2+JgW5729t23/zmN28yPn/yJ3/S1M4dd9yx23vvvVdt7JYag7V2PnMt83HSXOy3V4InKrT9vRvPX/7lX+4o1t69fOc3LtN5952/nX84j53TOHOvlhTKvPDub59//vOftxdF3Hc++90xXo53/Zw313Cs/f0+fFbkmbHWxqLaUwgUAoVAIVAIFALrC4EinOtrvG7S2vkQQwYlY5ZRe7Ob3ax99i7T6a1udatGaP77f//v3a/8yq80g9jffvfy2X6u590WQ9l5HcNwtf37v//7TQxz3zFoGcKMYL8zhGMge/+3f/u39j3l7mc/+1lLhmN/3/nbe4zoGNx+n7T1Cfd6HFrtN0Zbb711c6XdYostGp73ute9us9+9rObiEGIwzOf+czmanvCCSd0X/jCF1qXMxbrsf9rqc2T7i/3g7HZbbfduoc85CFtfNwfIZQhkpmHyF6In7lrLocE5t3vIZF9V+khFiGyCGru52QvRibdk14+px35Pecyb1zD/fOjH/2ovf/93/99U8hlOuaS/a//+q9t95DQzWERZy3Nq2pLIVAIFAKFQCGw0RAowrnGR7yvrGjqUGWhenGlvMc97tH93u/9Xve7v/u73a//+q93v/Zrv9b96q/+aiOIDFDGY8gfo3S4ISlRTUJaGJpRSlJq46c//WlrA+PZ7wihfWJg5zpRc+zTV3AY7La0yf6MY5v90sd++/qKT1SjlAiRLOef/umfui996UvdBz7wge7yyy9vnyeRrkmKqetMUnZWa1okPvMHP/hB91u/9VuNFNz//vfvPvOZz9yk3Im++H2rrbbqTj755Db2sCyyOf+Ryz0Gu+GCxa1vfetG6Pfff//uYQ97WLufELOLL764+/CHP9xIvjmYhZGojP3SNCGKua8QvpXc+kTV/HLvWWSS6RhZppLvtddejXgizubVNddc0730pS/t/vqv/3oT+cw9138GrWQ/6lqFQCFQCBQChUAhsD4RKMK5xsctCgVSxCCWPEY20n322ae7853v3NTAr33ta92NN97Y/d3f/V331a9+tbldfu9732tEjHrICM7xlDLJZWQ97RPPEMUQusDi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"}],"animations":[{"uuid":"79010dec-f6e1-033b-fdb0-7fed83a46717","name":"animation.cape_creation_tool.migration","loop":"once","override":false,"length":0,"snapping":24,"selected":false,"anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"91d65ecf-f78b-6339-d66f-548e29eb89d3":{"name":"Cape","type":"bone","keyframes":[{"channel":"position","data_points":[{"x":"0","y":"-0.5","z":"1"}],"uuid":"cc03a0f0-4c89-3d51-fa9d-ba5d7cc0b3a0","time":0,"color":-1,"interpolation":"linear"}]}}},{"uuid":"f88e2510-c78f-4521-3629-cedb0e6326d8","name":"animation.cape_creation_tool.solo","loop":"once","override":false,"length":0,"snapping":24,"selected":false,"anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"91d65ecf-f78b-6339-d66f-548e29eb89d3":{"name":"Cape","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":"0","y":"180","z":"0"}],"uuid":"1c2da9a3-7a80-1b48-04dc-fa18e3c13147","time":0,"color":-1,"interpolation":"linear"}]}}}]} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 8b0b895..0000000 --- a/gradle.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G -XX:+UseParallelGC - -org.gradle.daemon=true -org.gradle.parallel=true -org.gradle.configureondemand=true -org.gradle.caching=true - -minecraft_version=1.21.4 -yarn_mappings=1.21.4+build.7 -loader_version=0.16.10 -fabric_version=0.114.0+1.21.4 - -mod_version = 0.0.7-beta1 -maven_group = org.saturnclient -archives_base_name = saturnclient - -player_anim = 2.0.3+1.21.4 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975..61285a6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..19a6bde 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf9300..adff685 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 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. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # 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" ) @@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019..e509b2d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ 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 %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle index f91a4fe..07bdcaa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,21 @@ pluginManagement { repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } + maven { url "https://maven.fabricmc.net/" } gradlePluginPortal() + mavenCentral() } } + +rootProject.name = "saturn-client" + +include("common") + +def versionsDir = file("versions") + +versionsDir.eachDir { dir -> + def version = dir.name + def projectName = "mc-${version}" + + include(projectName) + project(":${projectName}").projectDir = dir +} diff --git a/src/main/java/org/saturnclient/modules/ModManager.java b/src/main/java/org/saturnclient/modules/ModManager.java deleted file mode 100644 index 9a2ef26..0000000 --- a/src/main/java/org/saturnclient/modules/ModManager.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.saturnclient.modules; - -import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; -import java.util.ArrayList; -import java.util.List; - -import org.saturnclient.modules.mods.*; - -public class ModManager { - public static final List ENABLED_MODS = new ArrayList<>(); - public static final Module[] ALL_MODS = { - new Crosshair(), - new AutoSprint(), - new ArmorDisplay(), - new Fps(), - new StatusEffects(), - new Coordinates(), - new Freelook(), - new Keystrokes(), - new Fullbright(), - new NoFog(), - new DayCounter(), - new Speedometer(), - new Zoom(), - new HealthDisplay(), - new Nametags(), - new Ping(), - new Tps(), - new Clock() - }; - - public static void init() { - // Pre-filter enabled modules to avoid checking every tick - updateEnabledModules(); - - ClientTickEvents.END_CLIENT_TICK.register(client -> { - // Only iterate over enabled modules - for (Module m : ENABLED_MODS) { - m.tick(); - } - }); - } - - public static synchronized void updateEnabledModules() { - ENABLED_MODS.clear(); - for (Module m : ALL_MODS) { - if (m.isEnabled()) { - ENABLED_MODS.add(m); - } - } - } - - public static Module[] getAllMods() { - return ALL_MODS; - } - - public static void refreshEnabledModules() { - updateEnabledModules(); - } -} diff --git a/src/main/java/org/saturnclient/modules/README.md b/src/main/java/org/saturnclient/modules/README.md deleted file mode 100644 index 0eb81ca..0000000 --- a/src/main/java/org/saturnclient/modules/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Credits -### Freelook -- https://github.com/Celibistrial/freelook -- https://modrinth.com/mod/freelook - -**The other mods are coded by us, if you have a concern or we missed something feel free to submit a issue with the credits tag** \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java deleted file mode 100644 index 5778b71..0000000 --- a/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.saturnclient.modules.mods; - -import org.saturnclient.modules.HudMod; -import org.saturnclient.modules.ModDimensions; -import org.saturnclient.modules.Module; -import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; - -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; - -public class ArmorDisplay extends Module implements HudMod { - private static Property enabled = Property.bool(false); - private static ModDimensions dimensions = new ModDimensions(40, 75); - private static Property useMainHand = Property.bool(false); - - public ArmorDisplay() { - super(new ModuleDetails("Armor Display", "armor") - .description("Displays armor durability") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - useMainHand.named("Use Main Hand"), - dimensions.prop()); - } - - public void renderArmor(RenderScope scope, ItemStack mainHand, ItemStack helmet, ItemStack chestplate, - ItemStack leggings, ItemStack boots) { - int row = 0; - - if (useMainHand.value && !mainHand.isEmpty()) { - scope.drawItem(mainHand, 0, 15 * row); - renderHealth(scope, row, mainHand.getMaxDamage(), mainHand.getDamage()); - row++; - } - - if (!helmet.isEmpty()) { - scope.drawItem(helmet, 0, 15 * row); - renderHealth(scope, row, helmet.getMaxDamage(), helmet.getDamage()); - row++; - } - - if (!chestplate.isEmpty()) { - scope.drawItem(chestplate, 0, 15 * row); - renderHealth(scope, row, chestplate.getMaxDamage(), chestplate.getDamage()); - row++; - } - if (!leggings.isEmpty()) { - scope.drawItem(leggings, 0, 15 * row); - renderHealth(scope, row, leggings.getMaxDamage(), leggings.getDamage()); - row++; - } - - if (!boots.isEmpty()) { - scope.drawItem(boots, 0, 15 * row); - renderHealth(scope, row, boots.getMaxDamage(), boots.getDamage()); - row++; - } - } - - public void renderHealth(RenderScope scope, int i, int max_damage, int damage) { - if (max_damage > 0) { - scope.drawText(0.5f, "" + (max_damage - damage), 17, (15 * i) + 3, dimensions.font.value, - dimensions.fgColor.value); - } - } - - @Override - public void renderHud(RenderScope scope) { - renderArmor(scope, - SaturnClient.client.player.getEquippedStack(EquipmentSlot.MAINHAND), - SaturnClient.client.player.getEquippedStack(EquipmentSlot.HEAD), - SaturnClient.client.player.getEquippedStack(EquipmentSlot.CHEST), - SaturnClient.client.player.getEquippedStack(EquipmentSlot.LEGS), - SaturnClient.client.player.getEquippedStack(EquipmentSlot.FEET)); - } - - @Override - public void renderDummy(RenderScope scope) { - renderArmor(scope, new ItemStack(Items.DIAMOND_SWORD), new ItemStack(Items.DIAMOND_HELMET), - new ItemStack(Items.DIAMOND_CHESTPLATE), - new ItemStack(Items.DIAMOND_LEGGINGS), new ItemStack(Items.DIAMOND_BOOTS)); - } - - @Override - public ModDimensions getDimensions() { - return dimensions; - } - - @Override - public boolean isEnabled() { - return enabled.value; - } - - @Override - public void onEnabled(boolean e) { - enabled.value = e; - } -} diff --git a/src/main/java/org/saturnclient/modules/mods/AutoSprint.java b/src/main/java/org/saturnclient/modules/mods/AutoSprint.java deleted file mode 100644 index 7a413b4..0000000 --- a/src/main/java/org/saturnclient/modules/mods/AutoSprint.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.saturnclient.modules.mods; - -import java.util.Objects; - -import org.saturnclient.modules.Module; -import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; - -public class AutoSprint extends Module { - private static Property enabled = Property.bool(false); - - public AutoSprint() { - super( - new ModuleDetails("Auto Sprint", "sprint") - .description("Makes the player always sprint") - .tags("Movement") - .version("v0.1.0"), - enabled.named("Enabled")); - } - - @Override - public void tick() { - if (SaturnClient.client.player == null || SaturnClient.client.getNetworkHandler() == null) { - return; - } - if (SaturnClient.client.options.forwardKey.isPressed() - && !SaturnClient.client.options.backKey.isPressed() - && !SaturnClient.client.player.isSneaking() - && !SaturnClient.client.player.horizontalCollision - && !SaturnClient.client.player.isUsingItem()) { - - Objects.requireNonNull(SaturnClient.client.player).setSprinting(true); - } - } - - @Override - public boolean isEnabled() { - return enabled.value; - } - - @Override - public void onEnabled(boolean e) { - enabled.value = e; - } -} diff --git a/src/main/java/org/saturnclient/modules/mods/Crosshair.java b/src/main/java/org/saturnclient/modules/mods/Crosshair.java deleted file mode 100644 index 5a4ed46..0000000 --- a/src/main/java/org/saturnclient/modules/mods/Crosshair.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.saturnclient.modules.mods; - -import org.saturnclient.modules.Module; -import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Textures; - -import net.minecraft.client.render.RenderLayer; - -public class Crosshair extends Module { - public static Property enabled = Property.bool(false); - - public Crosshair() { - super( - new ModuleDetails("Crosshair", "crosshair") - .description("Changes the crosshair if you're aiming at a entity") - .tags("Visuals", "Utility") - .version("v0.1.0"), - enabled.named("Enabled")); - } - - @Override - public void render(RenderScope scope) { - if (enabled.value - && SaturnClient.client.targetedEntity != null - && SaturnClient.client.targetedEntity.isAlive()) { - int scaledWidth = 15; - int scaledHeight = 15; - - scope.setRenderLayer(RenderLayer::getCrosshair); - scope.drawTexture(Textures.CROSSHAIR_RANGE, - (scope.getScaledWindowWidth() - scaledWidth) / 2, - (scope.getScaledWindowHeight() - scaledHeight) / 2, 0.0F, 0.0F, scaledWidth, scaledHeight); - } - } - - @Override - public boolean isEnabled() { - return enabled.value; - } - - @Override - public void onEnabled(boolean e) { - enabled.value = e; - } -} diff --git a/src/main/java/org/saturnclient/modules/mods/Nametags.java b/src/main/java/org/saturnclient/modules/mods/Nametags.java deleted file mode 100644 index 5f4948f..0000000 --- a/src/main/java/org/saturnclient/modules/mods/Nametags.java +++ /dev/null @@ -1,148 +0,0 @@ -package org.saturnclient.modules.mods; - -import org.saturnclient.modules.Module; -import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.modules.mods.utils.HealthRenderState; -import org.saturnclient.saturnclient.config.manager.Property; - -import net.minecraft.client.render.entity.state.LivingEntityRenderState; - -// todo: rendering modes, custom names - -public class Nametags extends Module { - private static Property enabled = Property.bool(false); - private static Property healthDisplay = Property.bool(false); - private static Property players = Property.bool(true); - private static Property hostile = Property.bool(false); - private static Property passive = Property.bool(false); - private static Property heartEmoji = Property.bool(true); - private static Property obfuscate = Property.bool(false); - private static Property unit = Property.select(0, "Health", "Hearts"); - private static Property format = Property.select(0, "Value", "Value / Total", "%"); - private static Property nameColor = Property.select(15, - "Black", - "Dark Blue", - "Dark Green", - "Dark Aqua", - "Dark Red", - "Dark Purple", - "Gold", - "Gray", - "Dark Gray", - "Blue", - "Green", - "Aqua", - "Red", - "Light Purple", - "Yellow", - "White" - ); - private static Property healthColor = Property.select(12, - "Black", - "Dark Blue", - "Dark Green", - "Dark Aqua", - "Dark Red", - "Dark Purple", - "Gold", - "Gray", - "Dark Gray", - "Blue", - "Green", - "Aqua", - "Red", - "Light Purple", - "Yellow", - "White" - ); - - private static final String[] COLOR_CODES = { - "§0", "§1", "§2", "§3", "§4", "§5", "§6", "§7", - "§8", "§9", "§a", "§b", "§c", "§d", "§e", "§f" - }; - - public Nametags() { - super( - new ModuleDetails("Nametags", "nametags") - .description("Allows you to modify entity nametags") - .tags("Camera", "Utility") - .version("0.1.0"), - enabled.named("Enabled"), - healthDisplay.named("Display health"), - players.named("Players"), - hostile.named("Hostile"), - passive.named("Passive"), - heartEmoji.named("Heart emoji"), - obfuscate.named("Obfuscate enemy names"), - unit.named("Unit"), - format.named("Format"), - nameColor.named("Name color"), - healthColor.named("Health color") - ); - } - - @Override - public void tick() { - - } - - public static String getHealthString(LivingEntityRenderState state, HealthRenderState hrs, float health, float maxHealth) { - String ret = ""; - - switch (format.value){ - case 0: // value - ret = String.format("%.1f", health / (unit.value + 1)); - break; - - case 1: // value / total - ret = String.format("%.1f", health / (unit.value + 1)) + " / " + String.format("%.1f", maxHealth / (unit.value + 1)); - break; - - case 2: // % - ret = String.format("%.0f%%", (health / maxHealth) * 100); - break; - } - return ret; - } - - public static String getNametagString(LivingEntityRenderState state) { - if (state.customName == null) return null; - if (!healthDisplay.value) return state.customName.getString(); // name only - if (!(state instanceof HealthRenderState hrs)) return null; - - float health = hrs.saturn$getHealth(); - float maxHealth = hrs.saturn$getMaxHealth(); - - HealthRenderState.EntityType type = hrs.saturn$getEntityType(); - if (type == HealthRenderState.EntityType.PASSIVE && !passive.value) return null; - if (type == HealthRenderState.EntityType.HOSTILE && !hostile.value) return null; - if (type == HealthRenderState.EntityType.PLAYER && !players.value) return null; - if (type == HealthRenderState.EntityType.OTHER) return null; - - if (health < 0f || maxHealth < 0f || health > maxHealth) return null; - - String hpColor = COLOR_CODES[healthColor.value]; - String color = COLOR_CODES[nameColor.value]; - String heart = heartEmoji.value ? " ❤" : ""; - String obf = obfuscate.value ? "§k" : ""; - String reset = "§r"; - - String ret = color + obf + state.customName.getString() + reset + " " + hpColor + getHealthString(state, hrs, health, maxHealth) + heart; - - return ret; - } - - public static boolean shouldReplaceName() { - return enabled.value; - } - - @Override - public void onEnabled(boolean e) { - enabled.value = e; - } - - @Override - public boolean isEnabled() { - return enabled.value; - } -} diff --git a/src/main/java/org/saturnclient/modules/mods/Speedometer.java b/src/main/java/org/saturnclient/modules/mods/Speedometer.java deleted file mode 100644 index ec3663c..0000000 --- a/src/main/java/org/saturnclient/modules/mods/Speedometer.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.saturnclient.modules.mods; - -import org.saturnclient.modules.HudMod; -import org.saturnclient.modules.ModDimensions; -import org.saturnclient.modules.Module; -import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; - -import net.minecraft.util.math.Vec3d; -import net.minecraft.entity.Entity; - -public class Speedometer extends Module implements HudMod { - private static Property enabled = Property.bool(false); - private static Property axis = Property.select(1, "Absolute", "X axis", "Y axis"); - private static Property unitText = Property.select(0, "None", "Blocks/s", "blocks/s", "b/s"); - private static Property speedText = Property.bool(true); - private static ModDimensions dimensions = new ModDimensions(40, 18); - double speed = 0.; - Vec3d velocity; - double y = 0.; - - public Speedometer() { - super(new ModuleDetails("Speedometer", "speed") - .description("Displays your current speed") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - axis.named("Speed type"), - unitText.named("Unit text"), - speedText.named("Show speed text"), - dimensions.prop() - ); - } - - @Override - public void renderDummy(RenderScope scope) { - renderSpeed(2.71, scope); - } - - @Override - public void renderHud(RenderScope scope) { - Entity vehicle = SaturnClient.client.player.getVehicle(); - Entity player = SaturnClient.client.player; - - if (vehicle == null) { - velocity = player.getVelocity(); - y = player.isOnGround() ? 0. : velocity.y; - } else { - velocity = vehicle.getVelocity(); - y = vehicle.isOnGround() ? 0. : velocity.y; - } - - switch (axis.value) { - case 0: // Absolute - speed = (Math.sqrt(Math.pow(velocity.x, 2) + Math.pow(y, 2) + Math.pow(velocity.z, 2))); - break; - - case 1: // x axis - speed = (Math.sqrt(Math.pow(velocity.x, 2) + Math.pow(velocity.z, 2))); - break; - - case 2: // y axis - speed = (Math.abs(y)); - break; - } - renderSpeed(speed * 20, scope); // blocks/tick to blocks/s - } - - public void renderSpeed(double speed, RenderScope scope) { - String f = String.format("%.2f ", speed); - - switch (unitText.value) { - case 1: - f += "Blocks/s"; - break; - - case 2: - f += "blocks/s"; - break; - case 3: - f += "b/s"; - break; - } - - String text = f; - - if (speedText.value) { - text = "Speed: " + text; - } - - scope.drawText(text, - 0, 0, dimensions.font.value, dimensions.fgColor.value); - dimensions.width = Fonts.getWidth(text, dimensions.font.value); - dimensions.height = 18 * text.split("\n").length; - } - - @Override - public boolean isEnabled() { - return enabled.value; - } - - @Override - public ModDimensions getDimensions() { - return dimensions; - } - - @Override - public void onEnabled(boolean e) { - enabled.value = e; - } -} diff --git a/src/main/java/org/saturnclient/modules/mods/StatusEffects.java b/src/main/java/org/saturnclient/modules/mods/StatusEffects.java deleted file mode 100644 index 3d4a1e0..0000000 --- a/src/main/java/org/saturnclient/modules/mods/StatusEffects.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.saturnclient.modules.mods; - -import java.util.Arrays; - -import org.saturnclient.modules.HudMod; -import org.saturnclient.modules.ModDimensions; -import org.saturnclient.modules.Module; -import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.RenderScope; - -import net.minecraft.client.resource.language.I18n; -import net.minecraft.client.texture.Sprite; -import net.minecraft.client.texture.StatusEffectSpriteManager; -import net.minecraft.entity.effect.StatusEffect; -import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.registry.Registries; -import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; - -public class StatusEffects extends Module implements HudMod { - public static Property enabled = Property.bool(false); - private static ModDimensions dimensions = new ModDimensions(60, 0); - - private final StatusEffectInstance[] dummyEffects = { - new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("speed")).get(), 12000, 2), - new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("strength")).get(), 12000, 2), - new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("fire_resistance")).get(), 12000, 2), - }; - - public StatusEffects() { - super(new ModuleDetails("Status effects", "effect") - .description("Displays status effects") - .version("v0.1.0") - .tags("Utility"), - - enabled.named("Enabled"), - dimensions.prop()); - } - - private void renderEffects(RenderScope scope, Iterable effects) { - int row = 0; - - StatusEffectSpriteManager statusEffectSpriteManager = SaturnClient.client.getStatusEffectSpriteManager(); - - for (StatusEffectInstance effect : effects) { - if (effect.shouldShowIcon()) { - RegistryEntry registryEntry = effect.getEffectType(); - Sprite sprite = statusEffectSpriteManager.getSprite(registryEntry); - scope.drawSpriteStretched(sprite, 0, 18 * row, 16, 16); - scope.drawText(0.5f, getDurationAsString(effect), 18, 18 * row + 3, dimensions.font.value, -1); - row++; - } - } - - dimensions.height = 18 * row; - } - - @Override - public void renderHud(RenderScope scope) { - renderEffects(scope, SaturnClient.client.player.getStatusEffects()); - } - - @Override - public void renderDummy(RenderScope scope) { - renderEffects(scope, Arrays.asList(dummyEffects)); - } - - // This code was from: https://github.com/magicus/statuseffecttimer/blob/master/src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java - private String getDurationAsString(StatusEffectInstance statusEffectInstance) { - if (statusEffectInstance.isInfinite()) { - return I18n.translate("effect.duration.infinite"); - } - - int ticks = MathHelper.floor((float) statusEffectInstance.getDuration()); - int totalSeconds = ticks / 20; - - if (totalSeconds >= 3600) { - return totalSeconds / 3600 + "h"; - } else if (totalSeconds >= 60) { - int minutes = totalSeconds / 60; - int seconds = totalSeconds % 60; - return String.format("%d:%02d", minutes, seconds); - } else { - return String.valueOf(totalSeconds) + "s"; - } - } - - @Override - public ModDimensions getDimensions() { - return dimensions; - } - - @Override - public boolean isEnabled() { - return enabled.value; - } - - @Override - public void onEnabled(boolean e) { - enabled.value = e; - } -} diff --git a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java deleted file mode 100644 index ba767c9..0000000 --- a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.saturnclient.saturnclient; - -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; -import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.util.math.MatrixStack; - -import org.saturnclient.cosmetics.Emotes; -import org.saturnclient.cosmetics.cloak.Cloaks; -import org.saturnclient.cosmetics.hat.Hats; -import org.saturnclient.modules.ModManager; -import org.saturnclient.saturnclient.client.ServiceClient; -import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.event.KeyInputHandler; -import org.saturnclient.saturnclient.mixin.DrawContextAccessor; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.screens.TitleMenu; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Main class for the Saturn Client mod. - */ -public class SaturnClient implements ModInitializer { - - public static final String MOD_ID = "saturnclient"; - public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); - public static MinecraftClient client; - - @Override - public void onInitialize() { - LOGGER.info("Initializing " + MOD_ID); - client = MinecraftClient.getInstance(); - Config.init(); - ModManager.init(); - - client.execute(() -> { - SaturnScreen.preload(client); - }); - - ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> ConfigManager.save()); - - ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> { - if (screen != null && !(screen instanceof TitleMenu)) { - if (screen instanceof SaturnScreen) { - ((SaturnScreen) screen).draw(new ImageTexture(Textures.LOGO_TEXT_BIG).dimensions(180, 18) - .position(screen.width - 180 - 20, screen.height - 18 - 20)); - } else { - ScreenEvents.afterRender(screen).register((screen1, context, mouseX, mouseY, tickDelta) -> { - RenderScope renderScope = new RenderScope(context.getMatrices(), - ((DrawContextAccessor) context).getVertexConsumers()); - - int width = context.getScaledWindowWidth(); - int height = context.getScaledWindowHeight(); - - float scaleX = (float) screen1.width / width; - float scaleY = (float) screen1.height / height; - - MatrixStack matrixStack = context.getMatrices(); - matrixStack.push(); - matrixStack.translate(width - 95, height - 14, 0); - matrixStack.scale(0.5f / scaleX, 0.5f / scaleY, 1.0f); - renderScope.drawTexture(Textures.LOGO_TEXT_BIG, 0, 0, 0, 0, 180, 18); - matrixStack.pop(); - }); - } - } - }); - - KeyInputHandler.register(); - Emotes.initialize(); - if (ServiceClient.authenticate()) { - Cloaks.initialize(); - Hats.initialize(); - LOGGER.info(MOD_ID + " initialization complete"); - } else { - LOGGER.error("Failed to authenticate with the server"); - } - } -} diff --git a/src/main/java/org/saturnclient/ui2/Utils.java b/src/main/java/org/saturnclient/ui2/Utils.java deleted file mode 100644 index 6e3efb2..0000000 --- a/src/main/java/org/saturnclient/ui2/Utils.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.saturnclient.ui2; - -import java.util.List; - -import org.lwjgl.glfw.GLFW; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.ui2.elements.Notification; -import org.saturnclient.ui2.elements.Notification.NotificationKind; - -public class Utils { - public static boolean isHovering(int mouseX, int mouseY, int elementWidth, int elementHeight, float elementScale) { - return mouseX >= 0 && - mouseX <= (elementWidth * elementScale) && - mouseY >= 0 && - mouseY <= (elementHeight * elementScale); - } - - public static char getCharFromKey(int keyCode, int modifiers) { - boolean shift = (modifiers & GLFW.GLFW_MOD_SHIFT) != 0; - - // A-Z - if (keyCode >= GLFW.GLFW_KEY_A && keyCode <= GLFW.GLFW_KEY_Z) { - return (char) (shift - ? 'A' + (keyCode - GLFW.GLFW_KEY_A) - : 'a' + (keyCode - GLFW.GLFW_KEY_A)); - } - - // 0-9 - if (keyCode >= GLFW.GLFW_KEY_0 && keyCode <= GLFW.GLFW_KEY_9) { - return shift - ? ")!@#$%^&*(".charAt(keyCode - GLFW.GLFW_KEY_0) - : (char) ('0' + (keyCode - GLFW.GLFW_KEY_0)); - } - - // Special characters - return switch (keyCode) { - case GLFW.GLFW_KEY_SPACE -> ' '; - case GLFW.GLFW_KEY_PERIOD -> shift ? '>' : '.'; - case GLFW.GLFW_KEY_COMMA -> shift ? '<' : ','; - case GLFW.GLFW_KEY_MINUS -> shift ? '_' : '-'; - case GLFW.GLFW_KEY_EQUAL -> shift ? '+' : '='; - case GLFW.GLFW_KEY_SEMICOLON -> shift ? ':' : ';'; - case GLFW.GLFW_KEY_APOSTROPHE -> shift ? '"' : '\''; - case GLFW.GLFW_KEY_SLASH -> shift ? '?' : '/'; - case GLFW.GLFW_KEY_BACKSLASH -> shift ? '|' : '\\'; - case GLFW.GLFW_KEY_LEFT_BRACKET -> shift ? '{' : '['; - case GLFW.GLFW_KEY_RIGHT_BRACKET -> shift ? '}' : ']'; - case GLFW.GLFW_KEY_GRAVE_ACCENT -> shift ? '~' : '`'; - default -> '\0'; - }; - } - - public static T getOrNull(List list, int index) { - return (index >= 0 && index < list.size()) ? list.get(index) : null; - } - - public static void notify(NotificationKind kind, String title, String toast) { - if (SaturnClient.client.currentScreen instanceof SaturnScreen) { - ((SaturnScreen) SaturnClient.client.currentScreen) - .draw(new Notification(SaturnClient.client.currentScreen.width, - SaturnClient.client.currentScreen.height, kind, - title, toast)); - } - } -} diff --git a/src/main/java/org/saturnclient/ui2/elements/ImageTexture.java b/src/main/java/org/saturnclient/ui2/elements/ImageTexture.java deleted file mode 100644 index 037ef31..0000000 --- a/src/main/java/org/saturnclient/ui2/elements/ImageTexture.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.saturnclient.ui2.elements; - -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.SvgTexture; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.util.Identifier; - -public class ImageTexture extends Element { - Identifier sprite; - - public ImageTexture(Identifier sprite) { - this.sprite = sprite; - } - - @Override - public void render(RenderScope renderScope, ElementContext ctx) { - if (sprite.toString().endsWith(".svg")) { - MinecraftClient client = MinecraftClient.getInstance(); - - // Get the actual window pixel dimensions for the image - int renderWidth = (int) (width * client.getWindow().getFramebufferWidth() / client.getWindow().getWidth()); - int renderHeight = (int) (height * client.getWindow().getFramebufferHeight() / client.getWindow().getHeight()); - - sprite = SvgTexture.getSvg(client, sprite, renderWidth * 2, renderHeight * 2); - } - - renderScope.drawTexture(sprite, 0, 0, 0, 0, width, height); - } -} diff --git a/src/main/java/org/saturnclient/ui2/resources/Textures.java b/src/main/java/org/saturnclient/ui2/resources/Textures.java deleted file mode 100644 index 35a238c..0000000 --- a/src/main/java/org/saturnclient/ui2/resources/Textures.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.saturnclient.ui2.resources; - -import net.minecraft.util.Identifier; - -public class Textures { - public static final Identifier CROSSHAIR_RANGE = Identifier.of("saturnclient", "textures/gui/hud/crosshair_range.png"); - public static final Identifier COSMETICS = Identifier.of("saturnclient", "textures/gui/components/cosmetics.png"); - public static final Identifier HUD_ICON = Identifier.of("saturnclient", "textures/gui/components/hud.png"); - public static final Identifier SEARCH = Identifier.of("saturnclient", "textures/gui/components/search.png"); - public static final Identifier CLOSE = Identifier.of("saturnclient", "textures/gui/components/close.png"); - public static final Identifier MODS_TAB = Identifier.of("saturnclient", "textures/gui/components/mods_tab.png"); - public static final Identifier SETTINGS = Identifier.of("saturnclient", "textures/gui/components/settings.png"); - public static final Identifier CLOAK = Identifier.of("saturnclient", "textures/gui/components/cloak.png"); - public static final Identifier HAT = Identifier.of("saturnclient", "textures/gui/components/hat.png"); - public static final Identifier RESET = Identifier.of("saturnclient", "textures/gui/components/reset.png"); - public static final Identifier TOGGLE_INDICATOR = Identifier.of("saturnclient", - "textures/gui/components/toggle_indicator.png"); - public static final Identifier LEFT = Identifier.of("saturnclient", "textures/gui/components/left.png"); - public static final Identifier RIGHT = Identifier.of("saturnclient", "textures/gui/components/right.png"); - public static final Identifier STORE = Identifier.of("saturnclient", "textures/gui/components/store.png"); - public static final Identifier COINS = Identifier.of("saturnclient", "textures/gui/components/coins.png"); - public static final Identifier SHIRT = Identifier.of("saturnclient", "textures/gui/components/shirt.png"); - public static final Identifier CIRCLE_X = Identifier.of("saturnclient", "textures/gui/components/circle_x.png"); - public static final Identifier INFO = Identifier.of("saturnclient", "textures/gui/components/info.png"); - public static final Identifier CHECK = Identifier.of("saturnclient", "textures/gui/components/check.png"); - - public static final Identifier LOGO = Identifier.of("saturnclient", "textures/logo/logo.png"); - public static final Identifier REALISTIC_LOGO = Identifier.of("saturnclient", "textures/logo/realistic.png"); - public static final Identifier LOGO_TEXT = Identifier.of("saturnclient", "textures/logo/text.png"); - public static final Identifier LOGO_TEXT_BIG = Identifier.of("saturnclient", "textures/logo/text_big.png"); - public static final Identifier SPLASH = Identifier.of("saturnclient", "textures/gui/splash.png"); - - // Widgets - public static final Identifier BUTTON_BORDER = Identifier.of("saturnclient", "button_border"); - public static final Identifier BUTTON = Identifier.of("saturnclient", "button"); - public static final Identifier BUTTON_OP = Identifier.of("saturnclient", "button_op"); - public static final Identifier SETTINGS_BG = Identifier.of("saturnclient", "settings_bg"); - public static final Identifier RECT = Identifier.of("saturnclient", "rect"); - public static final Identifier RECT_BORDER = Identifier.of("saturnclient", "rect_border"); - public static final Identifier MOD = Identifier.of("saturnclient", "textures/gui/components/mod.png"); - public static final Identifier MOD_BG = Identifier.of("saturnclient", "textures/gui/components/mod_bg.png"); - - public static Identifier getCloakPreview(String cloak) { - return Identifier.of("saturnclient", "textures/gui/cloak/" + (cloak.isEmpty() ? "none" : cloak) + ".png"); - } - - public static Identifier getHatPreview(String hat) { - return Identifier.of("saturnclient", "textures/gui/hat/" + (hat.isEmpty() ? "none" : hat) + ".png"); - } - - public static Identifier getEmotePreview(String emote) { - return Identifier.of("saturnclient", "textures/gui/emote/" + (emote == null ? "none" : emote) + ".png"); - } - - public static Identifier getModIcon(String modId) { - return Identifier.of("saturnclient", "textures/gui/mod/" + modId + ".svg"); - } - -} diff --git a/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java b/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java deleted file mode 100644 index 724407a..0000000 --- a/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.saturnclient.ui2.screens.cosmetics; - -import org.saturnclient.cosmetics.cloak.Cloaks; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.components.CosmeticPreview; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.components.SkinPreview; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.elements.TabMenu; -import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; - -public class CloakMenu extends SaturnScreen { - public CloakMenu() { - super("Cloaks Menu"); - } - - @Override - public void ui() { - int p = 10; - int g = 10; - - Scroll scroll = new Scroll(p); - - int row = 0; - int col = 0; - - SaturnPlayer player = SaturnPlayer.get(); - - AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu); - - if (player != null) { - for (String cloak : Cloaks.availableCloaks) { - - stagger.draw( - new CosmeticPreview( - cloak == player.cloak, - Textures.getCloakPreview(cloak), - () -> Cloaks.setCloak(cloak)) - .position((50 + g) * col, (111 + g) * row) - .animation(new SlideY(AnimationConfig.cosmeticsMenu, 14))); - - if (col == 5) { - col = 0; - row++; - } else { - col++; - } - } - } - - scroll.draw(stagger); - - int scrollWidth = 480 + 10 + (g * 2) + (p * 2); - - draw(scroll - .dimensions(scrollWidth, 350) - .center(width, height)); - - draw(new SkinPreview(-30.0f, false) - .scale(3.5f) - .position(scroll.x + (scrollWidth - 220), scroll.y + 40) - .animation(new Fade(500))); - - draw(new Sidebar(2, this::close) - .centerOffset(width, height, -(scrollWidth / 2 + 20), 0) - .animation(new Fade(400))); - - draw(new TabMenu(0, - new TabMenuComponent(Textures.CLOAK, () -> { - }), - new TabMenuComponent(Textures.HAT, () -> { - SaturnClient.client.setScreen(new HatMenu()); - })) - .centerOffset(width, height, 0, -195)); - } -} diff --git a/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java b/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java deleted file mode 100644 index 2978972..0000000 --- a/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.saturnclient.ui2.screens.store; - -import org.saturnclient.cosmetics.cloak.Cloaks; -import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.client.ServiceClient; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.components.CosmeticPreview; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.Notification.NotificationKind; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.elements.TabMenu; -import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; -import org.saturnclient.ui2.elements.Text; -import org.saturnclient.ui2.resources.Fonts; -import org.saturnclient.ui2.resources.Textures; - -import com.mojang.blaze3d.systems.RenderSystem; - -public class CloakStore extends SaturnScreen { - private long lastPurchaseTime = 0; - - public CloakStore() { - super("Cloak Store"); - } - - public CloakStore(long lastPurchaseTime) { - super("Cloak Store"); - this.lastPurchaseTime = lastPurchaseTime; - } - - @Override - public void ui() { - int p = 10; - int gx = 10; - int gy = 20; - - Scroll scroll = new Scroll(p); - - int row = 0; - int col = 0; - - SaturnPlayer player = SaturnPlayer.get(); - - AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu); - - if (player != null) { - for (String cloak : Cloaks.ALL_CLOAKS) { - if (!Cloaks.availableCloaks.contains(cloak)) { - - int x = (50 + gx) * col; - int y = (111 + gy) * row; - - stagger.draw( - new CosmeticPreview( - cloak == player.cloak, - Textures.getCloakPreview(cloak), - () -> handlePurchase(cloak)) - .position(x, y) - .animation(new SlideY(AnimationConfig.cosmeticsMenu, 16))); - - String t = "100"; - - stagger.draw( - new Text(t) - .position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 113) - .scale(0.5f) - .animation(new Fade(400))); - - stagger.draw( - new ImageTexture(Textures.COINS) - .dimensions(16, 16) - .position(x + Fonts.getWidth(t, Theme.FONT.value) - 1, y + 112) - .scale(0.5f) - .animation(new Fade(400))); - - if (col == 8) { - col = 0; - row++; - } else { - col++; - } - } - } - } - - scroll.draw(stagger); - - int scrollWidth = 480 + 40 + (gx * 2) + (p * 2); - - draw(scroll - .dimensions(scrollWidth, 350) - .centerOffset(width, height, 15, 0)); - - draw(new Sidebar(5, this::close) - .centerOffset(width, height, -((scrollWidth - 30) / 2 + 20), 0) - .animation(new Fade(400))); - - draw(new TabMenu(0, - new TabMenuComponent(Textures.CLOAK, () -> { - }), - new TabMenuComponent(Textures.HAT, () -> { - SaturnClient.client.setScreen(new HatStore()); - })) - .centerOffset(width, height, 0, -195)); - } - - private void handlePurchase(String cloak) { - long now = System.currentTimeMillis(); - - if (now - lastPurchaseTime >= 3000) { - Utils.notify(NotificationKind.Info, "Purchase processing", "Please wait"); - - ServiceClient.buyCloak(cloak); - lastPurchaseTime = now; - - new Thread(() -> { - try { - Thread.sleep(5000); - } catch (InterruptedException ignored) { - } - - RenderSystem.recordRenderCall(() -> { - SaturnClient.client.setScreen(new CloakStore(now)); - Utils.notify(NotificationKind.Success, - "Purchase complete", - "Congrats, enjoy your new cloak!"); - }); - }).start(); - - } else { - Utils.notify(NotificationKind.Error, - "Timeout error", - "Please wait 3 seconds"); - } - } -} diff --git a/versions/1.21.4/build.gradle b/versions/1.21.4/build.gradle new file mode 100644 index 0000000..bca2b04 --- /dev/null +++ b/versions/1.21.4/build.gradle @@ -0,0 +1,96 @@ +plugins { + id 'net.fabricmc.fabric-loom-remap' version "${loom_version}" + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +repositories { + maven { name = "KoSmX Maven"; url = 'https://maven.kosmx.dev/' } +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" + + // Player Animation Library + include modImplementation( + "dev.kosmx.player-anim:player-animation-lib-fabric:${project.player_anim}" + ) + + // Optional: BendyLib + // include modRuntimeOnly( + // "io.github.kosmx.bendy-lib:bendy-lib-fabric:${project.bendylib_version}" + // ) +} + +/* + * ================================================================ + * Resource Processing + * ================================================================ + * Injects version values into fabric.mod.json. + */ +processResources { + inputs.property "version", project.version + inputs.property "minecraft_version", project.minecraft_version + inputs.property "loader_version", project.loader_version + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand( + "version": project.version, + "minecraft_version": project.minecraft_version, + "loader_version": project.loader_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 { + inputs.property "archivesName", project.base.archivesName + + from("LICENSE") { + rename { "${it}_${inputs.properties.archivesName}"} + } +} + +// 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. + } +} \ No newline at end of file diff --git a/versions/1.21.4/gradle.properties b/versions/1.21.4/gradle.properties new file mode 100644 index 0000000..c13f6f6 --- /dev/null +++ b/versions/1.21.4/gradle.properties @@ -0,0 +1,23 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349 +org.gradle.configuration-cache=false + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.8 +loader_version=0.18.4 +loom_version=1.15-SNAPSHOT + +# Mod Properties +mod_version=1.0.0 +maven_group=org.saturnclient +archives_base_name=saturn-client + +# Dependencies +fabric_api_version=0.119.4+1.21.4 + +player_anim = 2.0.3+1.21.4 diff --git a/versions/1.21.4/settings.gradle b/versions/1.21.4/settings.gradle new file mode 100644 index 0000000..75c4d72 --- /dev/null +++ b/versions/1.21.4/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java similarity index 99% rename from src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java rename to versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java index a91ff29..fbdf18a 100644 --- a/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java @@ -2,8 +2,8 @@ package org.saturnclient.cosmetics.cloak; import java.util.Arrays; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.saturnclient.config.Config; +import org.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.config.Config; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.RenderLayer; diff --git a/src/main/java/org/saturnclient/cosmetics/cloak/Cloaks.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/Cloaks.java similarity index 98% rename from src/main/java/org/saturnclient/cosmetics/cloak/Cloaks.java rename to versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/Cloaks.java index ef54f85..8b9d3e5 100644 --- a/src/main/java/org/saturnclient/cosmetics/cloak/Cloaks.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/Cloaks.java @@ -2,8 +2,8 @@ package org.saturnclient.cosmetics.cloak; import net.minecraft.util.Identifier; -import org.saturnclient.saturnclient.client.ServiceClient; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.client.ServiceClient; +import org.saturnclient.client.player.SaturnPlayer; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/src/main/java/org/saturnclient/cosmetics/cloak/GifDecoder.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/GifDecoder.java similarity index 100% rename from src/main/java/org/saturnclient/cosmetics/cloak/GifDecoder.java rename to versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/GifDecoder.java diff --git a/src/main/java/org/saturnclient/cosmetics/cloak/utils/AnimatedCloakData.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/utils/AnimatedCloakData.java similarity index 100% rename from src/main/java/org/saturnclient/cosmetics/cloak/utils/AnimatedCloakData.java rename to versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/utils/AnimatedCloakData.java diff --git a/src/main/java/org/saturnclient/cosmetics/cloak/utils/IdentifierUtils.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/utils/IdentifierUtils.java similarity index 100% rename from src/main/java/org/saturnclient/cosmetics/cloak/utils/IdentifierUtils.java rename to versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/utils/IdentifierUtils.java diff --git a/src/main/java/org/saturnclient/cosmetics/cloak/utils/RandomUtils.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/utils/RandomUtils.java similarity index 100% rename from src/main/java/org/saturnclient/cosmetics/cloak/utils/RandomUtils.java rename to versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/utils/RandomUtils.java diff --git a/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java similarity index 95% rename from src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java rename to versions/1.21.4/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java index 98b536e..679b91a 100644 --- a/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/hat/HatFeatureRenderer.java @@ -1,8 +1,8 @@ package org.saturnclient.cosmetics.hat; +import org.saturnclient.client.player.SaturnPlayer; import org.saturnclient.cosmetics.obj.MtlLoader; import org.saturnclient.cosmetics.obj.ObjModel; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumerProvider; diff --git a/src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java similarity index 100% rename from src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java rename to versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/MtlLoader.java diff --git a/src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java similarity index 100% rename from src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java rename to versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/ObjModel.java diff --git a/src/main/java/org/saturnclient/cosmetics/obj/ObjRenderer.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/ObjRenderer.java similarity index 100% rename from src/main/java/org/saturnclient/cosmetics/obj/ObjRenderer.java rename to versions/1.21.4/src/main/java/org/saturnclient/cosmetics/obj/ObjRenderer.java diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/FabricModuleProvider.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/FabricModuleProvider.java new file mode 100644 index 0000000..cce02b0 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/FabricModuleProvider.java @@ -0,0 +1,37 @@ +package org.saturnclient.impl; + +import org.saturnclient.modules.Module; +import org.saturnclient.modules.ModManager.ModuleProvider; +import org.saturnclient.modules.mods.*; +import org.saturnclient.impl.modules.*; + +public class FabricModuleProvider implements ModuleProvider { + + public static final Module[] MODS = { + new ArmorDisplay(new ArmorDisplayFabric()), + new AutoSprint(new AutoSprintFabric()), + new Coordinates(new CoordinatesFabric()), + new Crosshair(new CrosshairFabric()), + new DayCounter(new DayCounterFabric()), + new Fps(new FpsFabric()), + new Freelook(new FreelookFabric()), + new HealthDisplay(new HealthDisplayFabric()), + new Keystrokes(new KeystrokesFabric()), + + new Clock(), + + new Fullbright(), + new Nametags(new NametagsFabric()), + new NoFog(), + new Ping(new PingFabric()), + new Speedometer(new SpeedometerFabric()), + new StatusEffects(new StatusEffectsFabric()), + new Tps(), + new Zoom() + }; + + @Override + public Module[] getMods() { + return MODS; + } +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/ui2/resources/Fonts.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/Fonts.java similarity index 84% rename from src/main/java/org/saturnclient/ui2/resources/Fonts.java rename to versions/1.21.4/src/main/java/org/saturnclient/impl/Fonts.java index 5233f45..4b7c388 100644 --- a/src/main/java/org/saturnclient/ui2/resources/Fonts.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/Fonts.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2.resources; +package org.saturnclient.impl; import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.text.Style; @@ -20,10 +20,15 @@ public class Fonts { return INTER_BOLD; } } - + public static Text setFont(String text, Identifier font) { return Text.literal(text).setStyle( - Style.EMPTY.withFont(font)); + Style.EMPTY.withFont(font)); + } + + public static Text setFont(String text, int font) { + return Text.literal(text).setStyle( + Style.EMPTY.withFont(getFont(font))); } public static int getWidth(String text, int font) { @@ -31,11 +36,7 @@ public class Fonts { for (String line : text.split("\n")) { w = Math.max(w, getWidth(line, getFont(font))); } - if (font == 0) { - return w * 2; - } else { - return w; - } + return w; } private static int getWidth(String text, Identifier font) { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java new file mode 100644 index 0000000..f85cd78 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/SaturnClientProvider.java @@ -0,0 +1,80 @@ +package org.saturnclient.impl; + +import java.awt.image.BufferedImage; + +import org.lwjgl.glfw.GLFW; +import org.saturnclient.common.minecraft.IMinecraftClient; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.cosmetics.cloak.utils.IdentifierUtils; +import org.saturnclient.saturnclient.SaturnClient; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.screens.TitleMenu; + +import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; +import net.minecraft.client.gui.screen.option.OptionsScreen; +import net.minecraft.client.gui.screen.world.SelectWorldScreen; +import net.minecraft.util.Identifier; + +public class SaturnClientProvider extends MinecraftProvider { + @Override + public IMinecraftClient getClient() { + return (IMinecraftClient) SaturnClient.client; + } + + @Override + public Object createIdentifier(String namespace, String path) { + return Identifier.of(namespace, path); + } + + @Override + public boolean isKeyPressed(int key) { + return GLFW.glfwGetKey(SaturnClient.client.getWindow().getHandle(), key) == GLFW.GLFW_PRESS + && SaturnClient.client.currentScreen == null; + } + + @Override + public int getWidth(String text, int font) { + return Fonts.getWidth(text, font); + } + + @Override + public void registerBufferedImageTexture(SaturnIdentifier i, BufferedImage bi) { + IdentifierUtils.registerBufferedImageTextureFast((Identifier) i.inner, bi); + } + + @Override + public String getKeyName(int key) { + return GLFW.glfwGetKeyName(key, GLFW.glfwGetKeyScancode(key)); + } + + @Override + public void setScreen(SaturnScreen screen) { + SaturnClient.client.setScreen(new SaturnScreenFabric(screen)); + } + + @Override + public void setScreen(MinecraftScreen screen) { + SaturnScreenFabric exitTarget = new SaturnScreenFabric(new TitleMenu()); + + switch (screen) { + case SelectWorld: + SaturnClient.client.setScreen(new SelectWorldScreen(exitTarget)); + break; + + case Multiplayer: + SaturnClient.client.setScreen(new MultiplayerScreen(exitTarget)); + break; + + case Options: + SaturnClient.client.setScreen(new OptionsScreen(exitTarget, SaturnClient.client.options)); + break; + } + } + + @Override + public void stop() { + SaturnClient.client.scheduleStop(); + } +} diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java new file mode 100644 index 0000000..b7a0539 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MatrixStackMixin.java @@ -0,0 +1,59 @@ +package org.saturnclient.impl.mixins; + +import org.joml.Quaternionf; +import org.saturnclient.common.minecraft.bindings.SaturnQuaternionf; +import org.saturnclient.common.minecraft.render.IMatrixStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.gen.Invoker; + +import net.minecraft.client.util.math.MatrixStack; + +@Mixin(MatrixStack.class) +public abstract class MatrixStackMixin implements IMatrixStack { + + @Shadow + public abstract void translate(double x, double y, double z); + + @Shadow + public abstract void translate(float x, float y, float z); + + @Shadow + public abstract void scale(float x, float y, float z); + + @Shadow + public abstract void multiply(Quaternionf quaternion); + + @Shadow + public abstract void multiply(Quaternionf quaternion, float originX, float originY, float originZ); + + @Shadow + public abstract void push(); + + @Shadow + public abstract void pop(); + + @Invoker("peek") + public abstract MatrixStack.Entry peekM(); + + @Shadow + public abstract boolean isEmpty(); + + @Shadow + public abstract void loadIdentity(); + + @Override + public void multiply(SaturnQuaternionf quaternion) { + this.multiply((Quaternionf) quaternion.inner); + } + + @Override + public void multiply(SaturnQuaternionf quaternion, float originX, float originY, float originZ) { + this.multiply((Quaternionf) quaternion.inner, originX, originY, originZ); + } + + @Override + public Object peek() { + return this.peekM(); + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java new file mode 100644 index 0000000..fa5d029 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java @@ -0,0 +1,46 @@ +package org.saturnclient.impl.mixins; + +import java.io.File; +import java.io.InputStream; + +import org.saturnclient.common.minecraft.IMinecraftClient; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.minecraft.render.IWindow; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.util.Window; +import net.minecraft.resource.ReloadableResourceManagerImpl; +import net.minecraft.util.Identifier; + +@Mixin(MinecraftClient.class) +public class MinecraftClientMixin implements IMinecraftClient { + @Shadow + public File runDirectory; + + @Shadow + private Window window; + + @Shadow + public ReloadableResourceManagerImpl resourceManager; + + @Override + public File getRunDirectory() { + return runDirectory; + } + + @Override + public InputStream getResource(SaturnIdentifier identifier) { + try { + return resourceManager.getResource((Identifier) identifier.inner).get().getInputStream(); + } catch (Exception e) { + return null; + } + } + + @Override + public IWindow getWindow() { + return (IWindow) (Object) this.window; + } +} diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java new file mode 100644 index 0000000..d757b39 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/mixins/WindowMixin.java @@ -0,0 +1,22 @@ +package org.saturnclient.impl.mixins; + +import org.saturnclient.common.minecraft.render.IWindow; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +import net.minecraft.client.util.Window; + +@Mixin(Window.class) +public abstract class WindowMixin implements IWindow { + @Shadow + public abstract int getWidth(); + + @Shadow + public abstract int getHeight(); + + @Shadow + public abstract int getFramebufferWidth(); + + @Shadow + public abstract int getFramebufferHeight(); +} diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java new file mode 100644 index 0000000..4e821c6 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/ArmorDisplayFabric.java @@ -0,0 +1,83 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.common.minecraft.bindings.SaturnItemStack; +import org.saturnclient.modules.interfaces.ArmorDisplayInterface; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; + +public class ArmorDisplayFabric implements ArmorDisplayInterface { + + private ItemStack get(EquipmentSlot slot) { + return MinecraftClient.getInstance().player.getEquippedStack(slot); + } + + @Override + public SaturnItemStack getMainHand() { + return new SaturnItemStack(get(EquipmentSlot.MAINHAND)); + } + + @Override + public SaturnItemStack getHelmet() { + return new SaturnItemStack(get(EquipmentSlot.HEAD)); + } + + @Override + public SaturnItemStack getChestplate() { + return new SaturnItemStack(get(EquipmentSlot.CHEST)); + } + + @Override + public SaturnItemStack getLeggings() { + return new SaturnItemStack(get(EquipmentSlot.LEGS)); + } + + @Override + public SaturnItemStack getBoots() { + return new SaturnItemStack(get(EquipmentSlot.FEET)); + } + + @Override + public boolean isEmpty(SaturnItemStack stack) { + return ((ItemStack) stack.get()).isEmpty(); + } + + @Override + public int getMaxDamage(SaturnItemStack stack) { + return ((ItemStack) stack.get()).getMaxDamage(); + } + + @Override + public int getDamage(SaturnItemStack stack) { + return ((ItemStack) stack.get()).getDamage(); + } + + // Dummy items + + @Override + public SaturnItemStack getDummyMainHand() { + return new SaturnItemStack(new ItemStack(Items.DIAMOND_SWORD)); + } + + @Override + public SaturnItemStack getDummyHelmet() { + return new SaturnItemStack(new ItemStack(Items.DIAMOND_HELMET)); + } + + @Override + public SaturnItemStack getDummyChestplate() { + return new SaturnItemStack(new ItemStack(Items.DIAMOND_CHESTPLATE)); + } + + @Override + public SaturnItemStack getDummyLeggings() { + return new SaturnItemStack(new ItemStack(Items.DIAMOND_LEGGINGS)); + } + + @Override + public SaturnItemStack getDummyBoots() { + return new SaturnItemStack(new ItemStack(Items.DIAMOND_BOOTS)); + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/AutoSprintFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/AutoSprintFabric.java new file mode 100644 index 0000000..2b552fe --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/AutoSprintFabric.java @@ -0,0 +1,50 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.interfaces.AutoSprintInterface; + +import net.minecraft.client.MinecraftClient; + +public class AutoSprintFabric implements AutoSprintInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public boolean hasPlayer() { + return mc.player != null; + } + + @Override + public boolean hasNetwork() { + return mc.getNetworkHandler() != null; + } + + @Override + public boolean isForwardPressed() { + return mc.options.forwardKey.isPressed(); + } + + @Override + public boolean isBackPressed() { + return mc.options.backKey.isPressed(); + } + + @Override + public boolean isSneaking() { + return mc.player.isSneaking(); + } + + @Override + public boolean hasHorizontalCollision() { + return mc.player.horizontalCollision; + } + + @Override + public boolean isUsingItem() { + return mc.player.isUsingItem(); + } + + @Override + public void setSprinting(boolean sprinting) { + mc.player.setSprinting(sprinting); + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CoordinatesFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CoordinatesFabric.java new file mode 100644 index 0000000..e80e3f6 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CoordinatesFabric.java @@ -0,0 +1,29 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.interfaces.CoordinatesInterface; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.util.math.Vec3d; + +public class CoordinatesFabric implements CoordinatesInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public int getPlayerX() { + Vec3d pos = mc.player.getPos(); + return (int) pos.x; + } + + @Override + public int getPlayerY() { + Vec3d pos = mc.player.getPos(); + return (int) pos.y; + } + + @Override + public int getPlayerZ() { + Vec3d pos = mc.player.getPos(); + return (int) pos.z; + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CrosshairFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CrosshairFabric.java new file mode 100644 index 0000000..c900365 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/CrosshairFabric.java @@ -0,0 +1,19 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.interfaces.CrosshairInterface; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.entity.Entity; + +public class CrosshairFabric implements CrosshairInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public boolean isTargetingLivingEntity() { + + Entity entity = mc.targetedEntity; + + return entity != null && entity.isAlive(); + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/DayCounterFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/DayCounterFabric.java new file mode 100644 index 0000000..d0eb046 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/DayCounterFabric.java @@ -0,0 +1,19 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.interfaces.DayCounterInterface; + +import net.minecraft.client.MinecraftClient; + +public class DayCounterFabric implements DayCounterInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public long getDay() { + if (mc.world == null) { + return 0; + } + + return mc.world.getTimeOfDay() / 24000L; + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FpsFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FpsFabric.java new file mode 100644 index 0000000..c051b6d --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FpsFabric.java @@ -0,0 +1,15 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.interfaces.FpsInterface; + +import net.minecraft.client.MinecraftClient; + +public class FpsFabric implements FpsInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public int getFps() { + return mc.getCurrentFps(); + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FreelookFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FreelookFabric.java new file mode 100644 index 0000000..2298d93 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/FreelookFabric.java @@ -0,0 +1,27 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.interfaces.FreelookInterface; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.option.Perspective; + +public class FreelookFabric implements FreelookInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public boolean isFirstPerson() { + return mc.options.getPerspective() == Perspective.FIRST_PERSON; + } + + @Override + public void setFirstPerson() { + mc.options.setPerspective(Perspective.FIRST_PERSON); + } + + @Override + public void setThirdPersonBack() { + mc.options.setPerspective(Perspective.THIRD_PERSON_BACK); + } + +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/HealthDisplayFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/HealthDisplayFabric.java new file mode 100644 index 0000000..2f4ba34 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/HealthDisplayFabric.java @@ -0,0 +1,20 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.interfaces.HealthDisplayInterface; + +import net.minecraft.client.MinecraftClient; + +public class HealthDisplayFabric implements HealthDisplayInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public float getPlayerHealth() { + if (mc.player == null) { + return 0f; + } + + return mc.player.getHealth(); + } + +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/KeystrokesFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/KeystrokesFabric.java new file mode 100644 index 0000000..ac0e8fa --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/KeystrokesFabric.java @@ -0,0 +1,45 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.interfaces.KeystrokesInterface; + +import net.minecraft.client.MinecraftClient; + +public class KeystrokesFabric implements KeystrokesInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public boolean isForwardPressed() { + return mc.options.forwardKey.isPressed(); + } + + @Override + public boolean isBackPressed() { + return mc.options.backKey.isPressed(); + } + + @Override + public boolean isLeftPressed() { + return mc.options.leftKey.isPressed(); + } + + @Override + public boolean isRightPressed() { + return mc.options.rightKey.isPressed(); + } + + @Override + public boolean isJumpPressed() { + return mc.options.jumpKey.isPressed(); + } + + @Override + public boolean isAttackPressed() { + return mc.options.attackKey.isPressed(); + } + + @Override + public boolean isUsePressed() { + return mc.options.useKey.isPressed(); + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/NametagsFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/NametagsFabric.java new file mode 100644 index 0000000..c59f0a1 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/NametagsFabric.java @@ -0,0 +1,49 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.HealthRenderState; +import org.saturnclient.modules.interfaces.NametagsInterface; + +import net.minecraft.client.render.entity.state.LivingEntityRenderState; +import net.minecraft.text.Text; + +public class NametagsFabric implements NametagsInterface { + + public static class EntityStateImpl implements EntityState { + + private final LivingEntityRenderState state; + + public EntityStateImpl(LivingEntityRenderState state) { + this.state = state; + } + + @Override + public String getCustomName() { + Text name = state.customName; + return name != null ? name.getString() : null; + } + + @Override + public float getHealth() { + if (!(state instanceof HealthRenderState hrs)) + return 0.0f; + + return hrs.saturn$getHealth(); + } + + @Override + public float getMaxHealth() { + if (!(state instanceof HealthRenderState hrs)) + return 0.0f; + + return hrs.saturn$getMaxHealth(); + } + + @Override + public EntityType getEntityType() { + if (!(state instanceof HealthRenderState hrs)) + return null; + + return hrs.saturn$getEntityType(); + } + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/PingFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/PingFabric.java new file mode 100644 index 0000000..e7e40d3 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/PingFabric.java @@ -0,0 +1,19 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.interfaces.PingInterface; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.network.ClientPlayNetworkHandler; + +public class PingFabric implements PingInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public int getPing() { + if (mc.player == null || mc.getNetworkHandler() == null) return 0; + ClientPlayNetworkHandler handler = mc.getNetworkHandler(); + if (handler.getPlayerListEntry(mc.player.getUuid()) == null) return 0; + return handler.getPlayerListEntry(mc.player.getUuid()).getLatency(); + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/SpeedometerFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/SpeedometerFabric.java new file mode 100644 index 0000000..8b5f271 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/SpeedometerFabric.java @@ -0,0 +1,23 @@ +package org.saturnclient.impl.modules; + +import org.saturnclient.modules.interfaces.SpeedometerInterface; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.entity.Entity; + +public class SpeedometerFabric implements SpeedometerInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public Velocity getVelocity() { + Entity entity = mc.player.getVehicle() != null ? mc.player.getVehicle() : mc.player; + return new Velocity(entity.getVelocity().x, entity.getVelocity().y, entity.getVelocity().z); + } + + @Override + public boolean isOnGround() { + Entity entity = mc.player.getVehicle() != null ? mc.player.getVehicle() : mc.player; + return entity.isOnGround(); + } +} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java new file mode 100644 index 0000000..0c133ec --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/impl/modules/StatusEffectsFabric.java @@ -0,0 +1,38 @@ +package org.saturnclient.impl.modules; + +import java.util.List; +import java.util.stream.Collectors; +import java.util.Arrays; + +import org.saturnclient.modules.interfaces.StatusEffectsInterface; +import org.saturnclient.common.minecraft.bindings.SaturnSprite; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.texture.StatusEffectSpriteManager; +import net.minecraft.entity.effect.StatusEffectInstance; + +public class StatusEffectsFabric implements StatusEffectsInterface { + + private final MinecraftClient mc = MinecraftClient.getInstance(); + + @Override + public List getActiveEffects() { + StatusEffectSpriteManager manager = mc.getStatusEffectSpriteManager(); + return mc.player.getStatusEffects().stream() + .filter(StatusEffectInstance::shouldShowIcon) + .map(se -> new Effect( + new SaturnSprite(manager.getSprite(se.getEffectType())), + se.getDuration() / 20, + se.isInfinite(), + se.shouldShowIcon(), + "Infinite")) + .collect(Collectors.toList()); + } + + @Override + public List getDummyEffects() { + return Arrays.asList( + new Effect(new SaturnSprite(null), 600, false, true, "Infinite"), + new Effect(new SaturnSprite(null), 600, false, true, "Infinite")); + } +} \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/utils/CameraOverriddenEntity.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/CameraOverriddenEntity.java similarity index 81% rename from src/main/java/org/saturnclient/modules/mods/utils/CameraOverriddenEntity.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/CameraOverriddenEntity.java index 169608f..cefd982 100644 --- a/src/main/java/org/saturnclient/modules/mods/utils/CameraOverriddenEntity.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/CameraOverriddenEntity.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.utils; +package org.saturnclient.modules; public interface CameraOverriddenEntity { float freelook$getCameraPitch(); diff --git a/src/main/java/org/saturnclient/modules/mods/utils/HealthRenderState.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/HealthRenderState.java similarity index 68% rename from src/main/java/org/saturnclient/modules/mods/utils/HealthRenderState.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/HealthRenderState.java index 4853754..4d77e99 100644 --- a/src/main/java/org/saturnclient/modules/mods/utils/HealthRenderState.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/HealthRenderState.java @@ -1,14 +1,15 @@ -package org.saturnclient.modules.mods.utils; +package org.saturnclient.modules; + +import org.saturnclient.modules.interfaces.NametagsInterface.EntityType; public interface HealthRenderState { float saturn$getHealth(); + float saturn$getMaxHealth(); + void saturn$setHealth(float health, float maxHealth); EntityType saturn$getEntityType(); - void saturn$setEntityType(EntityType type); - enum EntityType { - PLAYER, HOSTILE, PASSIVE, OTHER - } + void saturn$setEntityType(EntityType type); } diff --git a/src/main/java/org/saturnclient/modules/mods/mixins/BackgroundRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/BackgroundRendererMixin.java similarity index 95% rename from src/main/java/org/saturnclient/modules/mods/mixins/BackgroundRendererMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/BackgroundRendererMixin.java index b34bf23..3526ef5 100644 --- a/src/main/java/org/saturnclient/modules/mods/mixins/BackgroundRendererMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/BackgroundRendererMixin.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.render.BackgroundRenderer; diff --git a/src/main/java/org/saturnclient/modules/mods/mixins/CameraMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/CameraMixin.java similarity index 94% rename from src/main/java/org/saturnclient/modules/mods/mixins/CameraMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/CameraMixin.java index 7c2cabc..4da24e8 100644 --- a/src/main/java/org/saturnclient/modules/mods/mixins/CameraMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/CameraMixin.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; @@ -6,8 +6,8 @@ import net.minecraft.client.render.Camera; import net.minecraft.entity.Entity; import net.minecraft.world.BlockView; +import org.saturnclient.modules.CameraOverriddenEntity; import org.saturnclient.modules.mods.Freelook; -import org.saturnclient.modules.mods.utils.CameraOverriddenEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; diff --git a/src/main/java/org/saturnclient/modules/mods/mixins/EntityMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/EntityMixin.java similarity index 93% rename from src/main/java/org/saturnclient/modules/mods/mixins/EntityMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/EntityMixin.java index 8442b43..6ad53c0 100644 --- a/src/main/java/org/saturnclient/modules/mods/mixins/EntityMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/EntityMixin.java @@ -1,12 +1,12 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; +import org.saturnclient.modules.CameraOverriddenEntity; import org.saturnclient.modules.mods.Freelook; -import org.saturnclient.modules.mods.utils.CameraOverriddenEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/org/saturnclient/modules/mods/mixins/GameRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/GameRendererMixin.java similarity index 94% rename from src/main/java/org/saturnclient/modules/mods/mixins/GameRendererMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/GameRendererMixin.java index 2518f06..d0d3262 100644 --- a/src/main/java/org/saturnclient/modules/mods/mixins/GameRendererMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/GameRendererMixin.java @@ -1,4 +1,4 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/org/saturnclient/modules/mods/mixins/LightmapTextureManagerMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LightmapTextureManagerMixin.java similarity index 94% rename from src/main/java/org/saturnclient/modules/mods/mixins/LightmapTextureManagerMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LightmapTextureManagerMixin.java index 34289f6..cc4cfaa 100644 --- a/src/main/java/org/saturnclient/modules/mods/mixins/LightmapTextureManagerMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LightmapTextureManagerMixin.java @@ -1,5 +1,5 @@ // code modified from Gamma utils: https://github.com/Sjouwer/gamma-utils -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import net.minecraft.client.render.LightmapTextureManager; diff --git a/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRenderStateMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRenderStateMixin.java similarity index 58% rename from src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRenderStateMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRenderStateMixin.java index dacee20..4f0bd81 100644 --- a/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRenderStateMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRenderStateMixin.java @@ -1,17 +1,17 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.render.entity.state.LivingEntityRenderState; -import org.saturnclient.modules.mods.utils.HealthRenderState; +import org.saturnclient.modules.interfaces.NametagsInterface.EntityType; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @Mixin(LivingEntityRenderState.class) -public class LivingEntityRenderStateMixin implements org.saturnclient.modules.mods.utils.HealthRenderState { +public class LivingEntityRenderStateMixin implements org.saturnclient.modules.HealthRenderState { @Unique private float saturn$health = 0f; @Unique private float saturn$maxHealth = 1f; - @Unique private HealthRenderState.EntityType saturn$entityType = HealthRenderState.EntityType.OTHER; + @Unique private EntityType saturn$entityType = EntityType.OTHER; public float saturn$getHealth() { return saturn$health; } public float saturn$getMaxHealth() { return saturn$maxHealth; } @@ -20,7 +20,7 @@ public class LivingEntityRenderStateMixin implements org.saturnclient.modules.mo this.saturn$maxHealth = maxHealth; } - public HealthRenderState.EntityType saturn$getEntityType() { return saturn$entityType; } - public void saturn$setEntityType(HealthRenderState.EntityType type) { this.saturn$entityType = type; } + public EntityType saturn$getEntityType() { return saturn$entityType; } + public void saturn$setEntityType(EntityType type) { this.saturn$entityType = type; } } \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRendererMixin.java similarity index 70% rename from src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRendererMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRendererMixin.java index 34e5d1f..d2e560a 100644 --- a/src/main/java/org/saturnclient/modules/mods/mixins/LivingEntityRendererMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mixins/LivingEntityRendererMixin.java @@ -1,8 +1,11 @@ -package org.saturnclient.modules.mods.mixins; +package org.saturnclient.modules.mixins; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.client.render.entity.state.LivingEntityRenderState; -import org.saturnclient.modules.mods.utils.HealthRenderState; + +import org.saturnclient.modules.HealthRenderState; +import org.saturnclient.modules.interfaces.NametagsInterface.EntityType; + import net.minecraft.entity.LivingEntity; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.entity.passive.PassiveEntity; @@ -17,18 +20,19 @@ public abstract class LivingEntityRendererMixin { + SaturnScreenFabric.preload(client); + }); + + SaturnClientBindings.setPlatform(new SaturnPlatformBindingsImpl()); + SaturnClientBindings.setEmotes(new SaturnEmoteBindingsImpl()); + + ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> ConfigManager.save()); + + ClientTickEvents.END_CLIENT_TICK.register(client -> { + for (org.saturnclient.modules.Module m : ModManager.ENABLED_MODS) { + m.tick(); + } + }); + + KeyInputHandler.register(); + Emotes.initialize(); + if (ServiceClient.authenticate()) { + Cloaks.initialize(); + Hats.initialize(); + LOGGER.info(MOD_ID + " initialization complete"); + } else { + LOGGER.error("Failed to authenticate with the server"); + } + } +} diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnEmoteBindingsImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnEmoteBindingsImpl.java new file mode 100644 index 0000000..f987724 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnEmoteBindingsImpl.java @@ -0,0 +1,44 @@ +package org.saturnclient.saturnclient.bindings; + +import java.util.UUID; + +import org.saturnclient.common.minecraft.bindings.SaturnEmoteBindings; +import org.saturnclient.saturnclient.SaturnClient; + +import dev.kosmx.playerAnim.api.layered.AnimationStack; +import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; +import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationRegistry; +import net.minecraft.client.network.AbstractClientPlayerEntity; +import net.minecraft.util.Identifier; + +public class SaturnEmoteBindingsImpl implements SaturnEmoteBindings { + + @Override + public void setEmote(UUID fromPlayerUuid, String emoteIdOrNull) { + if (SaturnClient.client == null || SaturnClient.client.world == null) { + return; + } + + for (AbstractClientPlayerEntity player : SaturnClient.client.world.getPlayers()) { + if (!player.getUuid().equals(fromPlayerUuid)) { + continue; + } + + AnimationStack animationStack = PlayerAnimationAccess.getPlayerAnimLayer(player); + + if (emoteIdOrNull != null && !emoteIdOrNull.isEmpty()) { + if (animationStack.isActive() && animationStack.getPriority() == 1000) { + animationStack.removeLayer(1000); + } + animationStack.addAnimLayer(1000, + PlayerAnimationRegistry + .getAnimation(Identifier.of("saturnclient", emoteIdOrNull)) + .playAnimation()); + } else { + animationStack.removeLayer(1000); + } + + break; + } + } +} diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnPlatformBindingsImpl.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnPlatformBindingsImpl.java new file mode 100644 index 0000000..d7ae386 --- /dev/null +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnPlatformBindingsImpl.java @@ -0,0 +1,59 @@ +package org.saturnclient.saturnclient.bindings; + +import java.util.UUID; + +import org.saturnclient.common.minecraft.bindings.SaturnPlatformBindings; +import org.saturnclient.saturnclient.SaturnClient; + +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; +import net.minecraft.client.MinecraftClient; + +public class SaturnPlatformBindingsImpl implements SaturnPlatformBindings { + + @Override + public String getAccessToken() { + var session = MinecraftClient.getInstance().getSession(); + if (session == null) { + return null; + } + return session.getAccessToken(); + } + + @Override + public UUID getUuid() { + var session = MinecraftClient.getInstance().getSession(); + if (session == null) { + return null; + } + return session.getUuidOrNull(); + } + + @Override + public String getUsername() { + var session = MinecraftClient.getInstance().getSession(); + if (session == null) { + return null; + } + return session.getUsername(); + } + + @Override + public void onClientStopping(Runnable handler) { + ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> handler.run()); + } + + @Override + public void logInfo(String message) { + SaturnClient.LOGGER.info(message); + } + + @Override + public void logError(String message) { + SaturnClient.LOGGER.error(message); + } + + @Override + public void logError(String message, Throwable throwable) { + SaturnClient.LOGGER.error(message, throwable); + } +} diff --git a/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java similarity index 79% rename from src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java rename to versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java index 2a3e970..cedcede 100644 --- a/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java @@ -5,11 +5,12 @@ import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.config.Config; +import org.saturnclient.client.ServiceClient; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.client.ServiceClient; -import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.ui2.screens.EmoteWheel; -import org.saturnclient.ui2.screens.ShiftMenu; +import org.saturnclient.ui.screens.EmoteWheel; +import org.saturnclient.ui.screens.ShiftMenu; import dev.kosmx.playerAnim.api.layered.AnimationStack; import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; @@ -36,11 +37,12 @@ public class KeyInputHandler { // Register the event handler for the main menu key ClientTickEvents.END_CLIENT_TICK.register(client -> { if (mainMenuKeyBinding.wasPressed()) { - client.setScreen(new ShiftMenu()); + MinecraftProvider.PROVIDER.setScreen(new ShiftMenu()); } - if (Config.openEmoteWheel.wasKeyPressed() && client.currentScreen == null && !InputUtil.isKeyPressed(client.getWindow().getHandle(), GLFW.GLFW_KEY_F3)) { - client.setScreen(new EmoteWheel()); + if (Config.openEmoteWheel.wasKeyPressed() && client.currentScreen == null + && !InputUtil.isKeyPressed(client.getWindow().getHandle(), GLFW.GLFW_KEY_F3)) { + MinecraftProvider.PROVIDER.setScreen(new EmoteWheel()); } if (SaturnClient.client.player != null && SaturnClient.client.player.isSneaking()) { diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/DrawContextAccessor.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/DrawContextAccessor.java similarity index 100% rename from src/main/java/org/saturnclient/saturnclient/mixin/DrawContextAccessor.java rename to versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/DrawContextAccessor.java diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java similarity index 96% rename from src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java index 6cb2d0b..74b1f5f 100644 --- a/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java @@ -14,8 +14,8 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.math.Vec3d; -import org.saturnclient.saturnclient.client.player.Roles; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.client.player.Roles; +import org.saturnclient.client.player.SaturnPlayer; import java.util.UUID; diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java similarity index 100% rename from src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java similarity index 74% rename from src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java index e549083..01f2b84 100644 --- a/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java @@ -1,7 +1,8 @@ package org.saturnclient.saturnclient.mixin; -import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.ui2.screens.TitleMenu; +import org.saturnclient.config.Config; +import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.screens.TitleMenu; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; @@ -16,9 +17,9 @@ public class SetScreenMixin { private Screen replaceTitleScreen(Screen screen) { if (Config.saturnTitleScreen.value) { if (screen instanceof TitleScreen) - return new TitleMenu(); + return new SaturnScreenFabric(new TitleMenu()); if (screen == null && ((MinecraftClient) (Object) this).world == null) - return new TitleMenu(); + return new SaturnScreenFabric(new TitleMenu()); } return screen; diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java similarity index 94% rename from src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java index 912fa5c..4449442 100644 --- a/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java @@ -3,9 +3,10 @@ package org.saturnclient.saturnclient.mixin; import java.util.Optional; import java.util.function.Consumer; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.config.Theme; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.RenderScopeImpl; +import org.saturnclient.ui.resources.Textures; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; @@ -14,7 +15,6 @@ import org.spongepowered.asm.mixin.Final; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.SplashOverlay; -import net.minecraft.client.render.RenderLayer; import net.minecraft.resource.ResourceReload; import net.minecraft.util.Util; import net.minecraft.util.math.MathHelper; @@ -33,10 +33,12 @@ public abstract class SplashOverlayMixin { @Shadow private long reloadStartTime; - @Shadow @Final + @Shadow + @Final private boolean reloading; - @Shadow @Final + @Shadow + @Final private Consumer> exceptionHandler; @Shadow @@ -72,8 +74,7 @@ public abstract class SplashOverlayMixin { : -1f; // Get render scope for better UI - RenderScope scope = new RenderScope(context); - scope.setRenderLayer(RenderLayer::getGuiTextured); + RenderScope scope = new RenderScopeImpl(context); // Draw background overlay if (fadeOutProgress >= 1.0F) { diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java similarity index 90% rename from src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java rename to versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java index e830a3e..5dd00f6 100644 --- a/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java @@ -7,8 +7,8 @@ import net.minecraft.util.Formatting; import java.util.UUID; import org.jetbrains.annotations.Nullable; -import org.saturnclient.saturnclient.client.player.Roles; -import org.saturnclient.saturnclient.client.player.SaturnPlayer; +import org.saturnclient.client.player.Roles; +import org.saturnclient.client.player.SaturnPlayer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/WhoAmI.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/WhoAmI.java similarity index 100% rename from src/main/java/org/saturnclient/saturnclient/mixin/WhoAmI.java rename to versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/WhoAmI.java diff --git a/src/main/java/org/saturnclient/ui2/components/SkinPreview.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java similarity index 68% rename from src/main/java/org/saturnclient/ui2/components/SkinPreview.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java index 88407c0..ba8d0c1 100644 --- a/src/main/java/org/saturnclient/ui2/components/SkinPreview.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/EntityDrawerImpl.java @@ -1,27 +1,19 @@ -package org.saturnclient.ui2.components; +package org.saturnclient.ui; import org.jetbrains.annotations.Nullable; import org.joml.Quaternionf; import org.joml.Vector3f; +import org.saturnclient.common.minecraft.bindings.SaturnQuaternionf; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.components.SkinPreview.EntityDrawer; import net.minecraft.client.render.DiffuseLighting; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.entity.LivingEntity; -public class SkinPreview extends Element { - private boolean negativeAngle = false; - private float angle = 0.0f; - - public SkinPreview(float angle, boolean negativeAngle) { - this.angle = angle; - this.negativeAngle = negativeAngle; - } - - public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, int size, float f, float mouseX, +public class EntityDrawerImpl implements EntityDrawer { + public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, int size, float f, + float mouseX, float mouseY, LivingEntity entity, float angle, boolean negativeAngle) { float g = (float) (x1 + x2) / 2.0F; float h = (float) (y1 + y2) / 2.0F; @@ -57,31 +49,34 @@ public class SkinPreview extends Element { public static void drawEntity(RenderScope renderScope, float x, float y, float size, Vector3f vector3f, Quaternionf quaternionf, @Nullable Quaternionf quaternionf2, LivingEntity entity) { - renderScope.matrices.push(); - renderScope.matrices.translate((double) x, (double) y, 50.0); - renderScope.matrices.scale(size, size, -size); - renderScope.matrices.translate(vector3f.x, vector3f.y, vector3f.z); - renderScope.matrices.multiply(quaternionf); + renderScope.getMatrixStack().push(); + renderScope.getMatrixStack().translate((double) x, (double) y, 50.0); + renderScope.getMatrixStack().scale(size, size, -size); + renderScope.getMatrixStack().translate(vector3f.x, vector3f.y, vector3f.z); + renderScope.getMatrixStack().multiply(new SaturnQuaternionf(quaternionf)); renderScope.draw(); DiffuseLighting.method_34742(); EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher(); entityRenderDispatcher.setRenderShadows(false); - renderScope.draw((vertexConsumers) -> { - entityRenderDispatcher.render(entity, 0.0, 0.0, 0.0, 1.0F, renderScope.matrices, vertexConsumers, - 15728880); - }); + // TODO add the method draw with vertex consumers + // renderScope.draw((vertexConsumers) -> { + // entityRenderDispatcher.render(entity, 0.0, 0.0, 0.0, 1.0F, + // renderScope.getMatrixStack(), vertexConsumers, + // 15728880); + // }); renderScope.draw(); entityRenderDispatcher.setRenderShadows(true); - renderScope.matrices.pop(); + renderScope.getMatrixStack().pop(); DiffuseLighting.enableGuiDepthLighting(); } @Override - public void render(RenderScope renderScope, ElementContext ctx) { + public void render(RenderScope renderScope, boolean negativeAngle, float angle, float scale, ElementContext ctx) { LivingEntity entity = SaturnClient.client.player; if (entity != null) { - drawEntity(renderScope, 0, 0, 75, 78, 30, 0.0625F, ctx.mouseX / scale, ctx.mouseY / scale, entity, angle, negativeAngle); + drawEntity(renderScope, 0, 0, 75, 78, 30, 0.0625F, ctx.mouseX / scale, ctx.mouseY / scale, entity, angle, + negativeAngle); } } } diff --git a/src/main/java/org/saturnclient/ui2/RenderScope.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java similarity index 81% rename from src/main/java/org/saturnclient/ui2/RenderScope.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java index 1f846e6..b73d2c5 100644 --- a/src/main/java/org/saturnclient/ui2/RenderScope.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScopeImpl.java @@ -1,22 +1,25 @@ -package org.saturnclient.ui2; +package org.saturnclient.ui; import java.util.ArrayDeque; import java.util.Deque; import java.util.Objects; import java.util.function.Consumer; -import java.util.function.Function; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; -import org.saturnclient.ui2.resources.Fonts; -import org.saturnclient.ui2.resources.SvgTexture; import com.mojang.blaze3d.systems.RenderSystem; +import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.minecraft.bindings.SaturnItemStack; +import org.saturnclient.common.minecraft.bindings.SaturnSprite; +import org.saturnclient.common.minecraft.render.IMatrixStack; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.SvgTexture; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer.TextLayerType; import net.minecraft.client.gui.DrawContext; @@ -40,29 +43,35 @@ import net.minecraft.util.crash.CrashReportSection; import net.minecraft.util.math.RotationAxis; import net.minecraft.world.World; -public class RenderScope { +public class RenderScopeImpl implements RenderScope { public MatrixStack matrices; public VertexConsumerProvider.Immediate vertexConsumers; - // private Function renderLayers; private ScissorStack scissorStack = new ScissorStack(); private int opacity = 255 << 24; private final ItemRenderState itemRenderState; - public RenderScope(DrawContext context) { + public RenderScopeImpl(DrawContext context) { this(context.getMatrices(), ((DrawContextAccessor) context).getVertexConsumers()); } - public RenderScope(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers) { + public RenderScopeImpl(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers) { this.matrices = matrices; this.vertexConsumers = vertexConsumers; this.scissorStack = new ScissorStack(); this.itemRenderState = new ItemRenderState(); } + @Override + public IMatrixStack getMatrixStack() { + return (IMatrixStack) matrices; + } + + @Override public void setOpacity(float alpha) { this.opacity = (int) (alpha * 255) << 24; } + @Override public int getColor(int color) { int originalAlpha = (color >>> 24) & 0xFF; int newAlpha = (opacity >>> 24) & 0xFF; @@ -70,10 +79,7 @@ public class RenderScope { return (mixedAlpha << 24) | (color & 0x00FFFFFF); } - public void setRenderLayer(Function renderLayers) { - // this.renderLayers = renderLayers; - } - + @Override public void drawRect(int x, int y, int width, int height, int color) { if (color == 0) return; @@ -105,10 +111,12 @@ public class RenderScope { vertexConsumer.vertex(matrix4f, (float) x2, (float) y1, 0).color(color); } + @Override public void drawText(String text, int x, int y, int font, int color) { drawText(1.0f, text, x, y, font, color); } + @Override public void drawText(float scale, String text, int x, int y, int font, int color) { if (color == 0) return; @@ -122,7 +130,8 @@ public class RenderScope { matrices.translate(x, y + (i * Fonts.getHeight()), 0); matrices.scale(scale, scale, 1.0f); TextRenderer textRenderer = SaturnClient.client.textRenderer; - textRenderer.draw(Fonts.setFont(line, Fonts.getFont(font)), 0, font == 0 ? 1 : 7, color, false, + textRenderer.draw(org.saturnclient.impl.Fonts.setFont(line, font), 0, + font == 0 ? 1 : 7, color, false, this.matrices.peek().getPositionMatrix(), this.vertexConsumers, TextLayerType.NORMAL, 0, 15728880); matrices.pop(); @@ -173,6 +182,7 @@ public class RenderScope { this.matrices.pop(); } + @Override public void drawRoundedRectangle(int x, int y, int width, int height, int radius, int color) { if (color == 0) return; @@ -197,14 +207,44 @@ public class RenderScope { this.matrices.pop(); } + @Override public int getScaledWindowWidth() { return SaturnClient.client.getWindow().getScaledWidth(); } + @Override public int getScaledWindowHeight() { return SaturnClient.client.getWindow().getScaledHeight(); } + @Override + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, int color) { + this.drawTexture(sprite, x, y, u, v, width, height, width, height, width, height, color); + } + + @Override + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height) { + this.drawTexture(sprite, x, y, u, v, width, height, width, height, width, height); + } + + @Override + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, + int regionWith, + int regionHeight, int textureWidth, int textureHeight) { + this.drawTexture(sprite, x, y, u, v, width, height, regionWith, regionHeight, textureWidth, textureHeight, -1); + } + + @Override + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, + int regionWidth, + int regionHeight, int textureWidth, int textureHeight, int color) { + this.drawTexturedQuad((Identifier) sprite.inner, x, x + width, y, y + height, (u + 0.0F) / (float) textureWidth, + (u + (float) regionWidth) / (float) textureWidth, (v + 0.0F) / (float) textureHeight, + (v + (float) regionHeight) / (float) textureHeight, color); + } + + /* Minecraft sprites */ + public void drawTexture(Identifier sprite, int x, int y, float u, float v, int width, int height, int color) { this.drawTexture(sprite, x, y, u, v, width, height, width, height, width, height, color); } @@ -229,7 +269,9 @@ public class RenderScope { float v2, int color) { if (sprite.toString().endsWith(".svg")) { - sprite = SvgTexture.getSvg(MinecraftClient.getInstance(), sprite, (x2 - x1) * 2, (y2 - y1) * 2); + sprite = (Identifier) SvgTexture.getSvg(MinecraftProvider.PROVIDER.getClient(), + new SaturnIdentifier(sprite), + (x2 - x1) * 2, (y2 - y1) * 2).inner; } if (color == 0) @@ -253,16 +295,19 @@ public class RenderScope { matrices.pop(); } + @Override public void enableScissor(int x1, int y1, int x2, int y2) { ScreenRect screenRect = (new ScreenRect(x1, y1, x2 - x1, y2 - y1)) .transform(this.matrices.peek().getPositionMatrix()); this.setScissor(this.scissorStack.push(screenRect)); } + @Override public void disableScissor() { this.setScissor(this.scissorStack.pop()); } + @Override public boolean scissorContains(int x, int y) { return this.scissorStack.containsPoint(x, y); } @@ -284,6 +329,7 @@ public class RenderScope { } + @Override public void draw() { this.vertexConsumers.draw(); } @@ -324,33 +370,34 @@ public class RenderScope { } } - public void drawItem(ItemStack item, int x, int y) { + @Override + public void drawItem(SaturnItemStack item, int x, int y) { this.drawItem(SaturnClient.client.player, SaturnClient.client.world, item, x, y, 0); } - public void drawItem(ItemStack stack, int x, int y, int seed) { + @Override + public void drawItem(SaturnItemStack stack, int x, int y, int seed) { this.drawItem(SaturnClient.client.player, SaturnClient.client.world, stack, x, y, seed); } - public void drawItem(ItemStack stack, int x, int y, int seed, int z) { - this.drawItem(SaturnClient.client.player, SaturnClient.client.world, stack, x, y, seed, z); + @Override + public void drawItem(SaturnItemStack stack, int x, int y, int seed, int z) { + this.drawItem(SaturnClient.client.player, SaturnClient.client.world, (ItemStack) stack.inner, x, y, seed, z); } - public void drawItemWithoutEntity(ItemStack stack, int x, int y) { + @Override + public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y) { this.drawItemWithoutEntity(stack, x, y, 0); } - public void drawItemWithoutEntity(ItemStack stack, int x, int y, int seed) { + @Override + public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y, int seed) { this.drawItem((LivingEntity) null, SaturnClient.client.world, stack, x, y, seed); } - public void drawItem(LivingEntity entity, ItemStack stack, int x, int y, int seed) { - this.drawItem(entity, entity.getWorld(), stack, x, y, seed); - } - - private void drawItem(@Nullable LivingEntity entity, @Nullable World world, ItemStack stack, int x, int y, + private void drawItem(@Nullable LivingEntity entity, @Nullable World world, SaturnItemStack stack, int x, int y, int seed) { - this.drawItem(entity, world, stack, x, y, seed, 0); + this.drawItem(entity, world, (ItemStack) stack.inner, x, y, seed, 0); } private void drawItem(@Nullable LivingEntity entity, @Nullable World world, ItemStack stack, int x, int y, int seed, @@ -394,11 +441,14 @@ public class RenderScope { } } - public void drawSpriteStretched(Sprite sprite, int x, int y, int width, int height) { + @Override + public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height) { this.drawSpriteStretched(sprite, x, y, width, height, -1); } - public void drawSpriteStretched(Sprite sprite, int x, int y, int width, int height, int color) { + @Override + public void drawSpriteStretched(SaturnSprite saturnSprite, int x, int y, int width, int height, int color) { + Sprite sprite = (Sprite) saturnSprite.inner; if (color == 0) return; if (width != 0 && height != 0) { diff --git a/src/main/java/org/saturnclient/ui2/SaturnScreen.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreenFabric.java similarity index 58% rename from src/main/java/org/saturnclient/ui2/SaturnScreen.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreenFabric.java index 29651de..2afca4c 100644 --- a/src/main/java/org/saturnclient/ui2/SaturnScreen.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreenFabric.java @@ -1,12 +1,10 @@ -package org.saturnclient.ui2; +package org.saturnclient.ui; import java.time.Duration; import java.time.Instant; -import java.util.ArrayList; -import java.util.List; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; -import org.saturnclient.ui2.components.ElementRenderer; +import org.saturnclient.ui.SaturnScreen.ScreenProvider; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gl.PostEffectProcessor; @@ -21,13 +19,7 @@ import net.minecraft.client.util.Pool; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -public abstract class SaturnScreen extends Screen { - private final Pool pool = new Pool(3); - protected List elements = new ArrayList<>(); - protected float backgroundOpacity = 1.0f; - protected Instant start = null; - public int backgroundBlur = 10; - +public class SaturnScreenFabric extends Screen implements ScreenProvider { protected static final Identifier PANORAMA = Identifier.of("saturnclient", "textures/gui/title/background/panorama"); protected static final CubeMapRenderer PANORAMA_RENDERER = new CubeMapRenderer(PANORAMA); @@ -38,6 +30,9 @@ public abstract class SaturnScreen extends Screen { ROTATING_PANORAMA_RENDERER = new RotatingCubeMapRenderer(PANORAMA_RENDERER); } + private final Pool pool = new Pool(3); + public final SaturnScreen screen; + public static void preload(MinecraftClient client) { TextureManager textureManager = client.getTextureManager(); @@ -50,37 +45,30 @@ public abstract class SaturnScreen extends Screen { } } - public SaturnScreen(String title) { - super(Text.literal(title)); - } - - public void draw(Element element) { - ElementRenderer.draw(elements, element); + public SaturnScreenFabric(SaturnScreen screen) { + super(Text.literal(screen.title)); + screen.provider = this; + this.screen = screen; } @Override protected void init() { - elements.clear(); - width *= 2; - height *= 2; - ui(); // abstraction to render the saturn ui and also render extra stuff here + screen.init(); } - public abstract void ui(); - @SuppressWarnings("deprecation") @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - if (start == null) { - start = Instant.now(); + if (screen.start == null) { + screen.start = Instant.now(); } - long elapsed = Duration.between(start, Instant.now()).toMillis(); + long elapsed = Duration.between(screen.start, Instant.now()).toMillis(); mouseX *= 2; mouseY *= 2; if (client.world == null && client.getCurrentServerEntry() == null) { - ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, backgroundOpacity, delta); + ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, screen.backgroundOpacity, delta); } PostEffectProcessor postEffectProcessor = this.client.getShaderLoader().loadPostEffect( @@ -88,82 +76,86 @@ public abstract class SaturnScreen extends Screen { DefaultFramebufferSet.MAIN_ONLY); if (postEffectProcessor != null) { - postEffectProcessor.setUniforms("Radius", backgroundBlur * Math.min((float) elapsed / 700, 1.0f)); + postEffectProcessor.setUniforms("Radius", screen.backgroundBlur * Math.min((float) elapsed / 700, 1.0f)); postEffectProcessor.render(this.client.getFramebuffer(), this.pool); } // We are using a Abstracted RenderScope because older minecraft versions don't // use DrawContext - RenderScope renderScope = new RenderScope(context.getMatrices(), + RenderScope renderScope = new RenderScopeImpl(context.getMatrices(), ((DrawContextAccessor) context).getVertexConsumers()); - renderScope.matrices.push(); - - renderScope.matrices.scale(0.5f, 0.5f, 0.5f); - - ElementRenderer.render(new ArrayList<>(elements), elapsed, renderScope, mouseX, mouseY); - - renderScope.matrices.pop(); + screen.render(renderScope, mouseX, mouseY, delta, elapsed); } @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - mouseX *= 2; - mouseY *= 2; + if (screen.mouseClicked(mouseX, mouseY, button)) { + return true; + } - ElementRenderer.mouseClicked(elements, mouseX, mouseY, button); - - return false; + return super.mouseClicked(mouseX, mouseY, button); } @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - mouseX *= 2; - mouseY *= 2; + if (screen.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { + return true; + } - ElementRenderer.mouseDragged(elements, mouseX, mouseY, button, deltaX, deltaY); - - return super.mouseReleased(mouseX, mouseY, button); + return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); } @Override public boolean mouseReleased(double mouseX, double mouseY, int button) { - mouseX *= 2; - mouseY *= 2; - - ElementRenderer.mouseReleased(elements, mouseX, mouseY, button); + if (screen.mouseReleased(mouseX, mouseY, button)) { + return true; + } return super.mouseReleased(mouseX, mouseY, button); } @Override - public boolean mouseScrolled( - double mouseX, - double mouseY, - double horizontalAmount, - double verticalAmount) { - mouseX *= 2; - mouseY *= 2; + public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) { + if (screen.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount)) { + return true; + } - ElementRenderer.mouseScrolled(elements, mouseX, mouseY, horizontalAmount, verticalAmount); - - return super.mouseScrolled( - mouseX, - mouseY, - horizontalAmount, - verticalAmount); - } - - @Override - public void resize(MinecraftClient client, int width, int height) { - elements.clear(); - super.resize(client, width, height); + return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount); } @Override public boolean keyPressed(int keyCode, int scanCode, int modifiers) { - ElementRenderer.keyPressed(elements, keyCode, scanCode, modifiers); + if (screen.keyPressed(keyCode, scanCode, modifiers)) { + return true; + } return super.keyPressed(keyCode, scanCode, modifiers); } + + @Override + public void resize(MinecraftClient client, int width, int height) { + screen.resize(width, height); + super.resize(client, width, height); + } + + // ------------------------------------------ + // ScreenProvider implementations + // ------------------------------------------ + + @Override + public void close() { + this.screen.onClose(); + super.close(); + } + + @Override + public int getWidth() { + return width * 2; + } + + @Override + public int getHeight() { + return height * 2; + } } diff --git a/src/main/resources/fabric.mod.json b/versions/1.21.4/src/main/resources/fabric.mod.json similarity index 93% rename from src/main/resources/fabric.mod.json rename to versions/1.21.4/src/main/resources/fabric.mod.json index fc7fb33..e3ad456 100644 --- a/src/main/resources/fabric.mod.json +++ b/versions/1.21.4/src/main/resources/fabric.mod.json @@ -17,7 +17,8 @@ }, "mixins": [ "saturnclient.mixins.json", - "mods.mixins.json" + "mods.mixins.json", + "impl.mixins.json" ], "depends": { "fabricloader": ">=${loader_version}", diff --git a/versions/1.21.4/src/main/resources/impl.mixins.json b/versions/1.21.4/src/main/resources/impl.mixins.json new file mode 100644 index 0000000..1962c8d --- /dev/null +++ b/versions/1.21.4/src/main/resources/impl.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "org.saturnclient.impl.mixins", + "compatibilityLevel": "JAVA_21", + "client": [ + "MinecraftClientMixin", + "MatrixStackMixin", + "WindowMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/mods.mixins.json b/versions/1.21.4/src/main/resources/mods.mixins.json similarity index 88% rename from src/main/resources/mods.mixins.json rename to versions/1.21.4/src/main/resources/mods.mixins.json index 6cd236b..1b1b619 100644 --- a/src/main/resources/mods.mixins.json +++ b/versions/1.21.4/src/main/resources/mods.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "org.saturnclient.modules.mods.mixins", + "package": "org.saturnclient.modules.mixins", "compatibilityLevel": "JAVA_21", "client": [ "CameraMixin", diff --git a/src/main/resources/saturnclient.mixins.json b/versions/1.21.4/src/main/resources/saturnclient.mixins.json similarity index 100% rename from src/main/resources/saturnclient.mixins.json rename to versions/1.21.4/src/main/resources/saturnclient.mixins.json