Update to 22w17a

4 files changed, 10 insertions, 11 deletions

diff --git a/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java b/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java
index f683dfb18..743c7c6bf 100644
--- a/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java
+++ b/fabric/src/main/java/me/shedaniel/rei/fabric/RoughlyEnoughItemsInitializerImpl.java
@@ -87,6 +87,10 @@ public class RoughlyEnoughItemsInitializerImpl {
     }
     
     public static int compareVersions(String version1, String version2) {
+        version1 = version1.contains("-") ? version1.substring(0, version1.indexOf("-")) : version1;
+        version2 = version2.contains("-") ? version2.substring(0, version2.indexOf("-")) : version2;
+        version1 = version1.contains("+") ? version1.substring(0, version1.indexOf("+")) : version1;
+        version2 = version2.contains("+") ? version2.substring(0, version2.indexOf("+")) : version2;
         Version v1, v2;
         
         try {
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 addd38d05..b1dd2d2bd 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
@@ -33,7 +33,6 @@ import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage;
 import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
 import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
-import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
 import net.minecraft.world.item.ItemStack;
 
 import java.util.List;
@@ -47,13 +46,10 @@ public class FabricFluidAPISupportPlugin implements REIServerPlugin {
             ItemStack stack = entry.getValue().copy();
             Storage<FluidVariant> storage = FluidStorage.ITEM.find(stack, ContainerItemContext.withInitial(stack));
             if (storage != null) {
-                List<EntryStack<FluidStack>> result;
-                try (Transaction transaction = Transaction.openOuter()) {
-                    result = StreamSupport.stream(storage.iterable(transaction).spliterator(), false)
-                            .filter(view -> !view.isResourceBlank())
-                            .map(view -> EntryStacks.of(FluidStack.create(view.getResource().getFluid(), view.getAmount(), view.getResource().getNbt())))
-                            .collect(Collectors.toList());
-                }
+                List<EntryStack<FluidStack>> result = StreamSupport.stream(storage.spliterator(), false)
+                        .filter(view -> !view.isResourceBlank())
+                        .map(view -> EntryStacks.of(FluidStack.create(view.getResource().getFluid(), view.getAmount(), view.getResource().getNbt())))
+                        .collect(Collectors.toList());
                 if (!result.isEmpty()) {
                     return CompoundEventResult.interruptTrue(result.stream());
                 }
diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinPacketEncoder.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinPacketEncoder.java
index 2217b5c15..010a43b52 100644
--- a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinPacketEncoder.java
+++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinPacketEncoder.java
@@ -27,7 +27,6 @@ import dev.architectury.utils.GameInstance;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.ChatFormatting;
-import net.minecraft.Util;
 import net.minecraft.network.PacketEncoder;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
@@ -49,7 +48,7 @@ public class MixinPacketEncoder {
                            "Please check the server console log for errors, this breaks REI and vanilla recipe books!";
             server.execute(() -> {
                 for (ServerPlayer player : server.getPlayerList().getPlayers()) {
-                    player.sendMessage(Component.literal(issue).withStyle(ChatFormatting.RED), Util.NIL_UUID);
+                    player.sendSystemMessage(Component.literal(issue).withStyle(ChatFormatting.RED));
                 }
             });
             System.out.println(issue);
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index ac7824a52..d2e80a5ab 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -116,6 +116,6 @@
     }
   },
   "depends": {
-    "minecraft": "~1.19-"
+    "minecraft": "1.19-alpha.22.17.a"
   }
 }