[1.20.x] Fix patch conflicts introduced by #999

[Shadows-of-Fire]

pls help I cannot import the neo foreg thank you

(I still can't, pls help)

Merging of #999 introduced a patch conflict due to a change that was made between its last pipeline run and time of merge, this PR fixes that

[neoforged-pr-publishing]

• Publish PR to GitHub Packages

Last commit published: cb5cb3ce30e289986828f56f01c25123a25707e5.

PR Publishing

The artifacts published by this PR:

• 📦 net.neoforged:testframework:20.6.106-beta-pr-1057-what
• 📦 net.neoforged:neoforge:20.6.106-beta-pr-1057-what

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 #1057' // https://github.com/neoforged/NeoForge/pull/1057
        url 'https://prmaven.neoforged.net/NeoForge/pr1057'
        content {
            includeModule('net.neoforged', 'testframework')
            includeModule('net.neoforged', 'neoforge')
        }
    }
}

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-pr1057.
On Powershell you will need to remove the -L flag from the curl invocation.

mkdir NeoForge-pr1057
cd NeoForge-pr1057
curl -L https://prmaven.neoforged.net/NeoForge/pr1057/net/neoforged/neoforge/20.6.106-beta-pr-1057-what/mdk-pr1057.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.

[Shadows-of-Fire]

Updated to include a patch apply fix for an issue caused by merge of #999

[Shadows-of-Fire]

Due to issues with NG > 136 this PR now is just a fix for patch conflicts.

You really can't tell where things are going sometimes

[tmvkrpxl0]

I like how everything went unexpected here