Skip to content

Added yRiding offset to config #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rimevel wants to merge 1 commit into
base: 1.19.2
Choose a base branch
from
Open

Added yRiding offset to config #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/main/java/com/elenai/feathers/client/gui/FeathersHudOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ public class FeathersHudOverlay {
int fadeOut = FeathersClientConfig.FADE_OUT_COOLDOWN.get();
int xOffset = FeathersClientConfig.X_OFFSET.get();
int yOffset = FeathersClientConfig.Y_OFFSET.get();
int yRiding = FeathersClientConfig.Y_OFFSET_RIDING.get();
Minecraft minecraft = Minecraft.getInstance();

int x = screenWidth / 2;
int y = screenHeight;

int rightOffset = FeathersClientConfig.AFFECTED_BY_RIGHT_HEIGHT.get() ? gui.rightHeight : 0;
int topOffset = minecraft.player.isRidingJumpable() ? yRiding : yOffset;

RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.enableBlend();
Expand Down Expand Up @@ -71,7 +73,7 @@ public class FeathersHudOverlay {
if ((i + 1 <= Math.ceil((double) ClientFeathersData.getMaxFeathers() / 2.0d))) {
int cold = ((ClientFeathersData.isCold()) ? 18 : 0);
int height = (k > i * 10 && k < (i + 1) * 10) ? 2 : 0;
GuiComponent.blit(poseStack, x + 81 - (i * 8) + xOffset, y - rightOffset - height + yOffset, NONE,
GuiComponent.blit(poseStack, x + 81 - (i * 8) + xOffset, y - rightOffset - height + topOffset, NONE,
cold, 9, 9, 256, 256);
}
}
Expand All @@ -89,7 +91,7 @@ public class FeathersHudOverlay {
int height = (k > i * 10 && k < (i + 1) * 10) ? 2 : 0;

int cold = ((ClientFeathersData.isCold()) ? 18 : 0);
GuiComponent.blit(poseStack, x + 81 - (i * 8) + xOffset, y- rightOffset - height + yOffset,
GuiComponent.blit(poseStack, x + 81 - (i * 8) + xOffset, y- rightOffset - height + topOffset,
type, cold, 9, 9, 256, 256);
} else {
break;
Expand All @@ -111,7 +113,7 @@ public class FeathersHudOverlay {

int lowerFeathers = (i >= Math.floor((double) ClientFeathersData.getFeathers() / 2.0d)) ? 9 : 0;

GuiComponent.blit(poseStack, x + 81 - (i * 8) + xOffset, y - rightOffset - height + yOffset,
GuiComponent.blit(poseStack, x + 81 - (i * 8) + xOffset, y - rightOffset - height + topOffset,
type, lowerFeathers, 9, 9, 256, 256);
} else {
break;
Expand All @@ -130,7 +132,7 @@ public class FeathersHudOverlay {
&& ClientFeathersData.getFeathers() % 2 != 0 ? HALF_FLOW : FULL_FLOW);
int height = (k > i * 10 && k < (i + 1) * 10) ? 2 : 0;
int cold = ((ClientFeathersData.isCold()) ? 18 : 0);
GuiComponent.blit(poseStack, x + 81 - (i * 8) + xOffset, y- rightOffset - height + yOffset,
GuiComponent.blit(poseStack, x + 81 - (i * 8) + xOffset, y- rightOffset - height + topOffset,
type, cold, 9, 9, 256, 256);
} else {
break;
Expand All @@ -146,7 +148,7 @@ public class FeathersHudOverlay {
|| ClientFeathersData.getAnimationCooldown() == 10) {
if ((i + 1 <= Math.ceil((double) ClientFeathersData.getMaxFeathers() / 2.0d))) {
int height = (k > i * 10 && k < (i + 1) * 10) ? 2 : 0;
GuiComponent.blit(poseStack, x + 81 - (i * 8) + xOffset, y - rightOffset - height + yOffset,
GuiComponent.blit(poseStack, x + 81 - (i * 8) + xOffset, y - rightOffset - height + topOffset,
NONE, 9, 9, 9, 256, 256);
}
}
Expand Down Expand Up @@ -183,7 +185,7 @@ public class FeathersHudOverlay {
&& (ClientFeathersData.getEnduranceFeathers() % 2 != 0)) ? HALF : FULL);

GuiComponent.blit(poseStack, x + 81 - (j * 8) + xOffset,
y /*- 58*/ - rightOffset + yOffset - ((i) * 10), type, 9, 9, 9, 256, 256);
y /*- 58*/ - rightOffset + topOffset - ((i) * 10), type, 9, 9, 9, 256, 256);
} else {
break;
}
Expand All @@ -194,7 +196,7 @@ public class FeathersHudOverlay {
}

if (Feathers.OB_LOADED) {
RowCountRenderer.drawBarRowCount(poseStack, x + 100 + xOffset, y - rightOffset + 10 + yOffset, ClientFeathersData.getFeathers(), true, minecraft.font);
RowCountRenderer.drawBarRowCount(poseStack, x + 100 + xOffset, y - rightOffset + 10 + topOffset, ClientFeathersData.getFeathers(), true, minecraft.font);
}

}
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/elenai/feathers/config/FeathersClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public class FeathersClientConfig {
public static final ForgeConfigSpec.ConfigValue<Integer> FADE_OUT_COOLDOWN;
public static final ForgeConfigSpec.ConfigValue<Integer> FADE_COOLDOWN;

public static final ForgeConfigSpec.ConfigValue<Integer> Y_OFFSET_RIDING;

static {
BUILDER.push("Feathers' Config");

Expand Down Expand Up @@ -55,6 +57,9 @@ public class FeathersClientConfig {

Y_OFFSET = BUILDER.comment("How far up or down you want the feathers to be. TIP: use this for compatibility with mods that add other bars such as thirst")
.define("HUD Y Offset", 0);

Y_OFFSET_RIDING = BUILDER.comment("How far up or down you want the feathers to be when riding a horse.")
.define("HUD Y Offset When Riding", 0);

BUILDER.pop();
SPEC = BUILDER.build();
Expand Down