diff --git a/build.gradle b/build.gradle index d8efb67..3bfd494 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ import com.modrinth.minotaur.dependencies.VersionDependency plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' id 'maven-publish' id "com.modrinth.minotaur" version "2.+" } @@ -82,5 +82,8 @@ modrinth { uploadFile = remapJar gameVersions = ["${project.minecraft_version}"] loaders = ["fabric"] - dependencies = [new VersionDependency("p0LjncVW", "embedded")] + dependencies = [ + new VersionDependency("Atr5M7ky", "embedded"), + new VersionDependency("Pz1hLqTB", "required") + ] } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f99167e..04aab41 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,13 @@ org.gradle.jvmargs=-Xmx1G -minecraft_version=1.19.2 -yarn_mappings=1.19.2+build.28 -loader_version=0.14.10 +minecraft_version=1.19.4 +yarn_mappings=1.19.4+build.1 +loader_version=0.14.19 -mod_version = 1.1.0 +mod_version = 1.2.0 maven_group = com.github.clevernucleus archives_base_name = exhud -fabric_version=0.66.0+1.19.2 -midnightlib_version=1.0.0-fabric -modmenu_version=4.1.0 \ No newline at end of file +fabric_version=0.76.0+1.19.4 +midnightlib_version=1.2.1-fabric +modmenu_version=6.1.0-rc.4 \ No newline at end of file diff --git a/src/main/java/com/github/clevernucleus/exhud/mixin/InGameHudMixin.java b/src/main/java/com/github/clevernucleus/exhud/mixin/InGameHudMixin.java index cddc6bb..57c473a 100644 --- a/src/main/java/com/github/clevernucleus/exhud/mixin/InGameHudMixin.java +++ b/src/main/java/com/github/clevernucleus/exhud/mixin/InGameHudMixin.java @@ -16,6 +16,7 @@ import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.hud.InGameHud; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.JumpingMount; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.player.HungerManager; @@ -80,17 +81,19 @@ private void exhud_renderMountHealth(MatrixStack matrices, CallbackInfo ci) { } // Removes vanilla mount jump bar and renders our own. - @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/InGameHud;renderMountJumpBar(Lnet/minecraft/client/util/math/MatrixStack;I)V")) - private void exhud_renderMountJumpBar(InGameHud inGameHud, MatrixStack matrices, int x) { + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/InGameHud;renderMountJumpBar(Lnet/minecraft/entity/JumpingMount;Lnet/minecraft/client/util/math/MatrixStack;I)V")) + private void exhud_renderMountJumpBar(InGameHud inGameHud, JumpingMount jumpingMount, MatrixStack matrices, int x) { RenderSystem.setShaderTexture(0, ExHUD.GUI_LEVEL_BARS); float f = this.client.player.getMountJumpStrength(); int j = (int)(f * 183.0F); - DrawableHelper.drawTexture(matrices, x, this.scaledHeight - 27, 0, 6, 182, 3, 256, 16); + DrawableHelper.drawTexture(matrices, x, this.scaledHeight - 27, 0, 9, 182, 3, 256, 16); - if(j > 0) { - DrawableHelper.drawTexture(matrices, x, this.scaledHeight - 27, 0, 9, j, 3, 256, 16); + if(jumpingMount.getJumpCooldown() > 0) { + DrawableHelper.drawTexture(matrices, x, this.scaledHeight - 27, 0, 6, 182, 3, 256, 16); + } else if(j > 0) { + DrawableHelper.drawTexture(matrices, x, this.scaledHeight - 27, 0, 12, j, 3, 256, 16); } } diff --git a/src/main/resources/assets/exhud/textures/gui/level_bars.png b/src/main/resources/assets/exhud/textures/gui/level_bars.png index 726b3e3..20ec098 100644 Binary files a/src/main/resources/assets/exhud/textures/gui/level_bars.png and b/src/main/resources/assets/exhud/textures/gui/level_bars.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7e22345..061bf37 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,8 +26,9 @@ "exhud.mixins.json" ], "depends": { - "fabricloader": ">=0.14.10", - "minecraft": "1.19.2", + "fabricloader": ">=0.14.19", + "minecraft": "1.19.4", + "fabric-api": ">=0.76.0", "java": ">=17" } } \ No newline at end of file