Skip to content

Commit 87d0ae6

Browse files
committed
chore: make the snapshot runnable
- fix some imports - Ingredients use a stream of items now
1 parent 7f50cec commit 87d0ae6

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/item/crafting/IngredientMixin_API.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,19 @@
3939
import org.spongepowered.common.item.util.ItemStackUtil;
4040

4141
import java.util.List;
42+
import java.util.stream.Stream;
4243

4344
@Mixin(Ingredient.class)
4445
@Implements(@Interface(iface = org.spongepowered.api.item.recipe.crafting.Ingredient.class, prefix = "ingredient$", remap = Remap.NONE))
4546
public abstract class IngredientMixin_API {
4647

4748
// @formatter:off
4849
@Shadow public abstract boolean shadow$test(@Nullable ItemStack p_test_1_);
49-
@Shadow public abstract List<Holder<Item>> shadow$items();
50+
@Shadow public abstract Stream<Holder<Item>> shadow$items();
5051
// @formatter:on
5152

5253
public List<ItemType> ingredient$displayedItems() {
53-
return this.shadow$items().stream().map((holder) -> (ItemType) holder.value()).toList();
54+
return this.shadow$items().map((holder) -> (ItemType) holder.value()).toList();
5455
}
5556

5657
public boolean ingredient$test(final ItemStackLike itemStack) {

vanilla/src/main/java/org/spongepowered/vanilla/server/packs/PluginPackResources.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import net.minecraft.server.packs.AbstractPackResources;
3131
import net.minecraft.server.packs.PackLocationInfo;
3232
import net.minecraft.server.packs.PackType;
33-
import net.minecraft.server.packs.metadata.MetadataSectionSerializer;
33+
import net.minecraft.server.packs.metadata.MetadataSectionType;
3434
import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
3535
import net.minecraft.server.packs.resources.IoSupplier;
3636
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -109,8 +109,8 @@ private ResourceLocation convertResourcePath(final String namespace, final Path
109109

110110
@Nullable
111111
@Override
112-
public <T> T getMetadataSection(final MetadataSectionSerializer<T> deserializer) throws IOException {
113-
if (deserializer.getMetadataSectionName().equals("pack")) {
112+
public <T> T getMetadataSection(final MetadataSectionType<T> deserializer) throws IOException {
113+
if (deserializer.name().equals("pack")) {
114114
return (T) this.metadata;
115115
}
116116
return null;

0 commit comments

Comments
 (0)