Update to 1.19

13 files changed, 54 insertions, 57 deletions

diff --git a/.github/workflows/curseforge.yml b/.github/workflows/curseforge.yml
index 825dd8b14..5f956ecd6 100644
--- a/.github/workflows/curseforge.yml
+++ b/.github/workflows/curseforge.yml
@@ -24,8 +24,7 @@ jobs:
         with:
           java-version: 17
       - name: Upload to CurseForge
-        # run: ./gradlew build publish forge:curseforge fabric:curseforge jei-internals-workaround:curseforge --stacktrace
-        run: ./gradlew build publish fabric:curseforge --stacktrace
+        run: ./gradlew build publish forge:curseforge fabric:curseforge jei-internals-workaround:curseforge --stacktrace
         env:
           danielshe_curse_api_key: ${{ secrets.CF_API_KEY }}
           BRANCH_NAME: ${{ github.ref }}
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java b/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
index a6e333921..198104f1f 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/display/basic/BasicDisplay.java
@@ -23,12 +23,12 @@
 
 package me.shedaniel.rei.api.common.display.basic;
 
-import dev.architectury.utils.NbtType;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.display.SimpleDisplaySerializer;
 import me.shedaniel.rei.api.common.entry.EntryIngredient;
 import me.shedaniel.rei.api.common.util.EntryIngredients;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 
