From 92540059a5b1cb009c390e9c4815d0a0d7c38576 Mon Sep 17 00:00:00 2001 From: deirn Date: Mon, 22 Mar 2021 10:03:58 +0700 Subject: [PATCH] #16 fix server crash --- .../src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java | 2 +- .../main/java/mcp/mobius/waila/overlay/OverlayRenderer.java | 6 +++++- .../overlay/tooltiprenderers/TooltipRendererHealth.java | 5 +++-- .../waila/overlay/tooltiprenderers/TooltipRendererIcon.java | 5 +++-- .../tooltiprenderers/TooltipRendererProgressBar.java | 6 ++++-- .../overlay/tooltiprenderers/TooltipRendererStack.java | 5 +++-- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java b/common/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java index c0600009d..efe80dcce 100644 --- a/common/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java +++ b/common/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java @@ -17,7 +17,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; -public class DisplayUtil extends DrawableHelper { +public final class DisplayUtil extends DrawableHelper { // because some function in DrawableHelper are not static private static final DisplayUtil DH = new DisplayUtil(); diff --git a/common/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java b/common/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java index ab46c9719..ad49f1930 100644 --- a/common/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java +++ b/common/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java @@ -14,7 +14,11 @@ import net.minecraft.client.util.math.MatrixStack; import org.lwjgl.opengl.GL11; -public class OverlayRenderer extends DisplayUtil { +import static mcp.mobius.waila.overlay.DisplayUtil.drawGradientRect; +import static mcp.mobius.waila.overlay.DisplayUtil.enable2DRender; +import static mcp.mobius.waila.overlay.DisplayUtil.renderStack; + +public class OverlayRenderer { protected static boolean hasLight; protected static boolean hasDepthTest; diff --git a/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererHealth.java b/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererHealth.java index a3578560f..d7adb620a 100644 --- a/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererHealth.java +++ b/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererHealth.java @@ -5,13 +5,14 @@ import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.ICommonAccessor; import mcp.mobius.waila.api.ITooltipRenderer; -import mcp.mobius.waila.overlay.DisplayUtil; import mcp.mobius.waila.overlay.IconUI; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.MathHelper; -public class TooltipRendererHealth extends DisplayUtil implements ITooltipRenderer { +import static mcp.mobius.waila.overlay.DisplayUtil.renderIcon; + +public class TooltipRendererHealth implements ITooltipRenderer { @Override public Dimension getSize(CompoundTag tag, ICommonAccessor accessor) { diff --git a/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererIcon.java b/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererIcon.java index d1f97e2cb..250b51e34 100644 --- a/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererIcon.java +++ b/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererIcon.java @@ -4,12 +4,13 @@ import mcp.mobius.waila.api.ICommonAccessor; import mcp.mobius.waila.api.ITooltipRenderer; -import mcp.mobius.waila.overlay.DisplayUtil; import mcp.mobius.waila.overlay.IconUI; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.nbt.CompoundTag; -public class TooltipRendererIcon extends DisplayUtil implements ITooltipRenderer { +import static mcp.mobius.waila.overlay.DisplayUtil.renderIcon; + +public class TooltipRendererIcon implements ITooltipRenderer { private final String type; private final int size = 8; diff --git a/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererProgressBar.java b/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererProgressBar.java index 8df3c4077..3ec9fbf29 100644 --- a/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererProgressBar.java +++ b/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererProgressBar.java @@ -5,13 +5,15 @@ import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.ICommonAccessor; import mcp.mobius.waila.api.ITooltipRenderer; -import mcp.mobius.waila.overlay.DisplayUtil; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Identifier; import net.minecraft.util.Lazy; -public class TooltipRendererProgressBar extends DisplayUtil implements ITooltipRenderer { +import static mcp.mobius.waila.overlay.DisplayUtil.bind; +import static mcp.mobius.waila.overlay.DisplayUtil.drawTexturedModalRect; + +public class TooltipRendererProgressBar implements ITooltipRenderer { private static final Identifier SHEET = new Identifier(Waila.MODID, "textures/sprites.png"); private static final Lazy DIMENSION = new Lazy<>(() -> new Dimension(26, 16)); diff --git a/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererStack.java b/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererStack.java index 26702d95f..6e4395407 100644 --- a/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererStack.java +++ b/common/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TooltipRendererStack.java @@ -5,7 +5,6 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import mcp.mobius.waila.api.ICommonAccessor; import mcp.mobius.waila.api.ITooltipRenderer; -import mcp.mobius.waila.overlay.DisplayUtil; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,7 +15,9 @@ import net.minecraft.util.Lazy; import net.minecraft.util.registry.Registry; -public class TooltipRendererStack extends DisplayUtil implements ITooltipRenderer { +import static mcp.mobius.waila.overlay.DisplayUtil.renderStack; + +public class TooltipRendererStack implements ITooltipRenderer { private static final Lazy DIMENSION = new Lazy<>(() -> new Dimension(18, 18));