From f19b0aa69dae88a7e6d2e2c25d73343dc297c6b9 Mon Sep 17 00:00:00 2001 From: moehreag Date: Wed, 21 Jun 2023 22:29:48 +0200 Subject: [PATCH 1/3] update to 1.20.1 - update dependencies - DarkKore version is local since it's not yet published yet.. This is going to be changed before a release. --- build.gradle | 7 +- gradle.properties | 10 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../kronhud/gui/AbstractHudEntry.java | 19 +++--- .../darkkronicle/kronhud/gui/HudManager.java | 10 +-- .../kronhud/gui/component/HudEntry.java | 7 +- .../kronhud/gui/entry/BoxHudEntry.java | 33 ++++----- .../kronhud/gui/entry/SimpleTextHudEntry.java | 9 +-- .../kronhud/gui/hud/CompassHud.java | 27 ++++---- .../kronhud/gui/hud/CoordsHud.java | 68 +++++++++---------- .../kronhud/gui/hud/KeystrokeHud.java | 54 +++++++-------- .../kronhud/gui/hud/PlayerHud.java | 5 +- .../kronhud/gui/hud/PotionsHud.java | 25 +++---- .../kronhud/gui/hud/item/ArmorHud.java | 33 +++++---- .../kronhud/gui/hud/item/ArrowHud.java | 22 +++--- .../kronhud/gui/hud/item/ItemUpdateHud.java | 41 +++++------ .../kronhud/gui/hud/simple/GameTimeHud.java | 29 +++----- .../kronhud/gui/hud/vanilla/ActionBarHud.java | 33 ++++----- .../kronhud/gui/hud/vanilla/BossBarHud.java | 31 ++++----- .../kronhud/gui/hud/vanilla/CrosshairHud.java | 47 +++++++------ .../gui/hud/vanilla/ScoreboardHud.java | 56 ++++++--------- .../kronhud/gui/screen/HudEditScreen.java | 17 ++--- .../kronhud/gui/screen/HudEntryComponent.java | 4 -- .../kronhud/mixins/MixinBossBarHud.java | 3 +- .../kronhud/mixins/MixinInGameHud.java | 16 ++--- .../darkkronicle/kronhud/util/DrawUtil.java | 30 ++++---- .../darkkronicle/kronhud/util/ItemUtil.java | 59 ++-------------- .../kronhud/util/SnappingHelper.java | 16 ++--- .../resources/assets/kronhud/lang/en_us.json | 2 +- 29 files changed, 315 insertions(+), 400 deletions(-) diff --git a/build.gradle b/build.gradle index 05daa68..e6aa964 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { - id "fabric-loom" version "1.0-SNAPSHOT" + id "fabric-loom" version "1.2-SNAPSHOT" id "maven-publish" - id "io.freefair.lombok" version "6.1.0-m2" + id "io.freefair.lombok" version "8.0.1" } apply from: 'https://raw.githubusercontent.com/DarkKronicle/GradleScripts/main/gradle/publish.gradle' @@ -43,7 +43,8 @@ dependencies { // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. - modImplementation "com.github.DarkKronicle:DarkKore:${project.darkkore_version}" + //modImplementation "com.github.DarkKronicle:DarkKore:${project.darkkore_version}" // 1.20.1 version not yet published + modCompileOnly files("run/DarkKore-0.3.5-1.20.1.jar") modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" diff --git a/gradle.properties b/gradle.properties index 2ea445a..c166046 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,18 +2,18 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/versions.html -minecraft_version=1.19.4 -yarn_mappings=1.19.4+build.1 -loader_version=0.14.9 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.1 +loader_version=0.14.21 # Mod Properties mod_version=2.2.6 maven_group=io.github.darkkronicle archives_base_name=KronHUD # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_version=0.76.0+1.19.4 +fabric_version=0.84.0+1.20.1 darkkore_version=ab012735d8 -modmenu_version=6.1.0-rc.4 +modmenu_version=7.1.0 # Uploading data curseforge_slug=kronhud diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..fae0804 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.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/AbstractHudEntry.java b/src/main/java/io/github/darkkronicle/kronhud/gui/AbstractHudEntry.java index 39c748d..3cc58a3 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/AbstractHudEntry.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/AbstractHudEntry.java @@ -2,7 +2,10 @@ import io.github.darkkronicle.darkkore.config.options.Option; import io.github.darkkronicle.darkkore.gui.Tab; -import io.github.darkkronicle.kronhud.config.*; +import io.github.darkkronicle.kronhud.config.DefaultOptions; +import io.github.darkkronicle.kronhud.config.KronBoolean; +import io.github.darkkronicle.kronhud.config.KronConfig; +import io.github.darkkronicle.kronhud.config.KronDouble; import io.github.darkkronicle.kronhud.gui.component.HudEntry; import io.github.darkkronicle.kronhud.util.ColorUtil; import io.github.darkkronicle.kronhud.util.DrawPosition; @@ -11,7 +14,7 @@ import lombok.Getter; import lombok.Setter; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.util.math.MathHelper; import java.util.ArrayList; @@ -54,13 +57,13 @@ public static float intToFloat(int current, int max, int offset) { public void init() {} - public void renderPlaceholderBackground(MatrixStack matrices) { + public void renderPlaceholderBackground(DrawContext context) { if (hovered) { - fillRect(matrices, getTrueBounds(), ColorUtil.SELECTOR_BLUE.withAlpha(100)); + fillRect(context, getTrueBounds(), ColorUtil.SELECTOR_BLUE.withAlpha(100)); } else { - fillRect(matrices, getTrueBounds(), ColorUtil.WHITE.withAlpha(50)); + fillRect(context, getTrueBounds(), ColorUtil.WHITE.withAlpha(50)); } - outlineRect(matrices, getTrueBounds(), ColorUtil.BLACK); + outlineRect(context, getTrueBounds(), ColorUtil.BLACK); } public int getRawX() { @@ -101,9 +104,9 @@ public float getScale() { return scale.getValue().floatValue(); } - public void scale(MatrixStack matrices) { + public void scale(DrawContext context) { float scale = getScale(); - matrices.scale(scale, scale, 1); + context.getMatrices().scale(scale, scale, 1); } @Override diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/HudManager.java b/src/main/java/io/github/darkkronicle/kronhud/gui/HudManager.java index cb9e19a..f75a2ae 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/HudManager.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/HudManager.java @@ -7,7 +7,7 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.util.Identifier; import java.util.*; @@ -72,20 +72,20 @@ public HudEntry get(Identifier identifier) { return entries.get(identifier); } - public void render(MatrixStack matrices, float delta) { + public void render(DrawContext context, float delta) { if (!(client.currentScreen instanceof HudEditScreen) && !client.options.debugEnabled) { for (HudEntry hud : getEntries()) { if (hud.isEnabled()) { - hud.render(matrices, delta); + hud.render(context, delta); } } } } - public void renderPlaceholder(MatrixStack matrices, float delta) { + public void renderPlaceholder(DrawContext context, float delta) { for (HudEntry hud : getEntries()) { if (hud.isEnabled()) { - hud.renderPlaceholder(matrices, delta); + hud.renderPlaceholder(context, delta); } } } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/component/HudEntry.java b/src/main/java/io/github/darkkronicle/kronhud/gui/component/HudEntry.java index 3844992..7519299 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/component/HudEntry.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/component/HudEntry.java @@ -1,7 +1,6 @@ package io.github.darkkronicle.kronhud.gui.component; -import io.github.darkkronicle.kronhud.util.DrawPosition; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; public interface HudEntry extends Identifiable, Configurable, Positionable { @@ -25,9 +24,9 @@ default double getDefaultY() { return 0; } - void render(MatrixStack matrices, float delta); + void render(DrawContext context, float delta); - void renderPlaceholder(MatrixStack matrices, float delta); + void renderPlaceholder(DrawContext context, float delta); void setHovered(boolean hovered); diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/entry/BoxHudEntry.java b/src/main/java/io/github/darkkronicle/kronhud/gui/entry/BoxHudEntry.java index 53b6f39..8bcd6ae 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/entry/BoxHudEntry.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/entry/BoxHudEntry.java @@ -6,6 +6,7 @@ import io.github.darkkronicle.kronhud.config.KronExtendedColor; import io.github.darkkronicle.kronhud.gui.AbstractHudEntry; import io.github.darkkronicle.kronhud.util.ColorUtil; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import java.util.List; @@ -44,35 +45,35 @@ public List> getConfigurationOptions() { } @Override - public void render(MatrixStack matrices, float delta) { - matrices.push(); - scale(matrices); + public void render(DrawContext context, float delta) { + context.getMatrices().push(); + scale(context); if (backgroundAllowed) { if (background.getValue() && backgroundColor.getValue().alpha() > 0) { - fillRect(matrices, getBounds(), backgroundColor.getValue()); + fillRect(context, getBounds(), backgroundColor.getValue()); } if (outline.getValue() && outlineColor.getValue().alpha() > 0) { - outlineRect(matrices, getBounds(), outlineColor.getValue()); + outlineRect(context, getBounds(), outlineColor.getValue()); } } - renderComponent(matrices, delta); - matrices.pop(); + renderComponent(context, delta); + context.getMatrices().pop(); } - public abstract void renderComponent(MatrixStack matrices, float delta); + public abstract void renderComponent(DrawContext context, float delta); @Override - public void renderPlaceholder(MatrixStack matrices, float delta) { - matrices.push(); - renderPlaceholderBackground(matrices); - outlineRect(matrices, getTrueBounds(), ColorUtil.BLACK); - scale(matrices); - renderPlaceholderComponent(matrices, delta); - matrices.pop(); + public void renderPlaceholder(DrawContext context, float delta) { + context.getMatrices().push(); + renderPlaceholderBackground(context); + outlineRect(context, getTrueBounds(), ColorUtil.BLACK); + scale(context); + renderPlaceholderComponent(context, delta); + context.getMatrices().pop(); hovered = false; } - public abstract void renderPlaceholderComponent(MatrixStack matrices, float delta); + public abstract void renderPlaceholderComponent(DrawContext context, float delta); @Override public boolean movable() { diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/entry/SimpleTextHudEntry.java b/src/main/java/io/github/darkkronicle/kronhud/gui/entry/SimpleTextHudEntry.java index 0444bea..df118ab 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/entry/SimpleTextHudEntry.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/entry/SimpleTextHudEntry.java @@ -10,6 +10,7 @@ import io.github.darkkronicle.kronhud.gui.layout.AnchorPoint; import io.github.darkkronicle.kronhud.gui.layout.Justification; import io.github.darkkronicle.kronhud.util.DrawPosition; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; @@ -38,7 +39,7 @@ protected SimpleTextHudEntry(int width, int height, boolean backgroundAllowed) { } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); DrawPosition pos = getPos(); @@ -58,7 +59,7 @@ public void renderComponent(MatrixStack matrices, float delta) { onBoundsUpdate(); } drawString( - matrices, client.textRenderer, Text.literal(value), + context, client.textRenderer, Text.literal(value), pos.x() + justification.getValue().getXOffset(valueWidth, getWidth() - 4) + 2, pos.y() + (Math.round((float) getHeight() / 2)) - 4, getTextColor().color(), shadow.getValue() @@ -71,11 +72,11 @@ public Color getTextColor() { } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { + public void renderPlaceholderComponent(DrawContext context, float delta) { DrawPosition pos = getPos(); String value = getPlaceholder(); drawString( - matrices, client.textRenderer, Text.literal(value), + context, client.textRenderer, Text.literal(value), pos.x() + justification.getValue().getXOffset(value, getWidth() - 4) + 2, pos.y() + (Math.round((float) getHeight() / 2)) - 4, textColor.getValue().color(), shadow.getValue() diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/CompassHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/CompassHud.java index 7fd51db..7df5c6d 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/CompassHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/CompassHud.java @@ -12,6 +12,7 @@ import io.github.darkkronicle.kronhud.gui.layout.AnchorPoint; import io.github.darkkronicle.kronhud.util.DrawPosition; import io.github.darkkronicle.kronhud.util.DrawUtil; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -48,16 +49,16 @@ public Identifier getId() { } @Override - public void renderComponent(MatrixStack matrices, float delta) { - renderCompass(matrices, delta); + public void renderComponent(DrawContext context, float delta) { + renderCompass(context, delta); } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { - renderCompass(matrices, delta); + public void renderPlaceholderComponent(DrawContext context, float delta) { + renderCompass(context, delta); } - public void renderCompass(MatrixStack matrices, float delta) { + public void renderCompass(DrawContext context, float delta) { // N = 0 // E = 90 // S = 180 @@ -79,10 +80,10 @@ public void renderCompass(MatrixStack matrices, float delta) { DrawPosition pos = getPos(); int x = pos.x(); int y = pos.y() + 1; - RenderUtil.drawRectangle(matrices, pos.x() + (int) halfWidth - 1, pos.y(), 3, 11, lookingBox.getValue()); + RenderUtil.drawRectangle(context, pos.x() + (int) halfWidth - 1, pos.y(), 3, 11, lookingBox.getValue()); if (showDegrees.getValue()) { DrawUtil.drawCenteredString( - matrices, client.textRenderer, Text.literal(Integer.toString((int) degrees)), x + (int) halfWidth, y + 20, degreesColor.getValue(), + context, client.textRenderer, Text.literal(Integer.toString((int) degrees)), x + (int) halfWidth, y + 20, degreesColor.getValue(), shadow.getValue() ); } @@ -90,7 +91,7 @@ public void renderCompass(MatrixStack matrices, float delta) { if (invert.getValue()) { shift = dist - shift; } - matrices.translate(shift, 0, 0); + context.getMatrices().translate(shift, 0, 0); for (int i = 0; i < amount; i++) { int d; if (invert.getValue()) { @@ -111,27 +112,27 @@ public void renderCompass(MatrixStack matrices, float delta) { RenderSystem.setShaderColor(1, 1, 1, targetOpacity); if (indicator == Indicator.CARDINAL) { // We have to call .color() here so that transparency stays - RenderUtil.drawRectangle(matrices, innerX, y, 1, 9, majorIndicatorColor.getValue().color()); + RenderUtil.drawRectangle(context, innerX, y, 1, 9, majorIndicatorColor.getValue().color()); Color color = cardinalColor.getValue(); color = color.withAlpha((int) (color.alpha() * targetOpacity)); if (color.alpha() > 0) { DrawUtil.drawCenteredString( - matrices, client.textRenderer, Text.literal(getCardString(indicator, d)), innerX + 1, y + 10, color, shadow.getValue()); + context, client.textRenderer, Text.literal(getCardString(indicator, d)), innerX + 1, y + 10, color, shadow.getValue()); } } else if (indicator == Indicator.SEMI_CARDINAL) { Color color = semiCardinalColor.getValue(); color = color.withAlpha((int) (color.alpha() * targetOpacity)); if (color.alpha() > 0) { DrawUtil.drawCenteredString( - matrices, client.textRenderer, Text.literal(getCardString(indicator, d)), innerX + 1, y + 1, color, shadow.getValue()); + context, client.textRenderer, Text.literal(getCardString(indicator, d)), innerX + 1, y + 1, color, shadow.getValue()); } } else { // We have to call .color() here so that transparency stays - RenderUtil.drawRectangle(matrices, innerX, y, 1, 5, minorIndicatorColor.getValue().color()); + RenderUtil.drawRectangle(context, innerX, y, 1, 5, minorIndicatorColor.getValue().color()); } } RenderSystem.setShaderColor(1, 1, 1, 1); - matrices.translate(-shift, 0, 0); + context.getMatrices().translate(-shift, 0, 0); } private static Indicator getIndicator(int degrees) { diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/CoordsHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/CoordsHud.java index 46a9bf0..881bfd3 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/CoordsHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/CoordsHud.java @@ -7,7 +7,7 @@ import io.github.darkkronicle.kronhud.util.ColorUtil; import io.github.darkkronicle.kronhud.util.DrawPosition; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -83,7 +83,7 @@ public static int getDirection(double yaw) { } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { DrawPosition pos = getPos(); StringBuilder format = new StringBuilder("#"); if (decimalPlaces.getValue() > 0) { @@ -104,37 +104,37 @@ public void renderComponent(MatrixStack matrices, float delta) { int currPos = pos.x() + 1; Text separator = Text.literal(", "); drawString( - matrices, textRenderer, Text.literal("XYZ: "), + context, textRenderer, Text.literal("XYZ: "), currPos, pos.y() + 2, firstColor.getValue().color(), shadow.getValue() ); currPos += textRenderer.getWidth("XYZ: "); drawString( - matrices, textRenderer, Text.literal(df.format(x)), + context, textRenderer, Text.literal(df.format(x)), currPos, pos.y() + 2, secondColor.getValue().color(), shadow.getValue() ); currPos += textRenderer.getWidth(df.format(x)); drawString( - matrices, textRenderer, separator, + context, textRenderer, separator, currPos, pos.y() + 2, firstColor.getValue().color(), shadow.getValue() ); currPos += textRenderer.getWidth(separator); drawString( - matrices, textRenderer, Text.literal(df.format(y)), + context, textRenderer, Text.literal(df.format(y)), currPos, pos.y() + 2, secondColor.getValue().color(), shadow.getValue() ); currPos += textRenderer.getWidth(String.valueOf(df.format(y))); drawString( - matrices, textRenderer, separator, + context, textRenderer, separator, currPos, pos.y() + 2, firstColor.getValue().color(), shadow.getValue() ); currPos += textRenderer.getWidth(separator); drawString( - matrices, textRenderer, Text.literal(df.format(z)), + context, textRenderer, Text.literal(df.format(z)), currPos, pos.y() + 2, secondColor.getValue().color(), shadow.getValue() ); @@ -154,51 +154,51 @@ public void renderComponent(MatrixStack matrices, float delta) { } } else { drawString( - matrices, textRenderer, Text.literal("X"), + context, textRenderer, Text.literal("X"), pos.x() + 1, pos.y() + 2, firstColor.getValue().color(), shadow.getValue() ); drawString( - matrices, textRenderer, Text.literal(df.format(x)), + context, textRenderer, Text.literal(df.format(x)), pos.x() + 11, pos.y() + 2, secondColor.getValue().color(), shadow.getValue() ); drawString( - matrices, textRenderer, Text.literal("Y"), + context, textRenderer, Text.literal("Y"), pos.x() + 1, pos.y() + 12, firstColor.getValue().color(), shadow.getValue() ); drawString( - matrices, textRenderer, Text.literal(df.format(y)), + context, textRenderer, Text.literal(df.format(y)), pos.x() + 11, pos.y() + 12, secondColor.getValue().color(), shadow.getValue() ); drawString( - matrices, textRenderer, Text.literal("Z"), + context, textRenderer, Text.literal("Z"), pos.x() + 1, pos.y() + 22, firstColor.getValue().color(), shadow.getValue() ); drawString( - matrices, textRenderer, Text.literal(df.format(z)), pos.x() + 11, pos.y() + 22, secondColor.getValue().color(), + context, textRenderer, Text.literal(df.format(z)), pos.x() + 11, pos.y() + 22, secondColor.getValue().color(), shadow.getValue() ); drawString( - matrices, textRenderer, direction, + context, textRenderer, direction, pos.x() + 60, pos.y() + 12, firstColor.getValue().color(), shadow.getValue() ); drawString( - matrices, textRenderer, Text.of(getXDir(dir)), + context, textRenderer, Text.of(getXDir(dir)), pos.x() + 60, pos.y() + 2, secondColor.getValue().color(), shadow.getValue() ); - textRenderer.drawWithShadow( - matrices, getZDir(dir), + context.drawText( + client.textRenderer, getZDir(dir), pos.x() + 60, pos.y() + 22, secondColor.getValue().color(), shadow.getValue() ); @@ -218,7 +218,7 @@ matrices, getZDir(dir), } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { + public void renderPlaceholderComponent(DrawContext context, float delta) { DrawPosition pos = getPos(); StringBuilder format = new StringBuilder("#"); if (decimalPlaces.getValue() > 0) { @@ -240,17 +240,17 @@ public void renderPlaceholderComponent(MatrixStack matrices, float delta) { int currPos = pos.x() + 1; String separator = ", "; - textRenderer.drawWithShadow(matrices, "XYZ: ", currPos, pos.y() + 2, firstColor.getValue().color()); + context.drawTextWithShadow(client.textRenderer, "XYZ: ", currPos, pos.y() + 2, firstColor.getValue().color()); currPos += textRenderer.getWidth("XYZ: "); - textRenderer.drawWithShadow(matrices, String.valueOf(df.format(x)), currPos, pos.y() + 2, secondColor.getValue().color(), shadow.getValue()); + context.drawText(client.textRenderer, String.valueOf(df.format(x)), currPos, pos.y() + 2, secondColor.getValue().color(), shadow.getValue()); currPos += textRenderer.getWidth(String.valueOf(df.format(x))); - textRenderer.drawWithShadow(matrices, separator, currPos, pos.y() + 2, firstColor.getValue().color(), shadow.getValue()); + context.drawText(client.textRenderer, separator, currPos, pos.y() + 2, firstColor.getValue().color(), shadow.getValue()); currPos += textRenderer.getWidth(separator); - textRenderer.drawWithShadow(matrices, String.valueOf(df.format(y)), currPos, pos.y() + 2, secondColor.getValue().color(), shadow.getValue()); + context.drawText(client.textRenderer, String.valueOf(df.format(y)), currPos, pos.y() + 2, secondColor.getValue().color(), shadow.getValue()); currPos += textRenderer.getWidth(String.valueOf(df.format(y))); - textRenderer.drawWithShadow(matrices, separator, currPos, pos.y() + 2, firstColor.getValue().color(), shadow.getValue() ); + context.drawText(client.textRenderer, separator, currPos, pos.y() + 2, firstColor.getValue().color(), shadow.getValue() ); currPos += textRenderer.getWidth(separator); - textRenderer.drawWithShadow(matrices, String.valueOf(df.format(z)), currPos, pos.y() + 2, secondColor.getValue().color(), shadow.getValue()); + context.drawText(client.textRenderer, String.valueOf(df.format(z)), currPos, pos.y() + 2, secondColor.getValue().color(), shadow.getValue()); currPos += textRenderer.getWidth(String.valueOf(df.format(z))); int width = currPos - pos.x() + 2; @@ -267,15 +267,15 @@ public void renderPlaceholderComponent(MatrixStack matrices, float delta) { onBoundsUpdate(); } } else { - textRenderer.drawWithShadow(matrices, "X", pos.x() + 1, pos.y() + 2, firstColor.getValue().color()); - textRenderer.drawWithShadow(matrices, String.valueOf(df.format(x)), pos.x() + 11, pos.y() + 2, secondColor.getValue().color()); - textRenderer.drawWithShadow(matrices, "Y", pos.x() + 1, pos.y() + 12, firstColor.getValue().color()); - textRenderer.drawWithShadow(matrices, String.valueOf(df.format(y)), pos.x() + 11, pos.y() + 12, secondColor.getValue().color()); - textRenderer.drawWithShadow(matrices, "Z", pos.x() + 1, pos.y() + 22, firstColor.getValue().color()); - textRenderer.drawWithShadow(matrices, String.valueOf(df.format(z)), pos.x() + 11, pos.y() + 22, secondColor.getValue().color()); - textRenderer.drawWithShadow(matrices, direction, pos.x() + 60, pos.y() + 12, firstColor.getValue().color()); - textRenderer.drawWithShadow(matrices, getXDir(dir), pos.x() + 60, pos.y() + 2, secondColor.getValue().color()); - textRenderer.drawWithShadow(matrices, getZDir(dir), pos.x() + 60, pos.y() + 22, secondColor.getValue().color()); + context.drawTextWithShadow(client.textRenderer, "X", pos.x() + 1, pos.y() + 2, firstColor.getValue().color()); + context.drawTextWithShadow(client.textRenderer, String.valueOf(df.format(x)), pos.x() + 11, pos.y() + 2, secondColor.getValue().color()); + context.drawTextWithShadow(client.textRenderer, "Y", pos.x() + 1, pos.y() + 12, firstColor.getValue().color()); + context.drawTextWithShadow(client.textRenderer, String.valueOf(df.format(y)), pos.x() + 11, pos.y() + 12, secondColor.getValue().color()); + context.drawTextWithShadow(client.textRenderer, "Z", pos.x() + 1, pos.y() + 22, firstColor.getValue().color()); + context.drawTextWithShadow(client.textRenderer, String.valueOf(df.format(z)), pos.x() + 11, pos.y() + 22, secondColor.getValue().color()); + context.drawTextWithShadow(client.textRenderer, direction, pos.x() + 60, pos.y() + 12, firstColor.getValue().color()); + context.drawTextWithShadow(client.textRenderer, getXDir(dir), pos.x() + 60, pos.y() + 2, secondColor.getValue().color()); + context.drawTextWithShadow(client.textRenderer, getZDir(dir), pos.x() + 60, pos.y() + 22, secondColor.getValue().color()); } } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/KeystrokeHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/KeystrokeHud.java index 842ca0a..f1583c7 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/KeystrokeHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/KeystrokeHud.java @@ -13,9 +13,9 @@ import io.github.darkkronicle.kronhud.util.DrawPosition; import io.github.darkkronicle.kronhud.util.Rectangle; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.Util; @@ -84,15 +84,15 @@ public void setKeystrokes() { keystrokes.add(createFromKey(new Rectangle(36, 18, 17, 17), pos, client.options.rightKey)); // Space - keystrokes.add(new Keystroke(new Rectangle(0, 54, 53, 7), pos, client.options.jumpKey, (stroke, matrices) -> { + keystrokes.add(new Keystroke(new Rectangle(0, 54, 53, 7), pos, client.options.jumpKey, (stroke, context) -> { Rectangle bounds = stroke.bounds; Rectangle spaceBounds = new Rectangle(bounds.x() + stroke.offset.x() + 4, bounds.y() + stroke.offset.y() + 2, bounds.width() - 8, 1 ); - fillRect(matrices, spaceBounds, stroke.getFGColor()); + fillRect(context, spaceBounds, stroke.getFGColor()); if (shadow.getValue()) { - fillRect(matrices, spaceBounds.offset(1, 1), + fillRect(context, spaceBounds.offset(1, 1), new Color((stroke.getFGColor().color() & 16579836) >> 2 | stroke.getFGColor().color() & -16777216) ); } @@ -102,40 +102,40 @@ public void setKeystrokes() { } @Override - public void render(MatrixStack matrices, float delta) { - matrices.push(); - scale(matrices); - renderComponent(matrices, delta); - matrices.pop(); + public void render(DrawContext context, float delta) { + context.getMatrices().push(); + scale(context); + renderComponent(context, delta); + context.getMatrices().pop(); } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { if (keystrokes == null) { setKeystrokes(); } for (Keystroke stroke : keystrokes) { - stroke.render(matrices); + stroke.render(context); } if (mouseMovement.getValue()) { int spaceY = 62 + getRawY(); int spaceX = getRawX(); if (background.getValue()) { - RenderUtil.drawRectangle(matrices, spaceX, spaceY, width, 35, backgroundColor.getValue()); + RenderUtil.drawRectangle(context, spaceX, spaceY, width, 35, backgroundColor.getValue()); } if (outline.getValue()) { - RenderUtil.drawOutline(matrices, spaceX, spaceY, width, 35, outlineColor.getValue()); + RenderUtil.drawOutline(context, spaceX, spaceY, width, 35, outlineColor.getValue()); } float calculatedMouseX = (lastMouseX + ((mouseX - lastMouseX) * delta)) - 5; float calculatedMouseY = (lastMouseY + ((mouseY - lastMouseY) * delta)) - 5; - RenderUtil.drawRectangle(matrices, spaceX + (width / 2) - 1, spaceY + 17, 1, 1, ColorUtil.WHITE); + RenderUtil.drawRectangle(context, spaceX + (width / 2) - 1, spaceY + 17, 1, 1, ColorUtil.WHITE); - matrices.translate(calculatedMouseX, calculatedMouseY, 0); // Woah KodeToad, good use of translate + context.getMatrices().translate(calculatedMouseX, calculatedMouseY, 0); // Woah KodeToad, good use of translate RenderUtil.drawOutline( - matrices, + context, spaceX + (width / 2) - 1, spaceY + 17, 11, @@ -183,8 +183,8 @@ protected boolean getShadowDefault() { } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { - renderComponent(matrices, delta); + public void renderPlaceholderComponent(DrawContext context, float delta) { + renderComponent(context, delta); } public Keystroke createFromKey(Rectangle bounds, DrawPosition offset, KeyBinding key) { @@ -196,13 +196,13 @@ public Keystroke createFromKey(Rectangle bounds, DrawPosition offset, KeyBinding } public Keystroke createFromString(Rectangle bounds, DrawPosition offset, KeyBinding key, String word) { - return new Keystroke(bounds, offset, key, (stroke, matrices) -> { + return new Keystroke(bounds, offset, key, (stroke, context) -> { Rectangle strokeBounds = stroke.bounds; float x = (strokeBounds.x() + stroke.offset.x() + ((float) strokeBounds.width() / 2)) - ((float) client.textRenderer.getWidth(word) / 2); float y = strokeBounds.y() + stroke.offset.y() + ((float) strokeBounds.height() / 2) - 4; - drawString(matrices, client.textRenderer, Text.literal(word), x, y, stroke.getFGColor().color(), shadow.getValue()); + drawString(context, client.textRenderer, Text.literal(word), x, y, stroke.getFGColor().color(), shadow.getValue()); }); } @@ -260,16 +260,16 @@ public Keystroke(Rectangle bounds, DrawPosition offset, KeyBinding key, Keystrok this.render = render; } - public void renderStroke(MatrixStack matrices) { + public void renderStroke(DrawContext context) { if (key.isPressed() != wasPressed) { start = Util.getMeasuringTimeMs(); } Rectangle rect = bounds.offset(offset); if (background.getValue()) { - fillRect(matrices, rect, getColor()); + fillRect(context, rect, getColor()); } if (outline.getValue()) { - outlineRect(matrices, rect, getOutlineColor()); + outlineRect(context, rect, getOutlineColor()); } if ((Util.getMeasuringTimeMs() - start) / animTime >= 1) { start = -1; @@ -320,15 +320,15 @@ public Color getFGColor() { ); } - public void render(MatrixStack matrices) { - renderStroke(matrices); - render.render(this, matrices); + public void render(DrawContext context) { + renderStroke(context); + render.render(this, context); } } public interface KeystrokeRenderer { - void render(Keystroke stroke, MatrixStack matrices); + void render(Keystroke stroke, DrawContext context); } } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/PlayerHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/PlayerHud.java index b4924d2..07f2937 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/PlayerHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/PlayerHud.java @@ -7,6 +7,7 @@ import io.github.darkkronicle.kronhud.gui.entry.BoxHudEntry; import io.github.darkkronicle.kronhud.hooks.KronHudHooks; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ingame.InventoryScreen; import net.minecraft.client.render.DiffuseLighting; import net.minecraft.client.render.VertexConsumerProvider; @@ -40,12 +41,12 @@ public PlayerHud() { } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { renderPlayer(getTruePos().x() + 31 * getScale(), getTruePos().y() + 86 * getScale(), delta); } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { + public void renderPlaceholderComponent(DrawContext context, float delta) { renderPlayer(getTruePos().x() + 31 * getScale(), getTruePos().y() + 86 * getScale(), 0); // If delta was delta, it would start jittering } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/PotionsHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/PotionsHud.java index 34c2c17..9439752 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/PotionsHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/PotionsHud.java @@ -10,14 +10,12 @@ import io.github.darkkronicle.kronhud.gui.layout.AnchorPoint; import io.github.darkkronicle.kronhud.gui.layout.CardinalOrder; import io.github.darkkronicle.kronhud.util.Rectangle; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.texture.Sprite; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectUtil; import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.text.Text; import net.minecraft.util.Identifier; import java.util.ArrayList; @@ -60,15 +58,15 @@ private int calculateHeight(List effects) { } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { List effects = new ArrayList<>(client.player.getStatusEffects()); if (effects.isEmpty()) { return; } - renderEffects(matrices, effects); + renderEffects(context, effects); } - private void renderEffects(MatrixStack matrices, List effects) { + private void renderEffects(DrawContext context, List effects) { int calcWidth = calculateWidth(effects); int calcHeight = calculateHeight(effects); boolean changed = false; @@ -92,35 +90,34 @@ private void renderEffects(MatrixStack matrices, List effe for (int i = 0; i < effects.size(); i++) { StatusEffectInstance effect = effects.get(direction.getDirection() == -1 ? i : effects.size() - i - 1); if (direction.isXAxis()) { - renderPotion(matrices, effect, x + lastPos + 1, y + 1); + renderPotion(context, effect, x + lastPos + 1, y + 1); lastPos += (iconsOnly.getValue() ? 20 : 50); } else { - renderPotion(matrices, effect, x + 1, y + 1 + lastPos); + renderPotion(context, effect, x + 1, y + 1 + lastPos); lastPos += 20; } } } - private void renderPotion(MatrixStack matrices, StatusEffectInstance effect, int x, int y) { + private void renderPotion(DrawContext context, StatusEffectInstance effect, int x, int y) { StatusEffect type = effect.getEffectType(); Sprite sprite = client.getStatusEffectSpriteManager().getSprite(type); - RenderSystem.setShaderTexture(0, sprite.getAtlasId()); RenderSystem.setShaderColor(1, 1, 1, 1); - DrawableHelper.drawSprite(matrices, x, y, 0, 18, 18, sprite); + context.drawSprite(x, y, 0, 18, 18, sprite); if (!iconsOnly.getValue()) { - drawString(matrices, client.textRenderer, StatusEffectUtil.durationToString(effect, 1), x + 19, y + 5, + drawString(context, client.textRenderer, StatusEffectUtil.getDurationText(effect, 1), x + 19, y + 5, textColor.getValue().color(), shadow.getValue() ); } } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { + public void renderPlaceholderComponent(DrawContext context, float delta) { StatusEffectInstance effect = new StatusEffectInstance(StatusEffects.SPEED); StatusEffectInstance jump = new StatusEffectInstance(StatusEffects.JUMP_BOOST); StatusEffectInstance haste = new StatusEffectInstance(StatusEffects.HASTE); - renderEffects(matrices, List.of(effect, jump, haste)); + renderEffects(context, List.of(effect, jump, haste)); } @Override diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ArmorHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ArmorHud.java index d4014e6..1c6c3b9 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ArmorHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ArmorHud.java @@ -2,11 +2,10 @@ import io.github.darkkronicle.darkkore.util.render.RenderUtil; import io.github.darkkronicle.kronhud.config.KronConfig; -import io.github.darkkronicle.kronhud.gui.AbstractHudEntry; import io.github.darkkronicle.kronhud.gui.entry.TextHudEntry; import io.github.darkkronicle.kronhud.util.DrawPosition; import io.github.darkkronicle.kronhud.util.ItemUtil; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.Identifier; @@ -22,41 +21,39 @@ public ArmorHud() { } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { DrawPosition pos = getPos(); int lastY = 2 + (4 * 20); - renderMainItem(matrices, client.player.getInventory().getMainHandStack(), pos.x() + 2, pos.y() + lastY); + renderMainItem(context, client.player.getInventory().getMainHandStack(), pos.x() + 2, pos.y() + lastY); lastY = lastY - 20; for (int i = 0; i <= 3; i++) { ItemStack item = client.player.getInventory().armor.get(i); - renderItem(matrices, item, pos.x() + 2, lastY + pos.y()); + renderItem(context, item, pos.x() + 2, lastY + pos.y()); lastY = lastY - 20; } } - public void renderItem(MatrixStack matrices, ItemStack stack, int x, int y) { - RenderUtil.drawItem(matrices, stack, x, y); - ItemUtil.renderGuiItemOverlay(matrices, client.textRenderer, stack, x, y, null, textColor.getValue().color(), - shadow.getValue(), client.getTickDelta()); + public void renderItem(DrawContext context, ItemStack stack, int x, int y) { + RenderUtil.drawItem(context, stack, x, y); + context.drawItemInSlot(client.textRenderer, stack, x, y, null); } - public void renderMainItem(MatrixStack matrices, ItemStack stack, int x, int y) { - RenderUtil.drawItem(matrices, stack, x, y); + public void renderMainItem(DrawContext context, ItemStack stack, int x, int y) { + RenderUtil.drawItem(context, stack, x, y); String total = String.valueOf(ItemUtil.getTotal(client, stack)); if (total.equals("1")) { total = null; } - ItemUtil.renderGuiItemOverlay(matrices, client.textRenderer, stack, x, y, total, textColor.getValue().color(), - shadow.getValue(), client.getTickDelta()); + context.drawItemInSlot(client.textRenderer, stack, x, y, total); } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { + public void renderPlaceholderComponent(DrawContext context, float delta) { DrawPosition pos = getPos(); int lastY = 2 + (4 * 20); - RenderUtil.drawItem(matrices, new ItemStack(Items.GRASS_BLOCK), pos.x() + 2, pos.y() + lastY); - ItemUtil.renderGuiItemOverlay(matrices, client.textRenderer, new ItemStack(Items.GRASS_BLOCK), pos.x() + 2, - pos.y() + lastY, "90", textColor.getValue().color(), shadow.getValue(), delta); + RenderUtil.drawItem(context, new ItemStack(Items.GRASS_BLOCK), pos.x() + 2, pos.y() + lastY); + context.drawItemInSlot(client.textRenderer, new ItemStack(Items.GRASS_BLOCK), pos.x() + 2, + pos.y() + lastY, "90"); } @Override @@ -72,6 +69,8 @@ public Identifier getId() { @Override public List> getConfigurationOptions() { List> options = super.getConfigurationOptions(); + options.remove(textColor); + options.remove(shadow); return options; } } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ArrowHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ArrowHud.java index 5b8fb7b..9f63026 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ArrowHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ArrowHud.java @@ -3,15 +3,11 @@ import io.github.darkkronicle.darkkore.util.render.RenderUtil; import io.github.darkkronicle.kronhud.config.KronBoolean; import io.github.darkkronicle.kronhud.config.KronConfig; -import io.github.darkkronicle.kronhud.gui.AbstractHudEntry; -import io.github.darkkronicle.kronhud.gui.entry.BoxHudEntry; import io.github.darkkronicle.kronhud.gui.entry.TextHudEntry; import io.github.darkkronicle.kronhud.util.DrawPosition; -import io.github.darkkronicle.kronhud.util.DrawUtil; import io.github.darkkronicle.kronhud.util.ItemUtil; -import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.RangedWeaponItem; @@ -34,7 +30,7 @@ public ArrowHud() { } @Override - public void render(MatrixStack matrices, float delta) { + public void render(DrawContext context, float delta) { if (dynamic.getValue()) { ClientPlayerEntity player = client.player; if (!( @@ -44,17 +40,17 @@ public void render(MatrixStack matrices, float delta) { return; } } - super.render(matrices, delta); + super.render(context, delta); } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { DrawPosition pos = getPos(); drawCenteredString( - matrices, client.textRenderer, Text.literal(Integer.toString(arrows)), pos.x() + getWidth() / 2, pos.y() + getHeight() - 10, + context, client.textRenderer, Text.literal(Integer.toString(arrows)), pos.x() + getWidth() / 2, pos.y() + getHeight() - 10, textColor.getValue(), shadow.getValue() ); - RenderUtil.drawItem(matrices, currentArrow, pos.x() + 2, pos.y() + 2); + RenderUtil.drawItem(context, currentArrow, pos.x() + 2, pos.y() + 2); } @Override @@ -81,13 +77,13 @@ public void tick() { } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { + public void renderPlaceholderComponent(DrawContext context, float delta) { DrawPosition pos = getPos(); drawCenteredString( - matrices, client.textRenderer, Text.literal("64"), pos.x() + getWidth() / 2, pos.y() + getHeight() - 10, textColor.getValue(), + context, client.textRenderer, Text.literal("64"), pos.x() + getWidth() / 2, pos.y() + getHeight() - 10, textColor.getValue(), shadow.getValue() ); - RenderUtil.drawItem(matrices, new ItemStack(Items.ARROW), pos.x() + 2, pos.y() + 2); + RenderUtil.drawItem(context, new ItemStack(Items.ARROW), pos.x() + 2, pos.y() + 2); } @Override diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ItemUpdateHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ItemUpdateHud.java index f012495..3c5a3ea 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ItemUpdateHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/item/ItemUpdateHud.java @@ -2,11 +2,12 @@ import io.github.darkkronicle.kronhud.config.KronConfig; import io.github.darkkronicle.kronhud.config.KronInteger; -import io.github.darkkronicle.kronhud.gui.AbstractHudEntry; import io.github.darkkronicle.kronhud.gui.entry.TextHudEntry; -import io.github.darkkronicle.kronhud.util.*; +import io.github.darkkronicle.kronhud.util.ColorUtil; +import io.github.darkkronicle.kronhud.util.DrawPosition; +import io.github.darkkronicle.kronhud.util.ItemUtil; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.TextCollector; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.text.OrderedText; @@ -94,7 +95,7 @@ private void updateRemoved() { } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { DrawPosition pos = getPos(); int lastY = 1; int i = 0; @@ -110,12 +111,12 @@ public void renderComponent(MatrixStack matrices, float delta) { message.add(item.stack.getName()); OrderedText text = Language.getInstance().reorder(message.getCombined()); if (shadow.getValue()) { - client.textRenderer.drawWithShadow( - matrices, text, pos.x(), pos.y() + lastY, ColorUtil.SELECTOR_GREEN.color() + context.drawTextWithShadow( + client.textRenderer, text, pos.x(), pos.y() + lastY, ColorUtil.SELECTOR_GREEN.color() ); } else { - client.textRenderer.draw( - matrices, text, pos.x(), pos.y() + lastY, ColorUtil.SELECTOR_GREEN.color() + context.drawTextWithShadow( + client.textRenderer, text, pos.x(), pos.y() + lastY, ColorUtil.SELECTOR_GREEN.color() ); } lastY = lastY + client.textRenderer.fontHeight + 2; @@ -133,12 +134,12 @@ public void renderComponent(MatrixStack matrices, float delta) { message.add(item.stack.getName()); OrderedText text = Language.getInstance().reorder(message.getCombined()); if (shadow.getValue()) { - client.textRenderer.drawWithShadow( - matrices, text, pos.x(), pos.y() + lastY, Formatting.RED.getColorValue() + context.drawTextWithShadow( + client.textRenderer, text, pos.x(), pos.y() + lastY, Formatting.RED.getColorValue() ); } else { - client.textRenderer.draw( - matrices, text, pos.x(), pos.y() + lastY, Formatting.RED.getColorValue() + context.drawTextWithShadow( + client.textRenderer, text, pos.x(), pos.y() + lastY, Formatting.RED.getColorValue() ); } lastY = lastY + client.textRenderer.fontHeight + 2; @@ -147,7 +148,7 @@ public void renderComponent(MatrixStack matrices, float delta) { } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { + public void renderPlaceholderComponent(DrawContext context, float delta) { DrawPosition pos = getPos(); TextCollector addM = new TextCollector(); addM.add(Text.literal("+ ")); @@ -157,12 +158,12 @@ public void renderPlaceholderComponent(MatrixStack matrices, float delta) { addM.add(new ItemStack(Items.DIRT).getName()); OrderedText addText = Language.getInstance().reorder(addM.getCombined()); if (shadow.getValue()) { - client.textRenderer.drawWithShadow( - matrices, addText, pos.x(), pos.y(), Formatting.RED.getColorValue() + context.drawTextWithShadow( + client.textRenderer, addText, pos.x(), pos.y(), Formatting.RED.getColorValue() ); } else { - client.textRenderer.draw( - matrices, addText, pos.x(), pos.y() + client.textRenderer.fontHeight + 2, Formatting.RED.getColorValue() + context.drawTextWithShadow( + client.textRenderer, addText, pos.x(), pos.y() + client.textRenderer.fontHeight + 2, Formatting.RED.getColorValue() ); } TextCollector removeM = new TextCollector(); @@ -173,11 +174,13 @@ public void renderPlaceholderComponent(MatrixStack matrices, float delta) { removeM.add(new ItemStack(Items.GRASS).getName()); OrderedText removeText = Language.getInstance().reorder(removeM.getCombined()); if (shadow.getValue()) { - client.textRenderer.drawWithShadow(matrices, removeText, pos.x(), pos.y() + client.textRenderer.fontHeight + 2, + context.drawTextWithShadow( + client.textRenderer, removeText, pos.x(), pos.y() + client.textRenderer.fontHeight + 2, Formatting.RED.getColorValue() ); } else { - client.textRenderer.draw(matrices, removeText, pos.x(), pos.y() + client.textRenderer.fontHeight + 3, + context.drawTextWithShadow( + client.textRenderer, removeText, pos.x(), pos.y() + client.textRenderer.fontHeight + 3, Formatting.RED.getColorValue() ); } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/simple/GameTimeHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/simple/GameTimeHud.java index d6c83cf..d7bd464 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/simple/GameTimeHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/simple/GameTimeHud.java @@ -2,20 +2,15 @@ import com.mojang.blaze3d.systems.RenderSystem; import io.github.darkkronicle.darkkore.util.render.RenderUtil; -import io.github.darkkronicle.kronhud.KronHUD; import io.github.darkkronicle.kronhud.config.KronBoolean; import io.github.darkkronicle.kronhud.config.KronConfig; import io.github.darkkronicle.kronhud.gui.entry.TextHudEntry; import io.github.darkkronicle.kronhud.gui.layout.Justification; import io.github.darkkronicle.kronhud.util.DrawPosition; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.texture.AbstractTexture; -import net.minecraft.client.texture.atlas.Sprite; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.resource.Resource; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.world.World; @@ -67,12 +62,12 @@ public Identifier getId() { } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { updateWidth(); DrawPosition pos = getPos(); Text time = Text.literal(formatTime(getDayTicks())); drawString( - matrices, + context, client.textRenderer, time, pos.x() + Justification.RIGHT.getXOffset(time, getWidth() - 2), @@ -82,7 +77,7 @@ public void renderComponent(MatrixStack matrices, float delta) { ); if (clockDisplay.getValue()) { RenderUtil.drawItem( - matrices, + context, new ItemStack(Items.CLOCK), pos.x() + 1 + Justification.LEFT.getXOffset(16, getWidth() - 2), pos.y() + 2 @@ -97,9 +92,8 @@ public void renderComponent(MatrixStack matrices, float delta) { RenderSystem.setShaderColor(1, 1, 1, canPlayerSleep() ? 1 : 0.5f ); - RenderSystem.setShaderTexture(0, bedTexture); - DrawableHelper.drawTexture( - matrices, + context.drawTexture( + bedTexture, pos.x() + offset + 1 + Justification.LEFT.getXOffset(16, getWidth() - 2), pos.y() + 2, 0, 0, 16, 16, 16, 16 @@ -110,12 +104,12 @@ public void renderComponent(MatrixStack matrices, float delta) { } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { + public void renderPlaceholderComponent(DrawContext context, float delta) { updateWidth(); DrawPosition pos = getPos(); Text time = Text.literal(formatTime(0)); drawString( - matrices, + context, client.textRenderer, time, pos.x() + Justification.RIGHT.getXOffset(time, getWidth() - 2), @@ -125,7 +119,7 @@ public void renderPlaceholderComponent(MatrixStack matrices, float delta) { ); if (clockDisplay.getValue()) { RenderUtil.drawItem( - matrices, + context, new ItemStack(Items.CLOCK), pos.x() + 1 + Justification.LEFT.getXOffset(16, getWidth() - 2), pos.y() + 2 @@ -136,9 +130,8 @@ public void renderPlaceholderComponent(MatrixStack matrices, float delta) { if (clockDisplay.getValue()) { offset += 16; } - RenderSystem.setShaderTexture(0, bedTexture); - DrawableHelper.drawTexture( - matrices, + context.drawTexture( + bedTexture, pos.x() + offset + 1 + Justification.LEFT.getXOffset(16, getWidth() - 4), pos.y() + 2, 0, 0, 16, 16, 16, 16 diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/ActionBarHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/ActionBarHud.java index e2852d9..5cdce05 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/ActionBarHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/ActionBarHud.java @@ -4,10 +4,8 @@ import io.github.darkkronicle.kronhud.config.KronBoolean; import io.github.darkkronicle.kronhud.config.KronConfig; import io.github.darkkronicle.kronhud.config.KronInteger; -import io.github.darkkronicle.kronhud.gui.AbstractHudEntry; import io.github.darkkronicle.kronhud.gui.entry.TextHudEntry; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -35,7 +33,7 @@ public void setActionBar(Text bar, int color) { } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { if (ticksShown >= timeShown.getValue()) { this.actionBar = null; } @@ -43,9 +41,10 @@ public void renderComponent(MatrixStack matrices, float delta) { if (this.actionBar != null) { if (shadow.getValue()) { - client.textRenderer.drawWithShadow(matrices, actionBar, - (float) getPos().x() + Math.round((float) getWidth() / 2) - (float) client.textRenderer.getWidth(actionBar) / 2, - (float) getPos().y() + 3, + context.drawTextWithShadow( + client.textRenderer, actionBar, + getPos().x() + Math.round(getWidth() / 2F) - client.textRenderer.getWidth(actionBar) / 2, + getPos().y() + 3, customTextColor.getValue() ? ( textColor.getValue().alpha() == 255 ? new Color( @@ -60,9 +59,10 @@ public void renderComponent(MatrixStack matrices, float delta) { ); } else { - client.textRenderer.draw(matrices, actionBar, - (float) getPos().x() + Math.round((float) getWidth() / 2) - ((float) client.textRenderer.getWidth(actionBar) / 2), - (float) getPos().y() + 3, + context.drawText( + client.textRenderer, actionBar, + getPos().x() + Math.round(getWidth() / 2F) - (client.textRenderer.getWidth(actionBar) / 2), + getPos().y() + 3, customTextColor.getValue() ? ( textColor.getValue().alpha() == 255 ? new Color( @@ -73,7 +73,7 @@ public void renderComponent(MatrixStack matrices, float delta) { ).color() : textColor.getValue().color() ) : - color + color, false ); } ticksShown++; @@ -83,11 +83,12 @@ public void renderComponent(MatrixStack matrices, float delta) { } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { - client.textRenderer.draw( - matrices, placeholder, - (float) getPos().x() + Math.round((float) getWidth() / 2) - (float) client.textRenderer.getWidth(placeholder) / 2, - (float) getPos().y() + 3, -1 + public void renderPlaceholderComponent(DrawContext context, float delta) { + context.drawText( + client.textRenderer, + placeholder, + getPos().x() + Math.round(getWidth() / 2F) - client.textRenderer.getWidth(placeholder) / 2, + getPos().y() + 3, -1, false ); } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/BossBarHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/BossBarHud.java index e9d76eb..2852e06 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/BossBarHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/BossBarHud.java @@ -1,6 +1,5 @@ package io.github.darkkronicle.kronhud.gui.hud.vanilla; -import com.mojang.blaze3d.systems.RenderSystem; import io.github.darkkronicle.kronhud.config.DefaultOptions; import io.github.darkkronicle.kronhud.config.KronBoolean; import io.github.darkkronicle.kronhud.config.KronConfig; @@ -10,9 +9,8 @@ import io.github.darkkronicle.kronhud.gui.layout.AnchorPoint; import io.github.darkkronicle.kronhud.mixins.AccessorBossBarHud; import io.github.darkkronicle.kronhud.util.DrawPosition; -import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.ClientBossBar; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.boss.BossBar; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -59,7 +57,7 @@ public void setBossBars() { } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { setBossBars(); if (bossBars == null || this.bossBars.isEmpty()) { return; @@ -67,7 +65,7 @@ public void renderComponent(MatrixStack matrices, float delta) { DrawPosition scaledPos = getPos(); int by = 12; for (ClientBossBar bossBar : bossBars.values()) { - renderBossBar(matrices, scaledPos.x(), by + scaledPos.y(), bossBar); + renderBossBar(context, scaledPos.x(), by + scaledPos.y(), bossBar); by = by + 19; if (by > getHeight()) { break; @@ -76,25 +74,24 @@ public void renderComponent(MatrixStack matrices, float delta) { } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { + public void renderPlaceholderComponent(DrawContext context, float delta) { DrawPosition pos = getPos(); - renderBossBar(matrices, pos.x(), pos.y() + 12, placeholder); - renderBossBar(matrices, pos.x(), pos.y() + 31, placeholder2); + renderBossBar(context, pos.x(), pos.y() + 12, placeholder); + renderBossBar(context, pos.x(), pos.y() + 31, placeholder2); } - private void renderBossBar(MatrixStack matrices, int x, int y, BossBar bossBar) { - RenderSystem.setShaderTexture(0, BARS_TEXTURE); + private void renderBossBar(DrawContext context, int x, int y, BossBar bossBar) { if (bar.getValue()) { - DrawableHelper.drawTexture(matrices, x, y, 0, bossBar.getColor().ordinal() * 5 * 2, 182, 5, 256, 256); + context.drawTexture(BARS_TEXTURE, x, y, 0, bossBar.getColor().ordinal() * 5 * 2, 182, 5, 256, 256); if (bossBar.getStyle() != BossBar.Style.PROGRESS) { - DrawableHelper.drawTexture(matrices, x, y, 0, 80 + (bossBar.getStyle().ordinal() - 1) * 5 * 2, 182, 5, 256, 256); + context.drawTexture(BARS_TEXTURE, x, y, 0, 80 + (bossBar.getStyle().ordinal() - 1) * 5 * 2, 182, 5, 256, 256); } int i = (int) (bossBar.getPercent() * 183.0F); if (i > 0) { - DrawableHelper.drawTexture(matrices, x, y, 0, bossBar.getColor().ordinal() * 5 * 2 + 5, i, 5, 256, 256); + context.drawTexture(BARS_TEXTURE, x, y, 0, bossBar.getColor().ordinal() * 5 * 2 + 5, i, 5, 256, 256); if (bossBar.getStyle() != BossBar.Style.PROGRESS) { - DrawableHelper.drawTexture(matrices, x, y, 0, 80 + (bossBar.getStyle().ordinal() - 1) * 5 * 2 + 5, i, 5, 256, 256); + context.drawTexture(BARS_TEXTURE, x, y, 0, 80 + (bossBar.getStyle().ordinal() - 1) * 5 * 2 + 5, i, 5, 256, 256); } } } @@ -102,11 +99,7 @@ private void renderBossBar(MatrixStack matrices, int x, int y, BossBar bossBar) Text text = bossBar.getName(); float textX = x + ((float) getWidth() / 2) - ((float) client.textRenderer.getWidth(text) / 2); float textY = y - 9; - if (shadow.getValue()) { - client.textRenderer.drawWithShadow(matrices, text, textX, textY, textColor.getValue().color()); - } else { - client.textRenderer.draw(matrices, text, textX, textY, textColor.getValue().color()); - } + context.drawText(client.textRenderer, text, (int) textX, (int) textY, textColor.getValue().color(), shadow.getValue()); } } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/CrosshairHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/CrosshairHud.java index a28d168..782df71 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/CrosshairHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/CrosshairHud.java @@ -5,7 +5,10 @@ import io.github.darkkronicle.darkkore.config.options.OptionListEntry; import io.github.darkkronicle.darkkore.util.Color; import io.github.darkkronicle.darkkore.util.render.RenderUtil; -import io.github.darkkronicle.kronhud.config.*; +import io.github.darkkronicle.kronhud.config.KronBoolean; +import io.github.darkkronicle.kronhud.config.KronConfig; +import io.github.darkkronicle.kronhud.config.KronExtendedColor; +import io.github.darkkronicle.kronhud.config.KronOptionList; import io.github.darkkronicle.kronhud.gui.AbstractHudEntry; import io.github.darkkronicle.kronhud.gui.component.DynamicallyPositionable; import io.github.darkkronicle.kronhud.gui.layout.AnchorPoint; @@ -14,13 +17,10 @@ import io.github.darkkronicle.kronhud.util.Rectangle; import lombok.AllArgsConstructor; import net.minecraft.block.AbstractChestBlock; -import net.minecraft.client.Keyboard; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.option.AttackIndicator; import net.minecraft.client.render.Camera; import net.minecraft.client.render.GameRenderer; -import net.minecraft.client.render.debug.DebugRenderer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.LivingEntity; import net.minecraft.util.Identifier; @@ -29,12 +29,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RotationAxis; import net.minecraft.world.World; -import org.joml.Vector3f; import java.util.List; public class CrosshairHud extends AbstractHudEntry implements DynamicallyPositionable { public static final Identifier ID = new Identifier("kronhud", "crosshairhud"); + private static final Identifier ICONS_TEXTURE = new Identifier("textures/gui/icons.png"); private final KronOptionList type = new KronOptionList<>("type", ID.getPath(), Crosshair.CROSS); private final KronBoolean showInF5 = new KronBoolean("showInF5", ID.getPath(), false); @@ -59,24 +59,24 @@ public double getDefaultY() { } @Override - public void render(MatrixStack matrices, float delta) { + public void render(DrawContext context, float delta) { if (!client.options.getPerspective().isFirstPerson() && !showInF5.getValue()) { return; } - matrices.push(); - scale(matrices); + context.getMatrices().push(); + scale(context); DrawPosition pos = getPos().subtract(0, -1); Color color = getColor(); AttackIndicator indicator = this.client.options.getAttackIndicator().getValue(); if (type.getValue() == Crosshair.DOT) { - fillRect(matrices, new Rectangle(pos.x() + (getWidth() / 2) - 2, pos.y() + (getHeight() / 2) - 2, 3, 3), color); + fillRect(context, new Rectangle(pos.x() + (getWidth() / 2) - 2, pos.y() + (getHeight() / 2) - 2, 3, 3), color); } else if (type.getValue() == Crosshair.CROSS) { - fillRect(matrices, new Rectangle(pos.x() + (getWidth() / 2) - 6, pos.y() + (getHeight() / 2) - 1, 6, 1), color); - fillRect(matrices, new Rectangle(pos.x() + (getWidth() / 2), pos.y() + (getHeight() / 2) - 1, 5, 1), color); - fillRect(matrices, new Rectangle(pos.x() + (getWidth() / 2) - 1, pos.y() + (getHeight() / 2) - 6, 1, 6), color); - fillRect(matrices, new Rectangle(pos.x() + (getWidth() / 2) - 1, pos.y() + (getHeight() / 2), 1, 5), color); + fillRect(context, new Rectangle(pos.x() + (getWidth() / 2) - 6, pos.y() + (getHeight() / 2) - 1, 6, 1), color); + fillRect(context, new Rectangle(pos.x() + (getWidth() / 2), pos.y() + (getHeight() / 2) - 1, 5, 1), color); + fillRect(context, new Rectangle(pos.x() + (getWidth() / 2) - 1, pos.y() + (getHeight() / 2) - 6, 1, 6), color); + fillRect(context, new Rectangle(pos.x() + (getWidth() / 2) - 1, pos.y() + (getHeight() / 2), 1, 5), color); } else if (type.getValue() == Crosshair.DIRECTION) { Camera camera = this.client.gameRenderer.getCamera(); MatrixStack matrixStack = RenderSystem.getModelViewStack(); @@ -92,13 +92,12 @@ public void render(MatrixStack matrices, float delta) { } else if (type.getValue() == Crosshair.TEXTURE) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.setShader(GameRenderer::getPositionTexProgram); - RenderSystem.setShaderTexture(0, DrawableHelper.GUI_ICONS_TEXTURE); // Draw crosshair RenderSystem.setShaderColor( (float) color.red() / 255, (float) color.green() / 255, (float) color.blue() / 255, (float) color.alpha() / 255); - client.inGameHud.drawTexture( - matrices, (int) (((client.getWindow().getScaledWidth() / getScale()) - 15) / 2), + context.drawTexture( + ICONS_TEXTURE, (int) (((client.getWindow().getScaledWidth() / getScale()) - 15) / 2), (int) (((client.getWindow().getScaledHeight() / getScale()) - 15) / 2), 0, 0, 15, 15 ); RenderSystem.setShaderColor(1, 1, 1, 1); @@ -119,11 +118,11 @@ public void render(MatrixStack matrices, float delta) { int y = (int) ((client.getWindow().getScaledHeight() / getScale()) / 2 - 7 + 16); if (targetingEntity) { - client.inGameHud.drawTexture(matrices, x, y, 68, 94, 16, 16); + context.drawTexture(ICONS_TEXTURE, x, y, 68, 94, 16, 16); } else if (progress < 1.0F) { int k = (int) (progress * 17.0F); - client.inGameHud.drawTexture(matrices, x, y, 36, 94, 16, 4); - client.inGameHud.drawTexture(matrices, x, y, 52, 94, k, 4); + context.drawTexture(ICONS_TEXTURE, x, y, 36, 94, 16, 4); + context.drawTexture(ICONS_TEXTURE, x, y, 52, 94, k, 4); } } } @@ -131,16 +130,16 @@ public void render(MatrixStack matrices, float delta) { float progress = this.client.player.getAttackCooldownProgress(0.0F); if (progress != 1.0F) { RenderUtil.drawRectangle( - matrices, pos.x() + (getWidth() / 2) - 6, pos.y() + (getHeight() / 2) + 9, 11, 1, + context, pos.x() + (getWidth() / 2) - 6, pos.y() + (getHeight() / 2) + 9, 11, 1, attackIndicatorBackgroundColor.getValue() ); RenderUtil.drawRectangle( - matrices, pos.x() + (getWidth() / 2) - 6, pos.y() + (getHeight() / 2) + 9, + context, pos.x() + (getWidth() / 2) - 6, pos.y() + (getHeight() / 2) + 9, (int) (progress * 11), 1, attackIndicatorForegroundColor.getValue() ); } } - matrices.pop(); + context.getMatrices().pop(); } public Color getColor() { @@ -163,7 +162,7 @@ public Color getColor() { } @Override - public void renderPlaceholder(MatrixStack matrices, float delta) { + public void renderPlaceholder(DrawContext context, float delta) { // Shouldn't need this... } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/ScoreboardHud.java b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/ScoreboardHud.java index 757ab7a..074fa8d 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/ScoreboardHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/hud/vanilla/ScoreboardHud.java @@ -11,12 +11,8 @@ import io.github.darkkronicle.kronhud.gui.entry.TextHudEntry; import io.github.darkkronicle.kronhud.gui.layout.AnchorPoint; import io.github.darkkronicle.kronhud.util.Rectangle; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.scoreboard.Scoreboard; -import net.minecraft.scoreboard.ScoreboardCriterion; -import net.minecraft.scoreboard.ScoreboardObjective; -import net.minecraft.scoreboard.ScoreboardPlayerScore; -import net.minecraft.scoreboard.Team; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.scoreboard.*; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -60,15 +56,15 @@ public ScoreboardHud() { } @Override - public void render(MatrixStack matrices, float delta) { - matrices.push(); - scale(matrices); - renderComponent(matrices, delta); - matrices.pop(); + public void render(DrawContext context, float delta) { + context.getMatrices().push(); + scale(context); + renderComponent(context, delta); + context.getMatrices().pop(); } @Override - public void renderComponent(MatrixStack matrices, float delta) { + public void renderComponent(DrawContext context, float delta) { Scoreboard scoreboard = this.client.world.getScoreboard(); ScoreboardObjective scoreboardObjective = null; Team team = scoreboard.getPlayerTeam(this.client.player.getEntityName()); @@ -81,18 +77,18 @@ public void renderComponent(MatrixStack matrices, float delta) { ScoreboardObjective scoreboardObjective2 = scoreboardObjective != null ? scoreboardObjective : scoreboard.getObjectiveForSlot(1); if (scoreboardObjective2 != null) { - this.renderScoreboardSidebar(matrices, scoreboardObjective2); + this.renderScoreboardSidebar(context, scoreboardObjective2); } } @Override - public void renderPlaceholderComponent(MatrixStack matrices, float delta) { - renderScoreboardSidebar(matrices, placeholder); + public void renderPlaceholderComponent(DrawContext context, float delta) { + renderScoreboardSidebar(context, placeholder); } // Abusing this could break some stuff/could allow for unfair advantages. The goal is not to do this, so it won't // show any more information than it would have in vanilla. - private void renderScoreboardSidebar(MatrixStack matrices, ScoreboardObjective objective) { + private void renderScoreboardSidebar(DrawContext context, ScoreboardObjective objective) { Scoreboard scoreboard = objective.getScoreboard(); Collection scores = scoreboard.getAllPlayerScores(objective); List filteredScores = scores.stream().filter((testScore) -> @@ -162,50 +158,42 @@ private void renderScoreboardSidebar(MatrixStack matrices, ScoreboardObjective o if (background.getValue() && backgroundColor.getValue().alpha() > 0) { if (num == scoresSize) { RenderUtil.drawRectangle( - matrices, + context, textOffset, relativeY - 1, maxWidth, 10, backgroundColor.getValue() ); } else if (num == 1) { RenderUtil.drawRectangle( - matrices, + context, textOffset, relativeY, maxWidth, 10, backgroundColor.getValue() ); } else { RenderUtil.drawRectangle( - matrices, + context, textOffset, relativeY, maxWidth, 9, backgroundColor.getValue() ); } } - if (shadow.getValue()) { - client.textRenderer.drawWithShadow(matrices, scoreText, (float) scoreX, (float) relativeY, -1); - } else { - client.textRenderer.draw(matrices, scoreText, (float) scoreX, (float) relativeY, -1); - } + context.drawText(client.textRenderer, scoreText, scoreX, relativeY, -1, shadow.getValue()); if (this.scores.getValue()) { - drawString(matrices, client.textRenderer, Text.literal(score), + drawString(context, client.textRenderer, Text.literal(score), (float) (scoreX + maxWidth - client.textRenderer.getWidth(score) - 6), (float) relativeY, scoreColor.getValue().color(), shadow.getValue()); } if (num == scoresSize) { // Draw the title if (background.getValue()) { - RenderUtil.drawRectangle(matrices, textOffset, relativeY - 10 - topPadding.getValue() * 2 - 1, maxWidth, 10 + topPadding.getValue() * 2, topColor.getValue()); - } - float title = (float) (renderX + (maxWidth - displayNameWidth) / 2); - if (shadow.getValue()) { - client.textRenderer.drawWithShadow(matrices, text, title, (float) (relativeY - 9) - topPadding.getValue(), -1); - } - else { - client.textRenderer.draw(matrices, text, title, (float) (relativeY - 9), -1); + RenderUtil.drawRectangle(context, textOffset, relativeY - 10 - topPadding.getValue() * 2 - 1, maxWidth, 10 + topPadding.getValue() * 2, topColor.getValue()); } + int title = renderX + (maxWidth - displayNameWidth) / 2; + + context.drawText(client.textRenderer, text, title, (relativeY - 9), -1, shadow.getValue()); } } if (outline.getValue() && outlineColor.getValue().alpha() > 0) { - RenderUtil.drawOutline(matrices, textOffset, bounds.y(), maxWidth, fullHeight + 2, outlineColor.getValue()); + RenderUtil.drawOutline(context, textOffset, bounds.y(), maxWidth, fullHeight + 2, outlineColor.getValue()); } } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/screen/HudEditScreen.java b/src/main/java/io/github/darkkronicle/kronhud/gui/screen/HudEditScreen.java index 658a639..9ae15fc 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/screen/HudEditScreen.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/screen/HudEditScreen.java @@ -1,27 +1,22 @@ package io.github.darkkronicle.kronhud.gui.screen; -import io.github.darkkronicle.darkkore.config.options.Option; -import io.github.darkkronicle.darkkore.gui.Tab; import io.github.darkkronicle.darkkore.settings.DarkKoreConfig; import io.github.darkkronicle.darkkore.util.render.RenderUtil; import io.github.darkkronicle.kronhud.config.ConfigHandler; -import io.github.darkkronicle.kronhud.gui.AbstractHudEntry; import io.github.darkkronicle.kronhud.gui.HudManager; import io.github.darkkronicle.kronhud.gui.component.HudEntry; import io.github.darkkronicle.kronhud.util.DrawPosition; import io.github.darkkronicle.kronhud.util.Rectangle; import io.github.darkkronicle.kronhud.util.SnappingHelper; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; -import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; public class HudEditScreen extends Screen { private boolean mouseDown = false; @@ -62,14 +57,14 @@ private Text getSnappingButtonText() { } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - RenderUtil.fill(matrices, 0, 0, width, height, DarkKoreConfig.getInstance().screenBackgroundColor.getValue()); - super.render(matrices, mouseX, mouseY, delta); + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + RenderUtil.fill(context, 0, 0, width, height, DarkKoreConfig.getInstance().screenBackgroundColor.getValue()); + super.render(context, mouseX, mouseY, delta); Optional entry = HudManager.getInstance().getEntryXY(mouseX, mouseY); entry.ifPresent(abstractHudEntry -> abstractHudEntry.setHovered(true)); - HudManager.getInstance().renderPlaceholder(matrices, delta); + HudManager.getInstance().renderPlaceholder(context, delta); if (mouseDown && snap != null) { - snap.renderSnaps(matrices); + snap.renderSnaps(context); } } diff --git a/src/main/java/io/github/darkkronicle/kronhud/gui/screen/HudEntryComponent.java b/src/main/java/io/github/darkkronicle/kronhud/gui/screen/HudEntryComponent.java index 48456ab..e86ec2b 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/gui/screen/HudEntryComponent.java +++ b/src/main/java/io/github/darkkronicle/kronhud/gui/screen/HudEntryComponent.java @@ -14,17 +14,13 @@ import io.github.darkkronicle.darkkore.util.Dimensions; import io.github.darkkronicle.darkkore.util.FluidText; import io.github.darkkronicle.darkkore.util.StringUtil; -import io.github.darkkronicle.kronhud.gui.AbstractHudEntry; import io.github.darkkronicle.kronhud.gui.HudEntryOption; import io.github.darkkronicle.kronhud.gui.component.HudEntry; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.text.MutableText; import net.minecraft.text.Text; import java.time.LocalDateTime; -import java.time.Month; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/io/github/darkkronicle/kronhud/mixins/MixinBossBarHud.java b/src/main/java/io/github/darkkronicle/kronhud/mixins/MixinBossBarHud.java index acadb02..6ad045a 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/mixins/MixinBossBarHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/mixins/MixinBossBarHud.java @@ -1,6 +1,7 @@ package io.github.darkkronicle.kronhud.mixins; import io.github.darkkronicle.kronhud.gui.HudManager; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.BossBarHud; import net.minecraft.client.util.math.MatrixStack; import org.spongepowered.asm.mixin.Mixin; @@ -12,7 +13,7 @@ public class MixinBossBarHud { @Inject(method = "render", at = @At("HEAD"), cancellable = true) - public void render(MatrixStack matrices, CallbackInfo ci) { + public void render(DrawContext context, CallbackInfo ci) { io.github.darkkronicle.kronhud.gui.hud.vanilla.BossBarHud hud = (io.github.darkkronicle.kronhud.gui.hud.vanilla.BossBarHud) HudManager.getInstance().get( io.github.darkkronicle.kronhud.gui.hud.vanilla.BossBarHud.ID); if (hud != null && hud.isEnabled()) { diff --git a/src/main/java/io/github/darkkronicle/kronhud/mixins/MixinInGameHud.java b/src/main/java/io/github/darkkronicle/kronhud/mixins/MixinInGameHud.java index 9f89fdf..7fa2a5d 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/mixins/MixinInGameHud.java +++ b/src/main/java/io/github/darkkronicle/kronhud/mixins/MixinInGameHud.java @@ -9,7 +9,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.hud.InGameHud; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.scoreboard.ScoreboardObjective; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Mixin; @@ -27,7 +27,7 @@ public class MixinInGameHud { private int overlayRemaining; @Inject(method = "renderStatusEffectOverlay", at = @At("HEAD"), cancellable = true) - public void renderStatusEffect(MatrixStack matrices, CallbackInfo ci) { + public void renderStatusEffect(DrawContext context, CallbackInfo ci) { PotionsHud hud = (PotionsHud) HudManager.getInstance().get(PotionsHud.ID); if (hud != null && hud.isEnabled()) { ci.cancel(); @@ -35,7 +35,7 @@ public void renderStatusEffect(MatrixStack matrices, CallbackInfo ci) { } @Inject(method = "renderCrosshair", at = @At("HEAD"), cancellable = true) - public void renderCrosshair(MatrixStack matrices, CallbackInfo ci) { + public void renderCrosshair(DrawContext context, CallbackInfo ci) { CrosshairHud hud = (CrosshairHud) HudManager.getInstance().get(CrosshairHud.ID); if (hud != null && hud.isEnabled()) { ci.cancel(); @@ -43,21 +43,21 @@ public void renderCrosshair(MatrixStack matrices, CallbackInfo ci) { } @Inject(method = "renderScoreboardSidebar", at = @At("HEAD"), cancellable = true) - public void renderScoreboard(MatrixStack matrices, ScoreboardObjective objective, CallbackInfo ci) { + public void renderScoreboard(DrawContext context, ScoreboardObjective objective, CallbackInfo ci) { ScoreboardHud hud = (ScoreboardHud) HudManager.getInstance().get(ScoreboardHud.ID); if (hud != null && hud.isEnabled()) { ci.cancel(); } } - @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;drawWithShadow(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/text/Text;FFI)I")) - public int getActionBar(TextRenderer instance, MatrixStack matrices, Text message, float x, float y, int color) { + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;III)I")) + public int getActionBar(DrawContext instance, TextRenderer textRenderer, Text text, int x, int y, int color) { ActionBarHud hud = (ActionBarHud) HudManager.getInstance().get(ActionBarHud.ID); if (hud != null && hud.isEnabled()) { - hud.setActionBar(message, color); + hud.setActionBar(text, color); return 0; // Doesn't matter since return value is not used } else { - return instance.drawWithShadow(matrices, message, x, y, color); + return instance.drawTextWithShadow(textRenderer, text, x, y, color); } } diff --git a/src/main/java/io/github/darkkronicle/kronhud/util/DrawUtil.java b/src/main/java/io/github/darkkronicle/kronhud/util/DrawUtil.java index 1691e42..0820ef9 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/util/DrawUtil.java +++ b/src/main/java/io/github/darkkronicle/kronhud/util/DrawUtil.java @@ -3,40 +3,36 @@ import io.github.darkkronicle.darkkore.util.Color; import io.github.darkkronicle.darkkore.util.render.RenderUtil; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; public class DrawUtil { - public static void fillRect(MatrixStack matrices, Rectangle rectangle, Color color) { - RenderUtil.drawRectangle(matrices, rectangle.x(), rectangle.y(), rectangle.width(), rectangle.height(), color); + public static void fillRect(DrawContext context, Rectangle rectangle, Color color) { + RenderUtil.drawRectangle(context, rectangle.x(), rectangle.y(), rectangle.width(), rectangle.height(), color); } - public static void rectOutline(MatrixStack matrices, Rectangle rectangle, Color color) { - RenderUtil.drawOutline(matrices, rectangle.x(), rectangle.y(), rectangle.width(), rectangle.height(), color); + public static void rectOutline(DrawContext context, Rectangle rectangle, Color color) { + RenderUtil.drawOutline(context, rectangle.x(), rectangle.y(), rectangle.width(), rectangle.height(), color); } - public static void outlineRect(MatrixStack matrices, Rectangle rectangle, Color color) { - RenderUtil.drawOutline(matrices, rectangle.x(), rectangle.y(), rectangle.width(), rectangle.height(), color); + public static void outlineRect(DrawContext context, Rectangle rectangle, Color color) { + RenderUtil.drawOutline(context, rectangle.x(), rectangle.y(), rectangle.width(), rectangle.height(), color); } - public static void drawCenteredString(MatrixStack matrices, TextRenderer renderer, Text text, int x, int y, + public static void drawCenteredString(DrawContext context, TextRenderer renderer, Text text, int x, int y, Color color, boolean shadow) { - drawCenteredString(matrices, renderer, text, x, y, color.color(), shadow); + drawCenteredString(context, renderer, text, x, y, color.color(), shadow); } - public static void drawCenteredString(MatrixStack matrices, TextRenderer renderer, Text text, int x, int y, + public static void drawCenteredString(DrawContext context, TextRenderer renderer, Text text, int x, int y, int color, boolean shadow) { - drawString(matrices, renderer, text, (float) (x - renderer.getWidth(text) / 2), (float) y, color, shadow); + drawString(context, renderer, text, (float) (x - renderer.getWidth(text) / 2), (float) y, color, shadow); } - public static void drawString(MatrixStack matrices, TextRenderer renderer, Text text, float x, float y, int color, + public static void drawString(DrawContext context, TextRenderer renderer, Text text, float x, float y, int color, boolean shadow) { - if (shadow) { - renderer.drawWithShadow(matrices, text, x, y, color); - } else { - renderer.draw(matrices, text, x, y, color); - } + context.drawText(renderer, text, (int) x, (int) y, color, shadow); } } diff --git a/src/main/java/io/github/darkkronicle/kronhud/util/ItemUtil.java b/src/main/java/io/github/darkkronicle/kronhud/util/ItemUtil.java index a726365..cee89a3 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/util/ItemUtil.java +++ b/src/main/java/io/github/darkkronicle/kronhud/util/ItemUtil.java @@ -1,25 +1,13 @@ package io.github.darkkronicle.kronhud.util; -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.systems.RenderSystem; -import io.github.darkkronicle.darkkore.util.Color; import lombok.experimental.UtilityClass; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.font.TextRenderer.TextLayerType; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.render.*; -import net.minecraft.client.render.VertexConsumerProvider.Immediate; +import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexFormat.DrawMode; -import net.minecraft.client.render.model.BakedModel; -import net.minecraft.client.render.model.json.ModelTransformation; -import net.minecraft.client.texture.SpriteAtlasTexture; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.render.VertexFormats; import net.minecraft.item.ItemStack; -import net.minecraft.text.Text; import net.minecraft.util.Util; -import net.minecraft.util.math.MathHelper; import java.util.ArrayList; import java.util.List; @@ -78,7 +66,7 @@ public Optional getItemFromItem(ItemStack item, List getTimedItemFromItem(ItemStack item, ItemStack compare = item.copy(); compare.setCount(1); for (ItemUtil.TimedItemStorage storage : list) { - if (storage.stack.isItemEqual(compare)) { + if (storage.stack.isOf(compare.getItem())) { return Optional.of(storage); } } @@ -199,41 +187,4 @@ public void refresh() { start = Util.getMeasuringTimeMs(); } } - - public static void renderGuiItemOverlay(MatrixStack matrices, TextRenderer text, ItemStack stack, int x, int y, - String countLabel, int color, boolean shadow, float delta) { - if (!stack.isEmpty()) { - matrices.push(); - if (stack.getCount() != 1 || countLabel != null) { - matrices.translate(0, 0, 200); - String string = countLabel == null ? String.valueOf(stack.getCount()) : countLabel; - DrawUtil.drawString(matrices, text, Text.literal(string), (float) (x + 19 - 2 - text.getWidth(string)), - (float) (y + 6 + 3), color, shadow); - } - - if (stack.isItemBarVisible()) { - RenderSystem.disableDepthTest(); - int step = stack.getItemBarStep(); - int barColor = stack.getItemBarColor(); - int left = x + 2; - int top = y + 13; - DrawableHelper.fill(matrices, left, top, left + 13, top + 2, -16777216); - DrawableHelper.fill(matrices, left, top, left + step, top + 1, barColor | -16777216); - RenderSystem.enableDepthTest(); - } - - ClientPlayerEntity player = MinecraftClient.getInstance().player; - float cooldown = player == null ? 0.0F - : player.getItemCooldownManager().getCooldownProgress(stack.getItem(), delta); - if (cooldown > 0.0F) { - RenderSystem.disableDepthTest(); - int top = y + MathHelper.floor(16 * (1 - cooldown)); - int bottom = top + MathHelper.ceil(16 * cooldown); - DrawableHelper.fill(matrices, x, top, x + 16, bottom, Integer.MAX_VALUE); - RenderSystem.enableDepthTest(); - } - - matrices.pop(); - } - } } diff --git a/src/main/java/io/github/darkkronicle/kronhud/util/SnappingHelper.java b/src/main/java/io/github/darkkronicle/kronhud/util/SnappingHelper.java index f2a4190..052c159 100644 --- a/src/main/java/io/github/darkkronicle/kronhud/util/SnappingHelper.java +++ b/src/main/java/io/github/darkkronicle/kronhud/util/SnappingHelper.java @@ -3,7 +3,7 @@ import io.github.darkkronicle.darkkore.util.Color; import lombok.Setter; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import java.util.HashSet; import java.util.List; @@ -46,27 +46,27 @@ public void addRect(Rectangle rect) { y.add(rect.y() + rect.height()); } - public void renderSnaps(MatrixStack matrices) { + public void renderSnaps(DrawContext context) { Integer curx, cury; if ((curx = getRawXSnap()) != null) { - DrawUtil.fillRect(matrices, new Rectangle(curx, 0, 1, client.getWindow().getScaledHeight()), + DrawUtil.fillRect(context, new Rectangle(curx, 0, 1, client.getWindow().getScaledHeight()), LINE_COLOR); } if ((cury = getRawYSnap()) != null) { - DrawUtil.fillRect(matrices, new Rectangle(0, cury, client.getWindow().getScaledWidth(), 1), + DrawUtil.fillRect(context, new Rectangle(0, cury, client.getWindow().getScaledWidth(), 1), LINE_COLOR); } - // renderAll(matrices); + // renderAll(context); } - public void renderAll(MatrixStack matrices) { + public void renderAll(DrawContext context) { for (Integer xval : x) { - DrawUtil.fillRect(matrices, new Rectangle(xval, 0, 1, client.getWindow().getScaledHeight()), + DrawUtil.fillRect(context, new Rectangle(xval, 0, 1, client.getWindow().getScaledHeight()), ColorUtil.WHITE); } for (Integer yval : y) { - DrawUtil.fillRect(matrices, new Rectangle(0, yval, client.getWindow().getScaledWidth(), 1), ColorUtil.WHITE); + DrawUtil.fillRect(context, new Rectangle(0, yval, client.getWindow().getScaledWidth(), 1), ColorUtil.WHITE); } } diff --git a/src/main/resources/assets/kronhud/lang/en_us.json b/src/main/resources/assets/kronhud/lang/en_us.json index 3cc3f52..253d77c 100644 --- a/src/main/resources/assets/kronhud/lang/en_us.json +++ b/src/main/resources/assets/kronhud/lang/en_us.json @@ -132,7 +132,7 @@ "texts.kronhud.togglesprint.sneaking": "Sneaking", "texts.kronhud.togglesprint.sneaking_toggled": "Sneaking [Toggled]", "hud.kronhud.armorhud.info": "A HUD component to show held items and armor", - "hud.kronhud.arrowhead.info": "A HUD component to show the amount of arrows in your inventory", + "hud.kronhud.arrowhud.info": "A HUD component to show the amount of arrows in your inventory", "hud.kronhud.cpshud.info": "A simple text component to show CPS. Right/left click can be enabled", "hud.kronhud.crosshairhud.info": "Modify the Vanilla Crosshair", "hud.kronhud.fpshud.info": "A simple text component to show FPS", From cc70df97a6aae22635bed7774b1db3bd457e8897 Mon Sep 17 00:00:00 2001 From: moehreag Date: Wed, 21 Jun 2023 22:40:11 +0200 Subject: [PATCH 2/3] correct a temporary path for easier testing --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e6aa964..b58a418 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ dependencies { // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. //modImplementation "com.github.DarkKronicle:DarkKore:${project.darkkore_version}" // 1.20.1 version not yet published - modCompileOnly files("run/DarkKore-0.3.5-1.20.1.jar") + modCompileOnly files("run/mods/DarkKore-0.3.5-1.20.1.jar") modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" From ca01177ebea7910efda788040c0f74fc4f4e57ed Mon Sep 17 00:00:00 2001 From: moehreag Date: Fri, 23 Jun 2023 16:34:17 +0200 Subject: [PATCH 3/3] update Ladysnake maven URL --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b58a418..25a7af9 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories { maven { url "https://maven.terraformersmc.com/releases" } maven { name = 'Ladysnake Mods' - url = 'https://ladysnake.jfrog.io/artifactory/mods' + url = 'https://maven.ladysnake.org/releases' content { includeGroup 'io.github.ladysnake' includeGroupByRegex 'io\\.github\\.onyxstudios.*'