Update to 1.20.4

13 files changed, 38 insertions, 32 deletions

diff --git a/.github/workflows/curseforge.yml b/.github/workflows/curseforge.yml
index c0c980a8d..bec17513e 100644
--- a/.github/workflows/curseforge.yml
+++ b/.github/workflows/curseforge.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Upload Mod
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build publish forge:publishUnified neoforge:publishUnified fabric:publishUnified --stacktrace
+          arguments: build publish neoforge:publishUnified fabric:publishUnified --stacktrace
         env:
           danielshe_curse_api_key: ${{ secrets.CF_API_KEY }}
           modrinth_key: ${{ secrets.MODRINTH_KEY }}
diff --git a/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java b/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java
index 26115eaa8..ab06b6d7d 100644
--- a/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java
+++ b/fabric/src/main/java/me/shedaniel/rei/impl/common/compat/FabricFluidAPISupportPlugin.java
@@ -44,7 +44,7 @@ public class FabricFluidAPISupportPlugin implements REIServerPlugin {
     public void registerFluidSupport(FluidSupportProvider support) {
         support.register(entry -> {
             ItemStack stack = entry.getValue().copy();
-            Storage<FluidVariant> storage = FluidStorage.ITEM.find(stack, ContainerItemContext.withInitial(stack));
+            Storage<FluidVariant> storage = FluidStorage.ITEM.find(stack, ContainerItemContext.withConstant(stack));
             if (storage != null) {
                 List<EntryStack<FluidStack>> result = StreamSupport.stream(storage.spliterator(), false)
                         .filter(view -> !view.isResourceBlank())
diff --git a/fabric/src/main/resources/error_notifier.json b/fabric/src/main/resources/error_notifier.json
index d551a7504..10a87589f 100644
--- a/fabric/src/main/resources/error_notifier.json
+++ b/fabric/src/main/resources/error_notifier.json
@@ -12,14 +12,14 @@
             "type": "depends",
             "modId": "architectury",
             "modName": "Architectury API",
-            "versions": ">=10.0.0 <11.0.0",
+            "versions": ">=11.0.0 <12.0.0",
             "url": "https://www.curseforge.com/minecraft/mc-mods/architectury-api/"
         },
         {
             "type": "depends",
             "modId": "cloth-config2",
             "modName": "Cloth Config",
-            "versions": ">=12.0.0 <13.0.0",
+            "versions": ">=13.0.0 <14.0.0",
             "url": "https://www.curseforge.com/minecraft/mc-mods/cloth-config/"
         }
     ]
diff --git a/forge/build.gradle b/forge/build.gradle
index df2ee147c..38b052c7d 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -294,3 +294,10 @@ unifiedPublishing {
         }
     }
 }
+
+// I hate Forge
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
diff --git a/forge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java b/forge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java
index 79ff856e5..357c54a0b 100644
--- a/forge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java
+++ b/forge/src/main/java/me/shedaniel/rei/forge/AnnotationUtils.java
@@ -28,7 +28,6 @@ import me.shedaniel.rei.impl.init.PrimitivePlatformAdapter;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.fml.loading.moddiscovery.ModAnnotation;
 import net.minecraftforge.forgespi.language.IModInfo;
 import net.minecraftforge.forgespi.language.ModFileScanData;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
@@ -67,14 +66,14 @@ public class AnnotationUtils {
                     
                     if (value instanceof Dist[]) {
                         enabled = Arrays.asList((Dist[]) value).contains(FMLEnvironment.dist);
-                    } else if (value instanceof ModAnnotation.EnumHolder) {
-                        enabled = Objects.equals(((ModAnnotation.EnumHolder) value).getValue(), FMLEnvironment.dist.name());
+                    } else if (value instanceof ModFileScanData.EnumData) {
+                        enabled = Objects.equals(((ModFileScanData.EnumData) value).value(), FMLEnvironment.dist.name());
                     } else if (value instanceof List) {
-                        List<ModAnnotation.EnumHolder> holders = ((List<?>) value).stream().filter(o -> o instanceof ModAnnotation.EnumHolder)
-                                .map(o -> (ModAnnotation.EnumHolder) o).toList();
+                        List<ModFileScanData.EnumData> holders = ((List<?>) value).stream().filter(o -> o instanceof ModFileScanData.EnumData)
+                                .map(o -> (ModFileScanData.EnumData) o).toList();
                         if (!holders.isEmpty()) {
                             enabled = holders.stream()
-                                    .anyMatch(o -> Objects.equals(o.getValue(), FMLEnvironment.dist.name()));
+                                    .anyMatch(o -> Objects.equals(o.value(), FMLEnvironment.dist.name()));
                         } else {
                             enabled = true;
                         }
diff --git a/gradle.properties b/gradle.properties
index d2f1209a6..66fe14262 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,15 +1,15 @@
 org.gradle.jvmargs=-Xmx6G
-base_version=13.0
+base_version=14.0
 unstable=false
-supported_version=1.20.2
-minecraft_version=1.20.2
+supported_version=1.20.4
+minecraft_version=1.20.4
 platforms=fabric,forge,neoforge
-forge_version=48.1.0
-neoforge_version=20.2.86
-fabricloader_version=0.14.22
-cloth_config_version=12.0.111
+forge_version=49.0.3
+neoforge_version=20.4.5-beta
+fabricloader_version=0.15.1
+cloth_config_version=13.0.114
 modmenu_version=7.0.0
-fabric_api=0.89.2+1.20.2
-architectury_version=10.0.17
+fabric_api=0.91.2+1.20.4
+architectury_version=11.0.8
 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/neoforge/src/main/java/me/shedaniel/rei/plugin/common/forge/DefaultPluginImpl.java b/neoforge/src/main/java/me/shedaniel/rei/plugin/common/forge/DefaultPluginImpl.java
index 2308bcd03..0f0adcc11 100644
--- a/neoforge/src/main/java/me/shedaniel/rei/plugin/common/forge/DefaultPluginImpl.java
+++ b/neoforge/src/main/java/me/shedaniel/rei/plugin/common/forge/DefaultPluginImpl.java
@@ -30,11 +30,11 @@ import me.shedaniel.rei.api.common.fluid.FluidSupportProvider;
 import me.shedaniel.rei.api.common.util.EntryStacks;
 import me.shedaniel.rei.plugin.common.DefaultPlugin;
 import net.minecraft.world.item.ItemStack;
-import net.neoforged.neoforge.common.util.LazyOptional;
 import net.neoforged.neoforge.fluids.FluidStack;
 import net.neoforged.neoforge.fluids.FluidUtil;
 import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem;
 
+import java.util.Optional;
 import java.util.stream.IntStream;
 
 public class DefaultPluginImpl extends DefaultPlugin {
@@ -43,7 +43,7 @@ public class DefaultPluginImpl extends DefaultPlugin {
         super.registerFluidSupport(support);
         support.register(stack -> {
             ItemStack itemStack = stack.getValue();
-            LazyOptional<IFluidHandlerItem> handlerOptional = FluidUtil.getFluidHandler(itemStack);
+            Optional<IFluidHandlerItem> handlerOptional = FluidUtil.getFluidHandler(itemStack);
             if (handlerOptional.isPresent()) {
                 IFluidHandlerItem handler = handlerOptional.orElse(null);
                 if (handler.getTanks() > 0) {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonsScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonsScreen.java
index 2e7139459..32ee7174d 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonsScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/addon/ConfigAddonsScreen.java
@@ -128,8 +128,8 @@ public class ConfigAddonsScreen extends Screen {
                 Minecraft.getInstance().setScreen(this.addon.createScreen(Minecraft.getInstance().screen));
             }, Supplier::get) {
                 @Override
-                public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-                    super.render(graphics, mouseX, mouseY, delta);
+                public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+                    super.renderWidget(graphics, mouseX, mouseY, delta);
                     graphics.blit(InternalTextures.CHEST_GUI_TEXTURE, getX() + 3, getY() + 3, 0, 0, 14, 14);
                 }
             };
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java
index e6e920f64..3321cb40f 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java
@@ -180,8 +180,8 @@ public class FilteringRulesScreen extends Screen {
                 Minecraft.getInstance().setScreen(this.screenFunction.apply(Minecraft.getInstance().screen));
             }, Supplier::get) {
                 @Override
-                public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
-                    super.render(graphics, mouseX, mouseY, delta);
+                public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+                    super.renderWidget(graphics, mouseX, mouseY, delta);
                     graphics.blit(InternalTextures.CHEST_GUI_TEXTURE, getX() + 3, getY() + 3, 0, 0, 14, 14);
                 }
             };
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java
index f0d29ca0c..65d9da7aa 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java
@@ -54,9 +54,9 @@ public class RecipeScreenTypeEntry extends TooltipListEntry<DisplayScreenType> {
         }));
     }, Supplier::get) {
         @Override
-        public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+        public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
             setMessage(Component.translatable("config.roughlyenoughitems.recipeScreenType.config", type.toString()));
-            super.render(graphics, mouseX, mouseY, delta);
+            super.renderWidget(graphics, mouseX, mouseY, delta);
         }
     };
     private final List<AbstractWidget> children = ImmutableList.of(buttonWidget);
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java
index 6d2bc995e..80560b1e7 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java
@@ -54,12 +54,12 @@ public class ReloadPluginsEntry extends AbstractConfigListEntry<Unit> {
         RoughlyEnoughItemsCoreClient.reloadPlugins(null, null);
     }, Supplier::get) {
         @Override
-        public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+        public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
             if (PluginManager.areAnyReloading()) {
                 Screen screen = Minecraft.getInstance().screen;
                 Minecraft.getInstance().setScreen(new ConfigReloadingScreen(Component.translatable("text.rei.config.is.reloading"), PluginManager::areAnyReloading, () -> Minecraft.getInstance().setScreen(screen), null));
             } else {
-                super.render(graphics, mouseX, mouseY, delta);
+                super.renderWidget(graphics, mouseX, mouseY, delta);
             }
         }
     };
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java
index 0154d4041..d1ea0d047 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java
@@ -49,9 +49,9 @@ public class SearchFilterSyntaxHighlightingEntry extends TooltipListEntry<Syntax
         type = SyntaxHighlightingMode.values()[(type.ordinal() + 1) % SyntaxHighlightingMode.values().length];
     }, Supplier::get) {
         @Override
-        public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+        public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
             setMessage(Component.literal(type.toString()));
-            super.render(graphics, mouseX, mouseY, delta);
+            super.renderWidget(graphics, mouseX, mouseY, delta);
         }
     };
     private final List<AbstractWidget> children = ImmutableList.of(buttonWidget);
diff --git a/settings.gradle b/settings.gradle
index 5cece8a0b..fe124f86a 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,5 +13,5 @@ include "api"
 include "default-plugin"
 include "runtime"
 include "fabric"
-include "forge"
+//include "forge"
 include "neoforge"