From 6d88fbbee7836ef7bf5941b75c92a6349dc2845c Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Sat, 6 Jul 2024 16:29:08 +0200
Subject: [PATCH] feat: port to minecraft 1.21

---
 .github/ISSUE_TEMPLATE/bug-report.yml         |  2 +-
 .github/workflows/build.yml                   |  2 +-
 .github/workflows/draft-release.yml           |  2 +-
 .../issue-for-unsupported-version.yml         |  2 +-
 .github/workflows/publish-release.yml         |  2 +-
 .github/workflows/resolved-issue-locking.yml  |  2 +-
 .github/workflows/validate-branch-name.yml    |  2 +-
 .github/workflows/validate-changelog.yml      |  2 +-
 .../workflows/validate-commit-messages.yml    |  2 +-
 .gitignore                                    |  1 +
 CHANGELOG.md                                  | 24 ++++--
 config/intellij-code-style.xml                |  4 +-
 gradle.properties                             |  4 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../build.gradle                              |  2 +-
 .../refinedstorage/emi/common/Common.java     |  7 +-
 .../emi/common/EmiDragDropHandlerImpl.java    | 18 ++---
 .../emi/common/EmiExclusionAreaImpl.java      |  3 +-
 .../emi/common/EmiGridSynchronizer.java       |  3 +-
 .../emi/common/EmiRecipeHandlerImpl.java      |  9 ++-
 .../EmiRecipeModIngredientConverter.java      | 15 ++--
 .../emi/common/GridEmiStackProvider.java      |  9 ++-
 .../emi/common/RefinedStorageEmiPlugin.java   |  3 +-
 .../emi/common/ResourceEmiStackProvider.java  |  7 +-
 .../assets/emi/aliases/refinedstorage.json    |  8 ++
 .../emi/recipe/defaults/refinedstorage.json   | 74 +++++++++++++++++++
 .../refinedstorage_emi_integration.json       | 73 ------------------
 .../lang/en_us.json                           |  3 +-
 .../.gitignore                                |  1 -
 .../build.gradle                              |  4 +-
 .../emi/fabric/EmiRefinedStoragePlugin.java   |  4 +-
 .../src/main/resources/fabric.mod.json        |  7 +-
 .../.gitignore                                |  1 -
 .../build.gradle                              |  8 +-
 .../emi/forge/ModInitializer.java             |  2 +-
 .../emi/forge/package-info.java               |  0
 .../resources/META-INF/neoforge.mods.toml     |  6 +-
 .../src/main/resources/pack.mcmeta            |  0
 settings.gradle                               |  4 +-
 39 files changed, 174 insertions(+), 150 deletions(-)
 create mode 100644 refinedstorage-emi-integration-common/src/main/resources/assets/emi/aliases/refinedstorage.json
 create mode 100644 refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage.json
 delete mode 100644 refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage_emi_integration.json
 delete mode 100644 refinedstorage-emi-integration-fabric/.gitignore
 delete mode 100644 refinedstorage-emi-integration-forge/.gitignore
 rename {refinedstorage-emi-integration-forge => refinedstorage-emi-integration-neoforge}/build.gradle (59%)
 rename {refinedstorage-emi-integration-forge => refinedstorage-emi-integration-neoforge}/src/main/java/com/refinedmods/refinedstorage/emi/forge/ModInitializer.java (91%)
 rename {refinedstorage-emi-integration-forge => refinedstorage-emi-integration-neoforge}/src/main/java/com/refinedmods/refinedstorage/emi/forge/package-info.java (100%)
 rename refinedstorage-emi-integration-forge/src/main/resources/META-INF/mods.toml => refinedstorage-emi-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml (79%)
 rename {refinedstorage-emi-integration-forge => refinedstorage-emi-integration-neoforge}/src/main/resources/pack.mcmeta (100%)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 38c0392..93e6ff3 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -34,7 +34,7 @@ body:
       description: |
         If your Minecraft version isn't listed here, it means that it's no longer supported. In that case, don't create an issue.
       options:
-        - Minecraft 1.20.4
+        - Minecraft 1.21
     validations:
       required: true
   - type: input
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b2a7493..1ee8f8e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
     types: [ opened, synchronize, reopened ]
 jobs:
   build:
-    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.15.2
     with:
       mutation-testing: false
     secrets: inherit
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
index 5ea1d94..f731a43 100644
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@@ -17,7 +17,7 @@ on:
         type: string
 jobs:
   draft:
-    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.15.2
     with:
       release-type: ${{ inputs.release-type }}
       version-number-override: ${{ inputs.version-number-override }}
diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml
index 9f9ee90..7eace9c 100644
--- a/.github/workflows/issue-for-unsupported-version.yml
+++ b/.github/workflows/issue-for-unsupported-version.yml
@@ -4,4 +4,4 @@ on:
     types: [ labeled, unlabeled, reopened ]
 jobs:
   unsupported-labeler:
-    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.13.4
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.15.2
\ No newline at end of file
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index fc716a3..578b217 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -7,7 +7,7 @@ on:
       - closed
 jobs:
   publish-release:
-    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.15.2
     secrets: inherit
     with:
       project-name: 'Refined Storage - EMI Integration'
diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml
index 16b1cf9..f0098dd 100644
--- a/.github/workflows/resolved-issue-locking.yml
+++ b/.github/workflows/resolved-issue-locking.yml
@@ -4,4 +4,4 @@ on:
     - cron: '0 0 * * *'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.13.4
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.15.2
\ No newline at end of file
diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml
index b2ddb77..a5d3c1b 100644
--- a/.github/workflows/validate-branch-name.yml
+++ b/.github/workflows/validate-branch-name.yml
@@ -2,4 +2,4 @@ name: Validate branch name
 on: [ pull_request ]
 jobs:
   validate-branch-name:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.13.4
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.15.2
\ No newline at end of file
diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml
index 2adc54f..8822e7e 100644
--- a/.github/workflows/validate-changelog.yml
+++ b/.github/workflows/validate-changelog.yml
@@ -4,4 +4,4 @@ on:
     types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ]
 jobs:
   validate-changelog:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.13.4
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.15.2
\ No newline at end of file
diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml
index 8ef06cd..194a3e8 100644
--- a/.github/workflows/validate-commit-messages.yml
+++ b/.github/workflows/validate-commit-messages.yml
@@ -2,4 +2,4 @@ name: Validate commit messages
 on: [ pull_request ]
 jobs:
   validate-commit-messages:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.13.4
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.15.2
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 924b02b..8c2b9ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ out/
 /bin/
 logs/
 .cache/
+run/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f0c3eb..0c598b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,31 +7,39 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Added
+
+- Search alias for the old name of the Disk Interface.
+
+### Fixed
+
+- Support for Refined Storage v2.0.0-milestone.4.2.
+
 ## [0.2.1] - 2024-06-28
 
 ### Fixed
 
--   Support for Refined Storage v2.0.0-milestone.3.14.
+- Support for Refined Storage v2.0.0-milestone.3.14.
 
 ## [0.2.0] - 2024-06-20
 
 ### Added
 
--   Recipe defaults.
+- Recipe defaults.
 
 ### Fixed
 
--   Recipe transfer not working.
+- Recipe transfer not working.
 
 ## [0.1.0] - 2024-06-20
 
 ### Added
 
--   Support for EMI exclusion zones.
--   Support for EMI ghost ingredient dragging.
--   Support for using the R/U keys on Grid slots and filtering slots.
--   Recipe transfer integration for the Crafting Grid.
--   Grid / EMI search box synchronization options.
+- Support for EMI exclusion zones.
+- Support for EMI ghost ingredient dragging.
+- Support for using the R/U keys on Grid slots and filtering slots.
+- Recipe transfer integration for the Crafting Grid.
+- Grid / EMI search box synchronization options.
 
 [Unreleased]: https://github.com/refinedmods/refinedstorage-emi-integration/compare/v0.2.1...HEAD
 
diff --git a/config/intellij-code-style.xml b/config/intellij-code-style.xml
index f9d7a95..c4e6ca3 100644
--- a/config/intellij-code-style.xml
+++ b/config/intellij-code-style.xml
@@ -1,7 +1,7 @@
 <code_scheme name="Refined Mods" version="173">
     <JavaCodeStyleSettings>
-        <option name="GENERATE_FINAL_LOCALS" value="true" />
-        <option name="GENERATE_FINAL_PARAMETERS" value="true" />
+        <option name="GENERATE_FINAL_LOCALS" value="true"/>
+        <option name="GENERATE_FINAL_PARAMETERS" value="true"/>
         <option name="SPACE_INSIDE_ONE_LINE_ENUM_BRACES" value="true"/>
         <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999"/>
         <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999"/>
