Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19

2 files changed, 6 insertions, 9 deletions

diff --git a/forge/build.gradle b/forge/build.gradle
index af5ddc41f..59fd522f4 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -85,8 +85,10 @@ dependencies {
     // modRuntime("curse.maven:chiselsbits-231095:3492889")
     // modRuntime("curse.maven:jumbofurnace-390880:3120970")
     // modRuntime("curse.maven:cyclic-239286:3221427")
-    // modRuntime("curse.maven:mekanism-268560:3206392")
-    // modRuntime("curse.maven:mekanism-tools-268567:3206396")
+    modRuntime("curse.maven:mekanism-268560:3743835")
+    modRuntime("curse.maven:mekanism-tools-268567:3743838")
+    modRuntime("curse.maven:mekanism-generators-268566:3743837")
+    modRuntime("curse.maven:immersive-engineering-231951:3721708")
     // modRuntime("curse.maven:autoreglib-250363:3326041")
     // modRuntime("curse.maven:ars-nouveau-401955:3619899")
     // modRuntime("curse.maven:patchouli-306770:3594394")
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 c9b9e73b2..6a50e8d71 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
@@ -23,7 +23,6 @@
 
 package me.shedaniel.rei.impl.client.gui.forge;
 
-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;
@@ -35,19 +34,17 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.client.ForgeHooksClient;
 
+import java.util.ArrayList;
 import java.util.List;
 
 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);
-        RenderSystem.applyModelViewMatrix();
         matrices.pushPose();
         EntryStack<?> stack = tooltip.getContextStack();
         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);
+        components = new ArrayList<>(components);
         for (Tooltip.Entry entry : tooltip.entries()) {
             if (!entry.isText()) {
                 components.add(1, entry.getAsComponent());
@@ -57,7 +54,5 @@ public class ScreenOverlayImplImpl {
         screen.renderTooltipInternal(matrices, components, mouseX, mouseY);
         screen.tooltipStack = ItemStack.EMPTY;
         matrices.popPose();
-        modelViewStack.popPose();
-        RenderSystem.applyModelViewMatrix();
     }
 }