From 2360fc33432c5ada0dc42df6e2d2d7da9809a620 Mon Sep 17 00:00:00 2001 From: Visual-Vincent Date: Wed, 13 Jul 2022 23:51:10 +0200 Subject: [PATCH] Updated to support Minecraft 1.19 --- Build and copy to mods.bat | 2 +- Forge-README.txt | 4 +- README.md | 4 +- build.gradle | 81 +- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 10 +- settings.gradle | 6 + .../com/mydoomsite/statsmod/Main/Drawing.java | 4 +- .../statsmod/Main/MainRegistry.java | 9 +- .../statsmod/handlers/KeyBindings.java | 23 +- .../statsmod/handlers/RenderHandler.java | 941 +++++++++--------- src/main/resources/META-INF/mods.toml | 8 +- src/main/resources/pack.mcmeta | 4 +- 14 files changed, 562 insertions(+), 536 deletions(-) create mode 100644 settings.gradle diff --git a/Build and copy to mods.bat b/Build and copy to mods.bat index c8d7802..7424335 100644 --- a/Build and copy to mods.bat +++ b/Build and copy to mods.bat @@ -1,5 +1,5 @@ @echo off -set MCVERSION=1.18.1 +set MCVERSION=1.19 set MODVERSION=1.1 gradlew build && copy "build\libs\PlayerStatisticsList-%MCVERSION%-%MODVERSION%.jar" "%AppData%\.minecraft\mods\PlayerStatisticsList-%MCVERSION%-%MODVERSION%.jar" pause \ No newline at end of file diff --git a/Forge-README.txt b/Forge-README.txt index 344bca7..867e97e 100644 --- a/Forge-README.txt +++ b/Forge-README.txt @@ -40,7 +40,7 @@ https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md Additional Resources: ========================= -Community Documentation: http://mcforge.readthedocs.io/en/latest/gettingstarted/ +Community Documentation: https://mcforge.readthedocs.io/en/latest/gettingstarted/ LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0 Forge Forum: https://forums.minecraftforge.net/ -Forge Discord: https://discord.gg/UvedJ9m \ No newline at end of file +Forge Discord: https://discord.gg/UvedJ9m diff --git a/README.md b/README.md index d187917..cbde5c1 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,11 @@ A Minecraft Forge mod showing relevant statistics about the player and the world This mod is client-side only, meaning the server(s) you are joining don't need to be modded in order for this mod to work for you. +The code in this project is several years old and in need of a huge refactor. Read it at your own risk. :) + ## Requirements For running: -- Minecraft Forge Client 39.0.10 or higher (MC version 1.18.1) +- Minecraft Forge Client 41.0.98 or higher (MC version 1.19) For building: - Java SE Development Kit 17 / OpenJDK 17 or higher diff --git a/build.gradle b/build.gradle index d0fd610..aa6e915 100644 --- a/build.gradle +++ b/build.gradle @@ -1,39 +1,32 @@ -buildscript { - repositories { - // These repositories are only for Gradle plugins, put any other repositories in the repository block further below - maven { url = 'https://maven.minecraftforge.net' } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - } +plugins { + id 'eclipse' + id 'maven-publish' + id 'net.minecraftforge.gradle' version '5.1.+' } -apply plugin: 'net.minecraftforge.gradle' -// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -apply plugin: 'eclipse' -apply plugin: 'maven-publish' -version = '1.18.1-1.1' +version = '1.19-1.1' group = 'com.mydoomsite.statsmod' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'PlayerStatisticsList' // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. java.toolchain.languageVersion = JavaLanguageVersion.of(17) -println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) +println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" minecraft { // The mappings can be changed at any time and must be in the following format. // Channel: Version: - // snapshot YYYYMMDD Snapshot are built nightly. - // stable # Stables are built at the discretion of the MCP team. - // official MCVersion Official field/method names from Mojang mapping files + // official MCVersion Official field/method names from Mojang mapping files + // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official // - // You must be aware of the Mojang license when using the 'official' mappings. + // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md // + // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge + // Additional setup is needed to use their mappings: https://github.com/ParchmentMC/Parchment/wiki/Getting-Started + // // Use non-default mappings at your own risk. They may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'official', version: '1.18.1' + mappings channel: 'official', version: '1.19' // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. @@ -55,8 +48,11 @@ minecraft { // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels property 'forge.logging.console.level', 'debug' + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', 'mydoomsite_statsmod' + mods { - examplemod { + mydoomsite_statsmod { source sourceSets.main } } @@ -65,18 +61,31 @@ minecraft { server { workingDirectory project.file('run') - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. property 'forge.logging.markers', 'REGISTRIES' - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels property 'forge.logging.console.level', 'debug' + property 'forge.enabledGameTestNamespaces', 'mydoomsite_statsmod' + + mods { + mydoomsite_statsmod { + source sourceSets.main + } + } + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'REGISTRIES' + + property 'forge.logging.console.level', 'debug' + + property 'forge.enabledGameTestNamespaces', 'mydoomsite_statsmod' + mods { mydoomsite_statsmod { source sourceSets.main @@ -87,16 +96,8 @@ minecraft { data { workingDirectory project.file('run') - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. property 'forge.logging.markers', 'REGISTRIES' - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels property 'forge.logging.console.level', 'debug' // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. @@ -128,7 +129,7 @@ dependencies { // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.18.1-39.0.10' + minecraft 'net.minecraftforge:forge:1.19-41.0.98' // Real mod deobf dependency examples - these get remapped to your current mappings // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency @@ -176,3 +177,7 @@ publishing { } } } + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 8958 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefa..1b6c787 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..fb61b26 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,6 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { url = 'https://maven.minecraftforge.net/' } + } +} \ No newline at end of file diff --git a/src/main/java/com/mydoomsite/statsmod/Main/Drawing.java b/src/main/java/com/mydoomsite/statsmod/Main/Drawing.java index 5d64f2e..de78449 100644 --- a/src/main/java/com/mydoomsite/statsmod/Main/Drawing.java +++ b/src/main/java/com/mydoomsite/statsmod/Main/Drawing.java @@ -5,7 +5,7 @@ import com.mydoomsite.statsmod.lib.TextMetrics; import net.minecraft.client.Minecraft; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; public class Drawing { @@ -97,6 +97,6 @@ public static void DrawTextScaled(PoseStack matrixStack, String text, float x, f public static void sendChatMessageToClient(String message) { - minecraft.player.sendMessage(new TextComponent("\u00A7l\u00A7e[Statistics List]\u00A7r " + message), null); + minecraft.player.displayClientMessage(Component.literal("\u00A7l\u00A7e[Statistics List]\u00A7r " + message), false); // false = Display in chat, true = Display above status bar } } diff --git a/src/main/java/com/mydoomsite/statsmod/Main/MainRegistry.java b/src/main/java/com/mydoomsite/statsmod/Main/MainRegistry.java index 84b3462..3432149 100644 --- a/src/main/java/com/mydoomsite/statsmod/Main/MainRegistry.java +++ b/src/main/java/com/mydoomsite/statsmod/Main/MainRegistry.java @@ -1,6 +1,7 @@ package com.mydoomsite.statsmod.Main; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.RegisterKeyMappingsEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.IExtensionPoint; @@ -29,6 +30,7 @@ public MainRegistry() DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::Setup); FMLJavaModLoadingContext.get().getModEventBus().addListener(this::ClientSetup); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::RegisterKeyBindings); }); } @@ -41,7 +43,12 @@ private void ClientSetup(final FMLClientSetupEvent event) { StringHelper.Initialize(); MinecraftForge.EVENT_BUS.register(RenderHandler.Instance); - MinecraftForge.EVENT_BUS.register(new KeyBindings()); + MinecraftForge.EVENT_BUS.register(KeyBindings.Instance); MinecraftForge.EVENT_BUS.register(new TickHandlers()); } + + private void RegisterKeyBindings(RegisterKeyMappingsEvent event) + { + KeyBindings.RegisterKeyBindings(event); + } } diff --git a/src/main/java/com/mydoomsite/statsmod/handlers/KeyBindings.java b/src/main/java/com/mydoomsite/statsmod/handlers/KeyBindings.java index fadfed5..f1feaf8 100644 --- a/src/main/java/com/mydoomsite/statsmod/handlers/KeyBindings.java +++ b/src/main/java/com/mydoomsite/statsmod/handlers/KeyBindings.java @@ -8,12 +8,14 @@ import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ChatScreen; -import net.minecraftforge.client.ClientRegistry; -import net.minecraftforge.client.event.InputEvent.KeyInputEvent; +import net.minecraftforge.client.event.InputEvent.Key; +import net.minecraftforge.client.event.RegisterKeyMappingsEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -public class KeyBindings +public final class KeyBindings { + public static KeyBindings Instance = new KeyBindings(); + public static final int ShowHideList = 0; public static final int ShowHideCoords = 1; public static final int ResetDistances = 2; @@ -48,23 +50,29 @@ public class KeyBindings GLFW.GLFW_KEY_KP_7 }; - private final KeyMapping[] keys; + private static KeyMapping[] keys; private static Minecraft minecraft = Minecraft.getInstance(); - public KeyBindings() + private KeyBindings() {} + + @SubscribeEvent + public static void RegisterKeyBindings(RegisterKeyMappingsEvent event) { + if(keys != null) + return; + keys = new KeyMapping[desc.length]; for (int i = 0; i < desc.length; ++i) { keys[i] = new KeyMapping(desc[i], keyValues[i], "Player Statistics List"); - ClientRegistry.registerKeyBinding(keys[i]); + event.register(keys[i]); } } @SubscribeEvent - public void onKeyInput(KeyInputEvent event) + public void onKeyInput(Key event) { if ((minecraft.isWindowActive() || (minecraft.screen != null && (minecraft.screen instanceof ChatScreen))) && !minecraft.options.renderDebug) { @@ -124,5 +132,4 @@ else if(keys[StartStopMeasurement].isDown()) } } } - } diff --git a/src/main/java/com/mydoomsite/statsmod/handlers/RenderHandler.java b/src/main/java/com/mydoomsite/statsmod/handlers/RenderHandler.java index 99f97dd..5fa59f1 100644 --- a/src/main/java/com/mydoomsite/statsmod/handlers/RenderHandler.java +++ b/src/main/java/com/mydoomsite/statsmod/handlers/RenderHandler.java @@ -37,483 +37,480 @@ public class RenderHandler { - public static RenderHandler Instance = new RenderHandler(); - private static Minecraft minecraft = Minecraft.getInstance(); + public static RenderHandler Instance = new RenderHandler(); + private static Minecraft minecraft = Minecraft.getInstance(); - public static final float SwordBaseDamage = 3.0f; //From the constructor of SwordItem. - - public static int StatusAlpha = 255; - public static int DeathTimerAlpha = 255; - private static ReferenceType armorPieces = new ReferenceType(0); - - @SubscribeEvent(priority = EventPriority.NORMAL) - public void RenderGameOverlayEvent(RenderGameOverlayEvent.Post event) - { - if(event.getType() == RenderGameOverlayEvent.ElementType.TEXT) - { - if ((minecraft.isWindowActive() || (minecraft.screen != null && (minecraft.screen instanceof ChatScreen))) && !minecraft.options.renderDebug) - { - if(!GlobalProperties.renderList && !GlobalProperties.renderCoords) - return; - - Vec3 playerPos = minecraft.player.position(); - - if(GlobalProperties.renderCoords) - { - String coords = - MathHelper.roundWithTrail(playerPos.x, 2) + ", " + - MathHelper.roundWithTrail(playerPos.y, 2) + ", " + - MathHelper.roundWithTrail(playerPos.z, 2); - - Drawing.DrawTextScaled(event.getMatrixStack(), coords, 4.0f*(1 / GlobalProperties.listScale), 4.0f*(1 / GlobalProperties.listScale), 0xFFFFFF, GlobalProperties.listScale, true); - } - - if(!GlobalProperties.renderList) - return; - - Window window = event.getWindow(); - - int width = window.getGuiScaledWidth(); - int height = window.getGuiScaledHeight(); - - long TimeOfDay = minecraft.level.getDayTime() % 24000; - int TimeLeftSeconds; - String NextWhat; - boolean isDay = TimeOfDay < 12000; - - if(TimeOfDay < 12000) //Next sunset. - { - TimeLeftSeconds = (int)((12000-TimeOfDay) / 20); - NextWhat = "sunset"; - } - else //Next dawn. - { - TimeOfDay -= 12000; - TimeLeftSeconds = (int)((12000-TimeOfDay) / 20); - NextWhat = "dawn"; - } - - String TimeString = TimeLeftSeconds/60 + ":" + (TimeLeftSeconds%60)/10 + TimeLeftSeconds%10; - String DeathDropsString = ""; - - if(GlobalProperties.deathTimer > 0.0) - { - int DeathDropsSeconds = (int)(GlobalProperties.deathTimer / 20.0); - DeathDropsString = DeathDropsSeconds/60 + ":" + (DeathDropsSeconds%60)/10 + DeathDropsSeconds%10; - - Drawing.DrawCenteredText( - new RenderedLine(GlobalProperties.deathTimer > 0.0 ? "Death drops de-spawn: " + StringHelper.getColorFromValue(GlobalProperties.deathTimer, GlobalProperties.deathTimerMax, false) + DeathDropsString : "", DeathTimerAlpha), - window, event.getMatrixStack(), 0, 8, 0xFFFFFFF, GlobalProperties.listScale, true - ); - } - - BlockPos playerBlockPos = minecraft.player.blockPosition(); - - if(GlobalProperties.measureStart != null) - { - double diffX = playerBlockPos.getX() - GlobalProperties.measureStart.getX(); - double diffY = playerBlockPos.getY() - GlobalProperties.measureStart.getY(); - double diffZ = playerBlockPos.getZ() - GlobalProperties.measureStart.getZ(); - - double dist = MathHelper.round(Math.sqrt(diffX*diffX + diffY*diffY + diffZ*diffZ), 2); - - Drawing.DrawCenteredText( - new RenderedLine("Distance: \u00A72" + dist + "m"), - window, event.getMatrixStack(), 0, 8 + minecraft.font.lineHeight + 2, 0xFFFFFFF, GlobalProperties.listScale, true - ); - } - - float xpPercentage = minecraft.player.experienceProgress * 100; - - BlockPos CurrentBlock = new BlockPos(playerPos.x, playerPos.y, playerPos.z); - - int LightLevelSky = minecraft.level.getBrightness(LightLayer.SKY, CurrentBlock); - int LightLevelBlock = minecraft.level.getBrightness(LightLayer.BLOCK, CurrentBlock); - - HitResult crosshairObj = minecraft.hitResult; - - ItemStack ArmorBoots = minecraft.player.getInventory().getArmor(0); - ItemStack ArmorLeggings = minecraft.player.getInventory().getArmor(1); - ItemStack ArmorChestplate = minecraft.player.getInventory().getArmor(2); - ItemStack ArmorHelmet = minecraft.player.getInventory().getArmor(3); - - String armorDisplay = ""; - double armorPercentage = 0.0; - - armorPieces.Value = 0; - - double ArmorBootsDamage = MathHelper.damagePercentage(ArmorBoots, armorPieces); - double ArmorLegginsDamage = MathHelper.damagePercentage(ArmorLeggings, armorPieces); - double ArmorChestplateDamage = MathHelper.damagePercentage(ArmorChestplate, armorPieces); - double ArmorHelmetDamage = MathHelper.damagePercentage(ArmorHelmet, armorPieces); - - armorPercentage = ArmorBootsDamage + - ArmorLegginsDamage + - ArmorChestplateDamage + - ArmorHelmetDamage; - - armorPercentage = MathHelper.safeDivide(armorPercentage, armorPieces.Value); - - armorDisplay = "\u00A7f("; - armorDisplay = StringHelper.appendIfHasDurability(armorDisplay, ArmorHelmet, StringHelper.getColorFromValue(ArmorHelmetDamage, 100.0, true) + "H"); - armorDisplay = StringHelper.appendIfHasDurability(armorDisplay, ArmorChestplate, StringHelper.getColorFromValue(ArmorChestplateDamage, 100.0, true) + "C"); - armorDisplay = StringHelper.appendIfHasDurability(armorDisplay, ArmorLeggings, StringHelper.getColorFromValue(ArmorLegginsDamage, 100.0, true) + "L"); - armorDisplay = StringHelper.appendIfHasDurability(armorDisplay, ArmorBoots, StringHelper.getColorFromValue(ArmorBootsDamage, 100.0, true) + "B"); - armorDisplay += "\u00A7f)"; - - if(armorPieces.Value == 0) { - armorDisplay = ""; - } - - ItemStack heldItemMainHand = minecraft.player.getItemInHand(InteractionHand.MAIN_HAND); - ItemStack heldItemOffHand = minecraft.player.getItemInHand(InteractionHand.OFF_HAND); - - float directionYaw = minecraft.player.getRotationVector().y + 180.0f; - float directionDegreesYaw = Math.abs(directionYaw) % 360.0f; - float directionDegrees = (directionYaw >= 0.0f) ? directionDegreesYaw : (360.0f - directionDegreesYaw); - String direction = (int)Math.floor(directionDegrees) + ""; - - if(directionDegrees > 337.5f || directionDegrees <= 22.5f) { - direction = direction + " N"; - } - else if(directionDegrees > 22.5f && directionDegrees <= 67.5f) { - direction = direction + " NE"; - } - else if(directionDegrees > 67.5f && directionDegrees <= 112.5f) { - direction = direction + " E"; - } - else if(directionDegrees > 112.5f && directionDegrees <= 157.5f) { - direction = direction + " SE"; - } - else if(directionDegrees > 157.5f && directionDegrees <= 202.5f) { - direction = direction + " S"; - } - else if(directionDegrees > 202.5f && directionDegrees <= 247.5f) { - direction = direction + " SW"; - } - else if(directionDegrees > 247.5f && directionDegrees <= 292.5f) { - direction = direction + " W"; - } - else if(directionDegrees > 292.5f && directionDegrees <= 337.5f) { - direction = direction + " NW"; - } - - RenderedLine[] Statistics = new RenderedLine[] { - new RenderedLine("\u00A7aPlayer Statistics"), - new RenderedLine("\u00A7a--------------"), - - new RenderedLine("Direction: \u00A7a" + direction), - new RenderedLine("Status: " + StringHelper.getPlayerStatus(MathHelper.round(minecraft.player.getHealth()/20.0, 2), MathHelper.round(minecraft.player.getFoodData().getFoodLevel()/20.0, 2)), StatusAlpha), - new RenderedLine("Health: " + StringHelper.colorIntValue((int)((minecraft.player.getHealth()/2.0)*10.0), 100, false) + "%"), - new RenderedLine("Food: " + StringHelper.colorIntValue((int)((minecraft.player.getFoodData().getFoodLevel()/2.0)*10.0), 100, false) + "%"), - new RenderedLine("Air: " + StringHelper.colorAirValue((minecraft.player.getAirSupply()/3)>=0 ? (minecraft.player.getAirSupply()/3) : 0, 100, false) + "%"), - new RenderedLine(playerPos.y >= MathHelper.SeaLevel ? "MASL: \u00A7a" + MathHelper.roundWithTrail(playerPos.y - MathHelper.SeaLevel, 2) + " m" : "MBSL: \u00A7a" + MathHelper.roundWithTrail(MathHelper.SeaLevel - playerPos.y, 2) + " m"), - new RenderedLine("Xp: \u00A7a" + MathHelper.round(xpPercentage, 2) + "%"), - - new RenderedLine("Light: " + (LightLevelSky > 7 ? "\u00A7a" : "\u00A7c") + LightLevelSky + " " + (LightLevelBlock > 7 ? "\u00A7a" : "\u00A7c") + LightLevelBlock), - new RenderedLine("Speed: \u00A7a" + (GlobalProperties.doDistanceCalculations ? MathHelper.roundWithTrail(20*GlobalProperties.playerSpeed, 2) + " m/s" : "\u00A74-")), - new RenderedLine("Travelled: \u00A7a" + (GlobalProperties.doDistanceCalculations ? StringHelper.formatDistance(GlobalProperties.distanceTravelled, true, 2, false) : "\u00A74-")), - new RenderedLine("Fallen: \u00A7a" + (GlobalProperties.doDistanceCalculations ? StringHelper.formatDistance(GlobalProperties.distanceFallen, true, 2, false) : "\u00A74-")), - - new RenderedLine("Dmg taken: \u00A7b" + MathHelper.roundWithTrail(GlobalProperties.damageTaken, 1) + " hp"), - - new RenderedLine("Next " + NextWhat + ": " + StringHelper.getColorFromValue(TimeOfDay, 12000, isDay) + TimeString), - - // Be last - new RenderedLine(" "), - new RenderedLine(armorPieces.Value > 0 ? "Armor (avg.): " + StringHelper.colorDoubleValue(armorPercentage, 100.0, 2, true) + "% " + armorDisplay : ""), - new RenderedLine(heldItemMainHand != null && heldItemMainHand.getMaxDamage() > 0 ? heldItemMainHand.getHoverName().getString() + ": " + StringHelper.colorDoubleValue(((double)heldItemMainHand.getDamageValue()*100.0)/(double)heldItemMainHand.getMaxDamage(), 100, 2, true) + "%" : ""), - new RenderedLine(heldItemOffHand != null && heldItemOffHand.getMaxDamage() > 0 ? heldItemOffHand.getHoverName().getString() + ": " + StringHelper.colorDoubleValue(((double)heldItemOffHand.getDamageValue()*100.0)/(double)heldItemOffHand.getMaxDamage(), 100, 2, true) + "%" : "") - }; - Drawing.DrawTextLines(Statistics, window, event.getMatrixStack(), 1, 8, height / 2, 0xFFFFFF, GlobalProperties.listScale, true); - - - int rStatIndex = 0; - RenderedLine[] rightStatistics = new RenderedLine[48]; - boolean hasToolStatistics = false; - - // Right now you may be asking yourself: - // "Why is this guy using a regular array instead of an ArrayList<>?" - // - // The answer is simple: - // Even though an ArrayList<> is much more flexible than a regular array, - // I want to ensure that this mod affects performance as little as possible. - // Thus, I sacrifice readability and flexibility in order to get a little - // (even though it is very little) performance gain. - - - // Statistics about the held item - if(GlobalProperties.AdditionalStatistics == 2 && heldItemMainHand != null && heldItemMainHand.isEnchanted() == true) - { - ListTag toolEnchantments = heldItemMainHand.getEnchantmentTags(); - if(toolEnchantments != null) - { - int enchantmentCount = toolEnchantments.size(); - - rightStatistics[rStatIndex] = new RenderedLine("\u00A7a" + heldItemMainHand.getHoverName().getString()); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine("\u00A7a------------"); rStatIndex ++; - - Item heldItem = heldItemMainHand.getItem(); - - float SwordDamage = (heldItem instanceof SwordItem) ? (3.0f + ((SwordItem)heldItem).getDamage() + 1.0f) : 0.0f; - float SwordDamageFactor = 0.0f; - int SwordDamageIndex = rStatIndex; rStatIndex ++; - rightStatistics[SwordDamageIndex] = new RenderedLine(""); - - for(int i = 0; i < enchantmentCount; i++) - { - CompoundTag enchantment = (CompoundTag)toolEnchantments.get(i); - String id = enchantment.getString("id"); - short level = enchantment.getShort("lvl"); - - if(level > 0) - { - double sweepDamage; - switch(id) - { - case "minecraft:sharpness": - if(EnchantmentCategory.WEAPON.canEnchant(heldItem) && heldItem instanceof SwordItem) - { - SwordItem Sword = (SwordItem)heldItem; - SwordDamageFactor += (level - 1.0f) * 0.5f + 1.0f; - } - break; - - case "minecraft:smite": - rightStatistics[rStatIndex] = new RenderedLine("Undead: \u00A72+" + Math.round(((SwordDamage + level * 2.5f) / SwordDamage - 1.0f) * 100.0f) + "%"); rStatIndex ++; - break; - - case "minecraft:bane_of_arthropods": - rightStatistics[rStatIndex] = new RenderedLine("Arthropods: \u00A72+" + Math.round(((SwordDamage + level * 2.5f) / SwordDamage - 1.0f) * 100.0f) + "%"); rStatIndex ++; - break; - - case "minecraft:knockback": - rightStatistics[rStatIndex] = new RenderedLine("Knockback: \u00A72+" + (level * 3)); rStatIndex ++; - break; - - case "minecraft:fire_aspect": - rightStatistics[rStatIndex] = new RenderedLine("Applied fire: \u00A72" + (level * 4) + "s"); rStatIndex ++; - break; - - case "minecraft:looting": - rightStatistics[rStatIndex] = new RenderedLine("Maximum loot: \u00A72+" + level); rStatIndex ++; - break; - - case "minecraft:sweeping_edge": - sweepDamage = 50.0D; - if (level == 2) { sweepDamage = 67.0D; } - else if (level >= 3) { sweepDamage = 75.0D; } - - rightStatistics[rStatIndex] = new RenderedLine("Sweep: \u00A72+" + Math.round(sweepDamage) + "%"); rStatIndex ++; - break; - - case "minecraft:efficiency": - rightStatistics[rStatIndex] = new RenderedLine("Mining speed: \u00A72" + Math.round(Math.pow(level, 2.0D) + 1.0D) + "x"); rStatIndex ++; - break; - - case "minecraft:unbreaking": - rightStatistics[rStatIndex] = new RenderedLine("Durability: \u00A72" + (level + 1) + "x"); rStatIndex ++; - break; - - case "minecraft:fortune": - rightStatistics[rStatIndex] = new RenderedLine("Maximum drops: \u00A72" + (level + 1) + "x"); rStatIndex ++; - break; - - case "minecraft:power": - rightStatistics[rStatIndex] = new RenderedLine("Damage: \u00A72+" + Math.round(0.25D * (level + 1) * 100.0D) + "%"); rStatIndex ++; - break; - - case "minecraft:punch": - rightStatistics[rStatIndex] = new RenderedLine("Knockback: \u00A72+" + (level * 3)); rStatIndex ++; - break; - - case "minecraft:flame": - rightStatistics[rStatIndex] = new RenderedLine("Applied fire: \u00A725s"); rStatIndex ++; - break; - } - } - } - - if(SwordDamageFactor > 0.0f) - { - SwordDamageFactor = (SwordDamage + SwordDamageFactor) / SwordDamage - 1.0f; - rightStatistics[SwordDamageIndex] = new RenderedLine("Damage: \u00A72+" + Math.round(SwordDamageFactor * 100.0f) + "%"); - } - - hasToolStatistics = true; - } - } - - // Target identification - if(GlobalProperties.AdditionalStatistics >= 1 && crosshairObj != null) - { - if(crosshairObj != null - && crosshairObj.getType() == HitResult.Type.ENTITY - && ((EntityHitResult)crosshairObj).getEntity() instanceof LivingEntity) - { - LivingEntity TargetEntity = (LivingEntity)((EntityHitResult)crosshairObj).getEntity(); - - double playX = playerPos.x; - double playY = playerPos.y; - double playZ = playerPos.z; - - Vec3 entityPos = TargetEntity.position(); - - double entX = entityPos.x; - double entY = entityPos.y; - double entZ = entityPos.z; - - double diffX = entX - playX; - double diffZ = entZ - playZ; - - double EnemyDistance = Math.sqrt(diffX*diffX + diffZ*diffZ); - - if(hasToolStatistics == true) - { - rightStatistics[rStatIndex] = new RenderedLine(" "); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine(" "); rStatIndex ++; - } - - rightStatistics[rStatIndex] = new RenderedLine("\u00A74Target"); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine("\u00A74------"); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine("Name: \u00A7b" + TargetEntity.getName().getString()); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine("Health: " + StringHelper.colorIntValue((int)((TargetEntity.getHealth()/TargetEntity.getMaxHealth())*100.0f), 100, false) + "%"); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine("Distance: \u00A7b" + StringHelper.formatDistance(EnemyDistance, true, 2, true)); rStatIndex ++; - - // Specific mob statistics - if(TargetEntity.getClass().getSimpleName().contains("Creeper")) - { - try - { - int swell = (Integer)getInstanceField(TargetEntity, "f_32270_"); - int swellMax = (Integer)getInstanceField(TargetEntity, "f_32271_"); - - double explodeTics = swellMax - swell; - String explodeSecs = MathHelper.roundWithTrail(explodeTics / 20.0, 2); - - rightStatistics[rStatIndex] = new RenderedLine("\u00A74Explodes in: \u00A7b" + explodeSecs + " s"); rStatIndex ++; - } - catch(Throwable e) {} - - // fuseTime and timeSinceIgnited don't exist anymore - /* - try - { - //fuseTime - timeSinceIgnited - double explodeTics = (Integer)getInstanceField(TargetEntity, "field_82225_f") - (Integer)getInstanceField(TargetEntity, "field_70833_d"); - String explodeSecs = MathHelper.roundWithTrail(explodeTics / 20.0, 2); - - rightStatistics[rStatIndex] = new RenderedLine("\u00A74Explodes in: \u00A7b" + explodeSecs + " s"); rStatIndex ++; - } - catch (Throwable e) {} - */ - } - else if(TargetEntity instanceof AbstractHorse) - { - AbstractHorse horseEntity = (AbstractHorse)TargetEntity; - boolean horseIsTame = horseEntity.isTamed(); - - rightStatistics[rStatIndex] = new RenderedLine("Tame: " + (horseIsTame ? "\u00A7aYes" : "\u00A7cNo")); rStatIndex ++; - - if(horseIsTame == true) { - double jumpStrength = horseEntity.getCustomJump(); - double jumpHeight = -0.1817584952D * Math.pow(jumpStrength, 3.0D) + 3.689713992D * Math.pow(jumpStrength, 2.0D) + 2.128599134D * jumpStrength - 0.343930367D; - - rightStatistics[rStatIndex] = new RenderedLine("Speed: \u00A7a" + MathHelper.round(horseEntity.getAttribute(Attributes.MOVEMENT_SPEED).getValue() * 43.1718071434983D, 2) + " m/s"); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine("Jump: \u00A7a" + MathHelper.round(jumpHeight, 2) + " m"); rStatIndex ++; - } - } - } - else if(crosshairObj != null - && crosshairObj.getType() == HitResult.Type.BLOCK) - { - BlockPos blockpos = ((BlockHitResult)crosshairObj).getBlockPos(); - if(blockpos != null) - { - BlockState blockstate = minecraft.level.getBlockState(blockpos); - Block block = blockstate.getBlock(); - if(block instanceof CropBlock) - { - CropBlock crop = (CropBlock)block; - String cropName = ""; - int cropAge = -1; - int cropMaxAge = crop.getMaxAge(); - float growthChance = -1.0f; - - try - { - cropName = ((ItemLike)getInstanceMethod(crop, "m_6404_")).asItem().getDefaultInstance().getHoverName().getString(); - } catch(Throwable e) {} - try - { - if(block.getClass().equals(CropBlock.class)) - { - cropAge = (Integer)getInstanceMethod(crop, "m_52305_", new Class[] {BlockState.class}, new Object[] {blockstate}); - } - else - { - cropAge = (Integer)getSuperInstanceMethod(crop, "m_52305_", new Class[] {BlockState.class}, new Object[] {blockstate}); - } - - } catch(Throwable e) {} - try - { - if(block.getClass().equals(CropBlock.class)) - { - growthChance = (Float)getInstanceMethod(crop, "m_52272_", new Class[] {Block.class, BlockGetter.class, BlockPos.class}, new Object[] {block, minecraft.level, blockpos}); - } - else - { - growthChance = (Float)getSuperInstanceMethod(crop, "m_52272_", new Class[] {Block.class, BlockGetter.class, BlockPos.class}, new Object[] {block, minecraft.level, blockpos}); - } - } catch(Throwable e) {} - - - if(hasToolStatistics) - { - rightStatistics[rStatIndex] = new RenderedLine(" "); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine(" "); rStatIndex ++; - } - - rightStatistics[rStatIndex] = new RenderedLine("\u00A72Crop"); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine("\u00A72----"); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine("Name: \u00A7b" + cropName); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine((cropAge >= 0 ? ("Stage: \u00A7b" + cropAge + "/" + cropMaxAge) : "")); rStatIndex ++; - rightStatistics[rStatIndex] = new RenderedLine((growthChance >= 0.0f ? ("G. chance: \u00A7b" + MathHelper.round((double)growthChance, 2) + "%") : "")); rStatIndex ++; - } - } - } - } - - if(rStatIndex > 0) - Drawing.DrawTextLines(rightStatistics, window, event.getMatrixStack(), 1, 65536, height / 2, 0xFFFFFF, GlobalProperties.listScale, true); - } - } - } - - public static Object getInstanceField(Object instance, String fieldName) throws Throwable - { + public static final float SwordBaseDamage = 3.0f; //From the constructor of SwordItem. + + public static int StatusAlpha = 255; + public static int DeathTimerAlpha = 255; + private static ReferenceType armorPieces = new ReferenceType(0); + + @SubscribeEvent(priority = EventPriority.NORMAL) + public void CustomizeGuiOverlayEvent(CustomizeGuiOverlayEvent.DebugText event) + { + if ((minecraft.isWindowActive() || (minecraft.screen != null && (minecraft.screen instanceof ChatScreen))) && !minecraft.options.renderDebug) + { + if(!GlobalProperties.renderList && !GlobalProperties.renderCoords) + return; + + Vec3 playerPos = minecraft.player.position(); + + if(GlobalProperties.renderCoords) + { + String coords = + MathHelper.roundWithTrail(playerPos.x, 2) + ", " + + MathHelper.roundWithTrail(playerPos.y, 2) + ", " + + MathHelper.roundWithTrail(playerPos.z, 2); + + Drawing.DrawTextScaled(event.getPoseStack(), coords, 4.0f*(1 / GlobalProperties.listScale), 4.0f*(1 / GlobalProperties.listScale), 0xFFFFFF, GlobalProperties.listScale, true); + } + + if(!GlobalProperties.renderList) + return; + + Window window = event.getWindow(); + + int width = window.getGuiScaledWidth(); + int height = window.getGuiScaledHeight(); + + long TimeOfDay = minecraft.level.getDayTime() % 24000; + int TimeLeftSeconds; + String NextWhat; + boolean isDay = TimeOfDay < 12000; + + if(TimeOfDay < 12000) //Next sunset. + { + TimeLeftSeconds = (int)((12000-TimeOfDay) / 20); + NextWhat = "sunset"; + } + else //Next dawn. + { + TimeOfDay -= 12000; + TimeLeftSeconds = (int)((12000-TimeOfDay) / 20); + NextWhat = "dawn"; + } + + String TimeString = TimeLeftSeconds/60 + ":" + (TimeLeftSeconds%60)/10 + TimeLeftSeconds%10; + String DeathDropsString = ""; + + if(GlobalProperties.deathTimer > 0.0) + { + int DeathDropsSeconds = (int)(GlobalProperties.deathTimer / 20.0); + DeathDropsString = DeathDropsSeconds/60 + ":" + (DeathDropsSeconds%60)/10 + DeathDropsSeconds%10; + + Drawing.DrawCenteredText( + new RenderedLine(GlobalProperties.deathTimer > 0.0 ? "Death drops de-spawn: " + StringHelper.getColorFromValue(GlobalProperties.deathTimer, GlobalProperties.deathTimerMax, false) + DeathDropsString : "", DeathTimerAlpha), + window, event.getPoseStack(), 0, 8, 0xFFFFFFF, GlobalProperties.listScale, true + ); + } + + BlockPos playerBlockPos = minecraft.player.blockPosition(); + + if(GlobalProperties.measureStart != null) + { + double diffX = playerBlockPos.getX() - GlobalProperties.measureStart.getX(); + double diffY = playerBlockPos.getY() - GlobalProperties.measureStart.getY(); + double diffZ = playerBlockPos.getZ() - GlobalProperties.measureStart.getZ(); + + double dist = MathHelper.round(Math.sqrt(diffX*diffX + diffY*diffY + diffZ*diffZ), 2); + + Drawing.DrawCenteredText( + new RenderedLine("Distance: \u00A72" + dist + "m"), + window, event.getPoseStack(), 0, 8 + minecraft.font.lineHeight + 2, 0xFFFFFFF, GlobalProperties.listScale, true + ); + } + + float xpPercentage = minecraft.player.experienceProgress * 100; + + BlockPos CurrentBlock = new BlockPos(playerPos.x, playerPos.y, playerPos.z); + + int LightLevelSky = minecraft.level.getBrightness(LightLayer.SKY, CurrentBlock); + int LightLevelBlock = minecraft.level.getBrightness(LightLayer.BLOCK, CurrentBlock); + + HitResult crosshairObj = minecraft.hitResult; + + ItemStack ArmorBoots = minecraft.player.getInventory().getArmor(0); + ItemStack ArmorLeggings = minecraft.player.getInventory().getArmor(1); + ItemStack ArmorChestplate = minecraft.player.getInventory().getArmor(2); + ItemStack ArmorHelmet = minecraft.player.getInventory().getArmor(3); + + String armorDisplay = ""; + double armorPercentage = 0.0; + + armorPieces.Value = 0; + + double ArmorBootsDamage = MathHelper.damagePercentage(ArmorBoots, armorPieces); + double ArmorLegginsDamage = MathHelper.damagePercentage(ArmorLeggings, armorPieces); + double ArmorChestplateDamage = MathHelper.damagePercentage(ArmorChestplate, armorPieces); + double ArmorHelmetDamage = MathHelper.damagePercentage(ArmorHelmet, armorPieces); + + armorPercentage = ArmorBootsDamage + + ArmorLegginsDamage + + ArmorChestplateDamage + + ArmorHelmetDamage; + + armorPercentage = MathHelper.safeDivide(armorPercentage, armorPieces.Value); + + armorDisplay = "\u00A7f("; + armorDisplay = StringHelper.appendIfHasDurability(armorDisplay, ArmorHelmet, StringHelper.getColorFromValue(ArmorHelmetDamage, 100.0, true) + "H"); + armorDisplay = StringHelper.appendIfHasDurability(armorDisplay, ArmorChestplate, StringHelper.getColorFromValue(ArmorChestplateDamage, 100.0, true) + "C"); + armorDisplay = StringHelper.appendIfHasDurability(armorDisplay, ArmorLeggings, StringHelper.getColorFromValue(ArmorLegginsDamage, 100.0, true) + "L"); + armorDisplay = StringHelper.appendIfHasDurability(armorDisplay, ArmorBoots, StringHelper.getColorFromValue(ArmorBootsDamage, 100.0, true) + "B"); + armorDisplay += "\u00A7f)"; + + if(armorPieces.Value == 0) { + armorDisplay = ""; + } + + ItemStack heldItemMainHand = minecraft.player.getItemInHand(InteractionHand.MAIN_HAND); + ItemStack heldItemOffHand = minecraft.player.getItemInHand(InteractionHand.OFF_HAND); + + float directionYaw = minecraft.player.getRotationVector().y + 180.0f; + float directionDegreesYaw = Math.abs(directionYaw) % 360.0f; + float directionDegrees = (directionYaw >= 0.0f) ? directionDegreesYaw : (360.0f - directionDegreesYaw); + String direction = (int)Math.floor(directionDegrees) + ""; + + if(directionDegrees > 337.5f || directionDegrees <= 22.5f) { + direction = direction + " N"; + } + else if(directionDegrees > 22.5f && directionDegrees <= 67.5f) { + direction = direction + " NE"; + } + else if(directionDegrees > 67.5f && directionDegrees <= 112.5f) { + direction = direction + " E"; + } + else if(directionDegrees > 112.5f && directionDegrees <= 157.5f) { + direction = direction + " SE"; + } + else if(directionDegrees > 157.5f && directionDegrees <= 202.5f) { + direction = direction + " S"; + } + else if(directionDegrees > 202.5f && directionDegrees <= 247.5f) { + direction = direction + " SW"; + } + else if(directionDegrees > 247.5f && directionDegrees <= 292.5f) { + direction = direction + " W"; + } + else if(directionDegrees > 292.5f && directionDegrees <= 337.5f) { + direction = direction + " NW"; + } + + RenderedLine[] Statistics = new RenderedLine[] { + new RenderedLine("\u00A7aPlayer Statistics"), + new RenderedLine("\u00A7a--------------"), + + new RenderedLine("Direction: \u00A7a" + direction), + new RenderedLine("Status: " + StringHelper.getPlayerStatus(MathHelper.round(minecraft.player.getHealth()/20.0, 2), MathHelper.round(minecraft.player.getFoodData().getFoodLevel()/20.0, 2)), StatusAlpha), + new RenderedLine("Health: " + StringHelper.colorIntValue((int)((minecraft.player.getHealth()/2.0)*10.0), 100, false) + "%"), + new RenderedLine("Food: " + StringHelper.colorIntValue((int)((minecraft.player.getFoodData().getFoodLevel()/2.0)*10.0), 100, false) + "%"), + new RenderedLine("Air: " + StringHelper.colorAirValue((minecraft.player.getAirSupply()/3)>=0 ? (minecraft.player.getAirSupply()/3) : 0, 100, false) + "%"), + new RenderedLine(playerPos.y >= MathHelper.SeaLevel ? "MASL: \u00A7a" + MathHelper.roundWithTrail(playerPos.y - MathHelper.SeaLevel, 2) + " m" : "MBSL: \u00A7a" + MathHelper.roundWithTrail(MathHelper.SeaLevel - playerPos.y, 2) + " m"), + new RenderedLine("Xp: \u00A7a" + MathHelper.round(xpPercentage, 2) + "%"), + + new RenderedLine("Light: " + (LightLevelSky > 7 ? "\u00A7a" : "\u00A7c") + LightLevelSky + " " + (LightLevelBlock > 7 ? "\u00A7a" : "\u00A7c") + LightLevelBlock), + new RenderedLine("Speed: \u00A7a" + (GlobalProperties.doDistanceCalculations ? MathHelper.roundWithTrail(20*GlobalProperties.playerSpeed, 2) + " m/s" : "\u00A74-")), + new RenderedLine("Travelled: \u00A7a" + (GlobalProperties.doDistanceCalculations ? StringHelper.formatDistance(GlobalProperties.distanceTravelled, true, 2, false) : "\u00A74-")), + new RenderedLine("Fallen: \u00A7a" + (GlobalProperties.doDistanceCalculations ? StringHelper.formatDistance(GlobalProperties.distanceFallen, true, 2, false) : "\u00A74-")), + + new RenderedLine("Dmg taken: \u00A7b" + MathHelper.roundWithTrail(GlobalProperties.damageTaken, 1) + " hp"), + + new RenderedLine("Next " + NextWhat + ": " + StringHelper.getColorFromValue(TimeOfDay, 12000, isDay) + TimeString), + + // Be last + new RenderedLine(" "), + new RenderedLine(armorPieces.Value > 0 ? "Armor (avg.): " + StringHelper.colorDoubleValue(armorPercentage, 100.0, 2, true) + "% " + armorDisplay : ""), + new RenderedLine(heldItemMainHand != null && heldItemMainHand.getMaxDamage() > 0 ? heldItemMainHand.getHoverName().getString() + ": " + StringHelper.colorDoubleValue(((double)heldItemMainHand.getDamageValue()*100.0)/(double)heldItemMainHand.getMaxDamage(), 100, 2, true) + "%" : ""), + new RenderedLine(heldItemOffHand != null && heldItemOffHand.getMaxDamage() > 0 ? heldItemOffHand.getHoverName().getString() + ": " + StringHelper.colorDoubleValue(((double)heldItemOffHand.getDamageValue()*100.0)/(double)heldItemOffHand.getMaxDamage(), 100, 2, true) + "%" : "") + }; + Drawing.DrawTextLines(Statistics, window, event.getPoseStack(), 1, 8, height / 2, 0xFFFFFF, GlobalProperties.listScale, true); + + + int rStatIndex = 0; + RenderedLine[] rightStatistics = new RenderedLine[48]; + boolean hasToolStatistics = false; + + // Right now you may be asking yourself: + // "Why is this guy using a regular array instead of an ArrayList<>?" + // + // The answer is simple: + // Even though an ArrayList<> is much more flexible than a regular array, + // I want to ensure that this mod affects performance as little as possible. + // Thus, I sacrifice readability and flexibility in order to get a little + // (even though it is very little) performance gain. + + + // Statistics about the held item + if(GlobalProperties.AdditionalStatistics == 2 && heldItemMainHand != null && heldItemMainHand.isEnchanted() == true) + { + ListTag toolEnchantments = heldItemMainHand.getEnchantmentTags(); + if(toolEnchantments != null) + { + int enchantmentCount = toolEnchantments.size(); + + rightStatistics[rStatIndex] = new RenderedLine("\u00A7a" + heldItemMainHand.getHoverName().getString()); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine("\u00A7a------------"); rStatIndex ++; + + Item heldItem = heldItemMainHand.getItem(); + + float SwordDamage = (heldItem instanceof SwordItem) ? (3.0f + ((SwordItem)heldItem).getDamage() + 1.0f) : 0.0f; + float SwordDamageFactor = 0.0f; + int SwordDamageIndex = rStatIndex; rStatIndex ++; + rightStatistics[SwordDamageIndex] = new RenderedLine(""); + + for(int i = 0; i < enchantmentCount; i++) + { + CompoundTag enchantment = (CompoundTag)toolEnchantments.get(i); + String id = enchantment.getString("id"); + short level = enchantment.getShort("lvl"); + + if(level > 0) + { + double sweepDamage; + switch(id) + { + case "minecraft:sharpness": + if(EnchantmentCategory.WEAPON.canEnchant(heldItem) && heldItem instanceof SwordItem) + { + SwordItem Sword = (SwordItem)heldItem; + SwordDamageFactor += (level - 1.0f) * 0.5f + 1.0f; + } + break; + + case "minecraft:smite": + rightStatistics[rStatIndex] = new RenderedLine("Undead: \u00A72+" + Math.round(((SwordDamage + level * 2.5f) / SwordDamage - 1.0f) * 100.0f) + "%"); rStatIndex ++; + break; + + case "minecraft:bane_of_arthropods": + rightStatistics[rStatIndex] = new RenderedLine("Arthropods: \u00A72+" + Math.round(((SwordDamage + level * 2.5f) / SwordDamage - 1.0f) * 100.0f) + "%"); rStatIndex ++; + break; + + case "minecraft:knockback": + rightStatistics[rStatIndex] = new RenderedLine("Knockback: \u00A72+" + (level * 3)); rStatIndex ++; + break; + + case "minecraft:fire_aspect": + rightStatistics[rStatIndex] = new RenderedLine("Applied fire: \u00A72" + (level * 4) + "s"); rStatIndex ++; + break; + + case "minecraft:looting": + rightStatistics[rStatIndex] = new RenderedLine("Maximum loot: \u00A72+" + level); rStatIndex ++; + break; + + case "minecraft:sweeping_edge": + sweepDamage = 50.0D; + if (level == 2) { sweepDamage = 67.0D; } + else if (level >= 3) { sweepDamage = 75.0D; } + + rightStatistics[rStatIndex] = new RenderedLine("Sweep: \u00A72+" + Math.round(sweepDamage) + "%"); rStatIndex ++; + break; + + case "minecraft:efficiency": + rightStatistics[rStatIndex] = new RenderedLine("Mining speed: \u00A72" + Math.round(Math.pow(level, 2.0D) + 1.0D) + "x"); rStatIndex ++; + break; + + case "minecraft:unbreaking": + rightStatistics[rStatIndex] = new RenderedLine("Durability: \u00A72" + (level + 1) + "x"); rStatIndex ++; + break; + + case "minecraft:fortune": + rightStatistics[rStatIndex] = new RenderedLine("Maximum drops: \u00A72" + (level + 1) + "x"); rStatIndex ++; + break; + + case "minecraft:power": + rightStatistics[rStatIndex] = new RenderedLine("Damage: \u00A72+" + Math.round(0.25D * (level + 1) * 100.0D) + "%"); rStatIndex ++; + break; + + case "minecraft:punch": + rightStatistics[rStatIndex] = new RenderedLine("Knockback: \u00A72+" + (level * 3)); rStatIndex ++; + break; + + case "minecraft:flame": + rightStatistics[rStatIndex] = new RenderedLine("Applied fire: \u00A725s"); rStatIndex ++; + break; + } + } + } + + if(SwordDamageFactor > 0.0f) + { + SwordDamageFactor = (SwordDamage + SwordDamageFactor) / SwordDamage - 1.0f; + rightStatistics[SwordDamageIndex] = new RenderedLine("Damage: \u00A72+" + Math.round(SwordDamageFactor * 100.0f) + "%"); + } + + hasToolStatistics = true; + } + } + + // Target identification + if(GlobalProperties.AdditionalStatistics >= 1 && crosshairObj != null) + { + if(crosshairObj != null + && crosshairObj.getType() == HitResult.Type.ENTITY + && ((EntityHitResult)crosshairObj).getEntity() instanceof LivingEntity) + { + LivingEntity TargetEntity = (LivingEntity)((EntityHitResult)crosshairObj).getEntity(); + + double playX = playerPos.x; + double playY = playerPos.y; + double playZ = playerPos.z; + + Vec3 entityPos = TargetEntity.position(); + + double entX = entityPos.x; + double entY = entityPos.y; + double entZ = entityPos.z; + + double diffX = entX - playX; + double diffZ = entZ - playZ; + + double EnemyDistance = Math.sqrt(diffX*diffX + diffZ*diffZ); + + if(hasToolStatistics == true) + { + rightStatistics[rStatIndex] = new RenderedLine(" "); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine(" "); rStatIndex ++; + } + + rightStatistics[rStatIndex] = new RenderedLine("\u00A74Target"); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine("\u00A74------"); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine("Name: \u00A7b" + TargetEntity.getName().getString()); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine("Health: " + StringHelper.colorIntValue((int)((TargetEntity.getHealth()/TargetEntity.getMaxHealth())*100.0f), 100, false) + "%"); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine("Distance: \u00A7b" + StringHelper.formatDistance(EnemyDistance, true, 2, true)); rStatIndex ++; + + // Specific mob statistics + if(TargetEntity.getClass().getSimpleName().contains("Creeper")) + { + try + { + int swell = (Integer)getInstanceField(TargetEntity, "f_32270_"); + int swellMax = (Integer)getInstanceField(TargetEntity, "f_32271_"); + + double explodeTics = swellMax - swell; + String explodeSecs = MathHelper.roundWithTrail(explodeTics / 20.0, 2); + + rightStatistics[rStatIndex] = new RenderedLine("\u00A74Explodes in: \u00A7b" + explodeSecs + " s"); rStatIndex ++; + } + catch(Throwable e) {} + + // fuseTime and timeSinceIgnited don't exist anymore + /* + try + { + //fuseTime - timeSinceIgnited + double explodeTics = (Integer)getInstanceField(TargetEntity, "field_82225_f") - (Integer)getInstanceField(TargetEntity, "field_70833_d"); + String explodeSecs = MathHelper.roundWithTrail(explodeTics / 20.0, 2); + + rightStatistics[rStatIndex] = new RenderedLine("\u00A74Explodes in: \u00A7b" + explodeSecs + " s"); rStatIndex ++; + } + catch (Throwable e) {} + */ + } + else if(TargetEntity instanceof AbstractHorse) + { + AbstractHorse horseEntity = (AbstractHorse)TargetEntity; + boolean horseIsTame = horseEntity.isTamed(); + + rightStatistics[rStatIndex] = new RenderedLine("Tame: " + (horseIsTame ? "\u00A7aYes" : "\u00A7cNo")); rStatIndex ++; + + if(horseIsTame == true) { + double jumpStrength = horseEntity.getCustomJump(); + double jumpHeight = -0.1817584952D * Math.pow(jumpStrength, 3.0D) + 3.689713992D * Math.pow(jumpStrength, 2.0D) + 2.128599134D * jumpStrength - 0.343930367D; + + rightStatistics[rStatIndex] = new RenderedLine("Speed: \u00A7a" + MathHelper.round(horseEntity.getAttribute(Attributes.MOVEMENT_SPEED).getValue() * 43.1718071434983D, 2) + " m/s"); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine("Jump: \u00A7a" + MathHelper.round(jumpHeight, 2) + " m"); rStatIndex ++; + } + } + } + else if(crosshairObj != null + && crosshairObj.getType() == HitResult.Type.BLOCK) + { + BlockPos blockpos = ((BlockHitResult)crosshairObj).getBlockPos(); + if(blockpos != null) + { + BlockState blockstate = minecraft.level.getBlockState(blockpos); + Block block = blockstate.getBlock(); + if(block instanceof CropBlock) + { + CropBlock crop = (CropBlock)block; + String cropName = ""; + int cropAge = -1; + int cropMaxAge = crop.getMaxAge(); + float growthChance = -1.0f; + + try + { + cropName = ((ItemLike)getInstanceMethod(crop, "m_6404_")).asItem().getDefaultInstance().getHoverName().getString(); + } catch(Throwable e) {} + try + { + if(block.getClass().equals(CropBlock.class)) + { + cropAge = (Integer)getInstanceMethod(crop, "m_52305_", new Class[] {BlockState.class}, new Object[] {blockstate}); + } + else + { + cropAge = (Integer)getSuperInstanceMethod(crop, "m_52305_", new Class[] {BlockState.class}, new Object[] {blockstate}); + } + + } catch(Throwable e) {} + try + { + if(block.getClass().equals(CropBlock.class)) + { + growthChance = (Float)getInstanceMethod(crop, "m_52272_", new Class[] {Block.class, BlockGetter.class, BlockPos.class}, new Object[] {block, minecraft.level, blockpos}); + } + else + { + growthChance = (Float)getSuperInstanceMethod(crop, "m_52272_", new Class[] {Block.class, BlockGetter.class, BlockPos.class}, new Object[] {block, minecraft.level, blockpos}); + } + } catch(Throwable e) {} + + + if(hasToolStatistics) + { + rightStatistics[rStatIndex] = new RenderedLine(" "); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine(" "); rStatIndex ++; + } + + rightStatistics[rStatIndex] = new RenderedLine("\u00A72Crop"); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine("\u00A72----"); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine("Name: \u00A7b" + cropName); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine((cropAge >= 0 ? ("Stage: \u00A7b" + cropAge + "/" + cropMaxAge) : "")); rStatIndex ++; + rightStatistics[rStatIndex] = new RenderedLine((growthChance >= 0.0f ? ("G. chance: \u00A7b" + MathHelper.round((double)growthChance, 2) + "%") : "")); rStatIndex ++; + } + } + } + } + + if(rStatIndex > 0) + Drawing.DrawTextLines(rightStatistics, window, event.getPoseStack(), 1, 65536, height / 2, 0xFFFFFF, GlobalProperties.listScale, true); + } + } + + public static Object getInstanceField(Object instance, String fieldName) throws Throwable + { Field field = instance.getClass().getDeclaredField(fieldName); field.setAccessible(true); return field.get(instance); } - - public static Object getInstanceMethod(Object instance, String methodName) throws Throwable - { - return getInstanceMethod(instance, methodName, new Class[] {}, new Object[] {}); - } - - public static Object getInstanceMethod(Object instance, String methodName, Class[] argTypes, Object[] args) throws Throwable - { - Method method = instance.getClass().getDeclaredMethod(methodName, argTypes); - method.setAccessible(true); - return method.invoke(instance, args); + + public static Object getInstanceMethod(Object instance, String methodName) throws Throwable + { + return getInstanceMethod(instance, methodName, new Class[] {}, new Object[] {}); + } + + public static Object getInstanceMethod(Object instance, String methodName, Class[] argTypes, Object[] args) throws Throwable + { + Method method = instance.getClass().getDeclaredMethod(methodName, argTypes); + method.setAccessible(true); + return method.invoke(instance, args); } - - public static Object getSuperInstanceMethod(Object instance, String methodName, Class[] argTypes, Object[] args) throws Throwable - { - Method method = instance.getClass().getSuperclass().getDeclaredMethod(methodName, argTypes); - method.setAccessible(true); - return method.invoke(instance, args); + + public static Object getSuperInstanceMethod(Object instance, String methodName, Class[] argTypes, Object[] args) throws Throwable + { + Method method = instance.getClass().getSuperclass().getDeclaredMethod(methodName, argTypes); + method.setAccessible(true); + return method.invoke(instance, args); } } \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 7c2331a..36cbe97 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -6,7 +6,7 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[39,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion="[41,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. license="BSD 3-Clause License" @@ -29,7 +29,7 @@ displayURL="https://www.mydoomsite.com/" #optional # A file name (in the root of the mod JAR) containing a logo for display logoFile="" #optional # A text field displayed in the mod UI -credits="Created and maintained by Visual Vincent, help with ideas: Zoro, Simmmmme, Fazzew, Hazard, Swoomy." #optional +credits="Created and maintained by Visual Vincent. Help with ideas: Zoro, Simmmmme, Fazzew, Hazard, Swoomy." #optional # A text field displayed in the mod UI authors="Visual Vincent" #optional # The description text for the mod (multi line!) (#mandatory) @@ -43,7 +43,7 @@ A mod showing relevant statistics about the player and the world around them. # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="[39,)" #mandatory + versionRange="[41,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER @@ -53,6 +53,6 @@ A mod showing relevant statistics about the player and the world around them. modId="minecraft" mandatory=true # This version range declares a minimum of the current minecraft version up to but not including the next major version - versionRange="[1.18.1,1.19)" + versionRange="[1.19,1.20)" ordering="NONE" side="CLIENT" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 46913b3..ed52e90 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,8 @@ { "pack": { "description": "Player Statistics List Resources", - "pack_format": 8 + "pack_format": 9, + "forge:resource_pack_format": 9, + "forge:data_pack_format": 10 } }