diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb37e557..8d9c176d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ on: - "README.md" workflow_dispatch: jobs: - build: + build-main: runs-on: ubuntu-latest env: GIT_URL: ${{ github.server_url }}/${{ github.repository }}/tree/${{ github.sha }} @@ -26,16 +26,49 @@ jobs: GITHUB_TOKEN: ${{ secrets.TOKEN }} steps: + - name: Request library build ahead of time + run: | + JITPACK_URL="https://jitpack.io/com/github/Ascynx/MCConfigFramework/${{ steps.get_version.outputs.VERSION }}" + curl -s -m 30 ${JITPACK_URL} || true + + - uses: actions/checkout@v3 + - name: Set up JDK 21 + uses: actions/setup-java@v3 + with: + java-version: 21 + distribution: temurin + cache: gradle + - name: Build with Gradle + run: chmod +x ./gradlew && ./gradlew :main:build --no-daemon + - uses: actions/upload-artifact@v4 + with: + name: UnofficialMonumentaMod + path: main/build/libs/*.jar + + build-api: + runs-on: ubuntu-latest + env: + GIT_URL: ${{ github.server_url }}/${{ github.repository }}/tree/${{ github.sha }} + REF_NAME: ${{ github.ref_name }} + GITHUB_ACTOR: ${{ secrets.ACTOR }} + GITHUB_TOKEN: ${{ secrets.TOKEN }} + + steps: + - name: Request library build ahead of time + run: | + JITPACK_URL="https://jitpack.io/com/github/Ascynx/MCConfigFramework/${{ steps.get_version.outputs.VERSION }}" + curl -s -m 30 ${JITPACK_URL} || true + - uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 21 distribution: temurin cache: gradle - name: Build with Gradle - run: chmod +x ./gradlew && ./gradlew build --no-daemon + run: chmod +x ./gradlew && ./gradlew :api:build --no-daemon - uses: actions/upload-artifact@v4 with: - name: Artifact - path: build/libs/*.jar \ No newline at end of file + name: MonumentaAPI + path: api/build/libs/*.jar \ No newline at end of file diff --git a/api/build.gradle b/api/build.gradle new file mode 100644 index 00000000..43edfc54 --- /dev/null +++ b/api/build.gradle @@ -0,0 +1,129 @@ +plugins { + id 'fabric-loom' version '1.16-SNAPSHOT' + id 'maven-publish' + id "com.modrinth.minotaur" version "2.+" + id "com.matthewprenger.cursegradle" version "1.+" +// id 'java' +// id 'com.github.johnrengelman.shadow' version '1.2.2' +} + +configurations { + register("shadow") { + canBeResolved = false + extendsFrom(modImplementation) + } +} + +version = project.mod_version +group = project.maven_group + +base { + if (project.hasProperty("mod_extradata") && !project.mod_extradata.isEmpty()) { + archivesName = project.archives_base_name + "-mc" + project.minecraft_version + "-" + project.mod_extradata; + } else { + archivesName = project.archives_base_name + "-mc" + project.minecraft_version + } +} + + + +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_version}" + + modApi ('com.terraformersmc:modmenu:9.2.0') { + transitive = false + } + + modApi("me.shedaniel.cloth:cloth-config-fabric:13.0.138") { + exclude(group: "net.fabricmc.fabric-api") + } + + //un-comment those if you want to load from local maven (don't have both local and jitpack sources on at the same time, dunno what it'd do I never tried it) + //modApi "ch.njol.minecraft:ui-framework-mc1_19_3:${project.ui_framework_version}" + //include "ch.njol.minecraft:ui-framework-mc1_19_3:${project.ui_framework_version}" + //modApi "ch.njol.minecraft:config-framework-mc1_19:${project.config_framework_version}" + //include "ch.njol.minecraft:config-framework-mc1_19:${project.config_framework_version}" + //un-comment those if you want to load from jitpack (don't have both local and jitpack sources on at the same time, dunno what it'd do I never tried it) + modApi(include('com.github.Ascynx:MCConfigFramework:mc1.20.4-SNAPSHOT')) + modApi(include('com.github.Ascynx:MCUIFramework:mc1.20.4-SNAPSHOT')) +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + + withSourcesJar() +} + +repositories { + mavenLocal() + mavenCentral() + maven { url = "https://maven.terraformersmc.com" } + maven { url = "https://maven.shedaniel.me/" } + maven { url = "https://jitpack.io/" } +} + +sourceSets { + main { + java { + srcDir("src/java") + } + resources { + srcDir("src/resources") + } + } +} + +processResources { + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand project.properties + duplicatesStrategy = 'include' + } + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + duplicatesStrategy = 'include' + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +jar { + from("LICENSE") { + rename { "${it}_${archives_base_name}"} + } +} +//shadowJar { +// dependencies { +// include(dependency('me.shedaniel.cloth:cloth-config-fabric:.*')) +// } +//} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + builtBy remapJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} \ No newline at end of file diff --git a/api/gradle.properties b/api/gradle.properties new file mode 100644 index 00000000..eac9b4ab --- /dev/null +++ b/api/gradle.properties @@ -0,0 +1,4 @@ +# Mod Properties +mod_version=0.1 +maven_group=ch.njol.minecraft +archives_base_name=unofficial-monumenta-api \ No newline at end of file diff --git a/api/src/java/ch/njol/unofficialmonumentaapi/core/AutoDiscoveryMixinPlugin.java b/api/src/java/ch/njol/unofficialmonumentaapi/core/AutoDiscoveryMixinPlugin.java new file mode 100644 index 00000000..5335e668 --- /dev/null +++ b/api/src/java/ch/njol/unofficialmonumentaapi/core/AutoDiscoveryMixinPlugin.java @@ -0,0 +1,188 @@ +package ch.njol.unofficialmonumentaapi.core; + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +/** + * A mixin plugin to automatically discover all mixins in the current JAR. + *

+ * This mixin plugin automatically scans your entire JAR (or class directory, in case of an in-IDE launch) for classes inside of your + * mixin package and registers those. It does this recursively for sub packages of the mixin package as well. This means you will need + * to only have mixin classes inside your mixin package, which is good style anyway. + *

+ * provided under The Unlicense license + * @author Linnea Gräf + */ +public class AutoDiscoveryMixinPlugin implements IMixinConfigPlugin { + private static final List mixinPlugins = new ArrayList<>(); + + public static List getMixinPlugins() { + return mixinPlugins; + } + + private String mixinPackage; + + @Override + public void onLoad(String mixinPackage) { + this.mixinPackage = mixinPackage; + mixinPlugins.add(this); + } + + /** + * Resolves the base class root for a given class URL. This resolves either the JAR root, or the class file root. + * In either case the return value of this + the class name will resolve back to the original class url, or to other + * class urls for other classes. + */ + public URL getBaseUrlForClassUrl(URL classUrl) { + String string = classUrl.toString(); + if (classUrl.getProtocol().equals("jar")) { + try { + return new URL(string.substring(4).split("!")[0]); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + if (string.endsWith(".class")) { + try { + return new URL(string.replace("\\", "/") + .replace(getClass().getCanonicalName() + .replace(".", "/") + ".class", "")); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + return classUrl; + } + + /** + * Get the package that contains all the mixins. This value is set by mixin itself using {@link #onLoad}. + */ + public String getMixinPackage() { + return mixinPackage; + } + + /** + * Get the path inside the class root to the mixin package + */ + public String getMixinBaseDir() { + return mixinPackage.replace(".", "/"); + } + + /** + * A list of all discovered mixins. + */ + private List mixins = null; + + /** + * Try to add mixin class ot the mixins based on the filepath inside the class root. + * Removes the {@code .class} file suffix, as well as the base mixin package. + *

This method cannot be called after mixin initialization.

+ * + * @param className the name or path of a class to be registered as a mixin. + */ + public void tryAddMixinClass(String className) { + String norm = (className.endsWith(".class") ? className.substring(0, className.length() - ".class".length()) : className) + .replace("\\", "/") + .replace("/", "."); + if (norm.startsWith(getMixinPackage() + ".") && !norm.endsWith(".") && + !(Character.isDigit(norm.charAt(norm.length() - 1)) && norm.charAt(norm.length() - 2) == '$')) { + mixins.add(norm.substring(getMixinPackage().length() + 1)); + } + } + + /** + * Search through the JAR or class directory to find mixins contained in {@link #getMixinPackage()} + */ + @Override + public List getMixins() { + if (mixins != null) return mixins; + System.out.println("Trying to discover mixins"); + mixins = new ArrayList<>(); + URL classUrl = getClass().getProtectionDomain().getCodeSource().getLocation(); + System.out.println("Found classes at " + classUrl); + Path file; + try { + file = Paths.get(getBaseUrlForClassUrl(classUrl).toURI()); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + System.out.println("Base directory found at " + file); + if (Files.isDirectory(file)) { + walkDir(file); + } else { + walkJar(file); + } + System.out.println("Found mixins: " + mixins); + + return mixins; + } + + /** + * Search through directory for mixin classes based on {@link #getMixinBaseDir}. + * + * @param classRoot The root directory in which classes are stored for the default package. + */ + private void walkDir(Path classRoot) { + System.out.println("Trying to find mixins from directory"); + try (Stream classes = Files.walk(classRoot.resolve(getMixinBaseDir()))) { + classes.filter(it -> new File(it.toUri()).isFile()) + .map(it -> classRoot.relativize(it).toString()) + .forEach(this::tryAddMixinClass); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * Read through a JAR file, trying to find all mixins inside. + */ + private void walkJar(Path file) { + System.out.println("Trying to find mixins from jar file"); + try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(file))) { + ZipEntry next; + while ((next = zis.getNextEntry()) != null) { + tryAddMixinClass(next.getName()); + zis.closeEntry(); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override public void preApply(String targetClassName, org.objectweb.asm.tree.ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } + + @Override public void postApply(String targetClassName, org.objectweb.asm.tree.ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + return true; + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unofficial-monumenta-mod/icon.png b/api/src/resources/assets/monumenta-api/icon.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/icon.png rename to api/src/resources/assets/monumenta-api/icon.png diff --git a/api/src/resources/fabric.mod.json b/api/src/resources/fabric.mod.json new file mode 100644 index 00000000..6b5ea66f --- /dev/null +++ b/api/src/resources/fabric.mod.json @@ -0,0 +1,45 @@ +{ + "schemaVersion": 1, + "id": "unofficial-monumenta-api", + "version": "${mod_version}", + "name": "Unofficial Monumenta API", + "description": "PLACEHOLDER", + "authors": [ + "Njol" + ], + "contributors": [ + "Ascynx" + ], + "contact": { + "homepage": "https://www.curseforge.com/minecraft/mc-mods/unofficial-monumenta-mod", + "issues": "https://github.com/Njol/UnofficialMonumentaMod/issues", + "sources": "https://github.com/Njol/UnofficialMonumentaMod" + }, + "license": "GPL-3.0", + "icon": "assets/monumenta-api/icon.png", + "environment": "client", + "entrypoints": { + "client": [ + ], + "main": [ + ] + }, + "custom" : { + "mod_extradata": "${mod_extradata}" + }, + "mixins": [ + "monumenta-api.mixins.json" + ], + "depends": { + "fabricloader": ">=${loader_version}", + "fabric-api": ">=${fabric_version}", + "minecraft": "~${minecraft_version}" + }, + "recommends": { + "modmenu": ">=9.2.0", + "cloth-config": ">=13.0.138" + }, + "suggests": { + "citresewn": "*" + } +} diff --git a/api/src/resources/monumenta-api.mixins.json b/api/src/resources/monumenta-api.mixins.json new file mode 100644 index 00000000..80937742 --- /dev/null +++ b/api/src/resources/monumenta-api.mixins.json @@ -0,0 +1,10 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "ch.njol.unofficialmonumentaapi.mixins", + "plugin": "ch.njol.unofficialmonumentaapi.core.AutoDiscoveryMixinPlugin", + "compatibilityLevel": "JAVA_17", + "injectors": { + "defaultRequire": 1 + } +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e4b762da..9a8e58a7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1 +1,6 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +#Sun Jun 14 21:29:44 CEST 2026 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/build.gradle b/main/build.gradle similarity index 80% rename from build.gradle rename to main/build.gradle index 3459c0b2..449b94d6 100644 --- a/build.gradle +++ b/main/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.16-SNAPSHOT' id 'maven-publish' id "com.modrinth.minotaur" version "2.+" id "com.matthewprenger.cursegradle" version "1.+" @@ -7,15 +7,24 @@ plugins { // id 'com.github.johnrengelman.shadow' version '1.2.2' } +/*tasks.register('prepare') { + dependsOn ':api:build' +} + +tasks.getByName('dependencies').dependsOn 'prepare'*/ + version = project.mod_version group = project.maven_group -if (project.hasProperty("mod_extradata") && !project.mod_extradata.isEmpty()) { - archivesBaseName = project.archives_base_name + "-mc" + project.minecraft_version + "-" + project.mod_extradata; -} else { - archivesBaseName = project.archives_base_name + "-mc" + project.minecraft_version +base { + if (project.hasProperty("mod_extradata") && !project.mod_extradata.isEmpty()) { + archivesName = project.archives_base_name + "-mc" + project.minecraft_version + "-" + project.mod_extradata; + } else { + archivesName = project.archives_base_name + "-mc" + project.minecraft_version + } } + dependencies { //to change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" @@ -25,14 +34,17 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modApi "com.terraformersmc:modmenu:9.0.0" + modApi ('com.terraformersmc:modmenu:9.2.0') { + transitive = false + } + modApi("me.shedaniel.cloth:cloth-config-fabric:13.0.138") { exclude(group: "net.fabricmc.fabric-api") } - //modified under the com.github.Ascynx group to follow a modified working mirror for this dependency. - include(implementation('com.github.Ascynx:discord-rpc-release:v3.4.0')) - include(implementation("com.github.Ascynx:java-discord-rpc:v2.0.2")) + //modified under the com.github.ascynx group to follow a modified working mirror for this dependency. + include(implementation('com.github.ascynx:discord-rpc-release:v3.4.0')) + include(implementation("com.github.ascynx:java-discord-rpc:v2.0.2")) //un-comment those if you want to load from local maven (don't have both local and jitpack sources on at the same time, dunno what it'd do I never tried it) //modApi "ch.njol.minecraft:ui-framework-mc1_19_3:${project.ui_framework_version}" @@ -40,13 +52,15 @@ dependencies { //modApi "ch.njol.minecraft:config-framework-mc1_19:${project.config_framework_version}" //include "ch.njol.minecraft:config-framework-mc1_19:${project.config_framework_version}" //un-comment those if you want to load from jitpack (don't have both local and jitpack sources on at the same time, dunno what it'd do I never tried it) - modApi('com.github.Ascynx:MCConfigFramework:mc1.20.4-SNAPSHOT') - include('com.github.Ascynx:MCConfigFramework:mc1.20.4-SNAPSHOT') - modApi('com.github.Ascynx:MCUIFramework:mc1.20.4-SNAPSHOT') - include('com.github.Ascynx:MCUIFramework:mc1.20.4-SNAPSHOT') + modApi(include('com.github.Ascynx:MCConfigFramework:mc1.20.4-SNAPSHOT')) + modApi(include('com.github.Ascynx:MCUIFramework:mc1.20.4-SNAPSHOT')) + + include(modApi(project(path: ':api', configuration: 'shadow'))) // Optional Mod Integrations - modApi "com.github.Provismet:ProviHealth:1.2.4-mc1.20.2" //(no 1.20.4 specific version, mentioned as compatible) + modApi ("com.github.provismet:ProviHealth:1.2.4-mc1.20.2") { + exclude (group: "com.terraformersmc") + } //(no 1.20.4 specific version, mentioned as compatible) } java { @@ -64,6 +78,17 @@ repositories { maven { url = "https://jitpack.io/" } } +sourceSets { + main { + java { + srcDir("src/java") + } + resources { + srcDir("src/resources") + } + } +} + processResources { from(sourceSets.main.resources.srcDirs) { include "fabric.mod.json" diff --git a/src/main/java/ch/njol/unofficialmonumentamod/AbilityHandler.java b/main/src/java/ch/njol/unofficialmonumentamod/AbilityHandler.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/AbilityHandler.java rename to main/src/java/ch/njol/unofficialmonumentamod/AbilityHandler.java diff --git a/src/main/java/ch/njol/unofficialmonumentamod/AbilityOptionPreset.java b/main/src/java/ch/njol/unofficialmonumentamod/AbilityOptionPreset.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/AbilityOptionPreset.java rename to main/src/java/ch/njol/unofficialmonumentamod/AbilityOptionPreset.java diff --git a/main/src/java/ch/njol/unofficialmonumentamod/ChannelHandler.java b/main/src/java/ch/njol/unofficialmonumentamod/ChannelHandler.java new file mode 100644 index 00000000..96024e14 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/ChannelHandler.java @@ -0,0 +1,221 @@ +package ch.njol.unofficialmonumentamod; + +import ch.njol.unofficialmonumentamod.core.shard.ShardLoader; +import ch.njol.unofficialmonumentamod.hud.strike.ChestCountOverlay; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import java.nio.charset.StandardCharsets; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.networking.v1.PacketSender; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.network.ClientPlayNetworkHandler; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; + +public class ChannelHandler implements ClientPlayNetworking.PlayChannelHandler { + + public static final Identifier CHANNEL_ID = new Identifier("monumenta:client_channel_v1"); + + private final Gson gson; + private final AbilityHandler abilityHandler; + private final ChestCountOverlay chestCountOverlay; + + public ChannelHandler() { + gson = new GsonBuilder().create(); + abilityHandler = UnofficialMonumentaModClient.abilityHandler; + chestCountOverlay = ChestCountOverlay.INSTANCE; + } + + public static class EffectInfo { + public String UUID; + public int displayPriority; + + public String name; + public Integer duration; + public double power; + + public boolean positive; + public boolean percentage; + } + + public static class MassEffectUpdatePacket { + String _type = "MassEffectUpdatePacket"; + + //when received, will clear stored effects. + public EffectInfo[] effects; + } + + public static class EffectUpdatePacket { + String _type = "EffectUpdatePacket"; + + public EffectInfo effect; + } + + /** + * Sent whenever a player's class is updated. + */ + public static class ClassUpdatePacket { + + String _type = "ClassUpdatePacket"; + + AbilityInfo[] abilities; + + public static class AbilityInfo { + + public String name; + public String className; + + int remainingCooldown; + int initialCooldown; + + int remainingCharges; + int maxCharges; + + @Nullable String mode; + @Nullable Integer remainingDuration; + @Nullable Integer initialDuration; + + } + + } + + /** + * Sent whenever an ability is used or changed in any way + */ + public static class AbilityUpdatePacket { + + String _type = "AbilityUpdatePacket"; + + public String name; + + int remainingCooldown; + + int remainingCharges; + + @Nullable String mode; + @Nullable Integer remainingDuration; + @Nullable Integer initialDuration; + + } + + /** + * Custom player status effects that effect abilities + */ + public static class PlayerStatusPacket { + + final String _type = "PlayerStatusPacket"; + + int silenceDuration; + + } + + /** + * Sent whenever the number of chests in a strike changes + */ + public static class StrikeChestUpdatePacket { + + final String _type = "StrikeChestUpdatePacket"; + + public int newLimit; + + @Nullable + public Integer count; + + } + + /** + * sent on login, gives information that the client should know first and foremost. + */ + @SuppressWarnings("unused") + public static class ServerInfoPacket { + String _type = "ServerInfoPacket"; + + /** + * tells the clientside mod whether it is allowed to release information on the location of the player. + * example: beta testing of new content. Should be disabled on stage and volt. + */ + public boolean allowPublicizeContent; + } + + /** + * Should be sent on login, shard change and after a player enters a new content (most likely will be tied to the instance bot) + */ + @SuppressWarnings("unused") + public static class LocationUpdatedPacket { + String _type = "LocationUpdatedPacket"; + + /** + * the Shard the player is on. + */ + String shard; + + /** + * the content the player is playing, content can be the same as shard if the shard has the same name. + * on player plots, this will reflect the current instance. + */ + @Nullable + String content; + + public String getShard() { + return shard; + } + + public String getContent() { + if (content == null) { + return shard; + } + return content; + } + } + + @Override + public void receive(MinecraftClient client, ClientPlayNetworkHandler handler, PacketByteBuf buf, PacketSender responseSender) { + String message = buf.readCharSequence(buf.readableBytes(), StandardCharsets.UTF_8).toString(); + JsonElement json = JsonParser.parseString(message); + if (UnofficialMonumentaModClient.options.logPackets) { + UnofficialMonumentaModClient.LOGGER.info("[UMM] read packet: " + json); + } + client.execute(() -> { + String packetType = json.getAsJsonObject().getAsJsonPrimitive("_type").getAsString(); + switch (packetType) { + case "ClassUpdatePacket" -> { + ClassUpdatePacket packet = gson.fromJson(json, ClassUpdatePacket.class); + abilityHandler.updateAbilities(packet); + } + case "AbilityUpdatePacket" -> { + AbilityUpdatePacket packet = gson.fromJson(json, AbilityUpdatePacket.class); + abilityHandler.updateAbility(packet); + } + case "PlayerStatusPacket" -> { + PlayerStatusPacket packet = gson.fromJson(json, PlayerStatusPacket.class); + abilityHandler.updateStatus(packet); + } + case "StrikeChestUpdatePacket" -> { + StrikeChestUpdatePacket packet = gson.fromJson(json, StrikeChestUpdatePacket.class); + chestCountOverlay.onStrikeChestUpdatePacket(packet); + } + + case "MassEffectUpdatePacket" -> { + MassEffectUpdatePacket packet = gson.fromJson(json, MassEffectUpdatePacket.class); + UnofficialMonumentaModClient.effectOverlay.onMassEffectUpdatePacket(packet); + } + case "EffectUpdatePacket" -> { + EffectUpdatePacket packet = gson.fromJson(json, EffectUpdatePacket.class); + UnofficialMonumentaModClient.effectOverlay.onEffectUpdatePacket(packet); + } + case "ServerInfoPacket" -> { + ServerInfoPacket packet = gson.fromJson(json, ServerInfoPacket.class); + UnofficialMonumentaModClient.discordRPC.setCanPublicizeShards(packet.allowPublicizeContent); + } + case "LocationUpdatedPacket" -> { + LocationUpdatedPacket packet = gson.fromJson(json, LocationUpdatedPacket.class); + ShardLoader.onLocationUpdatedPacket(packet); + } + } + }); + } + +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/KeybindingUtils.java b/main/src/java/ch/njol/unofficialmonumentamod/KeybindingUtils.java new file mode 100644 index 00000000..9feb85e5 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/KeybindingUtils.java @@ -0,0 +1,30 @@ +package ch.njol.unofficialmonumentamod; + +import java.util.Objects; +import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.option.KeyBinding; +import net.minecraft.client.util.InputUtil; +import org.lwjgl.glfw.GLFW; + +public class KeybindingUtils { + public static boolean isKeyPressed(final KeyBinding keyBinding) { + if (keyBinding.isUnbound()) { + return false; + } + + if (Objects.equals(KeyBindingHelper.getBoundKeyOf(keyBinding).getCategory(), InputUtil.Type.MOUSE)) { + return GLFW.glfwGetMouseButton(MinecraftClient.getInstance().getWindow().getHandle(), getKeyCode(keyBinding)) == 1; + } else { + return InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), getKeyCode(keyBinding)); + } + } + + public static int getKeyCode(final KeyBinding keyBinding) { + if (keyBinding.isUnbound()) { + return -1; + } + + return KeyBindingHelper.getBoundKeyOf(keyBinding).getCode(); + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/UnofficialMonumentaModClient.java b/main/src/java/ch/njol/unofficialmonumentamod/UnofficialMonumentaModClient.java new file mode 100644 index 00000000..7480030b --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/UnofficialMonumentaModClient.java @@ -0,0 +1,321 @@ +package ch.njol.unofficialmonumentamod; + +import ch.njol.minecraft.config.Config; +import ch.njol.minecraft.uiframework.hud.Hud; +import ch.njol.unofficialmonumentamod.core.PersistentData; +import ch.njol.unofficialmonumentamod.core.commands.CommandHelpBuilder; +import ch.njol.unofficialmonumentamod.core.commands.MainCommand; +import ch.njol.unofficialmonumentamod.core.commands.TexSpoofingInGameCommand; +import ch.njol.unofficialmonumentamod.core.shard.ShardData; +import ch.njol.unofficialmonumentamod.core.shard.ShardDebugCommand; +import ch.njol.unofficialmonumentamod.core.shard.ShardLoader; +import ch.njol.unofficialmonumentamod.features.calculator.Calculator; +import ch.njol.unofficialmonumentamod.features.discordrpc.DiscordPresence; +import ch.njol.unofficialmonumentamod.features.effects.EffectOverlay; +import ch.njol.unofficialmonumentamod.features.locations.Locations; +import ch.njol.unofficialmonumentamod.features.misc.DelveBounty; +import ch.njol.unofficialmonumentamod.features.misc.SlotLocking; +import ch.njol.unofficialmonumentamod.features.misc.managers.MessageNotifier; +import ch.njol.unofficialmonumentamod.features.misc.notifications.LocationNotifier; +import ch.njol.unofficialmonumentamod.features.spoof.TextureSpoofer; +import ch.njol.unofficialmonumentamod.hud.strike.ChestCountOverlay; +import ch.njol.unofficialmonumentamod.hud.AbilitiesHud; +import ch.njol.unofficialmonumentamod.options.ConfigMenu; +import ch.njol.unofficialmonumentamod.options.Options; +import com.google.gson.JsonParseException; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.Timer; +import java.util.TimerTask; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.ModContainer; +import net.fabricmc.loader.api.Version; +import net.fabricmc.loader.api.metadata.ModMetadata; +import net.fabricmc.loader.api.metadata.ModOrigin; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.item.ModelPredicateProviderRegistry; +import net.minecraft.client.network.ClientPlayNetworkHandler; +import net.minecraft.client.option.KeyBinding; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.text.MutableText; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.lwjgl.glfw.GLFW; +import org.lwjgl.system.Platform; + +@Environment(EnvType.CLIENT) +public class UnofficialMonumentaModClient implements ClientModInitializer { + + public static final String MOD_IDENTIFIER = "unofficial-monumenta-mod"; + + public static final String OPTIONS_FILE_NAME = "unofficial-monumenta-mod.json"; + + public static final Logger LOGGER = LogManager.getLogger(MOD_IDENTIFIER); + + public static Options options = new Options(); + + public static Locations locations = new Locations(); + public static TextureSpoofer spoofer = new TextureSpoofer(); + + public static DiscordPresence discordRPC = DiscordPresence.INSTANCE; + + public static EffectOverlay effectOverlay = new EffectOverlay(); + + public static final AbilityHandler abilityHandler = new AbilityHandler(); + + public static KeyBinding toggleCalculatorKeyBinding = new KeyBinding("unofficial-monumenta-mod.keybinds.toggleCalculator", GLFW.GLFW_KEY_K, "unofficial-monumenta-mod.keybinds.category"); + public static KeyBinding nbtDevOverlayKeyBinding = new KeyBinding("unofficial-monumenta-mod.keybinds.toggleNBTOverlay", GLFW.GLFW_KEY_N, "unofficial-monumenta-mod.keybinds.category"); + + @Override + public void onInitializeClient() { + + ModelPredicateProviderRegistry.register(new Identifier("on_head"), + (itemStack, clientWorld, livingEntity, seed) -> livingEntity != null && itemStack == livingEntity.getEquippedStack(EquipmentSlot.HEAD) ? 1 : 0); + + try { + options = Config.readJsonFile(Options.class, OPTIONS_FILE_NAME); + } catch (FileNotFoundException e) { + // Config file doesn't exist, so use default config (and write config file). + try { + Config.writeJsonFile(options, OPTIONS_FILE_NAME); + } catch (IOException ex) { + // ignore + } + } catch (IOException | JsonParseException e) { + // Any issue with the config file silently reverts to the default config + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to load configuration file", e); + } + + if (!PersistentData.getInstance().initialize()) { + UnofficialMonumentaModClient.LOGGER.fatal("Failed to load persistence data, old data will be overridden by the end of this session."); + } + + if (options.discordEnabled) { + if (canInitializeDiscord()) { + try { + discordRPC.Init(); + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to initialize DiscordRPC", e); + } + } else { + UnofficialMonumentaModClient.LOGGER.error("Disabled DiscordRPC as architecture is not compatible."); + + //since it is most likely going to crash, just make sure it doesn't nearly cause it to happen again. + options.discordEnabled = false; + options.onUpdate(); + MinecraftClient.getInstance().submit(UnofficialMonumentaModClient::saveConfig); + } + } + + ClientTickEvents.END_CLIENT_TICK.register(client -> { + abilityHandler.tick(); + effectOverlay.tick(); + LocationNotifier.tick(); + MessageNotifier.getInstance().tick(); + SlotLocking.getInstance().onEndTick(); + }); + + ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> { + onDisconnect(); + }); + + ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> { + ShardLoader.onWorldLoaded(); + if (!PersistentData.getInstance().onLogin()) { + new Timer().schedule(new TimerTask() { + @Override + public void run() { + //if it fails here, then let it fail + PersistentData.getInstance().onLogin(); + } + }, 5000); + } + effectOverlay.onJoin(); + }); + + ClientPlayNetworking.registerGlobalReceiver(ChannelHandler.CHANNEL_ID, new ChannelHandler()); + + KeyBindingHelper.registerKeyBinding(toggleCalculatorKeyBinding); + KeyBindingHelper.registerKeyBinding(nbtDevOverlayKeyBinding); + KeyBindingHelper.registerKeyBinding(SlotLocking.LOCK_KEY); + + Hud.INSTANCE.addElement(AbilitiesHud.INSTANCE); + Hud.INSTANCE.addElement(ChestCountOverlay.INSTANCE); + Hud.INSTANCE.addElement(effectOverlay); + Hud.INSTANCE.addElement(MessageNotifier.getInstance()); + + DelveBounty.initializeListeners(); + ChestCountOverlay.INSTANCE.initializeListeners(); + Locations.registerListeners(); + Calculator.registerListeners(); + + ShardData.ShardChangedEventCallback.EVENT.register((currentShard, previousShard) -> { + if (options.shardDebug) { + debug("Received shard update: " + previousShard + " -> " + currentShard); + } + }); + + ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> { + List> commands = new ArrayList<>(); + commands.add(new ShardDebugCommand().register()); + commands.add(new MainCommand().register()); + commands.add(new TexSpoofingInGameCommand().register(registryAccess)); + + CommandHelpBuilder.initialize(commands); + for (LiteralArgumentBuilder command : commands) { + dispatcher.register(command); + } + })); + + try { + Class.forName("com.terraformersmc.modmenu.api.ModMenuApi"); + Class.forName("me.shedaniel.clothconfig2.api.ConfigBuilder"); + ConfigMenu.registerTypes(); + } catch (ClassNotFoundException e) { + LOGGER.warn("Could not load modmenu or cloth-config, disabling ConfigMenu."); + } + + ModInfo.initialize(); + } + + public static void debug(String message) { + if (!options.debugOptionsEnabled) { + return; + } + if (options.notifyDebugMessages) { + MutableText text = Text.literal(message); + text.setStyle(Style.EMPTY.withColor(Formatting.YELLOW)); + MessageNotifier.RenderedMessage renderedMessage = new MessageNotifier.RenderedMessage(text); + MessageNotifier.getInstance().addOrStackMessageToQueue(renderedMessage); + } + + UnofficialMonumentaModClient.LOGGER.info(message); + } + + public static void onDisconnect() { + abilityHandler.onDisconnect(); + LocationNotifier.onDisconnect(); + spoofer.onDisconnect(); + ShardLoader.onDisconnect(); + if (PersistentData.isLoaded()) { + if (!PersistentData.getInstance().onDisconnect()) { + new Timer().schedule(new TimerTask() { + @Override + public void run() { + if (PersistentData.isLoaded()) { + //if it fails here, then let it fail + PersistentData.getInstance().onDisconnect(); + } + } + }, 5000); + } + } + SlotLocking.getInstance().save(); + } + + public static boolean isOnMonumenta() { + boolean onMM = false; + MinecraftClient mc = MinecraftClient.getInstance(); + String shard = Locations.getShard(); + + if (!ShardData.UNKNOWN_SHARD.equals(shard)) { + return true; + } + + ClientPlayNetworkHandler clientPlayNetworkHandler = mc.getNetworkHandler(); + if (clientPlayNetworkHandler != null && clientPlayNetworkHandler.getBrand() != null) { + String serverBrand = clientPlayNetworkHandler.getBrand(); + onMM = !mc.isInSingleplayer() && serverBrand.startsWith("Monumenta"); + } + return onMM; + } + + public static void saveConfig() { + MinecraftClient.getInstance().execute(() -> { + try { + Config.writeJsonFile(options, OPTIONS_FILE_NAME); + } catch (IOException ignore) {} + }); + } + + public static boolean canInitializeDiscord() { + Platform.Architecture currentArch = Platform.getArchitecture(); + return !(currentArch == Platform.Architecture.ARM64 || currentArch == Platform.Architecture.ARM32); + } + + public static class ModInfo { + public static Version version; + public static String name; + public static String fileName; + public static String extraData; + + public static boolean inDevEnvironment; + + private static boolean initialized = false; + + public static void initialize() { + if (initialized) { + return; + } + final FabricLoader loader = FabricLoader.getInstance(); + inDevEnvironment = loader.isDevelopmentEnvironment(); + + if (!loader.isModLoaded(MOD_IDENTIFIER)) { + throw new IllegalStateException("Unofficial Monumenta Mod is incorrectly loaded,\nproceeding to throw a wrench into the mod loader."); + } + + Optional selfContainer = loader.getModContainer(MOD_IDENTIFIER); + if (selfContainer.isEmpty()) { + //Same as above + throw new IllegalStateException("Unofficial Monumenta Mod is incorrectly loaded,\nproceeding to throw a wrench into the mod loader."); + } + ModMetadata selfMeta = selfContainer.get().getMetadata(); + version = selfMeta.getVersion(); + name = selfMeta.getName(); + + ModOrigin origin = selfContainer.get().getOrigin(); + fileName = switch (origin.getKind()) { + case PATH -> origin.getPaths().get(0).getFileName().toString(); + case NESTED -> { + if (selfContainer.get().getContainingMod().isPresent()) { + yield selfContainer.get().getContainingMod().get().getOrigin().getPaths().get(0).getFileName().toString(); + } + yield "UNKNOWN"; + } + case UNKNOWN -> "UNKNOWN"; + }; + + if (selfMeta.containsCustomValue("mod_extradata")) { + extraData = selfMeta.getCustomValue("mod_extradata").getAsString(); + } + + initialized = true; + } + + public static String getVersion() { + String version = ModInfo.version.getFriendlyString(); + if (extraData != null && !extraData.isEmpty()) { + version += "-" + ModInfo.extraData; + } + + return version; + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/Utils.java b/main/src/java/ch/njol/unofficialmonumentamod/Utils.java new file mode 100644 index 00000000..29f783ac --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/Utils.java @@ -0,0 +1,277 @@ +package ch.njol.unofficialmonumentamod; + +import ch.njol.unofficialmonumentamod.core.gui.InventoryWidget; +import ch.njol.unofficialmonumentamod.mixins.screen.ScreenAccessor; +import com.mojang.blaze3d.systems.RenderSystem; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.Calendar; +import java.util.List; +import java.util.TimeZone; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.BufferRenderer; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.VertexFormat; +import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import org.joml.Matrix4f; + +public abstract class Utils { + + private Utils() { + } + + public static boolean isEntityMainPlayer(LivingEntity entity) { + return (entity instanceof PlayerEntity) && ((PlayerEntity) entity).isMainPlayer(); + } + + /** + * Gets the plain display name of an items. This is used by Monumenta to distinguish items. + * + * @param itemStack An item stack + * @return The plain display name of the item, i.e. the value of NBT node plain.display.Name. + */ + public static String getPlainDisplayName(ItemStack itemStack) { + return itemStack.getNbt() == null ? null : itemStack.getNbt().getCompound("plain").getCompound("display").getString("Name"); + } + + public static float smoothStep(float f) { + if (f <= 0) { + return 0; + } + if (f >= 1) { + return 1; + } + return f * f * (3 - 2 * f); + } + + public static float ease(float currentValue, float oldValue, float speedFactor, float minSpeed) { + if (Math.abs(currentValue - oldValue) <= minSpeed) { + return currentValue; + } else { + float speed = (currentValue - oldValue) * speedFactor; + if (speed > 0 && speed < minSpeed) { + speed = minSpeed; + } else if (speed < 0 && speed > -minSpeed) { + speed = -minSpeed; + } + return oldValue + speed; + } + } + + public static int clamp(int lowerBound, int value, int upperBound) { + return Math.max(lowerBound, Math.min(value, upperBound)); + } + + public static float clamp(float lowerBound, float value, float upperBound) { + return Math.max(lowerBound, Math.min(value, upperBound)); + } + + public static List getTooltip(ItemStack stack) { + return stack.getTooltip(MinecraftClient.getInstance().player, TooltipContext.BASIC); + } + + public static void drawFilledPolygon(DrawContext drawContext, int originX, int originY, float radius, int sides, int color) { + drawPartialFilledPolygon(drawContext, originX, originY, radius, sides, color, 1.0); + } + + public static void drawPartialFilledPolygon(DrawContext drawContext, int originX, int originY, float radius, int sides, int color, double percentage) { + MatrixStack matrices = drawContext.getMatrices(); + + //percentage from 0.00 to 1.00 + float a = (float)(color >> 24 & 0xFF) / 255.0f; + float r = (float)(color >> 16 & 0xFF) / 255.0f; + float g = (float)(color >> 8 & 0xFF) / 255.0f; + float b = (float)(color & 0xFF) / 255.0f; + Matrix4f positionMatrix = matrices.peek().getPositionMatrix(); + RenderSystem.setShader(GameRenderer::getPositionColorProgram); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + + BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer(); + + bufferBuilder.begin(VertexFormat.DrawMode.TRIANGLE_FAN, VertexFormats.POSITION_COLOR); + bufferBuilder.vertex(positionMatrix, originX, originY, 0.0f).color(a, r, g, b).next(); + + //very optimised (trust) + for (int i = 0; i <= (sides * percentage); i++) { + double angle = ((Math.PI * 2) * i / sides) + Math.toRadians(180); + bufferBuilder.vertex(positionMatrix, (float) (originX + Math.sin(angle) * radius), (float) (originY + Math.cos(angle) * radius), 0.0f).color(a, r, g, b).next(); + } + BufferBuilder.BuiltBuffer built = bufferBuilder.end(); + + BufferRenderer.drawWithGlobalProgram(built); + RenderSystem.disableBlend(); + } + + public static void drawHollowPolygon(DrawContext drawContext, int originX, int originY, int borderWidth, float radius, int sides, int color) { + drawPartialHollowPolygon(drawContext, originX, originY, borderWidth, radius, sides, color, 1.0); + } + + private static void drawPartialPartPolygon(DrawContext drawContext, int originX, int originY, int borderWidth, float radius, int sides, double percentage, float r, float g, float b, float a) { + MatrixStack matrices = drawContext.getMatrices(); + + Matrix4f positionMatrix = matrices.peek().getPositionMatrix(); + RenderSystem.setShader(GameRenderer::getPositionColorProgram); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + + BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer(); + bufferBuilder.begin(VertexFormat.DrawMode.TRIANGLE_STRIP, VertexFormats.POSITION_COLOR); + + //very optimised (trust) + for (int i = 0; i <= (sides * percentage); i++) { + double angle = ((Math.PI * 2) * i / sides) + Math.toRadians(180); + bufferBuilder.vertex(positionMatrix, (float) (originX + Math.sin(angle) * (radius - borderWidth)), (float) (originY + Math.cos(angle) * (radius - borderWidth)), 0.0f).color(a, r, g, b).next(); + bufferBuilder.vertex(positionMatrix, (float) (originX + Math.sin(angle) * radius), (float) (originY + Math.cos(angle) * radius), 0.0f).color(a, r, g, b).next(); + } + + BufferBuilder.BuiltBuffer built = bufferBuilder.end(); + BufferRenderer.drawWithGlobalProgram(built); + RenderSystem.disableBlend(); + } + + public static void drawPartialHollowPolygon(DrawContext drawContext, int originX, int originY, int borderWidth, float radius, int sides, int color, double percentage) { + float a = (float)(color >> 24 & 0xFF) / 255.0f; + float r = (float)(color >> 16 & 0xFF) / 255.0f; + float g = (float)(color >> 8 & 0xFF) / 255.0f; + float b = (float)(color & 0xFF) / 255.0f; + + drawPartialPartPolygon(drawContext, originX, originY, borderWidth, radius, sides, percentage, r, g, b, a); + drawPartialPartPolygon(drawContext, originX, originY, borderWidth, radius + ((float) borderWidth / 2), sides*2, percentage, r, g, b, a); + drawPartialPartPolygon(drawContext, originX, originY, borderWidth, radius - ((float) borderWidth / 2), sides*2, percentage, r, g, b, a); + } + + public static class Lerp { + //copied from https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/src/main/java/io/github/moulberry/notenoughupdates/core/util/lerp/LerpingFloat.java under the LGPL 3.0 license + + private int timeSpent; + private long lastMillis; + private final int targetTime; + + private float targetValue; + private float lerpValue; + + public Lerp(float initValue, int targetTime) { + this.targetValue = this.lerpValue = initValue; + this.targetTime = targetTime; + } + + public Lerp(int initValue) { + this(initValue, 200); + } + + public void tick() { + int lastTimeSpent = timeSpent; + this.timeSpent += (int) (System.currentTimeMillis() - lastMillis); + + float lastDistPercentToTarget = lastTimeSpent / (float) targetTime; + float distPercentToTarget = timeSpent / (float) targetTime; + float fac = (1 - lastDistPercentToTarget) / lastDistPercentToTarget; + + float startValue = lerpValue - (targetValue - lerpValue) / fac; + + float dist = targetValue - startValue; + if (dist == 0) return; + + float oldLerpValue = lerpValue; + if (distPercentToTarget >= 1) { + lerpValue = targetValue; + } else { + lerpValue = startValue + dist * distPercentToTarget; + } + + if (lerpValue == oldLerpValue) { + timeSpent = lastTimeSpent; + } else { + this.lastMillis = System.currentTimeMillis(); + } + } + + public void resetTimer() { + this.timeSpent = 0; + this.lastMillis = System.currentTimeMillis(); + } + + public void setTarget(float targetValue) { + this.targetValue = targetValue; + } + + public void setValue(float value) { + this.targetValue = this.lerpValue = value; + } + + public float getValue() { + return lerpValue; + } + + public float getTarget() { + return targetValue; + } + } + + public static long getNextDailyResetOf(long millis) { + Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT")); + + //set to chosen time. + calendar.setTimeInMillis(millis); + + calendar.set(Calendar.HOUR, 5); + calendar.set(Calendar.AM_PM, Calendar.PM); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + Instant instant = calendar.toInstant(); + + if (instant.isBefore(Instant.now())) { + //today's reset has already passed, switching to next day. + return instant.plus(86400, ChronoUnit.SECONDS).toEpochMilli(); + } else { + //next reset is later today + return instant.toEpochMilli(); + } + } + + public static void addWidget(Screen screen, InventoryWidget widget) { + ((ScreenAccessor) screen).doAddDrawableChild(widget); + } + + public static void removeWidget(Screen screen, InventoryWidget widget) { + ((ScreenAccessor) screen).doRemove(widget); + } + + public static long getNextWeeklyResetOf(long millis) { + Calendar calendar = Calendar.getInstance(); + + //get calendar with time of day already corrected. + calendar.setTimeInMillis(getNextDailyResetOf(millis)); + + calendar.set(Calendar.DAY_OF_WEEK, Calendar.FRIDAY); + Instant instant = calendar.toInstant(); + + if (instant.isBefore(Instant.now())) { + //friday was before current time -> get next week + return instant.plus(604800, ChronoUnit.SECONDS).toEpochMilli(); + } else { + //friday is after, current date + return instant.toEpochMilli(); + } + } + + public static long getNextDailyReset() { + return getNextDailyResetOf(System.currentTimeMillis()); + } + + public static long getNextWeeklyReset() { + return getNextWeeklyResetOf(System.currentTimeMillis()); + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/compat/HealthBarHook.java b/main/src/java/ch/njol/unofficialmonumentamod/compat/HealthBarHook.java new file mode 100644 index 00000000..17fccdc9 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/compat/HealthBarHook.java @@ -0,0 +1,64 @@ +package ch.njol.unofficialmonumentamod.compat; + +import com.provismet.provihealth.api.ProviHealthApi; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import net.minecraft.entity.EntityGroup; +import net.minecraft.entity.EntityType; +import net.minecraft.item.Items; +import net.minecraft.util.Identifier; + +public class HealthBarHook implements ProviHealthApi { + @Override + public void onInitialize () { + final Identifier DUELIST_BORDER = new Identifier(UnofficialMonumentaModClient.MOD_IDENTIFIER, "textures/gui/healthbars/duelist_portrait.png"); + final Identifier SLAYER_BORDER = new Identifier(UnofficialMonumentaModClient.MOD_IDENTIFIER, "textures/gui/healthbars/slayer_portrait.png"); + + // Creates new displays for Monumenta's custom entity groupings. + final EntityType[] duelist = { + EntityType.VEX, + EntityType.WITCH, + EntityType.PIGLIN, + EntityType.PIGLIN_BRUTE, + EntityType.IRON_GOLEM, + EntityType.GIANT, + EntityType.ALLAY, + EntityType.WARDEN + }; + + final EntityType[] slayer = { + EntityType.CREEPER, + EntityType.ENDERMAN, + EntityType.BLAZE, + EntityType.GHAST, + EntityType.SLIME, + EntityType.MAGMA_CUBE, + EntityType.SHULKER, + EntityType.WOLF, + EntityType.RAVAGER, + EntityType.HOGLIN, + EntityType.COW, + EntityType.PIG, + EntityType.SHEEP, + EntityType.CHICKEN + }; + + // Duelist + this.registerPortrait(EntityGroup.ILLAGER, DUELIST_BORDER, true); + this.registerIcon(EntityGroup.ILLAGER, Items.PLAYER_HEAD, true); + for (EntityType type : duelist) { + this.registerPortrait(type, DUELIST_BORDER); + this.registerIcon(type, Items.PLAYER_HEAD); + } + + // Slayer + this.registerPortrait(EntityGroup.AQUATIC, SLAYER_BORDER, true); + this.registerPortrait(EntityGroup.ARTHROPOD, SLAYER_BORDER, true); + this.registerIcon(EntityGroup.AQUATIC, Items.CREEPER_HEAD, true); + this.registerIcon(EntityGroup.ARTHROPOD, Items.CREEPER_HEAD, true); + for (EntityType type : slayer) { + this.registerPortrait(type, SLAYER_BORDER); + this.registerIcon(type, Items.CREEPER_HEAD); + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/core/PersistentData.java b/main/src/java/ch/njol/unofficialmonumentamod/core/PersistentData.java new file mode 100644 index 00000000..6c9a2a63 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/core/PersistentData.java @@ -0,0 +1,184 @@ +package ch.njol.unofficialmonumentamod.core; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.annotations.Expose; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.time.Instant; +import java.util.Date; +import java.util.concurrent.CompletableFuture; +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.util.Util; + +public class PersistentData { + private static final String PERSISTENCE_PATH = "monumenta/persistent.json"; + private static PersistentData INSTANCE = new PersistentData(); + private static final Gson GSON = new GsonBuilder() + .excludeFieldsWithoutExposeAnnotation() + .setPrettyPrinting() + .create(); + + private PersistentData() { + + } + + public static PersistentData getInstance() { + return INSTANCE; + } + + private static boolean loaded = false; + + public static boolean isLoaded() { + return loaded; + } + + private CompletableFuture IoFuture = null; + + private boolean canNewTaskBeSubmitted() { + return IoFuture == null || IoFuture.isDone() || IoFuture.isCancelled(); + } + + public boolean initialize() { + if (loaded || !canNewTaskBeSubmitted()) { + //if already loaded or doing an IO task with the persistent data. + return false; + } + + IoFuture = CompletableFuture.runAsync(PersistentData::load, Util.getIoWorkerExecutor()); + IoFuture.thenRun(() -> loaded = true); + + return true; + } + + public boolean onLogin() { + CompletableFuture.runAsync(() -> PersistentDataLoadedCallback.EVENT.invoker().invoke(INSTANCE)); + return true; + } + + public boolean onDisconnect() { + if (!loaded || !canNewTaskBeSubmitted()) { + //if unloaded or already doing an IO task with the persistent data. + return false; + } + + PersistentDataSavingCallback.EVENT.invoker().invoke(INSTANCE); + IoFuture = CompletableFuture.runAsync(PersistentData::save, Util.getIoWorkerExecutor()); + + return true; + } + + private static File getFile() { + return FabricLoader.getInstance().getConfigDir().resolve(PERSISTENCE_PATH).toFile(); + } + + private static void load() { + File file = getFile(); + if (!file.exists()) { + return; + } + + try (FileReader reader = new FileReader(file)) { + INSTANCE = GSON.fromJson(reader, PersistentData.class); + } catch (IOException e) { + UnofficialMonumentaModClient.LOGGER.error("Caught IO error whilst trying to load persistent data", e); + } + } + + private static void save() { + File file = getFile(); + if (!file.exists()) { + try { + file.getParentFile().mkdirs(); + file.createNewFile(); + } catch (IOException e) { + UnofficialMonumentaModClient.LOGGER.error("Caught IO error whilst trying to create files for persistent data", e); + } + } + + try (FileWriter writer = new FileWriter(file)) { + writer.write(GSON.toJson(INSTANCE)); + } catch (IOException e) { + UnofficialMonumentaModClient.LOGGER.error("Caught IO error whilst trying to save persistent data", e); + } + } + + @FunctionalInterface + public interface PersistentDataLoadedCallback { + Event EVENT = EventFactory.createArrayBacked(PersistentDataLoadedCallback.class, (listeners) -> (persistentData) -> { + for (PersistentDataLoadedCallback listener: listeners) { + //Invoke all event listeners + listener.invoke(persistentData); + } + }); + + void invoke(PersistentData data); + } + + @FunctionalInterface + public interface PersistentDataSavingCallback { + Event EVENT = EventFactory.createArrayBacked(PersistentDataSavingCallback.class, (listeners) -> (persistentData) -> { + for (PersistentDataSavingCallback listener: listeners) { + //Invoke all event listeners + listener.invoke(persistentData); + } + }); + + void invoke(PersistentData data); + } + + //Exposed data + @Expose + public DatedHolder delveBounty; + @Expose + public DatedHolder> chestCount; + + public abstract static class Holder { + @Expose + public T value; + + public boolean isEmpty() { + return value == null; + } + } + + public static class DatedHolder extends Holder { + @Expose + public Long time; + + public DatedHolder(Long time, T value) { + this.time = time; + this.value = value; + } + + @Override + public String toString() { + Instant time = null; + if (this.time != null) { + time = Instant.ofEpochMilli(this.time); + } + + return "[time: %s, value: %s]".formatted(this.time != null ? Date.from(time) : "unset", value.toString()); + } + } + + public static class ShardedHolder extends Holder { + @Expose + public String shard; + + public ShardedHolder(String shard, T value) { + this.shard = shard; + this.value = value; + } + + @Override + public String toString() { + return "[shard: %s, value: %s]".formatted(shard, value.toString()); + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/core/commands/CommandHelpBuilder.java b/main/src/java/ch/njol/unofficialmonumentamod/core/commands/CommandHelpBuilder.java new file mode 100644 index 00000000..b4ea21f8 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/core/commands/CommandHelpBuilder.java @@ -0,0 +1,111 @@ +package ch.njol.unofficialmonumentamod.core.commands; + +import com.mojang.brigadier.builder.ArgumentBuilder; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.builder.RequiredArgumentBuilder; +import com.mojang.brigadier.suggestion.SuggestionProvider; +import com.mojang.brigadier.tree.CommandNode; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; +import org.jetbrains.annotations.NotNull; + +public class CommandHelpBuilder { + private static final Map commandTrees = new HashMap<>(); + + public static String getTreeOf(String commandRoot) { + return commandTrees.getOrDefault(commandRoot, "UNSET"); + } + + public static Map getCommandTrees() { + return commandTrees; + } + + public static SuggestionProvider CommandHelpSuggestionProvider() { + return (context, builder) -> { + Set keys = commandTrees.keySet(); + for (String key: keys) { + builder.suggest(key); + } + return builder.buildFuture(); + }; + } + + public static void initialize(List> roots) { + commandTrees.clear(); + for (LiteralArgumentBuilder root : roots) { + commandTrees.put(root.getLiteral(), convertCommandToTree(root)); + } + } + + private static String convertCommandToTree(LiteralArgumentBuilder root) { + List>> tree = explorePath(root); + StringBuilder builder = new StringBuilder(); + builder.append(root.getLiteral()).append(" "); + + for (int x = 0; x < tree.size(); x++) { + List> args = tree.get(x); + if (args.isEmpty()) { + continue; + } + //depth woo + + String argumentsString = getArgumentsString(args); + builder.append("<").append(argumentsString).append(">"); + if (x < tree.size() - 1) { + builder.append(" "); + } + } + + return builder.toString(); + } + + private static @NotNull String getArgumentsString(List> args) { + StringBuilder subBuilder = new StringBuilder(); + + for (int y = 0; y < args.size(); y++) { + ArgumentBuilder arg = args.get(y); + + if (arg instanceof RequiredArgumentBuilder requiredArg) { + subBuilder.append(requiredArg.getName()); + } else if (arg instanceof LiteralArgumentBuilder literalArg) { + subBuilder.append(literalArg.getLiteral()); + } else { + subBuilder.append("UNKNOWN"); + } + + if (y < args.size() - 1) { + subBuilder.append(" | "); + } + } + return subBuilder.toString(); + } + + private static List>> explorePath(ArgumentBuilder root) { + int depth = 0; + return explorePath(new ArrayList<>(), root.build(), depth); + } + + //matrix x = depth. This is so bad of an idea. + private static List>> explorePath(List>> matrix, CommandNode pathRoot, int depth) { + List> path = new ArrayList<>(); + + Collection> arguments = pathRoot.getChildren(); + for (CommandNode node: arguments) { + ArgumentBuilder nodeBuilder = node.createBuilder(); + path.add(nodeBuilder); + explorePath(matrix, node, depth + 1); + } + + if (matrix.size() > depth) { + matrix.get(depth).addAll(path); + } else { + matrix.add(path); + } + return matrix; + } +} \ No newline at end of file diff --git a/src/main/java/ch/njol/unofficialmonumentamod/core/commands/Constants.java b/main/src/java/ch/njol/unofficialmonumentamod/core/commands/Constants.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/core/commands/Constants.java rename to main/src/java/ch/njol/unofficialmonumentamod/core/commands/Constants.java diff --git a/main/src/java/ch/njol/unofficialmonumentamod/core/commands/MainCommand.java b/main/src/java/ch/njol/unofficialmonumentamod/core/commands/MainCommand.java new file mode 100644 index 00000000..cfe7cc59 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/core/commands/MainCommand.java @@ -0,0 +1,276 @@ +package ch.njol.unofficialmonumentamod.core.commands; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import ch.njol.unofficialmonumentamod.core.PersistentData; +import ch.njol.unofficialmonumentamod.hud.strike.ChestCountOverlay; +import com.mojang.brigadier.arguments.IntegerArgumentType; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.context.CommandContext; +import java.util.Collection; +import java.util.Map; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; +import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.ModContainer; +import net.fabricmc.loader.api.metadata.ModMetadata; +import net.minecraft.SharedConstants; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.ClickEvent; +import net.minecraft.text.PlainTextContent; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; + +public class MainCommand extends Constants { + public LiteralArgumentBuilder register() { + LiteralArgumentBuilder builder = LiteralArgumentBuilder.literal("umm"); + + builder.then(ClientCommandManager.literal("disableChestCountError").executes((ctx) -> runExecuteDisableChestCountError())); + + builder.then(ClientCommandManager.literal("streamermode") + .then(ClientCommandManager.literal("enable").executes((ctx) -> switchStreamerMode(true))) + .then(ClientCommandManager.literal("disable").executes((ctx) -> switchStreamerMode(false))) + ); + + builder.then(ClientCommandManager.literal("debug").then(ClientCommandManager.literal("addCount").then(ClientCommandManager.argument("count", IntegerArgumentType.integer(0)).executes((MainCommand::runAddCount))))); + + builder.then(ClientCommandManager.literal("info").executes(ctx -> runSelfInfo())); + builder.then(ClientCommandManager.literal("info") + .then(ClientCommandManager.literal("clip") + .executes(ctx -> runCopyInfo()) + .then(ClientCommandManager.literal("modlist") + .executes(ctx -> runModList()))) + ); + + builder.then(ClientCommandManager.literal("persistence") + .then(ClientCommandManager.literal("list").executes(ctx -> runListPersistentData()))); + + builder.then(ClientCommandManager.literal("help") + .then(ClientCommandManager.argument("commandName", StringArgumentType.string()) + .suggests(CommandHelpBuilder.CommandHelpSuggestionProvider()) + .executes(MainCommand::runHelpSingular)) + .executes(MainCommand::runHelp)); + + return builder; + } + + public String getName() { + return MainCommand.class.getSimpleName(); + } + + private static int runHelpSingular(CommandContext ctx) { + String commandName = ctx.getArgument("commandName", String.class); + if (commandName == null) { + ctx.getSource().sendError(Text.of("Could not get command name")); + return 1; + } + + String tree = CommandHelpBuilder.getTreeOf(commandName); + + ctx.getSource().sendFeedback(MutableText.of(PlainTextContent.of(commandName + ":\n " + tree)).fillStyle(Constants.MAIN_INFO_STYLE)); + return 0; + } + + private static int runHelp(CommandContext ctx) { + Map commandTrees = CommandHelpBuilder.getCommandTrees(); + + StringBuilder builder = new StringBuilder(); + for (Map.Entry entry: commandTrees.entrySet()) { + builder.append(entry.getKey()).append(":\n ").append(entry.getValue()) + .append('\n'); + } + + ctx.getSource().sendFeedback(MutableText.of(PlainTextContent.of(builder.toString())).fillStyle(MAIN_INFO_STYLE)); + return 0; + } + + private static int runListPersistentData() { + MutableText text = Text.literal("Persistent data:"); + text.setStyle(Constants.MAIN_INFO_STYLE); + + PersistentData persistence = PersistentData.getInstance(); + + if (persistence.chestCount != null && !persistence.chestCount.isEmpty()) { + MutableText chestCountText = Text.literal("\nChest Count:\n%s".formatted(persistence.chestCount.toString())); + chestCountText.setStyle(Constants.VALUE_STYLE); + text.append(chestCountText); + } + + + if (persistence.delveBounty != null && !persistence.delveBounty.isEmpty()) { + MutableText delveBountyText = Text.literal("\nDelve bounty:\n%s".formatted(persistence.delveBounty.toString())); + delveBountyText.setStyle(Constants.VALUE_STYLE); + text.append(delveBountyText); + } + + long weekly = Utils.getNextWeeklyReset(); + long currentTime = System.currentTimeMillis(); + + long timeTillWeekly = (weekly - currentTime) / 1000; + //get days + int daysTW = (int) (timeTillWeekly / 86400); + timeTillWeekly %= 86400; + //get hours + int hoursTW = (int) (timeTillWeekly / 3600); + timeTillWeekly %= 3600; + //get minutes + int minutesTW = (int) (timeTillWeekly / 60); + timeTillWeekly %= 60; + + String timeTillDailyDate = "%02dH:%02dM:%02dS".formatted(hoursTW, minutesTW, timeTillWeekly); + String timeTillWeeklyDate = "%2d days %02dH:%02dM:%02dS".formatted(daysTW, hoursTW, minutesTW, timeTillWeekly); + + MutableText serverInfo = Text.literal("\nServer Info: ").setStyle(Constants.MAIN_INFO_STYLE); + serverInfo.append(Text.literal("\nTime till next daily reset: ").setStyle(Constants.KEY_INFO_STYLE).append(Text.literal(timeTillDailyDate).setStyle(Constants.VALUE_STYLE))); + serverInfo.append(Text.literal("\nTime till next weekly reset: ").setStyle(Constants.KEY_INFO_STYLE).append(Text.literal(timeTillWeeklyDate).setStyle(Constants.VALUE_STYLE))); + + text.append(serverInfo); + + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(text); + return 0; + } + + private static int switchStreamerMode(boolean enable) { + try { + UnofficialMonumentaModClient.options.hideShardMode = enable; + UnofficialMonumentaModClient.options.onUpdate(); + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to switch streamer mode " + (enable ? "on" : "off"), e); + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.literal("[UMM] Caught error whilst trying to " + (enable ? "enable" : "disable") + " streamer mode").setStyle(ERROR_STYLE)); + return 1; + } + + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.literal("[UMM] " + (enable ? "enabled" : "disabled") + " streamer mode").setStyle(MAIN_INFO_STYLE)); + return 0; + } + + private static String getSelfInfoString() { + String name = UnofficialMonumentaModClient.ModInfo.name; + return "Mod Info" + + "\n------------" + + "\nName: " + name + + "\nVersion: " + UnofficialMonumentaModClient.ModInfo.getVersion() + + "\nFile name: " + UnofficialMonumentaModClient.ModInfo.fileName + + "\nMinecraft: " + MinecraftClient.getInstance().getGameVersion() + "-" + SharedConstants.getGameVersion().getName() + + "\nIn Development environment: " + (FabricLoader.getInstance().isDevelopmentEnvironment() ? "Yes" : "No") + + "\n"; + } + + private static String getModListString() { + Collection mods = FabricLoader.getInstance().getAllMods(); + StringBuilder data = new StringBuilder(); + + data.append("Mod List").append("\n------------"); + for (ModContainer mod: mods) { + ModMetadata metadata = mod.getMetadata(); + if (metadata.getId().startsWith("fabric-") || metadata.getId().equals("minecraft") || metadata.getId().equals("java")) { + continue;//Skip fabric apis, Minecraft and Java. + } + data.append("\n") + .append("[").append(metadata.getName()).append("]") + .append("[").append(metadata.getId()).append("]") + .append("[").append(metadata.getVersion().getFriendlyString()).append("]"); + + if (mod.getContainingMod().isPresent()) { + data.append(" <").append(mod.getContainingMod().get().getMetadata().getId()).append(">"); + } + } + + return data.append("\n").toString(); + } + + private static int runCopyInfo() { + MinecraftClient.getInstance().keyboard.setClipboard( + "```md\n" + .concat(getSelfInfoString()) + .concat("\n") + .concat(getModListString()) + .concat("\n```") + ); + MutableText text = Text.literal("Copied info to clipboard").setStyle(SUB_INFO_STYLE); + + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(text); + return 0; + } + + private static int runSelfInfo() { + String name = UnofficialMonumentaModClient.ModInfo.name; + + MutableText text = Text.literal("[Mod Info]").setStyle(MAIN_INFO_STYLE); + + text.append(Text.literal("\nName: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal(name).setStyle(VALUE_STYLE)); + + text.append(Text.literal("\nFile name: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal(UnofficialMonumentaModClient.ModInfo.fileName).setStyle(VALUE_STYLE)); + + text.append(Text.literal("\nVersion: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal(UnofficialMonumentaModClient.ModInfo.getVersion()).setStyle(VALUE_STYLE)); + + text.append(Text.literal("\nMinecraft: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal(MinecraftClient.getInstance().getGameVersion() + "-" + SharedConstants.getGameVersion().getName()).setStyle(VALUE_STYLE)); + + text.append(Text.literal("\nIn Development environment: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal(FabricLoader.getInstance().isDevelopmentEnvironment() ? "Yes" : "No").setStyle(VALUE_STYLE)); + + //other "pages" + text.append(Text.literal("\n[Press Here to show modlist]").setStyle(SUB_INFO_STYLE.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/umm info modlist")))); + text.append(Text.literal("\n[Press Here to show current shard]").setStyle(SUB_INFO_STYLE.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/ummShard debug loaded")))); + + //copy all info to clipboard + text.append(Text.literal("\n[Press Here to copy to clipboard]").setStyle(SUB_INFO_STYLE.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/umm info clip")))); + + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(text); + + return 0; + } + + private static int runModList() { + Collection mods = FabricLoader.getInstance().getAllMods(); + MutableText text = Text.literal("[Mod List]").setStyle(MAIN_INFO_STYLE); + + for (ModContainer mod: mods) { + ModMetadata metadata = mod.getMetadata(); + if (metadata.getId().startsWith("fabric-") || metadata.getId().equals("minecraft") || metadata.getId().equals("java")) { + continue;//Skip fabric apis, Minecraft and Java. + } + + MutableText modText = Text.literal("\n" + metadata.getName()).setStyle(MOD_INFO_STYLE); + modText.append(Text.literal(" (" + metadata.getId() + ") ").setStyle(KEY_INFO_STYLE)); + modText.append(Text.literal(metadata.getVersion().getFriendlyString()).setStyle(MOD_INFO_STYLE)); + + text.append(modText); + } + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(text); + return 0; + } + + public static int runExecuteDisableChestCountError() { + if (!UnofficialMonumentaModClient.options.enableChestCountMaxError) { + return 1; + } + UnofficialMonumentaModClient.options.enableChestCountMaxError = false; + //wouldn't want to mitigate the effect of the command. + UnofficialMonumentaModClient.saveConfig(); + MutableText text = Text.literal("[UMM] Successfully disabled warning message").setStyle(MAIN_INFO_STYLE); + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(text); + + return 0; + } + + public static int runAddCount(CommandContext commandContext) { + if (!FabricLoader.getInstance().isDevelopmentEnvironment()) { + MutableText text = Text.literal("[UMM] nuh uh, not happening.").setStyle(ERROR_STYLE); + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(text); + return 1; + } + int count = IntegerArgumentType.getInteger(commandContext, "count"); + ChestCountOverlay.INSTANCE.addCount(count); + + MutableText text = Text.literal("[UMM] added " + count + " to chestCountOverlay").setStyle(MAIN_INFO_STYLE); + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(text); + + return 0; + } +} \ No newline at end of file diff --git a/main/src/java/ch/njol/unofficialmonumentamod/core/commands/TexSpoofingInGameCommand.java b/main/src/java/ch/njol/unofficialmonumentamod/core/commands/TexSpoofingInGameCommand.java new file mode 100644 index 00000000..e8232c9a --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/core/commands/TexSpoofingInGameCommand.java @@ -0,0 +1,227 @@ +package ch.njol.unofficialmonumentamod.core.commands; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.features.spoof.TextureSpoofer; +import com.mojang.brigadier.arguments.BoolArgumentType; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.context.CommandContext; +import java.util.Locale; +import java.util.UUID; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; +import net.minecraft.command.CommandRegistryAccess; +import net.minecraft.command.argument.ItemStackArgument; +import net.minecraft.command.argument.ItemStackArgumentType; +import net.minecraft.command.argument.UuidArgumentType; +import net.minecraft.text.PlainTextContent; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; +import org.jetbrains.annotations.Nullable; + +public class TexSpoofingInGameCommand extends Constants { + public LiteralArgumentBuilder register(CommandRegistryAccess access) { + LiteralArgumentBuilder builder = LiteralArgumentBuilder.literal("texspoof"); + + builder.then( + ClientCommandManager.literal("add") + .then( + ClientCommandManager.argument("name", StringArgumentType.string()) + .then( + ClientCommandManager.argument("item", ItemStackArgumentType.itemStack(access)) + .then( + ClientCommandManager.argument("replacement", StringArgumentType.string()) + .then( + ClientCommandManager.argument("override", BoolArgumentType.bool() + ).executes(TexSpoofingInGameCommand::runAdd) + ) + ) + ) + ) + ); + builder.then( + ClientCommandManager.literal("remove") + .then( + ClientCommandManager.argument("name", StringArgumentType.string()) + .suggests(UnofficialMonumentaModClient.spoofer.spoofedItemsKeyProvider()) + .executes(TexSpoofingInGameCommand::runRemove) + .then(ClientCommandManager.literal("hope").executes(TexSpoofingInGameCommand::runRemoveHope)) + ) + ); + builder.then( + ClientCommandManager.literal("edit") + .then( + ClientCommandManager.argument("name", StringArgumentType.string()) + .suggests(UnofficialMonumentaModClient.spoofer.spoofedItemsKeyProvider()) + .then( + ClientCommandManager.literal("replacement") + .then( + ClientCommandManager.argument("replacement", StringArgumentType.string()) + .executes(TexSpoofingInGameCommand::runEditReplacement) + ) + ) + .then( + ClientCommandManager.literal("override") + .then( + ClientCommandManager.argument("override", BoolArgumentType.bool()) + .executes(TexSpoofingInGameCommand::runEditOverride) + ) + ) + .then( + ClientCommandManager.literal("item") + .then( + ClientCommandManager.argument("item", ItemStackArgumentType.itemStack(access)) + .executes(TexSpoofingInGameCommand::runEditItem) + ) + ) + .then( + ClientCommandManager.literal("hope") + .then( + ClientCommandManager.argument("uuid", UuidArgumentType.uuid()) + .executes(TexSpoofingInGameCommand::runEditHope) + ) + ) + ) + ); + + return builder; + } + + private static String cleanName(String name) { + return name.toLowerCase(Locale.ROOT).strip(); + } + + private static int runAdd(CommandContext ctx) { + String itemName = ctx.getArgument("name", String.class); + itemName = cleanName(itemName); + + //check if item already exists. + @Nullable TextureSpoofer.SpoofItem item = UnofficialMonumentaModClient.spoofer.getSpoofItemFromName(itemName); + if (item != null) { + //There is a spoofed item for this item, send error message and exit. + ctx.getSource().sendError(Text.of("This item is already spoofed, please use either remove the old one or edit it.")); + return 1; + } + + String displayName = ctx.getArgument("replacement", String.class); + ItemStackArgument replacementStack = ctx.getArgument("item", ItemStackArgument.class); + Boolean override = ctx.getArgument("override", Boolean.class); + + String finalItemName = itemName; + UnofficialMonumentaModClient.spoofer.runThenSaveFile(() -> UnofficialMonumentaModClient.spoofer.addSpoof(finalItemName, replacementStack.getItem(), displayName, override)) + .thenRun(() -> ctx.getSource().sendError(MutableText.of(PlainTextContent.of("Successfully created new spoof on \"" + finalItemName + "\"")).fillStyle(MAIN_INFO_STYLE))); + return 0; + } + + private static int runRemove(CommandContext ctx) { + String itemName = ctx.getArgument("name", String.class); + itemName = cleanName(itemName); + + //check if item already exists. + @Nullable TextureSpoofer.SpoofItem item = UnofficialMonumentaModClient.spoofer.getSpoofItemFromName(itemName); + if (item == null) { + //There is not a spoofed item for this item, send error message and exit. + ctx.getSource().sendError(Text.of("This item is not spoofed.")); + return 1; + } + + String finalItemName = itemName; + UnofficialMonumentaModClient.spoofer.runThenSaveFile(() -> UnofficialMonumentaModClient.spoofer.deleteSpoof(finalItemName)) + .thenRun(() -> ctx.getSource().sendFeedback(MutableText.of(PlainTextContent.of("Successfully deleted spoof on \"" + finalItemName + "\"")).fillStyle(MAIN_INFO_STYLE))); + return 0; + } + + private static int runEditReplacement(CommandContext ctx) { + String itemName = ctx.getArgument("name", String.class); + itemName = cleanName(itemName); + + @Nullable TextureSpoofer.SpoofItem item = UnofficialMonumentaModClient.spoofer.getSpoofItemFromName(itemName); + if (item == null) { + //There is not a spoofed item for this item, send error message and exit. + ctx.getSource().sendError(Text.of("This item is not spoofed.")); + return 1; + } + + String displayName = ctx.getArgument("replacement", String.class); + + String finalItemName = itemName; + UnofficialMonumentaModClient.spoofer.runThenSaveFile(() -> UnofficialMonumentaModClient.spoofer.editDisplayName(finalItemName, displayName)) + .thenRun(() -> ctx.getSource().sendFeedback(MutableText.of(PlainTextContent.of("Successfully changed display name replacement on \"" + finalItemName + "\" to \"" + displayName + "\"")).fillStyle(MAIN_INFO_STYLE))); + + return 0; + } + + private static int runEditOverride(CommandContext ctx) { + String itemName = ctx.getArgument("name", String.class); + itemName = cleanName(itemName); + + @Nullable TextureSpoofer.SpoofItem item = UnofficialMonumentaModClient.spoofer.getSpoofItemFromName(itemName); + if (item == null) { + //There is not a spoofed item for this item, send error message and exit. + ctx.getSource().sendError(Text.of("This item is not spoofed.")); + return 1; + } + + Boolean override = ctx.getArgument("override", Boolean.class); + + String finalItemName = itemName; + UnofficialMonumentaModClient.spoofer.runThenSaveFile(() -> UnofficialMonumentaModClient.spoofer.editOverride(finalItemName, override)) + .thenRun(() -> ctx.getSource().sendFeedback(MutableText.of(PlainTextContent.of("Successfully changed display override on \"" + finalItemName + "\" to \"" + override + "\"")).fillStyle(MAIN_INFO_STYLE))); + return 0; + } + + private static int runEditItem(CommandContext ctx) { + String itemName = ctx.getArgument("name", String.class); + itemName = cleanName(itemName); + + @Nullable TextureSpoofer.SpoofItem item = UnofficialMonumentaModClient.spoofer.getSpoofItemFromName(itemName); + if (item == null) { + //There is not a spoofed item for this item, send error message and exit. + ctx.getSource().sendError(Text.of("This item is not spoofed.")); + return 1; + } + + ItemStackArgument replacementStack = ctx.getArgument("item", ItemStackArgument.class); + + String finalItemName = itemName; + UnofficialMonumentaModClient.spoofer.runThenSaveFile(() -> UnofficialMonumentaModClient.spoofer.editItem(finalItemName, replacementStack.getItem())) + .thenRun(() -> ctx.getSource().sendFeedback(MutableText.of(PlainTextContent.of("Successfully changed item replacement on \"" + finalItemName + "\" to \"" + replacementStack.getItem().getName().getString() + "\"")).fillStyle(MAIN_INFO_STYLE))); + return 0; + } + + private static int runEditHope(CommandContext ctx) { + String itemName = ctx.getArgument("name", String.class); + itemName = cleanName(itemName); + + @Nullable TextureSpoofer.SpoofItem item = UnofficialMonumentaModClient.spoofer.getSpoofItemFromName(itemName); + if (item == null) { + //There is not a spoofed item for this item, send error message and exit. + ctx.getSource().sendError(Text.of("This item is not spoofed.")); + return 1; + } + + UUID uuid = ctx.getArgument("uuid", UUID.class); + + String finalItemName = itemName; + UnofficialMonumentaModClient.spoofer.runThenSaveFile(() -> UnofficialMonumentaModClient.spoofer.editAppliedHope(finalItemName, uuid)) + .thenRun(() -> ctx.getSource().sendFeedback(MutableText.of(PlainTextContent.of("Successfully changed item hope replacement on \"" + finalItemName + "\" to \"" + uuid.toString() + "\"")).fillStyle(MAIN_INFO_STYLE))); + return 0; + } + + private static int runRemoveHope(CommandContext ctx) { + String itemName = ctx.getArgument("name", String.class); + itemName = cleanName(itemName); + + @Nullable TextureSpoofer.SpoofItem item = UnofficialMonumentaModClient.spoofer.getSpoofItemFromName(itemName); + if (item == null) { + //There is not a spoofed item for this item, send error message and exit. + ctx.getSource().sendError(Text.of("This item is not spoofed.")); + return 1; + } + + String finalItemName = itemName; + UnofficialMonumentaModClient.spoofer.runThenSaveFile(() -> UnofficialMonumentaModClient.spoofer.editAppliedHope(finalItemName, null)) + .thenRun(() -> ctx.getSource().sendFeedback(MutableText.of(PlainTextContent.of("Successfully removed hope replacement on \"" + finalItemName + "\"")).fillStyle(MAIN_INFO_STYLE))); + return 0; + } +} \ No newline at end of file diff --git a/main/src/java/ch/njol/unofficialmonumentamod/core/gui/InventoryWidget.java b/main/src/java/ch/njol/unofficialmonumentamod/core/gui/InventoryWidget.java new file mode 100644 index 00000000..ef891087 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/core/gui/InventoryWidget.java @@ -0,0 +1,109 @@ +package ch.njol.unofficialmonumentamod.core.gui; + +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.gui.AbstractParentElement; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.Screen; + +public abstract class InventoryWidget extends AbstractParentElement implements Drawable, Selectable, Element { + protected final Screen parentScreen; + + private boolean focused; + + private final List childrens = new ArrayList<>(); + private final List drawables = new ArrayList<>(); + private final List selectables = new ArrayList<>(); + private Element focusedElement; + private Selectable selected; + public InventoryWidget(Screen parentScreen) { + this.parentScreen = parentScreen; + } + + public abstract Rectangle getDimension(); + + @Override + public void render(DrawContext ctx, int mouseX, int mouseY, float delta) { + Rectangle dimension = getDimension(); + renderBackground(ctx, dimension); + render(ctx, dimension, mouseX, mouseY, delta); + for (Drawable dr : getDrawables()) { + dr.render(ctx, mouseX, mouseY, delta); + } + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + for (Element element : this.children()) { + if (!element.mouseClicked(mouseX, mouseY, button)) { + continue; + } + + this.setFocused(element); + if (button == 0) { + this.setDragging(true); + } + return true; + } + return false; + } + + + + @Override public boolean isMouseOver(double mouseX, double mouseY) { + return getDimension().contains(mouseX, mouseY); + } + + @Override + public List children() { + return childrens; + } + public List getDrawables() { + return drawables; + } + + protected void clear() { + childrens.clear(); + drawables.clear(); + selectables.clear(); + } + + protected T addDrawableChild(T child) { + this.drawables.add(child); + return addSelectableChild(child); + } + + protected Drawable addDrawable(Drawable drawable) { + this.drawables.add(drawable); + return drawable; + } + + protected T addSelectableChild(T child) { + this.selectables.add(child); + this.childrens.add(child); + return child; + } + + @Override + public void setFocused(boolean focused) { + this.focused = focused; + } + + @Override + public boolean isFocused() { + return focused; + } + + @Override + public SelectionType getType() { + return SelectionType.FOCUSED; + } + + public abstract void renderBackground(DrawContext ctx, Rectangle dimension); + + public abstract void render(DrawContext ctx, Rectangle dimension, int mouseX, int mouseY, float delta); +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/core/init/AutoDiscoveryMixinPlugin.java b/main/src/java/ch/njol/unofficialmonumentamod/core/init/AutoDiscoveryMixinPlugin.java new file mode 100644 index 00000000..0f352b12 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/core/init/AutoDiscoveryMixinPlugin.java @@ -0,0 +1,189 @@ +package ch.njol.unofficialmonumentamod.core.init; + +import java.io.File; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +/** + * A mixin plugin to automatically discover all mixins in the current JAR. + *

+ * This mixin plugin automatically scans your entire JAR (or class directory, in case of an in-IDE launch) for classes inside of your + * mixin package and registers those. It does this recursively for sub packages of the mixin package as well. This means you will need + * to only have mixin classes inside your mixin package, which is good style anyway. + *

+ * provided under The Unlicense license + * @author Linnea Gräf + */ +public class AutoDiscoveryMixinPlugin implements IMixinConfigPlugin { + private static final List mixinPlugins = new ArrayList<>(); + + public static List getMixinPlugins() { + return mixinPlugins; + } + + private String mixinPackage; + + @Override + public void onLoad(String mixinPackage) { + this.mixinPackage = mixinPackage; + mixinPlugins.add(this); + } + + /** + * Resolves the base class root for a given class URL. This resolves either the JAR root, or the class file root. + * In either case the return value of this + the class name will resolve back to the original class url, or to other + * class urls for other classes. + */ + public URL getBaseUrlForClassUrl(URL classUrl) { + String string = classUrl.toString(); + if (classUrl.getProtocol().equals("jar")) { + try { + return new URL(string.substring(4).split("!")[0]); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + if (string.endsWith(".class")) { + try { + return new URL(string.replace("\\", "/") + .replace(getClass().getCanonicalName() + .replace(".", "/") + ".class", "")); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + return classUrl; + } + + /** + * Get the package that contains all the mixins. This value is set by mixin itself using {@link #onLoad}. + */ + public String getMixinPackage() { + return mixinPackage; + } + + /** + * Get the path inside the class root to the mixin package + */ + public String getMixinBaseDir() { + return mixinPackage.replace(".", "/"); + } + + /** + * A list of all discovered mixins. + */ + private List mixins = null; + + /** + * Try to add mixin class ot the mixins based on the filepath inside the class root. + * Removes the {@code .class} file suffix, as well as the base mixin package. + *

This method cannot be called after mixin initialization.

+ * + * @param className the name or path of a class to be registered as a mixin. + */ + public void tryAddMixinClass(String className) { + String norm = (className.endsWith(".class") ? className.substring(0, className.length() - ".class".length()) : className) + .replace("\\", "/") + .replace("/", "."); + if (norm.startsWith(getMixinPackage() + ".") && !norm.endsWith(".") && + !(Character.isDigit(norm.charAt(norm.length() - 1)) && norm.charAt(norm.length() - 2) == '$')) { + mixins.add(norm.substring(getMixinPackage().length() + 1)); + } + } + + /** + * Search through the JAR or class directory to find mixins contained in {@link #getMixinPackage()} + */ + @Override + public List getMixins() { + if (mixins != null) return mixins; + System.out.println("Trying to discover mixins"); + mixins = new ArrayList<>(); + URL classUrl = getClass().getProtectionDomain().getCodeSource().getLocation(); + System.out.println("Found classes at " + classUrl); + Path file; + try { + file = Paths.get(getBaseUrlForClassUrl(classUrl).toURI()); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + System.out.println("Base directory found at " + file); + if (Files.isDirectory(file)) { + walkDir(file); + } else { + walkJar(file); + } + System.out.println("Found mixins: " + mixins); + + return mixins; + } + + /** + * Search through directory for mixin classes based on {@link #getMixinBaseDir}. + * + * @param classRoot The root directory in which classes are stored for the default package. + */ + private void walkDir(Path classRoot) { + System.out.println("Trying to find mixins from directory"); + try (Stream classes = Files.walk(classRoot.resolve(getMixinBaseDir()))) { + classes.filter(it -> new File(it.toUri()).isFile()) + .map(it -> classRoot.relativize(it).toString()) + .forEach(this::tryAddMixinClass); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * Read through a JAR file, trying to find all mixins inside. + */ + private void walkJar(Path file) { + System.out.println("Trying to find mixins from jar file"); + try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(file))) { + ZipEntry next; + while ((next = zis.getNextEntry()) != null) { + tryAddMixinClass(next.getName()); + zis.closeEntry(); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override public void preApply(String targetClassName, org.objectweb.asm.tree.ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } + + @Override public void postApply(String targetClassName, org.objectweb.asm.tree.ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + return true; + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + + } +} \ No newline at end of file diff --git a/src/main/java/ch/njol/unofficialmonumentamod/core/shard/ShardArgumentType.java b/main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardArgumentType.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/core/shard/ShardArgumentType.java rename to main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardArgumentType.java diff --git a/main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardData.java b/main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardData.java new file mode 100644 index 00000000..58d9b63b --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardData.java @@ -0,0 +1,176 @@ +package ch.njol.unofficialmonumentamod.core.shard; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.features.locations.Locations; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParseException; +import com.google.gson.reflect.TypeToken; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Objects; +import java.util.Optional; +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.client.MinecraftClient; +import net.minecraft.resource.Resource; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public class ShardData {//TODO clean up this class + public static final String UNKNOWN_SHARD = "unknown"; + public static final String DEFAULT_KEY_OVERRIDE = "default"; + + private static final HashMap SHARDS = new HashMap<>(); + + private static final Identifier FILE_IDENTIFIER = new Identifier(UnofficialMonumentaModClient.MOD_IDENTIFIER, "override/shards.json"); + + protected static boolean editedShard = false; + + public static boolean isEditedShard() { + return editedShard; + } + + public static TabShard getCurrentShard() { + return ShardLoader.getCurrentShard(); + } + + public static TabShard getLastShard() { + return ShardLoader.getLastShard(); + } + + public static HashMap getShards() { + return SHARDS; + } + + public static Shard getShard(String shard) { + return SHARDS.get(shard); + } + + public static boolean isExistingShard(String shard) { + return SHARDS.get(shard) != null; + } + + public static String getOfficialName(String shard) { + if (SHARDS.containsKey(shard)) { + return SHARDS.get(shard).officialName; + } + return null; + } + + public static Integer getMaxChests(String shard) { + if (SHARDS.containsKey(shard)) { + return SHARDS.get(shard).maxChests; + } + return null; + } + + public static void reload() { + SHARDS.clear(); + Optional resource = MinecraftClient.getInstance().getResourceManager().getResource(FILE_IDENTIFIER); + if (resource.isEmpty()) { + return; + } + try (InputStream stream = resource.get().getInputStream()) { + HashMap hash = new GsonBuilder().create().fromJson(new InputStreamReader(stream, StandardCharsets.UTF_8), new TypeToken>() { + }.getType()); + if (hash != null) { + SHARDS.putAll(hash); + } + } catch (IOException | JsonParseException e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error while trying to reload shards", e); + } + } + + public static String getShard(Text text) { + String shard = Locations.getShortShardFrom(text); + if (shard == null) { + return ShardLoader.UNKNOWN_SHARD; + } + return shard; + } + + public static class Shard { + public final String officialName; + public final ShardType shardType; + + @Nullable + public final Integer maxChests; + public final boolean canBeDelveBounty; + + public final String smallImageOverride; + + public Shard(String officialName, ShardType shardType, @Nullable Integer maxChests, @Nullable Boolean canBeDelveBounty, @Nullable String smallImageOverride) { + this.officialName = officialName; + this.shardType = shardType; + this.maxChests = maxChests; + this.canBeDelveBounty = Boolean.TRUE.equals(canBeDelveBounty); + this.smallImageOverride = smallImageOverride != null ? smallImageOverride : "default"; + + } + + @Override + public String toString() { + return "{ \"officialName\": \"" + officialName + "\", \"shardType\": \"" + shardType + "\", \"maxChests\": " + maxChests+ ",\"canBeDelveBounty\": \""+ canBeDelveBounty +"\", " + "\"smallImageOverride\": " + smallImageOverride + "\" }"; + } + } + + public static class TabShard { + @NotNull + public final String shardString; + @NotNull + public final String shortShard; + @Nullable + public final Shard shard; + + public TabShard(@NotNull String shard) { + this.shardString = shard; + this.shortShard = shardString.replaceFirst("-\\d+$", ""); + this.shard = getShard(shortShard); + } + + protected static TabShard UNKNOWN = new TabShard(UNKNOWN_SHARD); + + @Override + public String toString() { + return shardString; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + TabShard other = (TabShard) o; + //check object equality of every field. + return shardString.equals(other.shardString) && shortShard.equals(other.shortShard) && Objects.equals(shard, other.shard); + } + } + + public enum ShardType { + STRIKE, + OVERWORLD, + DUNGEON, + MINIGAME + } + + @FunctionalInterface + public interface ShardChangedEventCallback { + Event EVENT = EventFactory.createArrayBacked(ShardChangedEventCallback.class, + (listeners) -> (currentShard, previousShard) -> { + for (ShardChangedEventCallback listener: listeners) { + //Invoke all event listeners + listener.invoke(currentShard, previousShard); + } + }); + + void invoke(TabShard currentShard, TabShard previousShard); + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardDebugCommand.java b/main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardDebugCommand.java new file mode 100644 index 00000000..85b2ee07 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardDebugCommand.java @@ -0,0 +1,128 @@ +package ch.njol.unofficialmonumentamod.core.shard; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.core.commands.Constants; +import ch.njol.unofficialmonumentamod.hud.strike.ChestCountOverlay; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.context.CommandContext; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.*; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +public class ShardDebugCommand extends Constants { + public LiteralArgumentBuilder register() { + LiteralArgumentBuilder builder = LiteralArgumentBuilder.literal("ummShard"); + + //list shards + builder.then(ClientCommandManager.literal("list").executes(ShardDebugCommand::executeList)); + builder.then(ClientCommandManager.literal("debug") + .then(ClientCommandManager.literal("set").then(ClientCommandManager.argument("shard", ShardArgumentType.Key()).executes(ShardDebugCommand::executeDebugSet))) + .then(ClientCommandManager.literal("get").then(ClientCommandManager.argument("shard", ShardArgumentType.Key()).executes(ShardDebugCommand::executeDebugGet))) + .then(ClientCommandManager.literal("loaded").executes(ShardDebugCommand::executeDebugLoaded))); + return builder; + } + + public String getName() { + return ShardDebugCommand.class.getSimpleName(); + } + + public static int executeList(CommandContext context) { + try { + final HashMap shards = ShardData.getShards(); + + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.literal("Currently loaded shards:").setStyle(MAIN_INFO_STYLE.withBold(true))); + + for (Map.Entry shardEntry : shards.entrySet()) { + MutableText shardText = Text.literal(shardEntry.getKey()); + ShardData.Shard shard = shardEntry.getValue(); + + shardText.setStyle( + MAIN_INFO_STYLE + .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.of( + "Official name: " + shard.officialName + "\nShard type: " + shard.shardType + "\nMax chests: " + (shard.maxChests != null ? shard.maxChests : "None") + ))) + ); + + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(shardText); + + } + return 0; + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error while enumerating loaded shards", e); + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.literal("[UMM] Caught error while trying to enumerate loaded shards").setStyle(ERROR_STYLE)); + return -1; + } + } + + public static int executeDebugSet(CommandContext context) { + String shardName = context.getArgument("shard", String.class); + + ShardData.editedShard = true; + ShardLoader.onManualShardSet(shardName); + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.literal("The Mod will now believe you are in: " + shardName).setStyle(MAIN_INFO_STYLE.withBold(true))); + return 0; + } + + public static int executeDebugGet(CommandContext context) { + MutableText shardText = Text.literal("Shard: " + context.getArgument("shard", String.class)); + ShardData.Shard shard = ShardArgumentType.getShardFromKey(context, "shard"); + + assert shard != null; + shardText.setStyle(MAIN_INFO_STYLE.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.of("Official name: " + shard.officialName + "\nShard type: " + shard.shardType + "\nMax chests: " + (shard.maxChests != null ? shard.maxChests : "None")))).withBold(true)); + + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(shardText); + return 0; + } + + public static int executeDebugLoaded(CommandContext context) { + try { + ChestCountOverlay chestCountOverlay = ChestCountOverlay.INSTANCE; + + Integer count = chestCountOverlay.getCurrentCount(); + Integer max = chestCountOverlay.getTotalChests(); + String lastShard = ShardData.getLastShard().shardString; + String currentShard = ShardData.getCurrentShard().shardString; + boolean isEdited = ShardData.editedShard; + boolean isWorldSpoofOptionEnabled = ShardLoader.isWorldSpoofingEnabled(); + boolean receivesLocationsPackets = ShardLoader.receivesLocationPackets(); + + //check if it loaded correctly when entering the shard (should show false if it wasn't able to load the shard after world load) + boolean loadedCorrectly = !Objects.equals(lastShard, currentShard);//Sounds like it's still broken (TODO: FIX THIS) + + //count: (if max exists then count/max else just count) loaded shard: lastShard, current shard: currentShard + MutableText text = Text.literal("[Current Shard]\n").setStyle(MAIN_INFO_STYLE); + + text.append(Text.literal("Count: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal((max != null ? count + "/" + max : count) + "\n").setStyle(VALUE_STYLE)); + + text.append(Text.literal("Last shard: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal(lastShard).setStyle(VALUE_STYLE)); + + text.append(Text.literal(" | Current shard: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal(currentShard + "\n").setStyle(VALUE_STYLE)); + + text.append(Text.literal("Loaded correctly: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal(loadedCorrectly ? "Yes" : "No").setStyle(VALUE_STYLE)); + + text.append(Text.literal(" | Was edited: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal((isEdited ? "Yes" : "No")+ "\n" ).setStyle(VALUE_STYLE)); + + text.append(Text.literal("Is World Spoofing Enabled: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal((isWorldSpoofOptionEnabled ? "Yes" : "No") + (receivesLocationsPackets ? "(Ignored)" : "") + "\n").setStyle(VALUE_STYLE)); + + text.append(Text.literal("Does the client receive location update packets: ").setStyle(KEY_INFO_STYLE)); + text.append(Text.literal((receivesLocationsPackets ? "Yes" : "No") + "\n").setStyle(VALUE_STYLE)); + + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(text); + return 0; + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error while enumerating current loaded shard", e); + return -1; + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardLoader.java b/main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardLoader.java new file mode 100644 index 00000000..1d8c2b7c --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/core/shard/ShardLoader.java @@ -0,0 +1,157 @@ +package ch.njol.unofficialmonumentamod.core.shard; + +import ch.njol.unofficialmonumentamod.ChannelHandler; +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.core.shard.ShardData.ShardChangedEventCallback; +import ch.njol.unofficialmonumentamod.core.shard.ShardData.TabShard; +import java.util.Objects; +import net.minecraft.client.MinecraftClient; +import net.minecraft.registry.RegistryKey; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.minecraft.world.World; + +import static ch.njol.unofficialmonumentamod.core.shard.ShardData.ShardChangedEventCallback; +import static ch.njol.unofficialmonumentamod.core.shard.ShardData.TabShard; +import static ch.njol.unofficialmonumentamod.core.shard.ShardData.getShard; + +public class ShardLoader { + public static final String UNKNOWN_SHARD = "unknown"; + + private static TabShard currentShard = TabShard.UNKNOWN; + private static TabShard lastLoadedShard = TabShard.UNKNOWN; + + private static boolean worldSpoofEnabled = false; + private static boolean receivingLocationPackets = false; + + public static TabShard getCurrentShard() { + return currentShard; + } + + public static TabShard getLastShard() { + return lastLoadedShard; + } + + public static boolean isWorldSpoofingEnabled() { + return worldSpoofEnabled; + } + + public static boolean receivesLocationPackets() { + return receivingLocationPackets; + } + + private static final String WORLD_SPOOF_MESSAGE_START = "World name spoofing is now "; + + public static void onMessageReceived(Text message, boolean overlay) { + String text = message.getString(); + if (!text.startsWith(WORLD_SPOOF_MESSAGE_START)) { + return; + } + + String character = text.substring(WORLD_SPOOF_MESSAGE_START.length()); + if (character.charAt(0) == 'd') { //disabled + //disabled + worldSpoofEnabled = false; + } else if (character.charAt(0) == 'e') { //enabled + //enabled + worldSpoofEnabled = true; + } else { + //Uh oh, this is either not up-to-date or the message was edited by another mod. + UnofficialMonumentaModClient.LOGGER.warn("\"Received \"{character}\" but expected \"e\" or \"d\"\", could not set world spoofing status."); + } + } + + public static void onManualShardSet(String shardName) { + debug("Manually set shard to: " + shardName); + TabShard shard = shardName.equalsIgnoreCase(UNKNOWN_SHARD) ? TabShard.UNKNOWN : new TabShard(shardName); + checkAndDispatchEvent(shard); + } + + public static void onDisconnect() { + //world spoofing could be enabled or disabled between this and next login for all we know, so we set it as uncertain + debug("Disconnecting, un-setting non-persistent values"); + worldSpoofEnabled = false; + receivingLocationPackets = false; + } + + public static void onLocationUpdatedPacket(ChannelHandler.LocationUpdatedPacket packet) { + receivingLocationPackets = true; + String content = packet.getContent(); + String shard = packet.getShard(); + + TabShard sherd = TabShard.UNKNOWN; + if (!content.equalsIgnoreCase(shard)) { + //get from content + if (getShard(content) != null) { + sherd = new TabShard(content); + } + } + + if (sherd == TabShard.UNKNOWN) { + sherd = new TabShard(shard); + } + + checkAndDispatchEvent(sherd); + } + + public static void onWorldLoaded() { + if (MinecraftClient.getInstance().world != null) { + loadWorldFromDimensionKey(MinecraftClient.getInstance().world.getRegistryKey()); + debug("Inferring shard name from dimension key"); + } + } + + public static void loadShardFromTabHeader(String shardString) { + TabShard shard = shardString.equalsIgnoreCase(UNKNOWN_SHARD) ? TabShard.UNKNOWN : new TabShard(shardString); + + if (worldSpoofEnabled || receivingLocationPackets) { + debug("Skipping tab header " + shardString + ", receiving location from packets (world spoof or locationUpdatedPacket)."); + return; + } + debug("Received tab header update: " + shardString); + checkAndDispatchEvent(shard); + } + + public static void loadWorldFromDimensionKey(RegistryKey dimKey) { + String extractedShard = extractWorldFromDimKey(dimKey); + debug("Received new world key: " + extractedShard); + + if (receivingLocationPackets) { + debug("Skipping world spoof key " + extractedShard + ", receiving location from location updated packet."); + return; + } + + if (extractedShard.equalsIgnoreCase(UNKNOWN_SHARD)) { + return; + } + worldSpoofEnabled = true; + + TabShard shard = new TabShard(extractedShard); + checkAndDispatchEvent(shard); + } + + public static String extractWorldFromDimKey(RegistryKey dimensionKey) { + Identifier worldName = dimensionKey.getValue(); + if (ShardData.isExistingShard(worldName.getPath())) { + return worldName.getPath(); + } + + return UNKNOWN_SHARD; + } + + private static void checkAndDispatchEvent(TabShard shard) { + if (!Objects.equals(shard, currentShard) && !Objects.equals(shard, TabShard.UNKNOWN)) { + debug("Shard changed, dispatching event"); + + ShardChangedEventCallback.EVENT.invoker().invoke(shard, currentShard); + currentShard = shard; + lastLoadedShard = currentShard; + } + } + + private static void debug(String message) { + if (UnofficialMonumentaModClient.options.shardDebug) { + UnofficialMonumentaModClient.debug("[Shard Loading] " + message); + } + } +} \ No newline at end of file diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/calculator/Calculator.java b/main/src/java/ch/njol/unofficialmonumentamod/features/calculator/Calculator.java new file mode 100644 index 00000000..eb500c0e --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/calculator/Calculator.java @@ -0,0 +1,64 @@ +package ch.njol.unofficialmonumentamod.features.calculator; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import ch.njol.unofficialmonumentamod.core.shard.ShardData; +import ch.njol.unofficialmonumentamod.features.locations.Locations; +import ch.njol.unofficialmonumentamod.mixins.screen.ScreenAccessor; +import java.util.Objects; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.ingame.GenericContainerScreen; +import net.minecraft.client.gui.screen.ingame.ShulkerBoxScreen; + +public class Calculator { + public static final Calculator INSTANCE = new Calculator(); + + public static CalculatorWidget lastWidgetInitialized = null; + + public static void registerListeners() { + ShardData.ShardChangedEventCallback.EVENT.register((currentShard, previousShard) -> { + CalculatorWidget.setState((currentShard.shortShard.equals("plots") || !UnofficialMonumentaModClient.options.enableKeybindOutsidePlots) ? CalculatorWidget.CalculatorState.OPEN : CalculatorWidget.CalculatorState.CLOSED); + }); + } + + public boolean shouldRender() { + return mightRender() + && CalculatorWidget.getState() == CalculatorWidget.CalculatorState.OPEN; + } + + public boolean mightRender() { + return UnofficialMonumentaModClient.options.showCalculator + && (Objects.equals(Locations.getShortShard(), "plots") || UnofficialMonumentaModClient.options.enableKeybindOutsidePlots) + && (MinecraftClient.getInstance().currentScreen instanceof GenericContainerScreen || + MinecraftClient.getInstance().currentScreen instanceof ShulkerBoxScreen); + } + + public boolean keyTyped(int keyCode, int scanCode, int modifiers) { + if (mightRender() + && UnofficialMonumentaModClient.toggleCalculatorKeyBinding.matchesKey(keyCode, scanCode) + && modifiers == 0) { + //invert current state; + CalculatorWidget.setState(CalculatorWidget.getState() == CalculatorWidget.CalculatorState.OPEN ? CalculatorWidget.CalculatorState.CLOSED : CalculatorWidget.CalculatorState.OPEN); + if (MinecraftClient.getInstance().currentScreen == null) { + return false; + } + if (CalculatorWidget.getState() == CalculatorWidget.CalculatorState.OPEN) { + //open + if (lastWidgetInitialized != null) { + return false; + } + + CalculatorWidget widget = new CalculatorWidget(MinecraftClient.getInstance().currentScreen); + widget.init(CalculatorWidget.getMode()); + Utils.addWidget(MinecraftClient.getInstance().currentScreen, widget); + lastWidgetInitialized = widget; + } else { + //close + Utils.removeWidget(MinecraftClient.getInstance().currentScreen, lastWidgetInitialized); + lastWidgetInitialized = null; + } + return true; + } + return false; + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/calculator/CalculatorWidget.java b/main/src/java/ch/njol/unofficialmonumentamod/features/calculator/CalculatorWidget.java new file mode 100644 index 00000000..2e7a18d9 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/calculator/CalculatorWidget.java @@ -0,0 +1,236 @@ +package ch.njol.unofficialmonumentamod.features.calculator; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.core.gui.InventoryWidget; +import ch.njol.unofficialmonumentamod.mixins.screen.HandledScreenAccessor; +import java.awt.Rectangle; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.text.Text; + +public class CalculatorWidget extends InventoryWidget { + private static final MinecraftClient client = MinecraftClient.getInstance(); + + private static CalculatorState state = CalculatorState.CLOSED; + private static CalculatorMode mode = CalculatorMode.NORMAL; + protected static void switchMode() { + mode = CalculatorMode.values()[(mode.ordinal() + 1) % CalculatorMode.values().length]; + if (Calculator.lastWidgetInitialized != null) { + Calculator.lastWidgetInitialized.clearValues(); + } + } + + protected static void setState(CalculatorState state) { + CalculatorWidget.state = state; + } + + public static CalculatorState getState() { + return state; + } + + public static CalculatorMode getMode() { + return mode; + } + + private static double v1 = -1; + private static double v2 = -1; + private static double wanted = -1; + + public double tryParseDouble(String string) { + try { + return Double.parseDouble(string); + } catch (NumberFormatException ex) { + return -1; + } + } + + public void onParentClosed() { + clear(); + if (!UnofficialMonumentaModClient.options.calculatorPersistOnClosed) { + clearValues(); + mode = CalculatorMode.NORMAL; + } + } + + protected void clearValues() { + v1 = -1; + v2 = -1; + wanted = -1; + } + + public void init(CalculatorMode mode) { + clear(); + Rectangle dimension = getDimension(); + + switch(mode) { + case NORMAL: { + Text cText = Text.of("Enter price per units in (C*)"); + + TextFieldWidget cWidget = new TextFieldWidget(client.textRenderer, dimension.x + 10, dimension.y + 30, Math.max((int) Math.floor(client.textRenderer.getWidth(cText) / 1.5), 20), 10, cText); + cWidget.setEditableColor(16777215); + cWidget.setPlaceholder(Text.of("Price per unit")); + if (v1 != -1) { + cWidget.setText(String.valueOf(v1)); + } + cWidget.setChangedListener((string) -> v1 = tryParseDouble(string)); + + addDrawableChild(cWidget); + + Text numText = Text.of("Enter number of units"); + + TextFieldWidget numWidget = new TextFieldWidget(client.textRenderer, dimension.x + 10, dimension.y + 75, Math.max((int) Math.floor(client.textRenderer.getWidth(numText) / 1.5), 20), 10, numText); + numWidget.setEditableColor(16777215); + numWidget.setPlaceholder(Text.of("Units")); + if (v2 != -1) { + numWidget.setText(String.valueOf(v2)); + } + numWidget.setChangedListener((string) -> v2 = tryParseDouble(string)); + + addDrawableChild(numWidget); + break; + } + case REVERSE_EXCHANGE: + case EXCHANGE: { + Text currencyCompressedText = Text.of("(C*)"); + Text currencyHyperText = Text.of("(H*)"); + + TextFieldWidget currencyCompressed1Widget = new TextFieldWidget(client.textRenderer, dimension.x + 10, dimension.y + 30, Math.max((int) Math.floor(client.textRenderer.getWidth(currencyCompressedText) / 1.5), 20), 10, currencyCompressedText); + TextFieldWidget currencyCompressed2Widget = new TextFieldWidget(client.textRenderer, dimension.x + 40, dimension.y + 30, Math.max((int) Math.floor(client.textRenderer.getWidth(currencyCompressedText) / 1.5), 20), 10, currencyCompressedText); + TextFieldWidget currencyHyperWidget = new TextFieldWidget(client.textRenderer, dimension.x + 20, dimension.y + 75, Math.max((int) Math.floor(client.textRenderer.getWidth(currencyHyperText) / 1.5), 20), 10, currencyHyperText); + + currencyCompressed1Widget.setEditableColor(16777215); + currencyCompressed2Widget.setEditableColor(16777215); + currencyHyperWidget.setEditableColor(16777215); + + currencyCompressed1Widget.setPlaceholder(Text.of("(C*)")); + currencyCompressed2Widget.setPlaceholder(Text.of("(C*)")); + currencyHyperWidget.setPlaceholder(Text.of("(H*)")); + + if (v1 != -1) { + currencyCompressed1Widget.setText(String.valueOf(v1)); + } + if (v2 != -1) { + currencyCompressed2Widget.setText(String.valueOf(v2)); + } + if (wanted != -1) { + currencyHyperWidget.setText(String.valueOf(wanted)); + } + + currencyCompressed1Widget.setChangedListener((string) -> v1 = tryParseDouble(string)); + currencyCompressed2Widget.setChangedListener((string) -> v2 = tryParseDouble(string)); + currencyHyperWidget.setChangedListener((string) -> wanted = tryParseDouble(string)); + + addDrawableChild(currencyCompressed1Widget); + addDrawableChild(currencyCompressed2Widget); + addDrawableChild(currencyHyperWidget); + break; + } + default: { + throw new IllegalStateException("calculator mode " + mode.name() + " not handled"); + } + } + + ButtonWidget.Builder buttonBuilder = new ButtonWidget.Builder(Text.of(mode.name), (button) -> { + switchMode(); + clear(); + init(getMode()); + }); + buttonBuilder.dimensions(dimension.x, dimension.y, client.textRenderer.getWidth(mode.name) + 10, 12); + addDrawableChild(buttonBuilder.build()); + } + + private static String formatResult(double result) { + if (result < 0) { + return "***"; + } + + double rest = (result % 64); + double underCompressed = (rest - Math.floor(rest)) * 8; + + return (int) Math.floor((result / 64)) + "H* " + (int) Math.floor(rest) + "C*" + (underCompressed > 0 ? " " + (int) Math.floor(underCompressed) + "*" : ""); + } + + public static String getOutput(CalculatorMode mode) { + double output; + switch (mode) { + case NORMAL -> output = normalLogic(); + case EXCHANGE -> output = exLogic(); + case REVERSE_EXCHANGE -> output = reverseExLogic(); + default -> throw new IllegalStateException("Calculator mode " + mode.name() + " not handled"); + } + + return formatResult(output); + } + + public static double normalLogic() { + if (v1 == -1 || v2 == -1) { + return -1; + } + + return v1 * v2; + } + + public static double exLogic() { + if (v1 == -1 || v2 <= 0 || wanted == -1) { + return -1; + } + + return (wanted * 64 * v1 + v2 - 1) / v2; + } + + public static double reverseExLogic() { + if (v1 <= 0 || v2 == -1 || wanted == -1) { + return -1; + } + + return (wanted * 64 * v2 + v1 - 1) / v1; + } + + public CalculatorWidget(Screen parent) { + super(parent); + } + + public Rectangle getDimension() { + int x = ((HandledScreenAccessor) parentScreen).getX() + ((HandledScreenAccessor) parentScreen).getBackGroundWidth(); + int y = ((HandledScreenAccessor) parentScreen).getY(); + final int width = state == CalculatorState.OPEN ? 140 : 20; + final int height = state == CalculatorState.OPEN ? 160 : 40; + + return new Rectangle(x, y, width, height); + } + + @Override public void renderBackground(DrawContext ctx, Rectangle dimension) { + final int bgColour = client.options.getTextBackgroundColor(0.3f); + ctx.fill(dimension.x, dimension.y, (int) dimension.getMaxX(), (int) dimension.getMaxY(), bgColour); + } + + @Override public void render(DrawContext ctx, Rectangle dimension, int mouseX, int mouseY, float delta) { + ctx.drawTextWithShadow(client.textRenderer, getOutput(mode), dimension.x + 10, dimension.y + 105, 0xffcccccc); + } + + @Override + public void appendNarrations(NarrationMessageBuilder builder) { + //nuh uh + } + + public enum CalculatorState { + OPEN, + CLOSED + } + + public enum CalculatorMode { + NORMAL("Normal"), + EXCHANGE("Exchange"), + REVERSE_EXCHANGE("Reverse exchange"); + + public final String name; + + CalculatorMode(String name) { + this.name = name; + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/discordrpc/DiscordPresence.java b/main/src/java/ch/njol/unofficialmonumentamod/features/discordrpc/DiscordPresence.java new file mode 100644 index 00000000..d1a2b608 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/discordrpc/DiscordPresence.java @@ -0,0 +1,269 @@ +package ch.njol.unofficialmonumentamod.features.discordrpc; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.core.shard.ShardData; +import ch.njol.unofficialmonumentamod.features.locations.Locations; +import club.minnced.discord.rpc.DiscordEventHandlers; +import club.minnced.discord.rpc.DiscordRPC; +import club.minnced.discord.rpc.DiscordRichPresence; + +import java.util.*; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.util.Hand; + +//TODO RPC Gui? +public class DiscordPresence { + private DiscordRPC lib = null; + String applicationId = "989262014562070619"; + String steamId = ""; + private DiscordEventHandlers handlers = null; + Long start_time = System.currentTimeMillis() / 1000; + + MinecraftClient mc = MinecraftClient.getInstance(); + + Integer times = 0; + Timer updateTimer = new Timer(); + Thread callbackThread; + + public static DiscordPresence INSTANCE = new DiscordPresence(); + + private boolean initialized = false; + public boolean isInitialized() { + return initialized; + } + + public void Init() { + if (initialized) { + return; + } + + lib = DiscordRPC.INSTANCE; + handlers = new DiscordEventHandlers(); + + handlers.ready = (user) -> UnofficialMonumentaModClient.LOGGER.info("Ready! Connected to Discord with " + user.username + "#" + user.discriminator); + lib.Discord_Initialize(applicationId, handlers, true, steamId); + + startPresence(); + + callbackThread = new Thread(() -> { + while (!Thread.currentThread().isInterrupted()) { + lib.Discord_RunCallbacks(); + try { + Thread.sleep(2000); + } catch (InterruptedException ignored) {} + } + }, "RPC-Callback-Handler"); + callbackThread.start(); + + updateTimer.scheduleAtFixedRate(new TimerTask() { + @Override + public void run() { + try { + updatePresence(); + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to update Discord Rich Presence", e); + } + } + }, 15000, 15000); + + initialized = true; + } + + public void shutdown() { + lib.Discord_Shutdown(); + callbackThread.interrupt(); + //kill old timer and setup new one + updateTimer.cancel(); + updateTimer = new Timer(); + //enable the ability to re-load discord. + initialized = false; + } + + private void startPresence() { + + DiscordRichPresence presence = new DiscordRichPresence(); + + presence.startTimestamp = start_time; + presence.details = "In the Main menu"; + presence.largeImageKey = "minecraft512"; + presence.largeImageText = getLargeImageText(); + presence.instance = 1; + lib.Discord_UpdatePresence(presence); + } + + private String getLargeImageText() { + return UnofficialMonumentaModClient.ModInfo.inDevEnvironment ? "Unofficial Monumenta Mod - Dev" : "Unofficial Monumenta Mod"; + } + + private void updatePresence() { + if (mc.world != null) { + times++; + final boolean isSinglePlayer = mc.isInSingleplayer(); + final boolean userOnMonumenta = UnofficialMonumentaModClient.isOnMonumenta(); + + DiscordRichPresence presence = new DiscordRichPresence(); + presence.startTimestamp = start_time; + presence.largeImageKey = userOnMonumenta ? "monumenta" : "minecraft512"; + presence.largeImageText = getLargeImageText(); + presence.instance = 1; + + if (isSinglePlayer) { + presence.state = "Playing Singleplayer"; + } else { + if (!userOnMonumenta) { + presence.state = "Playing Multiplayer - " + (mc.getCurrentServerEntry() != null ? mc.getCurrentServerEntry().name.toUpperCase() : "Unknown"); + } else { + String shard = getActiveShard(); + + presence.state = !Objects.equals(shard, ShardData.UNKNOWN_SHARD) ? "Playing Monumenta - " + shard : "Playing Monumenta"; + + String shardName = getShardOfficialName(shard); + if (!Objects.equals(shard, ShardData.UNKNOWN_SHARD)) { + ShardData.Shard localShard = ShardData.getShard(shard); + + String shardSmallLink; + if (localShard == null) { + shardSmallLink = shard; + } else { + shardSmallLink = !Objects.equals(localShard.smallImageOverride, ShardData.DEFAULT_KEY_OVERRIDE) ? shard : localShard.smallImageOverride; + } + + //set small image + presence.smallImageKey = shardSmallLink; + presence.smallImageText = shardName; + } + + //set details + presence.details = getDetailString(shard, shardName); + } + } + + lib.Discord_UpdatePresence(presence); + } else { + startPresence(); + } + } + + private boolean canPublicizeShards = true; + public void setCanPublicizeShards(boolean canPublicizeShards) { + this.canPublicizeShards = canPublicizeShards; + } + + private boolean canPublicizeShards() { + return canPublicizeShards && !UnofficialMonumentaModClient.options.hideShardMode; + } + + private String getActiveShard() { + if (!canPublicizeShards()) { + return ShardData.UNKNOWN_SHARD; + } + String shard = Locations.getShortShard(); + + if (shard == null) { + return ShardData.UNKNOWN_SHARD; + } + + return shard; + } + + private String getShardOfficialName(String shard) { + if (shard == null || shard.equals(ShardData.UNKNOWN_SHARD)) { + return ShardData.UNKNOWN_SHARD; + } + String shardOfficialName = ShardData.getOfficialName(shard); + if (shardOfficialName == null) { + return ShardData.UNKNOWN_SHARD; + } + return shardOfficialName; + } + + public void updateDiscordRPCDetails() { + shouldUpdate = true; + getDetectedDetails(UnofficialMonumentaModClient.options.discordDetails); + } + + private final ArrayList cachedReplacers = new ArrayList<>(); + private boolean shouldUpdate = true; + + private ArrayList getDetectedDetails(String detailString) { + if (!cachedReplacers.isEmpty() && !shouldUpdate) { + return cachedReplacers; + } + + cachedReplacers.clear(); + int lastOpenBracketFound = -1; + StringBuilder currentReplacerString = new StringBuilder(); + + for (int i = 0; i < detailString.length(); i++) { + char c = detailString.charAt(i); + + if (c == '{' && lastOpenBracketFound == -1) { + lastOpenBracketFound = i; + } else if (c == '}' && lastOpenBracketFound != -1) { + //add the replacer to the matches + cachedReplacers.add(new Match(currentReplacerString.toString())); + //reset the string builder and open bracket index + currentReplacerString = new StringBuilder(); + lastOpenBracketFound = -1; + } else if ((Character.isDigit(c) || Character.isLetter(c)) && lastOpenBracketFound != -1) { + currentReplacerString.append(c); + } + } + + shouldUpdate = false; + return cachedReplacers; + } + + public String getDetailString(String shard, String shardName) { + //set details + String detail = UnofficialMonumentaModClient.options.discordDetails; + ArrayList replacers = getDetectedDetails(detail); + + for (Match replacer: replacers) { + switch (replacer.match) { + case "player" -> { + if (mc.player == null) { + continue; + } + detail = replacer.replaceIn(detail, mc.player.getName().getString()); + } + case "shard" -> { + if (Objects.equals(shard, ShardData.UNKNOWN_SHARD)) { + continue; + } + detail = replacer.replaceIn(detail, shardName); + } + case "holding" -> { + if (mc.player == null) { + continue; + } + detail = replacer.replaceIn(detail, !Objects.equals(mc.player.getStackInHand(Hand.MAIN_HAND).getName().getString(), "Air") ? mc.player.getStackInHand(Hand.MAIN_HAND).getName().getString() : "Nothing"); + } + case "class" -> detail = replacer.replaceIn(detail, !UnofficialMonumentaModClient.abilityHandler.abilityData.isEmpty() ? UnofficialMonumentaModClient.abilityHandler.abilityData.get(0).className.toLowerCase(Locale.ROOT) : "Timed out"); + case "location" -> { + if ((Objects.equals(shard, ShardData.UNKNOWN_SHARD)) || mc.player == null) { + continue; + } + detail = replacer.replaceIn(detail, UnofficialMonumentaModClient.locations.getLocation(mc.player.getX(), mc.player.getZ(), shard)); + } + case "version" -> detail = replacer.replaceIn(detail, UnofficialMonumentaModClient.ModInfo.getVersion()); + } + } + + return detail; + } + + private static class Match { + String match; + + Match(String match) { + this.match = match; + } + + String replaceIn(String string, String replaceValue) { + return string.replace("{" + match + "}", replaceValue); + } + } + +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/effects/Effect.java b/main/src/java/ch/njol/unofficialmonumentamod/features/effects/Effect.java new file mode 100644 index 00000000..89b04470 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/effects/Effect.java @@ -0,0 +1,207 @@ +package ch.njol.unofficialmonumentamod.features.effects; + +import ch.njol.unofficialmonumentamod.ChannelHandler; +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.annotations.Expose; +import java.text.DecimalFormat; +import java.time.Duration; +import java.util.UUID; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.network.PlayerListEntry; +import net.minecraft.text.PlainTextContent; +import net.minecraft.text.MutableText; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.text.TextColor; +import net.minecraft.util.Formatting; + +public class Effect { + private static final DecimalFormat POWER_FORMAT = new DecimalFormat("0.##;-#"); + private static final Pattern EFFECT_PATTERN = Pattern.compile("(?:(?[+-]?\\d+(?:\\.\\d+)?)(?%)? )?(?.*) (?\\d*:\\d*)"); + + @Expose + public final UUID uuid; + + @Expose + public String name; + @Expose + public int effectTime; + @Expose + public float effectPower; + @Expose + public boolean isPercentage = false; + @Expose + public boolean positiveEffect = true; + @Expose + public int displayPriority = 0; + @Expose + public boolean isNonStackableEffect; + + public Effect(String name, float effectPower, int effectTime) { + isNonStackableEffect = effectPower == 0; + this.name = name; + this.effectPower = effectPower; + this.effectTime = effectTime; + this.uuid = UUID.randomUUID(); + } + + public Effect(String name, float effectPower, int effectTime, boolean isPercentage) { + isNonStackableEffect = effectPower == 0; + this.name = name; + this.effectPower = effectPower; + this.effectTime = effectTime; + this.isPercentage = isPercentage; + this.uuid = UUID.randomUUID(); + } + + public Effect(String name, float effectPower, int effectTime, UUID uuid) { + isNonStackableEffect = effectPower == 0; + this.name = name; + this.effectPower = effectPower; + this.effectTime = effectTime; + this.uuid = uuid; + } + + public Effect(String name, float effectPower, int effectTime, boolean isPercentage, UUID uuid) { + isNonStackableEffect = effectPower == 0; + this.name = name; + this.effectPower = effectPower; + this.effectTime = effectTime; + this.isPercentage = isPercentage; + this.uuid = uuid; + } + + public boolean isPositive() { + return positiveEffect; + } + + public boolean isInfiniteDuration() { + return effectTime == -1; + } + + @Override + protected Effect clone() { + //DON'T FORGET TO MAKE SURE THIS SETS ALL THE PARAMETERS CORRECTLY + Effect effect = new Effect(name, effectPower, effectTime, isPercentage); + + effect.positiveEffect = positiveEffect; + effect.displayPriority = displayPriority; + return effect; + } + + public Text toText(float tickDelta, boolean rightAligned) { + Text timeText = MutableText.of(PlainTextContent.of((rightAligned ? " " : "") + getTimeRemainingAsString(tickDelta) + (rightAligned ? "" : " "))); + Style effectStyle = Style.EMPTY.withColor((isPositive() == (effectPower >= 0)) ? Formatting.GREEN : Formatting.RED); + String effectStringPrefix = effectPower != 0 ? (isPositive() == (effectPower > 0) ? "+" : "-") : ""; + String effectString = effectStringPrefix + (effectPower != 0 ? POWER_FORMAT.format(effectPower) + (isPercentage ? "%" : "") + " " : "") + name; + Text effectText = MutableText.of(PlainTextContent.of(effectString)).setStyle(effectStyle); + TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; + int maxEffectWidth = UnofficialMonumentaModClient.options.effect_width - textRenderer.getWidth(timeText); + if (textRenderer.getWidth(effectText) > maxEffectWidth) { + int trimmedLength = textRenderer.getTextHandler().getTrimmedLength(effectString, maxEffectWidth - textRenderer.getWidth("..."), effectStyle); + effectText = MutableText.of(PlainTextContent.of(effectString.substring(0, trimmedLength) + "...")).setStyle(effectStyle); + } + return rightAligned ? MutableText.of(PlainTextContent.of("")).append(effectText).append(timeText) + : MutableText.of(PlainTextContent.of("")).append(timeText).append(effectText); + } + + public void tick() { + if (isInfiniteDuration()) return; + effectTime = Math.max(0, effectTime - 50); // never lower below 0; also don't remove until removed by the server + } + + public static Effect from(PlayerListEntry entry) { + if (entry.getDisplayName() == null) { + return null; + } + Matcher matcher = EFFECT_PATTERN.matcher(entry.getDisplayName().getString()); + if (!matcher.matches()) { + return null; + } + String effectPowerStr = matcher.group("effectPower"); + final float effectPower = effectPowerStr != null ? Float.parseFloat(effectPowerStr) : 0; + + String timeRemainingStr = matcher.group("timeRemaining"); + int timeRemaining = 0; + if (timeRemainingStr != null) { + String[] r = timeRemainingStr.split(":"); + int minutes = Integer.parseInt(r[0]);//mm + int seconds = Integer.parseInt(r[1]);//ss + + timeRemaining += minutes * 60000; + timeRemaining += seconds * 1000; + } else { + //set as infinite duration. + timeRemaining = -1; + } + + Effect effect = new Effect(matcher.group("effectName"), effectPower, timeRemaining); + effect.isPercentage = matcher.group("percentage") != null; + effect.positiveEffect = entry.getDisplayName().getSiblings().stream().noneMatch( + (sibling) -> (sibling.getStyle() != null && + sibling.getStyle().getColor() != null && + sibling.getStyle().getColor().equals(TextColor.fromFormatting(Formatting.RED)))) && + effect.effectPower >= 0; + return effect; + } + + public static Effect from(ChannelHandler.EffectInfo effectInfo) { + int tickDuration = effectInfo.duration; + int millisDuration = tickDuration * 50; + + Effect effect = new Effect(effectInfo.name, (float) effectInfo.power, tickDuration == -1 ? -1 : millisDuration, UUID.fromString(effectInfo.UUID)); + effect.isPercentage = effectInfo.percentage; + effect.positiveEffect = !(effectInfo.positive == effectInfo.power < 0); + + + effect.displayPriority = effectInfo.displayPriority; + + return effect; + } + + public void updateFrom(ChannelHandler.EffectUpdatePacket packet) { + ChannelHandler.EffectInfo info = packet.effect; + if (info.duration == 0) { + return; + } + + int tickDuration = info.duration; + int millisDuration = tickDuration * 50; + + effectPower = (float) info.power; + name = info.name; + effectTime = tickDuration != -1 ? millisDuration : -1; + isPercentage = info.percentage; + positiveEffect = !(info.positive == info.power < 0); + displayPriority = info.displayPriority; + + isNonStackableEffect = effectPower == 0; + } + + public String getTimeRemainingAsString(float tickDelta) { + if (isInfiniteDuration()) { + return ""; + } + Duration duration = Duration.ofMillis(effectTime + (int) (tickDelta * 50)); + long seconds = duration.getSeconds(); + if (seconds >= 3600) { + return "**:**"; + } + long MM = (seconds % 3600) / 60; + long SS = seconds % 60; + + return String.format("%02d:%02d", MM, SS); + } + + Gson GSON = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().create(); + + @Override + public String toString() { + return GSON.toJson(this); + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/effects/EffectData.java b/main/src/java/ch/njol/unofficialmonumentamod/features/effects/EffectData.java new file mode 100644 index 00000000..66cb6157 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/effects/EffectData.java @@ -0,0 +1,53 @@ +package ch.njol.unofficialmonumentamod.features.effects; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParseException; +import com.google.gson.reflect.TypeToken; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Optional; +import net.minecraft.client.MinecraftClient; +import net.minecraft.resource.Resource; +import net.minecraft.util.Identifier; + +public class EffectData { + private static final HashMap EFFECTS = new HashMap<>(); + private static final Identifier FILE_IDENTIFIER = new Identifier(UnofficialMonumentaModClient.MOD_IDENTIFIER, "override/effects.json"); + //current format + //"effect name": {"method": "additive"|"multiplicative"} + + public static void reload() { + EFFECTS.clear(); + Optional resource = MinecraftClient.getInstance().getResourceManager().getResource(FILE_IDENTIFIER); + if (resource.isEmpty()) { + return; + } + try (InputStream stream = resource.get().getInputStream()) { + HashMap hash = new GsonBuilder().create().fromJson(new InputStreamReader(stream, StandardCharsets.UTF_8), new TypeToken>() { + }.getType()); + if (hash != null) { + EFFECTS.putAll(hash); + } + } catch (IOException | JsonParseException e) { + UnofficialMonumentaModClient.LOGGER.error("Failed to load effects", e); + } + } + + public static String getOverrideMethod(String effectName) { + EffectOverride effect = getEffectOverride(effectName); + if (effect == null) { + return "additive"; + } + return effect.method; + } + + public static EffectOverride getEffectOverride(String effectName) { + return EFFECTS.get(effectName); + } + + public record EffectOverride(String method) {} +} \ No newline at end of file diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/effects/EffectOverlay.java b/main/src/java/ch/njol/unofficialmonumentamod/features/effects/EffectOverlay.java new file mode 100644 index 00000000..a827b539 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/effects/EffectOverlay.java @@ -0,0 +1,298 @@ +package ch.njol.unofficialmonumentamod.features.effects; + +import ch.njol.minecraft.uiframework.ElementPosition; +import ch.njol.minecraft.uiframework.hud.HudElement; +import ch.njol.unofficialmonumentamod.ChannelHandler; +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.mixins.PlayerListHudAccessor; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.UUID; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.network.ClientPlayNetworkHandler; +import net.minecraft.client.network.PlayerListEntry; +import net.minecraft.text.Text; + +public class EffectOverlay extends HudElement { + + private static final int PADDING_VERTICAL = 5; + private static final int PADDING_HORIZONTAL = 5; + + private static final ArrayList dummyEffects = new ArrayList<>(); + + static { + dummyEffects.add(new Effect( + "Active effects", + 0, + 360000 + )); + dummyEffects.add( + new Effect( + "are shown here.", + 0, + 240000 + ) + ); + dummyEffects.add( + new Effect( + "Bad Effect", + -20, + 120000 + ) + ); + dummyEffects.add( + new Effect( + "A very long effect that will mostly likely be trimmed to fit", + 10, + 60000, + true + ) + ); + } + + private final ArrayList effects = new ArrayList<>(); + private long lastUpdate = 0; + + private boolean updatingFromPackets = false; + + private void logIfDebug(String msg) { + if (UnofficialMonumentaModClient.options.logEffectPackets) { + System.out.println(msg); + } + } + + public void updatingFromPackets() { + updatingFromPackets = true; + } + + public void update() { + effects.clear(); + for (PlayerListEntry entry : getCategory("Custom Effects")) { + Effect effect = Effect.from(entry); + if (effect != null) { + effects.add(effect); + } + } + + lastUpdate = System.currentTimeMillis(); + } + + public void onJoin() { + updatingFromPackets = false; + } + + public void onMassEffectUpdatePacket(ChannelHandler.MassEffectUpdatePacket packet) { + logIfDebug("Received onMassEffectUpdatePacket"); + effects.clear(); + for (ChannelHandler.EffectInfo effectInfo: packet.effects) { + Effect effect = Effect.from(effectInfo); + effects.add(effect); + logIfDebug("Added: " + effect); + } + lastUpdate = System.currentTimeMillis(); + if (!updatingFromPackets) updatingFromPackets(); + sortEffects(); + } + + public void onEffectUpdatePacket(ChannelHandler.EffectUpdatePacket packet) { + logIfDebug("Received onEffectUpdatePacket"); + if (!updatingFromPackets) updatingFromPackets(); + + boolean foundMatching = false; + for (Effect effect: effects) { + if (effect.uuid.equals(UUID.fromString(packet.effect.UUID))){ + foundMatching = true; + + if (packet.effect.duration == 0) { + logIfDebug("Found effect with uuid & new duration is 0, clearing effect: " + effect); + effects.remove(effect); + break; + } + //found effect to update. + logIfDebug("Found effect with uuid, updating from new packet"); + effect.updateFrom(packet); + logIfDebug("Updated to: " + effect); + break; + } + } + + if (!foundMatching) { + Effect effect = Effect.from(packet.effect); + effects.add(effect); + logIfDebug("found no effect with that uuid, adding new effect: " + effect); + } + sortEffects(); + } + + public void sortEffects() { + effects.sort((effect1, effect2) -> effect2.displayPriority - effect1.displayPriority); + } + + public ArrayList getCumulativeEffects() { + final ArrayList cumulativeEffects = new ArrayList<>(); + effectLoop: + for (Effect effect : effects) { + for (Effect cumulativeEffect : cumulativeEffects) { + if (Objects.equals(cumulativeEffect.name, effect.name) && cumulativeEffect.isPercentage == effect.isPercentage) { + if (Objects.equals(EffectData.getOverrideMethod(cumulativeEffect.name), "multiplicative")) { + accumulateEffectsPOWA(cumulativeEffect, effect); + } else { + accumulateEffects(cumulativeEffect, effect); + } + continue effectLoop; + } + } + cumulativeEffects.add(effect.clone()); + } + //clear effects that well... don't affect and aren't 0 power effects. + cumulativeEffects.removeIf((effect) -> effect.effectPower == 0 && !effect.isNonStackableEffect); + return cumulativeEffects; + } + + //DOES NOT COUNT THE BASE ATTRIBUTE. //NOTE TO SELF, I prolly botched this, so might want more thorough testing. + private void accumulateEffectsPOWA(Effect curr, Effect acc) { + //powa accumulator logic a.k.a multiplicative accumulation + if (curr.positiveEffect != acc.positiveEffect) { + if (curr.positiveEffect) { + curr.effectPower /= (1 +(acc.effectPower / 100)); + } else { + curr.positiveEffect = true; + float temp = curr.effectPower; + curr.effectPower = acc.effectPower; + curr.effectPower /= (1 + (temp / 100)); + } + } else { + curr.effectPower *= (1 + (acc.effectPower / 100)); + } + + if (acc.effectTime < curr.effectTime) { + curr.effectTime = acc.effectTime; + } + } + + private void accumulateEffects(Effect curr, Effect acc) { + //basic accumulator logic a.k.a additive accumulation + if (curr.positiveEffect != acc.positiveEffect) { + if (curr.positiveEffect) { + //current is positive, accumulator is not. + curr.effectPower -= acc.effectPower; + } else { + //accumulator is positive, current is not. + curr.positiveEffect = true; + float temp = curr.effectPower; + curr.effectPower = acc.effectPower; + curr.effectPower -= temp; + } + } else { + curr.effectPower += acc.effectPower; + } + + if (acc.effectTime < curr.effectTime) { + curr.effectTime = acc.effectTime; + } + } + + public void tick() { + if (lastUpdate + 1000 < System.currentTimeMillis() && !updatingFromPackets) { + // update every second + update(); + return; + } + + for (Effect effect : effects) { + effect.tick(); + } + } + + @Override + protected void render(DrawContext drawContext, float tickDelta) { + ArrayList visibleEffects = isInEditMode() ? dummyEffects : UnofficialMonumentaModClient.options.effect_compress ? getCumulativeEffects() : effects; + TextRenderer textRenderer = client.textRenderer; + + int height = getHeight(); + int width = getWidth(); + int currentY = PADDING_VERTICAL; + + drawContext.fill(0, 0, width, height, client.options.getTextBackgroundColor(UnofficialMonumentaModClient.options.overlay_opacity)); + + boolean textAlightRight = UnofficialMonumentaModClient.options.effect_textAlightRight; + for (Effect effect : visibleEffects) { + Text text = effect.toText(tickDelta, textAlightRight); + drawContext.drawTextWithShadow(textRenderer, text, textAlightRight ? width - PADDING_HORIZONTAL - textRenderer.getWidth(text) : PADDING_HORIZONTAL, currentY, 0xFFFFFFFF); + currentY += textRenderer.fontHeight + 2; + } + } + + @Override + protected boolean isEnabled() { + return UnofficialMonumentaModClient.options.effect_enabled; + } + + @Override + protected boolean isVisible() { + return !this.effects.isEmpty(); + } + + @Override + protected int getWidth() { + return UnofficialMonumentaModClient.options.effect_width + (2 * PADDING_HORIZONTAL); + } + + @Override + protected int getHeight() { + ArrayList effects = isInEditMode() ? dummyEffects : UnofficialMonumentaModClient.options.effect_compress ? getCumulativeEffects() : this.effects; + + return effects.size() * (client.textRenderer.fontHeight + 2) - 2 + (2 * PADDING_VERTICAL); + } + + @Override + protected ElementPosition getPosition() { + return UnofficialMonumentaModClient.options.effect_position; + } + + @Override + protected int getZOffset() { + return 0; + } + + @Override + public boolean mouseReleased(double mouseX, double mouseY, int button) { + if (dragging) { + UnofficialMonumentaModClient.saveConfig(); + } + return super.mouseReleased(mouseX, mouseY, button); + } + + private static List getCategory(String categoryName) { + if (MinecraftClient.getInstance().player == null) { + return List.of(); + } + String key = categoryName.trim().toLowerCase(); + //from gold to empty entry + + //get tablist entries + ClientPlayNetworkHandler clientPlayNetworkHandler = MinecraftClient.getInstance().player.networkHandler; + List list = clientPlayNetworkHandler.getListedPlayerListEntries().stream().sorted(((PlayerListHudAccessor) MinecraftClient.getInstance().inGameHud.getPlayerListHud()).getOrdering()).limit(80L).toList(); + + + List categoryEntries = new ArrayList<>(); + boolean addEntries = false; + + for (PlayerListEntry entry: list) { + if (entry.getDisplayName() == null) continue; + + if (entry.getDisplayName().getString().trim().toLowerCase().equals(key)) { + addEntries = true; + } else if (entry.getDisplayName().getString().trim().equalsIgnoreCase("") && addEntries) { + break; + } else if (addEntries) { + categoryEntries.add(entry); + } + } + + return categoryEntries; + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/locations/Locations.java b/main/src/java/ch/njol/unofficialmonumentamod/features/locations/Locations.java new file mode 100644 index 00000000..5b0261db --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/locations/Locations.java @@ -0,0 +1,236 @@ +package ch.njol.unofficialmonumentamod.features.locations; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.core.shard.ShardData; +import ch.njol.unofficialmonumentamod.mixins.PlayerListHudAccessor; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.annotations.Expose; +import com.google.gson.reflect.TypeToken; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import net.minecraft.client.MinecraftClient; +import net.minecraft.resource.Resource; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; + +public class Locations { + //region utilities + private static final MinecraftClient mc = MinecraftClient.getInstance(); + private static final Pattern shardGetterPattern = Pattern.compile(".*<(?[-\\w\\d]*)>.*"); + + //region cache + private static long lastUpdateTimeShortShard; + private static String cachedShortShard; + + private static long lastUpdateTimeShard; + private static String cachedShard; + + public static void resetCache() { + cachedShard = null; + cachedShortShard = null; + getShortShard(); + } + //endregion + + public static void registerListeners() { + ShardData.ShardChangedEventCallback.EVENT.register((currentShard, lastShard) -> { + resetCache(); + }); + } + + public static void setShard(String shard) { + cachedShard = shard; + cachedShortShard = shard; + lastUpdateTimeShortShard = lastUpdateTimeShard = System.currentTimeMillis(); + } + + public static String getShard() { + if (cachedShard != null && lastUpdateTimeShard + 2000 > System.currentTimeMillis()) { + return cachedShard; + } + + if (ShardData.getCurrentShard() != null) { + ShardData.TabShard shard = ShardData.getCurrentShard(); + + cachedShard = shard.shardString; + lastUpdateTimeShard = System.currentTimeMillis(); + return shard.shardString; + } + + Text header = ((PlayerListHudAccessor) mc.inGameHud.getPlayerListHud()).getHeader(); + String shard = ShardData.UNKNOWN_SHARD; + if (header != null) { + String text = header.getString(); + Matcher matcher = shardGetterPattern.matcher(text); + if (matcher.matches()) { + shard = matcher.group("shard"); + } + } + + cachedShard = shard; + lastUpdateTimeShard = System.currentTimeMillis(); + return shard; + } + + public static String getShortShard() { + if (cachedShortShard != null && lastUpdateTimeShortShard + 2000 > System.currentTimeMillis()) { + return cachedShortShard; + } + + String shard = getShard(); + shard = shard.replaceFirst("-\\d+$", ""); + + cachedShortShard = shard; + lastUpdateTimeShortShard = System.currentTimeMillis(); + + return shard; + } + + public static String getShardFrom(Text text) { + if (text == null) { + return null; + } + String message = text.getString(); + Matcher matcher = shardGetterPattern.matcher(message); + + String shard = null; + if (matcher.matches()) { + shard = matcher.group("shard"); + } + + return shard; + } + + public static String getShortShardFrom(Text text) { + String fullShard = getShardFrom(text); + if (fullShard == null) { + return null; + } + + return fullShard.replaceFirst("-\\d+$", ""); + } + //endregion + + @Expose + public static Map> locations = new HashMap<>(); + + private static final Gson GSON = new GsonBuilder() + .setPrettyPrinting() + .excludeFieldsWithoutExposeAnnotation() + .create(); + private static final Identifier FILE_IDENTIFIER = new Identifier(UnofficialMonumentaModClient.MOD_IDENTIFIER, "override/locations.json"); + + protected void registerLocation(String shard, String locName, int x1, int z1, int x2, int z2) { + if (getLocationByName(shard, locName) != null) { + throw new IllegalStateException(shard + "-" + locName + " already exists, if you intended to override it, please use Location#unregisterLocation first."); + } + + List locs = getLocations(shard); + locs.add(new Location(x1, z1, x2, z2, locName)); + } + + protected void unregisterLocation(String shard, String locName) { + List locs = getLocations(shard); + for (Location loc: locs) { + if (loc.name.equalsIgnoreCase(locName)) { + locs.remove(loc); + break; + } + } + } + + public void reload() { + locations.clear(); + Optional resource = MinecraftClient.getInstance().getResourceManager().getResource(FILE_IDENTIFIER); + if (resource.isEmpty()) { + return; + } + try (InputStream stream = resource.get().getInputStream(); + InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { + locations = GSON.fromJson(reader, new TypeToken>>() { + }.getType()); + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to reload locations from resource pack", e); + } + } + + private List getLocations(String shard) { + shard = shard.replaceFirst("-\\d+$", ""); + shard = shard.toLowerCase(Locale.ROOT); + + return locations.get(shard); + } + + public String getLocation(double x, double z, String shard) { + List locations = getLocations(shard); + if (locations == null) { + return shard; + } + + for (Location loc : locations) { + if (loc.isInBounds(x, z)) { + return loc.name; + } + } + + return shard; + } + + @Nullable + public Location getLocationByName(String shard, String name) { + List locs = getLocations(shard); + if (locs == null) { + return null; + } + + for (Location loc: locs) { + if (loc.name.equalsIgnoreCase(name)) { + return loc; + } + } + + return null; + } + + public static class Location { + @Expose + int east; + @Expose + int north; + @Expose + int west; + @Expose + int south; + + @Expose + String name; + + public Location(int east, int north, int west, int south, String name) { + this.east = east; + this.north = north; + this.west = west; + this.south = south; + this.name = name; + } + + public boolean isInBounds(double x, double z) { + return ((x >= east && x <= west) || (x <= east && x >= west)) + && ((z >= north && z <= south) || (z <= north && z >= south)); + } + + @Override + public String toString() { + return String.format("[%d->%d;%d->%d];%s", east, west, north, south, name); + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/misc/DelveBounty.java b/main/src/java/ch/njol/unofficialmonumentamod/features/misc/DelveBounty.java new file mode 100644 index 00000000..113e6b04 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/misc/DelveBounty.java @@ -0,0 +1,62 @@ +package ch.njol.unofficialmonumentamod.features.misc; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import ch.njol.unofficialmonumentamod.core.PersistentData; +import ch.njol.unofficialmonumentamod.core.shard.ShardData; +import java.util.Map; +import java.util.Objects; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.MutableText; +import net.minecraft.text.PlainTextContent; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; + +public class DelveBounty { + private static final String NPCNamePattern = "\\[\\w*] "; + private static String delveBounty = null; + private static Long delveBountyTime = null; + + public static void initializeListeners() { + PersistentData.PersistentDataLoadedCallback.EVENT.register((persistentData) -> { + if (Utils.getNextWeeklyResetOf(persistentData.delveBounty.time) > System.currentTimeMillis()) { + delveBounty = persistentData.delveBounty.value; + delveBountyTime = persistentData.delveBounty.time; + } + }); + + PersistentData.PersistentDataSavingCallback.EVENT.register((persistentData) -> persistentData.delveBounty = new PersistentData.DatedHolder<>(delveBountyTime, delveBounty)); + } + + public static void onMessage(Text message, boolean overlay) { + if (overlay || !ShardData.getCurrentShard().shortShard.equals("isles") || !UnofficialMonumentaModClient.options.enableDelveRecognition) { + return;//Ignore if received outside a possible shard or if the feature is disabled. + } + + String npcText = message.getString(); + String npcMessage = npcText.replaceFirst(NPCNamePattern, ""); + if (npcMessage.equals(npcText)) { + return;//if the giver is not an NPC, ignore. + } + + for (Map.Entry entry: ShardData.getShards().entrySet()) { + if (!entry.getValue().canBeDelveBounty) { + continue;//If the shard does not have an associated bounty, skip. + } + + MutableText translatedText = Text.translatable("unofficial-monumenta-mod.delvebounty." + entry.getKey().toLowerCase()); + if (Objects.equals(npcMessage, translatedText.getString())) { + //set persistent data. + delveBountyTime = System.currentTimeMillis(); + delveBounty = entry.getKey().toLowerCase(); + + MutableText text = Text.translatable("unofficial-monumenta-mod.delvebounty.newBountyMessage") + .setStyle(Style.EMPTY.withColor(Formatting.GOLD)) + .append(MutableText.of(PlainTextContent.of(entry.getValue().officialName)).setStyle(Style.EMPTY.withColor(Formatting.RED))); + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(text); + break; + } + } + } +} \ No newline at end of file diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/misc/SlotLocking.java b/main/src/java/ch/njol/unofficialmonumentamod/features/misc/SlotLocking.java new file mode 100644 index 00000000..9d7cd766 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/misc/SlotLocking.java @@ -0,0 +1,491 @@ +package ch.njol.unofficialmonumentamod.features.misc; + +import ch.njol.minecraft.uiframework.ModSpriteAtlasHolder; +import ch.njol.unofficialmonumentamod.KeybindingUtils; +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import ch.njol.unofficialmonumentamod.mixins.screen.HandledScreenAccessor; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.option.KeyBinding; +import net.minecraft.client.sound.PositionedSoundInstance; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.slot.Slot; +import net.minecraft.screen.slot.SlotActionType; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.text.*; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.random.Random; +import org.lwjgl.glfw.GLFW; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; + +public class SlotLocking { + // This feature is largely based on https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java per the LGPL 3.0 license + private static final String CACHE_PATH = "monumenta/lockedSlots.json"; + + private static final SlotLocking INSTANCE = new SlotLocking(); + private static final LockedSlot DEFAULT_LOCKED_SLOT = new LockedSlot(); + + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + + public static SlotLocking getInstance() { + return INSTANCE; + } + + public static class LockedSlot { + //fully locked (will stop most actions that would change the content of that slot) + public boolean locked = false; + //Left click in inventory + public boolean lockHalfPickup = false; + //Right click in inventory + public boolean lockPickup = false; + //Drop, both in inventory and outside of one + public boolean lockDrop = false; + + public void switchLock(LockType type) { + if (type != LockType.ALL && locked) { + return; + } + + switch (type) { + case HALF_PICKUP -> lockHalfPickup = !lockHalfPickup; + case PICKUP -> lockPickup = !lockPickup; + case DROP -> lockDrop = !lockDrop; + case ALL -> { + locked = !locked; + lockDrop = locked; + lockHalfPickup = locked; + lockPickup = locked; + } + } + } + } + + public enum LockType { + HALF_PICKUP(), + PICKUP(), + DROP(), + ALL() + } + + public static class SlotLockData { + public LockedSlot[] lockedSlots = new LockedSlot[41]; + } + + private static ModSpriteAtlasHolder atlas; + + private static Identifier LOCK; + private static Identifier LEFT_CLICK_LOCK; + private static Identifier RIGHT_CLICK_LOCK; + private static Identifier DROP_LOCK; + + private static Identifier BASE_LOCK; + + public static KeyBinding LOCK_KEY = new KeyBinding("unofficial-monumenta-mod.keybinds.lock_slot", GLFW.GLFW_KEY_L, "unofficial-monumenta-mod.keybinds.category"); + + private static final Style lockTextStyle = Style.EMPTY.withColor(TextColor.fromRgb(0xc49417)).withBold(true); + + private static int tickSinceLastLockText = 0; + + private static int getTextCooldown() { + return Math.round(UnofficialMonumentaModClient.options.lock_textCooldown * 20); + } + + //NOTE: doesn't work in creative inventory because it would require too many compatibility layers to actually make it work without having a lot of unintended behaviours. + private final Utils.Lerp circleSize = new Utils.Lerp(0, 200); + + private SlotLockData config = new SlotLockData(); + + private static boolean isHoldingLockKey = false; + + private int ticksSinceLastLockKeyClick = -1; + + private Slot activeSlot = null; + + public static void registerSprites() { + if (atlas == null) { + atlas = ModSpriteAtlasHolder.createAtlas(UnofficialMonumentaModClient.MOD_IDENTIFIER, "gui"); + } else { + atlas.clearSprites(); + } + LOCK = atlas.registerSprite("locks/locked"); + LEFT_CLICK_LOCK = atlas.registerSprite("locks/left-click"); + RIGHT_CLICK_LOCK = atlas.registerSprite("locks/right-click"); + DROP_LOCK = atlas.registerSprite("locks/drop"); + BASE_LOCK = atlas.registerSprite("locks/base-lock"); + } + + private boolean isLockedSlot(LockedSlot locked) { + if (locked == null) { + return false; + } + + return ((locked.locked || locked.lockDrop || locked.lockHalfPickup || locked.lockPickup)); + } + + public boolean isLockedSlot(Slot slot) { + return isLockedSlot(getLockedSlot(slot)); + } + + public void drawSlot(Screen screen, DrawContext drawContext, Slot slot) { + int originX = slot.x; + int originY = slot.y; + + LockedSlot locked = getLockedSlot(slot); + + if (locked == null) { + return; + } + + if (isLockedSlot(locked) && LOCK != null) { + drawContext.drawSprite(originX, originY, 0, 16, 16, atlas.getSprite(LOCK)); + } + + //status of special locks + if (UnofficialMonumentaModClient.options.lock_renderDebuggingAdvancedLock) { + TextRenderer tr = MinecraftClient.getInstance().textRenderer; + + drawContext.drawTextWithShadow(tr, Text.of("L"), originX, originY, locked.lockPickup ? 0xFFFFFFFF : 0xFFFF0000);//locked.lockPickup + drawContext.drawTextWithShadow(tr, Text.of("D"), originX + MinecraftClient.getInstance().textRenderer.getWidth("L"), originY, locked.lockDrop ? 0xFFFFFFFF : 0xFFFF0000);//locked.lockDrop + drawContext.drawTextWithShadow(tr, Text.of("H"), originX + MinecraftClient.getInstance().textRenderer.getWidth("LD"), originY, locked.lockHalfPickup ? 0xFFFFFFFF : 0xFFFF0000);//locked.lockHalfPickup + } + } + + public void onInputEvent(CallbackInfo ci) { + MinecraftClient client = MinecraftClient.getInstance(); + if (client.player == null || (client.currentScreen instanceof CreativeInventoryScreen)) { + return; + } + + if (client.options.dropKey.isPressed() || client.options.dropKey.wasPressed()) { + LockedSlot activeHandLocked = getLockedSlotIndex(client.player.getInventory().selectedSlot); + if (activeHandLocked != null && (activeHandLocked.lockDrop || activeHandLocked.locked)) { + if (tickSinceLastLockText >= getTextCooldown()) { + client.inGameHud.getChatHud().addMessage(MutableText.of(Text.of("Stopped dropping of locked item").getContent()).setStyle(lockTextStyle)); + tickSinceLastLockText = 0; + } + ci.cancel(); + } + } + } + + public void tickRender(DrawContext drawContext, int mouseX, int mouseY) { + if (!(MinecraftClient.getInstance().currentScreen instanceof HandledScreen containerScreen) || MinecraftClient.getInstance().player == null || activeSlot == null) { + return; + } + + circleSize.tick(); + + int slotIndex = activeSlot.getIndex(); + + int containerOriginX = ((HandledScreenAccessor) containerScreen).getX(); + int containerOriginY = ((HandledScreenAccessor) containerScreen).getY(); + + //origin of container + relative origin of slot + int absoluteSlotX = containerOriginX + activeSlot.x; + int absoluteSlotY = containerOriginY + activeSlot.y; + + if (isHoldingLockKey) { + if (circleSize.getTarget() != 20.0f) { + circleSize.setTarget(20.0f); + circleSize.resetTimer(); + } + } else { + if (circleSize.getValue() != 0.0f) { + circleSize.setValue(0.0f); + circleSize.setTarget(0.0f); + } + } + + if (isHoldingLockKey) { + LockedSlot slot = config.lockedSlots[slotIndex]; + //is active and being held + + Utils.drawFilledPolygon(drawContext, absoluteSlotX + 8, absoluteSlotY + 8, circleSize.getValue(), 360, 0x404040a0); + + drawContext.drawSprite(absoluteSlotX - 15, absoluteSlotY - 15, 0, 16, 16, atlas.getSprite(LEFT_CLICK_LOCK)); + if (slot.lockPickup) { + drawContext.drawSprite(absoluteSlotX - 15, absoluteSlotY - 15, 0, 16, 16, atlas.getSprite(BASE_LOCK)); + } + + drawContext.drawSprite(absoluteSlotX + 15, absoluteSlotY - 15, 0, 16, 16, atlas.getSprite(RIGHT_CLICK_LOCK)); + if (slot.lockHalfPickup) { + drawContext.drawSprite(absoluteSlotX + 15, absoluteSlotY - 15, 0, 16, 16, atlas.getSprite(BASE_LOCK)); + } + + drawContext.drawSprite(absoluteSlotX, absoluteSlotY + 15, 0, 16, 16, atlas.getSprite(DROP_LOCK)); + if (slot.lockDrop) { + drawContext.drawSprite(absoluteSlotX, absoluteSlotY + 15, 0, 16, 16, atlas.getSprite(BASE_LOCK)); + } + + } else if (ticksSinceLastLockKeyClick <= 2) { + //right after releasing lock key + + //use middle of the slot as the origin. + //Since the detection of the slot is done in a 16x16 area from its origin it shouldn't cause an issue. + int dragX = (absoluteSlotX + 8) - mouseX; + int dragY = (absoluteSlotY + 8) - mouseY; + + if (config.lockedSlots[slotIndex] == null) { + config.lockedSlots[slotIndex] = new LockedSlot(); + } + + //position for full lock hitbox + final int full_left = 8;//- + final int full_right = 8; + final int full_up = 8; + final int full_down = 8;//- + + //position for top buttons hitbox (left and right click locks) + final int top_min_y = 2; + final int left_max_right = 10; + final int right_max_left = 10; + + //position for drop button hitbox + final int bottom_max_y = 8; + final int side_max_x = 20; + + if (dragX > left_max_right && dragY > top_min_y) { + //LEFT button + config.lockedSlots[slotIndex].switchLock(LockType.PICKUP); + } else if (dragX < -right_max_left && dragY > top_min_y) { + //RIGHT button + config.lockedSlots[slotIndex].switchLock(LockType.HALF_PICKUP); + } else if ((dragX > -side_max_x && dragX < side_max_x) && dragY < -bottom_max_y) { + //DROP button + config.lockedSlots[slotIndex].switchLock(LockType.DROP); + } else if ((dragX > -full_left && dragX < full_right) && (dragY > -full_down && dragY < full_up)) { + //FULL lock + config.lockedSlots[slotIndex].switchLock(LockType.ALL); + } + + MinecraftClient.getInstance().getSoundManager().play(new PositionedSoundInstance(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 1.0f, isLockedSlot(activeSlot) ? 0.943f : 0.1f, Random.create(), MinecraftClient.getInstance().player.getBlockPos())); + + //reset active slot + activeSlot = null; + } + } + + private static boolean isLockKeyPressed() { + return KeybindingUtils.isKeyPressed(LOCK_KEY); + } + + public void onEndTick() { + if (MinecraftClient.getInstance().world == null) { + return; + } + tickSinceLastLockText++; + if (!isLockKeyPressed()) { + if (ticksSinceLastLockKeyClick == -1) { + ticksSinceLastLockKeyClick = 1; + } else { + ticksSinceLastLockKeyClick++; + } + + if (isHoldingLockKey && ticksSinceLastLockKeyClick > 1) { + isHoldingLockKey = false; + } + } else { + isHoldingLockKey = true; + ticksSinceLastLockKeyClick = 0; + } + } + + public void onKeyboardInput(Screen screen, int code, int scancode, int modifiers, CallbackInfoReturnable cir) { + if (!(screen instanceof HandledScreen containerScreen) || MinecraftClient.getInstance().player == null || (screen instanceof CreativeInventoryScreen)) { + return; + } + + final int scaledWidth = MinecraftClient.getInstance().getWindow().getScaledWidth(); + final int scaledHeight = MinecraftClient.getInstance().getWindow().getScaledHeight(); + double mouseX = MinecraftClient.getInstance().mouse.getX() * (double)scaledWidth / (double)MinecraftClient.getInstance().getWindow().getWidth(); + double mouseY = MinecraftClient.getInstance().mouse.getY() * (double)scaledHeight / (double)MinecraftClient.getInstance().getWindow().getHeight(); + if (!LOCK_KEY.isUnbound() && LOCK_KEY.matchesKey(code, scancode) && !isHoldingLockKey) { + isHoldingLockKey = true; + + Slot slot = ((HandledScreenAccessor) containerScreen).doGetSlotAt(mouseX, mouseY); + if (slot != null && + slot.inventory instanceof PlayerInventory) { + int slotI = slot.getIndex(); + if ((slotI >= 0 && slotI <= 40) && config.lockedSlots != null) { + if (config.lockedSlots[slotI] == null) { + config.lockedSlots[slotI] = new LockedSlot(); + } + + activeSlot = slot; + } + } + } + } + + public boolean onSlotClicked(Screen screen, Slot slot, int slotId, int button, SlotActionType actionType) { + if (!(screen instanceof HandledScreen) || MinecraftClient.getInstance().player == null) { + return false; + } + + return handleSlotInteraction(slot, button, actionType); + } + + private boolean handleSlotInteraction(Slot slot, int button, SlotActionType actionType) { + LockedSlot locked = getLockedSlot(slot); + if (locked == null) { + return false; + } + + boolean shouldBlock = false; + + switch (actionType) { + case PICKUP -> shouldBlock = shouldBlockPickupAction(slot, button, actionType); + case SWAP -> shouldBlock = shouldBlockSwapAction(slot, button, actionType); + case QUICK_MOVE -> shouldBlock = shouldBlockQuickMoveAction(slot, button, actionType); + case THROW -> { + if (!getLockedSlot(slot).lockDrop) break; + shouldBlock = true; + if (tickSinceLastLockText < getTextCooldown()) break; + + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(MutableText.of(Text.of("Stopped dropping of locked item").getContent()).setStyle(lockTextStyle)); + tickSinceLastLockText = 0; + } + } + + if (shouldBlock && MinecraftClient.getInstance().player != null) { + MinecraftClient.getInstance().getSoundManager().play(new PositionedSoundInstance(SoundEvents.BLOCK_NOTE_BLOCK_BASS.value(), SoundCategory.PLAYERS, 1.0f, 0.1f, Random.create(), MinecraftClient.getInstance().player.getBlockPos())); + } + + return shouldBlock; + } + + private boolean shouldBlockQuickMoveAction(Slot slot, int button, SlotActionType actionType) { + if (actionType != SlotActionType.QUICK_MOVE || slot == null) { + return false; + } + + LockedSlot locked = getLockedSlot(slot); + if (locked == null) { + return false; + } + + return locked.lockPickup || locked.locked; + } + + private boolean shouldBlockPickupAction(Slot slot, int button, SlotActionType actionType) { + if (actionType != SlotActionType.PICKUP || slot == null) { + return false; + } + LockedSlot locked = getLockedSlot(slot); + if (locked == null) { + return false; + } + + return button == 0 ? (locked.lockPickup || locked.locked) : button == 1 ? (locked.lockHalfPickup || locked.locked) : locked.locked; + } + + + private boolean shouldBlockSwapAction(Slot slot, int button, SlotActionType actionType) { + if (actionType != SlotActionType.SWAP || slot == null) { + return false; + } + + for (int i = 0; i < MinecraftClient.getInstance().options.hotbarKeys.length; i++) { + if (button == i && (getLockedSlotIndex(i) != null && getLockedSlotIndex(i).locked || getLockedSlot(slot) != null && getLockedSlot(slot).locked)) { + if (tickSinceLastLockText >= getTextCooldown()) { + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(MutableText.of(Text.of("Stopped exchange of locked item").getContent()).setStyle(lockTextStyle)); + tickSinceLastLockText = 0; + } + return true; + } + } + return false; + } + + public boolean isSlotIndexLocked(int index) { + LockedSlot locked = getLockedSlotIndex(index); + + return locked != null && + locked.locked; + } + + public LockedSlot getLockedSlot(Slot slot) { + if (slot == null || MinecraftClient.getInstance().player == null) { + return null; + } + if (!(slot.inventory instanceof PlayerInventory)) { + return null; + } + int index = slot.getIndex(); + if (index < 0 || index > 40) { + return null; + } + return getLockedSlotIndex(index); + } + + private LockedSlot getLockedSlot(LockedSlot[] lockedSlots, int index) { + if (lockedSlots == null) { + return DEFAULT_LOCKED_SLOT; + } + + LockedSlot slot = lockedSlots[index]; + + if (slot == null) { + return DEFAULT_LOCKED_SLOT; + } + + return slot; + } + + public LockedSlot getLockedSlotIndex(int index) { + if (config == null) { + return null; + } + return getLockedSlot(config.lockedSlots, index); + } + + private File getFile() { + return FabricLoader.getInstance().getConfigDir().resolve(CACHE_PATH).toFile(); + } + + public void reload() { + File file = getFile(); + if (!file.exists()) { + return; + } + + try (FileReader reader = new FileReader(file)) { + config = GSON.fromJson(reader, SlotLockData.class); + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to reload slot locking data", e); + } + } + + public void save() { + File file = getFile(); + if (!file.exists()) { + try { + file.getParentFile().mkdirs(); + file.createNewFile(); + } catch (IOException e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to create files for slot locking data", e); + } + } + + try (FileWriter writer = new FileWriter(file)) { + writer.write(GSON.toJson(config)); + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to save slot locking data", e); + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/misc/dev/ItemDataOverlay.java b/main/src/java/ch/njol/unofficialmonumentamod/features/misc/dev/ItemDataOverlay.java new file mode 100644 index 00000000..297d3d42 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/misc/dev/ItemDataOverlay.java @@ -0,0 +1,427 @@ +package ch.njol.unofficialmonumentamod.features.misc.dev; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import ch.njol.unofficialmonumentamod.core.gui.InventoryWidget; +import ch.njol.unofficialmonumentamod.features.misc.managers.MessageNotifier; +import ch.njol.unofficialmonumentamod.mixins.screen.HandledScreenAccessor; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.function.Function; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; +import net.minecraft.client.gui.tooltip.TooltipComponent; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.client.util.InputUtil; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.screen.slot.Slot; +import net.minecraft.text.MutableText; +import net.minecraft.text.PlainTextContent; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import org.lwjgl.glfw.GLFW; + +public class ItemDataOverlay extends InventoryWidget { + private static final MinecraftClient client = MinecraftClient.getInstance(); + private static ItemDataOverlay lastInitializedWidget = null; + + private final ItemStack itemStack; + private final List cachedLines; + + private double pos = 0; + + public ItemDataOverlay(Screen parent, ItemStack stack) { + super(parent); + itemStack = stack.copy(); + cachedLines = UnofficialMonumentaModClient.options.itemdataoverlay_mode.invoke(stack); + } + + private final int TITLE_HEIGHT = 20; + private final float TITLE_SCALE_FACTOR = 1.5f; + + @Override public Rectangle getDimension() { + int x = ((HandledScreenAccessor) parentScreen).getX() + ((HandledScreenAccessor) parentScreen).getBackGroundWidth(); + int y = ((HandledScreenAccessor) parentScreen).getY() - TITLE_HEIGHT; + + int TITLE_MARGIN = 4; + int width = TooltipComponent.of(itemStack.getName().asOrderedText()).getWidth(client.textRenderer) + (TITLE_MARGIN * 2); + width = Math.max(width, 160); + + int height = 180; + + return new Rectangle(x, y, (int) (width * TITLE_SCALE_FACTOR), height); + } + + @Override public void renderBackground(DrawContext ctx, Rectangle dimension) { + final int backgroundColor = client.options.getTextBackgroundColor(0.3f); + ctx.fill(dimension.x, dimension.y, (int) dimension.getMaxX(), (int) dimension.getMaxY(), backgroundColor); + } + + @Override public void render(DrawContext ctx, Rectangle dimension, int mouseX, int mouseY, float delta) { + renderTitle(ctx, mouseX, mouseY, dimension); + + int yPos = dimension.y + TITLE_HEIGHT; + for (int i = (int) pos; i < cachedLines.size(); i++) { + if (yPos + (client.textRenderer.fontHeight + 1) > dimension.getMaxY()) { + //add 1 to relativeIndex to keep a short margin, stops it from going overboard. + break; + } + Text line = cachedLines.get(i); + if (client.textRenderer.getWidth(line) >= dimension.getWidth()) { + //limit size to avoid going over the container limit + remove trailing as " ..." doesn't look as good. + line = trimToWidth(line, (int) dimension.getWidth() - (client.textRenderer.getWidth("...") * 2)); + } + + TooltipComponent component = TooltipComponent.of(line.asOrderedText()); + component.drawText(client.textRenderer, dimension.x + 10, yPos, ctx.getMatrices().peek().getPositionMatrix(), ctx.getVertexConsumers()); + yPos += (client.textRenderer.fontHeight + 1); + } + + renderScrollbar(ctx, mouseX, mouseY, dimension, (int) pos, (int) renderableLines(), cachedLines.size()); + } + + /** + * careful, shits recursive. + * @param text the text we're currently checking + * @param siblings the current known siblings of the root text + * @param currDepth current depth + * @param maxDepth the maximum depth we're allowed to go + * @return the new list of siblings of the root text. + */ + private List getTextSiblings(Text text, List siblings, int currDepth, int maxDepth) { + if (currDepth >= maxDepth || text.getSiblings().isEmpty()) { + siblings.add(text); + return siblings; + } + + for (Text sibling: text.getSiblings()) { + getTextSiblings(sibling, siblings, currDepth + 1, maxDepth); + } + return siblings; + } + + private Text trimToWidth(Text text, int width) { + if (width <= 0) { + return Text.empty(); + } + + int currentWidth = text.getLiteralString() != null ? text.getLiteralString().length() : 0; + if (currentWidth > width) { + Text trimmed = (Text) client.textRenderer.trimToWidth(text, width); + trimmed.visit((str) -> { + str = str.stripTrailing(); + str += "..."; + return Optional.of(str); + }); + return trimmed; + } + + + List oldSiblings = getTextSiblings(text, new ArrayList<>(), 0, 5); + List newSiblings = new ArrayList<>(); + for (int i = 0; i < oldSiblings.size(); i++) { + Text sibling = oldSiblings.get(i); + String siblingText = sibling.getContent().visit(Optional::of).orElse(""); + int textWidth = client.textRenderer.getWidth(siblingText); + currentWidth += textWidth; + if (currentWidth > width) { + int widthDelta = currentWidth - width; + siblingText = client.textRenderer.trimToWidth(siblingText, textWidth - widthDelta); + if (i == oldSiblings.size() - 1) { + siblingText = siblingText.stripTrailing(); + siblingText += "..."; + } + + newSiblings.add(MutableText.of(PlainTextContent.of(siblingText)).setStyle(sibling.getStyle())); + break; + } + newSiblings.add(sibling); + } + + MutableText newText = MutableText.of(text.getContent()).setStyle(text.getStyle()); + for (Text newSibling : newSiblings) { + newText.append(newSibling); + } + return newText; + } + + private void renderTitle(DrawContext ctx, double mouseX, double mouseY, Rectangle dimension) { + ctx.getMatrices().push(); + ctx.getMatrices().scale(TITLE_SCALE_FACTOR, TITLE_SCALE_FACTOR, TITLE_SCALE_FACTOR); + TooltipComponent component = TooltipComponent.of(itemStack.getName().asOrderedText()); + int titleY = (dimension.y) + ((TITLE_HEIGHT - client.textRenderer.fontHeight) / 2); + double titleX = dimension.x + ((dimension.getWidth()) / TITLE_SCALE_FACTOR - component.getWidth(client.textRenderer)) / 2; + + component.drawText(client.textRenderer, (int) (titleX / TITLE_SCALE_FACTOR), (int) (titleY / TITLE_SCALE_FACTOR), ctx.getMatrices().peek().getPositionMatrix(), ctx.getVertexConsumers()); + ctx.getMatrices().pop(); + } + + private void renderScrollbar(DrawContext ctx, double mouseX, double mouseY, Rectangle dimension, int firstPos, int renderedSize, int size) { + float factor = renderedSize / (float) size; + double height = dimension.getHeight() - TITLE_HEIGHT; + + int basePos = (int) ((double) firstPos / size * height); + double barHeight = Math.min(factor * height, height); + + Rectangle barDimensions = getBaseBarDimension(); + boolean mouseOverBar = barDimensions.contains(mouseX, mouseY) || clickedInBar; + + barDimensions.y += basePos; + barDimensions.height = (int) barHeight; + if (mouseOverBar) { + barDimensions.y -= 1; + barDimensions.x -= 1; + barDimensions.width += 2; + barDimensions.height += 2; + } + + ctx.fill(barDimensions.x, barDimensions.y, (int) barDimensions.getMaxX(), (int) barDimensions.getMaxY(), 0xFFFFFFFF); + } + + private boolean clickedInBar = false; + @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (getBaseBarDimension().contains(mouseX, mouseY) && button == 0) { + clickedInBar = true; + return true; + } + + return super.mouseClicked(mouseX, mouseY, button); + } + + @Override public boolean mouseReleased(double mouseX, double mouseY, int button) { + Rectangle barDimensions = getBaseBarDimension(); + if (barDimensions.contains(mouseX, mouseY) && button == 0) { + double relativeYPos = mouseY - barDimensions.y; + int size = cachedLines.size(); + + pos = (relativeYPos / (getDimension().getHeight() - TITLE_HEIGHT)) * size; + clampPosition(); + + return true; + } + + clickedInBar = false; + return super.mouseReleased(mouseX, mouseY, button); + } + + @Override public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) { + //invert movement so it lines up and clamp the result to the size of the list. + pos += (int) -verticalAmount; + clampPosition(); + return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount); + } + + @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { + if (clickedInBar) { + int size = cachedLines.size(); + double relativeDrag = deltaY / (getDimension().getHeight() - TITLE_HEIGHT); + double relativeMove = relativeDrag * size; + + pos = pos + relativeMove; + clampPosition(); + + return true; + } + + return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); + } + + @Override public void appendNarrations(NarrationMessageBuilder builder) { + //nuh uh + } + + private void clampPosition() { + pos = Utils.clamp(0, (float) pos, (float) (cachedLines.size() - (1 + renderableLines()))); + } + + private double renderableLines() { + //remove 1 from the total, to keep the margin into account. + return (getBaseBarDimension().getHeight() / ((client.textRenderer.fontHeight + 1))) - 1; + } + + private Rectangle getBaseBarDimension() { + Rectangle dim = getDimension(); + int baseY = dim.y + TITLE_HEIGHT; + + int barWidth = 2; + double barHeight = dim.getHeight() - TITLE_HEIGHT; + return new Rectangle( + dim.x, + baseY, + barWidth, + (int) barHeight + ); + } + + private static List splitNbt(NbtCompound tag) { + List splits = new ArrayList<>(); + + String dirtyNbt = tag.toString(); + StringBuilder builder = new StringBuilder(); + + boolean skipNext = false; + boolean inQuotation = false; + int depth = 0; + for (int i = 0; i < dirtyNbt.length(); i++) { + char c = dirtyNbt.charAt(i); + if (!skipNext && (c == '\'' || c == '\"')) { + inQuotation = !inQuotation; + builder.append(c); + continue; + } + + if (c == '\\') { + skipNext = !skipNext; + builder.append(c); + continue; + } + + if (!skipNext) { + //put the character on the next line. + if ( c == ']' || c == '}') { + splits.add(Text.of(builder.toString().indent(depth).stripTrailing())); + builder.setLength(0); + depth--; + } + } + + builder.append(c); + if (!skipNext) { + //put the character on this line, then new line. + if (c == ',' || c == '[' || c == '{') { + if (c == '[' || c == '{') { + depth++; + } + splits.add(Text.of(builder.toString().indent(depth).stripTrailing())); + builder.setLength(0); + } + } + skipNext = false; + } + if (!builder.isEmpty()) { + splits.add(Text.of(builder.toString())); + } + + return splits; + } + + private static boolean mightRender() { + return client.currentScreen instanceof HandledScreen; + } + + private static ItemStack getFocusedStack(HandledScreen handled) { + Slot focused = ((HandledScreenAccessor) handled).getFocusedSlot(); + if (focused == null || ((HandledScreenAccessor)handled).isMouseOverSlot(focused, client.mouse.getX(), client.mouse.getY()) || !focused.hasStack()) { + return null; + } + return focused.getStack(); + } + + public void copyContentToClipboard() { + StringBuilder builder = new StringBuilder(); + for (Text cachedLine : cachedLines) { + builder.append(cachedLine.getLiteralString()).append("\n"); + } + client.keyboard.setClipboard(builder.toString()); + } + + public static boolean keyTyped(int keyCode, int scanCode, int modifiers) { + if (lastInitializedWidget != null && client.currentScreen != null) { + if (modifiers == 0) { + if (keyCode == InputUtil.GLFW_KEY_UP) { + lastInitializedWidget.pos--; + lastInitializedWidget.clampPosition(); + } else if (keyCode == InputUtil.GLFW_KEY_DOWN) { + lastInitializedWidget.pos++; + lastInitializedWidget.clampPosition(); + } + } else { + if (((modifiers & GLFW.GLFW_MOD_CONTROL) != 0) + && ((modifiers & GLFW.GLFW_MOD_SHIFT) != 0)) { + if (keyCode == InputUtil.GLFW_KEY_C) { + lastInitializedWidget.copyContentToClipboard(); + MutableText text = Text.literal("Copied Item Data to clipboard"); + text.setStyle(Style.EMPTY.withColor(Formatting.AQUA)); + MessageNotifier.RenderedMessage renderedMessage = new MessageNotifier.RenderedMessage(text); + MessageNotifier.getInstance().addOrStackMessageToQueue(renderedMessage); + } + } + } + } + + if (mightRender() && UnofficialMonumentaModClient.nbtDevOverlayKeyBinding.matchesKey(keyCode, scanCode) + && modifiers == 0) { + if (!(client.currentScreen instanceof HandledScreen handled)) { + return false; + } + ItemStack stack = getFocusedStack(handled); + ItemStack oldStack = null; + + if (lastInitializedWidget != null) { + oldStack = lastInitializedWidget.itemStack; + Utils.removeWidget(handled, lastInitializedWidget); + lastInitializedWidget = null; + } + + //do not re-open if it seems like it is the same item. + if (stack != null && !(oldStack != null && stack.toString().equals(oldStack.toString()))) { + ItemDataOverlay overlay = new ItemDataOverlay(handled, stack); + Utils.addWidget(handled, overlay); + lastInitializedWidget = overlay; + } + return true; + } + return false; + } + + public static void onGUIClosed() { + if (lastInitializedWidget != null) { + lastInitializedWidget = null; + } + } + + public static void onGUIResized(Screen screen) { + if (screen instanceof HandledScreen handled) { + if (lastInitializedWidget != null) { + ItemDataOverlay overlay = new ItemDataOverlay(handled, lastInitializedWidget.itemStack); + Utils.addWidget(handled, overlay); + lastInitializedWidget = overlay; + } + return; + } + lastInitializedWidget = null; + } + + public enum ItemDataOverlayMode { + NBT((stack) -> { + if (stack.hasNbt() && stack.getNbt() != null) { + return splitNbt(stack.getNbt()); + } + return List.of(); + }), + TOOLTIP((stack) -> { + List tooltip = stack.getTooltip(client.player, TooltipContext.ADVANCED); + //remove the first one as it is already set as the title. + tooltip.removeFirst(); + return tooltip; + }) + + ; + final Function> _invoker; + + ItemDataOverlayMode(Function> invoker) { + _invoker = invoker; + } + + public List invoke(ItemStack itemStack) { + return _invoker.apply(itemStack); + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/misc/managers/MessageNotifier.java b/main/src/java/ch/njol/unofficialmonumentamod/features/misc/managers/MessageNotifier.java new file mode 100644 index 00000000..15c3f45b --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/misc/managers/MessageNotifier.java @@ -0,0 +1,310 @@ +package ch.njol.unofficialmonumentamod.features.misc.managers; + +import ch.njol.minecraft.uiframework.ElementPosition; +import ch.njol.minecraft.uiframework.hud.HudElement; +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.PlainTextContent; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; + +public class MessageNotifier extends HudElement { + private static final MessageNotifier INSTANCE = new MessageNotifier(); + private static final float MAX_MESSAGE_SCALE_FACTOR = getInstance().getBaseScaleFactor() * 1.6F; + + public static MessageNotifier getInstance() { + return INSTANCE; + } + + private static final MinecraftClient client = MinecraftClient.getInstance(); + + private final List messages = new ArrayList<>(); + + public void addOrStackMessageToQueue(RenderedMessage message) { + for (RenderedMessage renderedMessage : messages) { + if (renderedMessage.equals(message)) { + //Only extend by a bit to avoid an "infinite" loop of growing. + renderedMessage.firstRenderMillis += (System.currentTimeMillis() - renderedMessage.firstRenderMillis) / 4; + + //visually show the stacks. + renderedMessage.setScaleFactor(Math.min(MAX_MESSAGE_SCALE_FACTOR, renderedMessage.scaleFactor * 1.05F)); + return; + } + } + + addMessageToQueue(message); + } + + public void addMessageToQueue(RenderedMessage message) { + if (isRenderedQueueFull() && UnofficialMonumentaModClient.options.notifierEarlyDismiss) { + //dismiss first element and add this to end + for (RenderedMessage message1: messages) { + if (!message1.willBeDismissed()) { + message1.setAsDismissed(); + break; + } + } + } + messages.add(message); + } + + private boolean isRenderedQueueFull() { + return getCurrentMessageHeights() >= getHeight(); + } + + private int getCurrentMessageHeights() { + int size = 0; + for (RenderedMessage message : messages) { + size += (int) message.getHeight(); + } + + return size; + } + + @Override + protected boolean isEnabled() { + return true; + } + + @Override + protected boolean isVisible() { + return !messages.isEmpty(); + } + + @Override + protected int getWidth() { + return (int) Math.floor(200 * getBaseScaleFactor()); + } + + @Override + protected int getHeight() { + return (int) Math.floor(140 * getBaseScaleFactor());//~10 normal size messages + } + + @Override + protected ElementPosition getPosition() { + return UnofficialMonumentaModClient.options.notifierPosition; + } + + @Override + protected int getZOffset() { + return 0; + } + + private float getBaseScaleFactor() { + return UnofficialMonumentaModClient.options.notifierScaleFactor; + } + + public int getRemovalTime() { + return (int) UnofficialMonumentaModClient.options.notifierShowTime * 1000; + } + + public int getAnimTime() { + return getRemovalTime() / 30; + } + + public void tick() { + //through dismissal or reached end. + messages.removeIf(message -> (message.willBeDismissed() && (message.dismissalTime + getAnimTime() < System.currentTimeMillis())) || (message.isInitialized() && message.firstRenderMillis + getRemovalTime() < System.currentTimeMillis())); + } + + @Override + protected void render(DrawContext ctx, float tickDelta) { + Rectangle dimension = getDimension(); + if (isInEditMode()) { + renderOutline(ctx, new Rectangle(0, 0, dimension.width, dimension.height)); + } + + double y = Math.max(0, Math.max(dimension.getHeight(), getCurrentMessageHeights())); + for (RenderedMessage message: messages) { + if (y - (message.getHeight() + (2 * message.getScaleFactor())) <= 0) { + //if inferior to 0, then it means it has gone above the maximum height. + break; + } + + MatrixStack matrices = ctx.getMatrices(); + matrices.push(); + matrices.scale(message.getScaleFactor(), message.getScaleFactor(), message.getScaleFactor()); + matrices.translate(5, y / message.getScaleFactor(), 0); + message.draw(ctx, tickDelta); + matrices.pop(); + + y -= (message.getHeight() + (2 * message.getScaleFactor()));//size + small leeway + } + } + + public static class RenderedMessage { + public long firstRenderMillis = -1; + + private final Text originalMessage; + public List message; + + public boolean isInitialized() { + return firstRenderMillis != -1; + } + + public long dismissalTime = -1; + + public float scaleFactor; + + public RenderedMessage(Text message) { + this.originalMessage = message; + this.message = truncateTextToWidth(message, 1.0F); + this.scaleFactor = 1.0F; + } + + public RenderedMessage(Text message, float scaleFactor) { + this.originalMessage = message; + this.message = truncateTextToWidth(message, scaleFactor); + this.scaleFactor = scaleFactor; + } + + protected void setScaleFactor(float scaleFactor) { + this.scaleFactor = scaleFactor; + this.message = truncateTextToWidth(originalMessage, scaleFactor); + } + + private static List truncateTextToWidth(Text originalMessage, float scaleFactor) { + scaleFactor *= MessageNotifier.getInstance().getBaseScaleFactor(); + + int width = MessageNotifier.getInstance().getDimension().width; + if ((client.textRenderer.getWidth(originalMessage) * scaleFactor) > width) { + List lines = new ArrayList<>(); + StringBuilder newMessage = new StringBuilder(); + String messageContent = originalMessage.getString(); + for (int i = 0; i < messageContent.length(); i++) { + if ((client.textRenderer.getWidth(newMessage.toString()) * scaleFactor) >= width) { + lines.add(MutableText.of(PlainTextContent.of(newMessage.substring(0, newMessage.length() - 1).trim() + "⁻")) + .fillStyle(originalMessage.getStyle())); + newMessage.delete(0, newMessage.length() - 1); + } + newMessage.append(messageContent.charAt(i)); + } + + if (!newMessage.isEmpty()) { + lines.add(MutableText.of(PlainTextContent.of(newMessage.toString().trim())) + .fillStyle(originalMessage.getStyle())); + } + + return lines; + } + return List.of(originalMessage); + } + + public float getScaleFactor() { + return scaleFactor * MessageNotifier.getInstance().getBaseScaleFactor(); + } + + public double getWidth() { + return client.textRenderer.getWidth(getLongestLine()) * getScaleFactor(); + } + + public double getHeight() { + return client.textRenderer.fontHeight * getScaleFactor() * message.size(); + } + + private Text getLongestLine() { + Text longestLine = null; + double longestLineWidth = 0; + for (Text text : message) { + if (longestLine == null) { + longestLine = text; + longestLineWidth = client.textRenderer.getWidth(longestLine); + continue; + } + if (client.textRenderer.getWidth(text) > longestLineWidth) { + longestLine = text; + longestLineWidth = client.textRenderer.getWidth(text); + } + } + + return longestLine; + } + + public void draw(DrawContext ctx, float tickDelta) { + if (firstRenderMillis == -1) { + firstRenderMillis = System.currentTimeMillis(); + } + + final int remTime = getInstance().getRemovalTime(); + final int animTime = getInstance().getAnimTime(); + + Rectangle parentDim = getInstance().getDimension(); + //x=0 is position when set, x=width is position at the start/at the end (e.g. animation start/end position) + + //base animation duration is 3s -> 3000ms + double currentXPosition = 0; + + if (firstRenderMillis + animTime > System.currentTimeMillis()) { + //start animation + long millisSinceAppearance = System.currentTimeMillis() - firstRenderMillis; + float percent = ((float) millisSinceAppearance * tickDelta / animTime); + currentXPosition = (parentDim.getWidth() / 2 * (1F - percent)); + } + + if ((firstRenderMillis + remTime) - System.currentTimeMillis() < animTime) { + long millisTillRemoval = (firstRenderMillis + remTime) - System.currentTimeMillis(); + + float percent = ((float) millisTillRemoval * tickDelta / animTime); + currentXPosition = -(parentDim.getWidth() / 2 * (1F - percent)); + } + + if (willBeDismissed() && (dismissalTime + animTime > System.currentTimeMillis())) { + long millisTillDismissal = (dismissalTime + animTime) - System.currentTimeMillis(); + + float percent = ((float) millisTillDismissal * tickDelta / animTime); + currentXPosition = -(parentDim.getWidth() / 2 * (1F - percent)); + + } + + int baseX = (int) (Math.floor(currentXPosition) / getScaleFactor()); + int baseY = (int) (Math.floor(-getHeight() / 2) - ((client.textRenderer.fontHeight * getScaleFactor()) / 2)); + + for (Text text : message) { + ctx.drawText(client.textRenderer, text, baseX, baseY, 0xFFFFFF, false); + baseY += client.textRenderer.fontHeight; + } + } + + public void setAsDismissed() + { + this.dismissalTime = System.currentTimeMillis(); + } + + public boolean willBeDismissed() { + return dismissalTime != -1; + } + + @Override + public boolean equals(Object other) { + if (!(other instanceof RenderedMessage o)) { + return false; + } + + return originalMessage.getString().equals(o.originalMessage.getString()) && originalMessage.getStyle().equals(o.originalMessage.getStyle()); + } + } + + //TODO remove this when overlay editor branch is merged + private static final int OUTLINE_COLOR = 0xFFadacac; + public static void renderOutline(DrawContext ctx, Rectangle pos) { + renderOutline(ctx, pos, OUTLINE_COLOR); + } + + public static void renderOutline(DrawContext ctx, Rectangle pos, int color) { + //x1 x2 + ctx.fill(pos.x, pos.y - 1, (int) pos.getMaxX(), pos.y + 1, color); + //y1 y2 + ctx.fill((int) pos.getMaxX() - 1, pos.y, (int) pos.getMaxX() + 1, (int) pos.getMaxY(), color); + //x2 x1 + ctx.fill((int) pos.getMaxX(), (int) pos.getMaxY() - 1, pos.x, (int) pos.getMaxY() + 1, color); + //y2 y1 + ctx.fill(pos.x - 1, (int) pos.getMaxY(), pos.x + 1, pos.y, color); + } + //till this +} \ No newline at end of file diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/misc/notifications/LocationNotifier.java b/main/src/java/ch/njol/unofficialmonumentamod/features/misc/notifications/LocationNotifier.java new file mode 100644 index 00000000..023dec6b --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/misc/notifications/LocationNotifier.java @@ -0,0 +1,76 @@ +package ch.njol.unofficialmonumentamod.features.misc.notifications; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.core.shard.ShardLoader; +import ch.njol.unofficialmonumentamod.features.locations.Locations; +import ch.njol.unofficialmonumentamod.features.misc.managers.MessageNotifier; +import java.util.Objects; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.MutableText; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; + +public class LocationNotifier { + private static Double lastX; + private static Double lastZ; + + public static void onDisconnect() { + lastX = null; + lastZ = null; + } + + private static MessageNotifier.RenderedMessage lastNotification = null; + + public static void tick() { + if (!UnofficialMonumentaModClient.options.notifyLocation) { + return; + } + MinecraftClient client = MinecraftClient.getInstance(); + + + String shard = Locations.getShortShard(); + if (shard.equals(ShardLoader.UNKNOWN_SHARD) || client.player == null) { + return; + } + + MessageNotifier.RenderedMessage notification = null; + + String loc = UnofficialMonumentaModClient.locations.getLocation(client.player.getX(), client.player.getZ(), shard); + + if (lastX != null && lastZ != null) { + String lastLoc = UnofficialMonumentaModClient.locations.getLocation(lastX, lastZ, shard); + + if (!Objects.equals(loc, shard) && !Objects.equals(loc, lastLoc) && !Objects.equals(loc, "Overworld")) { + MutableText notificationText = Text.literal("Entering ") + .setStyle(Style.EMPTY.withColor(Formatting.GREEN)) + .append(Text.literal(loc) + .setStyle(Style.EMPTY.withColor(Formatting.GOLD))); + notification = new MessageNotifier.RenderedMessage(notificationText, 1.5F); + } else if (Objects.equals(loc, shard) || Objects.equals(loc, "Overworld")) { + MutableText notificationText = Text.literal("Leaving ") + .setStyle(Style.EMPTY.withColor(Formatting.RED)) + .append(Text.literal(lastLoc) + .setStyle(Style.EMPTY.withColor(Formatting.GOLD))); + notification = new MessageNotifier.RenderedMessage(notificationText, 1.5F); + if ((lastNotification != null && lastNotification.equals(notification)) || Objects.equals(lastLoc, shard) || Objects.equals(lastLoc, "Overworld") + ) { + return; + } + } + } else if (!Objects.equals(shard, loc) && !Objects.equals(loc, "Overworld")) { + MutableText notificationText = Text.literal("Entering ") + .setStyle(Style.EMPTY.withColor(Formatting.GREEN)) + .append(Text.literal(loc) + .setStyle(Style.EMPTY.withColor(Formatting.GOLD))); + notification = new MessageNotifier.RenderedMessage(notificationText, 1.5F); + } + + if (notification != null) { + MessageNotifier.getInstance().addMessageToQueue(notification); + lastNotification = notification; + } + lastX = client.player.getX(); + lastZ = client.player.getZ(); + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/features/spoof/TextureSpoofer.java b/main/src/java/ch/njol/unofficialmonumentamod/features/spoof/TextureSpoofer.java new file mode 100644 index 00000000..f3313b13 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/features/spoof/TextureSpoofer.java @@ -0,0 +1,376 @@ +package ch.njol.unofficialmonumentamod.features.spoof; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.mixins.item.ItemStackAccessor; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.annotations.Expose; +import com.google.gson.reflect.TypeToken; +import com.mojang.brigadier.suggestion.SuggestionProvider; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.HashMap; +import java.util.Set; +import java.util.UUID; + +import java.util.concurrent.CompletableFuture; +import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtInt; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public class TextureSpoofer { + private static final String CACHE_PATH = "monumenta/texture-spoof.json"; + public final HashMap spoofedItems = new HashMap<>(); + + private static final Gson GSON = new GsonBuilder() + .setPrettyPrinting() + .excludeFieldsWithoutExposeAnnotation() + .create(); + + public void onDisconnect() { + save(); + } + + public static String getKeyOf(ItemStack stack) { + return stack.getName().getString().toLowerCase().strip(); + } + + public SuggestionProvider spoofedItemsKeyProvider() { + return (context, builder) -> { + Set keys = spoofedItems.keySet(); + for (String key: keys) { + builder.suggest("\"" + key + "\""); + } + return builder.buildFuture(); + }; + } + + @Nullable + public SpoofItem getSpoofItemFromName(@NotNull String name) { + if (spoofedItems.containsKey(name)) { + return spoofedItems.get(name); + } + return null; + } + + public Item getSpoofItem(ItemStack stack) { + if (!UnofficialMonumentaModClient.options.enableTextureSpoofing) { + return stack.getItem(); + } + + String key = getKeyOf(stack); + if (spoofedItems.containsKey(key)) { + SpoofItem sI = spoofedItems.get(key); + + return Registries.ITEM.get(sI.getItemIdentifier()); + } + + return stack.getItem(); + } + + public ItemStack applyOnCopy(ItemStack stack) { + if (!UnofficialMonumentaModClient.options.enableTextureSpoofing) { + return stack; + } + String key = getKeyOf(stack); + if (spoofedItems.containsKey(key)) { + SpoofItem item = spoofedItems.get(key); + if (stack.hasNbt() && hasBeenEdited(stack)) { + return stack; + } + if (item == null || item.invalid) { + return stack; + } + + ItemStack newItemStack = stack.copy(); + + Item overrideItem = Registries.ITEM.get(item.getItemIdentifier()); + if (!stack.getItem().equals(overrideItem)) { + ((ItemStackAccessor) (Object) newItemStack).setItem(overrideItem); + } + + if (stack.hasNbt()) { + assert newItemStack.getNbt() != null; + if (item.displayName != null) { + newItemStack.getNbt().put("plain", setPlain(newItemStack.getNbt(), item.displayName)); + } + + if (item.hope != null) { + try { + //check if it's a valid uuid + UUID uuid = UUID.fromString(item.hope); + newItemStack.getNbt().put("Monumenta", setHoped(newItemStack.getNbt(), item.hope)); + } catch (IllegalArgumentException e) { + UnofficialMonumentaModClient.LOGGER.error("invalid Hope skin uuid, removing entry.", e); + SpoofItem newSpoof = spoofedItems.get(key); + newSpoof.invalid = true; + spoofedItems.replace(key, newSpoof); + return stack; + } + + } + //to be able to detect already edited stacks + NbtCompound monumentamodCompound = new NbtCompound(); + monumentamodCompound.put("edited", NbtInt.of(1)); + newItemStack.getNbt().put("monumenta-mod", monumentamodCompound); + } + + return newItemStack; + } + return stack; + } + + public ItemStack apply(ItemStack stack) { + //avoid unforeseen use actions if the stack's item type is different from what it actually is (would look kinda dumb if I could place sword ._.) + if (stack.getItem() == this.getSpoofItem(stack)) { + applyOnOriginal(stack); + return null; + } else { + return applyOnCopy(stack); + } + } + + public void applyOnOriginal(ItemStack stack) { + if (!UnofficialMonumentaModClient.options.enableTextureSpoofing) { + return; + } + String key = getKeyOf(stack); + if (spoofedItems.containsKey(key)) { + SpoofItem item = spoofedItems.get(key); + if (stack.hasNbt() && hasBeenEdited(stack)) { + return; + } + if (item == null || item.invalid) { + return; + } + + Item overrideItem = Registries.ITEM.get(item.getItemIdentifier()); + if (!stack.getItem().equals(overrideItem)) { + ((ItemStackAccessor) (Object) stack).setItem(overrideItem); + } + + if (stack.hasNbt()) { + assert stack.getNbt() != null; + if (item.displayName != null) { + stack.getNbt().put("plain", setPlain(stack.getNbt(), item.displayName)); + } + + if (item.hope != null) { + try { + //check if it's a valid uuid + UUID uuid = UUID.fromString(item.hope); + stack.getNbt().put("Monumenta", setHoped(stack.getNbt(), item.hope)); + } catch (IllegalArgumentException e) { + UnofficialMonumentaModClient.LOGGER.error("invalid Hope skin uuid, removing entry.", e); + SpoofItem newSpoof = spoofedItems.get(key); + newSpoof.invalid = true; + spoofedItems.replace(key, newSpoof); + return; + } + + } + //to be able to detect already edited stacks + NbtCompound monumentamodCompound = new NbtCompound(); + monumentamodCompound.put("edited", NbtInt.of(1)); + stack.getNbt().put("monumenta-mod", monumentamodCompound); + } + } + } + + private final TypeToken> typeToken = new TypeToken<>() { + }; + + private static NbtCompound setHoped(NbtCompound stackData, String uuid) { + NbtCompound monumenta = getOrCreateCompound(stackData, "Monumenta"); + NbtCompound playerModified = getOrCreateCompound(monumenta, "PlayerModified"); + NbtCompound infusions = getOrCreateCompound(playerModified, "Infusions"); + NbtCompound hope = getOrCreateCompound(infusions, "Hope"); + + hope.putString("Infuser", uuid); + + infusions.put("Hope", hope); + playerModified.put("Infusions", infusions); + monumenta.put("PlayerModified", playerModified); + return monumenta; + } + + public static NbtCompound setPlain(NbtCompound stackData, String displayName) { + NbtCompound plain = getOrCreateCompound(stackData, "plain"); + NbtCompound display = getOrCreateCompound(plain, "display"); + display.putString("Name", displayName); + plain.put("display", display); + return plain; + } + + public static String getPlainDisplayName(NbtCompound stackData) { + try { + if (stackData.contains("plain")) { + if (stackData.getCompound("plain").contains("display")) { + return stackData.getCompound("plain").getCompound("display").getString("Name"); + } + } + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to obtain the display name of an item", e); + } + + return null; + } + + private static NbtCompound getOrCreateCompound(NbtCompound compound, String key) { + if (compound.getCompound(key) == null) { + return new NbtCompound(); + } else { + return compound.getCompound(key); + } + } + + public static boolean hasBeenEdited(ItemStack stack) { + if (stack.hasNbt()) { + assert stack.getNbt() != null; + if (stack.getNbt().contains("monumenta-mod", 10)) { + return stack.getNbt().getCompound("monumenta-mod").getInt("edited") == 1; + } + } + return false; + } + + public static boolean shouldEdit(ItemStack stack) { + String key = getKeyOf(stack); + return UnofficialMonumentaModClient.spoofer.spoofedItems.containsKey(key) && + !UnofficialMonumentaModClient.spoofer.spoofedItems.get(key).invalid; + } + + public void reload() { + File file = FabricLoader.getInstance().getConfigDir().resolve(CACHE_PATH).toFile(); + if (!file.exists()) { + return; + } + + try (FileReader reader = new FileReader(file)) { + HashMap loadedItems = GSON.fromJson(reader, typeToken.getType()); + if (loadedItems != null) { + spoofedItems.clear(); + spoofedItems.putAll(loadedItems); + } + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to reload texture spoofing data", e); + } + } + + public void save() { + File file = FabricLoader.getInstance().getConfigDir().resolve(CACHE_PATH).toFile(); + + if (!file.exists()) { + try { + if (!file.getParentFile().mkdirs() || !file.createNewFile()) { + UnofficialMonumentaModClient.LOGGER.error("Could not create texture spoofing file"); + return; + } + } catch (IOException e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to create files for texture spoofing", e); + } + } + + try (FileWriter writer = new FileWriter(file)) { + writer.write(GSON.toJson(spoofedItems)); + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to save texture spoofing data", e); + } + } + + public CompletableFuture runThenSaveFile(Runnable runnable) { + return CompletableFuture.runAsync(runnable).thenRunAsync(this::save); + } + + public void addSpoof(String key, Item item, String displayName, boolean override) { + SpoofItem localSpoofedItem = getSpoofItemFromName(key); + if (localSpoofedItem != null) { + throw new IllegalArgumentException("key '" + key + "' has an associated spoofed item, could not create new one."); + } + + SpoofItem spoofedItem = new SpoofItem(item, displayName); + spoofedItem.override = override; + spoofedItems.put(key, spoofedItem); + } + + public void deleteSpoof(String key) { + SpoofItem spoofedItem = getSpoofItemFromName(key); + if (spoofedItem == null) { + throw new IllegalArgumentException("key '" + key + "' does not have an associated spoofed item."); + } + spoofedItems.remove(key); + } + + public void editItem(String key, Item item) { + SpoofItem spoofedItem = getSpoofItemFromName(key); + if (spoofedItem == null) { + throw new IllegalArgumentException("key '" + key + "' does not have an associated spoofed item."); + } + spoofedItem.item = Registries.ITEM.getId(item).toString(); + } + + public void editDisplayName(String key, String displayName) { + SpoofItem spoofedItem = getSpoofItemFromName(key); + if (spoofedItem == null) { + throw new IllegalArgumentException("key '" + key + "' does not have an associated spoofed item."); + } + spoofedItem.displayName = displayName; + } + + public void editAppliedHope(String key, UUID appliedUuid) { + SpoofItem spoofedItem = getSpoofItemFromName(key); + if (spoofedItem == null) { + throw new IllegalArgumentException("key '" + key + "' does not have an associated spoofed item."); + } + + if (appliedUuid == null) { + spoofedItem.hope = null; + return; + } + spoofedItem.hope = appliedUuid.toString(); + } + + public void editOverride(String key, boolean override) { + SpoofItem spoofedItem = getSpoofItemFromName(key); + if (spoofedItem == null) { + throw new IllegalArgumentException("key '" + key + "' does not have an associated spoofed item."); + } + spoofedItem.override = override; + } + + public static class SpoofItem { + @Expose + public String item; + @Expose + public String displayName; + @Expose + public String hope; + @Expose + public boolean override = false; + + protected boolean invalid; + + public SpoofItem(Item item, String displayName) { + this.item = Registries.ITEM.getId(item).toString(); + this.displayName = displayName; + } + + public Identifier getItemIdentifier() { + return new Identifier(item); + } + + @Override + public String toString() { + return item + "-" + displayName + (hope != null ? "-(hoped by "+ hope +")" : ""); + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/hud/AbilitiesHud.java b/main/src/java/ch/njol/unofficialmonumentamod/hud/AbilitiesHud.java new file mode 100644 index 00000000..59e282f9 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/hud/AbilitiesHud.java @@ -0,0 +1,497 @@ +package ch.njol.unofficialmonumentamod.hud; + +import ch.njol.minecraft.uiframework.ElementPosition; +import ch.njol.minecraft.uiframework.ModSpriteAtlasHolder; +import ch.njol.minecraft.uiframework.hud.Hud; +import ch.njol.minecraft.uiframework.hud.HudElement; +import ch.njol.unofficialmonumentamod.AbilityHandler; +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import ch.njol.unofficialmonumentamod.options.Options; +import com.mojang.blaze3d.systems.RenderSystem; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.ChatScreen; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.texture.MissingSprite; +import net.minecraft.client.texture.Sprite; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.RotationAxis; + +public class AbilitiesHud extends HudElement { + + private static ModSpriteAtlasHolder atlas; + + private static Identifier COOLDOWN_OVERLAY; + private static Identifier COOLDOWN_FLASH; + private static Identifier UNKNOWN_ABILITY_ICON; + private static Identifier UNKNOWN_CLASS_BORDER; + + private String draggedAbility = null; + + public static AbilitiesHud INSTANCE = new AbilitiesHud(); + + private AbilitiesHud() { + } + + public static void registerSprites() { + if (atlas == null) { + atlas = ModSpriteAtlasHolder.createAtlas(UnofficialMonumentaModClient.MOD_IDENTIFIER, "abilities"); + } else { + atlas.clearSprites(); + } + COOLDOWN_OVERLAY = atlas.registerSprite("cooldown_overlay"); + COOLDOWN_FLASH = atlas.registerSprite("off_cooldown"); + UNKNOWN_ABILITY_ICON = atlas.registerSprite("unknown_ability"); + UNKNOWN_CLASS_BORDER = atlas.registerSprite("unknown_border"); + List foundIcons = MinecraftClient.getInstance().getResourceManager().findResources("textures/abilities", path -> true) + .keySet().stream() + .filter(id -> id.getNamespace().equals(UnofficialMonumentaModClient.MOD_IDENTIFIER)).toList(); + for (Identifier foundIcon : foundIcons) { + if (foundIcon == COOLDOWN_OVERLAY || foundIcon == COOLDOWN_FLASH || foundIcon == UNKNOWN_ABILITY_ICON || foundIcon == UNKNOWN_CLASS_BORDER) { + continue; + } + atlas.registerSprite(foundIcon.getPath().substring("textures/abilities/".length(), foundIcon.getPath().length() - ".png".length())); + } + } + + public boolean renderInFrontOfChat() { + return UnofficialMonumentaModClient.options.abilitiesDisplay_inFrontOfChat + && !(client.currentScreen instanceof ChatScreen); + } + + protected boolean isEnabled() { + return UnofficialMonumentaModClient.options.abilitiesDisplay_enabled && !UnofficialMonumentaModClient.abilityHandler.abilityData.isEmpty(); + } + + @Override + protected boolean isVisible() { + return true; + } + + private int getTotalSize() { + int numAbilities = (int) UnofficialMonumentaModClient.abilityHandler.abilityData.stream().filter(a -> isAbilityVisible(a, true)).count(); + return UnofficialMonumentaModClient.options.abilitiesDisplay_iconSize * numAbilities + UnofficialMonumentaModClient.options.abilitiesDisplay_iconGap * (numAbilities - 1); + } + + @Override + protected int getWidth() { + return UnofficialMonumentaModClient.options.abilitiesDisplay_horizontal ? getTotalSize() : UnofficialMonumentaModClient.options.abilitiesDisplay_iconSize; + } + + @Override + protected int getHeight() { + return UnofficialMonumentaModClient.options.abilitiesDisplay_horizontal ? UnofficialMonumentaModClient.options.abilitiesDisplay_iconSize : getTotalSize(); + } + + @Override + protected int getZOffset() { + return renderInFrontOfChat() ? 100 : 0; + } + + @Override + protected ElementPosition getPosition() { + return UnofficialMonumentaModClient.options.abilitiesDisplay_position; + } + + @Override + protected void render(DrawContext drawContext, float tickDelta) { + if (client.options.hudHidden || client.player == null || client.player.isSpectator()) { + return; + } + Options options = UnofficialMonumentaModClient.options; + + AbilityHandler abilityHandler = UnofficialMonumentaModClient.abilityHandler; + List abilityInfos = abilityHandler.abilityData; + if (abilityInfos.isEmpty()) { + return; + } + + abilityInfos = abilityInfos.stream().filter(a -> isAbilityVisible(a, true)).toList(); + + int iconSize = options.abilitiesDisplay_iconSize; + int iconGap = options.abilitiesDisplay_iconGap; + + boolean horizontal = options.abilitiesDisplay_horizontal; + + int totalSize = getTotalSize(); + + boolean ascendingRenderOrder = options.abilitiesDisplay_ascendingRenderOrder; + int textColor = 0xFF000000 | options.abilitiesDisplay_textColorRaw; + + float silenceCooldownFraction = abilityHandler.initialSilenceDuration <= 0 || abilityHandler.silenceDuration <= 0 ? 0 : 1f * abilityHandler.silenceDuration / abilityHandler.initialSilenceDuration; + + // multiple passes to render multiple layers. + // layer 0: textures + // layer 1: numbers + for (int layer = 0; layer < 2; layer++) { + + int x = 0; + int y = 0; + if (!ascendingRenderOrder) { + if (horizontal) { + x += totalSize - iconSize; + } else { + y += totalSize - iconSize; + } + } + + for (int i = 0; i < abilityInfos.size(); i++) { + AbilityHandler.AbilityInfo abilityInfo = abilityInfos.get(ascendingRenderOrder ? i : abilityInfos.size() - 1 - i); + + if (isAbilityVisible(abilityInfo, false)) { + // some settings are affected by called methods, so set them anew for each ability to render + RenderSystem.setShader(GameRenderer::getPositionTexProgram); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + + if (layer == 0) { + + float animTicks = abilityInfo.offCooldownAnimationTicks + tickDelta; + float animLength = 2; // half of length actually + float scaledIconSize = iconSize * (options.abilitiesDisplay_offCooldownResize ? 1 + 0.08f * Utils.smoothStep(1 - Math.abs(animTicks - animLength) / animLength) : 1); + float scaledX = x - (scaledIconSize - iconSize) / 2; + float scaledY = y - (scaledIconSize - iconSize) / 2; + + float durationFraction = abilityInfo.initialDuration > 0 && abilityInfo.remainingDuration > 0 ? (abilityInfo.remainingDuration - tickDelta) / abilityInfo.initialDuration : 0; + if (durationFraction > 0 && options.abilitiesDisplay_durationRenderMode == AbilityHandler.DurationRenderMode.CIRCLE) { + Utils.drawPartialHollowPolygon( + drawContext, + (int) scaledX + (iconSize / 2), + (int) scaledY + (iconSize / 2), + 4, + ((float) iconSize / 2), + 360, + durationFraction > 0.10 ? 0x00FF00FF : 0xFF0000FF,//If above 10% then green else red + durationFraction + ); + //as RenderSystem settings are changed during the circle drawing, need to re-set them. + RenderSystem.setShader(GameRenderer::getPositionTexProgram); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + } + + drawContext.drawSprite((int) scaledX, (int) scaledY, 0, (int) scaledIconSize, (int) scaledIconSize, getAbilityIcon(abilityInfo)); + + + // silenceCooldownFraction is >= 0 so this is also >= 0 + float cooldownFraction = abilityInfo.initialCooldown <= 0 ? 0 : Math.min(Math.max((abilityInfo.remainingCooldown - tickDelta) / abilityInfo.initialCooldown, silenceCooldownFraction), 1); + if (cooldownFraction > 0) { + Sprite cooldownOverlay = atlas.getSprite(COOLDOWN_OVERLAY); + float yOffset = (cooldownOverlay.getContents().getWidth() - cooldownOverlay.getContents().getHeight()) / 2f; + drawPartialSprite(drawContext, cooldownOverlay, scaledX, scaledY + yOffset, scaledIconSize, scaledIconSize - 2 * yOffset, 0, 1 - cooldownFraction, 1, 1); + } + if (options.abilitiesDisplay_offCooldownFlashIntensity > 0 && animTicks < 8) { + RenderSystem.setShaderColor(1, 1, 1, options.abilitiesDisplay_offCooldownFlashIntensity * (1 - animTicks / 8f)); + drawContext.drawSprite((int) scaledX, (int) scaledY, 0, (int) scaledIconSize, (int) scaledIconSize, atlas.getSprite(COOLDOWN_FLASH)); + RenderSystem.setShaderColor(1, 1, 1, 1); + } + + drawContext.drawSprite((int) scaledX, (int) scaledY, 0, (int) scaledIconSize, (int) scaledIconSize, getSpriteOrDefault(getBorderFileIdentifier(abilityInfo.className, abilityHandler.silenceDuration > 0), UNKNOWN_CLASS_BORDER)); + + //bar looks better on top of the border, that's why we're checking again here + if (durationFraction > 0 && options.abilitiesDisplay_durationRenderMode == AbilityHandler.DurationRenderMode.BAR) { + drawDurationBar(drawContext, scaledX, scaledY, durationFraction, abilityInfo.className); + } + } else { + + if ((abilityInfo.remainingCooldown > 0 || abilityHandler.silenceDuration > 0) && options.abilitiesDisplay_showCooldownAsText) { + String cooldownString = "" + (int) Math.ceil(Math.max(Math.max(abilityInfo.remainingCooldown, abilityHandler.silenceDuration), 0) / 20f); + drawOutlinedText(drawContext, cooldownString, + x + iconSize - options.abilitiesDisplay_textOffset - this.client.textRenderer.getWidth(cooldownString), + y + iconSize - options.abilitiesDisplay_textOffset - this.client.textRenderer.fontHeight, + textColor); + } + + if (abilityInfo.maxCharges > 1 || abilityInfo.maxCharges == 1 && abilityInfo.initialCooldown <= 0) { + drawOutlinedText(drawContext, "" + abilityInfo.charges, x + options.abilitiesDisplay_textOffset, y + options.abilitiesDisplay_textOffset, textColor); + } + + } + } + + if (horizontal) { + x += (ascendingRenderOrder ? 1 : -1) * (iconSize + iconGap); + } else { + y += (ascendingRenderOrder ? 1 : -1) * (iconSize + iconGap); + } + + } + } + } + + private void drawDurationBar(DrawContext drawContext, float originX, float originY, float fraction, String className) { + + MatrixStack matrices = drawContext.getMatrices(); + + Options options = UnofficialMonumentaModClient.options; + int iconSize = options.abilitiesDisplay_iconSize; + float barHeight = 8 * iconSize / 32f; + + matrices.push(); + + boolean horizontal = options.abilitiesDisplay_durationBar_side == Options.DurationBarSideMode.FOLLOW ? options.abilitiesDisplay_horizontal + : options.abilitiesDisplay_durationBar_side == Options.DurationBarSideMode.HORIZONTAL; + matrices.translate(originX + iconSize / 2f, originY + iconSize / 2f, 0); + if (!horizontal) { + matrices.multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(90)); + } + matrices.translate(iconSize / 32f * options.abilitiesDisplay_durationBar_offsetX, iconSize / 32f * options.abilitiesDisplay_durationBar_offsetY - barHeight / 2f, 0); + + Sprite backgroundSprite = getClassDuration(className, "background"); + Sprite barSprite = getClassDuration(className, "full"); + Sprite overlaySprite = getClassDuration(className, "overlay"); + + float barWidth = 1f * barSprite.getContents().getWidth() / backgroundSprite.getContents().getWidth() * (float) iconSize; + float overlayWidth = 1f * overlaySprite.getContents().getWidth() / backgroundSprite.getContents().getWidth() * (float) iconSize; + + drawContext.drawSprite(-iconSize / 2, 0, 0, iconSize, (int) barHeight, backgroundSprite); + drawPartialSprite(drawContext, barSprite, -barWidth / 2, 0, barWidth, barHeight, 0, 0, fraction, 1); + drawContext.drawSprite((int) -overlayWidth / 2, 0, 0, (int) overlayWidth, (int) barHeight, overlaySprite); + + matrices.pop(); + } + + private static final Pattern IDENTIFIER_SANITATION_PATTERN = Pattern.compile("[^a-zA-Z0-9/._-]"); + + private static String sanitizeForIdentifier(String string) { + return IDENTIFIER_SANITATION_PATTERN.matcher(string).replaceAll("_").toLowerCase(Locale.ROOT); + } + + private static final Map abilityIdentifiers = new HashMap<>(); + + private Sprite getClassDuration(String className, String part) { + String id = className + "/" + className + "_bar_" + part; + Identifier baseIdentifier = abilityIdentifiers.computeIfAbsent(id, key -> new Identifier(UnofficialMonumentaModClient.MOD_IDENTIFIER, sanitizeForIdentifier(key))); + Sprite sprite = atlas.getSprite(baseIdentifier); + if (!sprite.getContents().getId().equals(MissingSprite.getMissingSpriteId())) { + return sprite; + } + + Identifier e = abilityIdentifiers.computeIfAbsent("shaman/shaman_bar_" + part, key -> new Identifier(UnofficialMonumentaModClient.MOD_IDENTIFIER, sanitizeForIdentifier(key))); + return atlas.getSprite(e); + } + + private Sprite getAbilityIcon(AbilityHandler.AbilityInfo abilityInfo) { + String id = (abilityInfo.className == null ? "unknown" : abilityInfo.className) + "/" + abilityInfo.name + (abilityInfo.mode == null ? "" : "_" + abilityInfo.mode); + + // for abilities with charges, use a special "_max" sprite when charges are full (and the sprite exists) + if ((abilityInfo.maxCharges > 1 || abilityInfo.maxCharges == 1 && abilityInfo.initialCooldown <= 0) && abilityInfo.charges == abilityInfo.maxCharges) { + Identifier maxIdentifier = abilityIdentifiers.computeIfAbsent(id + "_max", key -> new Identifier(UnofficialMonumentaModClient.MOD_IDENTIFIER, sanitizeForIdentifier(key))); + Sprite sprite = atlas.getSprite(maxIdentifier); + if (!sprite.getContents().getId().equals(MissingSprite.getMissingSpriteId())) { + return sprite; + } + } + + Identifier baseIdentifier = abilityIdentifiers.computeIfAbsent(id, key -> new Identifier(UnofficialMonumentaModClient.MOD_IDENTIFIER, sanitizeForIdentifier(key))); + Sprite sprite = atlas.getSprite(baseIdentifier); + if (!sprite.getContents().getId().equals(MissingSprite.getMissingSpriteId())) { + return sprite; + } + return atlas.getSprite(UNKNOWN_ABILITY_ICON); + } + + private static final Map borderIdentifiers = new HashMap<>(); + + private static Identifier getBorderFileIdentifier(String className, boolean silenced) { + return borderIdentifiers.computeIfAbsent((className == null ? "unknown" : className) + (silenced ? "_silenced" : ""), + key -> new Identifier(UnofficialMonumentaModClient.MOD_IDENTIFIER, + sanitizeForIdentifier(className == null ? "unknown" : className) + "/border" + (silenced ? "_silenced" : ""))); + } + + private Sprite getSpriteOrDefault(Identifier identifier, Identifier defaultIdentifier) { + Sprite sprite = atlas.getSprite(identifier); + if (sprite.getContents().getId().equals(MissingSprite.getMissingSpriteId())) { + return atlas.getSprite(defaultIdentifier); + } + return sprite; + } + + public boolean isAbilityVisible(AbilityHandler.AbilityInfo abilityInfo, boolean forSpaceCalculation) { + // Passive abilities are visible iff passives are enabled in the options + if (abilityInfo.initialCooldown == 0 && abilityInfo.maxCharges == 0) { + return UnofficialMonumentaModClient.options.abilitiesDisplay_showPassiveAbilities; + } + + // Active abilities take up space even if hidden unless condenseOnlyOnCooldown is enabled + if (forSpaceCalculation && !UnofficialMonumentaModClient.options.abilitiesDisplay_condenseOnlyOnCooldown) { + return true; + } + + // Active abilities are visible with showOnlyOnCooldown iff they are on cooldown or don't have a cooldown (and should have stacks instead) + return !UnofficialMonumentaModClient.options.abilitiesDisplay_showOnlyOnCooldown + || draggedAbility != null + || isInEditMode() + || abilityInfo.remainingCooldown > 0 + || abilityInfo.maxCharges > 0 && (abilityInfo.initialCooldown <= 0 || UnofficialMonumentaModClient.options.abilitiesDisplay_alwaysShowAbilitiesWithCharges); + } + + @Override + public Hud.ClickResult mouseClicked(double mouseX, double mouseY, int button) { + if (button != 0) { + return Hud.ClickResult.NONE; + } + if (Screen.hasControlDown()) { + startDragging(mouseX, mouseY); + } else { + AbilityHandler abilityHandler = UnofficialMonumentaModClient.abilityHandler; + List abilityInfos = abilityHandler.abilityData; + if (abilityInfos.isEmpty()) { + return Hud.ClickResult.NONE; + } + abilityInfos = abilityInfos.stream().filter(a -> isAbilityVisible(a, true)).collect(Collectors.toList()); + int index = getClosestAbilityIndex(abilityInfos, mouseX, mouseY); + if (index < 0) { + return Hud.ClickResult.NONE; + } + draggedAbility = abilityInfos.get(index).getOrderId(); + } + return Hud.ClickResult.DRAG; + } + + private int getClosestAbilityIndex(List abilityInfos, double mouseX, double mouseY) { + if (abilityInfos.isEmpty()) { + return -1; + } + + Options options = UnofficialMonumentaModClient.options; + int iconSize = options.abilitiesDisplay_iconSize; + int iconGap = options.abilitiesDisplay_iconGap; + boolean horizontal = options.abilitiesDisplay_horizontal; + + int closestAbilityIndex; + if (horizontal) { + closestAbilityIndex = (int) Math.floor((mouseX + iconGap / 2.0) / (iconSize + iconGap)); + } else { + closestAbilityIndex = (int) Math.floor((mouseY + iconGap / 2.0) / (iconSize + iconGap)); + } + closestAbilityIndex = Utils.clamp(0, closestAbilityIndex, abilityInfos.size() - 1); + + return closestAbilityIndex; + } + + public void renderTooltip(Screen screen, DrawContext drawContext, int mouseX, int mouseY) { + if (!UnofficialMonumentaModClient.options.abilitiesDisplay_enabled + || !UnofficialMonumentaModClient.options.abilitiesDisplay_tooltips + || dragging + || draggedAbility != null) { + return; + } + MatrixStack matrices = drawContext.getMatrices(); + + AbilityHandler abilityHandler = UnofficialMonumentaModClient.abilityHandler; + List abilityInfos = abilityHandler.abilityData; + if (abilityInfos.isEmpty()) { + return; + } + abilityInfos = abilityInfos.stream().filter(a -> isAbilityVisible(a, true)).collect(Collectors.toList()); + + int index = getClosestAbilityIndex(abilityInfos, mouseX, mouseY); + if (index < 0) { + return; + } + + AbilityHandler.AbilityInfo abilityInfo = abilityInfos.get(index); + + // renderTooltip assumes that the coordinates passed in are absolute... + Rectangle dimension = getDimension(); + matrices.push(); + matrices.translate(-dimension.x, -dimension.y, 0); + drawContext.drawTooltip(client.textRenderer, Text.of(abilityInfo.name), mouseX + dimension.x, mouseY + dimension.y); + matrices.pop(); + // TODO also display ability description? + } + + public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { + if (dragging) { + return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); + } else if (draggedAbility != null) { + AbilityHandler abilityHandler = UnofficialMonumentaModClient.abilityHandler; + List abilityInfos = abilityHandler.abilityData; + if (abilityInfos.isEmpty()) { + return false; + } + int index = getClosestAbilityIndex(abilityInfos, mouseX, mouseY); + if (index < 0) { + return false; + } + String abilityAtCurrentPos = abilityInfos.get(index).getOrderId(); + if (abilityAtCurrentPos.equals(draggedAbility)) { + return false; + } + List order = new ArrayList<>(UnofficialMonumentaModClient.options.abilitiesDisplay_order); + int currentAbiOrderIndex = order.indexOf(abilityAtCurrentPos); + if (currentAbiOrderIndex < 0) // shouldn't happen + { + return false; + } + order.remove(draggedAbility); + order.add(currentAbiOrderIndex, draggedAbility); + UnofficialMonumentaModClient.options.abilitiesDisplay_order = order; + abilityHandler.sortAbilities(); + return true; + } + return false; + } + + public boolean mouseReleased(double mouseX, double mouseY, int button) { + if (dragging) { + super.mouseReleased(mouseX, mouseY, button); + UnofficialMonumentaModClient.saveConfig(); + } else if (draggedAbility != null) { + draggedAbility = null; + UnofficialMonumentaModClient.saveConfig(); + return true; + } + return false; + } + + public void removed() { + super.removed(); + draggedAbility = null; + } + + @Override + protected boolean isClickable(double mouseX, double mouseY) { + AbilityHandler abilityHandler = UnofficialMonumentaModClient.abilityHandler; + List abilityInfos = abilityHandler.abilityData; + if (abilityInfos.isEmpty()) { + return false; + } + abilityInfos = abilityInfos.stream().filter(a -> isAbilityVisible(a, true)).collect(Collectors.toList()); + + int index = getClosestAbilityIndex(abilityInfos, mouseX, mouseY); + if (index < 0) { + return false; + } + AbilityHandler.AbilityInfo abilityInfo = abilityInfos.get(index); + if (!isAbilityVisible(abilityInfo, false)) { + return false; + } + Options options = UnofficialMonumentaModClient.options; + int iconSize = options.abilitiesDisplay_iconSize; + int iconOffset = iconSize + options.abilitiesDisplay_iconGap; + if (options.abilitiesDisplay_horizontal) { + mouseX -= index * iconOffset; + } else { + mouseY -= index * iconOffset; + } + return !isPixelTransparent(getAbilityIcon(abilityInfo), mouseX / iconSize, mouseY / iconSize) + || !isPixelTransparent(getSpriteOrDefault(getBorderFileIdentifier(abilityInfo.className, abilityHandler.silenceDuration > 0), UNKNOWN_CLASS_BORDER), mouseX / iconSize, mouseY / iconSize); + } + +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/hud/strike/ChestCountOverlay.java b/main/src/java/ch/njol/unofficialmonumentamod/hud/strike/ChestCountOverlay.java new file mode 100644 index 00000000..c551e718 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/hud/strike/ChestCountOverlay.java @@ -0,0 +1,176 @@ +package ch.njol.unofficialmonumentamod.hud.strike; + +import ch.njol.minecraft.uiframework.ElementPosition; +import ch.njol.minecraft.uiframework.hud.HudElement; +import ch.njol.unofficialmonumentamod.ChannelHandler; +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.core.PersistentData; +import ch.njol.unofficialmonumentamod.core.shard.ShardData; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.text.ClickEvent; +import net.minecraft.text.MutableText; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import org.jetbrains.annotations.Nullable; + +public class ChestCountOverlay extends HudElement { + //TODO generalize this class to be able to create one for any actionbar based counter / maybe other sources? + + public static final Pattern ACTIONBAR_PATTERN = Pattern.compile("(?[0-9]{1,3}) total chests? added to lootroom\\. \\(\\+(?[0-9])\\)", Pattern.CASE_INSENSITIVE); + + public static final ChestCountOverlay INSTANCE = new ChestCountOverlay(); + + private static final int WIDTH = 64; + private static final int HEIGHT = 24; + + private Integer currentCount; //get from actionbar + private Integer totalChests; //take from loaded shards as a HashMap (String, int) + + private final ItemStack CHEST = new ItemStack(Items.CHEST); + + public Integer getCurrentCount() { + return currentCount; + } + public Integer getTotalChests() { + return totalChests; + } + + @Override + protected void render(DrawContext drawContext, float tickDelta) { + final TextRenderer tr = MinecraftClient.getInstance().textRenderer; + + drawContext.fill(0, 0, WIDTH, HEIGHT, MinecraftClient.getInstance().options.getTextBackgroundColor(UnofficialMonumentaModClient.options.overlay_opacity)); + + drawContext.drawItemWithoutEntity(CHEST, 4, (HEIGHT - 16) / 2); + + Text text; + if (isInEditMode()) { + text = Text.of("Chests"); + } else { + text = Text.of("" + (totalChests != null && totalChests > 0 ? currentCount + "/" + totalChests : currentCount)); + } + + // if total is 0 or the current count is under the total then render in gold else render in bright green + int color = totalChests != null && totalChests > 0 && currentCount >= totalChests ? 0xFF1FD655 : 0xFFFCCD12; + + // center text + int x = 20 + (WIDTH - 20) / 2 - tr.getWidth(text) / 2; + int y = HEIGHT / 2 - tr.fontHeight / 2; + + drawContext.drawText(tr, text, x, y, color, false); + } + + public void onActionbarReceived(Text text) { + Matcher matcher = ACTIONBAR_PATTERN.matcher(text.getString()); + if (matcher.matches()) { + @Nullable String total = matcher.group("total"); + @Nullable String added = matcher.group("added"); + if (total != null) { + //Value given by the server should be trusted more than the local value. + currentCount = Integer.parseInt(total); + if (UnofficialMonumentaModClient.options.shardDebug) { + UnofficialMonumentaModClient.debug("Overid total chests: " + currentCount + " / " + totalChests); + } + } else if (added != null) { + UnofficialMonumentaModClient.LOGGER.warn("Got full match of chest counter but failed to get total\nAttempting to add value to local version instead"); + int addedInt = Integer.parseInt(added); + addCount(addedInt); + if (UnofficialMonumentaModClient.options.shardDebug) { + UnofficialMonumentaModClient.debug("Updated total chests: " + currentCount + " / " + totalChests); + } + } + } + } + + public void initializeListeners() { + PersistentData.PersistentDataLoadedCallback.EVENT.register((persistentData) -> { + if (persistentData.chestCount.value.shard.equals(ShardData.getCurrentShard().shortShard)) { + currentCount = Integer.valueOf(persistentData.chestCount.value.value); + } + }); + PersistentData.PersistentDataSavingCallback.EVENT.register((persistentData) -> persistentData.chestCount = new PersistentData.DatedHolder<>(System.currentTimeMillis(), new PersistentData.ShardedHolder<>(ShardData.getCurrentShard().shortShard, currentCount != null ? currentCount.shortValue() : 0))); + + ShardData.ShardChangedEventCallback.EVENT.register((currentShard, lastShard) -> { + if (!currentShard.equals(lastShard)) { + onShardChange(currentShard.shortShard); + } + }); + } + + public void onStrikeChestUpdatePacket(ChannelHandler.StrikeChestUpdatePacket packet) { + if (!UnofficialMonumentaModClient.options.chestCount_disablePacketMaxOverride) { + totalChests = packet.newLimit; + } + + if (packet.count != null) { + currentCount = packet.count; + } + + if (UnofficialMonumentaModClient.options.shardDebug) { + UnofficialMonumentaModClient.debug("Strike Packet received\nOverid total chests: " + currentCount + " / " + totalChests); + } + } + + public void addCount(int num) { + currentCount += num; + + if (currentCount > totalChests) { + //means that the current max count is probably not correct + MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(MutableText.of(Text.of( + "[UMM] Current shard's max count seems incorrect.\nPlease report the new count to a Unofficial Monumenta Mod maintainer: " + currentCount + "\nYou can disable this message by clicking on it." + ).getContent()).setStyle(Style.EMPTY.withColor(Formatting.DARK_RED).withBold(true).withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/umm disableChestCountError")))); + } + } + + public void onShardChange(String shardName) { + //now serves mostly as a fallback as most (if not all) content now uses StrikeChestUpdatePacket + totalChests = ShardData.getMaxChests(shardName); // if null then non strike, if 0 then strike but max is unknown, > 0 means it's known so then render the max + currentCount = 0; + } + + @Override + protected boolean isEnabled() { + return UnofficialMonumentaModClient.options.chestCount_enabled; + } + + @Override + protected boolean isVisible() { + return totalChests != null; + } + + @Override + protected int getWidth() { + return WIDTH; + } + + @Override + protected int getHeight() { + return HEIGHT; + } + + @Override + protected ElementPosition getPosition() { + return UnofficialMonumentaModClient.options.chestCount_position; + } + + @Override + protected int getZOffset() { + return 0; + } + + @Override + public boolean mouseReleased(double mouseX, double mouseY, int button) { + if (dragging) { + UnofficialMonumentaModClient.saveConfig(); + } + return super.mouseReleased(mouseX, mouseY, button); + } + +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/ArmorFeatureRendererMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ArmorFeatureRendererMixin.java new file mode 100644 index 00000000..d5cf9154 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ArmorFeatureRendererMixin.java @@ -0,0 +1,116 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import ch.njol.unofficialmonumentamod.features.spoof.TextureSpoofer; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.entity.feature.ArmorFeatureRenderer; +import net.minecraft.client.render.entity.feature.FeatureRenderer; +import net.minecraft.client.render.entity.feature.FeatureRendererContext; +import net.minecraft.client.render.entity.model.BipedEntityModel; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.BakedModelManager; +import net.minecraft.client.render.model.json.ModelTransformationMode; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.mob.ZombieVillagerEntity; +import net.minecraft.entity.passive.VillagerEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.Equipment; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registries; +import org.joml.Quaternionf; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ArmorFeatureRenderer.class) +public abstract class ArmorFeatureRendererMixin, A extends BipedEntityModel> extends FeatureRenderer { + + public ArmorFeatureRendererMixin(FeatureRendererContext context) { + super(context); + } + + @Unique + private static EquipmentSlot contextSlot; + @Unique + private static LivingEntity contextEntity; + + /** + * If a helmet has a model, do not render it as usual and instead render its model + */ + @Inject(method = "renderArmor(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/EquipmentSlot;ILnet/minecraft/client/render/entity/model/BipedEntityModel;)V", + at = @At("HEAD"), cancellable = true) + public void renderArmor(MatrixStack matrices, VertexConsumerProvider vertexConsumers, T livingEntity, EquipmentSlot equipmentSlot, + int i, M bipedEntityModel, CallbackInfo ci) { + contextSlot = equipmentSlot; + contextEntity = livingEntity; + if (equipmentSlot != EquipmentSlot.HEAD) { + return; + } + + ItemStack itemStack = livingEntity.getEquippedStack(EquipmentSlot.HEAD); + if (!(itemStack.getItem() instanceof ArmorItem)) { + return; + } + + BakedModelManager bakedModelManager = MinecraftClient.getInstance().getBakedModelManager(); + BakedModel headModel = MinecraftClient.getInstance().getItemRenderer().getModel(itemStack, livingEntity.getWorld(), livingEntity, 0); + headModel = headModel.getOverrides().apply(headModel, itemStack, (ClientWorld) livingEntity.getWorld(), livingEntity, 0); + if (headModel == null || headModel == bakedModelManager.getMissingModel() || !headModel.hasDepth()) { + return; + } + + ci.cancel(); + + // this code is mostly copied from HeadFeatureRenderer + matrices.push(); + if (livingEntity.isBaby() && !(livingEntity instanceof VillagerEntity)) { + matrices.translate(0.0D, 0.03125D, 0.0D); + matrices.scale(0.7F, 0.7F, 0.7F); + matrices.translate(0.0D, 1.0D, 0.0D); + } + this.getContextModel().getHead().rotate(matrices); + matrices.translate(0.0D, -0.25D, 0.0D); + matrices.multiply(new Quaternionf(0, 180, 0, 0)); + matrices.scale(0.625F, -0.625F, -0.625F); + if (!UnofficialMonumentaModClient.options.lowerVillagerHelmets && (livingEntity instanceof VillagerEntity || livingEntity instanceof ZombieVillagerEntity)) { + matrices.translate(0.0D, 0.1875D, 0.0D); + } + MinecraftClient.getInstance().getItemRenderer().renderItem(itemStack, ModelTransformationMode.HEAD, + false, matrices, vertexConsumers, i, OverlayTexture.DEFAULT_UV, headModel); + matrices.pop(); + } + + @ModifyVariable(method = "renderArmor", at = @At(value = "STORE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;")) + private ItemStack editStack(ItemStack value) { + if (!Utils.isEntityMainPlayer(contextEntity)) { + return value; + } + + //override logic, if override is false and the item is wearable it will remove the original stack else it will carry on. + if (UnofficialMonumentaModClient.options.enableTextureSpoofing && + UnofficialMonumentaModClient.spoofer.spoofedItems.containsKey(TextureSpoofer.getKeyOf(value)) && + !(Registries.ITEM.get(UnofficialMonumentaModClient.spoofer.spoofedItems.get(TextureSpoofer.getKeyOf(value)).getItemIdentifier()) instanceof ArmorItem)) { + if (UnofficialMonumentaModClient.spoofer.spoofedItems.get(TextureSpoofer.getKeyOf(value)).override && + ((Registries.ITEM.get(UnofficialMonumentaModClient.spoofer.spoofedItems.get(TextureSpoofer.getKeyOf(value)).getItemIdentifier()) instanceof Equipment) || + (contextSlot == EquipmentSlot.HEAD))) { + return ItemStack.EMPTY; + } + //if the item is not an armor item (e.g: iron helmet, diamond leggings, golden boots, etc...) but is also not wearable + return value; + } + + ItemStack edited = UnofficialMonumentaModClient.spoofer.apply(value); + return edited != null ? edited : value; + } + +} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/BlockItemMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/BlockItemMixin.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/mixins/BlockItemMixin.java rename to main/src/java/ch/njol/unofficialmonumentamod/mixins/BlockItemMixin.java diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/CapeFeatureRendererMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/CapeFeatureRendererMixin.java new file mode 100644 index 00000000..0068e1dd --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/CapeFeatureRendererMixin.java @@ -0,0 +1,30 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.features.spoof.TextureSpoofer; +import net.minecraft.client.network.AbstractClientPlayerEntity; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.entity.feature.CapeFeatureRenderer; +import net.minecraft.client.util.SkinTextures; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +@Mixin(CapeFeatureRenderer.class) +public class CapeFeatureRendererMixin { + + @Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/network/AbstractClientPlayerEntity;FFFFFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z"), cancellable = true, locals = LocalCapture.CAPTURE_FAILSOFT) + private void onCapeRender(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, AbstractClientPlayerEntity abstractClientPlayerEntity, float f, float g, float h, float j, float k, float l, CallbackInfo ci, SkinTextures skinTextures, ItemStack itemStack) { + if (UnofficialMonumentaModClient.options.enableTextureSpoofing && TextureSpoofer.shouldEdit(itemStack)) { + ItemStack edited = UnofficialMonumentaModClient.spoofer.apply(itemStack); + if ((edited != null ? edited : itemStack).getItem() == Items.ELYTRA) { + ci.cancel(); + } + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/ClientPlayNetworkHandlerMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ClientPlayNetworkHandlerMixin.java new file mode 100644 index 00000000..c0284316 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ClientPlayNetworkHandlerMixin.java @@ -0,0 +1,31 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.core.shard.ShardLoader; +import net.minecraft.client.network.ClientPlayNetworkHandler; +import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket; +import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ClientPlayNetworkHandler.class) +public class ClientPlayNetworkHandlerMixin { + + @Inject(method = "onPlayerRespawn", at = @At("HEAD")) + public void umm$onPlayerRespawnPacket(PlayerRespawnS2CPacket packet, CallbackInfo ci) { + ShardLoader.loadWorldFromDimensionKey(packet.commonPlayerSpawnInfo().dimension()); + if (UnofficialMonumentaModClient.options.shardDebug) { + UnofficialMonumentaModClient.LOGGER.info("Loading shard from Player Respawn packet"); + } + } + + @Inject(method = "onGameJoin", at = @At("HEAD")) + public void umm$onGameJoin(GameJoinS2CPacket packet, CallbackInfo ci) { + ShardLoader.loadWorldFromDimensionKey(packet.commonPlayerSpawnInfo().dimension()); + if (UnofficialMonumentaModClient.options.shardDebug) { + UnofficialMonumentaModClient.LOGGER.info("Loading shard from Game Join packet"); + } + } +} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/ClientPlayerInteractionManagerMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ClientPlayerInteractionManagerMixin.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/mixins/ClientPlayerInteractionManagerMixin.java rename to main/src/java/ch/njol/unofficialmonumentamod/mixins/ClientPlayerInteractionManagerMixin.java diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/DrawContextMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/DrawContextMixin.java new file mode 100644 index 00000000..db9d37d6 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/DrawContextMixin.java @@ -0,0 +1,24 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +@Mixin(DrawContext.class) +public class DrawContextMixin { + @ModifyVariable(method = "drawItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;IIII)V", at = @At("HEAD"), argsOnly = true) + private ItemStack umm$editStack(ItemStack value, LivingEntity entity) { + if (!Utils.isEntityMainPlayer(entity)) { + return value; + } + + ItemStack edited = UnofficialMonumentaModClient.spoofer.apply(value); + return edited != null ? edited : value; + } +} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/ElytraFeatureRendererMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ElytraFeatureRendererMixin.java similarity index 54% rename from src/main/java/ch/njol/unofficialmonumentamod/mixins/ElytraFeatureRendererMixin.java rename to main/src/java/ch/njol/unofficialmonumentamod/mixins/ElytraFeatureRendererMixin.java index fa6e44ec..4063db97 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/mixins/ElytraFeatureRendererMixin.java +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ElytraFeatureRendererMixin.java @@ -1,22 +1,37 @@ package ch.njol.unofficialmonumentamod.mixins; import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; import ch.njol.unofficialmonumentamod.features.spoof.TextureSpoofer; +import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.entity.feature.ElytraFeatureRenderer; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ElytraItem; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ElytraFeatureRenderer.class) public class ElytraFeatureRendererMixin { + @Unique + private static LivingEntity contextEntity; + + @Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/LivingEntity;FFFFFF)V", at = @At("HEAD"), cancellable = true) + public void umm$renderElytraMonitor(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l, CallbackInfo ci) { + contextEntity = livingEntity; + } + @ModifyVariable(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/LivingEntity;FFFFFF)V", at = @At(value = "STORE", target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z")) private ItemStack editStack(ItemStack value) { - if (UnofficialMonumentaModClient.spoofer.spoofedItems.containsKey(TextureSpoofer.getKeyOf(value)) && - !(Registries.ITEM.get(UnofficialMonumentaModClient.spoofer.spoofedItems.get(TextureSpoofer.getKeyOf(value)).getItemIdentifier()) instanceof ElytraItem)) { + if (!Utils.isEntityMainPlayer(contextEntity) || (UnofficialMonumentaModClient.spoofer.spoofedItems.containsKey(TextureSpoofer.getKeyOf(value)) && + !(Registries.ITEM.get(UnofficialMonumentaModClient.spoofer.spoofedItems.get(TextureSpoofer.getKeyOf(value)).getItemIdentifier()) instanceof ElytraItem))) { return value; } ItemStack edited = UnofficialMonumentaModClient.spoofer.apply(value); diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/HeadFeatureRendererMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/HeadFeatureRendererMixin.java new file mode 100644 index 00000000..b67b8890 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/HeadFeatureRendererMixin.java @@ -0,0 +1,128 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import net.minecraft.block.AbstractSkullBlock; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.entity.feature.FeatureRenderer; +import net.minecraft.client.render.entity.feature.FeatureRendererContext; +import net.minecraft.client.render.entity.feature.HeadFeatureRenderer; +import net.minecraft.client.render.entity.model.EntityModel; +import net.minecraft.client.render.entity.model.ModelWithHead; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.BakedModelManager; +import net.minecraft.client.render.model.BuiltinBakedModel; +import net.minecraft.client.render.model.json.ModelTransformationMode; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.mob.ZombieVillagerEntity; +import net.minecraft.entity.passive.VillagerEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import org.joml.Quaternionf; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(HeadFeatureRenderer.class) +public abstract class HeadFeatureRendererMixin & ModelWithHead> extends FeatureRenderer { + + public HeadFeatureRendererMixin(FeatureRendererContext context) { + super(context); + } + + @Unique + private static LivingEntity contextEntity; + + /** + * If a skull block has an "on_head" model, do not render it as usual and instead render that model + */ + @Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/LivingEntity;FFFFFF)V", + at = @At("HEAD"), cancellable = true) + public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, T livingEntity, float f, float g, float h, float j, float k, float l, CallbackInfo ci) { + ItemStack itemStack = livingEntity.getEquippedStack(EquipmentSlot.HEAD); + contextEntity = livingEntity; + + if (Utils.isEntityMainPlayer(livingEntity)) { + ItemStack edited = UnofficialMonumentaModClient.spoofer.apply(itemStack); + itemStack = edited != null ? edited : itemStack; + } + + Item item = itemStack.getItem(); + if (!(item instanceof BlockItem) || !(((BlockItem) item).getBlock() instanceof AbstractSkullBlock)) { + return; + } + + if (livingEntity instanceof VillagerEntity + && !livingEntity.isInvisible() + && UnofficialMonumentaModClient.options.hideVillagerPlayerHeads) { + ci.cancel(); + return; + } + + BakedModelManager bakedModelManager = MinecraftClient.getInstance().getBakedModelManager(); + BakedModel baseModel = MinecraftClient.getInstance().getItemRenderer().getModel(itemStack, livingEntity.getWorld(), livingEntity, 0); + BakedModel headModel = baseModel.getOverrides().apply(baseModel, itemStack, (ClientWorld) livingEntity.getWorld(), livingEntity, 0); + if (headModel == null || headModel == bakedModelManager.getMissingModel() || !headModel.hasDepth() || headModel instanceof BuiltinBakedModel) { + return; + } + + ci.cancel(); + + // this code is mostly copied from HeadFeatureRenderer + matrices.push(); + if (livingEntity.isBaby() && !(livingEntity instanceof VillagerEntity)) { + matrices.translate(0.0D, 0.03125D, 0.0D); + matrices.scale(0.7F, 0.7F, 0.7F); + matrices.translate(0.0D, 1.0D, 0.0D); + } + this.getContextModel().getHead().rotate(matrices); + matrices.translate(0.0D, -0.25D, 0.0D); + matrices.multiply(new Quaternionf(0, 180, 0, 0)); + matrices.scale(0.625F, -0.625F, -0.625F); + if (!UnofficialMonumentaModClient.options.lowerVillagerHelmets && (livingEntity instanceof VillagerEntity || livingEntity instanceof ZombieVillagerEntity)) { + matrices.translate(0.0D, 0.1875D, 0.0D); + } + MinecraftClient.getInstance().getItemRenderer().renderItem(itemStack, ModelTransformationMode.HEAD, + false, matrices, vertexConsumers, i, OverlayTexture.DEFAULT_UV, headModel); + matrices.pop(); + } + + @Redirect(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/LivingEntity;FFFFFF)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;translate(FFF)V", ordinal = 2)) + public void render_MatrixStack_translate(MatrixStack instance, float x, float y, float z) { + if (UnofficialMonumentaModClient.options.lowerVillagerHelmets + && x == 0 + && y == 0.0625D + && z == 0) { + return; // don't translate + } + instance.translate(x, y, z); + } + + @ModifyVariable(method = "translate(Lnet/minecraft/client/util/math/MatrixStack;Z)V", at = @At("HEAD"), argsOnly = true) + private static boolean render_MatrixStack_translate(boolean villager) { + return !UnofficialMonumentaModClient.options.lowerVillagerHelmets && villager; + } + + @ModifyVariable(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/LivingEntity;FFFFFF)V", at = @At(value = "STORE", target = "Lnet/minecraft/item/ItemStack;isEmpty()Z")) + private ItemStack editStack(ItemStack value) { + if (!Utils.isEntityMainPlayer(contextEntity)) { + return value; + } + + ItemStack edited = UnofficialMonumentaModClient.spoofer.apply(value); + return edited != null ? edited : value; + } + +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/HeldItemFeatureRendererMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/HeldItemFeatureRendererMixin.java new file mode 100644 index 00000000..9554721e --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/HeldItemFeatureRendererMixin.java @@ -0,0 +1,44 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.entity.feature.FeatureRenderer; +import net.minecraft.client.render.entity.feature.FeatureRendererContext; +import net.minecraft.client.render.entity.feature.HeldItemFeatureRenderer; +import net.minecraft.client.render.entity.model.EntityModel; +import net.minecraft.client.render.entity.model.ModelWithArms; +import net.minecraft.client.render.model.json.ModelTransformationMode; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.Arm; +import net.minecraft.util.Hand; +import net.minecraft.util.math.RotationAxis; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(HeldItemFeatureRenderer.class) +public abstract class HeldItemFeatureRendererMixin & ModelWithArms> extends FeatureRenderer { + + public HeldItemFeatureRendererMixin(FeatureRendererContext context) { + super(context); + } + + /** + * Rotate third-person tridents while in their throwing animation + */ + @Inject(method = "renderItem", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/HeldItemRenderer;renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", shift = At.Shift.BEFORE)) + public void renderItem_tridentFix(LivingEntity entity, ItemStack stack, ModelTransformationMode transformationMode, Arm arm, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) { + if (UnofficialMonumentaModClient.options.overrideTridentRendering + && stack.getItem() == Items.TRIDENT + && entity.isUsingItem() + && (entity.getActiveHand() == Hand.MAIN_HAND) == (entity.getMainArm() == arm)) { + matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(180.0f)); + } + } + +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/InGameHudMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/InGameHudMixin.java new file mode 100644 index 00000000..508ef952 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/InGameHudMixin.java @@ -0,0 +1,91 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.AbilityHandler; +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.features.misc.managers.MessageNotifier; +import ch.njol.unofficialmonumentamod.hud.strike.ChestCountOverlay; +import ch.njol.unofficialmonumentamod.hud.AbilitiesHud; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.text.Text; +import org.apache.commons.lang3.StringUtils; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Slice; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(InGameHud.class) +public class InGameHudMixin { + + @Unique + private final AbilitiesHud abilitiesHud = AbilitiesHud.INSTANCE; + + @Inject(method = "setOverlayMessage", at = @At("TAIL")) + public void onActionbar(Text message, boolean tinted, CallbackInfo ci) { + ChestCountOverlay.INSTANCE.onActionbarReceived(message); + } + + @Inject(method = "render", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/InGameHud;renderStatusEffectOverlay(Lnet/minecraft/client/gui/DrawContext;)V", shift = At.Shift.BEFORE)) + void renderSkills_beforeStatusEffects(DrawContext drawContext, float tickDelta, CallbackInfo ci) { + if (!abilitiesHud.renderInFrontOfChat()) { + UnofficialMonumentaModClient.effectOverlay.renderAbsolute(drawContext, tickDelta); + ChestCountOverlay.INSTANCE.renderAbsolute(drawContext, tickDelta); + MessageNotifier.getInstance().renderAbsolute(drawContext, tickDelta); + abilitiesHud.renderAbsolute(drawContext, tickDelta); + } + } + + @Inject(method = "render", + at = @At(value = "INVOKE", target = "Lnet/minecraft/scoreboard/Scoreboard;getObjectiveForSlot(Lnet/minecraft/scoreboard/ScoreboardDisplaySlot;)Lnet/minecraft/scoreboard/ScoreboardObjective;", shift = At.Shift.BEFORE), + slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/ChatHud;render(Lnet/minecraft/client/gui/DrawContext;III)V"))) + void renderSkills_afterChat(DrawContext drawContext, float tickDelta, CallbackInfo ci) { + if (abilitiesHud.renderInFrontOfChat()) { + UnofficialMonumentaModClient.effectOverlay.renderAbsolute(drawContext, tickDelta); + ChestCountOverlay.INSTANCE.renderAbsolute(drawContext, tickDelta); + MessageNotifier.getInstance().renderAbsolute(drawContext, tickDelta); + abilitiesHud.renderAbsolute(drawContext, tickDelta); + } + } + + /** + * If configured, do not show ability messages + * TODO The messages here are translated, so only work for English. Maybe just check for the ability name in the message? (assuming that one isn't translated as well...) + * TODO Or maybe make this an option server-side? That would probably be the best option. Maybe even make the client mod send this request. + */ + @Inject(method = "setOverlayMessage(Lnet/minecraft/text/Text;Z)V", at = @At("HEAD"), cancellable = true) + void setOverlayMessage(Text message, boolean tinted, CallbackInfo ci) { + if (message == null) { + return; + } + synchronized (UnofficialMonumentaModClient.abilityHandler) { + if (!UnofficialMonumentaModClient.options.abilitiesDisplay_hideAbilityRelatedMessages + || !UnofficialMonumentaModClient.options.abilitiesDisplay_enabled + || UnofficialMonumentaModClient.abilityHandler.abilityData.isEmpty()) { + return; + } + String m = message.getString(); + if (StringUtils.startsWithIgnoreCase(m, "You are silenced") + || StringUtils.startsWithIgnoreCase(m, "All your cooldowns have been reset") + || StringUtils.startsWithIgnoreCase(m, "Cloak stacks:") + || StringUtils.startsWithIgnoreCase(m, "Rage:") + || StringUtils.startsWithIgnoreCase(m, "Holy energy radiates from your hands") + || StringUtils.startsWithIgnoreCase(m, "The light from your hands fades")) { + ci.cancel(); + return; + } + for (AbilityHandler.AbilityInfo abilityInfo : UnofficialMonumentaModClient.abilityHandler.abilityData) { + if (StringUtils.startsWithIgnoreCase(m, abilityInfo.name + " is now off cooldown") + || StringUtils.startsWithIgnoreCase(m, abilityInfo.name + " has been activated") + || StringUtils.startsWithIgnoreCase(m, abilityInfo.name + " stacks") + || StringUtils.startsWithIgnoreCase(m, abilityInfo.name + " charges")) { + ci.cancel(); + return; + } + } + } + } + +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/ItemRendererMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ItemRendererMixin.java new file mode 100644 index 00000000..ae5fc0d6 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ItemRendererMixin.java @@ -0,0 +1,92 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.render.model.json.ModelTransformationMode; +import net.minecraft.client.render.model.json.Transformation; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; +import org.joml.Vector3f; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(ItemRenderer.class) +public abstract class ItemRendererMixin { + + @Unique + private static final Transformation THIRD_PERSON_RIGHT_HAND_TRANSFORM = new Transformation(new Vector3f(0, -90, 55), new Vector3f(0, 0.2f, 0), new Vector3f(1.7f, 1.7f, 0.85f)); + @Unique + private static final Transformation THIRD_PERSON_LEFT_HAND_TRANSFORM = new Transformation(new Vector3f(0, 90, -55), new Vector3f(0, 0.2f, 0), new Vector3f(1.7f, 1.7f, 0.85f)); + @Unique + private static final Transformation FIRST_PERSON_RIGHT_HAND_TRANSFORM = new Transformation(new Vector3f(0, -90, 70), new Vector3f(0.1f, 0.2f, 0.1f), new Vector3f(1.36f, 1.36f, 0.68f)); + @Unique + private static final Transformation FIRST_PERSON_LEFT_HAND_TRANSFORM = new Transformation(new Vector3f(0, 90, -70), new Vector3f(0.1f, 0.2f, 0.1f), new Vector3f(1.36f, 1.36f, 0.68f)); + + @Unique + private ModelTransformationMode originalRenderMode; + + /** + * Pretend tridents are always rendered in GUI mode. This prevents Mojank code for tridents from being executed, and also causes CITResewn's trident hack to work. + * CITResewn is also the reason why the change happens in this method instead of the more general renderItem method - it injects at HEAD there, but we need to inject even earlier. + * The only other use of renderMode in the vanilla code is for transformations, which the next method in this mixin handles. + */ + @ModifyVariable(method = "renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/world/World;III)V", + at = @At("HEAD"), ordinal = 0, argsOnly = true) + ModelTransformationMode renderItem_tridentFix_citResewnHack(ModelTransformationMode renderMode, @Nullable LivingEntity entity, ItemStack item, ModelTransformationMode renderMode2, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, @Nullable World world, int light, int overlay, int seed) { + Item spoofedItem = Utils.isEntityMainPlayer(entity) ? UnofficialMonumentaModClient.spoofer.getSpoofItem(item) : null; + + if (UnofficialMonumentaModClient.options.overrideTridentRendering + && !item.isEmpty() + && item.getItem() == Items.TRIDENT && + (spoofedItem != null && spoofedItem == Items.TRIDENT)) { + originalRenderMode = renderMode; + return ModelTransformationMode.GUI; + } + return renderMode; + } + + /** + * Always use the hardcoded transforms here where the trident model was otherwise used (except HEAD which really should not be used...). + */ + @Redirect(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/render/model/BakedModel;)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/model/json/ModelTransformation;getTransformation(Lnet/minecraft/client/render/model/json/ModelTransformationMode;)Lnet/minecraft/client/render/model/json/Transformation;")) + Transformation getTransformation_tridentFix2(ModelTransformation modelTransformation, ModelTransformationMode renderMode, ItemStack stack, ModelTransformationMode renderMode2, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, BakedModel model) { + if (UnofficialMonumentaModClient.options.overrideTridentRendering + && stack.getItem() == Items.TRIDENT) { + if (originalRenderMode != null) { + renderMode = originalRenderMode; + originalRenderMode = null; + } + return switch (renderMode) { + case THIRD_PERSON_RIGHT_HAND -> THIRD_PERSON_RIGHT_HAND_TRANSFORM; + case THIRD_PERSON_LEFT_HAND -> THIRD_PERSON_LEFT_HAND_TRANSFORM; + case FIRST_PERSON_RIGHT_HAND -> FIRST_PERSON_RIGHT_HAND_TRANSFORM; + case FIRST_PERSON_LEFT_HAND -> FIRST_PERSON_LEFT_HAND_TRANSFORM; + default -> modelTransformation.getTransformation(renderMode); + }; + } + return modelTransformation.getTransformation(renderMode); + } + + @ModifyVariable(method = "renderItem(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/model/json/ModelTransformationMode;ZLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/world/World;III)V", at = @At("HEAD"), argsOnly = true) + private ItemStack umm$editStack$renderItemEntity(ItemStack value, @Nullable LivingEntity entity) { + if (!Utils.isEntityMainPlayer(entity)) { + return value; + } + ItemStack edited = UnofficialMonumentaModClient.spoofer.apply(value); + return edited != null ? edited : value; + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/MessageHandlerMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/MessageHandlerMixin.java new file mode 100644 index 00000000..8efb1056 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/MessageHandlerMixin.java @@ -0,0 +1,19 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.core.shard.ShardLoader; +import ch.njol.unofficialmonumentamod.features.misc.DelveBounty; +import net.minecraft.client.network.message.MessageHandler; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MessageHandler.class) +public class MessageHandlerMixin { + @Inject(method = "onGameMessage", at = @At("TAIL")) + private void umm$onChatMessage(Text message, boolean overlay, CallbackInfo ci) { + DelveBounty.onMessage(message, overlay); + ShardLoader.onMessageReceived(message, overlay); + } +} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/MinecraftClientMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/MinecraftClientMixin.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/mixins/MinecraftClientMixin.java rename to main/src/java/ch/njol/unofficialmonumentamod/mixins/MinecraftClientMixin.java diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/PlayerListHudAccessor.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/PlayerListHudAccessor.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/mixins/PlayerListHudAccessor.java rename to main/src/java/ch/njol/unofficialmonumentamod/mixins/PlayerListHudAccessor.java diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/PlayerListHudMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/PlayerListHudMixin.java new file mode 100644 index 00000000..546e2851 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/PlayerListHudMixin.java @@ -0,0 +1,18 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.core.shard.ShardData; +import ch.njol.unofficialmonumentamod.core.shard.ShardLoader; +import net.minecraft.client.gui.hud.PlayerListHud; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(PlayerListHud.class) +public class PlayerListHudMixin { + @Inject(method = "setHeader", at = @At("TAIL")) + public void umm$onPlayerListHeader(Text header, CallbackInfo ci) { + ShardLoader.loadShardFromTabHeader(ShardData.getShard(header)); + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/ReloadableResourceManagerImplMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ReloadableResourceManagerImplMixin.java new file mode 100644 index 00000000..e62fd179 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ReloadableResourceManagerImplMixin.java @@ -0,0 +1,35 @@ +package ch.njol.unofficialmonumentamod.mixins; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.core.shard.ShardData; +import ch.njol.unofficialmonumentamod.features.effects.EffectData; +import ch.njol.unofficialmonumentamod.features.misc.SlotLocking; +import ch.njol.unofficialmonumentamod.hud.AbilitiesHud; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; +import net.minecraft.resource.ReloadableResourceManagerImpl; +import net.minecraft.resource.ResourcePack; +import net.minecraft.resource.ResourceReload; +import net.minecraft.util.Unit; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(ReloadableResourceManagerImpl.class) +public class ReloadableResourceManagerImplMixin { + + @Inject(method = "reload(Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)Lnet/minecraft/resource/ResourceReload;", + at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/SimpleResourceReload;start(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/concurrent/CompletableFuture;Z)Lnet/minecraft/resource/ResourceReload;", shift = At.Shift.BEFORE)) + void reload(Executor prepareExecutor, Executor applyExecutor, CompletableFuture initialStage, List packs, CallbackInfoReturnable cir) { + AbilitiesHud.registerSprites(); + SlotLocking.registerSprites(); + UnofficialMonumentaModClient.locations.reload(); + UnofficialMonumentaModClient.spoofer.reload(); + ShardData.reload(); + EffectData.reload(); + SlotLocking.getInstance().reload(); + } + +} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/ThreadExecutorMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ThreadExecutorMixin.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/mixins/ThreadExecutorMixin.java rename to main/src/java/ch/njol/unofficialmonumentamod/mixins/ThreadExecutorMixin.java diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/ThrowablePotionItemMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/ThrowablePotionItemMixin.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/mixins/ThrowablePotionItemMixin.java rename to main/src/java/ch/njol/unofficialmonumentamod/mixins/ThrowablePotionItemMixin.java diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/item/ItemStackAccessor.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/item/ItemStackAccessor.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/mixins/item/ItemStackAccessor.java rename to main/src/java/ch/njol/unofficialmonumentamod/mixins/item/ItemStackAccessor.java diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/item/ItemStackMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/item/ItemStackMixin.java new file mode 100644 index 00000000..6aa3e920 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/item/ItemStackMixin.java @@ -0,0 +1,32 @@ +package ch.njol.unofficialmonumentamod.mixins.item; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.features.spoof.TextureSpoofer; +import java.util.List; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.text.MutableText; +import net.minecraft.text.PlainTextContent; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +@Mixin(ItemStack.class) +public abstract class ItemStackMixin { + @Shadow + public abstract Text getName(); + + @Inject(method = "getTooltip", at = @At(value = "INVOKE_ASSIGN", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", ordinal = 0), locals = LocalCapture.CAPTURE_FAILSOFT) + private void onTooltip(@Nullable PlayerEntity player, TooltipContext context, CallbackInfoReturnable> cir, List list) { + if (TextureSpoofer.shouldEdit((ItemStack) (Object) this)) { + list.add(MutableText.of(PlainTextContent.of("Spoofed: " + UnofficialMonumentaModClient.spoofer.spoofedItems.get(this.getName().getString().toLowerCase()).displayName)).formatted(Formatting.DARK_GRAY)); + } + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/CreativeInventoryScreenMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/CreativeInventoryScreenMixin.java new file mode 100644 index 00000000..94a5da71 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/CreativeInventoryScreenMixin.java @@ -0,0 +1,21 @@ +package ch.njol.unofficialmonumentamod.mixins.screen; + +import ch.njol.unofficialmonumentamod.core.gui.InventoryWidget; +import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(CreativeInventoryScreen.class) +public class CreativeInventoryScreenMixin { + //allows the pass-through of mouseScrolled events to inventory widgets. + @Inject(at = @At("HEAD"), method = "mouseScrolled", cancellable = true) + void umm$onMouseScrolled(double mouseX, double mouseY, double horizontalScroll, double verticalScroll, CallbackInfoReturnable cir) { + if (((CreativeInventoryScreen) (Object) this).hoveredElement(mouseX, mouseY).filter( + (el) -> (el instanceof InventoryWidget) && el.mouseScrolled(mouseX, mouseY, horizontalScroll, verticalScroll) + ).isPresent()) { + cir.setReturnValue(true); + }; + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenAccessor.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenAccessor.java new file mode 100644 index 00000000..056803fb --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenAccessor.java @@ -0,0 +1,28 @@ +package ch.njol.unofficialmonumentamod.mixins.screen; + +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.screen.slot.Slot; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(HandledScreen.class) +public interface HandledScreenAccessor { + @Accessor("y") + int getY(); + + @Accessor("x") + int getX(); + + @Accessor("focusedSlot") + Slot getFocusedSlot(); + + @Accessor("backgroundWidth") + int getBackGroundWidth(); + + @Invoker("getSlotAt") + Slot doGetSlotAt(double x, double y); + + @Invoker("isPointOverSlot") + boolean isMouseOverSlot(Slot slot, double mouseX, double mouseY); +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenMixin.java new file mode 100644 index 00000000..37b01d4b --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenMixin.java @@ -0,0 +1,75 @@ +package ch.njol.unofficialmonumentamod.mixins.screen; + +import ch.njol.unofficialmonumentamod.core.gui.InventoryWidget; +import ch.njol.unofficialmonumentamod.features.misc.SlotLocking; +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.screen.slot.Slot; +import net.minecraft.screen.slot.SlotActionType; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.At.Shift; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +@Mixin(HandledScreen.class) +public abstract class HandledScreenMixin { + @Inject(method = "onMouseClick(Lnet/minecraft/screen/slot/Slot;IILnet/minecraft/screen/slot/SlotActionType;)V", at = @At("HEAD"), cancellable = true) + void umm$onSlotClicked(Slot slot, int slotId, int button, SlotActionType actionType, CallbackInfo ci) { + HandledScreen $this = (HandledScreen) (Object) this; + + if (SlotLocking.getInstance().onSlotClicked($this, slot, slotId, button, actionType)) { + ci.cancel(); + } + } + + @Inject(method = "render", at = @At("TAIL")) + void umm$onRender(DrawContext drawContext, int mouseX, int mouseY, float delta, CallbackInfo ci) { + SlotLocking.getInstance().tickRender(drawContext, mouseX, mouseY); + } + + //allows the pass-through of mouseReleased events to inventory widgets. + @Inject(method = "mouseReleased", at = @At("HEAD"), cancellable = true) + void umm$handledScreen$onMouseReleased(double mouseX, double mouseY, int button, CallbackInfoReturnable cir) { + HandledScreen $this = (HandledScreen) (Object) this; + + if($this.getFocused() instanceof InventoryWidget) { + if ($this.getFocused().mouseReleased(mouseX, mouseY, button)) { + cir.setReturnValue(true); + } + } + } + + //allows the pass-through of mouseDragged events to inventory widgets. + @Inject(method = "mouseDragged", at = @At("HEAD"), cancellable = true) + void umm$handledScreen$onMouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY, CallbackInfoReturnable cir) { + HandledScreen $this = (HandledScreen) (Object) this; + + if($this.getFocused() instanceof InventoryWidget) { + if ($this.getFocused().mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { + cir.setReturnValue(true); + } + } + } + + @Inject( + method = "render", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawSlot(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/screen/slot/Slot;)V", + shift = Shift.AFTER + ), + locals = LocalCapture.CAPTURE_FAILSOFT + ) + private void umm$afterDrawnSlot(DrawContext drawContext, int mouseX, int mouseY, float delta, CallbackInfo ci, int i, int j, int k, Slot slot) { + RenderSystem.disableDepthTest(); + RenderSystem.enableBlend(); + HandledScreen $this = (HandledScreen) (Object) this; + SlotLocking.getInstance().drawSlot($this, drawContext, slot); + RenderSystem.enableDepthTest(); + RenderSystem.disableBlend(); + } +} diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/ScreenAccessor.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/ScreenAccessor.java new file mode 100644 index 00000000..cdcc929c --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/ScreenAccessor.java @@ -0,0 +1,17 @@ +package ch.njol.unofficialmonumentamod.mixins.screen; + +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.Screen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(Screen.class) +public interface ScreenAccessor { + @Invoker("remove") + void doRemove(Element child); + + @Invoker("addDrawableChild") + T doAddDrawableChild(T drawableElement); +} \ No newline at end of file diff --git a/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/ScreenMixin.java b/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/ScreenMixin.java new file mode 100644 index 00000000..a7c92b59 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/mixins/screen/ScreenMixin.java @@ -0,0 +1,77 @@ +package ch.njol.unofficialmonumentamod.mixins.screen; + +import ch.njol.unofficialmonumentamod.Utils; +import ch.njol.unofficialmonumentamod.features.calculator.Calculator; +import ch.njol.unofficialmonumentamod.features.calculator.CalculatorWidget; + +import ch.njol.unofficialmonumentamod.features.misc.SlotLocking; +import ch.njol.unofficialmonumentamod.features.misc.dev.ItemDataOverlay; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.AbstractParentElement; +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.ParentElement; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.Screen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Screen.class) +public abstract class ScreenMixin extends AbstractParentElement implements ParentElement { + @Shadow protected abstract T addDrawableChild(T drawableElement); + + @Shadow protected abstract void remove(Element child); + + @Unique + void initializeWidget() { + Screen $this = (Screen) (Object) this; + //initialize calculator widget if it should be added. + if (Calculator.INSTANCE.shouldRender()) { + CalculatorWidget calculator = new CalculatorWidget($this); + calculator.init(CalculatorWidget.getMode()); + Calculator.lastWidgetInitialized = calculator; + Utils.addWidget($this, calculator); + } + + //re-initialize nbt dev overlay + ItemDataOverlay.onGUIResized($this); + } + + @Inject(at = @At("HEAD"), method = "close") + void onClose(CallbackInfo ci) { + //remove calculator from opened screen. + if (Calculator.lastWidgetInitialized != null) { + Calculator.lastWidgetInitialized.onParentClosed(); + Calculator.lastWidgetInitialized = null; + } + ItemDataOverlay.onGUIClosed(); + } + + @Inject(at = @At("HEAD"), method = "keyPressed", cancellable = true) + void onKeyTyped(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable cir) { + Screen $this = (Screen) (Object) this; + + if (Calculator.INSTANCE.keyTyped(keyCode, scanCode, modifiers)) { + cir.setReturnValue(true); + } + if (ItemDataOverlay.keyTyped(keyCode, scanCode, modifiers)) { + cir.setReturnValue(true); + } + + SlotLocking.getInstance().onKeyboardInput($this, keyCode, scanCode, modifiers, cir); + } + + @Inject(at = @At("TAIL"), method = "init(Lnet/minecraft/client/MinecraftClient;II)V") + void onInit(MinecraftClient client, int width, int height, CallbackInfo ci) { + initializeWidget(); + } + @Inject(at = @At("TAIL"), method = "resize") + void onResize(MinecraftClient client, int width, int height, CallbackInfo ci) { + initializeWidget(); + } +} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/options/ConfigMenu.java b/main/src/java/ch/njol/unofficialmonumentamod/options/ConfigMenu.java similarity index 100% rename from src/main/java/ch/njol/unofficialmonumentamod/options/ConfigMenu.java rename to main/src/java/ch/njol/unofficialmonumentamod/options/ConfigMenu.java diff --git a/main/src/java/ch/njol/unofficialmonumentamod/options/Options.java b/main/src/java/ch/njol/unofficialmonumentamod/options/Options.java new file mode 100644 index 00000000..fd2804d7 --- /dev/null +++ b/main/src/java/ch/njol/unofficialmonumentamod/options/Options.java @@ -0,0 +1,274 @@ +package ch.njol.unofficialmonumentamod.options; + +import ch.njol.minecraft.config.annotations.Category; +import ch.njol.minecraft.config.annotations.Color; +import ch.njol.minecraft.config.annotations.DescriptionLine; +import ch.njol.minecraft.config.annotations.Dropdown; +import ch.njol.minecraft.config.annotations.FloatSlider; +import ch.njol.minecraft.config.annotations.IntSlider; +import ch.njol.minecraft.uiframework.ElementPosition; +import ch.njol.unofficialmonumentamod.AbilityHandler; +import ch.njol.unofficialmonumentamod.AbilityOptionPreset; +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.features.misc.dev.ItemDataOverlay.ItemDataOverlayMode; +import java.util.ArrayList; +import java.util.List; + +public class Options implements ch.njol.minecraft.config.Options { + + @Category("misc") + public boolean overrideTridentRendering = true; + @Category("misc") + public boolean lowerVillagerHelmets = false; + @Category("misc") + public boolean hideVillagerPlayerHeads = false; + + @Category("misc") + public boolean firmamentPingFix = true; + + @Dropdown("chestsort") + @Category("misc") + public boolean chestsortDisabledForInventory = false; + @Dropdown("chestsort") + @Category("misc") + public boolean chestsortDisabledForEnderchest = false; + @Dropdown("chestsort") + @Category("misc") + public boolean chestsortDisabledEverywhereElse = false; + + @Category("misc") + public boolean enableDelveRecognition = true; + + @Dropdown("location") + @Category("misc") + public boolean notifyLocation = false; + @Dropdown("notifier") + @Category("misc") + @FloatSlider(min = 1.5F, max = 20F, step = 0.1F, unit = " seconds") + public float notifierShowTime = 10F; + @Dropdown("notifier") + @Category("misc") + public boolean notifierEarlyDismiss = false; + + @Dropdown("notifier") + @Category("misc") + @FloatSlider(min = 0.5F, max = 3F, step = 0.5F, unit = "x bigger") + public float notifierScaleFactor = 1.5F; + @Dropdown("notifier") + @Category("misc") + public ElementPosition notifierPosition = new ElementPosition(1.0F, -10, 1.0F, -10, 1.0F, 1.0F); + + // TODO implement item cooldown display + // requires sever-side adaptions to send the cooldown (on use and on connect) + + // the biggest issue: most tesseracts are apparently done in mcfunctions -> and one of them for some reason doesn't handle its charges the same way as the others. + // @Category("misc") + // public boolean renderItemCooldowns = true; + + @Category("misc") + public boolean silenceTeamErrors = true; + + @Dropdown("calculator") + @Category("misc") + public boolean showCalculator = true; + @Dropdown("calculator") + @Category("misc") + public boolean enableKeybindOutsidePlots = false; + @Dropdown("calculator") + @Category("misc") + public boolean calculatorPersistOnClosed = false; + + @Category("misc") + public boolean enableTextureSpoofing = true; + + @Category("misc") + public transient DescriptionLine overlay_misc; + @Category("misc") + @FloatSlider(min = 0F, max = 1F, step = 0.05F, unit = "%") + public float overlay_opacity = 0.3F; + + @Dropdown("lock") + @Category("misc") + @FloatSlider(min = 0.2F, max = 10F, step = 0.2F, unit = "s") + public float lock_textCooldown = 1F; + + @Dropdown("idoverlay") + @Category("misc") + public ItemDataOverlayMode itemdataoverlay_mode = ItemDataOverlayMode.NBT; + + @Category("abilities") + public transient DescriptionLine abilitiesDisplay_info; + @Category("abilities") + public boolean abilitiesDisplay_enabled = true; + @Category("abilities") + public boolean abilitiesDisplay_showCooldownAsText = true; + @Category("abilities") + public boolean abilitiesDisplay_hideAbilityRelatedMessages = true; + @Category("abilities") + public boolean abilitiesDisplay_inFrontOfChat = false; + @Category("abilities") + public boolean abilitiesDisplay_tooltips = true; + @Category("abilities") + public AbilityHandler.DurationRenderMode abilitiesDisplay_durationRenderMode = AbilityHandler.DurationRenderMode.BAR; + @Category("abilities") + public DurationBarSideMode abilitiesDisplay_durationBar_side = DurationBarSideMode.FOLLOW; + @Category("abilities") + @IntSlider(min = -32, max = 32, unit = " pixels") + public int abilitiesDisplay_durationBar_offsetY = -20; + @Category("abilities") + @IntSlider(min = -32, max = 32, unit = " pixels") + public int abilitiesDisplay_durationBar_offsetX = 2; + + @Category("abilities") + public transient DescriptionLine abilitiesDisplay_positionInfo; + @Category("abilities") + public transient AbilityOptionPreset abilitiesDisplay_preset = AbilityOptionPreset.CUSTOM; + @Category("abilities") + public boolean abilitiesDisplay_horizontal = AbilityOptionPreset.ABOVE_HOTBAR.horizontal; + @Category("abilities") + public ElementPosition abilitiesDisplay_position = AbilityOptionPreset.ABOVE_HOTBAR.position.clone(); + + @Category("abilities") + public transient DescriptionLine abilitiesDisplay_miscInfo; + @Category("abilities") + public boolean abilitiesDisplay_offCooldownResize = true; + @Category("abilities") + @FloatSlider(min = 0, max = 1, step = 0.01f, unit = "%", unitStep = 100) + public float abilitiesDisplay_offCooldownFlashIntensity = 1; + @Category("abilities") + @FloatSlider(min = 0, max = 1, step = 0.01f, unit = "%", unitStep = 100) + public float abilitiesDisplay_offCooldownSoundVolume = 0f; + @Category("abilities") + @FloatSlider(min = 0, max = 2, step = 0.05f) + public float abilitiesDisplay_offCooldownSoundPitchMin = 1f; + @Category("abilities") + @FloatSlider(min = 0, max = 2, step = 0.05f) + public float abilitiesDisplay_offCooldownSoundPitchMax = 1f; + @Category("abilities") + public boolean abilitiesDisplay_offCooldownSoundUseAlt = false; + @Category("abilities") + public int abilitiesDisplay_iconSize = 32; + @Category("abilities") + public int abilitiesDisplay_iconGap = 0; + @Category("abilities") + @Color + public int abilitiesDisplay_textColorRaw = 0xffeeeeee; + @Category("abilities") + public int abilitiesDisplay_textOffset = 4; + @Category("abilities") + public boolean abilitiesDisplay_ascendingRenderOrder = false; + @Category("abilities") + public boolean abilitiesDisplay_showOnlyOnCooldown = false; + @Category("abilities") + public boolean abilitiesDisplay_alwaysShowAbilitiesWithCharges = false; + @Category("abilities") + public boolean abilitiesDisplay_condenseOnlyOnCooldown = false; + @Category("abilities") + public boolean abilitiesDisplay_showPassiveAbilities = false; + + /** + * List of [class]/[ability] + */ + public List abilitiesDisplay_order = new ArrayList<>(); + + + /** + * Discord RPC Configuration + */ + @Category("discord") + public boolean discordEnabled = true; + /** + * discordDetails replace values: + * {player} returns the player's name + * {shard} returns the shard name + * {holding} returns the item held in the main hand + * {class} returns the class the user is playing as + * {location} returns the location or if not found the shard name + * everything else is a string literal + */ + @Category("discord") + public String discordDetails = "{player} is in {shard}"; + @Category("discord") + public boolean hideShardMode = false; + + @Category("effectOverlay") + public boolean effect_enabled = true; + @Category("effectOverlay") + public ElementPosition effect_position = new ElementPosition(0.5f, 0, 0.0f, 0, 0.5f, 0); + + @Category("effectOverlay") + public boolean effect_compress = true; + @Category("effectOverlay") + public boolean effect_textAlightRight = false; + @Category("effectOverlay") + @IntSlider(min = 50, max = 500) + public int effect_width = 200; + + @Category("chestCountOverlay") + public boolean chestCount_enabled = true; + @Category("chestCountOverlay") + public ElementPosition chestCount_position = new ElementPosition(1f, 0, 0.0f, 0, 1f, 0); + @Category("chestCountOverlay") + public boolean chestCount_disablePacketMaxOverride = false; + + @Category("debug") + public boolean debugOptionsEnabled = false; + @Category("debug") + public boolean logPackets = false; + + @Category("debug") + public boolean enableChestCountMaxError = true; + + @Category("debug") + public boolean logEffectPackets = false; + + @Dropdown("lock") + @Category("debug") + public boolean lock_renderDebuggingAdvancedLock = false; + + @Dropdown("info") + @Category("debug") + public boolean shardDebug = false; + + @Dropdown("info") + @Category("debug") + public boolean notifyDebugMessages = false; + + public void onUpdate() { + if (abilitiesDisplay_preset != AbilityOptionPreset.CUSTOM) { + abilitiesDisplay_horizontal = abilitiesDisplay_preset.horizontal; + abilitiesDisplay_position = abilitiesDisplay_preset.position.clone(); + abilitiesDisplay_preset = AbilityOptionPreset.CUSTOM; + } + try { + if (UnofficialMonumentaModClient.canInitializeDiscord()) { + if (UnofficialMonumentaModClient.options.discordEnabled) { + if (UnofficialMonumentaModClient.discordRPC.isInitialized()) { + UnofficialMonumentaModClient.discordRPC.updateDiscordRPCDetails(); + } else { + UnofficialMonumentaModClient.discordRPC.Init(); + } + } else { + if (UnofficialMonumentaModClient.discordRPC.isInitialized()) { + UnofficialMonumentaModClient.discordRPC.shutdown(); + } + } + } + } catch (Exception e) { + UnofficialMonumentaModClient.LOGGER.error("Caught error whilst trying to update Discord Presence data: ", e); + } + + UnofficialMonumentaModClient.saveConfig(); + } + + public boolean categoryVisible(String category) { + return debugOptionsEnabled || !category.equals("debug"); + } + + public enum DurationBarSideMode { + FOLLOW(), + HORIZONTAL(), + VERTICAL() + } + +} diff --git a/src/main/resources/assets/unofficial-monumenta-mod/atlases/abilities.json b/main/src/resources/assets/unofficial-monumenta-mod/atlases/abilities.json similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/atlases/abilities.json rename to main/src/resources/assets/unofficial-monumenta-mod/atlases/abilities.json diff --git a/src/main/resources/assets/unofficial-monumenta-mod/atlases/gui.json b/main/src/resources/assets/unofficial-monumenta-mod/atlases/gui.json similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/atlases/gui.json rename to main/src/resources/assets/unofficial-monumenta-mod/atlases/gui.json diff --git a/main/src/resources/assets/unofficial-monumenta-mod/icon.png b/main/src/resources/assets/unofficial-monumenta-mod/icon.png new file mode 100644 index 00000000..da6b038e Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/icon.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/lang/en_us.json b/main/src/resources/assets/unofficial-monumenta-mod/lang/en_us.json new file mode 100644 index 00000000..681aa182 --- /dev/null +++ b/main/src/resources/assets/unofficial-monumenta-mod/lang/en_us.json @@ -0,0 +1,224 @@ +{ + + "unofficial-monumenta-mod.keybinds.category": "Unofficial Monumenta Mod", + "unofficial-monumenta-mod.keybinds.toggleCalculator": "Toggle Calculator (plots shard only)", + "unofficial-monumenta-mod.keybinds.toggleNBTOverlay": "Open Item Overlay", + "unofficial-monumenta-mod.keybinds.lock_slot": "Lock/Unlock selected inventory slot", + + "unofficial-monumenta-mod.config.title": "Unofficial Monumenta Mod Configuration", + + "unofficial-monumenta-mod.config.position.offsetXRelative": "Relative X position", + "unofficial-monumenta-mod.config.position.offsetXRelative.tooltip": "Horizontal position relative to the screen (0 = left, 1 = right)\nAny value works, e.g. 0.1 = 10% of the screen width from the left edge.", + "unofficial-monumenta-mod.config.position.offsetYRelative": "Relative Y position", + "unofficial-monumenta-mod.config.position.offsetYRelative.tooltip": "Vertical position relative to the screen (0 = top, 1 = bottom)\nAny value works, e.g. 0.1 = 10% of the screen height from the top edge. ", + "unofficial-monumenta-mod.config.position.offsetXAbsolute": "Absolute X offset", + "unofficial-monumenta-mod.config.position.offsetXAbsolute.tooltip": "Absolute horizontal position offset.\nThis is added after the relative position has been calculated.\nNegative values shift to the left, positive values shift to the right.", + "unofficial-monumenta-mod.config.position.offsetYAbsolute": "Absolute Y offset", + "unofficial-monumenta-mod.config.position.offsetYAbsolute.tooltip": "Absolute vertical position offset.\nThis is added after the relative position has been calculated.\nNegative values shift upwards, positive values shift downwards.", + "unofficial-monumenta-mod.config.position.alignX": "X Alignment", + "unofficial-monumenta-mod.config.position.alignX.tooltip": "Horizontal alignment.\n0: left-aligned, 0.5: centered, 1: right-aligned.\nAny value between 0 and 1 works.", + "unofficial-monumenta-mod.config.position.alignY": "Y Alignment", + "unofficial-monumenta-mod.config.position.alignY.tooltip": "Vertical alignment.\n0: top-aligned, 0.5: centered, 1: bottom-aligned.\nAny value between 0 and 1 works.", + + "unofficial-monumenta-mod.config.category.misc": "Miscellaneous", + "unofficial-monumenta-mod.config.option.overrideTridentRendering": "Render trident textures", + "unofficial-monumenta-mod.config.option.overrideTridentRendering.tooltip": "Render tridents using the item textures.\nRequires the Monumenta resource pack to look good.", + "unofficial-monumenta-mod.config.option.lowerVillagerHelmets": "Lower villagers' helmets", + "unofficial-monumenta-mod.config.option.lowerVillagerHelmets.tooltip": "Lowers helmets and player heads worn by villagers\nto fit with the model used in the Monumenta RP.", + "unofficial-monumenta-mod.config.option.hideVillagerPlayerHeads": "Hide player heads worn by villagers", + "unofficial-monumenta-mod.config.option.hideVillagerPlayerHeads.tooltip": "Hides player heads on villagers, as long as they aren't invisible.", + "unofficial-monumenta-mod.config.option.firmamentPingFix": "Firmament ping fix", + "unofficial-monumenta-mod.config.option.firmamentPingFix.tooltip": "Changes the Firmament and Doorway from Eternity to place prismarine/blackstone\ninstead of a Shulker box for faster placement.", + + "unofficial-monumenta-mod.config.option.enableDelveRecognition": "Tells you what Delve bounty you got", + "unofficial-monumenta-mod.config.option.enableDelveRecognition.tooltip": "Shows a message under the cryptic message told by Reynart telling you what dungeon you are about to suffer in.", + + "unofficial-monumenta-mod.config.subcategory.chestsort": "ChestSort options", + "unofficial-monumenta-mod.config.option.chestsortDisabledForInventory": "Disable ChestSort in Inventory", + "unofficial-monumenta-mod.config.option.chestsortDisabledForInventory.tooltip": "Disable ChestSort (double right click) in the player inventory", + "unofficial-monumenta-mod.config.option.chestsortDisabledForEnderchest": "Disable ChestSort in Ender Chest", + "unofficial-monumenta-mod.config.option.chestsortDisabledForEnderchest.tooltip": "Disable ChestSort (double right click) in the Ender Chest", + "unofficial-monumenta-mod.config.option.chestsortDisabledEverywhereElse": "Disable ChestSort everywhere else", + "unofficial-monumenta-mod.config.option.chestsortDisabledEverywhereElse.tooltip": "Disable ChestSort (double right click) in every other type of inventory", + + "unofficial-monumenta-mod.config.subcategory.location": "Location notification options", + "unofficial-monumenta-mod.config.option.notifyLocation": "Enable Location notifications", + "unofficial-monumenta-mod.config.option.notifyLocation.tooltip": "Toggle whether to show a notification when joining or leaving an area.", + + "unofficial-monumenta-mod.config.subcategory.notifier": "Notifications", + "unofficial-monumenta-mod.config.option.notifierShowTime": "Dismissal time", + "unofficial-monumenta-mod.config.option.notifierShowTime.tooltip": "How long a message takes to be dismissed.", + "unofficial-monumenta-mod.config.option.notifierEarlyDismiss": "Early dismissal", + "unofficial-monumenta-mod.config.option.notifierEarlyDismiss.tooltip": "Whether it will be dismissed early if the max rendered amount is reached.", + "unofficial-monumenta-mod.config.option.notifierScaleFactor": "Scale factor", + "unofficial-monumenta-mod.config.option.notifierScaleFactor.tooltip": "How much bigger the notifications are", + "unofficial-monumenta-mod.config.option.notifierPosition": "Overlay position", + "unofficial-monumenta-mod.config.option.notifierPosition.tooltip": "", + + "unofficial-monumenta-mod.config.option.enableTextureSpoofing": "Enable texture spoofing", + "unofficial-monumenta-mod.config.option.enableTextureSpoofing.tooltip": "Allows the ability to change the rendered texture of an item by tricking Minecraft into believing that the item is another item.", + "unofficial-monumenta-mod.config.option.silenceTeamErrors": "Silence Team related errors", + "unofficial-monumenta-mod.config.option.silenceTeamErrors.tooltip": "Silences errors that happen when a player leaves the server or changes shard", + + "unofficial-monumenta-mod.config.subcategory.calculator": "Calculator options", + "unofficial-monumenta-mod.config.option.showCalculator": "Enable Calculator in plots", + "unofficial-monumenta-mod.config.option.showCalculator.tooltip": "Allows the injection of the calculator when in a chest container in the plots.", + "unofficial-monumenta-mod.config.option.enableKeybindOutsidePlots": "Toggle whether the calculator can be opened when outside plots", + "unofficial-monumenta-mod.config.option.enableKeybindOutsidePlots.tooltip": "When this is toggled on, the player is able to open the calculator on any shard.\nThe calculator is disabled by default outside of Plots.", + "unofficial-monumenta-mod.config.option.calculatorPersistOnClosed": "Toggle whether the values persist in the calculator", + "unofficial-monumenta-mod.config.option.calculatorPersistOnClosed.tooltip": "Whether the values persist when the calculator is closed. (does not persist in between sessions)", + + "unofficial-monumenta-mod.config.option.overlay_misc": "Miscellaneous Overlay options", + "unofficial-monumenta-mod.config.option.overlay_misc.tooltip": "", + "unofficial-monumenta-mod.config.option.overlay_opacity": "Overlay opacity", + "unofficial-monumenta-mod.config.option.overlay_opacity.tooltip": "(Won't be used if the Text Background setting is set to Everywhere in Accessibility Settings)", + + "unofficial-monumenta-mod.config.subcategory.lock": "Slot locking options", + "unofficial-monumenta-mod.config.option.lock_textCooldown": "Lock blocked messages cooldown", + "unofficial-monumenta-mod.config.option.lock_textCooldown.tooltip": "Will determine how often the mod can spam the player's chat with messages like \"Stopped dropping of locked item\"", + + "unofficial-monumenta-mod.config.subcategory.idoverlay": "Item Data Overlay", + "unofficial-monumenta-mod.config.option.itemdataoverlay_mode": "Item Data Overlay Mode", + "unofficial-monumenta-mod.config.option.itemdataoverlay_mode.tooltip": "The type of data shown about the item in the overlay", + "njols-config-framework.enum.ItemDataOverlayMode.NBT": "NBT Data", + "njols-config-framework.enum.ItemDataOverlayMode.TOOLTIP": "Tooltip", + + "unofficial-monumenta-mod.config.category.abilities": "Ability Display", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_info": "Abilities can be reordered by opening the chat and then dragging them around with the mouse.\nTo move the whole ability display instead, hold ctrl while clicking & dragging.\nAlternatively, press the 'Edit HUD' button to move abilities and the display (assign this key in the Minecraft settings).", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_enabled": "Show abilities", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_enabled.tooltip": "Show the ability display with cooldowns and current stacks/charges.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_showCooldownAsText": "Show cooldown as text", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_showCooldownAsText.tooltip": "Shows the cooldown as a counter in seconds as well.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_hideAbilityRelatedMessages": "Hide ability messages", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_hideAbilityRelatedMessages.tooltip": "Hides the usual ability-related messages from the server.\nHides messages like 'Mana Lance is now off cooldown!' and 'Sharpshooter Stacks: 1'.\nThis setting has no effect if 'Show abilities' is disabled.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_inFrontOfChat": "Show in front of chat unless chat is open", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_inFrontOfChat.tooltip": "When this option is enabled, the abilities will be displayed in front of chat messages\nas long as the chat is not currently open.\nThis will draw them in front of the overlay messages as well since those are behind the chat.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_tooltips": "Tooltips", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_tooltips.tooltip": "Show tooltips when hovering over an ability while the chat is open.\nCurrently only displays the ability's name.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_positionInfo": " Display position:", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_preset": "Preset (applies on save & exit)", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_preset.tooltip": "Applies a preset for the ability display.\nCustom: uses the values set below.\nAbove Hotbar: Puts the abilities centered above the hotbar (default).\nRight of Hotbar: Puts abilities to the right of the hotbar.\nLeft side of Screen: Abilities are shown vertically at the left edge of the screen.\nRight side of Screen: Abilities are shown vertically at the right edge of the screen.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_durationRenderMode": "How duration should be rendered on a skill", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_durationRenderMode.tooltip": "", + "njols-config-framework.enum.DurationRenderMode.CIRCLE": "Circle", + "njols-config-framework.enum.DurationRenderMode.BAR": "Bar", + "njols-config-framework.enum.DurationBarSideMode.FOLLOW": "Follows", + "njols-config-framework.enum.DurationBarSideMode.HORIZONTAL": "Horizontal", + "njols-config-framework.enum.DurationBarSideMode.VERTICAL": "Vertical", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_durationBar_side": "Bar side", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_durationBar_side.tooltip": "Follows parent overlay, horizontal or vertical", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_durationBar_offsetY": "Bar distance", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_durationBar_offsetY.tooltip": "Distance of the duration bar to the ability icon's center.\n-20 is the original position\n20 mirrors the original position", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_durationBar_offsetX": "Bar offset", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_durationBar_offsetX.tooltip": "Offset off the duration bar, in the direction of the bar.", + "njols-config-framework.enum.AbilityOptionPreset.CUSTOM": "Custom", + "njols-config-framework.enum.AbilityOptionPreset.ABOVE_HOTBAR": "Above Hotbar", + "njols-config-framework.enum.AbilityOptionPreset.RIGHT_OF_HOTBAR": "Right of Hotbar", + "njols-config-framework.enum.AbilityOptionPreset.LEFT_SIDE_OF_SCREEN": "Left side of Screen", + "njols-config-framework.enum.AbilityOptionPreset.RIGHT_SIDE_OF_SCREEN": "Right side of Screen", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_horizontal": "Horizontal", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_horizontal.tooltip": "Enable for horizontal display, disable for vertical display.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_position": "Position of the ability display", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_position.tooltip": "Raw positional values of the ability display for manual adjustment.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_miscInfo": " Miscellaneous options:", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownResize": "Off-Cooldown resize", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownResize.tooltip": "Briefly enlarges abilities when they get off cooldown.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownFlashIntensity": "Off-Cooldown flash intensity", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownFlashIntensity.tooltip": "Intensity of the flash when an ability gets off cooldown.\nSet to 0% to disable the flash.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownSoundVolume": "Off-Cooldown sound volume", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownSoundVolume.tooltip": "Volume of the sound played when an ability gets off cooldown.\nSet to 0% to disable the sound.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownSoundPitchMin": "Off-Cooldown sound pitch min", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownSoundPitchMin.tooltip": "Pitch of the off-cooldown sound for the first ability.\nAbilities in-between get a pitch in-between these values.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownSoundPitchMax": "Off-Cooldown sound pitch max", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownSoundPitchMax.tooltip": "Pitch of the off-cooldown sound for the last ability.\nAbilities in-between get a pitch in-between these values.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownSoundUseAlt": "Use alternative off-cooldown sound", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_offCooldownSoundUseAlt.tooltip": "An alternative, higher pitched off-cooldown sound.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_iconSize": "Icon size", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_iconSize.tooltip": "Size of the ability icons.\nThe default of 32 will show icons in the same resolution as the rest of the GUI.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_iconGap": "Icon gap", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_iconGap.tooltip": "Gap between ability icons.\nCan be negative to move icons closer together.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_textColorRaw": "Text color", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_textColorRaw.tooltip": "Color of the cooldown and stacks/charges counters.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_textOffset": "Text offset", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_textOffset.tooltip": "Offset of cooldown and charge counters from the edges of the icons.\nPositive to move inwards, negative to move outwards.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_ascendingRenderOrder": "Render in ascending order", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_ascendingRenderOrder.tooltip": "Render from left/top to right/bottom or vice versa.\nOnly really matters if the icon gap is negative.\nWhen enabled, icons to the right/bottom will be on top if they overlap, or vice versa if disabled.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_showOnlyOnCooldown": "Show only abilities currently on cooldown", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_showOnlyOnCooldown.tooltip": "Hides abilities not currently on cooldown.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_alwaysShowAbilitiesWithCharges": "Always show abilities with stacks", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_alwaysShowAbilitiesWithCharges.tooltip": "Shows abilities with stacks or changes regardless of the previous setting.\nWhen disabled, only completely passive abilities without a cooldown are shown.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_condenseOnlyOnCooldown": "Condense abilities", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_condenseOnlyOnCooldown.tooltip": "When abilities are hidden due to being on cooldown, move abilities together to prevent gaps.", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_showPassiveAbilities": "Show passive abilities with modes", + "unofficial-monumenta-mod.config.option.abilitiesDisplay_showPassiveAbilities.tooltip": "A few passive abilities have different modes.\nEnable this to see icons for these abilities showing which mode they're in.", + + "unofficial-monumenta-mod.config.category.debug": "Debug", + "unofficial-monumenta-mod.config.option.debugOptionsEnabled": "Enable debug options", + "unofficial-monumenta-mod.config.option.debugOptionsEnabled.tooltip": "", + "unofficial-monumenta-mod.config.option.logPackets": "Log packets", + "unofficial-monumenta-mod.config.option.logPackets.tooltip": "", + "unofficial-monumenta-mod.config.option.shardDebug": "Log Shard debug data", + "unofficial-monumenta-mod.config.option.shardDebug.tooltip": "Sends information on when shard was changed, errors and other related stuff.", + "unofficial-monumenta-mod.config.option.enableChestCountMaxError": "Will show an error in chat when the the max chest value is wrong", + "unofficial-monumenta-mod.config.option.enableChestCountMaxError.tooltip": "BTW it can be disabled through the /umm disableChestCountError command", + "unofficial-monumenta-mod.config.option.lock_renderDebuggingAdvancedLock": "Render special locks", + "unofficial-monumenta-mod.config.option.lock_renderDebuggingAdvancedLock.tooltip": "When slots are rendered will also render letters that shows that state of every special locks.", + "unofficial-monumenta-mod.config.option.logEffectPackets": "Log Effect packets", + "unofficial-monumenta-mod.config.option.logEffectPackets.tooltip": "Show more informations on received effect packets", + "unofficial-monumenta-mod.config.subcategory.info": "Debug informations", + "unofficial-monumenta-mod.config.option.notifyDebugMessages": "Use the notification system to show debug messages on screen.", + + "unofficial-monumenta-mod.config.category.discord": "Discord Rich Presence", + "unofficial-monumenta-mod.config.option.discordEnabled": "Enable discord rich presence", + "unofficial-monumenta-mod.config.option.discordEnabled.tooltip": "Defines if the rich presence should be active or not", + "unofficial-monumenta-mod.config.option.discordDetails": "Discord rich presence details", + "unofficial-monumenta-mod.config.option.discordDetails.tooltip": "{player} returns the player name. \n{shard} returns the shard name. \n{holding} returns the name of the item held in main hand. \n{class} returns the name of the class the user is playing as.", + "unofficial-monumenta-mod.config.option.hideShardMode": "Hide shard in DiscordRPC", + "unofficial-monumenta-mod.config.option.hideShardMode.tooltip": "Similar to a Streamer mode\nWill hide the shard in Discord Rich Presence.", + + "unofficial-monumenta-mod.config.category.effectOverlay": "Effect Overlay", + "unofficial-monumenta-mod.config.option.effect_enabled": "Enable overlay", + "unofficial-monumenta-mod.config.option.effect_enabled.tooltip": "Whether the overlay should render or not.", + "unofficial-monumenta-mod.config.option.effect_position": "Position of the Effect overlay", + "unofficial-monumenta-mod.config.option.effect_position.tooltip": "Can be moved with the mouse like the abilities display", + "unofficial-monumenta-mod.config.option.effect_width": "Width of the Effect overlay", + "unofficial-monumenta-mod.config.option.effect_width.tooltip": "", + "unofficial-monumenta-mod.config.option.effect_textAlightRight": "Align text to the right", + "unofficial-monumenta-mod.config.option.effect_textAlightRight.tooltip": "When enabled, text will be right-justified.\nBy default (when disabled), it is left-justified.", + "unofficial-monumenta-mod.config.option.effect_format": "Format related options", + "unofficial-monumenta-mod.config.option.effect_format.tooltip": "", + "unofficial-monumenta-mod.config.option.effect_compress": "Condense cumulative effects", + "unofficial-monumenta-mod.config.option.effect_compress.tooltip": "While on, will show all cumulative effects as one.", + + "unofficial-monumenta-mod.config.category.chestCountOverlay": "Chest count overlay", + "unofficial-monumenta-mod.config.option.chestCount_position": "Position of the overlay", + "unofficial-monumenta-mod.config.option.chestCount_position.tooltip": "Can be moved with the mouse like the abilities display", + "unofficial-monumenta-mod.config.option.chestCount_enabled": "Enable overlay", + "unofficial-monumenta-mod.config.option.chestCount_enabled.tooltip": "Whether the overlay should render or not.", + "unofficial-monumenta-mod.config.option.chestCount_disablePacketMaxOverride": "Disable server max count override", + "unofficial-monumenta-mod.config.option.chestCount_disablePacketMaxOverride.tooltip": "Whether the server is disallowed from overriding the local max chest count.", + + "unofficial-monumenta-mod.delvebounty.newBountyMessage": "New Delve bounty: ", + + "unofficial-monumenta-mod.delvebounty.white": "Rituals defiling the souls of the dead disturb hallowed halls. You must put an end to these unholy rites.", + "unofficial-monumenta-mod.delvebounty.orange": "Vile experiments mutate nature's gifts for the sake of power. These must be put to an end.", + "unofficial-monumenta-mod.delvebounty.magenta": "A deathly spectre looms over the ruins of a once great temple... the plague must not be allowed into this world.", + "unofficial-monumenta-mod.delvebounty.lightblue": "An eternal conflict, the mage's seal on alchemical evil... yet there is only one fate evil shall meet, and containment is not sufficient.", + "unofficial-monumenta-mod.delvebounty.yellow": "A once peaceful spirit, whipped up into a mindless rage by the meddling of insidious forces. I know not what must be done, but it cannot be allowed to fester any longer.", + "unofficial-monumenta-mod.delvebounty.willows": "A grove of mysteries locked away behind an elemental key, for good reason. The voice of a power now taken echoes through the willow trees.", + "unofficial-monumenta-mod.delvebounty.reverie": "The great Genius Loci stirs in his sleep. What an awful distortion of reality this nightmare has created...", + + "unofficial-monumenta-mod.delvebounty.lime": "To claim the knowledge, power, and wisdom of the gods can only end in tragedy. The imbalance from this folly must be corrected.", + "unofficial-monumenta-mod.delvebounty.pink": "A blight afflicts the seasons. What was once harmony is now dissonance, and cannot remain so.", + "unofficial-monumenta-mod.delvebounty.gray": "The cycle of life and death no longer holds in this civilization. The natural order must be restored.", + "unofficial-monumenta-mod.delvebounty.lightgray": "Light shines into the mirror, but only darkness seeps out... a corruption has taken grip and must be purified.", + "unofficial-monumenta-mod.delvebounty.cyan": "Madness is the greatest loss, for even the memory of what once was becomes tainted. Their remembrance must be avenged.", + "unofficial-monumenta-mod.delvebounty.purple": "A consuming greed envelops this hideaway lost to the sea. This hunger must be pacified.", + "unofficial-monumenta-mod.delvebounty.teal": "A kingdom lost to the sands of history. Someone here seeks to deceive you, but time tells no lies.", + "unofficial-monumenta-mod.delvebounty.forum": "The researchers' magnum opus freed, a power now unchained. It must be stamped out, lest we all fall to the nothing from whence it came.", + "unofficial-monumenta-mod.delvebounty.shiftingcity": "In attempt to keep away outsiders, the denizens of this city doomed themselves to their own shifting hell. They must be freed, one way or another.", + + "unofficial-monumenta-mod.delvebounty.blue": "A great upheaval is errupting within the Tree of Life. The great heads of this band of witches must be cut down, lest they unleash a powerful ritual, the consequences of which cannot be undone.", + "unofficial-monumenta-mod.delvebounty.brown": "Tales of the Ashkii speak of the Shades, husks of their kin that have been reduced to naught but mindless flesh, and doppelgangers that infiltrate their ranks. These threats must be stamped out by removing the god that lies in the heart of Pelias’ folly.", + "unofficial-monumenta-mod.delvebounty.indigo": "A tower. inverted, calls out as friends and foes descend upon it. The wool within must be claimed before those with darker motives are able to lay claim to the secrets within." +} \ No newline at end of file diff --git a/src/main/resources/assets/unofficial-monumenta-mod/lang/lol_us.json b/main/src/resources/assets/unofficial-monumenta-mod/lang/lol_us.json similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/lang/lol_us.json rename to main/src/resources/assets/unofficial-monumenta-mod/lang/lol_us.json diff --git a/main/src/resources/assets/unofficial-monumenta-mod/override/effects.json b/main/src/resources/assets/unofficial-monumenta-mod/override/effects.json new file mode 100644 index 00000000..98ada3e9 --- /dev/null +++ b/main/src/resources/assets/unofficial-monumenta-mod/override/effects.json @@ -0,0 +1,26 @@ +{ + "Speed": { + "method": "multiplicative" + }, + "Absorption": { + "method": "multiplicative" + }, + "Attack Speed": { + "method": "multiplicative" + }, + "Resistance": { + "method": "multiplicative" + }, + "Experience Gain": { + "method": "multiplicative" + }, + "Healing": { + "method": "multiplicative" + }, + "Max Health": { + "method": "multiplicative" + }, + "Knockback Resistance": { + "method": "multiplicative" + } +} \ No newline at end of file diff --git a/main/src/resources/assets/unofficial-monumenta-mod/override/locations.json b/main/src/resources/assets/unofficial-monumenta-mod/override/locations.json new file mode 100644 index 00000000..df494a7a --- /dev/null +++ b/main/src/resources/assets/unofficial-monumenta-mod/override/locations.json @@ -0,0 +1,232 @@ +{ + "valley": [ + { + "east": 701, + "north": -32, + "west": 777, + "south": 56, + "name": "Kaul Arena" + }, + { + "east": -497, + "north": -282, + "west": -1069, + "south": 343, + "name": "Sierhaven" + }, + { + "east": -78, + "north": -166, + "west": -180, + "south": 29, + "name": "Nyr" + }, + { + "east": 658, + "north": 100, + "west": 538, + "south": 229, + "name": "Farr" + }, + { + "east": 1319, + "north": -271, + "west": 1259, + "south": 180, + "name": "Highwatch Monument" + }, + { + "east": 1319, + "north": -271, + "west": 1115, + "south": -62, + "name": "Highwatch" + }, + { + "east": 765, + "north": 421, + "west": 642, + "south": 513, + "name": "Lowtide" + }, + { + "east": 642, + "north": 513, + "west": 557, + "south": 569, + "name": "Lowtide" + }, + { + "east": -1548, + "north": -18, + "west": -1685, + "south": 165, + "name": "Oceangate" + }, + { + "east": 520, + "north": -400, + "west": 380, + "south": -340, + "name": "Ta'Eldim" + }, + { + "east": 1340, + "north": -141, + "west": 1283, + "south": -99, + "name": "Azacor Lobby" + }, + { + "east": 1645, + "north": -596, + "west": -1733, + "south": 569, + "name": "Overworld" + } + ], + "plots": [ + { + "east": -762, + "north": 931, + "west": -539, + "south": 1210, + "name": "Player market" + } + ], + "isles": [ + { + "east": -632, + "north": 1218, + "west": -871, + "south": 1487, + "name": "Mistport" + }, + { + "east": -92, + "north": 397, + "west": -209, + "south": 502, + "name": "Rahkeri" + }, + { + "east": 460, + "north": 640, + "west": 289, + "south": 865, + "name": "Alnera" + }, + { + "east": 130, + "north": -107, + "west": -16, + "south": 48, + "name": "Hekawt Arena" + }, + { + "east": 316, + "north": 2, + "west": 133, + "south": 191, + "name": "Molta" + }, + { + "east": -1415, + "north": 72, + "west": -1523, + "south": 246, + "name": "Eldrask Arena" + }, + { + "east": -1332, + "north": 528, + "west": -1371, + "south": 551, + "name": "Nightroost" + }, + { + "east": -1241, + "north": 444, + "west": -1362, + "south": 527, + "name": "Nightroost" + }, + { + "east": -1418, + "north": 871, + "west": -1640, + "south": 1086, + "name": "Frostgate" + }, + { + "east": -1677, + "north": -135, + "west": -1855, + "south": 36, + "name": "Wispervale" + }, + { + "east": -671, + "north": -202, + "west": -755, + "south": -139, + "name": "Breachpoint" + }, + { + "east": -511, + "north": -548, + "west": -545, + "south": -514, + "name": "Steelmeld Monument" + }, + { + "east": -493, + "north": -563, + "west": -676, + "south": -424, + "name": "Steelmeld" + }, + { + "east": -1155, + "north": -569, + "west": -1273, + "south": -445, + "name": "Headless Horseman" + }, + { + "east": -412, + "north": 1506, + "west": -519, + "south": 1615, + "name": "The Floating Carnival" + }, + { + "east": -64, + "north": 3248, + "west": -223, + "south": 3375, + "name": "The Black Mist" + }, + { + "east": 292, + "north": 3367, + "west": 225, + "south": 3447, + "name": "Sealed Remorse" + }, + { + "east": -1394, + "north": -1342, + "west": -1450, + "south": -1275, + "name": "Darkest Depths" + }, + { + "east": 862, + "north": -654, + "west": -2222, + "south": 1902, + "name": "Overworld" + } + ] +} \ No newline at end of file diff --git a/main/src/resources/assets/unofficial-monumenta-mod/override/shards.json b/main/src/resources/assets/unofficial-monumenta-mod/override/shards.json new file mode 100644 index 00000000..a170ca13 --- /dev/null +++ b/main/src/resources/assets/unofficial-monumenta-mod/override/shards.json @@ -0,0 +1,238 @@ +{ + "valley": { + "officialName": "King's Valley", + "shardType": "OVERWORLD", + "maxChests": null + }, + "isles": { + "officialName": "Celsian Isles", + "shardType": "OVERWORLD", + "maxChests": null + }, + "ring": { + "officialName": "Architect's Ring", + "shardType": "OVERWORLD", + "maxChests": null + }, + + "plots": { + "officialName": "Plots", + "shardType": "OVERWORLD", + "maxChests": null + }, + "playerplots": { + "officialName": "Player Plots", + "shardType": "OVERWORLD", + "maxChests": null + }, + "build": { + "officialName": "Build shard", + "shardType": "OVERWORLD", + "maxChests": null + }, + + "tutorial": { + "officialName": "Tutorial", + "shardType": "DUNGEON", + "maxChests": null + }, + "labs": { + "officialName": "The Alchemy Labs", + "shardType": "DUNGEON", + "maxChests": null + }, + "white": { + "officialName": "Halls of Wind And Blood", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "orange": { + "officialName": "Fallen Menagerie", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "magenta": { + "officialName": "Plagueroot Temple", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "lightblue": { + "officialName": "Arcane Rivalry", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "yellow": { + "officialName": "Vernal Nightmare", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "willows": { + "officialName": "The Black Willows", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "reverie": { + "officialName": "Malevolent Reverie", + "shardType": "DUNGEON", + "maxChests": null + }, + "corridors": { + "officialName": "Ephemeral Corridors", + "shardType": "STRIKE", + "maxChests": null + }, + "verdant": { + "officialName": "Verdant Remnants", + "shardType": "STRIKE", + "maxChests": 52 + }, + "sanctum": { + "officialName": "Forsworn Sanctum", + "shardType": "STRIKE", + "maxChests": 65 + }, + "lime": { + "officialName": "Salazar's Folly", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "pink": { + "officialName": "Harmonic Arboretum", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "gray": { + "officialName": "Valley of the Forgotten Pharaohs", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "lightgray": { + "officialName": "Palace Of Mirrors", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "cyan": { + "officialName": "Scourge Of Lunacy", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "purple": { + "officialName": "Grasp Of Avarice", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "teal": { + "officialName": "Echoes Of Oblivion", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "shiftingcity": { + "officialName": "City of Shifting Waters", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "forum": { + "officialName": "The Fallen Forum", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "depths": { + "officialName": "Darkest Depths", + "shardType": "STRIKE", + "maxChests": null + }, + "mist": { + "officialName": "The Black Mist", + "shardType": "STRIKE", + "maxChests": 42 + }, + "remorse": { + "officialName": "The Sealed Remorse", + "shardType": "STRIKE", + "maxChests": 62 + }, + "rush": { + "officialName": "Rush of Dissonance", + "shardType": "MINIGAME", + "maxChests": null + }, + + "blue": { + "officialName": "Coven's Gambit", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "brown": { + "officialName": "Cradle of the Broken God", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "indigo": { + "officialName": "Phyrrys, City Of Fallen Stars", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, + "green": { + "officialName": "green", + "shardType": "DUNGEON", + "maxChests": null + }, + "red": { + "officialName": "red", + "shardType": "DUNGEON", + "maxChests": null + }, + "black": { + "officialName": "black", + "shardType": "DUNGEON", + "maxChests": null + }, + "portal": { + "officialName": "P.O.R.T.A.L.", + "shardType": "STRIKE", + "maxChests": 41 + }, + "skt": { + "officialName": "Silver Knight's Tomb", + "shardType": "STRIKE", + "maxChests": 99 + }, + "ruin": { + "officialName": "Masquerader's Ruin", + "shardType": "STRIKE", + "maxChests": 118 + }, + "gallery": { + "officialName": "The Gallery of Fear", + "shardType": "MINIGAME", + "maxChests": null + }, + "zenith": { + "officialName": "Celestial Zenith", + "shardType": "STRIKE", + "maxChests": null + }, + "hexfall": { + "officialName": "Hexfall", + "shardType": "STRIKE", + "maxChests": 43 + } +} diff --git a/src/main/resources/assets/unofficial-monumenta-mod/sounds.json b/main/src/resources/assets/unofficial-monumenta-mod/sounds.json similarity index 94% rename from src/main/resources/assets/unofficial-monumenta-mod/sounds.json rename to main/src/resources/assets/unofficial-monumenta-mod/sounds.json index f8c2eae8..8a1d82b9 100644 --- a/src/main/resources/assets/unofficial-monumenta-mod/sounds.json +++ b/main/src/resources/assets/unofficial-monumenta-mod/sounds.json @@ -1,16 +1,16 @@ -{ - "cooldown_ping": { - "sounds": [ - { - "name": "unofficial-monumenta-mod:cooldown_ping" - } - ] - }, - "cooldown_ping_alt": { - "sounds": [ - { - "name": "unofficial-monumenta-mod:cooldown_ping_alt" - } - ] - } -} +{ + "cooldown_ping": { + "sounds": [ + { + "name": "unofficial-monumenta-mod:cooldown_ping" + } + ] + }, + "cooldown_ping_alt": { + "sounds": [ + { + "name": "unofficial-monumenta-mod:cooldown_ping_alt" + } + ] + } +} diff --git a/src/main/resources/assets/unofficial-monumenta-mod/sounds/cooldown_ping.ogg b/main/src/resources/assets/unofficial-monumenta-mod/sounds/cooldown_ping.ogg similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/sounds/cooldown_ping.ogg rename to main/src/resources/assets/unofficial-monumenta-mod/sounds/cooldown_ping.ogg diff --git a/src/main/resources/assets/unofficial-monumenta-mod/sounds/cooldown_ping_alt.ogg b/main/src/resources/assets/unofficial-monumenta-mod/sounds/cooldown_ping_alt.ogg similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/sounds/cooldown_ping_alt.ogg rename to main/src/resources/assets/unofficial-monumenta-mod/sounds/cooldown_ping_alt.ogg diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemical_artillery.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemical_artillery.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemical_artillery.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemical_artillery.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemical_artillery_active.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemical_artillery_active.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemical_artillery_active.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemical_artillery_active.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_background.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_background.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_background.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_background.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_full.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_full.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_full.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_full.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_overlay.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_overlay.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_overlay.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_bar_overlay.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_potion.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_potion.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_potion.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_potion.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_potion_gruesome.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_potion_gruesome.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_potion_gruesome.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/alchemist_potion_gruesome.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/energizing_elixir.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/energizing_elixir.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/energizing_elixir.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/energizing_elixir.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/energizing_elixir_active.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/energizing_elixir_active.png new file mode 100644 index 00000000..12c9e3bb Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/energizing_elixir_active.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/esoteric_enhancements.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/esoteric_enhancements.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/esoteric_enhancements.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/esoteric_enhancements.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/iron_tincture.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/iron_tincture.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/iron_tincture.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/iron_tincture.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/panacea.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/panacea.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/panacea.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/panacea.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/scorched_earth.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/scorched_earth.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/scorched_earth.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/scorched_earth.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo_active.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo_active.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo_active.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo_active.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo_burst.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo_burst.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo_burst.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/taboo_burst.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/transmutation_ring.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/transmutation_ring.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/transmutation_ring.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/transmutation_ring.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/unstable_amalgam.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/unstable_amalgam.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/unstable_amalgam.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/unstable_amalgam.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/warding_remedy.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/warding_remedy.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/warding_remedy.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/alchemist/warding_remedy.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/celestial_blessing.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/celestial_blessing.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/celestial_blessing.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/celestial_blessing.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/choir_bells.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/choir_bells.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/choir_bells.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/choir_bells.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleansing_rain.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleansing_rain.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleansing_rain.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleansing_rain.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_background.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_background.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_background.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_background.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_full.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_full.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_full.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_full.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_overlay.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_overlay.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_overlay.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/cleric_bar_overlay.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/divine_justice.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/divine_justice.png new file mode 100644 index 00000000..758083c9 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/divine_justice.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/enchanted_prayer.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/enchanted_prayer.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/enchanted_prayer.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/enchanted_prayer.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_attack.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_attack.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_attack.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_attack.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_default.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_default.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_default.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_default.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_healing.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_healing.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_healing.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hallowed_beam_healing.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hand_of_light.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hand_of_light.png new file mode 100644 index 00000000..d08333fe Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hand_of_light.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hand_of_light_damage.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hand_of_light_damage.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hand_of_light_damage.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/hand_of_light_damage.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/holy_javelin.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/holy_javelin.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/holy_javelin.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/holy_javelin.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/illuminate.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/illuminate.png new file mode 100644 index 00000000..4b5f0a18 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/illuminate.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/luminous_infusion.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/luminous_infusion.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/luminous_infusion.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/luminous_infusion.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/luminous_infusion_active.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/luminous_infusion_active.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/luminous_infusion_active.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/luminous_infusion_active.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/sanctified_armor.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/sanctified_armor.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/sanctified_armor.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/sanctified_armor.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/thurible_procession.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/thurible_procession.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/thurible_procession.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/thurible_procession.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/thurible_procession_max.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/thurible_procession_max.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/thurible_procession_max.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cleric/thurible_procession_max.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cooldown_overlay.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cooldown_overlay.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/cooldown_overlay.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/cooldown_overlay.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/bottled_sunlight.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/bottled_sunlight.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/bottled_sunlight.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/bottled_sunlight.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/divine_beam.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/divine_beam.png new file mode 100644 index 00000000..88c1c049 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/divine_beam.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/eternal_savior.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/eternal_savior.png new file mode 100644 index 00000000..6fdae83d Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/eternal_savior.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/lightning_bottle.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/lightning_bottle.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/lightning_bottle.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/lightning_bottle.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/radiant_blessing.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/radiant_blessing.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/radiant_blessing.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/radiant_blessing.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/spark_of_inspiration.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/spark_of_inspiration.png new file mode 100644 index 00000000..42e5dc44 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/spark_of_inspiration.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/totem_of_salvation.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/totem_of_salvation.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/totem_of_salvation.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/totem_of_salvation.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/ward_of_light.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/ward_of_light.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/ward_of_light.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/dawnbringer/ward_of_light.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/bulwark.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/bulwark.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/bulwark.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/bulwark.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/crushing_earth.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/crushing_earth.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/crushing_earth.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/crushing_earth.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/earthen_wrath.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/earthen_wrath.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/earthen_wrath.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/earthen_wrath.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/earthquake.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/earthquake.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/earthquake.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/earthquake.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/iron_grip.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/iron_grip.png new file mode 100644 index 00000000..f40b7735 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/iron_grip.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/stone_skin.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/stone_skin.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/stone_skin.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/stone_skin.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/taunt.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/taunt.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/taunt.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/earthbound/taunt.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/apocalypse.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/apocalypse.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/apocalypse.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/apocalypse.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/detonation.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/detonation.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/detonation.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/detonation.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/fireball.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/fireball.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/fireball.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/fireball.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/flame_spirit.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/flame_spirit.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/flame_spirit.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/flame_spirit.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/flamestrike.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/flamestrike.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/flamestrike.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/flamestrike.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/ring_of_flames.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/igneous_rune.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/ring_of_flames.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/igneous_rune.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/pyroblast.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/pyroblast.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/pyroblast.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/pyroblast.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/ring_of_flames.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/ring_of_flames.png new file mode 100644 index 00000000..0c2e9d48 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/ring_of_flames.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/volcanic_combos.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/volcanic_combos.png new file mode 100644 index 00000000..986ad793 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/volcanic_combos.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/volcanic_meteor.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/volcanic_meteor.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/volcanic_meteor.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/flamecaller/volcanic_meteor.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/avalanche.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/avalanche.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/avalanche.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/avalanche.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/cryobox.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/cryobox.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/cryobox.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/cryobox.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frigid_combos.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frigid_combos.png new file mode 100644 index 00000000..64f563a7 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frigid_combos.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frost_nova.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frost_nova.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frost_nova.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frost_nova.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frozen_domain.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frozen_domain.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frozen_domain.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/frozen_domain.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_barrier.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_barrier.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_barrier.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_barrier.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_barrier_primed.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_barrier_primed.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_barrier_primed.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_barrier_primed.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_lance.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_lance.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_lance.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/ice_lance.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/icebreaker.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/icebreaker.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/icebreaker.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/icebreaker.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/permafrost.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/permafrost.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/permafrost.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/permafrost.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/piercing_cold.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/piercing_cold.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/piercing_cold.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/piercing_cold.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/snowstorm.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/snowstorm.png new file mode 100644 index 00000000..c01fb854 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/frostborn/snowstorm.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/arcane_strike.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/arcane_strike.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/arcane_strike.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/arcane_strike.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/blizzard.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/blizzard.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/blizzard.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/blizzard.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/cosmic_moonblade.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/cosmic_moonblade.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/cosmic_moonblade.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/cosmic_moonblade.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows_fire.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows_fire.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows_fire.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows_fire.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows_ice.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows_ice.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows_ice.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/elemental_arrows_ice.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/fire_elemental_spirit.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/fire_elemental_spirit.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/fire_elemental_spirit.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/fire_elemental_spirit.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/frost_nova.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/frost_nova.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/frost_nova.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/frost_nova.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/ice_elemental_spirit.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/ice_elemental_spirit.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/ice_elemental_spirit.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/ice_elemental_spirit.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_background.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_background.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_background.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_background.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_full.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_full.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_full.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_full.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_overlay.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_overlay.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_overlay.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mage_bar_overlay.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/magma_shield.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/magma_shield.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/magma_shield.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/magma_shield.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mana_lance.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mana_lance.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mana_lance.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/mana_lance.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/prismatic_shield.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/prismatic_shield.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/prismatic_shield.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/prismatic_shield.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sage_s_insight.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sage_s_insight.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sage_s_insight.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sage_s_insight.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sages_insight.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sages_insight.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sages_insight.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sages_insight.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sages_insight_max.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sages_insight_max.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sages_insight_max.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/sages_insight_max.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/starfall.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/starfall.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/starfall.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/starfall.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/thunder_step.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/thunder_step.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/thunder_step.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/mage/thunder_step.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/off_cooldown.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/off_cooldown.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/off_cooldown.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/off_cooldown.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/border_silenced.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/chroma_blade.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/chroma_blade.png new file mode 100644 index 00000000..9acac440 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/chroma_blade.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/color_splash.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/color_splash.png new file mode 100644 index 00000000..4c2faba2 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/color_splash.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/convergence.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/convergence.png new file mode 100644 index 00000000..15ad947e Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/convergence.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/disco_ball.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/disco_ball.png new file mode 100644 index 00000000..0aeeb7ee Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/disco_ball.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/encore.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/encore.png new file mode 100644 index 00000000..b9967b20 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/encore.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/rebirth.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/rebirth.png new file mode 100644 index 00000000..db60af00 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/rebirth.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/refraction.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/refraction.png new file mode 100644 index 00000000..450d46a7 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/refraction.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/solar_ray.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/solar_ray.png new file mode 100644 index 00000000..e64aee9d Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/prismatic/solar_ray.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/advancing_shadows.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/advancing_shadows.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/advancing_shadows.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/advancing_shadows.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/blade_dance.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/blade_dance.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/blade_dance.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/blade_dance.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/bodkin_blitz.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/bodkin_blitz.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/bodkin_blitz.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/bodkin_blitz.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/by_my_blade.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/by_my_blade.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/by_my_blade.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/by_my_blade.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/cloak_and_dagger.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/cloak_and_dagger.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/cloak_and_dagger.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/cloak_and_dagger.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/dagger_throw.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/dagger_throw.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/dagger_throw.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/dagger_throw.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/deadly_ronde.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/deadly_ronde.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/deadly_ronde.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/deadly_ronde.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/dodging.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/dodging.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/dodging.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/dodging.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/escape_death.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/escape_death.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/escape_death.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/escape_death.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_background.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_background.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_background.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_background.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_full.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_full.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_full.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_full.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_overlay.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_overlay.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_overlay.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/rogue_bar_overlay.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/smokescreen.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/smokescreen.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/smokescreen.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/smokescreen.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/wind_walk.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/wind_walk.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/wind_walk.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/rogue/wind_walk.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/eagle_eye.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/eagle_eye.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/eagle_eye.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/eagle_eye.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/hunting_companion.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/hunting_companion.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/hunting_companion.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/hunting_companion.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/predator_strike.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/predator_strike.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/predator_strike.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/predator_strike.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/predator_strike_active.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/predator_strike_active.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/predator_strike_active.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/predator_strike_active.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/quickdraw.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/quickdraw.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/quickdraw.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/quickdraw.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_background.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_background.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_background.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_background.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_full.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_full.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_full.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_full.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_overlay.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_overlay.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_overlay.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/scout_bar_overlay.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/sharpshooter.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/sharpshooter.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/sharpshooter.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/sharpshooter.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swift_cuts.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swift_cuts.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swift_cuts.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swift_cuts.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swiftness.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swiftness.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swiftness.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swiftness.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swiftness_disabled.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swiftness_disabled.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swiftness_disabled.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/swiftness_disabled.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/tactical_maneuver.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/tactical_maneuver.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/tactical_maneuver.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/tactical_maneuver.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/volley.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/volley.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/volley.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/volley.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/whirling_blade.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/whirling_blade.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/whirling_blade.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/whirling_blade.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/wind_bomb.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/wind_bomb.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/wind_bomb.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/scout/wind_bomb.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/advancing_shadows.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/advancing_shadows.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/advancing_shadows.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/advancing_shadows.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/blade_flurry.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/blade_flurry.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/blade_flurry.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/blade_flurry.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/brutalize.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/brutalize.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/brutalize.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/brutalize.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/chaos_dagger.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/chaos_dagger.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/chaos_dagger.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/chaos_dagger.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/cloak_of_shadows.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/cloak_of_shadows.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/cloak_of_shadows.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/cloak_of_shadows.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/deadly_strike.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/deadly_strike.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/deadly_strike.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/deadly_strike.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/dummy_decoy.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/dummy_decoy.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/dummy_decoy.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/dummy_decoy.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/escape_artist.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/escape_artist.png new file mode 100644 index 00000000..201ea65a Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shadowdancer/escape_artist.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/chain_healing_wave.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/chain_healing_wave.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/chain_healing_wave.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/chain_healing_wave.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/chain_lightning.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/chain_lightning.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/chain_lightning.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/chain_lightning.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/cleansing_totem.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/cleansing_totem.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/cleansing_totem.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/cleansing_totem.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/crystalline_combos.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/crystalline_combos.png new file mode 100644 index 00000000..cbb81a96 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/crystalline_combos.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/decayed_totem.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/decayed_totem.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/decayed_totem.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/decayed_totem.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/desecrating_shot.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/desecrating_shot.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/desecrating_shot.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/desecrating_shot.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/devastation.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/devastation.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/devastation.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/devastation.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/earthen_tremor.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/earthen_tremor.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/earthen_tremor.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/earthen_tremor.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/flame_totem.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/flame_totem.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/flame_totem.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/flame_totem.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/lightning_totem.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/lightning_totem.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/lightning_totem.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/lightning_totem.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_background.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_background.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_background.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_background.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_full.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_full.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_full.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_full.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_left.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_left.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_left.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_left.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_overlay.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_overlay.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_overlay.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_overlay.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_right.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_right.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_right.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/shaman_bar_right.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/totemic_projection.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/totemic_projection.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/totemic_projection.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/totemic_projection.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/whirlwind_totem.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/whirlwind_totem.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/whirlwind_totem.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/shaman/whirlwind_totem.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/firework_blast.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/firework_blast.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/firework_blast.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/firework_blast.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/gravity_bomb.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/gravity_bomb.png new file mode 100644 index 00000000..d21c4587 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/gravity_bomb.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/metalmancy.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/metalmancy.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/metalmancy.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/metalmancy.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/precision_strike.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/precision_strike.png new file mode 100644 index 00000000..54f3f76b Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/precision_strike.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/rapid_fire.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/rapid_fire.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/rapid_fire.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/rapid_fire.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/scrapshot.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/scrapshot.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/scrapshot.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/scrapshot.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/sharpshooter.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/sharpshooter.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/sharpshooter.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/sharpshooter.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/sidearm.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/sidearm.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/sidearm.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/sidearm.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/steel_stallion.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/steel_stallion.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/steel_stallion.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/steel_stallion.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/volley.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/volley.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/volley.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/steelsage/volley.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_ability.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_ability.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_ability.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_ability.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_border.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_border_silenced.png new file mode 100644 index 00000000..1e2f2405 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/unknown_border_silenced.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/amplifying_hex.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/amplifying_hex.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/amplifying_hex.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/amplifying_hex.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/choleric_flames.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/choleric_flames.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/choleric_flames.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/choleric_flames.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/dark_pact.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/dark_pact.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/dark_pact.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/dark_pact.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/dark_pact_active.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/dark_pact_active.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/dark_pact_active.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/dark_pact_active.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/grasping_claws.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/grasping_claws.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/grasping_claws.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/grasping_claws.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/haunting_shades.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/haunting_shades.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/haunting_shades.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/haunting_shades.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/judgement_chain.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/judgement_chain.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/judgement_chain.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/judgement_chain.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/melancholic_lament.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/melancholic_lament.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/melancholic_lament.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/melancholic_lament.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/sanguine_harvest.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/sanguine_harvest.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/sanguine_harvest.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/sanguine_harvest.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/soul_rend.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/soul_rend.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/soul_rend.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/soul_rend.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/voodoo_bonds.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/voodoo_bonds.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/voodoo_bonds.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/voodoo_bonds.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_background.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_background.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_background.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_background.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_full.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_full.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_full.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_full.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_overlay.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_overlay.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_overlay.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/warlock_bar_overlay.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/withering_gaze.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/withering_gaze.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/withering_gaze.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warlock/withering_gaze.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/bodyguard.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/bodyguard.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/bodyguard.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/bodyguard.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/border.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/border.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/border.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/border_silenced.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/border_silenced.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/border_silenced.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/challenge.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/challenge.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/challenge.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/challenge.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/defensive_line.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/defensive_line.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/defensive_line.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/defensive_line.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/glorious_battle.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/glorious_battle.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/glorious_battle.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/glorious_battle.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/meteor_slam.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/meteor_slam.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/meteor_slam.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/meteor_slam.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/rampage.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/rampage.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/rampage.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/rampage.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/rampage_max.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/rampage_max.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/rampage_max.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/rampage_max.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/riposte.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/riposte.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/riposte.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/riposte.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/shield_bash.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/shield_bash.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/shield_bash.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/shield_bash.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/shield_wall.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/shield_wall.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/shield_wall.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/shield_wall.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_background.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_background.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_background.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_background.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_full.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_full.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_full.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_full.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_overlay.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_overlay.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_overlay.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/warrior/warrior_bar_overlay.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/aeroblast.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/aeroblast.png new file mode 100644 index 00000000..4a916a3d Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/aeroblast.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/border.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/border.png new file mode 100644 index 00000000..1b9e7b17 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/border.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/border_silenced.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/border_silenced.png new file mode 100644 index 00000000..c07193bb Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/border_silenced.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/dodging.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/dodging.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/dodging.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/dodging.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/guarding_bolt.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/guarding_bolt.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/guarding_bolt.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/guarding_bolt.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/howling_winds.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/howling_winds.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/howling_winds.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/howling_winds.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/last_breath.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/last_breath.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/last_breath.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/last_breath.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/one_with_the_wind.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/one_with_the_wind.png new file mode 100644 index 00000000..1dcb0f6c Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/one_with_the_wind.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/one_with_the_wind_active.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/one_with_the_wind_active.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/one_with_the_wind_active.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/one_with_the_wind_active.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/restoring_draft.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/restoring_draft.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/restoring_draft.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/restoring_draft.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/skyhook.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/skyhook.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/skyhook.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/skyhook.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/slipstream.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/slipstream.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/slipstream.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/slipstream.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/thundercloud_form.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/thundercloud_form.png new file mode 100644 index 00000000..85999da8 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/thundercloud_form.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/updraft.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/updraft.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/updraft.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/updraft.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/whirlwind.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/whirlwind.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/whirlwind.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/whirlwind.png diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/wind_walk.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/wind_walk.png new file mode 100644 index 00000000..b11c1232 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/wind_walk.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/windswept_combos.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/windswept_combos.png new file mode 100644 index 00000000..c55c469c Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/abilities/windwalker/windswept_combos.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/healthbars/duelist_portrait.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/healthbars/duelist_portrait.png new file mode 100644 index 00000000..a6c4fc20 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/healthbars/duelist_portrait.png differ diff --git a/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/healthbars/slayer_portrait.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/healthbars/slayer_portrait.png new file mode 100644 index 00000000..2864a363 Binary files /dev/null and b/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/healthbars/slayer_portrait.png differ diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/base-lock.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/base-lock.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/base-lock.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/base-lock.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/drop.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/drop.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/drop.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/drop.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/left-click.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/left-click.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/left-click.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/left-click.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/locked.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/locked.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/locked.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/locked.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/right-click.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/right-click.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/right-click.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/right-click.png diff --git a/src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/unlocked.png b/main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/unlocked.png similarity index 100% rename from src/main/resources/assets/unofficial-monumenta-mod/textures/gui/locks/unlocked.png rename to main/src/resources/assets/unofficial-monumenta-mod/textures/gui/locks/unlocked.png diff --git a/main/src/resources/fabric.mod.json b/main/src/resources/fabric.mod.json new file mode 100644 index 00000000..7fcfc501 --- /dev/null +++ b/main/src/resources/fabric.mod.json @@ -0,0 +1,52 @@ +{ + "schemaVersion": 1, + "id": "unofficial-monumenta-mod", + "version": "${mod_version}", + "name": "Unofficial Monumenta Mod", + "description": "An unofficial client-side mod to complement the Monumenta MMO server.", + "authors": [ + "Njol" + ], + "contributors": [ + "Ascynx" + ], + "contact": { + "homepage": "https://www.curseforge.com/minecraft/mc-mods/unofficial-monumenta-mod", + "issues": "https://github.com/Njol/UnofficialMonumentaMod/issues", + "sources": "https://github.com/Njol/UnofficialMonumentaMod" + }, + "license": "GPL-3.0", + "icon": "assets/unofficial-monumenta-mod/icon.png", + "environment": "client", + "entrypoints": { + "client": [ + "ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient" + ], + "main": [ + ], + "modmenu": [ + "ch.njol.unofficialmonumentamod.options.ConfigMenu" + ], + "provihealth": [ + "ch.njol.unofficialmonumentamod.compat.HealthBarHook" + ] + }, + "custom" : { + "mod_extradata": "${mod_extradata}" + }, + "mixins": [ + "unofficial-monumenta-mod.mixins.json" + ], + "depends": { + "fabricloader": ">=${loader_version}", + "fabric-api": ">=${fabric_version}", + "minecraft": "~${minecraft_version}" + }, + "recommends": { + "modmenu": ">=9.2.0", + "cloth-config": ">=13.0.138" + }, + "suggests": { + "citresewn": "*" + } +} diff --git a/main/src/resources/unofficial-monumenta-mod.mixins.json b/main/src/resources/unofficial-monumenta-mod.mixins.json new file mode 100644 index 00000000..bb8007d8 --- /dev/null +++ b/main/src/resources/unofficial-monumenta-mod.mixins.json @@ -0,0 +1,10 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "ch.njol.unofficialmonumentamod.mixins", + "plugin": "ch.njol.unofficialmonumentamod.core.init.AutoDiscoveryMixinPlugin", + "compatibilityLevel": "JAVA_17", + "injectors": { + "defaultRequire": 1 + } +} diff --git a/settings.gradle b/settings.gradle index 6e06a881..5b011e03 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,3 +16,4 @@ pluginManagement { } } rootProject.name = "unofficial-monumenta-mod" +include(':api',':main') diff --git a/src/main/java/ch/njol/unofficialmonumentamod/ChannelHandler.java b/src/main/java/ch/njol/unofficialmonumentamod/ChannelHandler.java index 4826c0af..96024e14 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/ChannelHandler.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/ChannelHandler.java @@ -135,7 +135,7 @@ public static class ServerInfoPacket { /** * tells the clientside mod whether it is allowed to release information on the location of the player. - * example: beta testing of new content. Should be enabled on stage and volt. + * example: beta testing of new content. Should be disabled on stage and volt. */ public boolean allowPublicizeContent; } diff --git a/src/main/java/ch/njol/unofficialmonumentamod/KeybindingUtils.java b/src/main/java/ch/njol/unofficialmonumentamod/KeybindingUtils.java new file mode 100644 index 00000000..9feb85e5 --- /dev/null +++ b/src/main/java/ch/njol/unofficialmonumentamod/KeybindingUtils.java @@ -0,0 +1,30 @@ +package ch.njol.unofficialmonumentamod; + +import java.util.Objects; +import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.option.KeyBinding; +import net.minecraft.client.util.InputUtil; +import org.lwjgl.glfw.GLFW; + +public class KeybindingUtils { + public static boolean isKeyPressed(final KeyBinding keyBinding) { + if (keyBinding.isUnbound()) { + return false; + } + + if (Objects.equals(KeyBindingHelper.getBoundKeyOf(keyBinding).getCategory(), InputUtil.Type.MOUSE)) { + return GLFW.glfwGetMouseButton(MinecraftClient.getInstance().getWindow().getHandle(), getKeyCode(keyBinding)) == 1; + } else { + return InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), getKeyCode(keyBinding)); + } + } + + public static int getKeyCode(final KeyBinding keyBinding) { + if (keyBinding.isUnbound()) { + return -1; + } + + return KeyBindingHelper.getBoundKeyOf(keyBinding).getCode(); + } +} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/UnofficialMonumentaModClient.java b/src/main/java/ch/njol/unofficialmonumentamod/UnofficialMonumentaModClient.java index 8f39fe06..7480030b 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/UnofficialMonumentaModClient.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/UnofficialMonumentaModClient.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.Optional; import java.util.Timer; import java.util.TimerTask; @@ -82,6 +81,7 @@ public class UnofficialMonumentaModClient implements ClientModInitializer { public static final AbilityHandler abilityHandler = new AbilityHandler(); public static KeyBinding toggleCalculatorKeyBinding = new KeyBinding("unofficial-monumenta-mod.keybinds.toggleCalculator", GLFW.GLFW_KEY_K, "unofficial-monumenta-mod.keybinds.category"); + public static KeyBinding nbtDevOverlayKeyBinding = new KeyBinding("unofficial-monumenta-mod.keybinds.toggleNBTOverlay", GLFW.GLFW_KEY_N, "unofficial-monumenta-mod.keybinds.category"); @Override public void onInitializeClient() { @@ -153,6 +153,7 @@ public void run() { ClientPlayNetworking.registerGlobalReceiver(ChannelHandler.CHANNEL_ID, new ChannelHandler()); KeyBindingHelper.registerKeyBinding(toggleCalculatorKeyBinding); + KeyBindingHelper.registerKeyBinding(nbtDevOverlayKeyBinding); KeyBindingHelper.registerKeyBinding(SlotLocking.LOCK_KEY); Hud.INSTANCE.addElement(AbilitiesHud.INSTANCE); @@ -241,7 +242,6 @@ public static boolean isOnMonumenta() { ClientPlayNetworkHandler clientPlayNetworkHandler = mc.getNetworkHandler(); if (clientPlayNetworkHandler != null && clientPlayNetworkHandler.getBrand() != null) { String serverBrand = clientPlayNetworkHandler.getBrand(); - System.out.println(serverBrand); onMM = !mc.isInSingleplayer() && serverBrand.startsWith("Monumenta"); } return onMM; diff --git a/src/main/java/ch/njol/unofficialmonumentamod/Utils.java b/src/main/java/ch/njol/unofficialmonumentamod/Utils.java index e6df73f7..ce34d7a5 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/Utils.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/Utils.java @@ -1,5 +1,7 @@ package ch.njol.unofficialmonumentamod; +import ch.njol.unofficialmonumentamod.core.gui.InventoryWidget; +import ch.njol.unofficialmonumentamod.mixins.screen.ScreenAccessor; import com.mojang.blaze3d.systems.RenderSystem; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -8,6 +10,7 @@ import java.util.TimeZone; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.item.TooltipContext; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.BufferRenderer; @@ -232,6 +235,14 @@ public static long getNextDailyResetOf(long millis) { } } + public static void addWidget(Screen screen, InventoryWidget widget) { + ((ScreenAccessor) screen).doAddDrawableChild(widget); + } + + public static void removeWidget(Screen screen, InventoryWidget widget) { + ((ScreenAccessor) screen).doRemove(widget); + } + public static long getNextWeeklyResetOf(long millis) { Calendar calendar = Calendar.getInstance(); diff --git a/src/main/java/ch/njol/unofficialmonumentamod/core/commands/TexSpoofingInGameCommand.java b/src/main/java/ch/njol/unofficialmonumentamod/core/commands/TexSpoofingInGameCommand.java index 2edde9af..e8232c9a 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/core/commands/TexSpoofingInGameCommand.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/core/commands/TexSpoofingInGameCommand.java @@ -185,7 +185,7 @@ private static int runEditItem(CommandContext ctx) { String finalItemName = itemName; UnofficialMonumentaModClient.spoofer.runThenSaveFile(() -> UnofficialMonumentaModClient.spoofer.editItem(finalItemName, replacementStack.getItem())) - .thenRun(() -> ctx.getSource().sendFeedback(MutableText.of(PlainTextContent.of("Successfully changed item replacement on \"" + finalItemName + "\" to \"" + replacementStack.getItem().getName() + "\"")).fillStyle(MAIN_INFO_STYLE))); + .thenRun(() -> ctx.getSource().sendFeedback(MutableText.of(PlainTextContent.of("Successfully changed item replacement on \"" + finalItemName + "\" to \"" + replacementStack.getItem().getName().getString() + "\"")).fillStyle(MAIN_INFO_STYLE))); return 0; } diff --git a/src/main/java/ch/njol/unofficialmonumentamod/core/gui/InventoryWidget.java b/src/main/java/ch/njol/unofficialmonumentamod/core/gui/InventoryWidget.java new file mode 100644 index 00000000..ef891087 --- /dev/null +++ b/src/main/java/ch/njol/unofficialmonumentamod/core/gui/InventoryWidget.java @@ -0,0 +1,109 @@ +package ch.njol.unofficialmonumentamod.core.gui; + +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.gui.AbstractParentElement; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.Screen; + +public abstract class InventoryWidget extends AbstractParentElement implements Drawable, Selectable, Element { + protected final Screen parentScreen; + + private boolean focused; + + private final List childrens = new ArrayList<>(); + private final List drawables = new ArrayList<>(); + private final List selectables = new ArrayList<>(); + private Element focusedElement; + private Selectable selected; + public InventoryWidget(Screen parentScreen) { + this.parentScreen = parentScreen; + } + + public abstract Rectangle getDimension(); + + @Override + public void render(DrawContext ctx, int mouseX, int mouseY, float delta) { + Rectangle dimension = getDimension(); + renderBackground(ctx, dimension); + render(ctx, dimension, mouseX, mouseY, delta); + for (Drawable dr : getDrawables()) { + dr.render(ctx, mouseX, mouseY, delta); + } + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + for (Element element : this.children()) { + if (!element.mouseClicked(mouseX, mouseY, button)) { + continue; + } + + this.setFocused(element); + if (button == 0) { + this.setDragging(true); + } + return true; + } + return false; + } + + + + @Override public boolean isMouseOver(double mouseX, double mouseY) { + return getDimension().contains(mouseX, mouseY); + } + + @Override + public List children() { + return childrens; + } + public List getDrawables() { + return drawables; + } + + protected void clear() { + childrens.clear(); + drawables.clear(); + selectables.clear(); + } + + protected T addDrawableChild(T child) { + this.drawables.add(child); + return addSelectableChild(child); + } + + protected Drawable addDrawable(Drawable drawable) { + this.drawables.add(drawable); + return drawable; + } + + protected T addSelectableChild(T child) { + this.selectables.add(child); + this.childrens.add(child); + return child; + } + + @Override + public void setFocused(boolean focused) { + this.focused = focused; + } + + @Override + public boolean isFocused() { + return focused; + } + + @Override + public SelectionType getType() { + return SelectionType.FOCUSED; + } + + public abstract void renderBackground(DrawContext ctx, Rectangle dimension); + + public abstract void render(DrawContext ctx, Rectangle dimension, int mouseX, int mouseY, float delta); +} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/core/init/AutoDiscoveryMixinPlugin.java b/src/main/java/ch/njol/unofficialmonumentamod/core/init/AutoDiscoveryMixinPlugin.java new file mode 100644 index 00000000..0f352b12 --- /dev/null +++ b/src/main/java/ch/njol/unofficialmonumentamod/core/init/AutoDiscoveryMixinPlugin.java @@ -0,0 +1,189 @@ +package ch.njol.unofficialmonumentamod.core.init; + +import java.io.File; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +/** + * A mixin plugin to automatically discover all mixins in the current JAR. + *

+ * This mixin plugin automatically scans your entire JAR (or class directory, in case of an in-IDE launch) for classes inside of your + * mixin package and registers those. It does this recursively for sub packages of the mixin package as well. This means you will need + * to only have mixin classes inside your mixin package, which is good style anyway. + *

+ * provided under The Unlicense license + * @author Linnea Gräf + */ +public class AutoDiscoveryMixinPlugin implements IMixinConfigPlugin { + private static final List mixinPlugins = new ArrayList<>(); + + public static List getMixinPlugins() { + return mixinPlugins; + } + + private String mixinPackage; + + @Override + public void onLoad(String mixinPackage) { + this.mixinPackage = mixinPackage; + mixinPlugins.add(this); + } + + /** + * Resolves the base class root for a given class URL. This resolves either the JAR root, or the class file root. + * In either case the return value of this + the class name will resolve back to the original class url, or to other + * class urls for other classes. + */ + public URL getBaseUrlForClassUrl(URL classUrl) { + String string = classUrl.toString(); + if (classUrl.getProtocol().equals("jar")) { + try { + return new URL(string.substring(4).split("!")[0]); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + if (string.endsWith(".class")) { + try { + return new URL(string.replace("\\", "/") + .replace(getClass().getCanonicalName() + .replace(".", "/") + ".class", "")); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + return classUrl; + } + + /** + * Get the package that contains all the mixins. This value is set by mixin itself using {@link #onLoad}. + */ + public String getMixinPackage() { + return mixinPackage; + } + + /** + * Get the path inside the class root to the mixin package + */ + public String getMixinBaseDir() { + return mixinPackage.replace(".", "/"); + } + + /** + * A list of all discovered mixins. + */ + private List mixins = null; + + /** + * Try to add mixin class ot the mixins based on the filepath inside the class root. + * Removes the {@code .class} file suffix, as well as the base mixin package. + *

This method cannot be called after mixin initialization.

+ * + * @param className the name or path of a class to be registered as a mixin. + */ + public void tryAddMixinClass(String className) { + String norm = (className.endsWith(".class") ? className.substring(0, className.length() - ".class".length()) : className) + .replace("\\", "/") + .replace("/", "."); + if (norm.startsWith(getMixinPackage() + ".") && !norm.endsWith(".") && + !(Character.isDigit(norm.charAt(norm.length() - 1)) && norm.charAt(norm.length() - 2) == '$')) { + mixins.add(norm.substring(getMixinPackage().length() + 1)); + } + } + + /** + * Search through the JAR or class directory to find mixins contained in {@link #getMixinPackage()} + */ + @Override + public List getMixins() { + if (mixins != null) return mixins; + System.out.println("Trying to discover mixins"); + mixins = new ArrayList<>(); + URL classUrl = getClass().getProtectionDomain().getCodeSource().getLocation(); + System.out.println("Found classes at " + classUrl); + Path file; + try { + file = Paths.get(getBaseUrlForClassUrl(classUrl).toURI()); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + System.out.println("Base directory found at " + file); + if (Files.isDirectory(file)) { + walkDir(file); + } else { + walkJar(file); + } + System.out.println("Found mixins: " + mixins); + + return mixins; + } + + /** + * Search through directory for mixin classes based on {@link #getMixinBaseDir}. + * + * @param classRoot The root directory in which classes are stored for the default package. + */ + private void walkDir(Path classRoot) { + System.out.println("Trying to find mixins from directory"); + try (Stream classes = Files.walk(classRoot.resolve(getMixinBaseDir()))) { + classes.filter(it -> new File(it.toUri()).isFile()) + .map(it -> classRoot.relativize(it).toString()) + .forEach(this::tryAddMixinClass); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * Read through a JAR file, trying to find all mixins inside. + */ + private void walkJar(Path file) { + System.out.println("Trying to find mixins from jar file"); + try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(file))) { + ZipEntry next; + while ((next = zis.getNextEntry()) != null) { + tryAddMixinClass(next.getName()); + zis.closeEntry(); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override public void preApply(String targetClassName, org.objectweb.asm.tree.ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } + + @Override public void postApply(String targetClassName, org.objectweb.asm.tree.ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + return true; + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + + } +} \ No newline at end of file diff --git a/src/main/java/ch/njol/unofficialmonumentamod/core/shard/ShardDebugCommand.java b/src/main/java/ch/njol/unofficialmonumentamod/core/shard/ShardDebugCommand.java index cbee2a24..85b2ee07 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/core/shard/ShardDebugCommand.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/core/shard/ShardDebugCommand.java @@ -113,7 +113,7 @@ public static int executeDebugLoaded(CommandContext c text.append(Text.literal((isEdited ? "Yes" : "No")+ "\n" ).setStyle(VALUE_STYLE)); text.append(Text.literal("Is World Spoofing Enabled: ").setStyle(KEY_INFO_STYLE)); - text.append(Text.literal((isWorldSpoofOptionEnabled ? "Yes" : "No") + "\n" + (receivesLocationsPackets ? "(Ignored)" : "")).setStyle(VALUE_STYLE)); + text.append(Text.literal((isWorldSpoofOptionEnabled ? "Yes" : "No") + (receivesLocationsPackets ? "(Ignored)" : "") + "\n").setStyle(VALUE_STYLE)); text.append(Text.literal("Does the client receive location update packets: ").setStyle(KEY_INFO_STYLE)); text.append(Text.literal((receivesLocationsPackets ? "Yes" : "No") + "\n").setStyle(VALUE_STYLE)); diff --git a/src/main/java/ch/njol/unofficialmonumentamod/features/calculator/Calculator.java b/src/main/java/ch/njol/unofficialmonumentamod/features/calculator/Calculator.java index ce1e2769..eb500c0e 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/features/calculator/Calculator.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/features/calculator/Calculator.java @@ -1,6 +1,7 @@ package ch.njol.unofficialmonumentamod.features.calculator; import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; import ch.njol.unofficialmonumentamod.core.shard.ShardData; import ch.njol.unofficialmonumentamod.features.locations.Locations; import ch.njol.unofficialmonumentamod.mixins.screen.ScreenAccessor; @@ -49,11 +50,11 @@ public boolean keyTyped(int keyCode, int scanCode, int modifiers) { CalculatorWidget widget = new CalculatorWidget(MinecraftClient.getInstance().currentScreen); widget.init(CalculatorWidget.getMode()); - ((ScreenAccessor) MinecraftClient.getInstance().currentScreen).doAddDrawableChild(widget); + Utils.addWidget(MinecraftClient.getInstance().currentScreen, widget); lastWidgetInitialized = widget; } else { //close - ((ScreenAccessor) MinecraftClient.getInstance().currentScreen).doRemove(lastWidgetInitialized); + Utils.removeWidget(MinecraftClient.getInstance().currentScreen, lastWidgetInitialized); lastWidgetInitialized = null; } return true; diff --git a/src/main/java/ch/njol/unofficialmonumentamod/features/calculator/CalculatorWidget.java b/src/main/java/ch/njol/unofficialmonumentamod/features/calculator/CalculatorWidget.java index e3ee5747..2e7a18d9 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/features/calculator/CalculatorWidget.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/features/calculator/CalculatorWidget.java @@ -1,37 +1,22 @@ package ch.njol.unofficialmonumentamod.features.calculator; import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.core.gui.InventoryWidget; import ch.njol.unofficialmonumentamod.mixins.screen.HandledScreenAccessor; import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.AbstractParentElement; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.text.Text; -public class CalculatorWidget extends AbstractParentElement implements Drawable, Selectable, Element { +public class CalculatorWidget extends InventoryWidget { private static final MinecraftClient client = MinecraftClient.getInstance(); private static CalculatorState state = CalculatorState.CLOSED; private static CalculatorMode mode = CalculatorMode.NORMAL; - private boolean focused; - - private final List childrens = new ArrayList<>(); - private final List drawables = new ArrayList<>(); - private final List selectables = new ArrayList<>(); - private Element focusedElement; - private Selectable selected; - - private final Screen parent; - protected static void switchMode() { mode = CalculatorMode.values()[(mode.ordinal() + 1) % CalculatorMode.values().length]; if (Calculator.lastWidgetInitialized != null) { @@ -77,15 +62,8 @@ protected void clearValues() { wanted = -1; } - private void clear() { - childrens.clear(); - drawables.clear(); - selectables.clear(); - } - public void init(CalculatorMode mode) { clear(); - Rectangle dimension = getDimension(); switch(mode) { @@ -213,89 +191,25 @@ public static double reverseExLogic() { } public CalculatorWidget(Screen parent) { - this.parent = parent; + super(parent); } public Rectangle getDimension() { - int x = ((HandledScreenAccessor) parent).getX() + ((HandledScreenAccessor) parent).getBackGroundWidth(); - int y = ((HandledScreenAccessor) parent).getY(); + int x = ((HandledScreenAccessor) parentScreen).getX() + ((HandledScreenAccessor) parentScreen).getBackGroundWidth(); + int y = ((HandledScreenAccessor) parentScreen).getY(); final int width = state == CalculatorState.OPEN ? 140 : 20; final int height = state == CalculatorState.OPEN ? 160 : 40; return new Rectangle(x, y, width, height); } - @Override - public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { - Rectangle dimension = getDimension(); - - renderBackground(drawContext); - for (Drawable dr : getDrawables()) { - dr.render(drawContext, mouseX, mouseY, delta); - } - drawContext.drawTextWithShadow(client.textRenderer, getOutput(mode), dimension.x + 10, dimension.y + 105, 0xffcccccc); - } - - private void renderBackground(DrawContext drawContext) { - Rectangle dimension = getDimension(); - + @Override public void renderBackground(DrawContext ctx, Rectangle dimension) { final int bgColour = client.options.getTextBackgroundColor(0.3f); - - drawContext.fill(dimension.x, dimension.y, (int) dimension.getMaxX(), (int) dimension.getMaxY(), bgColour); - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - for (Element element : this.children()) { - if (!element.mouseClicked(mouseX, mouseY, button)) { - continue; - } - this.setFocused(element); - if (button == 0) { - this.setDragging(true); - } - return true; - } - return false; - } - - @Override - public List children() { - return childrens; - } - public List getDrawables() { - return drawables; - } - - protected T addDrawableChild(T child) { - this.drawables.add(child); - return addSelectableChild(child); - } - - protected Drawable addDrawable(Drawable drawable) { - this.drawables.add(drawable); - return drawable; + ctx.fill(dimension.x, dimension.y, (int) dimension.getMaxX(), (int) dimension.getMaxY(), bgColour); } - protected T addSelectableChild(T child) { - this.selectables.add(child); - this.childrens.add(child); - return child; - } - - @Override - public void setFocused(boolean focused) { - this.focused = focused; - } - - @Override - public boolean isFocused() { - return focused; - } - - @Override - public SelectionType getType() { - return SelectionType.FOCUSED; + @Override public void render(DrawContext ctx, Rectangle dimension, int mouseX, int mouseY, float delta) { + ctx.drawTextWithShadow(client.textRenderer, getOutput(mode), dimension.x + 10, dimension.y + 105, 0xffcccccc); } @Override diff --git a/src/main/java/ch/njol/unofficialmonumentamod/features/effects/Effect.java b/src/main/java/ch/njol/unofficialmonumentamod/features/effects/Effect.java index 3e2a8e77..89b04470 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/features/effects/Effect.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/features/effects/Effect.java @@ -156,7 +156,9 @@ public static Effect from(ChannelHandler.EffectInfo effectInfo) { Effect effect = new Effect(effectInfo.name, (float) effectInfo.power, tickDuration == -1 ? -1 : millisDuration, UUID.fromString(effectInfo.UUID)); effect.isPercentage = effectInfo.percentage; - effect.positiveEffect = effectInfo.positive; + effect.positiveEffect = !(effectInfo.positive == effectInfo.power < 0); + + effect.displayPriority = effectInfo.displayPriority; return effect; @@ -175,7 +177,7 @@ public void updateFrom(ChannelHandler.EffectUpdatePacket packet) { name = info.name; effectTime = tickDuration != -1 ? millisDuration : -1; isPercentage = info.percentage; - positiveEffect = info.positive; + positiveEffect = !(info.positive == info.power < 0); displayPriority = info.displayPriority; isNonStackableEffect = effectPower == 0; diff --git a/src/main/java/ch/njol/unofficialmonumentamod/features/misc/SlotLocking.java b/src/main/java/ch/njol/unofficialmonumentamod/features/misc/SlotLocking.java index 58e31362..9d7cd766 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/features/misc/SlotLocking.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/features/misc/SlotLocking.java @@ -1,9 +1,9 @@ package ch.njol.unofficialmonumentamod.features.misc; import ch.njol.minecraft.uiframework.ModSpriteAtlasHolder; +import ch.njol.unofficialmonumentamod.KeybindingUtils; import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; import ch.njol.unofficialmonumentamod.Utils; -import ch.njol.unofficialmonumentamod.mixins.KeyBindingAccessor; import ch.njol.unofficialmonumentamod.mixins.screen.HandledScreenAccessor; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -16,8 +16,6 @@ import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.sound.PositionedSoundInstance; -import net.minecraft.client.util.InputUtil; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.slot.Slot; import net.minecraft.screen.slot.SlotActionType; @@ -34,9 +32,6 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.util.Objects; - -import static ch.njol.minecraft.uiframework.hud.HudElement.drawSprite; public class SlotLocking { // This feature is largely based on https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java per the LGPL 3.0 license @@ -284,21 +279,9 @@ public void tickRender(DrawContext drawContext, int mouseX, int mouseY) { activeSlot = null; } } - - private static int getLockKeyCode() { - return ((KeyBindingAccessor) LOCK_KEY).getBoundKey().getCode(); - } private static boolean isLockKeyPressed() { - if (LOCK_KEY.isUnbound()) { - return false; - } - - if (Objects.equals(((KeyBindingAccessor) LOCK_KEY).getBoundKey().getCategory(), InputUtil.Type.MOUSE)) { - return GLFW.glfwGetMouseButton(MinecraftClient.getInstance().getWindow().getHandle(), getLockKeyCode()) == 1; - } else { - return InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), getLockKeyCode()); - } + return KeybindingUtils.isKeyPressed(LOCK_KEY); } public void onEndTick() { @@ -368,6 +351,7 @@ private boolean handleSlotInteraction(Slot slot, int button, SlotActionType acti switch (actionType) { case PICKUP -> shouldBlock = shouldBlockPickupAction(slot, button, actionType); case SWAP -> shouldBlock = shouldBlockSwapAction(slot, button, actionType); + case QUICK_MOVE -> shouldBlock = shouldBlockQuickMoveAction(slot, button, actionType); case THROW -> { if (!getLockedSlot(slot).lockDrop) break; shouldBlock = true; @@ -385,6 +369,19 @@ private boolean handleSlotInteraction(Slot slot, int button, SlotActionType acti return shouldBlock; } + private boolean shouldBlockQuickMoveAction(Slot slot, int button, SlotActionType actionType) { + if (actionType != SlotActionType.QUICK_MOVE || slot == null) { + return false; + } + + LockedSlot locked = getLockedSlot(slot); + if (locked == null) { + return false; + } + + return locked.lockPickup || locked.locked; + } + private boolean shouldBlockPickupAction(Slot slot, int button, SlotActionType actionType) { if (actionType != SlotActionType.PICKUP || slot == null) { return false; diff --git a/src/main/java/ch/njol/unofficialmonumentamod/features/misc/dev/ItemDataOverlay.java b/src/main/java/ch/njol/unofficialmonumentamod/features/misc/dev/ItemDataOverlay.java new file mode 100644 index 00000000..297d3d42 --- /dev/null +++ b/src/main/java/ch/njol/unofficialmonumentamod/features/misc/dev/ItemDataOverlay.java @@ -0,0 +1,427 @@ +package ch.njol.unofficialmonumentamod.features.misc.dev; + +import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.Utils; +import ch.njol.unofficialmonumentamod.core.gui.InventoryWidget; +import ch.njol.unofficialmonumentamod.features.misc.managers.MessageNotifier; +import ch.njol.unofficialmonumentamod.mixins.screen.HandledScreenAccessor; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.function.Function; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; +import net.minecraft.client.gui.tooltip.TooltipComponent; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.client.util.InputUtil; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.screen.slot.Slot; +import net.minecraft.text.MutableText; +import net.minecraft.text.PlainTextContent; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import org.lwjgl.glfw.GLFW; + +public class ItemDataOverlay extends InventoryWidget { + private static final MinecraftClient client = MinecraftClient.getInstance(); + private static ItemDataOverlay lastInitializedWidget = null; + + private final ItemStack itemStack; + private final List cachedLines; + + private double pos = 0; + + public ItemDataOverlay(Screen parent, ItemStack stack) { + super(parent); + itemStack = stack.copy(); + cachedLines = UnofficialMonumentaModClient.options.itemdataoverlay_mode.invoke(stack); + } + + private final int TITLE_HEIGHT = 20; + private final float TITLE_SCALE_FACTOR = 1.5f; + + @Override public Rectangle getDimension() { + int x = ((HandledScreenAccessor) parentScreen).getX() + ((HandledScreenAccessor) parentScreen).getBackGroundWidth(); + int y = ((HandledScreenAccessor) parentScreen).getY() - TITLE_HEIGHT; + + int TITLE_MARGIN = 4; + int width = TooltipComponent.of(itemStack.getName().asOrderedText()).getWidth(client.textRenderer) + (TITLE_MARGIN * 2); + width = Math.max(width, 160); + + int height = 180; + + return new Rectangle(x, y, (int) (width * TITLE_SCALE_FACTOR), height); + } + + @Override public void renderBackground(DrawContext ctx, Rectangle dimension) { + final int backgroundColor = client.options.getTextBackgroundColor(0.3f); + ctx.fill(dimension.x, dimension.y, (int) dimension.getMaxX(), (int) dimension.getMaxY(), backgroundColor); + } + + @Override public void render(DrawContext ctx, Rectangle dimension, int mouseX, int mouseY, float delta) { + renderTitle(ctx, mouseX, mouseY, dimension); + + int yPos = dimension.y + TITLE_HEIGHT; + for (int i = (int) pos; i < cachedLines.size(); i++) { + if (yPos + (client.textRenderer.fontHeight + 1) > dimension.getMaxY()) { + //add 1 to relativeIndex to keep a short margin, stops it from going overboard. + break; + } + Text line = cachedLines.get(i); + if (client.textRenderer.getWidth(line) >= dimension.getWidth()) { + //limit size to avoid going over the container limit + remove trailing as " ..." doesn't look as good. + line = trimToWidth(line, (int) dimension.getWidth() - (client.textRenderer.getWidth("...") * 2)); + } + + TooltipComponent component = TooltipComponent.of(line.asOrderedText()); + component.drawText(client.textRenderer, dimension.x + 10, yPos, ctx.getMatrices().peek().getPositionMatrix(), ctx.getVertexConsumers()); + yPos += (client.textRenderer.fontHeight + 1); + } + + renderScrollbar(ctx, mouseX, mouseY, dimension, (int) pos, (int) renderableLines(), cachedLines.size()); + } + + /** + * careful, shits recursive. + * @param text the text we're currently checking + * @param siblings the current known siblings of the root text + * @param currDepth current depth + * @param maxDepth the maximum depth we're allowed to go + * @return the new list of siblings of the root text. + */ + private List getTextSiblings(Text text, List siblings, int currDepth, int maxDepth) { + if (currDepth >= maxDepth || text.getSiblings().isEmpty()) { + siblings.add(text); + return siblings; + } + + for (Text sibling: text.getSiblings()) { + getTextSiblings(sibling, siblings, currDepth + 1, maxDepth); + } + return siblings; + } + + private Text trimToWidth(Text text, int width) { + if (width <= 0) { + return Text.empty(); + } + + int currentWidth = text.getLiteralString() != null ? text.getLiteralString().length() : 0; + if (currentWidth > width) { + Text trimmed = (Text) client.textRenderer.trimToWidth(text, width); + trimmed.visit((str) -> { + str = str.stripTrailing(); + str += "..."; + return Optional.of(str); + }); + return trimmed; + } + + + List oldSiblings = getTextSiblings(text, new ArrayList<>(), 0, 5); + List newSiblings = new ArrayList<>(); + for (int i = 0; i < oldSiblings.size(); i++) { + Text sibling = oldSiblings.get(i); + String siblingText = sibling.getContent().visit(Optional::of).orElse(""); + int textWidth = client.textRenderer.getWidth(siblingText); + currentWidth += textWidth; + if (currentWidth > width) { + int widthDelta = currentWidth - width; + siblingText = client.textRenderer.trimToWidth(siblingText, textWidth - widthDelta); + if (i == oldSiblings.size() - 1) { + siblingText = siblingText.stripTrailing(); + siblingText += "..."; + } + + newSiblings.add(MutableText.of(PlainTextContent.of(siblingText)).setStyle(sibling.getStyle())); + break; + } + newSiblings.add(sibling); + } + + MutableText newText = MutableText.of(text.getContent()).setStyle(text.getStyle()); + for (Text newSibling : newSiblings) { + newText.append(newSibling); + } + return newText; + } + + private void renderTitle(DrawContext ctx, double mouseX, double mouseY, Rectangle dimension) { + ctx.getMatrices().push(); + ctx.getMatrices().scale(TITLE_SCALE_FACTOR, TITLE_SCALE_FACTOR, TITLE_SCALE_FACTOR); + TooltipComponent component = TooltipComponent.of(itemStack.getName().asOrderedText()); + int titleY = (dimension.y) + ((TITLE_HEIGHT - client.textRenderer.fontHeight) / 2); + double titleX = dimension.x + ((dimension.getWidth()) / TITLE_SCALE_FACTOR - component.getWidth(client.textRenderer)) / 2; + + component.drawText(client.textRenderer, (int) (titleX / TITLE_SCALE_FACTOR), (int) (titleY / TITLE_SCALE_FACTOR), ctx.getMatrices().peek().getPositionMatrix(), ctx.getVertexConsumers()); + ctx.getMatrices().pop(); + } + + private void renderScrollbar(DrawContext ctx, double mouseX, double mouseY, Rectangle dimension, int firstPos, int renderedSize, int size) { + float factor = renderedSize / (float) size; + double height = dimension.getHeight() - TITLE_HEIGHT; + + int basePos = (int) ((double) firstPos / size * height); + double barHeight = Math.min(factor * height, height); + + Rectangle barDimensions = getBaseBarDimension(); + boolean mouseOverBar = barDimensions.contains(mouseX, mouseY) || clickedInBar; + + barDimensions.y += basePos; + barDimensions.height = (int) barHeight; + if (mouseOverBar) { + barDimensions.y -= 1; + barDimensions.x -= 1; + barDimensions.width += 2; + barDimensions.height += 2; + } + + ctx.fill(barDimensions.x, barDimensions.y, (int) barDimensions.getMaxX(), (int) barDimensions.getMaxY(), 0xFFFFFFFF); + } + + private boolean clickedInBar = false; + @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (getBaseBarDimension().contains(mouseX, mouseY) && button == 0) { + clickedInBar = true; + return true; + } + + return super.mouseClicked(mouseX, mouseY, button); + } + + @Override public boolean mouseReleased(double mouseX, double mouseY, int button) { + Rectangle barDimensions = getBaseBarDimension(); + if (barDimensions.contains(mouseX, mouseY) && button == 0) { + double relativeYPos = mouseY - barDimensions.y; + int size = cachedLines.size(); + + pos = (relativeYPos / (getDimension().getHeight() - TITLE_HEIGHT)) * size; + clampPosition(); + + return true; + } + + clickedInBar = false; + return super.mouseReleased(mouseX, mouseY, button); + } + + @Override public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) { + //invert movement so it lines up and clamp the result to the size of the list. + pos += (int) -verticalAmount; + clampPosition(); + return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount); + } + + @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { + if (clickedInBar) { + int size = cachedLines.size(); + double relativeDrag = deltaY / (getDimension().getHeight() - TITLE_HEIGHT); + double relativeMove = relativeDrag * size; + + pos = pos + relativeMove; + clampPosition(); + + return true; + } + + return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); + } + + @Override public void appendNarrations(NarrationMessageBuilder builder) { + //nuh uh + } + + private void clampPosition() { + pos = Utils.clamp(0, (float) pos, (float) (cachedLines.size() - (1 + renderableLines()))); + } + + private double renderableLines() { + //remove 1 from the total, to keep the margin into account. + return (getBaseBarDimension().getHeight() / ((client.textRenderer.fontHeight + 1))) - 1; + } + + private Rectangle getBaseBarDimension() { + Rectangle dim = getDimension(); + int baseY = dim.y + TITLE_HEIGHT; + + int barWidth = 2; + double barHeight = dim.getHeight() - TITLE_HEIGHT; + return new Rectangle( + dim.x, + baseY, + barWidth, + (int) barHeight + ); + } + + private static List splitNbt(NbtCompound tag) { + List splits = new ArrayList<>(); + + String dirtyNbt = tag.toString(); + StringBuilder builder = new StringBuilder(); + + boolean skipNext = false; + boolean inQuotation = false; + int depth = 0; + for (int i = 0; i < dirtyNbt.length(); i++) { + char c = dirtyNbt.charAt(i); + if (!skipNext && (c == '\'' || c == '\"')) { + inQuotation = !inQuotation; + builder.append(c); + continue; + } + + if (c == '\\') { + skipNext = !skipNext; + builder.append(c); + continue; + } + + if (!skipNext) { + //put the character on the next line. + if ( c == ']' || c == '}') { + splits.add(Text.of(builder.toString().indent(depth).stripTrailing())); + builder.setLength(0); + depth--; + } + } + + builder.append(c); + if (!skipNext) { + //put the character on this line, then new line. + if (c == ',' || c == '[' || c == '{') { + if (c == '[' || c == '{') { + depth++; + } + splits.add(Text.of(builder.toString().indent(depth).stripTrailing())); + builder.setLength(0); + } + } + skipNext = false; + } + if (!builder.isEmpty()) { + splits.add(Text.of(builder.toString())); + } + + return splits; + } + + private static boolean mightRender() { + return client.currentScreen instanceof HandledScreen; + } + + private static ItemStack getFocusedStack(HandledScreen handled) { + Slot focused = ((HandledScreenAccessor) handled).getFocusedSlot(); + if (focused == null || ((HandledScreenAccessor)handled).isMouseOverSlot(focused, client.mouse.getX(), client.mouse.getY()) || !focused.hasStack()) { + return null; + } + return focused.getStack(); + } + + public void copyContentToClipboard() { + StringBuilder builder = new StringBuilder(); + for (Text cachedLine : cachedLines) { + builder.append(cachedLine.getLiteralString()).append("\n"); + } + client.keyboard.setClipboard(builder.toString()); + } + + public static boolean keyTyped(int keyCode, int scanCode, int modifiers) { + if (lastInitializedWidget != null && client.currentScreen != null) { + if (modifiers == 0) { + if (keyCode == InputUtil.GLFW_KEY_UP) { + lastInitializedWidget.pos--; + lastInitializedWidget.clampPosition(); + } else if (keyCode == InputUtil.GLFW_KEY_DOWN) { + lastInitializedWidget.pos++; + lastInitializedWidget.clampPosition(); + } + } else { + if (((modifiers & GLFW.GLFW_MOD_CONTROL) != 0) + && ((modifiers & GLFW.GLFW_MOD_SHIFT) != 0)) { + if (keyCode == InputUtil.GLFW_KEY_C) { + lastInitializedWidget.copyContentToClipboard(); + MutableText text = Text.literal("Copied Item Data to clipboard"); + text.setStyle(Style.EMPTY.withColor(Formatting.AQUA)); + MessageNotifier.RenderedMessage renderedMessage = new MessageNotifier.RenderedMessage(text); + MessageNotifier.getInstance().addOrStackMessageToQueue(renderedMessage); + } + } + } + } + + if (mightRender() && UnofficialMonumentaModClient.nbtDevOverlayKeyBinding.matchesKey(keyCode, scanCode) + && modifiers == 0) { + if (!(client.currentScreen instanceof HandledScreen handled)) { + return false; + } + ItemStack stack = getFocusedStack(handled); + ItemStack oldStack = null; + + if (lastInitializedWidget != null) { + oldStack = lastInitializedWidget.itemStack; + Utils.removeWidget(handled, lastInitializedWidget); + lastInitializedWidget = null; + } + + //do not re-open if it seems like it is the same item. + if (stack != null && !(oldStack != null && stack.toString().equals(oldStack.toString()))) { + ItemDataOverlay overlay = new ItemDataOverlay(handled, stack); + Utils.addWidget(handled, overlay); + lastInitializedWidget = overlay; + } + return true; + } + return false; + } + + public static void onGUIClosed() { + if (lastInitializedWidget != null) { + lastInitializedWidget = null; + } + } + + public static void onGUIResized(Screen screen) { + if (screen instanceof HandledScreen handled) { + if (lastInitializedWidget != null) { + ItemDataOverlay overlay = new ItemDataOverlay(handled, lastInitializedWidget.itemStack); + Utils.addWidget(handled, overlay); + lastInitializedWidget = overlay; + } + return; + } + lastInitializedWidget = null; + } + + public enum ItemDataOverlayMode { + NBT((stack) -> { + if (stack.hasNbt() && stack.getNbt() != null) { + return splitNbt(stack.getNbt()); + } + return List.of(); + }), + TOOLTIP((stack) -> { + List tooltip = stack.getTooltip(client.player, TooltipContext.ADVANCED); + //remove the first one as it is already set as the title. + tooltip.removeFirst(); + return tooltip; + }) + + ; + final Function> _invoker; + + ItemDataOverlayMode(Function> invoker) { + _invoker = invoker; + } + + public List invoke(ItemStack itemStack) { + return _invoker.apply(itemStack); + } + } +} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/hud/AbilitiesHud.java b/src/main/java/ch/njol/unofficialmonumentamod/hud/AbilitiesHud.java index 2b06ec4c..59e282f9 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/hud/AbilitiesHud.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/hud/AbilitiesHud.java @@ -118,7 +118,7 @@ protected void render(DrawContext drawContext, float tickDelta) { return; } - abilityInfos = abilityInfos.stream().filter(a -> isAbilityVisible(a, true)).collect(Collectors.toList()); + abilityInfos = abilityInfos.stream().filter(a -> isAbilityVisible(a, true)).toList(); int iconSize = options.abilitiesDisplay_iconSize; int iconGap = options.abilitiesDisplay_iconGap; @@ -255,13 +255,12 @@ private void drawDurationBar(DrawContext drawContext, float originX, float origi Sprite barSprite = getClassDuration(className, "full"); Sprite overlaySprite = getClassDuration(className, "overlay"); - float backgroundWidth = iconSize; - float barWidth = 1f * barSprite.getContents().getWidth() / backgroundSprite.getContents().getWidth() * backgroundWidth; - float overlayWidth = 1f * overlaySprite.getContents().getWidth() / backgroundSprite.getContents().getWidth() * backgroundWidth; + float barWidth = 1f * barSprite.getContents().getWidth() / backgroundSprite.getContents().getWidth() * (float) iconSize; + float overlayWidth = 1f * overlaySprite.getContents().getWidth() / backgroundSprite.getContents().getWidth() * (float) iconSize; - drawSprite(drawContext, backgroundSprite, -backgroundWidth / 2, 0, backgroundWidth, barHeight); + drawContext.drawSprite(-iconSize / 2, 0, 0, iconSize, (int) barHeight, backgroundSprite); drawPartialSprite(drawContext, barSprite, -barWidth / 2, 0, barWidth, barHeight, 0, 0, fraction, 1); - drawSprite(drawContext, overlaySprite, -overlayWidth / 2, 0, overlayWidth, barHeight); + drawContext.drawSprite((int) -overlayWidth / 2, 0, 0, (int) overlayWidth, (int) barHeight, overlaySprite); matrices.pop(); } diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/HeadFeatureRendererMixin.java b/src/main/java/ch/njol/unofficialmonumentamod/mixins/HeadFeatureRendererMixin.java index 8eac4980..76f07ec4 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/mixins/HeadFeatureRendererMixin.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/mixins/HeadFeatureRendererMixin.java @@ -89,8 +89,8 @@ public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, } @Redirect(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/LivingEntity;FFFFFF)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;translate(DDD)V")) - public void render_MatrixStack_translate(MatrixStack instance, double x, double y, double z) { + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;translate(FFF)V", ordinal = 2)) + public void render_MatrixStack_translate(MatrixStack instance, float x, float y, float z) { if (UnofficialMonumentaModClient.options.lowerVillagerHelmets && x == 0 && y == 0.0625D diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/ItemRendererMixin.java b/src/main/java/ch/njol/unofficialmonumentamod/mixins/ItemRendererMixin.java index 192a2eee..f7b1a6d3 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/mixins/ItemRendererMixin.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/mixins/ItemRendererMixin.java @@ -24,9 +24,13 @@ @Mixin(ItemRenderer.class) public abstract class ItemRendererMixin { + @Unique private static final Transformation THIRD_PERSON_RIGHT_HAND_TRANSFORM = new Transformation(new Vector3f(0, -90, 55), new Vector3f(0, 0.2f, 0), new Vector3f(1.7f, 1.7f, 0.85f)); + @Unique private static final Transformation THIRD_PERSON_LEFT_HAND_TRANSFORM = new Transformation(new Vector3f(0, 90, -55), new Vector3f(0, 0.2f, 0), new Vector3f(1.7f, 1.7f, 0.85f)); + @Unique private static final Transformation FIRST_PERSON_RIGHT_HAND_TRANSFORM = new Transformation(new Vector3f(0, -90, 70), new Vector3f(0.1f, 0.2f, 0.1f), new Vector3f(1.36f, 1.36f, 0.68f)); + @Unique private static final Transformation FIRST_PERSON_LEFT_HAND_TRANSFORM = new Transformation(new Vector3f(0, 90, -70), new Vector3f(0.1f, 0.2f, 0.1f), new Vector3f(1.36f, 1.36f, 0.68f)); @Unique diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/KeyBindingAccessor.java b/src/main/java/ch/njol/unofficialmonumentamod/mixins/KeyBindingAccessor.java deleted file mode 100644 index c62708ae..00000000 --- a/src/main/java/ch/njol/unofficialmonumentamod/mixins/KeyBindingAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package ch.njol.unofficialmonumentamod.mixins; - -import net.minecraft.client.option.KeyBinding; -import net.minecraft.client.util.InputUtil; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(KeyBinding.class) -public interface KeyBindingAccessor { - @Accessor("boundKey") - InputUtil.Key getBoundKey(); -} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/CreativeInventoryScreenMixin.java b/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/CreativeInventoryScreenMixin.java new file mode 100644 index 00000000..94a5da71 --- /dev/null +++ b/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/CreativeInventoryScreenMixin.java @@ -0,0 +1,21 @@ +package ch.njol.unofficialmonumentamod.mixins.screen; + +import ch.njol.unofficialmonumentamod.core.gui.InventoryWidget; +import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(CreativeInventoryScreen.class) +public class CreativeInventoryScreenMixin { + //allows the pass-through of mouseScrolled events to inventory widgets. + @Inject(at = @At("HEAD"), method = "mouseScrolled", cancellable = true) + void umm$onMouseScrolled(double mouseX, double mouseY, double horizontalScroll, double verticalScroll, CallbackInfoReturnable cir) { + if (((CreativeInventoryScreen) (Object) this).hoveredElement(mouseX, mouseY).filter( + (el) -> (el instanceof InventoryWidget) && el.mouseScrolled(mouseX, mouseY, horizontalScroll, verticalScroll) + ).isPresent()) { + cir.setReturnValue(true); + }; + } +} diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenAccessor.java b/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenAccessor.java index 10048b12..056803fb 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenAccessor.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenAccessor.java @@ -14,9 +14,15 @@ public interface HandledScreenAccessor { @Accessor("x") int getX(); + @Accessor("focusedSlot") + Slot getFocusedSlot(); + @Accessor("backgroundWidth") int getBackGroundWidth(); @Invoker("getSlotAt") Slot doGetSlotAt(double x, double y); + + @Invoker("isPointOverSlot") + boolean isMouseOverSlot(Slot slot, double mouseX, double mouseY); } diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenMixin.java b/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenMixin.java index cea84792..37b01d4b 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenMixin.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/HandledScreenMixin.java @@ -1,10 +1,10 @@ package ch.njol.unofficialmonumentamod.mixins.screen; +import ch.njol.unofficialmonumentamod.core.gui.InventoryWidget; import ch.njol.unofficialmonumentamod.features.misc.SlotLocking; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ingame.HandledScreen; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.screen.slot.Slot; import net.minecraft.screen.slot.SlotActionType; import org.spongepowered.asm.mixin.Mixin; @@ -12,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.At.Shift; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; @Mixin(HandledScreen.class) @@ -30,6 +31,30 @@ public abstract class HandledScreenMixin { SlotLocking.getInstance().tickRender(drawContext, mouseX, mouseY); } + //allows the pass-through of mouseReleased events to inventory widgets. + @Inject(method = "mouseReleased", at = @At("HEAD"), cancellable = true) + void umm$handledScreen$onMouseReleased(double mouseX, double mouseY, int button, CallbackInfoReturnable cir) { + HandledScreen $this = (HandledScreen) (Object) this; + + if($this.getFocused() instanceof InventoryWidget) { + if ($this.getFocused().mouseReleased(mouseX, mouseY, button)) { + cir.setReturnValue(true); + } + } + } + + //allows the pass-through of mouseDragged events to inventory widgets. + @Inject(method = "mouseDragged", at = @At("HEAD"), cancellable = true) + void umm$handledScreen$onMouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY, CallbackInfoReturnable cir) { + HandledScreen $this = (HandledScreen) (Object) this; + + if($this.getFocused() instanceof InventoryWidget) { + if ($this.getFocused().mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { + cir.setReturnValue(true); + } + } + } + @Inject( method = "render", at = @At( diff --git a/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/ScreenMixin.java b/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/ScreenMixin.java index a74a1634..a7c92b59 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/ScreenMixin.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/mixins/screen/ScreenMixin.java @@ -1,20 +1,18 @@ package ch.njol.unofficialmonumentamod.mixins.screen; +import ch.njol.unofficialmonumentamod.Utils; import ch.njol.unofficialmonumentamod.features.calculator.Calculator; import ch.njol.unofficialmonumentamod.features.calculator.CalculatorWidget; -import java.util.List; import ch.njol.unofficialmonumentamod.features.misc.SlotLocking; +import ch.njol.unofficialmonumentamod.features.misc.dev.ItemDataOverlay; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.AbstractParentElement; -import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.ParentElement; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.util.math.MatrixStack; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @@ -24,18 +22,24 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Screen.class) -public abstract class ScreenMixin extends AbstractParentElement { +public abstract class ScreenMixin extends AbstractParentElement implements ParentElement { @Shadow protected abstract T addDrawableChild(T drawableElement); + @Shadow protected abstract void remove(Element child); + @Unique void initializeWidget() { + Screen $this = (Screen) (Object) this; //initialize calculator widget if it should be added. if (Calculator.INSTANCE.shouldRender()) { - CalculatorWidget calculator = new CalculatorWidget((Screen) (Object) this); + CalculatorWidget calculator = new CalculatorWidget($this); calculator.init(CalculatorWidget.getMode()); Calculator.lastWidgetInitialized = calculator; - addDrawableChild(calculator); + Utils.addWidget($this, calculator); } + + //re-initialize nbt dev overlay + ItemDataOverlay.onGUIResized($this); } @Inject(at = @At("HEAD"), method = "close") @@ -45,6 +49,7 @@ void onClose(CallbackInfo ci) { Calculator.lastWidgetInitialized.onParentClosed(); Calculator.lastWidgetInitialized = null; } + ItemDataOverlay.onGUIClosed(); } @Inject(at = @At("HEAD"), method = "keyPressed", cancellable = true) @@ -54,6 +59,9 @@ void onKeyTyped(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable if (Calculator.INSTANCE.keyTyped(keyCode, scanCode, modifiers)) { cir.setReturnValue(true); } + if (ItemDataOverlay.keyTyped(keyCode, scanCode, modifiers)) { + cir.setReturnValue(true); + } SlotLocking.getInstance().onKeyboardInput($this, keyCode, scanCode, modifiers, cir); } diff --git a/src/main/java/ch/njol/unofficialmonumentamod/options/Options.java b/src/main/java/ch/njol/unofficialmonumentamod/options/Options.java index b721a2d0..fd2804d7 100644 --- a/src/main/java/ch/njol/unofficialmonumentamod/options/Options.java +++ b/src/main/java/ch/njol/unofficialmonumentamod/options/Options.java @@ -10,6 +10,7 @@ import ch.njol.unofficialmonumentamod.AbilityHandler; import ch.njol.unofficialmonumentamod.AbilityOptionPreset; import ch.njol.unofficialmonumentamod.UnofficialMonumentaModClient; +import ch.njol.unofficialmonumentamod.features.misc.dev.ItemDataOverlay.ItemDataOverlayMode; import java.util.ArrayList; import java.util.List; @@ -91,6 +92,10 @@ public class Options implements ch.njol.minecraft.config.Options { @FloatSlider(min = 0.2F, max = 10F, step = 0.2F, unit = "s") public float lock_textCooldown = 1F; + @Dropdown("idoverlay") + @Category("misc") + public ItemDataOverlayMode itemdataoverlay_mode = ItemDataOverlayMode.NBT; + @Category("abilities") public transient DescriptionLine abilitiesDisplay_info; @Category("abilities") diff --git a/src/main/resources/assets/unofficial-monumenta-mod/lang/en_us.json b/src/main/resources/assets/unofficial-monumenta-mod/lang/en_us.json index aa53105a..d390af18 100644 --- a/src/main/resources/assets/unofficial-monumenta-mod/lang/en_us.json +++ b/src/main/resources/assets/unofficial-monumenta-mod/lang/en_us.json @@ -2,6 +2,7 @@ "unofficial-monumenta-mod.keybinds.category": "Unofficial Monumenta Mod", "unofficial-monumenta-mod.keybinds.toggleCalculator": "Toggle Calculator (plots shard only)", + "unofficial-monumenta-mod.keybinds.toggleNBTOverlay": "Open Item Overlay", "unofficial-monumenta-mod.keybinds.lock_slot": "Lock/Unlock selected inventory slot", "unofficial-monumenta-mod.config.title": "Unofficial Monumenta Mod Configuration", @@ -76,6 +77,12 @@ "unofficial-monumenta-mod.config.option.lock_textCooldown": "Lock blocked messages cooldown", "unofficial-monumenta-mod.config.option.lock_textCooldown.tooltip": "Will determine how often the mod can spam the player's chat with messages like \"Stopped dropping of locked item\"", + "unofficial-monumenta-mod.config.subcategory.idoverlay": "Item Data Overlay", + "unofficial-monumenta-mod.config.option.itemdataoverlay_mode": "Item Data Overlay Mode", + "unofficial-monumenta-mod.config.option.itemdataoverlay_mode.tooltip": "The type of data shown about the item in the overlay", + "njols-config-framework.enum.ItemDataOverlayMode.NBT": "NBT Data", + "njols-config-framework.enum.ItemDataOverlayMode.TOOLTIP": "Tooltip", + "unofficial-monumenta-mod.config.category.abilities": "Ability Display", "unofficial-monumenta-mod.config.option.abilitiesDisplay_info": "Abilities can be reordered by opening the chat and then dragging them around with the mouse.\nTo move the whole ability display instead, hold ctrl while clicking & dragging.\nAlternatively, press the 'Edit HUD' button to move abilities and the display (assign this key in the Minecraft settings).", "unofficial-monumenta-mod.config.option.abilitiesDisplay_enabled": "Show abilities", @@ -212,6 +219,6 @@ "unofficial-monumenta-mod.delvebounty.shiftingcity": "In attempt to keep away outsiders, the denizens of this city doomed themselves to their own shifting hell. They must be freed, one way or another.", "unofficial-monumenta-mod.delvebounty.blue": "A great upheaval is errupting within the Tree of Life. The great heads of this band of witches must be cut down, lest they unleash a powerful ritual, the consequences of which cannot be undone.", - "unofficial-monumenta-mod.delvebounty.brown": "Tales of the Ashkii speak of the Shades, husks of their kin that have been reduced to naught but mindless flesh, and doppelgangers that infiltrate their ranks. These threats must be stamped out by removing the god that lies in the heart of Pelias’ folly." - + "unofficial-monumenta-mod.delvebounty.brown": "Tales of the Ashkii speak of the Shades, husks of their kin that have been reduced to naught but mindless flesh, and doppelgangers that infiltrate their ranks. These threats must be stamped out by removing the god that lies in the heart of Pelias’ folly.", + "unofficial-monumenta-mod.delvebounty.indigo": "A tower. inverted, calls out as friends and foes descend upon it. The wool within must be claimed before those with darker motives are able to lay claim to the secrets within." } \ No newline at end of file diff --git a/src/main/resources/assets/unofficial-monumenta-mod/override/effects.json b/src/main/resources/assets/unofficial-monumenta-mod/override/effects.json index f235c117..98ada3e9 100644 --- a/src/main/resources/assets/unofficial-monumenta-mod/override/effects.json +++ b/src/main/resources/assets/unofficial-monumenta-mod/override/effects.json @@ -8,9 +8,6 @@ "Attack Speed": { "method": "multiplicative" }, - "Damage Dealt": { - "method": "multiplicative" - }, "Resistance": { "method": "multiplicative" }, diff --git a/src/main/resources/assets/unofficial-monumenta-mod/override/shards.json b/src/main/resources/assets/unofficial-monumenta-mod/override/shards.json index a0a274d8..a170ca13 100644 --- a/src/main/resources/assets/unofficial-monumenta-mod/override/shards.json +++ b/src/main/resources/assets/unofficial-monumenta-mod/override/shards.json @@ -184,6 +184,12 @@ "maxChests": null, "canBeDelveBounty": true }, + "indigo": { + "officialName": "Phyrrys, City Of Fallen Stars", + "shardType": "DUNGEON", + "maxChests": null, + "canBeDelveBounty": true + }, "green": { "officialName": "green", "shardType": "DUNGEON", @@ -227,6 +233,6 @@ "hexfall": { "officialName": "Hexfall", "shardType": "STRIKE", - "maxChests": 99 + "maxChests": 43 } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 14739207..7fcfc501 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -43,8 +43,8 @@ "minecraft": "~${minecraft_version}" }, "recommends": { - "modmenu": ">=7.2.1", - "cloth-config": ">=11.1.106" + "modmenu": ">=9.2.0", + "cloth-config": ">=13.0.138" }, "suggests": { "citresewn": "*" diff --git a/src/main/resources/unofficial-monumenta-mod.mixins.json b/src/main/resources/unofficial-monumenta-mod.mixins.json index 2b544e0e..bb8007d8 100644 --- a/src/main/resources/unofficial-monumenta-mod.mixins.json +++ b/src/main/resources/unofficial-monumenta-mod.mixins.json @@ -2,34 +2,8 @@ "required": true, "minVersion": "0.8", "package": "ch.njol.unofficialmonumentamod.mixins", + "plugin": "ch.njol.unofficialmonumentamod.core.init.AutoDiscoveryMixinPlugin", "compatibilityLevel": "JAVA_17", - "client": [ - "ArmorFeatureRendererMixin", - "BlockItemMixin", - "CapeFeatureRendererMixin", - "ClientPlayerInteractionManagerMixin", - "ClientPlayNetworkHandlerMixin", - "DrawContextMixin", - "ElytraFeatureRendererMixin", - "HeadFeatureRendererMixin", - "HeldItemFeatureRendererMixin", - "InGameHudMixin", - "ItemRendererMixin", - "KeyBindingAccessor", - "MessageHandlerMixin", - "MinecraftClientMixin", - "PlayerListHudAccessor", - "PlayerListHudMixin", - "ReloadableResourceManagerImplMixin", - "ThreadExecutorMixin", - "ThrowablePotionItemMixin", - "item.ItemStackAccessor", - "item.ItemStackMixin", - "screen.HandledScreenAccessor", - "screen.HandledScreenMixin", - "screen.ScreenAccessor", - "screen.ScreenMixin" - ], "injectors": { "defaultRequire": 1 }