bar text

Author: deirn

platform/fabric/src/main/java/mcp/mobius/waila/fabric/FabricWailaClient.java

@@ -8,7 +8,6 @@
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationConnectionEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
-import net.fabricmc.fabric.api.client.rendering.v1.SpecialGuiElementRegistry;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.minecraft.server.packs.PackType;
 
@@ -17,7 +16,6 @@ public class FabricWailaClient extends WailaClient implements ClientModInitializ
     @Override
     public void onInitializeClient() {
         registerKeyBinds();
-        getPictureInPictureRenderers().forEach(fn -> SpecialGuiElementRegistry.register(ctx -> fn.apply(ctx.vertexConsumers())));
 
         Packets.initClient();
 

platform/neo/src/main/java/mcp/mobius/waila/neo/NeoWailaClient.java

@@ -17,7 +17,6 @@
 import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.client.event.RegisterClientCommandsEvent;
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
-import net.neoforged.neoforge.client.event.RegisterPictureInPictureRenderersEvent;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent;
 
@@ -37,11 +36,6 @@ static void registerKeyMappings(RegisterKeyMappingsEvent event) {
         registerKeyBinds().forEach(event::register);
     }
 
-    @SubscribeEvent
-    static void registerPictureInPictureRenderers(RegisterPictureInPictureRenderersEvent event) {
-        getPictureInPictureRenderers().forEach(event::register);
-    }
-
     @SubscribeEvent
     static void addReloadListener(AddClientReloadListenersEvent event) {
         event.addListener(BuiltinThemeLoader.ID, new BuiltinThemeLoader());

src/api/java/mcp/mobius/waila/api/__internal__/IClientApiService.java

@@ -6,10 +6,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.client.gui.render.state.GuiRenderState;
-import net.minecraft.client.gui.render.state.pip.PictureInPictureRenderState;
-import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3x2f;
 
 /** @hidden */
@@ -28,6 +25,4 @@ public interface IClientApiService {
 
     void renderRectBorder(Matrix3x2f matrix, VertexConsumer buf, int x, int y, float z, int w, int h, int s, int gradStart, int gradEnd);
 
-    PictureInPictureRenderState pipOutlinedText(Component text, int x, int y, float scale, @Nullable ScreenRectangle scissorArea);
-
 }

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

@@ -3,8 +3,6 @@
 import mcp.mobius.waila.api.ITooltipComponent;
 import mcp.mobius.waila.api.WailaConstants;
 import mcp.mobius.waila.api.__internal__.ApiSide;
-import mcp.mobius.waila.api.__internal__.IClientApiService;
-import mcp.mobius.waila.api.util.WRenders;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -89,7 +87,15 @@ static void renderText(GuiGraphics ctx, Component text, int x, int y) {
         var textX = x + (int) Math.max((BarComponent.WIDTH - textWidth) / 2F, 0F);
         var textY = y + 2;
 
-        WRenders.state(ctx).submitPicturesInPictureState(IClientApiService.INSTANCE.pipOutlinedText(text, textX, textY, 1, WRenders.scissor(ctx)));
+        var formatted = text.getVisualOrderText();
+        for (var i = -1; i <= 1; i++) {
+            for (var j = -1; j <= 1; j++) {
+                if (i != 0 || j != 0) {
+                    ctx.drawString(font, formatted, textX + i, textY + j, 0xFF292929, false);
+                }
+            }
+        }
+        ctx.drawString(font, formatted, textX, textY, 0xFFAAAAAA, false);
     }
 
 }

src/main/java/mcp/mobius/waila/WailaClient.java

@@ -1,7 +1,6 @@
 package mcp.mobius.waila;
 
 import java.util.List;
-import java.util.function.Function;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import mcp.mobius.waila.access.ClientAccessor;
@@ -10,7 +9,6 @@
 import mcp.mobius.waila.buildconst.Tl;
 import mcp.mobius.waila.config.PluginConfig;
 import mcp.mobius.waila.gui.hud.TooltipHandler;
-import mcp.mobius.waila.gui.render.OutlinedTextRenderer;
 import mcp.mobius.waila.gui.screen.HomeScreen;
 import mcp.mobius.waila.integration.IRecipeAction;
 import mcp.mobius.waila.registry.Registrar;
@@ -19,8 +17,6 @@
 import mcp.mobius.waila.util.Log;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.Nullable;
@@ -62,10 +58,6 @@ protected static List<KeyMapping> registerKeyBinds() {
         );
     }
 
-    protected static List<Function<MultiBufferSource.BufferSource, PictureInPictureRenderer<?>>> getPictureInPictureRenderers() {
-        return List.of(OutlinedTextRenderer::new);
-    }
-
     protected static void onClientTick() {
         Waila.onAnyTick();
 

src/main/java/mcp/mobius/waila/gui/render/OutlinedTextRenderer.java

@@ -4,16 +4,11 @@
 import mcp.mobius.waila.api.ITooltipComponent;
 import mcp.mobius.waila.api.__internal__.IClientApiService;
 import mcp.mobius.waila.gui.hud.ComponentRenderer;
-import mcp.mobius.waila.gui.render.OutlinedTextRenderer;
 import mcp.mobius.waila.mixin.GuiGraphicsAccess;
 import mcp.mobius.waila.util.DisplayUtil;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.client.gui.render.state.GuiRenderState;
-import net.minecraft.client.gui.render.state.pip.PictureInPictureRenderState;
-import net.minecraft.network.chat.Component;
-import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix3x2f;
 
 public abstract class ClientApiService implements IClientApiService {
@@ -38,9 +33,4 @@ public void renderRectBorder(Matrix3x2f matrix, VertexConsumer buf, int x, int y
         DisplayUtil.renderRectBorder(matrix, buf, x, y, z, w, h, s, gradStart, gradEnd);
     }
 
-    @Override
-    public PictureInPictureRenderState pipOutlinedText(Component text, int x, int y, float scale, @Nullable ScreenRectangle scissorArea) {
-        return OutlinedTextRenderer.state(text, x, y, scale, scissorArea);
-    }
-
 }