Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/1.20.2' into 1.20.4-the-second
Browse files Browse the repository at this point in the history
  • Loading branch information
moehreag committed Jan 28, 2024
2 parents c0a175e + 5da1018 commit 14b767d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import org.quiltmc.qsl.resource.loader.api.client.ClientResourceLoaderEvents;
import org.quiltmc.qsl.resource.loader.test.ResourceLoaderTestMod;

public class ClientLoaderEventsTestMod implements ClientResourceLoaderEvents.StartPackReload,
public class ClientResourceLoaderEventsTestMod implements ClientResourceLoaderEvents.StartPackReload,
ClientResourceLoaderEvents.EndPackReload {
private static final Logger LOGGER = LoggerFactory.getLogger(ClientLoaderEventsTestMod.class);
private static final Logger LOGGER = LoggerFactory.getLogger(ClientResourceLoaderEventsTestMod.class);
private long start;

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import net.minecraft.inventory.Inventory;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Recipe;
import net.minecraft.recipe.RecipeHolder;
import net.minecraft.recipe.RecipeManager;
import net.minecraft.recipe.RecipeType;
import net.minecraft.util.collection.DefaultedList;
Expand All @@ -37,9 +38,9 @@
@Mixin(RecipeManager.class)
public class RecipeManagerMixin {
@Inject(method = "getRemainingStacks", at = @At(value = "RETURN", ordinal = 0), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD)
public <C extends Inventory, T extends Recipe<C>> void interceptGetRemainingStacks(RecipeType<T> recipeType, C inventory, World world, CallbackInfoReturnable<DefaultedList<ItemStack>> cir, Optional<Recipe<?>> optionalRecipe) {
public <C extends Inventory, T extends Recipe<C>> void interceptGetRemainingStacks(RecipeType<T> recipeType, C inventory, World world, CallbackInfoReturnable<DefaultedList<ItemStack>> cir, Optional<RecipeHolder<?>> optionalRecipe) {
cir.setReturnValue(
RecipeRemainderProvider.getRemainingStacks(inventory, optionalRecipe.get(), cir.getReturnValue())
RecipeRemainderProvider.getRemainingStacks(inventory, optionalRecipe.get().value(), cir.getReturnValue())
);
}
}

0 comments on commit 14b767d

Please sign in to comment.