#479033547

Committed 17 Mar 2024 09:56AM CUT coverage: 22.398% (+0.2%) from 22.159%

Build # #479033547

Build Type

push

github

Committed by

rubensworks

Commit Message

Update to NeoForge 1.20.4

Run Details

5 of 635 new or added lines in 138 files covered. (0.79%)

39 existing lines in 26 files now uncovered.

2300 of 10269 relevant lines covered (22.4%)

0.22 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/main/java/org/cyclops/cyclopscore/client/gui/GuiGraphicsExtended.java

package org.cyclops.cyclopscore.client.gui;

import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.util.Mth;
import net.minecraft.world.item.ItemStack;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import org.cyclops.cyclopscore.helper.GuiHelpers;
import org.jetbrains.annotations.Nullable;

/**
 * Additional helper functions related to {@link GuiGraphics}.
 * @author rubensworks
 */
@OnlyIn(Dist.CLIENT)
public class GuiGraphicsExtended {

    private final GuiGraphics guiGraphics;

    public GuiGraphicsExtended(GuiGraphics guiGraphics) {
        this.guiGraphics = guiGraphics;
    }

    public void drawSlotText(Font font, @javax.annotation.Nullable String text, int x, int y) { // Abstracted for reuse
        guiGraphics.pose().pushPose();
        guiGraphics.pose().translate(0.0F, 0.0F, 200.0F);
        float scale = 0.5f; // This part was added
        guiGraphics.pose().scale(scale, scale, 1.0f); // This part was added
        guiGraphics.drawString(font, text, (x + 19 - 2) / scale - font.width(text), (float)(y + 6 + 6) / scale, 16777215, true); // Scale was added here
        guiGraphics.pose().popPose();
    }

    public void renderItemDecorations(Font font, ItemStack stack, int x, int y) {
        this.renderItemDecorations(font, stack, x, y, (String)null);
    }

    public void renderItemDecorations(Font font, ItemStack stack, int x, int y, @Nullable String text) {
        // ----- Copied and adjusted from GuiGraphics#renderItemDecorations -----
        if (!stack.isEmpty()) {
            guiGraphics.pose().pushPose();
            if (stack.getCount() != 1 || text != null) {
                String s = text == null ? GuiHelpers.quantityToScaledString(stack.getCount()) : text; // This part was changed
                drawSlotText(font, s, x, y); // New function
            }

            if (stack.isBarVisible()) {
                int l = stack.getBarWidth();
                int i = stack.getBarColor();
                int j = x + 2;
                int k = y + 13;
                guiGraphics.fill(RenderType.guiOverlay(), j, k, j + 13, k + 2, -16777216);
                guiGraphics.fill(RenderType.guiOverlay(), j, k, j + l, k + 1, i | -16777216);
            }

            Minecraft minecraft = Minecraft.getInstance();
            LocalPlayer localplayer = minecraft.player;
            float f = localplayer == null ? 0.0F : localplayer.getCooldowns().getCooldownPercent(stack.getItem(), minecraft.getFrameTime());
            if (f > 0.0F) {
                int i1 = y + Mth.floor(16.0F * (1.0F - f));
                int j1 = i1 + Mth.ceil(16.0F * f);
                guiGraphics.fill(RenderType.guiOverlay(), x, i1, x + 16, j1, Integer.MAX_VALUE);
            }

            guiGraphics.pose().popPose();
            net.neoforged.neoforge.client.ItemDecoratorHandler.of(stack).render(guiGraphics, font, stack, x, y);
        }
    }
}

1	package org.cyclops.cyclopscore.client.gui;
2
3	import net.minecraft.client.Minecraft;
4	import net.minecraft.client.gui.Font;
5	import net.minecraft.client.gui.GuiGraphics;
6	import net.minecraft.client.player.LocalPlayer;
7	import net.minecraft.client.renderer.RenderType;
8	import net.minecraft.util.Mth;
9	import net.minecraft.world.item.ItemStack;
10	import net.neoforged.api.distmarker.Dist;
11	import net.neoforged.api.distmarker.OnlyIn;
12	import org.cyclops.cyclopscore.helper.GuiHelpers;
13	import org.jetbrains.annotations.Nullable;
14
15	/**
16	* Additional helper functions related to {@link GuiGraphics}.
17	* @author rubensworks
18	*/
19	@OnlyIn(Dist.CLIENT)
20	public class GuiGraphicsExtended {
21
22	private final GuiGraphics guiGraphics;
23
24	public GuiGraphicsExtended(GuiGraphics guiGraphics) {	×
25	this.guiGraphics = guiGraphics;	×
26	}	×
27
28	public void drawSlotText(Font font, @javax.annotation.Nullable String text, int x, int y) { // Abstracted for reuse
29	guiGraphics.pose().pushPose();	×
30	guiGraphics.pose().translate(0.0F, 0.0F, 200.0F);	×
31	float scale = 0.5f; // This part was added	×
32	guiGraphics.pose().scale(scale, scale, 1.0f); // This part was added	×
33	guiGraphics.drawString(font, text, (x + 19 - 2) / scale - font.width(text), (float)(y + 6 + 6) / scale, 16777215, true); // Scale was added here	×
34	guiGraphics.pose().popPose();	×
35	}	×
36
37	public void renderItemDecorations(Font font, ItemStack stack, int x, int y) {
38	this.renderItemDecorations(font, stack, x, y, (String)null);	×
39	}	×
40
41	public void renderItemDecorations(Font font, ItemStack stack, int x, int y, @Nullable String text) {
42	// ----- Copied and adjusted from GuiGraphics#renderItemDecorations -----
43	if (!stack.isEmpty()) {	×
44	guiGraphics.pose().pushPose();	×
45	if (stack.getCount() != 1 \|\| text != null) {	×
46	String s = text == null ? GuiHelpers.quantityToScaledString(stack.getCount()) : text; // This part was changed	×
47	drawSlotText(font, s, x, y); // New function	×
48	}
49
50	if (stack.isBarVisible()) {	×
51	int l = stack.getBarWidth();	×
52	int i = stack.getBarColor();	×
53	int j = x + 2;	×
54	int k = y + 13;	×
55	guiGraphics.fill(RenderType.guiOverlay(), j, k, j + 13, k + 2, -16777216);	×
56	guiGraphics.fill(RenderType.guiOverlay(), j, k, j + l, k + 1, i \| -16777216);	×
57	}
58
59	Minecraft minecraft = Minecraft.getInstance();	×
60	LocalPlayer localplayer = minecraft.player;	×
61	float f = localplayer == null ? 0.0F : localplayer.getCooldowns().getCooldownPercent(stack.getItem(), minecraft.getFrameTime());	×
62	if (f > 0.0F) {	×
63	int i1 = y + Mth.floor(16.0F * (1.0F - f));	×
64	int j1 = i1 + Mth.ceil(16.0F * f);	×
65	guiGraphics.fill(RenderType.guiOverlay(), x, i1, x + 16, j1, Integer.MAX_VALUE);	×
66	}
67
68	guiGraphics.pose().popPose();	×
NEW 69	net.neoforged.neoforge.client.ItemDecoratorHandler.of(stack).render(guiGraphics, font, stack, x, y);	×
70	}
71	}	×
72	}

CyclopsMC / CyclopsCore / #479033547

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous