From 3fbac23c13bc2114b6f034ca7b52238654dc2227 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Mon, 1 Apr 2024 22:34:55 +0900
Subject: Update to 24w14potato

---
 .github/workflows/curseforge.yml                               |  1 +
 .../rei/api/common/transfer/info/simple/DumpHandler.java       |  2 +-
 gradle.properties                                              | 10 +++++-----
 .../main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java  |  2 +-
 .../shedaniel/rei/impl/common/transfer/InputSlotCrafter.java   |  2 +-
 .../rei/impl/common/transfer/NewInputSlotCrafter.java          |  2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/curseforge.yml b/.github/workflows/curseforge.yml
index 60f6d0eec..1024cff69 100644
--- a/.github/workflows/curseforge.yml
+++ b/.github/workflows/curseforge.yml
@@ -19,6 +19,7 @@ on:
       - 13.x-1.20.2
       - 14.x-1.20.4
       - 15.x-1.20.5
+      - 15.x-24w14potato
 
 jobs:
   build:
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/DumpHandler.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/DumpHandler.java
index 9f1fe8593..dda6344df 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/DumpHandler.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/simple/DumpHandler.java
@@ -55,6 +55,6 @@ public interface DumpHandler<T extends AbstractContainerMenu, D extends Display>
     }
     
     static boolean canStackAddMore(ItemStack existingStack, ItemStack stack) {
-        return !existingStack.isEmpty() && ItemStack.isSameItemSameTags(existingStack, stack) && existingStack.isStackable() && existingStack.getCount() + stack.getCount() <= existingStack.getMaxStackSize();
+        return !existingStack.isEmpty() && ItemStack.isSameItemSameComponents(existingStack, stack) && existingStack.isStackable() && existingStack.getCount() + stack.getCount() <= existingStack.getMaxStackSize();
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 94e8ac4d9..97a1a9d05 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,15 +1,15 @@
 org.gradle.jvmargs=-Xmx6G
 base_version=14.0
 unstable=true
-supported_version=1.20.5 (24w09a)
-minecraft_version=24w09a
+supported_version=24w14potato April Fools
+minecraft_version=24w14potato
 platforms=fabric
 forge_version=49.0.3
 neoforge_version=20.4.48-beta
-fabricloader_version=0.15.7
+fabricloader_version=0.15.9
 cloth_config_version=14.0.122
 modmenu_version=7.0.0
-fabric_api=0.96.6+1.20.5
-architectury_version=12.0.16
+fabric_api=0.96.14+24w14potato
+architectury_version=12.0.19
 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/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
index 3f536b53e..f8a241ab0 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
@@ -107,7 +107,7 @@ public class RoughlyEnoughItemsNetwork {
             AbstractContainerMenu menu = player.containerMenu;
             ItemStack itemStack = buf.readJsonWithCodec(ItemStack.OPTIONAL_CODEC);
             ItemStack stack = itemStack.copy();
-            if (!menu.getCarried().isEmpty() && ItemStack.isSameItemSameTags(menu.getCarried(), stack)) {
+            if (!menu.getCarried().isEmpty() && ItemStack.isSameItemSameComponents(menu.getCarried(), stack)) {
                 stack.setCount(Mth.clamp(stack.getCount() + menu.getCarried().getCount(), 1, stack.getMaxStackSize()));
             } else if (!menu.getCarried().isEmpty()) {
                 return;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java
index 50b24676a..07a2db41d 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/InputSlotCrafter.java
@@ -160,7 +160,7 @@ public abstract class InputSlotCrafter<T extends AbstractContainerMenu, C extend
     }
     
     private static boolean areItemsEqual(ItemStack stack1, ItemStack stack2) {
-        return ItemStack.isSameItemSameTags(stack1, stack2);
+        return ItemStack.isSameItemSameComponents(stack1, stack2);
     }
     
     public static class NotEnoughMaterialsException extends RuntimeException {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/NewInputSlotCrafter.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/NewInputSlotCrafter.java
index a2d35f24d..a7965324f 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/NewInputSlotCrafter.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/transfer/NewInputSlotCrafter.java
@@ -129,6 +129,6 @@ public class NewInputSlotCrafter<T extends AbstractContainerMenu, C extends Cont
     }
     
     static boolean canStackAddMore(ItemStack existingStack, ItemStack stack) {
-        return !existingStack.isEmpty() && ItemStack.isSameItemSameTags(existingStack, stack) && existingStack.isStackable() && existingStack.getCount() + stack.getCount() <= existingStack.getMaxStackSize();
+        return !existingStack.isEmpty() && ItemStack.isSameItemSameComponents(existingStack, stack) && existingStack.isStackable() && existingStack.getCount() + stack.getCount() <= existingStack.getMaxStackSize();
     }
 }
-- 
cgit