diff --git a/gradle.properties b/gradle.properties
index 6958055..7d0d86a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-refinedstorageVersion=2.0.0-milestone.3.14
-emiVersion=1.1.7+1.20.4
+refinedstorageVersion=2.0.0-milestone.4.2
+emiVersion=1.1.10+1.21
 # Gradle
 org.gradle.jvmargs=-Xmx1G
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23..a441313 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/refinedstorage-emi-integration-common/build.gradle b/refinedstorage-emi-integration-common/build.gradle
index 9d5e0f3..fedc00f 100644
--- a/refinedstorage-emi-integration-common/build.gradle
+++ b/refinedstorage-emi-integration-common/build.gradle
@@ -21,7 +21,7 @@ repositories {
 commonProject()
 
 dependencies {
-    api "com.refinedmods.refinedstorage2:refinedstorage2-platform-common:${refinedstorageVersion}"
+    api "com.refinedmods.refinedstorage:refinedstorage-platform-common:${refinedstorageVersion}"
     compileOnlyApi "dev.emi:emi-xplat-mojmap:${emiVersion}"
 }
 
diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/Common.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/Common.java
index be1d28b..0e630ab 100644
--- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/Common.java
+++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/Common.java
@@ -1,6 +1,7 @@
 package com.refinedmods.refinedstorage.emi.common;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
+
 import net.minecraft.resources.ResourceLocation;
 
 public final class Common {
@@ -12,11 +13,11 @@ private Common() {
     public static void init(final PlatformApi platformApi) {
         platformApi.addIngredientConverter(new EmiRecipeModIngredientConverter());
         platformApi.getGridSynchronizerRegistry().register(
-            new ResourceLocation(MOD_ID, "emi"),
+            ResourceLocation.fromNamespaceAndPath(MOD_ID, "emi"),
             new EmiGridSynchronizer(false)
         );
         platformApi.getGridSynchronizerRegistry().register(
-            new ResourceLocation(MOD_ID, "emi_two_way"),
+            ResourceLocation.fromNamespaceAndPath(MOD_ID, "emi_two_way"),
             new EmiGridSynchronizer(true)
         );
     }
diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiDragDropHandlerImpl.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiDragDropHandlerImpl.java
index d5ae6c6..0e9dac6 100644
--- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiDragDropHandlerImpl.java
+++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiDragDropHandlerImpl.java
@@ -1,11 +1,12 @@
 package com.refinedmods.refinedstorage.emi.common;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.common.Platform;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
-import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu;
-import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot;
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
+import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
+import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu;
+import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot;
+import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets;
+
 import dev.emi.emi.api.EmiDragDropHandler;
 import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.runtime.EmiDrawContext;
@@ -52,10 +53,7 @@ private boolean dropStack(final PlatformResourceKey resource,
         if (x < slotX || y < slotY || x > slotX + 16 || y > slotY + 16) {
             return false;
         }
-        Platform.INSTANCE.getClientToServerCommunications().sendResourceFilterSlotChange(
-            resource,
-            slot.index
-        );
+        C2SPackets.sendResourceFilterSlotChange(resource, slot.index);
         return true;
     }
 
diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiExclusionAreaImpl.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiExclusionAreaImpl.java
index d975a32..2657028 100644
--- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiExclusionAreaImpl.java
+++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiExclusionAreaImpl.java
@@ -1,9 +1,10 @@
 package com.refinedmods.refinedstorage.emi.common;
 
+import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
+
 import java.util.List;
 import java.util.function.Consumer;
 
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
 import dev.emi.emi.api.EmiExclusionArea;
 import dev.emi.emi.api.widget.Bounds;
 import net.minecraft.client.gui.screens.Screen;
diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiGridSynchronizer.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiGridSynchronizer.java
index c6d4222..fb45851 100644
--- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiGridSynchronizer.java
+++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiGridSynchronizer.java
@@ -1,8 +1,9 @@
 package com.refinedmods.refinedstorage.emi.common;
 
+import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridSynchronizer;
+
 import javax.annotation.Nullable;
 
-import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridSynchronizer;
 import dev.emi.emi.api.EmiApi;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeHandlerImpl.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeHandlerImpl.java
index c9f19ed..bcf14b1 100644
--- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeHandlerImpl.java
+++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeHandlerImpl.java
@@ -1,12 +1,13 @@
 package com.refinedmods.refinedstorage.emi.common;
 
+import com.refinedmods.refinedstorage.api.resource.list.ResourceList;
+import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu;
+import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.refinedmods.refinedstorage2.api.resource.list.ResourceList;
-import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu;
-import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource;
 import dev.emi.emi.api.recipe.EmiCraftingRecipe;
 import dev.emi.emi.api.recipe.EmiPlayerInventory;
 import dev.emi.emi.api.recipe.EmiRecipe;
@@ -30,7 +31,7 @@ public EmiPlayerInventory getInventory(final AbstractContainerScreen<CraftingGri
             .filter(resourceAmount -> resourceAmount.getResource() instanceof ItemResource)
             .map(resourceAmount -> EmiStack.of(
                 ((ItemResource) resourceAmount.getResource()).item(),
-                ((ItemResource) resourceAmount.getResource()).tag(),
+                ((ItemResource) resourceAmount.getResource()).components(),
                 resourceAmount.getAmount()
             )).toList());
     }
diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeModIngredientConverter.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeModIngredientConverter.java
index eb2c10f..69b42de 100644
--- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeModIngredientConverter.java
+++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/EmiRecipeModIngredientConverter.java
@@ -1,11 +1,12 @@
 package com.refinedmods.refinedstorage.emi.common;
 
+import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
+import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter;
+import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource;
+import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource;
+
 import java.util.Optional;
 
-import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
-import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource;
-import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource;
 import dev.emi.emi.api.stack.EmiStack;
 import dev.emi.emi.api.stack.FluidEmiStack;
 import dev.emi.emi.api.stack.ItemEmiStack;
@@ -16,10 +17,10 @@ class EmiRecipeModIngredientConverter implements RecipeModIngredientConverter {
     @Override
     public Optional<PlatformResourceKey> convertToResource(final Object ingredient) {
         if (ingredient instanceof FluidEmiStack fluid) {
-            return Optional.of(new FluidResource((Fluid) fluid.getKey(), fluid.getNbt()));
+            return Optional.of(new FluidResource((Fluid) fluid.getKey(), fluid.getComponentChanges()));
         }
         if (ingredient instanceof ItemEmiStack item) {
-            return Optional.of(new ItemResource((Item) item.getKey(), item.getNbt()));
+            return Optional.of(new ItemResource((Item) item.getKey(), item.getComponentChanges()));
         }
         return Optional.empty();
     }
@@ -30,7 +31,7 @@ public Optional<Object> convertToIngredient(final PlatformResourceKey resource)
             return Optional.of(EmiStack.of(itemResource.toItemStack()));
         }
         if (resource instanceof FluidResource fluidResource) {
-            return Optional.of(EmiStack.of(fluidResource.fluid(), fluidResource.tag()));
+            return Optional.of(EmiStack.of(fluidResource.fluid(), fluidResource.components()));
         }
         return Optional.empty();
     }
diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/GridEmiStackProvider.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/GridEmiStackProvider.java
index 846d0c7..c865c90 100644
--- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/GridEmiStackProvider.java
+++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/GridEmiStackProvider.java
@@ -1,9 +1,10 @@
 package com.refinedmods.refinedstorage.emi.common;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.grid.view.PlatformGridResource;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.common.grid.screen.AbstractGridScreen;
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage.platform.api.grid.view.PlatformGridResource;
+import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
+import com.refinedmods.refinedstorage.platform.common.grid.screen.AbstractGridScreen;
+
 import dev.emi.emi.api.EmiStackProvider;
 import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.api.stack.EmiStackInteraction;
diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/RefinedStorageEmiPlugin.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/RefinedStorageEmiPlugin.java
index c2e7260..bbc2be0 100644
--- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/RefinedStorageEmiPlugin.java
+++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/RefinedStorageEmiPlugin.java
@@ -1,6 +1,7 @@
 package com.refinedmods.refinedstorage.emi.common;
 
-import com.refinedmods.refinedstorage2.platform.common.content.Menus;
+import com.refinedmods.refinedstorage.platform.common.content.Menus;
+
 import dev.emi.emi.api.EmiEntrypoint;
 import dev.emi.emi.api.EmiPlugin;
 import dev.emi.emi.api.EmiRegistry;
diff --git a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/ResourceEmiStackProvider.java b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/ResourceEmiStackProvider.java
index f59616c..b0a35b3 100644
--- a/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/ResourceEmiStackProvider.java
+++ b/refinedstorage-emi-integration-common/src/main/java/com/refinedmods/refinedstorage/emi/common/ResourceEmiStackProvider.java
@@ -1,8 +1,9 @@
 package com.refinedmods.refinedstorage.emi.common;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
+import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
+
 import dev.emi.emi.api.EmiStackProvider;
 import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.api.stack.EmiStackInteraction;
diff --git a/refinedstorage-emi-integration-common/src/main/resources/assets/emi/aliases/refinedstorage.json b/refinedstorage-emi-integration-common/src/main/resources/assets/emi/aliases/refinedstorage.json
new file mode 100644
index 0000000..e29e225
--- /dev/null
+++ b/refinedstorage-emi-integration-common/src/main/resources/assets/emi/aliases/refinedstorage.json
@@ -0,0 +1,8 @@
+{
+  "aliases": [
+    {
+      "stacks": "item:refinedstorage:disk_interface",
+      "text": "alias.emi.refinedstorage1_disk_manipulator"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage.json b/refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage.json
new file mode 100644
index 0000000..a91eba4
--- /dev/null
+++ b/refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage.json
@@ -0,0 +1,74 @@
+{
+  "added": [
+    "refinedstorage:stack_upgrade",
+    "refinedstorage:block_of_quartz_enriched_iron",
+    "refinedstorage:block_of_quartz_enriched_copper",
+    "refinedstorage:upgrade",
+    "refinedstorage:fortune_3_upgrade",
+    "refinedstorage:crafting_grid",
+    "refinedstorage:64b_fluid_storage_disk",
+    "refinedstorage:security_card",
+    "refinedstorage:256b_fluid_storage_disk",
+    "refinedstorage:1k_storage_part",
+    "refinedstorage:construction_core",
+    "refinedstorage:improved_processor",
+    "refinedstorage:4096b_fluid_storage_disk",
+    "refinedstorage:wireless_grid",
+    "refinedstorage:64b_fluid_storage_part",
+    "refinedstorage:4k_storage_disk",
+    "refinedstorage:range_upgrade",
+    "refinedstorage:cable",
+    "refinedstorage:1024b_fluid_storage_part",
+    "refinedstorage:4k_storage_block",
+    "refinedstorage:64k_storage_disk",
+    "refinedstorage:interface",
+    "refinedstorage:speed_upgrade",
+    "refinedstorage:network_receiver",
+    "refinedstorage:silk_touch_upgrade",
+    "refinedstorage:exporter",
+    "refinedstorage:4096b_fluid_storage_part",
+    "refinedstorage:4k_storage_part",
+    "refinedstorage:16k_storage_block",
+    "refinedstorage:64k_storage_block",
+    "refinedstorage:configuration_card",
+    "refinedstorage:importer",
+    "refinedstorage:controller",
+    "refinedstorage:external_storage",
+    "refinedstorage:64k_storage_part",
+    "refinedstorage:storage_housing",
+    "refinedstorage:1k_storage_disk",
+    "refinedstorage:fortune_1_upgrade",
+    "refinedstorage:constructor",
+    "refinedstorage:4096b_fluid_storage_block",
+    "refinedstorage:fortune_2_upgrade",
+    "refinedstorage:1024b_fluid_storage_disk",
+    "refinedstorage:256b_fluid_storage_part",
+    "refinedstorage:64b_fluid_storage_block",
+    "refinedstorage:network_transmitter",
+    "refinedstorage:16k_storage_disk",
+    "refinedstorage:1k_storage_block",
+    "refinedstorage:portable_grid",
+    "refinedstorage:destruction_core",
+    "refinedstorage:16k_storage_part",
+    "refinedstorage:advanced_processor",
+    "refinedstorage:grid",
+    "refinedstorage:256b_fluid_storage_block",
+    "refinedstorage:relay",
+    "refinedstorage:security_manager",
+    "refinedstorage:1024b_fluid_storage_block",
+    "refinedstorage:fallback_security_card",
+    "refinedstorage:disk_drive",
+    "refinedstorage:disk_interface",
+    "refinedstorage:raw_basic_processor",
+    "refinedstorage:wireless_transmitter",
+    "refinedstorage:raw_improved_processor",
+    "refinedstorage:basic_processor",
+    "refinedstorage:network_card",
+    "refinedstorage:detector",
+    "refinedstorage:storage_monitor",
+    "refinedstorage:destructor",
+    "refinedstorage:regulator_upgrade",
+    "refinedstorage:wrench",
+    "refinedstorage:raw_advanced_processor"
+  ]
+}
\ No newline at end of file
diff --git a/refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage_emi_integration.json b/refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage_emi_integration.json
deleted file mode 100644
index c8a2e67..0000000
--- a/refinedstorage-emi-integration-common/src/main/resources/assets/emi/recipe/defaults/refinedstorage_emi_integration.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "added": [
-    "refinedstorage2:stack_upgrade",
-    "refinedstorage2:block_of_quartz_enriched_iron",
-    "refinedstorage2:upgrade",
-    "refinedstorage2:fortune_3_upgrade",
-    "refinedstorage2:crafting_grid",
-    "refinedstorage2:64b_fluid_storage_disk",
-    "refinedstorage2:security_card",
-    "refinedstorage2:256b_fluid_storage_disk",
-    "refinedstorage2:1k_storage_part",
-    "refinedstorage2:construction_core",
-    "refinedstorage2:improved_processor",
-    "refinedstorage2:4096b_fluid_storage_disk",
-    "refinedstorage2:wireless_grid",
-    "refinedstorage2:64b_fluid_storage_part",
-    "refinedstorage2:4k_storage_disk",
-    "refinedstorage2:range_upgrade",
-    "refinedstorage2:cable",
-    "refinedstorage2:1024b_fluid_storage_part",
-    "refinedstorage2:4k_storage_block",
-    "refinedstorage2:64k_storage_disk",
-    "refinedstorage2:interface",
-    "refinedstorage2:speed_upgrade",
-    "refinedstorage2:network_receiver",
-    "refinedstorage2:silk_touch_upgrade",
-    "refinedstorage2:exporter",
-    "refinedstorage2:4096b_fluid_storage_part",
-    "refinedstorage2:4k_storage_part",
-    "refinedstorage2:16k_storage_block",
-    "refinedstorage2:64k_storage_block",
-    "refinedstorage2:configuration_card",
-    "refinedstorage2:importer",
-    "refinedstorage2:controller",
-    "refinedstorage2:external_storage",
-    "refinedstorage2:64k_storage_part",
-    "refinedstorage2:storage_housing",
-    "refinedstorage2:1k_storage_disk",
-    "refinedstorage2:fortune_1_upgrade",
-    "refinedstorage2:constructor",
-    "refinedstorage2:4096b_fluid_storage_block",
-    "refinedstorage2:fortune_2_upgrade",
-    "refinedstorage2:1024b_fluid_storage_disk",
-    "refinedstorage2:256b_fluid_storage_part",
-    "refinedstorage2:64b_fluid_storage_block",
-    "refinedstorage2:network_transmitter",
-    "refinedstorage2:16k_storage_disk",
-    "refinedstorage2:1k_storage_block",
-    "refinedstorage2:portable_grid",
-    "refinedstorage2:destruction_core",
-    "refinedstorage2:16k_storage_part",
-    "refinedstorage2:advanced_processor",
-    "refinedstorage2:grid",
-    "refinedstorage2:256b_fluid_storage_block",
-    "refinedstorage2:relay",
-    "refinedstorage2:security_manager",
-    "refinedstorage2:1024b_fluid_storage_block",
-    "refinedstorage2:fallback_security_card",
-    "refinedstorage2:disk_drive",
-    "refinedstorage2:disk_interface",
-    "refinedstorage2:raw_basic_processor",
-    "refinedstorage2:wireless_transmitter",
-    "refinedstorage2:raw_improved_processor",
-    "refinedstorage2:basic_processor",
-    "refinedstorage2:network_card",
-    "refinedstorage2:detector",
-    "refinedstorage2:storage_monitor",
-    "refinedstorage2:destructor",
-    "refinedstorage2:regulator_upgrade",
-    "refinedstorage2:wrench",
-    "refinedstorage2:raw_advanced_processor"
-  ]
-}
\ No newline at end of file
diff --git a/refinedstorage-emi-integration-common/src/main/resources/assets/refinedstorage_emi_integration/lang/en_us.json b/refinedstorage-emi-integration-common/src/main/resources/assets/refinedstorage_emi_integration/lang/en_us.json
index 7f71850..f51b90b 100644
--- a/refinedstorage-emi-integration-common/src/main/resources/assets/refinedstorage_emi_integration/lang/en_us.json
+++ b/refinedstorage-emi-integration-common/src/main/resources/assets/refinedstorage_emi_integration/lang/en_us.json
@@ -2,5 +2,6 @@
   "gui.refinedstorage_emi_integration.grid.synchronizer": "EMI",
   "gui.refinedstorage_emi_integration.grid.synchronizer.help": "Sync the search box text to the EMI filter.",
   "gui.refinedstorage_emi_integration.grid.synchronizer.two_way": "EMI two-way",
-  "gui.refinedstorage_emi_integration.grid.synchronizer.two_way.help": "Sync the search box text to the EMI filter, and the EMI filter to the search box text."
+  "gui.refinedstorage_emi_integration.grid.synchronizer.two_way.help": "Sync the search box text to the EMI filter, and the EMI filter to the search box text.",
+  "alias.emi.refinedstorage1_disk_manipulator": "Disk Manipulator"
 }
\ No newline at end of file
diff --git a/refinedstorage-emi-integration-fabric/.gitignore b/refinedstorage-emi-integration-fabric/.gitignore
deleted file mode 100644
index 737e26b..0000000
--- a/refinedstorage-emi-integration-fabric/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-run/
\ No newline at end of file
diff --git a/refinedstorage-emi-integration-fabric/build.gradle b/refinedstorage-emi-integration-fabric/build.gradle
index 43faffe..6c6edcd 100644
--- a/refinedstorage-emi-integration-fabric/build.gradle
+++ b/refinedstorage-emi-integration-fabric/build.gradle
@@ -29,9 +29,9 @@ repositories {
 }
 
 dependencies {
-    modApi "com.refinedmods.refinedstorage2:refinedstorage2-platform-fabric:${refinedstorageVersion}"
+    modApi "com.refinedmods.refinedstorage:refinedstorage-platform-fabric:${refinedstorageVersion}"
     modRuntimeOnly "dev.emi:emi-fabric:${emiVersion}"
-    modCompileOnlyApi "dev.emi:emi-fabric:${emiVersion}:api"
+    modCompileOnlyApi "dev.emi:emi-fabric:${emiVersion}"
 }
 
 enablePublishing()
\ No newline at end of file
diff --git a/refinedstorage-emi-integration-fabric/src/main/java/com/refinedmods/refinedstorage/emi/fabric/EmiRefinedStoragePlugin.java b/refinedstorage-emi-integration-fabric/src/main/java/com/refinedmods/refinedstorage/emi/fabric/EmiRefinedStoragePlugin.java
index 774a0d5..142bf94 100644
--- a/refinedstorage-emi-integration-fabric/src/main/java/com/refinedmods/refinedstorage/emi/fabric/EmiRefinedStoragePlugin.java
+++ b/refinedstorage-emi-integration-fabric/src/main/java/com/refinedmods/refinedstorage/emi/fabric/EmiRefinedStoragePlugin.java
@@ -1,7 +1,7 @@
 package com.refinedmods.refinedstorage.emi.fabric;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.RefinedStoragePlugin;
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
+import com.refinedmods.refinedstorage.platform.api.RefinedStoragePlugin;
 
 import static com.refinedmods.refinedstorage.emi.common.Common.init;
 
diff --git a/refinedstorage-emi-integration-fabric/src/main/resources/fabric.mod.json b/refinedstorage-emi-integration-fabric/src/main/resources/fabric.mod.json
index 816f048..2906408 100644
--- a/refinedstorage-emi-integration-fabric/src/main/resources/fabric.mod.json
+++ b/refinedstorage-emi-integration-fabric/src/main/resources/fabric.mod.json
@@ -26,14 +26,15 @@
       "links": {
         "modmenu.discord": "https://discordapp.com/invite/VYzsydb"
       },
-      "parent": "refinedstorage2"
+      "parent": "refinedstorage"
     }
   },
   "depends": {
     "fabricloader": ">=0.14.6",
     "fabric-api": "*",
-    "minecraft": "~1.20.4",
-    "emi": ">=1.1.7",
+    "minecraft": "~1.21",
+    "refinedstorage": ">=2.0.0-milestone.4.2",
+    "emi": ">=1.1.10",
     "java": ">=17"
   }
 }
