chore: make the snapshot runnable

- fix some imports - Ingredients use a stream of items now
SpongePowered · Nov 16, 2024 · 87d0ae6 · 87d0ae6
1 parent 7f50cec
commit 87d0ae6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...org/spongepowered/common/mixin/api/minecraft/world/item/crafting/IngredientMixin_API.java b/...org/spongepowered/common/mixin/api/minecraft/world/item/crafting/IngredientMixin_API.java
@@ -39,18 +39,19 @@
 import org.spongepowered.common.item.util.ItemStackUtil;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 @Mixin(Ingredient.class)
 @Implements(@Interface(iface = org.spongepowered.api.item.recipe.crafting.Ingredient.class, prefix = "ingredient$", remap = Remap.NONE))
 public abstract class IngredientMixin_API {
 
     // @formatter:off
     @Shadow public abstract boolean shadow$test(@Nullable ItemStack p_test_1_);
-    @Shadow public abstract List<Holder<Item>> shadow$items();
+    @Shadow public abstract Stream<Holder<Item>> shadow$items();
     // @formatter:on
 
     public List<ItemType> ingredient$displayedItems() {
-        return this.shadow$items().stream().map((holder) -> (ItemType) holder.value()).toList();
+        return this.shadow$items().map((holder) -> (ItemType) holder.value()).toList();
     }
 
     public boolean ingredient$test(final ItemStackLike itemStack) {

diff --git a/vanilla/src/main/java/org/spongepowered/vanilla/server/packs/PluginPackResources.java b/vanilla/src/main/java/org/spongepowered/vanilla/server/packs/PluginPackResources.java
@@ -30,7 +30,7 @@
 import net.minecraft.server.packs.AbstractPackResources;
 import net.minecraft.server.packs.PackLocationInfo;
 import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
+import net.minecraft.server.packs.metadata.MetadataSectionType;
 import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
 import net.minecraft.server.packs.resources.IoSupplier;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -109,8 +109,8 @@ private ResourceLocation convertResourcePath(final String namespace, final Path
 
     @Nullable
     @Override
-    public <T> T getMetadataSection(final MetadataSectionSerializer<T> deserializer) throws IOException {
-        if (deserializer.getMetadataSectionName().equals("pack")) {
+    public <T> T getMetadataSection(final MetadataSectionType<T> deserializer) throws IOException {
+        if (deserializer.name().equals("pack")) {
             return (T) this.metadata;
         }
         return null;