1.21.11 (#94)

* 25w45a

* Update LocatorBarMixin.java

* Nautilus dash bar fix

* Default to dash bar for unknown mobs

* Rename methods too

* Improved but default-disabled mount jump/dash text

* Bump deps

* Breath of the Nautilus

* Fixes

Fixed diamond and netherite horse/nautilus armor being considered the same.

Author: Madis0

README.md

@@ -66,6 +66,7 @@ The mod only uses client-side data, so it is never needed on a server. There are
 | Totem of Undying |  |  | +ቶ1 | +tu1 | Opt-in, shows the amount of Totem of Undyings in your inventory; crossed out when not held in main/offhand. |
 | Fire resistance |  |  | -~🔥1×~ | -~bu1×~ | Number is a rough damage multiplier (1× - burning, 2× - in fire, 3× - in soul fire, 4× - in lava), only shown if you are on fire |
 | Water Breathing, Conduit Power | Blue | █ | -~⭘1~ | -~ai1~ | The bar is only shown if you got the effect after losing air, text is only shown if you are in water |
+| Breath of the Nautilus | Blue | █ | -⭘1⏸️ | -ap1 | The bar is only shown if you got the effect after losing air, text is only shown if you are in water, text is crossed if combined with water breathing-like effect. |
 | Held food restored hunger: exact/less | Green | █ | _→1_ | _→1_ | Overlaid on hunger bar; number is the resulting hunger (like AppleSkin) | 
 | Held food restored hunger: wasted | Orange | █ | _→-1_ | _→-1_ | Overlaid on hunger bar; number is the waste of hunger (how much more than needed) | 
 | Saturation | Orange | ▁ |  | Below OneBar | Opt-in |

gradle.properties

@@ -7,18 +7,17 @@ org.gradle.configuration-cache=false
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop/
-	minecraft_version=1.21.10
-	yarn_mappings=1.21.10+build.2
-	loader_version=0.17.3
+	minecraft_version=1.21.11
+	loader_version=0.18.2
 	loom_version=1.13-SNAPSHOT
 
 # Mod Properties
-	mod_version = 5.1.3
+	mod_version = 5.2.0
 	maven_group = io.github.madis0
 	archives_base_name = onebar
 
 # Dependencies
-	fabric_api_version=0.138.0+1.21.10
-	modmenu_version=16.0.0-rc.1
-	cloth_config_version=20.0.149
+	fabric_api_version=0.139.5+1.21.11
+	modmenu_version=17.0.0-alpha.1
+	cloth_config_version=21.11.151
 	exordium_version=1.2.1-1.20.2

src/main/java/io/github/madis0/Calculations.java

@@ -95,12 +95,39 @@ public static String emojiOrText(String emojiPhrase, String textPhrase, boolean
 
     /**
      * Converts horse's jump strength to jump height, may not be 100% accurate
-     * <a href="https://github.com/d4rkm0nkey/HorseStatsVanilla/blob/main/src/main/java/monkey/lumpy/horse/stats/vanilla/util/Converter.java">Source</a>
+     * <a href="https://github.com/d4rkm0nkey/HorseStatsVanilla/blob/main/src/client/java/monkey/lumpy/horse/stats/vanilla/util/Converter.java">Source</a>
      * @param strength Horse jump strength
      * @return Jump height in blocks
      */
-    public static double horseJumpStrengthToJumpHeight(double strength) {
-        return -0.1817584952 * strength * strength * strength + 3.689713992 * strength * strength + 2.128599134 * strength - 0.343930367;
+    public static double getJumpHeight(double strength) {
+        double height = 0;
+        double velocity = strength;
+        while(velocity > 0) {
+            height += velocity;
+            velocity = (velocity - .08) * .98 * .98;
+        }
+        return height;
+    }
+
+    public static double getDashDistance(float strength) {
+        // Minecraft gravity constant (approximately)
+        final double gravity = 0.08; // Blocks/tick^2
+        final double jumpVelocityOneBlock = Math.sqrt(2 * gravity * 1); // Velocity needed to reach 1 block high
+
+        // Default values for movement speed and velocity multiplier
+        final double defaultMovementSpeed = 0.12; // Adjusted for the camel's movement speed
+        final double defaultVelocityMultiplier = 1.0; // Neutral velocity multiplier
+
+        // Horizontal velocity calculation with adjusted factor
+        double horizontalVelocity = 11.1111F * strength * defaultMovementSpeed * defaultVelocityMultiplier;
+
+        // Time in the air (based on jumping 1 block high)
+        double initialVerticalVelocity = jumpVelocityOneBlock * strength;
+        double timeUp = initialVerticalVelocity / gravity; // Time to reach the peak
+        double totalTimeInAir = timeUp * 2;
+
+        // Horizontal distance = horizontal velocity * total time in air
+        return horizontalVelocity * totalTimeInAir;
     }
 
     /**

src/main/java/io/github/madis0/ClientProperties.java

@@ -23,15 +23,15 @@ public class ClientProperties {
     public int xpStartH;
     public final int xpEndH;
 
-    public final int horseJumpStartW;
-    public final int horseJumpEndW;
-    public final int horseJumpStartH;
-    public final int horseJumpEndH;
-
-    public final int camelJumpStartW;
-    public final int camelJumpEndW;
-    public final int camelJumpStartH;
-    public final int camelJumpEndH;
+    public final int jumpStartW;
+    public final int jumpEndW;
+    public final int jumpStartH;
+    public final int jumpEndH;
+
+    public final int dashStartW;
+    public final int dashEndW;
+    public final int dashStartH;
+    public final int dashEndH;
     public final int mountStartH;
     public final int mountEndH;
 
@@ -106,15 +106,15 @@ else if(hasHotbarLocatorBar){
         xpEndW = xpStartW + 18;
         xpEndH = xpStartH + 1;
 
-        horseJumpStartW = (scaledWidth / 2) - 7;
-        horseJumpStartH = (scaledHeight / 2) + 15;
-        horseJumpEndW = horseJumpStartW + 13;
-        horseJumpEndH = horseJumpStartH + 50;
+        jumpStartW = (scaledWidth / 2) - 7;
+        jumpStartH = (scaledHeight / 2) + 15;
+        jumpEndW = jumpStartW + 13;
+        jumpEndH = jumpStartH + 50;
 
-        camelJumpStartW = baseStartW + 65;
-        camelJumpEndW = camelJumpStartW + 50;
-        camelJumpStartH = horseJumpStartH;
-        camelJumpEndH = camelJumpStartH + 7;
+        dashStartW = baseStartW + 65;
+        dashEndW = dashStartW + 50;
+        dashStartH = jumpStartH;
+        dashEndH = dashStartH + 7;
 
         mountStartH = baseStartH - 12;
         mountEndH = mountStartH + 9;
@@ -148,10 +148,10 @@ public int baseRelativeStartW(float value, float total){
         return baseRelativeStartW(Calculations.getPreciseInt(value), Calculations.getPreciseInt(total));
     }
 
-    public int camelRelativeEndW(int value, int total){
-        return Calculations.relativeW(camelJumpStartW, camelJumpEndW, value, total);
+    public int dashRelativeEndW(int value, int total){
+        return Calculations.relativeW(dashStartW, dashEndW, value, total);
     }
-    public int camelRelativeEndW(long value, long total){
-        return camelRelativeEndW(Calculations.getPreciseInt(value), Calculations.getPreciseInt(total));
+    public int dashRelativeEndW(long value, long total){
+        return dashRelativeEndW(Calculations.getPreciseInt(value), Calculations.getPreciseInt(total));
     }
 }

src/main/java/io/github/madis0/ModConfig.java

@@ -122,7 +122,7 @@ public static class Entity {
         @ConfigEntry.Gui.Tooltip
         public boolean showMountJump = true;
         @ConfigEntry.Gui.Tooltip
-        public boolean showMountJumpText = true;
+        public boolean showMountJumpText = false;
         @ConfigEntry.ColorPicker(allowAlpha = true)
         public int jumpColor = 0xFF795548;
         @ConfigEntry.Gui.Tooltip

src/main/java/io/github/madis0/ModMenuIntegration.java

@@ -9,4 +9,4 @@ public class ModMenuIntegration implements ModMenuApi {
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
         return parent -> AutoConfig.getConfigScreen(ModConfig.class, parent).get();
     }
-}
+}

src/main/java/io/github/madis0/OneBar.java

@@ -9,7 +9,7 @@
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 public class OneBar implements ClientModInitializer {
     static KeyMapping.Category ONEBAR_MAIN;
@@ -25,7 +25,7 @@ public void onInitializeClient() {
 
 		ModConfig config = AutoConfig.getConfigHolder(ModConfig.class).getConfig();
 
-        ONEBAR_MAIN = KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath("onebar", "main"));
+        ONEBAR_MAIN = KeyMapping.Category.register(Identifier.fromNamespaceAndPath("onebar", "main"));
 
 		KeyMapping showOneBar = registerKeybind("text.autoconfig.onebar.option.showOneBar");
 		KeyMapping healthEstimates = registerKeybind("text.autoconfig.onebar.option.healthEstimates");

src/main/java/io/github/madis0/OneBarElements.java

@@ -16,6 +16,7 @@
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.entity.animal.camel.Camel;
+import net.minecraft.world.entity.animal.equine.AbstractHorse;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -351,10 +352,14 @@ private void barText(){
 
             if(playerProperties.isWardenNear && config.badThings.showWarden)
                 value += minus + Calculations.emojiOrText("text.onebar.wardenEmoji","text.onebar.warden",false, Calculations.makeFraction(playerProperties.wardenDanger, false));
-            if (playerProperties.isUnderwater && !playerProperties.hasWaterBreathing)
+            if (playerProperties.isUnderwater && !playerProperties.hasWaterBreathing && !playerProperties.hasWaterPause)
                 value += minus + Calculations.emojiOrText("text.onebar.airEmoji", "text.onebar.air", false, Calculations.makeFraction(playerProperties.air, false));
-            if (playerProperties.isUnderwater && playerProperties.hasWaterBreathing)
+            if (playerProperties.isUnderwater && playerProperties.hasWaterBreathing && !playerProperties.hasWaterPause)
                 value += minus + para + "m" + Calculations.emojiOrText("text.onebar.airEmoji","text.onebar.air", false, Calculations.makeFraction(playerProperties.air, false)) + para + "r";
+            if (playerProperties.isUnderwater && !playerProperties.hasWaterBreathing && playerProperties.hasWaterPause)
+                value += minus + Calculations.emojiOrText("text.onebar.airPauseEmoji","text.onebar.airPause", false, Calculations.makeFraction(playerProperties.air, false));
+            if (playerProperties.isUnderwater && playerProperties.hasWaterBreathing && playerProperties.hasWaterPause)
+                value += minus + para + "m" + Calculations.emojiOrText("text.onebar.airPauseEmoji","text.onebar.airPause", false, Calculations.makeFraction(playerProperties.air, false)) + para + "r";
             if (playerProperties.isFreezing)
                 value += minus + Calculations.emojiOrText("text.onebar.freezeEmoji", "text.onebar.freeze", false, Calculations.makeFraction(playerProperties.freeze, false));
             if (playerProperties.isBurning && !playerProperties.hasFireResistance && config.badThings.showFire)
@@ -475,65 +480,74 @@ public void mountJumpBar() {
         var entity = client.player.getControlledVehicle();
         if (entity == null) return;
 
-        if (entity instanceof Camel) {
-            camelJumpBar();
-        } else {
-            horseJumpBar(); // Horse or modded entity
+        if (entity instanceof AbstractHorse && !(entity instanceof Camel)) {
+            jumpBar();
+        } else { // Camel, Nautilus, modded mobs
+            dashBar();
         }
     }
 
-    public void horseJumpBar(){
+    public void jumpBar(){
         if (client.player == null || client.player.jumpableVehicle() == null) return;
 
         int barHeight = Calculations.getPreciseInt(1.0F);
         int jumpHeight = Calculations.getPreciseInt(client.player.getJumpRidingScale());
 
         double heightInBlocks = Math.max(0, client.player.getJumpRidingScale() *
-                                                Calculations.horseJumpStrengthToJumpHeight(client.player.getJumpRidingScale()));
+                                                Calculations.getJumpHeight(client.player.getJumpRidingScale()));
 
         String roundedHeightInBlocks = Calculations.getSubscriptNumber(Double.parseDouble(String.format(Locale.US, "%,.1f",(heightInBlocks))));
 
-        int relativeStartH = Calculations.relativeW(clientProperties.horseJumpEndH, clientProperties.horseJumpStartH, jumpHeight, barHeight);
-        renderBar(clientProperties.horseJumpStartW, clientProperties.horseJumpStartH, clientProperties.horseJumpEndW, clientProperties.horseJumpEndH, config.backgroundColor);
-        renderBar(clientProperties.horseJumpStartW, relativeStartH, clientProperties.horseJumpEndW, clientProperties.horseJumpEndH, config.entity.jumpColor);
+        int relativeStartH = Calculations.relativeW(clientProperties.jumpEndH, clientProperties.jumpStartH, jumpHeight, barHeight);
+        renderBar(clientProperties.jumpStartW, clientProperties.jumpStartH, clientProperties.jumpEndW, clientProperties.jumpEndH, config.backgroundColor);
+        renderBar(clientProperties.jumpStartW, relativeStartH, clientProperties.jumpEndW, clientProperties.jumpEndH, config.entity.jumpColor);
 
-        int textX = clientProperties.horseJumpEndW - client.font.width(roundedHeightInBlocks);
-        int textY = clientProperties.horseJumpEndH - 10;
+        int textX = clientProperties.jumpEndW - client.font.width(roundedHeightInBlocks);
+        int textY = clientProperties.jumpEndH - 10;
 
         if(config.textSettings.showText && config.entity.showMountJumpText)
             drawContext.drawString(textRenderer, roundedHeightInBlocks, textX, textY, config.textSettings.textColor, false);
     }
 
-    public void camelJumpBar(){
+    public void dashBar(){
         if (client.player == null || client.player.jumpableVehicle() == null) return;
 
         int jumpStrength = Calculations.getPreciseInt(Math.max(client.player.getJumpRidingScale(), 0)); //TODO: strength can be negative???
         int maxStrength = Calculations.getPreciseInt(1.0F);
-        int cooldown = client.player.jumpableVehicle().getJumpCooldown();
+        int cooldown = Objects.requireNonNull(client.player.jumpableVehicle()).getJumpCooldown();
         int maxCooldown = 50;
         int cooldownVisible = cooldown / 20;
 
-        int relativeEndW = clientProperties.camelRelativeEndW(jumpStrength, maxStrength);
-        int relativeEndWCooldown = clientProperties.camelRelativeEndW(cooldown, maxCooldown);
+        double distanceInBlocks = Math.max(0, Calculations.getDashDistance(client.player.getJumpRidingScale()));
+
+        int relativeEndW = clientProperties.dashRelativeEndW(jumpStrength, maxStrength);
+        int relativeEndWCooldown = clientProperties.dashRelativeEndW(cooldown, maxCooldown);
 
         if(relativeEndWCooldown > relativeEndW){
-            camelCooldownBar(relativeEndWCooldown, cooldownVisible);
+            dashCooldownBar(relativeEndWCooldown, cooldownVisible);
         }
         else {
-            renderBar(clientProperties.camelJumpStartW, clientProperties.camelJumpStartH, clientProperties.camelJumpEndW, clientProperties.camelJumpEndH, config.backgroundColor);
-            renderBar(clientProperties.camelJumpStartW, clientProperties.camelJumpStartH, relativeEndW, clientProperties.camelJumpEndH, config.entity.jumpColor);
+            renderBar(clientProperties.dashStartW, clientProperties.dashStartH, clientProperties.dashEndW, clientProperties.dashEndH, config.backgroundColor);
+            renderBar(clientProperties.dashStartW, clientProperties.dashStartH, relativeEndW, clientProperties.dashEndH, config.entity.jumpColor);
+
+            if(config.textSettings.showText && config.entity.showMountJumpText){
+                String roundedDistanceInBlocks = Calculations.getSubscriptNumber(Double.parseDouble(String.format(Locale.US, "%,.1f",(distanceInBlocks))));
+                int textX = clientProperties.dashEndW - client.font.width(roundedDistanceInBlocks);
+                int textY = clientProperties.dashEndH - 9;
+                drawContext.drawString(textRenderer, roundedDistanceInBlocks, textX, textY, config.textSettings.textColor, false);
+            }
         }
     }
 
-    private void camelCooldownBar(int relativeEndW, int cooldownTimer){
+    private void dashCooldownBar(int relativeEndW, int cooldownTimer){
         if(config.entity.showMountCooldown){
-            renderBar(clientProperties.camelJumpStartW, clientProperties.camelJumpStartH, clientProperties.camelJumpEndW, clientProperties.camelJumpEndH, config.backgroundColor);
-            renderBar(clientProperties.camelJumpStartW, clientProperties.camelJumpStartH, relativeEndW, clientProperties.camelJumpEndH, config.entity.cooldownColor);
+            renderBar(clientProperties.dashStartW, clientProperties.dashStartH, clientProperties.dashEndW, clientProperties.dashEndH, config.backgroundColor);
+            renderBar(clientProperties.dashStartW, clientProperties.dashStartH, relativeEndW, clientProperties.dashEndH, config.entity.cooldownColor);
 
             if(config.textSettings.showText && config.entity.showMountCooldownText){
                 String text = Calculations.getSubscriptNumber(-1 - cooldownTimer);
-                int textX = clientProperties.camelJumpEndW - client.font.width(text);
-                int textY = clientProperties.camelJumpEndH - 9;
+                int textX = clientProperties.dashEndW - client.font.width(text);
+                int textY = clientProperties.dashEndH - 9;
                 drawContext.drawString(textRenderer, text, textX, textY, config.textSettings.textColor, false);
             }
         }
@@ -558,16 +572,16 @@ public void mountBar(LivingEntity mountEntity){
         float mountRawHealth = mountEntity.getHealth();
         float mountMaxHealth = mountEntity.getMaxHealth();
         int health = (int) Math.ceil(mountRawHealth);
-        int horseArmor = mountEntity.getArmorValue();
-        int horseMaxArmor = getProtectionFromArmor(new ItemStack((Items.DIAMOND_HORSE_ARMOR)));
+        int mountArmor = mountEntity.getArmorValue();
+        int mountMaxArmor = getProtectionFromArmor(new ItemStack((Items.NETHERITE_HORSE_ARMOR)));
 
         String value = Calculations.emojiOrText("text.onebar.mountHealthEmoji","text.onebar.mountHealth", true, config.textSettings.rawHealth ? (Math.round(mountRawHealth * 100.0) / 100.0) : Calculations.makeFraction(health, false));
         int textX = clientProperties.baseEndW - client.font.width(value);
         int textY = clientProperties.mountStartH + 1;
 
         renderBar(clientProperties.baseStartW, clientProperties.mountStartH, clientProperties.baseEndW, clientProperties.mountEndH, config.backgroundColor);
         renderBar(clientProperties.baseStartW, clientProperties.mountStartH, clientProperties.baseRelativeEndW(Calculations.getPreciseInt(mountRawHealth), Calculations.getPreciseInt(mountMaxHealth)), clientProperties.mountEndH, config.entity.healthColor);
-        if(config.armor.showArmorBar) renderBar(clientProperties.baseStartW, clientProperties.mountStartH - 1, clientProperties.baseRelativeEndW(horseArmor, horseMaxArmor), clientProperties.mountStartH, config.armor.armorColor);
+        if(config.armor.showArmorBar) renderBar(clientProperties.baseStartW, clientProperties.mountStartH - 1, clientProperties.baseRelativeEndW(mountArmor, mountMaxArmor), clientProperties.mountStartH, config.armor.armorColor);
         if(config.textSettings.showText) drawContext.drawString(textRenderer, value, textX, textY, config.textSettings.textColor, false);
 
         if(mountEntity instanceof Camel){
@@ -576,7 +590,7 @@ public void mountBar(LivingEntity mountEntity){
             int standingUpTimerVisible = Math.round((standingUpMax - standingUpTimer) / (float)20);
 
             if(((Camel)mountEntity).isInPoseTransition()){
-                camelCooldownBar(clientProperties.camelRelativeEndW(standingUpMax - standingUpTimer, standingUpMax), standingUpTimerVisible);
+                dashCooldownBar(clientProperties.dashRelativeEndW(standingUpMax - standingUpTimer, standingUpMax), standingUpTimerVisible);
             }
         }