diff --git a/refinedstorage-emi-integration-forge/.gitignore b/refinedstorage-emi-integration-forge/.gitignore
deleted file mode 100644
index 643cb18..0000000
--- a/refinedstorage-emi-integration-forge/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-runs/
\ No newline at end of file
diff --git a/refinedstorage-emi-integration-forge/build.gradle b/refinedstorage-emi-integration-neoforge/build.gradle
similarity index 59%
rename from refinedstorage-emi-integration-forge/build.gradle
rename to refinedstorage-emi-integration-neoforge/build.gradle
index dbdf613..d0f0f39 100644
--- a/refinedstorage-emi-integration-forge/build.gradle
+++ b/refinedstorage-emi-integration-neoforge/build.gradle
@@ -2,9 +2,9 @@ plugins {
     id 'java-library'
 }
 
-archivesBaseName = 'refinedstorage-emi-integration-forge'
+archivesBaseName = 'refinedstorage-emi-integration-neoforge'
 
-forgeProject("refinedstorage_emi_integration", project(":refinedstorage-emi-integration-common"))
+neoForgeProject("refinedstorage_emi_integration", project(":refinedstorage-emi-integration-common"))
 
 repositories {
     maven {
@@ -21,9 +21,9 @@ repositories {
 }
 
 dependencies {
-    api "com.refinedmods.refinedstorage2:refinedstorage2-platform-forge:${refinedstorageVersion}"
+    api "com.refinedmods.refinedstorage:refinedstorage-platform-neoforge:${refinedstorageVersion}"
     runtimeOnly "dev.emi:emi-neoforge:${emiVersion}"
-    compileOnlyApi "dev.emi:emi-neoforge:${emiVersion}:api"
+    compileOnlyApi "dev.emi:emi-neoforge:${emiVersion}"
 }
 
 enablePublishing()
\ No newline at end of file
diff --git a/refinedstorage-emi-integration-forge/src/main/java/com/refinedmods/refinedstorage/emi/forge/ModInitializer.java b/refinedstorage-emi-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/emi/forge/ModInitializer.java
similarity index 91%
rename from refinedstorage-emi-integration-forge/src/main/java/com/refinedmods/refinedstorage/emi/forge/ModInitializer.java
rename to refinedstorage-emi-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/emi/forge/ModInitializer.java
index 7cba7e6..be4d2c8 100644
--- a/refinedstorage-emi-integration-forge/src/main/java/com/refinedmods/refinedstorage/emi/forge/ModInitializer.java
+++ b/refinedstorage-emi-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/emi/forge/ModInitializer.java
@@ -1,8 +1,8 @@
 package com.refinedmods.refinedstorage.emi.forge;
 
 import com.refinedmods.refinedstorage.emi.common.Common;
+import com.refinedmods.refinedstorage.platform.api.PlatformApi;
 
-import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.Mod;
diff --git a/refinedstorage-emi-integration-forge/src/main/java/com/refinedmods/refinedstorage/emi/forge/package-info.java b/refinedstorage-emi-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/emi/forge/package-info.java
similarity index 100%
rename from refinedstorage-emi-integration-forge/src/main/java/com/refinedmods/refinedstorage/emi/forge/package-info.java
rename to refinedstorage-emi-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/emi/forge/package-info.java
diff --git a/refinedstorage-emi-integration-forge/src/main/resources/META-INF/mods.toml b/refinedstorage-emi-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml
similarity index 79%
rename from refinedstorage-emi-integration-forge/src/main/resources/META-INF/mods.toml
rename to refinedstorage-emi-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml
index d415313..9742f22 100644
--- a/refinedstorage-emi-integration-forge/src/main/resources/META-INF/mods.toml
+++ b/refinedstorage-emi-integration-neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -6,15 +6,15 @@ license = "MIT"
 modId = "refinedstorage_emi_integration"
 version = "${version}"
 displayName = "Refined Storage - EMI Integration"
-displayURL = "https://github.com/refinedmods/refinedstorage-emi-integration"
+displayURL = "https://refinedmods.com/refined-storage"
 authors = "Refined Mods"
 description = '''
 EMI integration for Refined Storage.
 '''
 [[dependencies.refinedstorage_emi_integration]]
-modId = "refinedstorage2"
+modId = "refinedstorage"
 type = "required"
-versionRange = "2.0.0-milestone.3.13"
+versionRange = "2.0.0-milestone.4.2"
 side = "BOTH"
 [[dependencies.refinedstorage_emi_integration]]
 modId = "emi"
diff --git a/refinedstorage-emi-integration-forge/src/main/resources/pack.mcmeta b/refinedstorage-emi-integration-neoforge/src/main/resources/pack.mcmeta
similarity index 100%
rename from refinedstorage-emi-integration-forge/src/main/resources/pack.mcmeta
rename to refinedstorage-emi-integration-neoforge/src/main/resources/pack.mcmeta
diff --git a/settings.gradle b/settings.gradle
index e0d31da..944e571 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-gradle.ext.refinedArchitectVersion = "0.13.4"
+gradle.ext.refinedArchitectVersion = "0.15.2"
 
 dependencyResolutionManagement {
     repositories {
@@ -14,5 +14,5 @@ dependencyResolutionManagement {
 
 rootProject.name = 'refinedstorage-emi-integration'
 include 'refinedstorage-emi-integration-common'
-include 'refinedstorage-emi-integration-forge'
+include 'refinedstorage-emi-integration-neoforge'
 include 'refinedstorage-emi-integration-fabric'