Update to 22w17a

10 files changed, 21 insertions, 25 deletions

diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
index e016bebe1..50adee384 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
@@ -66,8 +66,7 @@ public class DefaultInformationCategory implements DisplayCategory<DefaultInform
         bufferBuilder.vertex(matrix4f, xEnd, yEnd, z).uv(uEnd, vEnd).endVertex();
         bufferBuilder.vertex(matrix4f, xEnd, yStart, z).uv(uEnd, vStart).endVertex();
         bufferBuilder.vertex(matrix4f, xStart, yStart, z).uv(uStart, vStart).endVertex();
-        bufferBuilder.end();
-        BufferUploader.drawWithShader(bufferBuilder);
+        BufferUploader.drawWithShader(bufferBuilder.end());
     }
     
     @Override
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"
   }
 }
diff --git a/gradle.properties b/gradle.properties
index eb19026d9..361220535 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 (22w16b)
-minecraft_version=22w16b
+supported_version=1.19 (22w17a)
+minecraft_version=22w17a
 forgeEnabled=false
 forge_version=40.0.45
-fabricloader_version=0.14.0
+fabricloader_version=0.14.3
 cloth_config_version=7.0.61
 modmenu_version=3.0.0
-fabric_api=0.51.2+1.19
-architectury_version=5.2.8
+fabric_api=0.51.3+1.19
+architectury_version=5.2.9
 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 a2b7cd9b6..2825a2ffb 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
@@ -121,9 +121,9 @@ public class RoughlyEnoughItemsNetwork {
                     }
                     NetworkManager.sendToPlayer(player, NOT_ENOUGH_ITEMS_PACKET, buf);*/
                 } catch (IllegalStateException e) {
-                    player.sendMessage(Component.translatable(e.getMessage()).withStyle(ChatFormatting.RED), Util.NIL_UUID);
+                    player.sendSystemMessage(Component.translatable(e.getMessage()).withStyle(ChatFormatting.RED));
                 } catch (Exception e) {
-                    player.sendMessage(Component.translatable("error.rei.internal.error", e.getMessage()).withStyle(ChatFormatting.RED), Util.NIL_UUID);
+                    player.sendSystemMessage(Component.translatable("error.rei.internal.error", e.getMessage()).withStyle(ChatFormatting.RED));
                     e.printStackTrace();
                 }
             } catch (Exception e) {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java
index 9625571b7..2c232ae2a 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/PerformanceScreen.java
@@ -161,7 +161,7 @@ public class PerformanceScreen extends Screen {
             entries.sort(Comparator.<EntryListEntry>comparingLong(value -> value.time).reversed());
             list.addItem(new SubCategoryListEntry(Component.literal(stage), (List<PerformanceScreen.PerformanceEntry>) (List<? extends PerformanceScreen.PerformanceEntry>) entries, Math.max(inner.totalNano(), separateTime), false));
         });
-        list.children().add(0, new EntryListEntry(new TextComponent("Total Load Time"), totalTime[0]));
+        list.children().add(0, new EntryListEntry(Component.literal("Total Load Time"), totalTime[0]));
         addWidget(list);
     }
     
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java
index afdddd38e..afc94b2d5 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java
@@ -69,7 +69,6 @@ public final class TexturedDrawableConsumer implements DrawableConsumer {
         bufferBuilder.vertex(matrix, xEnd, yEnd, z).uv(uEnd, vEnd).endVertex();
         bufferBuilder.vertex(matrix, xEnd, yStart, z).uv(uEnd, vStart).endVertex();
         bufferBuilder.vertex(matrix, xStart, yStart, z).uv(uStart, vStart).endVertex();
-        bufferBuilder.end();
-        BufferUploader.drawWithShader(bufferBuilder);
+        BufferUploader.drawWithShader(bufferBuilder.end());
     }
 }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/search/OverlaySearchField.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/search/OverlaySearchField.java
index e9e68f206..951059664 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/search/OverlaySearchField.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/search/OverlaySearchField.java
@@ -203,8 +203,7 @@ public class OverlaySearchField extends TextFieldWidget implements TextFieldWidg
             fillGradient(pose, bufferBuilder, x + 1, y + height - 3, x + progressWidth - 1, y + height - 1, 400, 0xffffffff, 0xffffffff);
         }
         
-        bufferBuilder.end();
-        BufferUploader.drawWithShader(bufferBuilder);
+        BufferUploader.drawWithShader(bufferBuilder.end());
         poses.pushPose();
         poses.translate(0.0D, 0.0D, 400.0D);
         for (int i = 0; i < sequences.size(); i++) {