Skip to content

Update to Minecraft 26.3 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rubensworks merged 2 commits into from
Sep 20, 2026
+6 −4
Merged

Update to Minecraft 26.3 #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c1d602
Update to Minecraft 26.3
claude Sep 20, 2026
c5d5d8f
Merge master-26 into the 26.3 update branch
rubensworks Sep 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions capability/recipehandler/RecipeHandlerHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package org.cyclops.commoncapabilities.api.capability.recipehandler;

import com.google.common.collect.Lists;
import net.minecraft.core.HolderSet;
import net.minecraft.recipebook.PlaceRecipeHelper;
import net.minecraft.resources.ResourceKey;
import net.minecraft.util.context.ContextMap;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.crafting.Recipe;
Expand Down Expand Up @@ -43,8 +45,8 @@ public static IPrototypedIngredientAlternatives<ItemStack, Integer> getPrototype
* @return A list of prototyped ingredients.
*/
public static IPrototypedIngredientAlternatives<ItemStack, Integer> getPrototypesFromDisplay(SlotDisplay display, int count) {
if (display instanceof SlotDisplay.TagSlotDisplay(net.minecraft.tags.TagKey<net.minecraft.world.item.Item> tag)) {
return new PrototypedIngredientAlternativesItemStackTag(Lists.newArrayList(tag.location().toString()), ItemMatch.ITEM, count);
if (display instanceof SlotDisplay.TagSlotDisplay(HolderSet<Item> tag) && tag.unwrapKey().isPresent()) {
return new PrototypedIngredientAlternativesItemStackTag(Lists.newArrayList(tag.unwrapKey().get().location().toString()), ItemMatch.ITEM, count);
} else if (display instanceof SlotDisplay.Empty) {
return new PrototypedIngredientAlternativesList<>(Lists.newArrayList(new PrototypedIngredient<>(IngredientComponent.ITEMSTACK, ItemStack.EMPTY, ItemMatch.ITEM)));
} else if (display instanceof SlotDisplay.ItemStackSlotDisplay(net.minecraft.world.item.ItemStackTemplate stackTemplate)) {
Expand All @@ -69,8 +71,8 @@ public static IPrototypedIngredientAlternatives<ItemStack, Integer> getPrototype
* @return A list of prototyped ingredients.
*/
private static IPrototypedIngredientAlternatives<ItemStack, Integer> getPrototypesFromDisplay(SlotDisplay display, int count, ContextMap contextMap) {
if (display instanceof SlotDisplay.TagSlotDisplay(net.minecraft.tags.TagKey<net.minecraft.world.item.Item> tag)) {
return new PrototypedIngredientAlternativesItemStackTag(Lists.newArrayList(tag.location().toString()), ItemMatch.ITEM, count);
if (display instanceof SlotDisplay.TagSlotDisplay(HolderSet<Item> tag) && tag.unwrapKey().isPresent()) {
return new PrototypedIngredientAlternativesItemStackTag(Lists.newArrayList(tag.unwrapKey().get().location().toString()), ItemMatch.ITEM, count);
} else if (display instanceof SlotDisplay.Empty) {
return new PrototypedIngredientAlternativesList<>(Lists.newArrayList(new PrototypedIngredient<>(IngredientComponent.ITEMSTACK, ItemStack.EMPTY, ItemMatch.ITEM)));
} else if (display instanceof SlotDisplay.ItemStackSlotDisplay(net.minecraft.world.item.ItemStackTemplate stackTemplate)) {
Expand Down