split off client api internals

closes #317
badasintended · Feb 10, 2025 · 273a0f1 · 273a0f1
1 parent 846dec2
commit 273a0f1
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 54 deletions.
diff --git a/src/api/java/mcp/mobius/waila/api/__internal__/IApiService.java b/src/api/java/mcp/mobius/waila/api/__internal__/IApiService.java
@@ -5,7 +5,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import com.mojang.blaze3d.vertex.VertexConsumer;
 import mcp.mobius.waila.api.IBlacklistConfig;
 import mcp.mobius.waila.api.IData;
 import mcp.mobius.waila.api.IInstanceRegistry;
@@ -15,18 +14,13 @@
 import mcp.mobius.waila.api.IRegistryFilter;
 import mcp.mobius.waila.api.ITheme;
 import mcp.mobius.waila.api.IThemeType;
-import mcp.mobius.waila.api.ITooltipComponent;
 import mcp.mobius.waila.api.IWailaConfig;
-import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.ToolMaterial;
 import org.jetbrains.annotations.ApiStatus;
-import org.joml.Matrix4f;
 
 /**
  * @hidden
@@ -52,18 +46,12 @@ public interface IApiService {
 
     IWailaConfig getConfig();
 
-    void renderComponent(GuiGraphics ctx, ITooltipComponent component, int x, int y, DeltaTracker delta);
-
     int getPairComponentColonOffset();
 
     int getColonFontWidth();
 
     int getFontColor();
 
-    void fillGradient(Matrix4f matrix, VertexConsumer buf, int x, int y, int w, int h, int start, int end);
-
-    void renderRectBorder(Matrix4f matrix, VertexConsumer buf, int x, int y, int w, int h, int s, int gradStart, int gradEnd);
-
     <T extends ITheme> IThemeType.Builder<T> createThemeTypeBuilder(Class<T> clazz);
 
     String getDefaultEnergyUnit();
@@ -80,6 +68,4 @@ public interface IApiService {
 
     boolean isDevEnv();
 
-    MultiBufferSource getBufferSource(GuiGraphics ctx);
-
 }
diff --git a/src/api/java/mcp/mobius/waila/api/__internal__/IClientApiService.java b/src/api/java/mcp/mobius/waila/api/__internal__/IClientApiService.java
@@ -0,0 +1,25 @@
+package mcp.mobius.waila.api.__internal__;
+
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import mcp.mobius.waila.api.ITooltipComponent;
+import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.MultiBufferSource;
+import org.jetbrains.annotations.ApiStatus;
+import org.joml.Matrix4f;
+
+/** @hidden */
+@ApiStatus.Internal
+public interface IClientApiService {
+
+    IClientApiService INSTANCE = Internals.loadService(IClientApiService.class);
+
+    MultiBufferSource getBufferSource(GuiGraphics ctx);
+
+    void renderComponent(GuiGraphics ctx, ITooltipComponent component, int x, int y, DeltaTracker delta);
+
+    void fillGradient(Matrix4f matrix, VertexConsumer buf, int x, int y, int w, int h, int start, int end);
+
+    void renderRectBorder(Matrix4f matrix, VertexConsumer buf, int x, int y, int w, int h, int s, int gradStart, int gradEnd);
+
+}
diff --git a/src/api/java/mcp/mobius/waila/api/component/PairComponent.java b/src/api/java/mcp/mobius/waila/api/component/PairComponent.java
@@ -4,6 +4,7 @@
 import mcp.mobius.waila.api.IWailaConfig;
 import mcp.mobius.waila.api.__internal__.ApiSide;
 import mcp.mobius.waila.api.__internal__.IApiService;