@@ -131,10 +131,10 @@ public abstract class BasicDisplay implements Display {
         
         @Override
         public P read(CompoundTag tag) {
-            List<EntryIngredient> input = EntryIngredients.read(tag.getList("input", NbtType.LIST));
-            List<EntryIngredient> output = EntryIngredients.read(tag.getList("output", NbtType.LIST));
+            List<EntryIngredient> input = EntryIngredients.read(tag.getList("input", Tag.TAG_LIST));
+            List<EntryIngredient> output = EntryIngredients.read(tag.getList("output", Tag.TAG_LIST));
             ResourceLocation location;
-            if (tag.contains("location", NbtType.STRING)) {
+            if (tag.contains("location", Tag.TAG_STRING)) {
                 location = new ResourceLocation(tag.getString("location"));
             } else {
                 location = null;
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java b/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java
index cf9e671cf..53c622901 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/registry/RecipeManagerContext.java
@@ -23,10 +23,10 @@
 
 package me.shedaniel.rei.api.common.registry;
 
-import dev.architectury.utils.NbtType;
 import me.shedaniel.rei.api.common.plugins.PluginManager;
 import me.shedaniel.rei.api.common.plugins.REIPlugin;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeManager;
@@ -51,7 +51,7 @@ public interface RecipeManagerContext<P extends REIPlugin<?>> extends Reloadable
     RecipeManager getRecipeManager();
     
     default Recipe<?> byId(CompoundTag tag, String key) {
-        if (tag.contains(key, NbtType.STRING)) {
+        if (tag.contains(key, Tag.TAG_STRING)) {
             return getRecipeManager().byKey(new ResourceLocation(tag.getString(key))).orElse(null);
         }
         return null;
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
index 5ba026cc5..96cf3be2a 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
@@ -28,7 +28,6 @@ import dev.architectury.hooks.fluid.FluidStackHooks;
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import dev.architectury.injectables.annotations.PlatformOnly;
 import dev.architectury.platform.Platform;
-import dev.architectury.utils.NbtType;
 import me.shedaniel.rei.api.common.display.DisplaySerializerRegistry;
 import me.shedaniel.rei.api.common.entry.comparison.EntryComparator;
 import me.shedaniel.rei.api.common.entry.comparison.ItemComparatorRegistry;
@@ -67,13 +66,13 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin {
         Function<ItemStack, ListTag> enchantmentTag = stack -> {
             CompoundTag tag = stack.getTag();
             if (tag == null) return null;
-            if (!tag.contains(ItemStack.TAG_ENCH, NbtType.LIST)) {
-                if (tag.contains(EnchantedBookItem.TAG_STORED_ENCHANTMENTS, NbtType.LIST)) {
-                    return tag.getList(EnchantedBookItem.TAG_STORED_ENCHANTMENTS, NbtType.COMPOUND);
+            if (!tag.contains(ItemStack.TAG_ENCH, Tag.TAG_LIST)) {
+                if (tag.contains(EnchantedBookItem.TAG_STORED_ENCHANTMENTS, Tag.TAG_LIST)) {
+                    return tag.getList(EnchantedBookItem.TAG_STORED_ENCHANTMENTS, Tag.TAG_COMPOUND);
                 }
                 return null;
             }
-            return tag.getList(ItemStack.TAG_ENCH, NbtType.COMPOUND);
+            return tag.getList(ItemStack.TAG_ENCH, Tag.TAG_COMPOUND);
         };
         registry.register((context, stack) -> nbtHasher.hash(context, enchantmentTag.apply(stack)), Items.ENCHANTED_BOOK);
         registry.registerNbt(Items.POTION);
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultInformationDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultInformationDisplay.java
index fbae4fb85..156792870 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultInformationDisplay.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultInformationDisplay.java
@@ -24,7 +24,6 @@
 package me.shedaniel.rei.plugin.common.displays;
 
 import com.google.common.collect.Lists;
-import dev.architectury.utils.NbtType;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.display.DisplaySerializer;
@@ -116,10 +115,10 @@ public class DefaultInformationDisplay implements Display {
             
             @Override
             public DefaultInformationDisplay read(CompoundTag tag) {
-                EntryIngredient stacks = EntryIngredient.read(tag.getList("stacks", NbtType.COMPOUND));
+                EntryIngredient stacks = EntryIngredient.read(tag.getList("stacks", Tag.TAG_COMPOUND));
                 Component name = Component.Serializer.fromJson(tag.getString("name"));
                 List<Component> descriptions = new ArrayList<>();
-                for (Tag descriptionTag : tag.getList("descriptions", NbtType.STRING)) {
+                for (Tag descriptionTag : tag.getList("descriptions", Tag.TAG_STRING)) {
                     descriptions.add(Component.Serializer.fromJson(descriptionTag.getAsString()));
                 }
                 return new DefaultInformationDisplay(stacks, name).lines(descriptions);
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java
index 99c8722d8..25009039b 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/brewing/DefaultBrewingDisplay.java
@@ -24,7 +24,6 @@
 package me.shedaniel.rei.plugin.common.displays.brewing;
 
 import com.google.common.collect.Lists;
-import dev.architectury.utils.NbtType;
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import me.shedaniel.rei.api.common.display.Display;
 import me.shedaniel.rei.api.common.display.DisplaySerializer;
@@ -35,6 +34,7 @@ import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.BuiltinPlugin;
 import net.minecraft.ChatFormatting;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
@@ -104,8 +104,8 @@ public class DefaultBrewingDisplay implements Display {
             
             @Override
             public DefaultBrewingDisplay read(CompoundTag tag) {
-                EntryIngredient input = EntryIngredient.read(tag.getList("input", NbtType.COMPOUND));
-                EntryIngredient reactant = EntryIngredient.read(tag.getList("reactant", NbtType.COMPOUND));
+                EntryIngredient input = EntryIngredient.read(tag.getList("input", Tag.TAG_COMPOUND));
+                EntryIngredient reactant = EntryIngredient.read(tag.getList("reactant", Tag.TAG_COMPOUND));
                 EntryStack<?> output = EntryStack.read(tag.getCompound("output"));
                 return new DefaultBrewingDisplay(input, reactant, output);
             }
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"
diff --git a/gradle.properties b/gradle.properties
index 42fbd34bf..534272bd1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx6G
 base_version=9.0
 unstable=false
-supported_version=1.19 (1.19-pre1)
-minecraft_version=1.19-pre1
-forgeEnabled=false
-forge_version=40.1.20
-fabricloader_version=0.14.5
-cloth_config_version=7.0.65
-modmenu_version=3.0.0
-fabric_api=0.52.4+1.19
-architectury_version=5.4.12
+supported_version=1.19
+minecraft_version=1.19
+forgeEnabled=true
+forge_version=41.0.1
+fabricloader_version=0.14.6
+cloth_config_version=7.0.69
+modmenu_version=4.0.0
+fabric_api=0.55.2+1.19
+architectury_version=5.5.16
 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"