Update to 1.19.3

3 files changed, 15 insertions, 17 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
index 0d0b64ca9..e7a460761 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java
@@ -58,7 +58,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.language.I18n;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -111,7 +111,7 @@ public class FluidEntryDefinition implements EntryDefinition<FluidStack>, EntryS
     @Override
     @Nullable
     public ResourceLocation getIdentifier(EntryStack<FluidStack> entry, FluidStack value) {
-        return Registry.FLUID.getKey(value.getFluid());
+        return BuiltInRegistries.FLUID.getKey(value.getFluid());
     }
     
     @Override
@@ -213,7 +213,7 @@ public class FluidEntryDefinition implements EntryDefinition<FluidStack>, EntryS
     public void fillCrashReport(CrashReport report, CrashReportCategory category, EntryStack<FluidStack> entry) {
         EntryDefinition.super.fillCrashReport(report, category, entry);
         FluidStack stack = entry.getValue();
-        category.setDetail("Fluid Type", () -> String.valueOf(Registry.FLUID.getKey(stack.getFluid())));
+        category.setDetail("Fluid Type", () -> String.valueOf(BuiltInRegistries.FLUID.getKey(stack.getFluid())));
         category.setDetail("Fluid Amount", () -> String.valueOf(stack.getAmount()));
         category.setDetail("Fluid NBT", () -> String.valueOf(stack.getTag()));
     }
@@ -306,7 +306,7 @@ public class FluidEntryDefinition implements EntryDefinition<FluidStack>, EntryS
                 }
             }
             if (Minecraft.getInstance().options.advancedItemTooltips) {
-                ResourceLocation fluidId = Registry.FLUID.getKey(entry.getValue().getFluid());
+                ResourceLocation fluidId = BuiltInRegistries.FLUID.getKey(entry.getValue().getFluid());
                 toolTip.add((Component.literal(fluidId.toString())).withStyle(ChatFormatting.DARK_GRAY));
             }
             return Tooltip.create(toolTip);
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java
index 3ea8f26e9..c0dce1523 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/ItemEntryDefinition.java
@@ -57,7 +57,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -105,7 +105,7 @@ public class ItemEntryDefinition implements EntryDefinition<ItemStack>, EntrySer
     @Override
     @Nullable
     public ResourceLocation getIdentifier(EntryStack<ItemStack> entry, ItemStack value) {
-        return Registry.ITEM.getKey(value.getItem());
+        return BuiltInRegistries.ITEM.getKey(value.getItem());
     }
     
     @Override
@@ -206,7 +206,7 @@ public class ItemEntryDefinition implements EntryDefinition<ItemStack>, EntrySer
                 SEARCH_BLACKLISTED.add(value.getItem());
             }
         try {
-            return Component.literal(I18n.get("item." + Registry.ITEM.getKey(value.getItem()).toString().replace(":", ".")));
+            return Component.literal(I18n.get("item." + BuiltInRegistries.ITEM.getKey(value.getItem()).toString().replace(":", ".")));
         } catch (Throwable e) {
             e.printStackTrace();
         }
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java b/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java
index 73080a7ec..3a0d59658 100644
--- a/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java
+++ b/runtime/src/main/java/me/shedaniel/rei/plugin/test/REITestPlugin.java
@@ -43,12 +43,10 @@ import me.shedaniel.rei.impl.common.InternalLogger;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
-import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.Commands;
 import net.minecraft.commands.arguments.item.ItemArgument;
 import net.minecraft.commands.arguments.item.ItemInput;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryAccess;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.Item;
@@ -68,9 +66,9 @@ public class REITestPlugin implements REIClientPlugin {
     private BasicFilteringRule.MarkDirty markDirty;
     
     public REITestPlugin() {
-        CommandRegistrationEvent.EVENT.register((dispatcher, selection) -> {
+        CommandRegistrationEvent.EVENT.register((dispatcher, registry, selection) -> {
             dispatcher.register(Commands.literal("rei_test_reload_filtering")
-                    .then(Commands.argument("item", ItemArgument.item(new CommandBuildContext(RegistryAccess.fromRegistryOfRegistries(Registry.REGISTRY))))
+                    .then(Commands.argument("item", ItemArgument.item(registry))
                             .executes(context -> {
                                 BasicFilteringRule<?> basic = FilteringRuleTypeRegistry.getInstance().basic();
                                 basic.hide(EntryStacks.of(context.getArgument("item", ItemInput.class).createItemStack(1, false)));
@@ -92,7 +90,7 @@ public class REITestPlugin implements REIClientPlugin {
     public void registerEntries(EntryRegistry registry) {
         if (1 + 1 == 2) return;
         int times = 10;
-        for (Item item : Registry.ITEM) {
+        for (Item item : BuiltInRegistries.ITEM) {
             EntryStack<ItemStack> base = EntryStacks.of(item);
             registry.addEntriesAfter(base, IntStream.range(0, times).mapToObj(value -> transformStack(EntryStacks.of(item))).collect(Collectors.toList()));
             try {
@@ -107,10 +105,10 @@ public class REITestPlugin implements REIClientPlugin {
     @Override
     public void registerCollapsibleEntries(CollapsibleEntryRegistry registry) {
         int i = 0;
-        for (Item item : Registry.ITEM) {
+        for (Item item : BuiltInRegistries.ITEM) {
             if (i++ % 10 != 0)
                 continue;
-            registry.group(Registry.ITEM.getKey(item), Component.literal(Registry.ITEM.getKey(item).toString()),
+            registry.group(BuiltInRegistries.ITEM.getKey(item), Component.literal(BuiltInRegistries.ITEM.getKey(item).toString()),
                     stack -> stack.getType() == VanillaEntryTypes.ITEM && stack.<ItemStack>castValue().is(item));
         }
     }
@@ -119,7 +117,7 @@ public class REITestPlugin implements REIClientPlugin {
     public void registerBasicEntryFiltering(BasicFilteringRule<?> rule) {
         markDirty = rule.hide(() -> {
             EntryIngredient.Builder builder = EntryIngredient.builder();
-            for (Item item : Registry.ITEM) {
+            for (Item item : BuiltInRegistries.ITEM) {
                 if (random.nextInt() % 10 == 0) {
                     builder.add(EntryStacks.of(item));
                 }
@@ -130,7 +128,7 @@ public class REITestPlugin implements REIClientPlugin {
     
     @Override
     public void registerItemComparators(ItemComparatorRegistry registry) {
-        registry.registerNbt(Registry.ITEM.stream().toArray(Item[]::new));
+        registry.registerNbt(BuiltInRegistries.ITEM.stream().toArray(Item[]::new));
     }
     
     public EntryStack<ItemStack> transformStack(EntryStack<ItemStack> stack) {