Skip to content
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.

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

[1.21.3] Fix recipe manager not using ConditionalOps #1710

Merged
merged 2 commits into from
Nov 27, 2024

Conversation

ApexModder
Copy link
Contributor

During the 1.21.2 port the RecipeManager patch was completely dropped, which changed recipes to use JsonOps.INSTANCE when loading the recipe files when it should be wrapped in ConditionalOps for conditional support.

This PR aims to fix that by again wrapping the JsonOps with ConditionalOps.

@ApexModder ApexModder added the 1.21.3 Targeted at Minecraft 1.21.3 label Nov 26, 2024
@neoforged-pr-publishing
Copy link

neoforged-pr-publishing bot commented Nov 26, 2024

  • Publish PR to GitHub Packages

Last commit published: d474b84b2fe9fb0cde0160339b22ffcb5688a907.

PR Publishing

The artifacts published by this PR:

Repository Declaration

In order to use the artifacts published by the PR, add the following repository to your buildscript:

repositories {
    maven {
        name 'Maven for PR #1710' // https://github.com/neoforged/NeoForge/pull/1710
        url 'https://prmaven.neoforged.net/NeoForge/pr1710'
        content {
            includeModule('net.neoforged', 'neoforge')
            includeModule('net.neoforged', 'testframework')
        }
    }
}

MDK installation

In order to setup a MDK using the latest PR version, run the following commands in a terminal.
The script works on both *nix and Windows as long as you have the JDK bin folder on the path.
The script will clone the MDK in a folder named NeoForge-pr1710.
On Powershell you will need to remove the -L flag from the curl invocation.

mkdir NeoForge-pr1710
cd NeoForge-pr1710
curl -L https://prmaven.neoforged.net/NeoForge/pr1710/net/neoforged/neoforge/21.3.45-beta-pr-1710-pr-fix-recipe-condition/mdk-pr1710.zip -o mdk.zip
jar xf mdk.zip
rm mdk.zip || del mdk.zip

To test a production environment, you can download the installer from here.

@ApexModder ApexModder requested a review from XFactHD November 26, 2024 18:09
@ApexModder ApexModder added the bug A bug or error label Nov 26, 2024
@ApexModder ApexModder enabled auto-merge (squash) November 27, 2024 07:57
@ApexModder ApexModder merged commit cf6cc71 into neoforged:1.21.x Nov 27, 2024
6 checks passed
@ApexModder ApexModder deleted the pr/fix-recipe-condition branch November 27, 2024 08:01
@neoforged-releases
Copy link

🚀 This PR has been released as NeoForge version 21.3.43-beta.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.21.3 Targeted at Minecraft 1.21.3 bug A bug or error
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants