Skip to content

Commit 7727d33

Browse files
committed
fix atlas and sprite bar scissoring
1 parent 042a315 commit 7727d33

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

platform/neo/src/plugin/java/mcp/mobius/waila/plugin/neo/fluid/NeoFluidDescriptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import mcp.mobius.waila.api.data.FluidData.FluidDescriptionContext;
55
import mcp.mobius.waila.api.data.FluidData.FluidDescriptor;
66
import net.minecraft.client.Minecraft;
7-
import net.minecraft.world.inventory.InventoryMenu;
7+
import net.minecraft.client.renderer.texture.TextureAtlas;
88
import net.minecraft.world.level.material.Fluid;
99
import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions;
1010
import net.neoforged.neoforge.fluids.FluidStack;
@@ -20,7 +20,7 @@ public void describeFluid(FluidDescriptionContext<Fluid> ctx, FluidDescription d
2020
var extensions = IClientFluidTypeExtensions.of(type);
2121

2222
desc.name(type.getDescription(stack))
23-
.sprite(Minecraft.getInstance().getTextureAtlas(InventoryMenu.BLOCK_ATLAS).apply(extensions.getStillTexture(stack)))
23+
.sprite(Minecraft.getInstance().getTextureAtlas(TextureAtlas.LOCATION_BLOCKS).apply(extensions.getStillTexture(stack)))
2424
.tint(extensions.getTintColor(stack));
2525
}
2626

src/api/java/mcp/mobius/waila/api/component/SpriteBarComponent.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,16 @@ public void render(GuiGraphics ctx, int x, int y, DeltaTracker delta) {
6262

6363
BarComponent.renderBar(matrices, x, y, BarComponent.WIDTH, BarComponent.V0_BG, BarComponent.U1, BarComponent.V1_BG, 0xFFAAAAAA);
6464

65+
var mx = (int) (x + BarComponent.WIDTH * ratio);
66+
var my = y + BarComponent.HEIGHT;
67+
ctx.enableScissor(x + 1, y + 1, mx - 1, my - 1);
68+
6569
matrices.pushPose();
6670
RenderSystem.enableBlend();
6771
RenderSystem.defaultBlendFunc();
6872
RenderSystem.setShader(CoreShaders.POSITION_TEX_COLOR);
6973
RenderSystem.setShaderTexture(0, texture);
7074

71-
var mx = (int) (x + BarComponent.WIDTH * ratio);
72-
var my = y + BarComponent.HEIGHT;
73-
74-
ctx.enableScissor(x + 1, y + 1, mx - 1, my - 1);
75-
7675
var a = WailaHelper.getAlpha(spriteTint);
7776
var r = WailaHelper.getRed(spriteTint);
7877
var g = WailaHelper.getGreen(spriteTint);

0 commit comments

Comments
 (0)