Skip to content

Commit

Permalink
fixed having exactly %20==0 azure dike rendering an empty dike canister
Browse files Browse the repository at this point in the history
  • Loading branch information
@DaFuqs
DaFuqs committed Dec 5, 2023
1 parent 41f22c1 commit ab9aa41
Showing 1 changed file with 37 additions and 40 deletions.
77 changes: 37 additions & 40 deletions src/main/java/de/dafuqs/spectrum/render/HudRenderers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,22 @@

@Environment(EnvType.CLIENT)
public class HudRenderers {

private static final Text missingInkText = Text.translatable("item.spectrum.constructors_staff.tooltip.missing_ink");
private static final Text noneText = Text.translatable("item.spectrum.constructors_staff.tooltip.none_in_inventory");

private static ItemStack itemStackToRender;
private static int amount;
private static boolean missingInk;

public static void register() {
// That one is on Patchouli. ty <3
HudRenderCallback.EVENT.register((drawContext, tickDelta) -> renderSelectedStaffStack(drawContext));
}


private static final int SPECTRUM$_DIKE_HEARTS_PER_ROW = 10;
private static final int SPECTRUM$_DIKE_PER_ROW = 20;

// this is run in InGameHudMixin instead to render behind the chat and other gui elements
public static void renderAzureDike(DrawContext drawContext, int scaledWidth, int scaledHeight, PlayerEntity cameraPlayer) {
AzureDikeComponent azureDikeComponent = AzureDikeProvider.getAzureDikeComponent(cameraPlayer);
Expand All @@ -39,29 +42,25 @@ public static void renderAzureDike(DrawContext drawContext, int scaledWidth, int
if (cameraPlayer.getRecentDamageSource() != null && cameraPlayer.getWorld() != null) {
blink = (cameraPlayer.getWorld().getTime() >> 2) % 2 == 0;
}

int fullCanisters = charges / 20;
int emptyCanisters = (maxCharges / 20) - fullCanisters;
int displayedHearts = charges % 20;
if (displayedHearts == 0 && charges > 0) { // if the row is full render it as full instead of wrapping over
displayedHearts = 20;
fullCanisters--;
emptyCanisters++;
}
int renderedOutlines = emptyCanisters > 0 ? 10 : ((maxCharges % 20 / 2) + (maxCharges % 2 == 0 ? 0 : 1));
boolean renderBackRow = fullCanisters > 0;


int totalDikeCanisters = (maxCharges - 1) / SPECTRUM$_DIKE_PER_ROW;
int filledDikeCanisters = (charges - 1) / SPECTRUM$_DIKE_PER_ROW;
int singleDike = (charges - 1) % SPECTRUM$_DIKE_PER_ROW + 1;

int dikeHeartOutlinesThisRow = (totalDikeCanisters - filledDikeCanisters) > 0 ? SPECTRUM$_DIKE_HEARTS_PER_ROW : (((maxCharges - 1) % SPECTRUM$_DIKE_PER_ROW / 2) + 1);
boolean renderBackRow = filledDikeCanisters > 0;

int maxHealth = (int) cameraPlayer.getMaxHealth();
int heartRows = maxHealth / 20;
if (cameraPlayer.getMaxHealth() % 20 == 0) {
int heartRows = maxHealth / SPECTRUM$_DIKE_PER_ROW;
if (cameraPlayer.getMaxHealth() % SPECTRUM$_DIKE_PER_ROW == 0) {
heartRows--;
}
boolean hasArmor = cameraPlayer.getArmor() > 0;
var texture = AzureDikeComponent.AZURE_DIKE_BAR_TEXTURE;

int width = scaledWidth / 2 - 82;
int height = scaledHeight - 49;

// Fit display to HealthOverlay renderer if present
if (FabricLoader.getInstance().isModLoaded("healthoverlay")) {
int i = 1;
Expand All @@ -72,27 +71,26 @@ public static void renderAzureDike(DrawContext drawContext, int scaledWidth, int
heartRows = 0;
absorptionAmount = Math.min(i, absorptionAmount);
}

int y = hasArmor ? height + heartRows * SpectrumCommon.CONFIG.AzureDikeHudOffsetYForEachRowOfExtraHearts + SpectrumCommon.CONFIG.AzureDikeHudOffsetYWithArmor : height + SpectrumCommon.CONFIG.AzureDikeHudOffsetY;
if (absorptionAmount > 0) {
int absorptionRows = (int) Math.ceil(absorptionAmount / 20.0F);
int absorptionRowHeight = 10 - (absorptionRows - 2);
y -= absorptionRows * Math.max(absorptionRowHeight, 3);
}
int x = width - 9 + SpectrumCommon.CONFIG.AzureDikeHudOffsetX;

// back row
if (renderBackRow) {
for (int i = displayedHearts / 2; i < 10; i++) {
for (int i = singleDike / 2; i < 10; i++) {
drawContext.drawTexture(texture, x + i * 8, y, 36, 9, 9, 9, 256, 256); // "back row" icon
}
}

// outline
for (int i = 0; i < renderedOutlines; i++) {
for (int i = 0; i < dikeHeartOutlinesThisRow; i++) {
if (renderBackRow) {
if (blink) {

drawContext.drawTexture(texture, x + i * 8, y, 54, 9, 9, 9, 256, 256); // background
} else {
drawContext.drawTexture(texture, x + i * 8, y, 45, 9, 9, 9, 256, 256); // background
Expand All @@ -105,39 +103,39 @@ public static void renderAzureDike(DrawContext drawContext, int scaledWidth, int
}
}
}

// hearts
for (int i = 0; i < displayedHearts; i++) {
for (int i = 0; i < singleDike; i++) {
int q = i * 2 + 1;
if (q < displayedHearts) {
if (q < singleDike) {
drawContext.drawTexture(texture, x + i * 8, y, 18, 9, 9, 9, 256, 256); // full charge icon
} else if (q == displayedHearts) {
} else if (q == singleDike) {
drawContext.drawTexture(texture, x + i * 8, y, 27, 9, 9, 9, 256, 256); // half charge icon
}
}

// canisters
for (int i = 0; i < fullCanisters; i++) {
for (int i = 0; i < filledDikeCanisters; i++) {
drawContext.drawTexture(texture, x + i * 6, y - 9, 0, 0, 9, 9, 256, 256); // full canisters
}
for (int i = fullCanisters; i < fullCanisters + emptyCanisters; i++) {
for (int i = filledDikeCanisters; i < totalDikeCanisters; i++) {
drawContext.drawTexture(texture, x + i * 6, y - 9, 9, 0, 9, 9, 256, 256); // empty canisters
}
}
}

private static void renderSelectedStaffStack(DrawContext drawContext) {
MinecraftClient client = MinecraftClient.getInstance();
if (amount > -1 && itemStackToRender != null) {
// Render the item stack next to the cursor
Window window = MinecraftClient.getInstance().getWindow();
int x = window.getScaledWidth() / 2 + 3;
int y = window.getScaledHeight() / 2 + 3;

var matrixStack = drawContext.getMatrices();
matrixStack.push();
matrixStack.scale(0.5F, 0.5F, 1F);

var textRenderer = client.textRenderer;
drawContext.drawItem(itemStackToRender, (x + 8) * 2, (y + 8) * 2); // TODO: make this render 2x the size, so it spans all 2 rows of text
matrixStack.scale(2F, 2F, 1F);
Expand All @@ -152,16 +150,15 @@ private static void renderSelectedStaffStack(DrawContext drawContext) {
matrixStack.pop();
}
}

public static void setItemStackToRender(ItemStack itemStack, int amount, boolean missingInk) {
HudRenderers.itemStackToRender = itemStack;
HudRenderers.amount = amount;
HudRenderers.missingInk = missingInk;
}

public static void clearItemStackOverlay() {
HudRenderers.amount = -1;
}



}

0 comments on commit ab9aa41

Please sign in to comment.