Update to 1.19

5 files changed, 26 insertions, 26 deletions

diff --git a/forge/build.gradle b/forge/build.gradle
index 5da03eef6..97fdc24e4 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -85,10 +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: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: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")
@@ -96,13 +96,13 @@ dependencies {
     // modRuntime("curse.maven:geckolib-388172:3627502")
     // modRuntime("curse.maven:refined-storage-243076:3623324")
     // modRuntime("appeng:appliedenergistics2:10.0.1")
-    modRuntime("curse.maven:tcon-74072:3784732")
-    modRuntime("curse.maven:mantle-74924:3784500")
+    // modRuntime("curse.maven:tcon-74072:3784732")
+    // modRuntime("curse.maven:mantle-74924:3784500")
     // modRuntime("curse.maven:jer-240630:3575590")
     // modRuntime("curse.maven:jep-417645:3550303")
     // modRuntime("curse.maven:simple-storage-network-268495:3594529")
-    modRuntime("curse.maven:create-328085:3737418")
-    modRuntime("curse.maven:flywheel-486392:3737402")
+    // modRuntime("curse.maven:create-328085:3737418")
+    // modRuntime("curse.maven:flywheel-486392:3737402")
     // modRuntime("curse.maven:industrial-foregoing-266515:3446262")
     // modRuntime("curse.maven:titanium-287342:3346366")
     // modRuntime("curse.maven:extended-crafting-268387:3606681")
@@ -113,9 +113,9 @@ dependencies {
     // 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:3803489")
-    modRuntime("curse.maven:thermal-foundation-222880:3803495")
-    modRuntime("curse.maven:cofh-core-69162:3803484")
+    // modRuntime("curse.maven:thermal-expansion-69163:3803489")
+    // modRuntime("curse.maven:thermal-foundation-222880:3803495")
+    // modRuntime("curse.maven:cofh-core-69162:3803484")
     // modRuntime("curse.maven:advanced-peripherals-431725:3525665")
     // modRuntime("curse.maven:cc-tweaked-282001:3434680")
     // modRuntime("curse.maven:ender-storage-245174:3361748")
@@ -135,8 +135,8 @@ dependencies {
     // modRuntime("curse.maven:datapack-anvil-432817:3569515")
     // modRuntime("curse.maven:assemblylinemachines-388282:3623609")
     // modRuntime("curse.maven:mystical-agriculture-246640:3645812")
-    modRuntime("curse.maven:oreberries-replanted-454062:3776180")
-    modRuntime("curse.maven:farmers-delight-398521:3784851")
+    // modRuntime("curse.maven:oreberries-replanted-454062:3776180")
+    // modRuntime("curse.maven:farmers-delight-398521:3784851")
 }
 
 def modRuntime(str) {
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 6a50e8d71..a7b5a3091 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
@@ -47,7 +47,7 @@ public class ScreenOverlayImplImpl {
         components = new ArrayList<>(components);
         for (Tooltip.Entry entry : tooltip.entries()) {
             if (!entry.isText()) {
-                components.add(1, entry.getAsComponent());
+                components.add(1, ClientTooltipComponent.create(entry.getAsTooltipComponent()));
             }
         }
         screen.tooltipStack = itemStack;
diff --git a/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java b/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java
index 6d69f9068..23aac8d92 100644
--- a/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java
+++ b/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java
@@ -26,6 +26,7 @@ package me.shedaniel.rei.plugin.client.forge;
 import com.google.common.collect.Sets;
 import me.shedaniel.rei.api.client.registry.display.DisplayRegistry;
 import me.shedaniel.rei.plugin.client.BuiltinClientPlugin;
+import net.minecraft.core.Holder;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.alchemy.Potion;
@@ -36,7 +37,6 @@ import net.minecraftforge.common.brewing.BrewingRecipe;
 import net.minecraftforge.common.brewing.BrewingRecipeRegistry;
 import net.minecraftforge.common.brewing.IBrewingRecipe;
 import net.minecraftforge.common.brewing.VanillaBrewingRecipe;
-import net.minecraftforge.registries.IRegistryDelegate;
 
 import java.util.Arrays;
 import java.util.Set;
@@ -57,9 +57,9 @@ public class DefaultClientPluginImpl {
         Set<Potion> potions = Sets.newLinkedHashSet();
         for (Ingredient container : PotionBrewing.ALLOWED_CONTAINERS) {
             for (PotionBrewing.Mix<Potion> mix : PotionBrewing.POTION_MIXES) {
-                IRegistryDelegate<Potion> from = mix.f_43532_;
+                Holder.Reference<Potion> from = mix.f_43532_;
                 Ingredient ingredient = mix.ingredient;
-                IRegistryDelegate<Potion> to = mix.f_43534_;
+                Holder.Reference<Potion> to = mix.f_43534_;
                 Ingredient base = Ingredient.of(Arrays.stream(container.getItems())
                         .map(ItemStack::copy)
                         .map(stack -> PotionUtils.setPotion(stack, from.get())));
@@ -74,9 +74,9 @@ public class DefaultClientPluginImpl {
         }
         for (Potion potion : potions) {
             for (PotionBrewing.Mix<Item> mix : PotionBrewing.CONTAINER_MIXES) {
-                IRegistryDelegate<Item> from = mix.f_43532_;
+                Holder.Reference<Item> from = mix.f_43532_;
                 Ingredient ingredient = mix.ingredient;
-                IRegistryDelegate<Item> to = mix.f_43534_;
+                Holder.Reference<Item> to = mix.f_43534_;
                 Ingredient base = Ingredient.of(PotionUtils.setPotion(new ItemStack(from.get()), potion));
                 ItemStack output = PotionUtils.setPotion(new ItemStack(to.get()), potion);
                 clientPlugin.registerBrewingRecipe(base, ingredient, output);
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 48057d142..adc28f32b 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 = "[38,)"
+loaderVersion = "[41,)"
 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 = "9.9999"
+version = "10.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 = "[3.1.44,)"
+versionRange = "[5.5,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.roughlyenoughitems]]
 modId = "cloth_config"
 mandatory = true
-versionRange = "[6.0,)"
+versionRange = "[7.0,)"
 ordering = "NONE"
 side = "BOTH"
diff --git a/forge/src/serverComponent/resources/META-INF/mods.toml b/forge/src/serverComponent/resources/META-INF/mods.toml
index 6cbbd7cf7..1f76f5381 100644
--- a/forge/src/serverComponent/resources/META-INF/mods.toml
+++ b/forge/src/serverComponent/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[38,)"
+loaderVersion = "[41,)"
 issueTrackerURL = "https://github.com/shedaniel/RoughlyEnoughItems/issues"
 logoFile = "icon.png"
 authors = "shedaniel"
@@ -16,13 +16,13 @@ To allow players to view items and recipes.
 [[dependencies.roughlyenoughitems_servercomponent]]
 modId = "architectury"
 mandatory = true
-versionRange = "[3.1.44,)"
+versionRange = "[5.5,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.roughlyenoughitems_servercomponent]]
 modId = "cloth_config"
 mandatory = true
-versionRange = "[6.0,)"
+versionRange = "[7.0,)"
 ordering = "NONE"
 side = "BOTH"