diff options
| author | shedaniel <daniel@shedaniel.me> | 2022-04-12 12:55:54 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2022-04-12 18:01:16 +0800 |
| commit | caa82617183f2665cb4bd369eab72b996b4ef1e4 (patch) | |
| tree | 8b58d15dacc65eaced9e7a50bb79610b3798cec8 /forge/src | |
| parent | beec9eae120d193b5c75baf80bbeda8bd07fec72 (diff) | |
| download | RoughlyEnoughItems-caa82617183f2665cb4bd369eab72b996b4ef1e4.tar.gz RoughlyEnoughItems-caa82617183f2665cb4bd369eab72b996b4ef1e4.tar.bz2 RoughlyEnoughItems-caa82617183f2665cb4bd369eab72b996b4ef1e4.zip | |
Fix quark tooltip fighting issues
Diffstat (limited to 'forge/src')
| -rw-r--r-- | forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java b/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java index 373e0a6ae..c9b9e73b2 100644 --- a/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java +++ b/forge/src/main/java/me/shedaniel/rei/impl/client/gui/forge/ScreenOverlayImplImpl.java @@ -27,6 +27,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.api.common.entry.EntryStack; +import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; import me.shedaniel.rei.api.common.util.CollectionUtils; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; @@ -40,11 +41,11 @@ public class ScreenOverlayImplImpl { public static void renderTooltipInner(Screen screen, PoseStack matrices, Tooltip tooltip, int mouseX, int mouseY) { PoseStack modelViewStack = RenderSystem.getModelViewStack(); modelViewStack.pushPose(); - modelViewStack.translate(0, 0, 500); +// modelViewStack.translate(0, 0, 500); RenderSystem.applyModelViewMatrix(); matrices.pushPose(); EntryStack<?> stack = tooltip.getContextStack(); - ItemStack itemStack = stack.getValue() instanceof ItemStack ? stack.castValue() : ItemStack.EMPTY; + ItemStack itemStack = stack.getType() == VanillaEntryTypes.ITEM ? stack.castValue() : ItemStack.EMPTY; List<Component> texts = CollectionUtils.filterAndMap(tooltip.entries(), Tooltip.Entry::isText, Tooltip.Entry::getAsText); List<ClientTooltipComponent> components = ForgeHooksClient.gatherTooltipComponents(itemStack, texts, mouseX, screen.width, screen.height, null, screen.getMinecraft().font); for (Tooltip.Entry entry : tooltip.entries()) { |