+import mcp.mobius.waila.api.__internal__.IClientApiService;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
@@ -48,14 +49,14 @@ public int getHeight() {
     @Override
     public void render(GuiGraphics ctx, int x, int y, DeltaTracker delta) {
         var offset = key.getHeight() < height ? (height - key.getHeight()) / 2 : 0;
-        IApiService.INSTANCE.renderComponent(ctx, key, x, y + offset, delta);
+        IClientApiService.INSTANCE.renderComponent(ctx, key, x, y + offset, delta);
 
         var font = Minecraft.getInstance().font;
         offset = font.lineHeight < height ? (height - font.lineHeight) / 2 : 0;
         ctx.drawString(font, ": ", x + getColonOffset(), y + offset, IWailaConfig.get().getOverlay().getColor().getTheme().getDefaultTextColor());
 
         offset = value.getHeight() < height ? (height - value.getHeight()) / 2 : 0;
-        IApiService.INSTANCE.renderComponent(ctx, value, x + getColonOffset() + getColonWidth(), y + offset, delta);
+        IClientApiService.INSTANCE.renderComponent(ctx, value, x + getColonOffset() + getColonWidth(), y + offset, delta);
     }
 
     private int getColonOffset() {

diff --git a/src/api/java/mcp/mobius/waila/api/util/WRenders.java b/src/api/java/mcp/mobius/waila/api/util/WRenders.java
@@ -2,7 +2,7 @@
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import mcp.mobius.waila.api.__internal__.ApiSide;
-import mcp.mobius.waila.api.__internal__.IApiService;
+import mcp.mobius.waila.api.__internal__.IClientApiService;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
@@ -11,7 +11,7 @@
 public final class WRenders {
 
     public static MultiBufferSource bufferSource(GuiGraphics ctx) {
-        return IApiService.INSTANCE.getBufferSource(ctx);
+        return IClientApiService.INSTANCE.getBufferSource(ctx);
     }
 
     public static VertexConsumer buffer(GuiGraphics ctx, RenderType type) {

diff --git a/src/main/java/mcp/mobius/waila/service/ApiService.java b/src/main/java/mcp/mobius/waila/service/ApiService.java
@@ -5,7 +5,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import com.mojang.blaze3d.vertex.VertexConsumer;
 import mcp.mobius.waila.Waila;
 import mcp.mobius.waila.access.DataType;
 import mcp.mobius.waila.api.IBlacklistConfig;
@@ -17,22 +16,16 @@
 import mcp.mobius.waila.api.IRegistryFilter;
 import mcp.mobius.waila.api.ITheme;
 import mcp.mobius.waila.api.IThemeType;
-import mcp.mobius.waila.api.ITooltipComponent;
 import mcp.mobius.waila.api.IWailaConfig;
 import mcp.mobius.waila.api.__internal__.IApiService;
 import mcp.mobius.waila.config.JsonConfig;
 import mcp.mobius.waila.gui.hud.TooltipRenderer;
 import mcp.mobius.waila.gui.hud.theme.ThemeType;
-import mcp.mobius.waila.mixin.GuiGraphicsAccess;
 import mcp.mobius.waila.plugin.PluginInfo;
 import mcp.mobius.waila.registry.InstanceRegistry;
 import mcp.mobius.waila.registry.RegistryFilter;
-import mcp.mobius.waila.util.DisplayUtil;
 import mcp.mobius.waila.util.Log;
 import mcp.mobius.waila.util.ModInfo;
-import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.Registry;
 import net.minecraft.core.component.DataComponents;
@@ -48,7 +41,6 @@
 import net.minecraft.world.item.component.CustomData;
 import net.minecraft.world.item.enchantment.ItemEnchantments;
 import net.minecraft.world.level.block.Block;
-import org.joml.Matrix4f;
 
 public abstract class ApiService implements IApiService {
 
@@ -122,11 +114,6 @@ public IWailaConfig getConfig() {
         return Waila.CONFIG.get();
     }
 
-    @Override
-    public void renderComponent(GuiGraphics ctx, ITooltipComponent component, int x, int y, DeltaTracker delta) {
-        DisplayUtil.renderComponent(ctx, component, x, y, 0, delta);
-    }
-
     @Override
     public int getPairComponentColonOffset() {
         return TooltipRenderer.colonOffset;
@@ -142,16 +129,6 @@ public int getFontColor() {
         return TooltipRenderer.state.getTheme().getDefaultTextColor();
     }
 
-    @Override
-    public void fillGradient(Matrix4f matrix, VertexConsumer buf, int x, int y, int w, int h, int start, int end) {
-        DisplayUtil.fillGradient(matrix, buf, x, y, w, h, start, end);
-    }
-
-    @Override
-    public void renderRectBorder(Matrix4f matrix, VertexConsumer buf, int x, int y, int w, int h, int s, int gradStart, int gradEnd) {
-        DisplayUtil.renderRectBorder(matrix, buf, x, y, w, h, s, gradStart, gradEnd);
-    }
-
     @Override
     public <T extends ITheme> IThemeType.Builder<T> createThemeTypeBuilder(Class<T> clazz) {
         return new ThemeType<>(clazz);
@@ -232,9 +209,4 @@ public boolean isDevEnv() {
         return Waila.DEV;
     }
 
-    @Override
-    public MultiBufferSource getBufferSource(GuiGraphics ctx) {
-        return ((GuiGraphicsAccess) ctx).wthit_bufferSource();
-    }
-
 }
diff --git a/src/main/java/mcp/mobius/waila/service/ClientApiService.java b/src/main/java/mcp/mobius/waila/service/ClientApiService.java
@@ -0,0 +1,35 @@
+package mcp.mobius.waila.service;
+
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import mcp.mobius.waila.api.ITooltipComponent;
+import mcp.mobius.waila.api.__internal__.IClientApiService;
+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.renderer.MultiBufferSource;
+import org.joml.Matrix4f;
+
+public class ClientApiService implements IClientApiService {
+
+    @Override
+    public void renderComponent(GuiGraphics ctx, ITooltipComponent component, int x, int y, DeltaTracker delta) {
+        DisplayUtil.renderComponent(ctx, component, x, y, 0, delta);
+    }
+
+    @Override
+    public void fillGradient(Matrix4f matrix, VertexConsumer buf, int x, int y, int w, int h, int start, int end) {
+        DisplayUtil.fillGradient(matrix, buf, x, y, w, h, start, end);
+    }
+
+    @Override
+    public void renderRectBorder(Matrix4f matrix, VertexConsumer buf, int x, int y, int w, int h, int s, int gradStart, int gradEnd) {
+        DisplayUtil.renderRectBorder(matrix, buf, x, y, w, h, s, gradStart, gradEnd);
+    }
+
+    @Override
+    public MultiBufferSource getBufferSource(GuiGraphics ctx) {
+        return ((GuiGraphicsAccess) ctx).wthit_bufferSource();
+    }
+
+}
diff --git a/src/pluginCore/java/mcp/mobius/waila/plugin/core/theme/GradientTheme.java b/src/pluginCore/java/mcp/mobius/waila/plugin/core/theme/GradientTheme.java
@@ -5,11 +5,10 @@
 import mcp.mobius.waila.api.IThemeAccessor;
 import mcp.mobius.waila.api.IThemeType;
 import mcp.mobius.waila.api.IntFormat;
-import mcp.mobius.waila.api.__internal__.IApiService;
+import mcp.mobius.waila.api.__internal__.IClientApiService;
 import mcp.mobius.waila.api.util.WRenders;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.renderer.CoreShaders;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.Range;
@@ -58,7 +57,6 @@ public void setPadding(Padding padding) {
     public void renderTooltipBackground(GuiGraphics ctx, int x, int y, int width, int height, @Range(from = 0x00, to = 0xFF) int alpha, DeltaTracker delta) {
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        RenderSystem.setShader(CoreShaders.POSITION_COLOR);
 
         var buf = WRenders.buffer(ctx, RenderType.gui());
         var matrix = ctx.pose().last().pose();
@@ -71,16 +69,16 @@ public void renderTooltipBackground(GuiGraphics ctx, int x, int y, int width, in
         var bo2 = borderOffset * 2;
 
         if (drawCorner) {
-            IApiService.INSTANCE.fillGradient(matrix, buf, x, y, width, height, bg, bg);
+            IClientApiService.INSTANCE.fillGradient(matrix, buf, x, y, width, height, bg, bg);
         } else {
             // @formatter:off
-            IApiService.INSTANCE.fillGradient(matrix, buf, x + bo        , y     , width - bo2, height      , bg, bg);
-            IApiService.INSTANCE.fillGradient(matrix, buf, x             , y + bo, bo         , height - bo2, bg, bg);
-            IApiService.INSTANCE.fillGradient(matrix, buf, x + width - bo, y + bo, bo         , height - bo2, bg, bg);
+            IClientApiService.INSTANCE.fillGradient(matrix, buf, x + bo        , y     , width - bo2, height      , bg, bg);
+            IClientApiService.INSTANCE.fillGradient(matrix, buf, x             , y + bo, bo         , height - bo2, bg, bg);
+            IClientApiService.INSTANCE.fillGradient(matrix, buf, x + width - bo, y + bo, bo         , height - bo2, bg, bg);
             // @formatter:on
         }
 
-        IApiService.INSTANCE.renderRectBorder(matrix, buf, x + bo, y + bo, width - bo2, height - bo2, borderSize, gradStart, gradEnd);
+        IClientApiService.INSTANCE.renderRectBorder(matrix, buf, x + bo, y + bo, width - bo2, height - bo2, borderSize, gradStart, gradEnd);
 
         ctx.flush();
     }

diff --git a/...resources/resources/META-INF/services/mcp.mobius.waila.api.__internal__.IClientApiService b/...resources/resources/META-INF/services/mcp.mobius.waila.api.__internal__.IClientApiService
@@ -0,0 +1 @@
+mcp.mobius.waila.service.ClientApiService