Forge 1.18

8 files changed, 39 insertions, 33 deletions

diff --git a/forge/build.gradle b/forge/build.gradle
index aa99b6d02..cac5c5ed0 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -66,7 +66,7 @@ dependencies {
         shadowCommon(project(path: it, configuration: "transformProductionForge")) { transitive false }
     }
 
-    modRuntime("curse.maven:chiselsbits-231095:3492889")
+    // modRuntime("curse.maven:chiselsbits-231095:3492889")
     // modRuntime("curse.maven:jumbofurnace-390880:3120970")
     // modRuntime("curse.maven:cyclic-239286:3221427")
     // modRuntime("curse.maven:mekanism-268560:3206392")
@@ -74,15 +74,15 @@ dependencies {
     // modRuntime("curse.maven:autoreglib-250363:3326041")
     // modRuntime("curse.maven:ars-nouveau-401955:3442387")
     // modRuntime("curse.maven:patchouli-306770:3374063")
-    modRuntime("curse.maven:curios-309927:3457073")
-    modRuntime("curse.maven:geckolib-388172:3502639")
+    // modRuntime("curse.maven:curios-309927:3457073")
+    // modRuntime("curse.maven:geckolib-388172:3502639")
     // modRuntime("curse.maven:refined-storage-243076:3196167")
     // modRuntime("appeng:appliedenergistics2:8.2.0")
     // modRuntime("curse.maven:tcon-74072:3273213")
     // modRuntime("curse.maven:mantle-74924:3273201")
-    modRuntime("curse.maven:jer-240630:3489131")
-    modRuntime("curse.maven:jep-417645:3478254")
-    modRuntime("curse.maven:simple-storage-network-268495:3476722")
+    // modRuntime("curse.maven:jer-240630:3489131")
+    // modRuntime("curse.maven:jep-417645:3478254")
+    // modRuntime("curse.maven:simple-storage-network-268495:3476722")
     // modRuntime("curse.maven:create-328085:3278516")
     // modRuntime("curse.maven:industrial-foregoing-266515:3446262")
     // modRuntime("curse.maven:titanium-287342:3346366")
@@ -91,8 +91,8 @@ dependencies {
     // modRuntime("curse.maven:crafttweaker-239197:3494644")
     // modRuntime("curse.maven:jeitweaker-368718:3468722")
     // modRuntime("curse.maven:eidolon-429625:3157832")
-    modRuntime("curse.maven:token-enchanter-444421:3449483")
-    modRuntime("curse.maven:silent-lib-242998:3400030")
+    // modRuntime("curse.maven:token-enchanter-444421:3449483")
+    // modRuntime("curse.maven:silent-lib-242998:3400030")
     // modRuntime("curse.maven:resourceful-bees-384508:3485315")
     // modRuntime("curse.maven:thermal-expansion-69163:3404884")
     // modRuntime("curse.maven:thermal-foundation-222880:3412300")
diff --git a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
index e2b13d7bc..91ee343c7 100644
--- a/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
+++ b/forge/src/main/java/me/shedaniel/rei/forge/RoughlyEnoughItemsForge.java
@@ -26,10 +26,10 @@ package me.shedaniel.rei.forge;
 import com.google.common.collect.Lists;
 import me.shedaniel.rei.RoughlyEnoughItemsInitializer;
 import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.data.loading.DatagenModLoader;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fmllegacy.DatagenModLoader;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
diff --git a/forge/src/main/java/me/shedaniel/rei/impl/client/forge/ErrorDisplayerImpl.java b/forge/src/main/java/me/shedaniel/rei/impl/client/forge/ErrorDisplayerImpl.java
index 0af11b1c0..55c23646e 100644
--- a/forge/src/main/java/me/shedaniel/rei/impl/client/forge/ErrorDisplayerImpl.java
+++ b/forge/src/main/java/me/shedaniel/rei/impl/client/forge/ErrorDisplayerImpl.java
@@ -24,7 +24,7 @@
 package me.shedaniel.rei.impl.client.forge;
 
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.client.event.ScreenOpenEvent;
 import net.minecraftforge.common.MinecraftForge;
 
 import java.util.ArrayList;
@@ -42,11 +42,11 @@ public class ErrorDisplayerImpl {
         CONSUMERS.add(consumer);
     }
     
-    public static void onGuiOpen(GuiOpenEvent event) {
+    public static void onGuiOpen(ScreenOpenEvent event) {
         for (UnaryOperator<Screen> consumer : CONSUMERS) {
-            Screen screen = consumer.apply(event.getGui());
+            Screen screen = consumer.apply(event.getScreen());
             if (screen != null) {
-                event.setGui(screen);
+                event.setScreen(screen);
             }
         }
     }
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 90b0e8857..e0f0d3898 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,12 +27,11 @@ 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.util.CollectionUtils;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.FormattedText;
-import net.minecraft.network.chat.Style;
+import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.fmlclient.gui.GuiUtils;
+import net.minecraftforge.client.ForgeHooksClient;
 
 import java.util.List;
 
@@ -42,10 +41,16 @@ public class ScreenOverlayImplImpl {
         matrices.translate(0, 0, 500);
         EntryStack<?> stack = tooltip.getContextStack();
         ItemStack itemStack = stack.getValue() instanceof ItemStack ? stack.castValue() : ItemStack.EMPTY;
-        GuiUtils.preItemToolTip(itemStack);
-        List<FormattedText> texts = CollectionUtils.flatMap(tooltip.getText(), component -> Minecraft.getInstance().font.getSplitter().splitLines(component, 100000, Style.EMPTY));
-        GuiUtils.drawHoveringText(matrices, texts, mouseX, mouseY, screen.width, screen.height, screen.width, Minecraft.getInstance().font);
-        GuiUtils.postItemToolTip();
+        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()) {
+            if (!entry.isText()) {
+                components.add(1, entry.getAsComponent());
+            }
+        }
+        screen.tooltipStack = itemStack;
+        screen.renderTooltipInternal(matrices, components, mouseX, mouseY);
+        screen.tooltipStack = ItemStack.EMPTY;
         matrices.popPose();
     }
 }
diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg
index 908d28af2..d468de9f2 100644
--- a/forge/src/main/resources/META-INF/accesstransformer.cfg
+++ b/forge/src/main/resources/META-INF/accesstransformer.cfg
@@ -34,6 +34,7 @@ protected net.minecraft.client.gui.screens.Screen m_6575_(Lnet/minecraft/client/
 public net.minecraft.client.gui.screens.Screen m_142416_(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
 public net.minecraft.client.gui.screens.Screen m_169394_(Lnet/minecraft/client/gui/components/Widget;)Lnet/minecraft/client/gui/components/Widget;
 public net.minecraft.client.gui.screens.Screen m_169383_(Lcom/mojang/blaze3d/vertex/PoseStack;Ljava/util/List;II)V
+public net.minecraft.client.gui.screens.Screen tooltipStack
 public net.minecraft.client.renderer.RenderType m_173209_(Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormat;Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;ILnet/minecraft/client/renderer/RenderType$CompositeState;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType;
 public net.minecraft.client.renderer.RenderType$OutlineProperty
 public net.minecraft.client.renderer.RenderType$CompositeState
\ No newline at end of file
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 160936ba0..48057d142 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[33,)"
+loaderVersion = "[38,)"
 issueTrackerURL = "https://github.com/shedaniel/RoughlyEnoughItems/issues"
 logoFile = "icon.png"
 authors = "shedaniel"
@@ -15,7 +15,7 @@ To allow players to view items and recipes.
 
 [[mods]]
 modId = "jei"
-version = "8.9999"
+version = "9.9999"
 displayName = "Roughly Enough Items (JEI Stub)"
 description = '''
 To allow players to view items and recipes.
@@ -24,13 +24,13 @@ To allow players to view items and recipes.
 [[dependencies.roughlyenoughitems]]
 modId = "architectury"
 mandatory = true
-versionRange = "[2.3.22,)"
+versionRange = "[3.1.44,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.roughlyenoughitems]]
 modId = "cloth_config"
 mandatory = true
-versionRange = "[5.1,)"
+versionRange = "[6.0,)"
 ordering = "NONE"
 side = "BOTH"
diff --git a/gradle.properties b/gradle.properties
index 7c7dffaa0..e035c669c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx3G
 base_version=7.0
 unstable=false
-supported_version=1.18-pre5
-minecraft_version=1.18-pre5
+supported_version=1.18
+minecraft_version=1.18
 forgeEnabled=false
-forge_version=37.0.95
+forge_version=38.0.4
 fabricloader_version=0.12.5
-cloth_config_version=6.0.42
+cloth_config_version=6.0.43
 modmenu_version=3.0.0
 fabric_api=0.42.8+1.18
-architectury_version=3.0.39
+architectury_version=3.1.44
 api_exculde=
 #api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations,net.fabricmc.fabric-api:fabric
diff --git a/settings.gradle b/settings.gradle
index d74265742..be97e596c 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,7 +13,7 @@ include "api"
 include "default-plugin"
 include "runtime"
 include "fabric"
-//include "forge"
+include "forge"
 
-//include "jei-compatibility-layer"
-//include "jei-internals-workaround"
+include "jei-compatibility-layer"
+include "jei-internals-workaround"