Fixed an unroll from the MCL merge. Updated MCP mappings.

Added a new hook to support custom enchantments.

.gitattributes

@@ -1,23 +0,0 @@
-* text eol=lf
-*.bat text eol=crlf
-*.patch text eol=lf
-*.java text eol=lf
-*.gradle text eol=crlf
-*.png binary
-*.gif binary
-*.exe binary
-*.dll binary
-*.jar binary
-*.lzma binary
-*.zip binary
-*.pyd binary
-*.cfg text eol=lf
-*.py text eol=lf
-*.jks binary
-
-# Disable autocrlf on generated files, they always generate with LF
-src/generated/**/.cache/cache text eol=lf
-src/generated/**/*.json text eol=lf
-src/generated_test/**/.cache/cache text eol=lf
-src/generated_test/**/*.json text eol=lf
-

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,13 +0,0 @@
----
-name: Feature request
-about: Want to request a feature?
-title: ''
-labels: Feature
-assignees: ''
-
----
-
-<!-- Please note, feature requests that are submitted as GitHub issues here are rarely implemented. -->
-<!-- If you'd like to see something in Forge, you should be ready to implement it as a PR. -->
-<!-- If you're not sure, open a Draft PR or discuss it in the Discord server. -->
-<!-- Discord: https://discord.gg/UvedJ9m -->

.github/ISSUE_TEMPLATE/issue_report.md

@@ -1,26 +0,0 @@
----
-name: Issue report
-about: Visit the forum first for issues with crashes.
-title: ''
-labels: Triage
-assignees: ''
-
----
-
-<!-- Thank you for reporting! -->
-
-<!-- For support with crashes and issues, please create a post on the forum instead: -->
-<!-- https://www.minecraftforge.net/forum/forum/18-support-bug-reports/ -->
-
-**Minecraft Version:** {Minecraft version}
-
-**Forge Version:** {Forge version. *Version number, not latest/rb*}
-
-**Logs:** {Link(s) to GitHub Gist with full latest.log and/or crash report}
-
-**Steps to Reproduce:**
- 1. Do this
- 2. Then do that
- 3. ...
-
-**Description of issue:**

.github/stale.yml

@@ -1,43 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# Label to use when marking as stale
-staleLabel: Stale
-# Comment to post when removing the stale label. Set to `false` to disable
-unmarkComment: false
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 1
-# Issues with these labels will never be considered stale. Set to `[]` to disable
-exemptLabels:
-  - Assigned
-
-pulls:
-  # Number of days of inactivity before a Pull Request becomes stale
-  daysUntilStale: 60
-  # Number of days of inactivity before a stale Pull Request is closed
-  daysUntilClose: 14
-  # Comment to post when marking as stale. Set to `false` to disable
-  markComment: >
-    This pull request has been automatically marked as stale because it has not had recent
-    activity, and will be closed if no further activity occurs. If this pull request was
-    overlooked, forgotten, or should remain open for any other reason, please reply
-    here to call attention to it and remove the stale status. Thank you for your contributions.
-  # Comment to post when closing a stale Pull Request. Set to `false` to disable
-  closeComment: >
-    This pull request has been automatically closed because it has not had
-    recent activity. Please feel free to update or reopen it.
-issues:
-  # Number of days of inactivity before an Issue becomes stale
-  daysUntilStale: 180
-  # Number of days of inactivity before a stale Issue is closed
-  daysUntilClose: 14
-  # Comment to post when marking as stale. Set to `false` to disable
-  markComment: >
-    This issue has been automatically marked as stale because it has not had activity
-    in a long time. If this issue is still relevant and should remain open, please reply
-    with a short explanation (e.g. "I have checked the code and this issue is still relevant because ___."
-    or "Here's a screenshot of this issue on the latest version").
-    Thank you for your contributions!
-  # Comment to post when closing a stale Issue. Set to `false` to disable
-  closeComment: >
-    This issue has been automatically closed because it has not had
-    activity in a long time. Please feel free to reopen it or create a new issue.

.github/workflows/spam-label.yml

@@ -1,42 +0,0 @@
-name: 'Spam label'
-
-on:
-  issues:
-    types: [labeled]
-  pull_request:
-    types: [labeled]
-  discussion:
-    types: [labeled]
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  lock:
-    if: ${{ (github.event.label.name == 'spam') && (github.event.action == 'labeled') }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/close-issue@v2
-        name: Close Issue
-        with: 
-          close-reason: 'not_planned'
-        if: ${{ github.event_name != 'pull_request' }}
-      - run: gh pr close ${{ github.event.pull_request.html_url }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        name: Close PR
-        if: ${{ github.event_name == 'pull_request' }}
-      - uses: maxkomarychev/[email protected]
-        name: Lock PR
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
-          token: "${{ secrets.GITHUB_TOKEN }}"
-          issue_number: ${{ github.event.number }}
-      - uses: OSDKDev/[email protected]
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        name: Lock issue
-        if: ${{ github.event_name != 'pull_request' }}

.github/workflows/support.yml

@@ -1,27 +0,0 @@
-name: Support Requests
-
-on:
-  issues:
-    types:
-    - labeled
-    - unlabeled
-    - reopened
-
-permissions:
-  issues: write
-
-jobs:
-  support:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: dessant/support-requests@v2
-      with:
-        support-label: Forum
-        issue-comment: >
-            :wave: We use the issue tracker exclusively for final bug reports and feature requests. 
-            However, this issue appears to be better suited for the 
-            [Forge Support Forums](https://forums.minecraftforge.net/) or 
-            [Forge Discord](https://discord.gg/UvedJ9m). Please create a new topic on the support forum
-            with this issue or ask in the `#tech-support` channel in the Discord server, and the 
-            conversation can continue there.
-        lock-issue: true

.gitignore

@@ -1,48 +0,0 @@
-#eclipse
-**/bin
-**/.settings
-**/.classpath
-*.project
-
-#In case people make their workspace in the repo
-/eclipse/
-
-#idea
-/.idea
-/*/out
-/classes
-*.iml
-
-#gradle
-/build
-/.gradle
-/*/build
-/*/.gradle
-
-# Projects repo, either ignore it, or ignore patches.
-/projects/mcp/
-/projects/clean/
-/projects/forge/
-/projects/fmlonly/
-#/patches/*
-
-#occupational hazards
-/projects/**/build/
-/projects/**/out/
-/projects/**/run/
-/projects/**/*.launch
-/repo/
-src/generated/resources/.cache/
-src/generated_test/resources/.cache/
-
-#Patch rejects
-/patches-/
-*.patch.rej
-/projects/*/rejects/
-
-# FML changelog
-changelog.txt
-*.py
-*.7z
-/logs/
-

.teamcity/pom.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <name>MinecraftForge_Forge Config DSL Script</name>
-  <groupId>MinecraftForge_Forge</groupId>
-  <artifactId>MinecraftForge_Forge_dsl</artifactId>
-  <version>1.0-SNAPSHOT</version>
-
-  <parent>
-    <groupId>org.jetbrains.teamcity</groupId>
-    <artifactId>configs-dsl-kotlin-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-
-  <repositories>
-    <repository>
-      <id>jetbrains-all</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>teamcity-server</id>
-      <url>https://teamcity.minecraftforge.net/app/dsl-plugins-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>JetBrains</id>
-      <url>https://download.jetbrains.com/teamcity-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <build>
-    <sourceDirectory>${basedir}</sourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
-
-        <configuration/>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <phase>process-test-sources</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jetbrains.teamcity</groupId>
-        <artifactId>teamcity-configs-maven-plugin</artifactId>
-        <version>${teamcity.dsl.version}</version>
-        <configuration>
-          <format>kotlin</format>
-          <dstDir>target/generated-configs</dstDir>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin</artifactId>
-      <version>${teamcity.dsl.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin-plugins</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>pom</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-script-runtime</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>

.teamcity/settings.kts

@@ -1,208 +0,0 @@
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.projectFeatures.githubIssues
-import jetbrains.buildServer.configs.kotlin.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-
-/*
-The settings script is an entry point for defining a TeamCity
-project hierarchy. The script should contain a single call to the
-project() function with a Project instance or an init function as
-an argument.
-
-VcsRoots, BuildTypes, Templates, and subprojects can be
-registered inside the project using the vcsRoot(), buildType(),
-template(), and subProject() methods respectively.
-
-To debug settings scripts in command-line, run the
-
-    mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate
-
-command and attach your debugger to the port 8000.
-
-To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
--> Tool Windows -> Maven Projects), find the generate task node
-(Plugins -> teamcity-configs -> teamcity-configs:generate), the
-'Debug' option is available in the context menu for the task.
-*/
-
-version = "2021.2"
-
-project {
-
-    buildType(Build)
-    buildType(BuildSecondaryBranches)
-    buildType(PullRequests)
-    buildType(PullRequestChecks)
-    buildType(PullRequestCompatibility)
-
-    params {
-        text("docker_jdk_version", "17", label = "Gradle version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "7.4", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("git_main_branch", "1.19.x", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("git_branch_spec", """
-                +:refs/heads/(main*)
-                +:refs/heads/(master*)
-                +:refs/heads/(develop|release|staging|main|master)
-                +:refs/heads/(1.*)
-            """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-        text("github_repository_name", "MinecraftForge", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `MinecraftForge` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("env.PUBLISHED_JAVA_ARTIFACT_ID", "forge", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_FML_ARTIFACT_ID", "fmlonly", label = "Published fmlonly artifact id", description = "The maven coordinate artifact id for fml only that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION", "0.0.0-SNAPSHOT", label = "Published fmlonly artifact version", description = "The version for fml only that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
-        //These are references and not actually keys
-        password("env.CROWDIN_KEY", "credentialsJSON:a3102dbe-805d-4177-9f54-3d2c2eb08fd5", display = ParameterDisplay.HIDDEN)
-        password("env.KEYSTORE_URL", "credentialsJSON:a7ae1c82-8058-4061-8d12-7f6bc2618d2e", display = ParameterDisplay.HIDDEN)
-        password("env.KEYSTORE_PASSWORD", "credentialsJSON:d7b964e3-a1fd-47a8-b892-6f601fe47479", display = ParameterDisplay.HIDDEN)
-        text("additional_publishing_gradle_parameters", "-PcrowdinKey=%env.CROWDIN_KEY% -PkeystoreKeyPass=%env.KEYSTORE_PASSWORD% -PkeystoreStorePass=%env.KEYSTORE_PASSWORD% -Pkeystore=%env.KEYSTORE_URL%", label = "Additional gradle parameters for publish", description = "Contains the additional gradle parameters used during publishing.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-
-        checkbox("should_execute_build", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-        checkbox("should_execute_test", "false", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-    }
-
-    features {
-        githubIssues {
-            id = "MinecraftForge_MinecraftForge__IssueTracker"
-            displayName = "MinecraftForge/MinecraftForge"
-            repositoryURL = "https://github.com/MinecraftForge/MinecraftForge"
-        }
-    }
-}
-
-object Build : BuildType({
-    templates(AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"), AbsoluteId("MinecraftForge_PublishProjectUsingGradle"), AbsoluteId("MinecraftForge_TriggersStaticFilesWebpageGenerator"))
-    id("MinecraftForge_MinecraftForge__Build")
-    name = "Build"
-    description = "Builds and Publishes the main branches of the project."
-
-    features {
-        feature {
-            id = "trigger_fml_only_files_generator"
-            type = "triggerBuildFeature"
-            param("triggers", "MinecraftForge_FilesGenerator_GeneratePages")
-            param("parameters", """
-                env.PUBLISHED_JAVA_FML_ARTIFACT_ID~env.PUBLISHED_JAVA_ARTIFACT_ID
-                env.PUBLISHED_JAVA_FML_ARTIFACT_VERSION~env.PUBLISHED_JAVA_ARTIFACT_VERSION
-                env.PUBLISHED_JAVA_GROUP
-            """.trimIndent())
-        }
-    }
-})
-
-object BuildSecondaryBranches : BuildType({
-    templates(AbsoluteId("MinecraftForge_ExcludesBuildingDefaultBranch"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_BuildMainBranches"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
-    id("MinecraftForge_MinecraftForge__BuildSecondaryBranches")
-    name = "Build - Secondary Branches"
-    description = "Builds and Publishes the secondary branches of the project."
-    params {
-        text("git_branch_spec", """
-                +:refs/heads/(*)
-                -:refs/heads/noci*
-            """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
-    }
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequests : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"), AbsoluteId("MinecraftForge_BuildUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequests")
-    name = "Pull Requests"
-    description = "Builds pull requests for the project"
-
-    params {
-        checkbox("should_execute_build", "true", label = "Should build", description = "Indicates if the build task should be executed.", display = ParameterDisplay.HIDDEN,
-            checked = "true", unchecked = "false")
-        text(
-            "gradle_build_task",
-            "assemble",
-            label = "Gradle build task to execute during build",
-            description = "Determines the build task that is executed to build the project.",
-            display = ParameterDisplay.HIDDEN,
-            allowEmpty = false
-        )
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequestChecks : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequestChecks")
-    name = "Pull Requests (Checks)"
-    description = "Checks pull requests for the project"
-
-    steps {
-        gradle {
-            name = "Check"
-            id = "RUNNER_10_Check"
-
-            tasks = "checkAll"
-            gradleParams = "--continue %gradle_custom_args%"
-            enableStacktrace = true
-            dockerImage = "%docker_gradle_image%"
-            dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
-                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
-                --network=host
-                -u 1000:1000
-                %docker_additional_args%
-            """.trimIndent()
-        }
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})
-
-object PullRequestCompatibility : BuildType({
-    templates(AbsoluteId("MinecraftForge_BuildPullRequests"), AbsoluteId("MinecraftForge_SetupGradleUtilsCiEnvironmen"), AbsoluteId("MinecraftForge_BuildWithDiscordNotifications"), AbsoluteId("MinecraftForge_SetupProjectUsingGradle"))
-    id("MinecraftForge_MinecraftForge__PullRequestCompatibility")
-    name = "Pull Requests (Compatibility)"
-    description = "Validates binary compatibility for pull requests made to the project"
-
-    steps {
-        gradle {
-            name = "Validate"
-            id = "RUNNER_10_Compatibility"
-
-            tasks = "checkJarCompatibility"
-            gradleParams = "--continue %gradle_custom_args%"
-            enableStacktrace = true
-            dockerImage = "%docker_gradle_image%"
-            dockerRunParameters = """
-                -v "/opt/cache/agent/gradle:/home/gradle/.gradle" 
-                -v "/opt/cache/shared/gradle:/home/gradle/rocache:ro"
-                --network=host
-                -u 1000:1000
-                %docker_additional_args%
-            """.trimIndent()
-        }
-    }
-
-    vcs {
-        branchFilter = """
-            +:*
-            -:1.*
-            -:<default>
-        """.trimIndent()
-    }
-})

CREDITS.txt

@@ -1,65 +0,0 @@
-Minecraft Forge: Credits/Thank You
-
-Forge is a set of tools and modifications to the Minecraft base game code to assist 
-mod developers in creating new and exciting content. It has been in development for 
-several years now, but I would like to take this time thank a few people who have 
-helped it along it's way.
-
-First, the people who originally created the Forge projects way back in Minecraft 
-alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance 
-of me taking over the project, who knows what Minecraft modding would be today.
-
-Secondly, someone who has worked with me, and developed some of the core features
-that allow modding to be as functional, and as simple as it is, cpw. For developing
-FML, which stabelized the client and server modding ecosystem. As well as the base
-loading system that allows us to modify Minecraft's code as elegently as possible.
-
-Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
-sane as well as guiding the community into creating better additions to Forge.
-
-Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which 
-I am a part}. For creating some of the core tools needed to make Minecraft modding 
-both possible, and as stable as can be.
-  On that note, here is some specific information of the MCP data we use:
-    * Minecraft Coder Pack (MCP) *
-      Forge Mod Loader and Minecraft Forge have permission to distribute and automatically 
-      download components of MCP and distribute MCP data files. This permission is not 
-      transitive and others wishing to redistribute the Minecraft Forge source independently
-      should seek permission of MCP or remove the MCP data files and request their users 
-      to download MCP separately.
-      
-And lastly, the countless community members who have spent time submitting bug reports, 
-pull requests, and just helping out the community in general. Thank you.
-
---LexManos
-
-=========================================================================
-
-This is Forge Mod Loader.
-
-You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml
-
-This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
-and minecraft clients.
-
-The code is authored by cpw.
-
-It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
-http://www.minecraftforum.net/topic/75440-
-This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
-
-It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
-http://www.minecraftforge.net/
-
-Additionally, it contains an implementation of topological sort based on that 
-published at http://keithschwarz.com/interesting/code/?dir=topological-sort
-
-It also contains code from the Maven project for performing versioned dependency
-resolution. http://maven.apache.org/
-
-It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
-with credit to it's authors.
-
-Forge Mod Loader downloads components from the Minecraft Coder Pack
-(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.
-

LICENSE-header.txt

@@ -1,2 +0,0 @@
-Copyright (c) Forge Development LLC and contributors
-SPDX-License-Identifier: LGPL-2.1-only

LICENSE.txt

@@ -1,520 +0,0 @@
-Unless noted below, Minecraft Forge, Forge Mod Loader, and all 
-parts herein are licensed under the terms of the LGPL 2.1 found
-here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and 
-copied below.
-
-Homepage: http://minecraftforge.net/
-          https://github.com/MinecraftForge/MinecraftForge
-          
-
-A note on authorship:
-All source artifacts are property of their original author, with
-the exclusion of the contents of the patches directory and others
-copied from it from time to time. Authorship of the contents of
-the patches directory is retained by the Minecraft Forge project.
-This is because the patches are partially machine generated
-artifacts, and are changed heavily due to the way forge works.
-Individual attribution within them is impossible.
-
-Consent:
-All contributions to Forge must consent to the release of any
-patch content to the Forge project.
-
-A note on infectivity:
-The LGPL is chosen specifically so that projects may depend on Forge
-features without being infected with its license. That is the 
-purpose of the LGPL. Mods and others using this code via ordinary
-Java mechanics for referencing libraries are specifically not bound
-by Forge's license for the Mod code.
-
-
-=== MCP Data ===
-This software includes data from the Minecraft Coder Pack (MCP), with kind permission
-from them. The license to MCP data is not transitive - distribution of this data by
-third parties requires independent licensing from the MCP team. This data is not
-redistributable without permission from the MCP team.
-
-=== Sharing ===
-I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of
-the minecraft modding community. All contributions to these parts should be licensed under the same additional grant.
-
--- Runtime patcher --
-License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher
-and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
-
--- ASM transformers --
-License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories)
-under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
-
-=========================================================================
-This software includes portions from the Apache Maven project at
-http://maven.apache.org/ specifically the ComparableVersion.java code. It is
-included based on guidelines at
-http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html
-with notices intact. The only change is a non-functional change of package name.
-
-This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating
-binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/
-authored by genman, heikok, pivot.
-The only changes are to replace some Trove collection types with standard Java collections, and repackaged.
-=========================================================================
-
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS

MLProp.java

@@ -0,0 +1,11 @@
+package net.minecraft.src;
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface MLProp {
+	String name() default "";
+	String info() default "";
+	double min() default Double.NEGATIVE_INFINITY;
+	double max() default Double.POSITIVE_INFINITY;
+}

bin/grep.exe

@@ -0,0 +1 @@
+asdfsnb  -a -v "svn"+

build.bat

@@ -0,0 +1,11 @@
+cd ..
+
+rmdir /S /Q src
+mkdir src
+xcopy  /Y /E src_work\* src\
+
+xcopy /Y /E forge\forge_client\src\net\* src\minecraft\net
+xcopy /Y /E forge\forge_common\net\* src\minecraft\net
+xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net
+
+cmd /C recompile.bat

build.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+cd ..
+
+rm -rf src bin src_forge
+
+cp -a src_work src_forge
+
+cp -a forge/forge_client/src/net/* src_forge/minecraft/net/
+cp -a forge/forge_common/net/* src_forge/minecraft/net/
+cp -a forge/forge_common/net/* src_forge/minecraft_server/net/
+
+cp -a src_forge src
+
+./recompile.sh
+
+

buildSrc/.gitignore

@@ -1,3 +0,0 @@
-/.gradle/
-/build/
-/out/

buildSrc/build.gradle

@@ -1,11 +0,0 @@
-repositories {
-    maven { url = 'https://maven.minecraftforge.net/' }
-	mavenCentral()
-}
-
-dependencies {
-    implementation 'org.ow2.asm:asm:9.5'
-    implementation 'org.ow2.asm:asm-tree:9.5'
-    implementation 'net.minecraftforge:srgutils:0.5.+'
-    implementation 'commons-io:commons-io:2.12.0'
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BytecodeFinder.groovy

@@ -1,66 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.json.JsonBuilder
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.TaskAction
-import org.objectweb.asm.ClassReader
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.tree.ClassNode
-import org.objectweb.asm.tree.FieldNode
-import org.objectweb.asm.tree.MethodNode
-
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-
-abstract class BytecodeFinder extends DefaultTask {
-    @InputFile abstract RegularFileProperty getJar()
-    // It should be fine to mark the output as internal as we want to control when we run it anyways.
-    // This also shuts Gradle 8 up about implicit task dependencies.
-    @Internal abstract RegularFileProperty getOutput()
-
-    BytecodeFinder() {
-        output.convention(project.layout.buildDirectory.dir(name).map { it.file("output.json") })
-    }
-
-    @TaskAction
-    protected void exec() {
-        Util.init()
-
-        def outputFile = output.get().asFile
-        if (outputFile.exists())
-            outputFile.delete()
-
-        pre()
-
-        jar.get().asFile.withInputStream { i ->
-            new ZipInputStream(i).withCloseable { zin ->
-                ZipEntry zein
-                while ((zein = zin.nextEntry) != null) {
-                    if (zein.name.endsWith('.class')) {
-                        def node = new ClassNode(Opcodes.ASM9)
-                        new ClassReader(zin).accept(node, 0)
-                        process(node)
-                    }
-                }
-            }
-        }
-
-        post()
-        outputFile.text = new JsonBuilder(getData()).toPrettyString()
-    }
-
-
-    protected process(ClassNode node) {
-        if (node.fields != null) node.fields.each { process(node, it) }
-        if (node.methods != null) node.methods.each { process(node, it) }
-    }
-
-    protected pre() {}
-    protected process(ClassNode parent, FieldNode node) {}
-    protected process(ClassNode parent, MethodNode node) {}
-    protected post() {}
-    protected abstract Object getData()
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/CheckATs.groovy

@@ -1,267 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import net.minecraftforge.srgutils.IMappingFile
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.TaskAction
-import org.objectweb.asm.Opcodes
-
-abstract class CheckATs extends DefaultTask {
-	@InputFile abstract RegularFileProperty getInheritance()
-	@InputFiles abstract ConfigurableFileCollection getAts()
-    @InputFile @Optional abstract RegularFileProperty getMappings()
-	
-    @TaskAction
-    protected void exec() {
-        def mappings = mappings.map { IMappingFile.load(it.asFile) }.getOrNull()
-		Util.init()
-		def parse = { line ->
-			def idx = line.indexOf('#')
-			def comment = idx == -1 ? null : line.substring(idx)
-			if (idx != -1) line = line.substring(0, idx - 1)
-			def (modifier, cls, desc) = (line.trim() + '     ').split(' ', -1)
-			def key = cls + (desc.isEmpty() ? '' : ' ' + desc)
-			return [modifier, cls, desc, comment, key]
-		}
-		def accessLevel = { access ->
-			if ((access & Opcodes.ACC_PUBLIC)    != 0) return 3
-			if ((access & Opcodes.ACC_PROTECTED) != 0) return 2
-			if ((access & Opcodes.ACC_PRIVATE)   != 0) return 0
-			return 1
-		}
-		def accessStr = { access ->
-			if (access.endsWith('-f') || access.endsWith('+f'))
-				return 4
-			switch (access.toLowerCase()) {
-				case 'public':    return 3
-				case 'protected': return 2
-				case 'default':   return 1
-				case 'private':   return 0
-				default:          return -1
-			}
-		}
-		def json = inheritance.get().asFile.json()
-		
-		ats.each { f -> 
-			TreeMap lines = [:]
-			def group = null
-			for (def line : f.readLines()) {
-				if (line.isEmpty()) continue
-				if (line.startsWith('#group ')) {
-					def (modifier, cls, desc, comment, key) = parse.call(line.substring(7))
-					
-					if (desc != '*' && desc != '*()' && desc != '<init>')
-						throw new IllegalStateException('Invalid group: ' + line)
-					
-					group = [modifier: modifier, cls: cls, desc: desc, comment: comment, 
-						existing: [] as Set,
-						children: [] as TreeSet,
-						group: true
-					]
-					if (lines.containsKey(key))
-						throw new IllegalStateException('Duplicate group: ' + line)
-					
-					lines[key] = group
-				} else if (group != null) {
-					if (line.startsWith('#endgroup')) {
-						group = null
-					} else {
-						def (modifier, cls, desc, comment, key) = parse.call(line)
-						group['existing'].add(key)
-					}
-				} else if (line.startsWith('#endgroup')) {
-					throw new IllegalStateException('Invalid group ending: ' + line)
-				} else if (line.startsWith('#')) {
-					//Nom
-				} else {
-					def (modifier, cls, desc, comment, key) = parse.call(line)
-					if (lines.containsKey(key)) {
-						println('Duplicate: ' + line)
-						continue
-					}
-					lines[key] = [modifier: modifier, cls: cls, desc: desc, comment: comment, group: false]
-				}
-			}
-			
-			// Process Groups, this will remove any entries outside the group that is covered by the group
-			for (def key : new ArrayList<>(lines.keySet())) {
-				def entry = lines.get(key)
-				if (entry != null && entry['group']) {
-					def cls = entry['cls']
-					def jcls = json.get(cls.replaceAll('\\.', '/'))
-					if (jcls == null) {
-						lines.remove(key)
-						println('Invalid Group: ' + key)
-					} else if ('*' == entry['desc']) {
-						if (!jcls.containsKey('fields')) {
-							lines.remove(key)
-							println('Invalid Group, Class has no fields: ' + key)
-						} else {
-							jcls['fields'].each { field, value ->
-								def fkey = cls + ' ' + field
-								if (accessLevel.call(value['access']) < accessStr.call(entry['modifier'])) {
-									if (lines.containsKey(fkey)) {
-										lines.remove(fkey)
-									} else if (!entry['existing'].contains(fkey)) {
-										println('Added: ' + fkey)
-									}
-									entry['children'].add(fkey)
-								} else if (lines.containsKey(fkey)) {
-									lines.remove(fkey)
-									println('Removed: ' + fkey)
-								}
-							}
-							entry['existing'].stream().findAll{ !entry['children'].contains(it) }.each{ println('Removed: ' + it) }
-						}
-					} else if ('*()' == entry['desc']) {
-						if (!jcls.containsKey('methods')) {
-							lines.remove(key)
-							println('Invalid Group, Class has no methods: ' + key)
-						} else {
-							jcls['methods'].each{ mtd, value ->
-								if (mtd.startsWith('<clinit>') || mtd.startsWith('lambda$'))
-									return
-								key = cls + ' ' + mtd.replace(' ', '')
-								if (accessLevel.call(value['access']) < accessStr.call(entry['modifier'])) {
-									if (lines.containsKey(key)) {
-										lines.remove(key)
-									} else if (!entry['existing'].contains(key)) {
-										println('Added: ' + key)
-									}
-									entry['children'].add(key)
-								} else if (lines.containsKey(key)) {
-									lines.remove(key)
-									println('Removed: ' + key)
-								}
-							}
-							entry['existing'].stream().findAll{ !entry['children'].contains(it) }.each{ println('Removed: ' + it) }
-						}
-					} else if ('<init>' == entry['desc']) { //Make all public non-abstract subclasses
-						json.each{ tcls,value -> 
-							if (!value.containsKey('methods') || ((value['access'] & Opcodes.ACC_ABSTRACT) != 0))
-								return
-							def parents = [] as Set
-							def parent = tcls
-							while (parent != null && json.containsKey(parent)) {
-								parents.add(parent)
-								def p = json[parent]
-								parent = p == null ? null : p['superName']
-							}
-							if (parents.contains(cls.replaceAll('\\.', '/'))) {
-								value['methods'].each{ mtd, v -> 
-									if (mtd.startsWith('<init>')) {
-										def child = tcls.replaceAll('/', '\\.') + ' ' + mtd.replace(' ', '')
-										if (accessLevel.call(v['access']) < 3) {
-											if (lines.containsKey(child)) {
-												lines.remove(child)
-											} else if (!entry['existing'].contains(child)) {
-												println('Added: ' + child)
-											}
-											entry['children'].add(child)
-										} else if (lines.containsKey(child)) {
-											lines.remove(child)
-											println('Removed: ' + child)
-										}
-									}
-								}
-							}
-						}
-						entry['existing'].stream().findAll{ !entry['children'].contains(it) }.each{ println('Removed: ' + it) }
-					}
-				}
-			}
-			
-			// Process normal lines, remove invalid and remove narrowing
-			for (def key : new ArrayList<>(lines.keySet())) {
-				def entry = lines.get(key)
-				if (entry != null && !entry['group']) {
-					def cls = entry['cls']
-					def jcls = json.get(cls.replaceAll('\\.', '/'))
-					if (jcls == null) {
-						lines.remove(key)
-						println('Invalid: ' + key)
-					} else if (entry['desc'] == '') {
-						if (accessLevel.call(jcls['access']) > accessStr.call(entry['modifier']) && (entry.comment == null || !entry.comment.startsWith('#force '))) {
-							lines.remove(key)
-							println('Invalid Narrowing: ' + key)
-						}
-					} else if (!entry['desc'].contains('(')) {
-						if (!jcls.containsKey('fields') || !jcls['fields'].containsKey(entry['desc'])) {
-							lines.remove(key)
-							println('Invalid: ' + key)
-						} else {
-							def value = jcls['fields'][entry['desc']]
-							if (accessLevel.call(value['access']) > accessStr.call(entry['modifier']) && (entry.comment == null || !entry.comment.startsWith('#force '))) {
-								lines.remove(key)
-								println('Invalid Narrowing: ' + key)
-								println(entry.comment)
-							}
-						}
-					} else {
-						def jdesc = entry['desc'].replace('(', ' (')
-						if (!jcls.containsKey('methods') || !jcls['methods'].containsKey(jdesc)) {
-							lines.remove(key)
-							println('Invalid: ' + key)
-						} else {
-							def value = jcls['methods'][jdesc]
-							if (accessLevel.call(value['access']) > accessStr.call(entry['modifier']) && (entry.comment == null || !entry.comment.startsWith('#force '))) {
-								lines.remove(key)
-								println('Invalid Narrowing: ' + key)
-							}
-						}
-					}
-				}
-			}
-
-			
-			def data = []
-            def remapComment = { entry ->
-                if (!mappings || !entry || !entry.desc) return null
-                def comment = entry.comment?.substring(1)?.trim()
-                def jsonCls = json.get(entry.cls.replaceAll('\\.', '/'))
-                def mappingsClass = mappings?.getClass(jsonCls.name)
-                if (!mappingsClass) return entry.comment
-                def idx = entry.desc.indexOf('(')
-                def mappedName = idx == -1
-                        ? mappingsClass.remapField(entry.desc)
-                        : mappingsClass.remapMethod(entry.desc.substring(0, idx), entry.desc.substring(idx))
-                if (!mappedName) return entry.comment
-                if (mappedName == '<init>')
-                    mappedName = 'constructor'
-
-                if (comment?.startsWith(mappedName))
-                    return '# ' + comment
-                if (comment && comment.indexOf(' ') != -1) {
-                    def split = comment.split(" - ").toList()
-                    if (split[0].indexOf(' ') != -1)
-                        // The first string is more than one word, so append before it
-                        return "# ${mappedName} - ${comment}"
-                    split.remove(0)
-                    return "# ${mappedName} - ${String.join(' - ', split)}"
-                }
-                return '# ' + mappedName
-            }
-			lines.each { key,value -> 
-				if (!value.group) {
-                    def comment = remapComment.call(value)
-					data.add(value.modifier + ' ' + key + (comment ? ' ' + comment : ''))
-				} else {
-					data.add('#group ' + value.modifier + ' ' + key + (value.comment == null ? '' : ' ' + value.comment))
-					value.children.each {
-                        def line = value.modifier + ' ' + it
-                        def (modifier, cls, desc, comment) = parse.call(line)
-                        comment = remapComment.call([modifier: modifier, cls: cls, desc: desc, comment: comment])
-                        data.add(line + (comment ? ' ' + comment : ''))
-                    }
-					data.add('#endgroup')
-				}
-			}
-			f.text = data.join('\n')
-		}
-	}
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/CheckExcs.groovy

@@ -1,94 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.TaskAction
-
-import org.objectweb.asm.ClassReader
-import org.objectweb.asm.ClassVisitor
-import org.objectweb.asm.MethodVisitor
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.Type
-
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-
-abstract class CheckExcs extends DefaultTask {
-	@InputFile abstract RegularFileProperty getBinary()
-	@InputFiles abstract ConfigurableFileCollection getExcs()
-	
-    @TaskAction
-    protected void exec() {
-		Util.init()
-		def known = []
-		binary.get().asFile.withInputStream { i ->
-			new ZipInputStream(i).withCloseable { zin ->
-				def visitor = new ClassVisitor(Opcodes.ASM9) {
-					private String cls
-					@Override
-					public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-						this.cls = name
-					}
-					
-					@Override
-					public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
-						known.add(this.cls + '.' + name + descriptor)
-						super.visitMethod(access, name, descriptor, signature, exceptions)
-					}
-				}
-				ZipEntry zein
-				while ((zein = zin.nextEntry) != null) {
-					if (zein.name.endsWith('.class')) {
-						ClassReader reader = new ClassReader(zin)
-						reader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES)
-					}
-				}
-			}
-		}
-		
-		excs.each { f -> 
-			def lines = []
-			f.eachLine { line ->
-				def idx = line.indexOf('#')
-				if (idx == 0 || line.isEmpty()) {
-					return
-				}
-				
-				def comment = idx == -1 ? null : line.substring(idx)
-				if (idx != -1) line = line.substring(0, idx - 1)
-				
-				if (!line.contains('=')) {
-					println('Invalid: ' + line)
-					return
-				}
-				
-				def (key, value) = line.split('=', 2)
-				if (!known.contains(key)) {
-					println('Unknown: ' + line)
-					return
-				}
-				
-				def (cls, desc) = key.split('\\.', 2)
-				if (!desc.contains('(')) {
-					println('Invalid: ' + line)
-					return
-				}
-				def name = desc.split('\\(', 2)[0]
-				desc = '(' + desc.split('\\(', 2)[1]
-				
-				def (exceptions, args) = value.contains('|') ? value.split('|', 2) : [value, '']
-				
-				if (args.split(',').length != Type.getArgumentTypes(desc).length) {
-					println('Invalid: ' + line)
-					return
-				}
-				lines.add(line)
-			}
-			f.text = lines.sort().join('\n')
-		}
-	}
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/CheckPatches.groovy

@@ -1,219 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.TaskAction
-
-import java.nio.file.Files
-import java.nio.file.Paths
-import java.util.regex.Pattern
-
-abstract class CheckPatches extends DefaultTask {
-    @InputDirectory abstract DirectoryProperty getPatchDir()
-    @Input boolean autoFix = false
-
-    @TaskAction
-    protected void exec() {
-        def hasS2SArtifact = [
-                Paths.get("patches/minecraft/net/minecraft/client/renderer/ViewArea.java.patch"),
-                Paths.get("patches/minecraft/net/minecraft/data/models/blockstates/Variant.java.patch")
-        ]
-
-        def verified = true;
-        patchDir.get().asFileTree.each { patch ->
-            def patchPath = project.rootDir.toPath().relativize(patch.toPath())
-            verified &= verifyPatch(patch, autoFix, patchPath.toString(), hasS2SArtifact.contains(patchPath))
-        }
-
-        if (!verified)
-            throw new RuntimeException('One or more patches failed verification. Check the log for errors.')
-    }
-
-    def verifyPatch(patch, fix, patchPath, hasS2SArtifact) {
-        def hunk_start_pattern = Pattern.compile('^@@ -[0-9,]* \\+[0-9,_]* @@$')
-        def white_space_pattern = Pattern.compile('^[+\\-]\\s*$')
-        def import_pattern = Pattern.compile('^[+\\-]\\s*import.*')
-        def field_pattern = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^=;]*)(=.*)?;\\s*$')
-        def method_pattern = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^(]*)[(]([^)]*)?[)]\\s*[{]\\s*$')
-        def class_pattern = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final[\\s]*)?(class|interface)([^{]*)[{]\\s*$')
-
-        def accessMap = [("private"):0, (null):1, ("protected"):2, ("public"):3]
-
-        def hasProblem = false;
-        def lines = patch.readLines()
-
-        def hunksStart = 0
-        def onlyWhiteSpace = false
-
-        def didFix = false
-        def newLines = []
-        def whiteSpaceErrors = []
-
-        // First two lines are file name ++/-- and we do not care
-        newLines.add(lines[0] + '\n')
-        newLines.add(lines[1] + '\n')
-
-        int i = 2
-        for (; i < lines.size(); ++i) {
-            def line = lines[i]
-            newLines.add(line + '\n')
-
-            if (hunk_start_pattern.matcher(line).find()) {
-                if (onlyWhiteSpace) {
-                    if (fix || hasS2SArtifact) {
-                        logger.lifecycle("Removing white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
-                        def toRemove = i - hunksStart;
-                        while (toRemove-- > 0)
-                            newLines.remove(newLines.size() - 1)
-                        didFix = true
-                    }
-                    else {
-                        logger.lifecycle("Patch contains only white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
-                        hasProblem = true
-                    }
-                }
-                else {
-                    if (!whiteSpaceErrors.empty)
-                        hasProblem = true
-                    whiteSpaceErrors.each { error -> logger.lifecycle(error) }
-                    whiteSpaceErrors.clear()
-                }
-                hunksStart = i
-                onlyWhiteSpace = true
-                continue
-            }
-
-            if (line.startsWithAny('+','-')) {
-                def prefixChange = false
-                def prevLine = lines[i - 1]
-
-                if (line.charAt(0) == (char)'+' && prevLine.charAt(0) == (char)'-') {
-                    def prevTrim = prevLine.substring(1).replaceAll("\\s", "")
-                    def currTrim = line.substring(1).replaceAll("\\s", "")
-
-                    if (prevTrim.equals(currTrim)) {
-                        prefixChange = true
-                    }
-
-                    def pMatcher = field_pattern.matcher(prevLine)
-                    def cMatcher = field_pattern.matcher(line)
-
-                    if (pMatcher.find() && cMatcher.find() &&
-                            pMatcher.group(6) == cMatcher.group(6) && // = ...
-                            pMatcher.group(5) == cMatcher.group(5) && // field name
-                            pMatcher.group(3) == cMatcher.group(3) && // static
-                            (accessMap[pMatcher.group(2)] < accessMap[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
-                        logger.lifecycle("Patch contains access changes or final removal at line {}, file: {}", i + 1, patchPath)
-                        hasProblem = true
-                    }
-
-                    pMatcher = method_pattern.matcher(prevLine)
-                    cMatcher = method_pattern.matcher(line)
-
-                    if (pMatcher.find() && cMatcher.find() &&
-                            pMatcher.group(6) == cMatcher.group(6) && // params
-                            pMatcher.group(5) == cMatcher.group(5) && // <T> void name
-                            pMatcher.group(3) == cMatcher.group(3) && // static
-                            (accessMap[pMatcher.group(2)] < accessMap[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
-                        logger.lifecycle("Patch contains access changes or final removal at line {}, file: {}", i + 1, patchPath)
-                        hasProblem = true
-                    }
-
-                    pMatcher = class_pattern.matcher(prevLine)
-                    cMatcher = class_pattern.matcher(line)
-
-                    if (pMatcher.find() && cMatcher.find() &&
-                            pMatcher.group(6) == cMatcher.group(6) && // ClassName<> extends ...
-                            pMatcher.group(5) == cMatcher.group(5) && // class | interface
-                            pMatcher.group(3) == cMatcher.group(3) && // static
-                            (accessMap[pMatcher.group(2)] < accessMap[cMatcher.group(2)] || pMatcher.group(4) != cMatcher.group(4))) {
-                        logger.lifecycle("Patch contains access changes or final removal at line {}, file: {}", i + 1, patchPath)
-                        hasProblem = true
-                    }
-                }
-
-                if (line.charAt(0) == (char)'-' && i + 1 < lines.size()) {
-                    def nextLine = lines[i + 1]
-                    if (nextLine.charAt(0) == (char)'+') {
-                        def nextTrim = nextLine.substring(1).replaceAll("\\s", "")
-                        def currTrim = line.substring(1).replaceAll("\\s", "")
-
-                        if (nextTrim.equals(currTrim)) {
-                            prefixChange = true
-                        }
-                    }
-                }
-
-                def isWhiteSpaceChange = white_space_pattern.matcher(line).find()
-
-                if (!prefixChange && !isWhiteSpaceChange) {
-                    onlyWhiteSpace = hasS2SArtifact && import_pattern.matcher(line).find()
-                }
-                else if (isWhiteSpaceChange) {
-                    def prevLineChange = prevLine.startsWithAny('+','-')
-                    def nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
-
-                    if (!prevLineChange && !nextLineChange) {
-                        whiteSpaceErrors.add(String.format("Patch contains white space change in valid hunk at line %d (cannot auto fix), file: %s", i + 1, patchPath))
-                    }
-                }
-
-                if (line.contains("\t")) {
-                    if (!fix) {
-                        logger.lifecycle("Patch contains tabs on line {}, file: {}", i + 1, patchPath)
-                        hasProblem = true
-                    }
-                    else {
-                        logger.lifecycle("Fixing tabs on line {}, file: {}", i + 1, patchPath)
-                        line = line.replaceAll('\t', '    ')
-                        newLines.remove(newLines.size() - 1)
-                        newLines.add(line + '\n')
-                        didFix = true
-                    }
-                }
-
-                if (import_pattern.matcher(line).find() && !hasS2SArtifact) {
-                    logger.lifecycle("Patch contains import change on line {}, file: {}", i + 1, patchPath)
-                    hasProblem = true
-                }
-            }
-        }
-
-        if (onlyWhiteSpace) {
-            if (fix || hasS2SArtifact) {
-                logger.lifecycle("Removing white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
-                def toRemove = i - hunksStart;
-                while (toRemove-- > 0)
-                    newLines.remove(newLines.size() - 1)
-                didFix = true
-            }
-            else {
-                logger.lifecycle("Patch contains only white space hunk starting at line {}, file: {}", hunksStart + 1, patchPath)
-                hasProblem = true
-            }
-        }
-        else {
-            if (!whiteSpaceErrors.empty)
-                hasProblem = true
-            whiteSpaceErrors.each { error -> logger.lifecycle(error) }
-        }
-
-        if (didFix) {
-            if (newLines.size() <= 2) {
-                logger.lifecycle("Patch is now empty removing, file: {}", patchPath)
-                Files.delete(patch.toPath())
-            }
-            else {
-                if (!hasS2SArtifact)
-                    logger.lifecycle("*** Updating patch file. Please run setup then genPatches again. ***")
-                patch.withWriter('UTF-8') { writer ->
-                    newLines.each { l -> writer.write(l) }
-                }
-            }
-        }
-
-        return !hasProblem
-    }
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/CheckSAS.groovy

@@ -1,107 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.TaskAction
-
-abstract class CheckSAS extends DefaultTask {
-	@InputFile abstract RegularFileProperty getInheritance()
-	@InputFiles abstract ConfigurableFileCollection getSass()
-	
-    @TaskAction
-    protected void exec() {
-		Util.init()
-		def json = inheritance.get().asFile.json()
-		
-		sass.each { f -> 
-			def lines = []
-			f.eachLine { line ->
-				if (line[0] == '\t') return //Skip any tabbed lines, those are ones we add
-				def idx = line.indexOf('#')
-				if (idx == 0 || line.isEmpty()) {
-					lines.add(line)
-					return
-				}
-				def comment = idx == -1 ? null : line.substring(idx)
-				if (idx != -1) line = line.substring(0, idx - 1)
-				def (cls, name, desc) = (line.trim().replace('(', ' (') + '     ').split(' ', -1)
-				cls = cls.replaceAll('\\.', '/')
-
-				if (json[cls] == null) {
-					println('Invalid: ' + line)
-				} else if (name.isEmpty()) { //Class SAS
-                    def toAdd = []
-                    def clsSided = isSided(json[cls])
-                    def sided = clsSided
-                    
-                    /* TODO: MergeTool doesn't do fields
-                    if (json[cls]['fields'] != null) {
-						for (entry in json[cls]['fields']) {
-                            if (isSided(entry.value)) {
-                                sided = true
-                                toAdd.add('\t' + cls + ' ' + entry.key)
-                            }
-						}
-                    }
-                    */
-					if (json[cls]['methods'] != null) {
-                        for (entry in json[cls]['methods']) {
-                            if (isSided(entry.value)) {
-                                sided = true
-                                toAdd.add('\t' + cls + ' ' + entry.key.replaceAll(' ', ''))
-                                findChildMethods(json, cls, entry.key).each { lines.add('\t' + it) }
-                                findChildMethods(json, cls, entry.key).each { println(line + ' -- ' + it) }
-                            } else if (clsSided) {
-                                findChildMethods(json, cls, entry.key).each { lines.add('\t' + it) }
-                                findChildMethods(json, cls, entry.key).each { println(line + ' -- ' + it) }
-                            }
-						}
-                    }
-                    
-                    if (sided) {
-                        lines.add(cls + (comment == null ? '' : ' ' + comment))
-                        lines.addAll(toAdd.sort())
-                    } else
-                        println('Invalid: ' + line)
-                    
-                } else if (desc.isEmpty()) { // Fields
-                    /* TODO: MergeTool doesn't do fields
-                    if (json[cls]['fields'] != null && isSided(json[cls]['fields'][name]))
-                        lines.add(cls + ' ' + name + (comment == null ? '' : ' ' + comment))
-                    else
-                    */
-                        println('Invalid: ' + line)
-                } else { // Methods
-                    if (json[cls]['methods'] == null || !isSided(json[cls]['methods'][name + ' ' + desc]))
-                        println('Invalid: ' + line)
-                    else {
-                        lines.add(cls + ' ' + name + desc + (comment == null ? '' : ' ' + comment))
-                        findChildMethods(json, cls, name + ' ' + desc).each { println(line + ' -- ' + it) }
-                        findChildMethods(json, cls, name + ' ' + desc).each { lines.add('\t' + it) }
-                    }
-                }
-			}
-			f.text = lines.join('\n')
-		}
-	}
-
-    protected static isSided(json) {
-        if (json == null || json['annotations'] == null)
-            return false
-        for (ann in json['annotations']) {
-            if ('Lnet/minecraftforge/api/distmarker/OnlyIn;'.equals(ann.desc))
-                return true
-        }
-        return false
-    }
-    
-	protected static findChildMethods(json, cls, desc)
-	{
-		return json.values().findAll{ it.methods != null && it.methods[desc] != null && it.methods[desc].override == cls && isSided(it.methods[desc]) }
-				.collect { it.name + ' ' + desc.replace(' ', '') } as TreeSet
-	}
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ClosureHelper.groovy

@@ -1,31 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import java.util.function.BiConsumer
-
-public class ClosureHelper {
-    BiConsumer<String, Closure> callback
-    
-    public ClosureHelper(Closure cl, BiConsumer<String, Closure> callback) {
-        this.callback = callback
-        apply(this, cl)
-    }
-    
-    
-    def methodMissing(String name, Object args) {
-        if (!args.class.isArray()) return
-        Object[] aargs = (Object[])args
-        
-        if (aargs.length == 1 && aargs[0] instanceof Closure) {
-            this.callback.accept(name, (Closure)aargs[0])
-        } else {
-            throw new IllegalArgumentException('Unknown method: "' + name + '" with arguments ' + args + ' for ' + this)
-        }
-    }
-    
-    static <T> T apply(T obj, Closure cl) {
-        cl.delegate = obj
-        cl.resolveStrategy = Closure.DELEGATE_FIRST
-        cl()
-        return obj
-    }
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Crowdin.groovy

@@ -1,73 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.TaskAction
-
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
-
-abstract class Crowdin extends DefaultTask {
-    @Input abstract Property<String> getId()
-	@Input @Optional abstract Property<String> getKey()
-	@Input boolean json = true
-	@OutputFile abstract RegularFileProperty getOutput()
-	@OutputFile abstract RegularFileProperty getExport()
-
-    Crowdin() {
-		outputs.upToDateWhen{ false }
-		id.convention('minecraft-forge')
-		output.convention(project.layout.buildDirectory.dir(name).map {it.file("output.zip") })
-		export.convention(project.layout.buildDirectory.dir(name).map {it.file("export.json") })
-	}
-
-    @TaskAction
-    def run() {
-		File outputFile = output.get().asFile
-		File exportFile = export.get().asFile
-		if (outputFile.exists())
-			outputFile.delete()
-		
-		if (!key.isPresent())
-			return
-		String key = this.key.get()
-		String id = this.id.get()
-		
-		// Force an export
-		new URL("https://api.crowdin.com/api/project/${id}/export?key=${key}").withInputStream { i ->
-			exportFile.withOutputStream { it << i }
-		}
-		
-		if (!exportFile.text.contains('success')) {
-			throw new RuntimeException("Crowdin export failed, see ${exportFile} for more info")
-		}
-
-		new URL("https://api.crowdin.com/api/project/${id}/download/all.zip?key=${key}").withInputStream { i -> 
-			new ZipInputStream(i).withCloseable { zin ->
-				outputFile.withOutputStream { out ->
-					new ZipOutputStream(out).withCloseable { zout -> 
-						ZipEntry zein
-						while ((zein = zin.nextEntry) != null) {
-							if (zein.isDirectory()) {
-								zout.putNextEntry(new ZipEntry(zein.name))
-							} else {
-								// 1.13+ uses json
-								if (zein.name.endsWith('.json') == json) {
-									ZipEntry zeout = new ZipEntry(json ? zein.name.toLowerCase() : zein.name)
-									zeout.time = 1
-									zout.putNextEntry(zeout)
-									zout << zin
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-    }
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/DownloadLibraries.groovy

@@ -1,54 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.Internal
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.OutputFiles
-import org.gradle.api.tasks.TaskAction
-import org.gradle.api.tasks.OutputDirectory
-
-import java.nio.file.Files
-
-abstract class DownloadLibraries extends DefaultTask {
-	@InputFile abstract RegularFileProperty getInput()
-	@OutputDirectory abstract DirectoryProperty getOutput()
-	@OutputFile abstract RegularFileProperty getLibrariesOutput()
-
-    DownloadLibraries() {
-		output.convention(project.layout.buildDirectory.dir(name))
-        librariesOutput.convention(project.layout.buildDirectory.dir(name).map(d -> d.file('libraries.txt')))
-	}
-
-    @TaskAction
-    def run() {
-		Util.init()
-		File outputDir = output.get().asFile
-        def libraries = new ArrayList()
-
-		def json = input.get().asFile.json().libraries.each { lib ->
-		    //TODO: Thread?
-			def artifacts = [lib.downloads.artifact] + lib.downloads.get('classifiers', [:]).values()
-			artifacts.each{ art -> 
-				def target = new File(outputDir, art.path)
-				libraries.add(target.absolutePath)
-				if (!target.exists() || !art.sha1.equals(target.sha1())) {
-					project.logger.lifecycle("Downloading ${art.url}")
-					if (!target.parentFile.exists()) {
-						target.parentFile.mkdirs()
-					}
-					new URL(art.url).withInputStream { i ->
-						target.withOutputStream { it << i }
-					}
-					if (!art.sha1.equals(target.sha1())) {
-						throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
-					}
-				}
-			}
-		}
-        Files.write(librariesOutput.get().asFile.toPath(), libraries)
-    }
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/FieldCompareFinder.groovy

@@ -1,109 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.transform.EqualsAndHashCode
-
-import java.util.ArrayList
-import java.util.HashMap
-import java.util.TreeMap
-import java.util.TreeSet
-import java.util.function.BiConsumer
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.*
-
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.Type
-import org.objectweb.asm.tree.ClassNode
-import org.objectweb.asm.tree.FieldNode
-import org.objectweb.asm.tree.MethodNode
-
-import static org.objectweb.asm.Opcodes.*
-
-abstract class FieldCompareFinder extends BytecodeFinder {
-    @Nested
-    Map<String, Search> fields = [:] as HashMap
-    @Internal
-    Map<Search, String> fieldsReverse = [:] as HashMap
-    @Internal
-    Map<String, Set<ObjectTarget>> targets = [:] as TreeMap
-    
-    @Override
-    protected pre() {
-        //fields.each{ k,v -> logger.lifecycle("Fields: " + k + ' ' + v) }
-    }
-    
-    @Override
-    protected process(ClassNode parent, MethodNode node) {
-        def last = null
-        def parentInstance = new ObjectTarget(owner: parent.name, name: '', desc: '')
-        for (int x = 0; x < node.instructions.size(); x++) {
-            def current = node.instructions.get(x)
-            if (current.opcode == IF_ACMPEQ || current.opcode == IF_ACMPNE) {
-                if (last != null && (last.opcode == GETSTATIC || last.opcode == GETFIELD)) {
-                    def target = new Search(cls: last.owner, name: last.name)
-                    def wanted = fieldsReverse.get(target)
-                    def original = fields.get(wanted)
-                    def instance = new ObjectTarget(owner: parent.name, name: node.name, desc: node.desc)
-                    if (wanted != null && (original.blacklist == null || (!original.blacklist.contains(instance) && !original.blacklist.contains(parentInstance)))) {
-                        targets.computeIfAbsent(wanted, { k -> new TreeSet() }).add(instance)
-                    }
-                }
-            }
-            last = current
-        }
-    }
-    
-    @Internal
-    @Override
-    protected Object getData() {
-		def ret = [:] as HashMap
-		targets.forEach{ k, v -> 
-			def e = fields.get(k)
-			ret[k] = [
-				cls: e.cls, 
-				name: e.name, 
-				replacement: e.replacement, 
-				targets: v
-			]
-		}
-        return ret
-    }
-    
-    @EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
-    public static class Search {
-        @Input
-        String cls
-        
-        @Input
-        String name
-		
-		@Input
-		String replacement
-    
-        @Nested
-        @Optional
-        Set<ObjectTarget> blacklist
-        
-        @Override
-        String toString() {
-            return cls + '.' + name
-        }
-        
-        def blacklist(def owner, def name, def desc) {
-            if (blacklist == null)
-                blacklist = new HashSet()
-            blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
-        }
-        def blacklist(def owner) {
-            blacklist(owner, '', '')
-        }
-    }
-    
-    def fields(Closure cl) {
-        new ClosureHelper(cl, {name, ccl ->
-            def search = ClosureHelper.apply(new Search(), ccl)
-            this.fields.put(name, search)
-            this.fieldsReverse.put(search, name)
-        })
-    }
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJar.groovy

@@ -1,44 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.tasks.bundling.Zip
-import org.gradle.api.tasks.*
-import org.gradle.api.provider.SetProperty
-
-abstract class InstallerJar extends Zip {
-    @Input @Optional abstract SetProperty<String> getPackedDependencies()
-    
-    InstallerJar() {
-        archiveClassifier.set('installer')
-        archiveExtension.set('jar') // Needs to be Zip task to not override Manifest, so set extension
-        destinationDirectory.set(project.layout.buildDirectory.dir('libs'))
-
-        def installerJson = project.tasks.installerJson
-        def launcherJson = project.tasks.launcherJson
-        def downloadInstaller = project.tasks.downloadInstaller
-        
-        dependsOn(installerJson, launcherJson, downloadInstaller)
-        from(installerJson, launcherJson)
-
-        from(project.rootProject.file('/src/main/resources/url.png'))
-        project.afterEvaluate {
-            from(project.zipTree(downloadInstaller.output)) {
-                duplicatesStrategy = 'exclude'
-            }
-            
-            if (!System.env.MAVEN_USER) {
-                dependsOn(project.universalJar)
-                from(project.universalJar) {
-                    into '/maven/' + project.group.replace('.', '/') + '/' + project.universalJar.archiveBaseName.get() + '/' + project.version + '/'
-                }
-    
-                packedDependencies.get().forEach {
-                    def jarTask = project.rootProject.getTasks().findByPath(it)
-                    dependsOn(jarTask)
-                    from(jarTask) {
-                        into '/maven/' + jarTask.project.group.replace('.', '/') + '/' + jarTask.archiveBaseName.get() + '/' + jarTask.project.version + '/'
-                    }
-                }
-            }
-        }
-    }
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJson.groovy

@@ -1,81 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.json.JsonBuilder
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.provider.SetProperty
-import org.gradle.api.tasks.*
-
-import java.nio.file.Files
-
-abstract class InstallerJson extends DefaultTask {
-    @OutputFile abstract RegularFileProperty getOutput()
-    @InputFiles abstract ConfigurableFileCollection getInput()
-    @Input @Optional abstract SetProperty<String> getPackedDependencies()
-    @Input @Optional final Map<String, Object> libraries = new LinkedHashMap<>()
-    @Input Map<String, Object> json = new LinkedHashMap<>()
-    @InputFile abstract RegularFileProperty getIcon()
-    @Input abstract Property<String> getLauncherJsonName()
-    @Input abstract Property<String> getLogo()
-    @Input abstract Property<String> getMirrors()
-    @Input abstract Property<String> getWelcome()
-
-    InstallerJson() {
-        getLauncherJsonName().convention('/version.json')
-        getLogo().convention('/big_logo.png')
-        getMirrors().convention('https://files.minecraftforge.net/mirrors-2.0.json')
-        getWelcome().convention("Welcome to the simple ${project.name.capitalize()} installer.")
-                
-        getOutput().convention(project.layout.buildDirectory.file('install_profile.json'))
-
-        ['client', 'server'].each { side ->
-            ['slim', 'extra'].each { type ->
-                def tsk = project.tasks.getByName("download${side.capitalize()}${type.capitalize()}")
-                dependsOn(tsk)
-                input.from(tsk.output)
-            }
-            def tsk = project.tasks.getByName("create${side.capitalize()}SRG")
-            dependsOn(tsk)
-            input.from(tsk.output)
-        }
-
-        
-        project.afterEvaluate {
-            (packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) } + [project.universalJar]).forEach {
-                dependsOn(it)
-                input.from it.archiveFile
-            }
-        }
-    }
-
-    @TaskAction
-    protected void exec() {
-        def libs = libraries
-        for (def child : packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) } + [project.universalJar]) {
-            def dep = Util.getMavenDep(child)
-            def path = Util.getMavenPath(child)
-            libs.put(dep.toString(), [
-                name: dep,
-                downloads: [
-                    artifact: [
-                        path: path,
-                        url: "https://maven.minecraftforge.net/${path}",
-                        sha1: child.archiveFile.get().asFile.sha1(),
-                        size: child.archiveFile.get().asFile.length()
-                    ]
-                ]
-            ])
-        }
-        json.libraries = libs.values().sort{a,b -> a.name.compareTo(b.name)}
-        json.icon = "data:image/png;base64," + new String(Base64.getEncoder().encode(Files.readAllBytes(icon.get().asFile.toPath())))
-        json.json = launcherJsonName.get()
-        json.logo = logo.get()
-        if (!mirrors.get().isEmpty())
-            json.mirrorList = mirrors.get()
-        json.welcome = welcome.get()
-
-        Files.writeString(output.get().getAsFile().toPath(), new JsonBuilder(json).toPrettyString())
-    }
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy

@@ -1,74 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.json.JsonBuilder
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.SetProperty
-import org.gradle.api.tasks.*
-
-import java.nio.file.Files
-
-import static net.minecraftforge.forge.tasks.Util.getArtifacts
-import static net.minecraftforge.forge.tasks.Util.iso8601Now
-
-abstract class LauncherJson extends DefaultTask {
-    @OutputFile abstract RegularFileProperty getOutput()
-    @InputFiles abstract ConfigurableFileCollection getInput()
-    @Input Map<String, Object> json = new LinkedHashMap<>()
-    @Input @Optional abstract SetProperty<String> getPackedDependencies()
-    
-    @Internal final vanilla = project.project(':mcp').file('build/mcp/downloadJson/version.json')
-    @Internal final timestamp = iso8601Now()
-    @Internal final comment = [
-        "Please do not automate the download and installation of Forge.",
-        "Our efforts are supported by ads from the download page.",
-        "If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/"
-    ]
-    @Internal final id = "${project.rootProject.ext.MC_VERSION}-${project.name}${project.version.substring(project.rootProject.ext.MC_VERSION.length())}"
-
-    LauncherJson() {
-        getOutput().convention(project.layout.buildDirectory.file('version.json'))
-
-        dependsOn(':fmlloader:jar', 'universalJar')
-        getInput().from(project.tasks.universalJar.archiveFile,
-                project.project(':fmlloader').jar.archiveFile,
-                vanilla)
-                
-        project.afterEvaluate {
-            packedDependencies.get().forEach {
-                def jarTask = project.rootProject.tasks.findByPath(it)
-                dependsOn(jarTask)
-                input.from jarTask.archiveFile
-            }
-        }
-    }
-
-    @TaskAction
-    protected void exec() {
-        if (!json.libraries)
-            json.libraries = []
-        def libs = [:]
-        getArtifacts(project, project.configurations.installer, false).each { key, lib -> libs[key] = lib }
-        getArtifacts(project, project.configurations.moduleonly, false).each { key, lib -> libs[key] = lib }
-
-        packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) }.forEach {
-            def path = Util.getMavenPath(it)
-            def key = Util.getMavenDep(it)
-            
-            libs[key] = [
-                name: key,
-                downloads: [
-                    artifact: [
-                        path: path,
-                        url: "https://maven.minecraftforge.net/${path}",
-                        sha1: it.archiveFile.get().asFile.sha1(),
-                        size: it.archiveFile.get().asFile.length()
-                    ]
-                ]
-            ]
-        }
-        libs.each { key, lib -> json.libraries.add(lib) }
-        Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
-    }
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/MergeJars.groovy

@@ -1,44 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.apache.commons.io.IOUtils
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.TaskAction
-
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
-
-abstract class MergeJars extends DefaultTask {
-    MergeJars() {
-        output.convention(project.layout.buildDirectory.dir(name).map { it.file('output.jar') })
-    }
-
-    @TaskAction
-    void run() {
-        def jars = inputJars.files
-
-        try (ZipOutputStream zout = new ZipOutputStream(new FileOutputStream(output.get().asFile))) {
-            for (def jar : jars) {
-                try (ZipInputStream zin = new ZipInputStream(new FileInputStream(jar))) {
-                    def entry
-                    while ((entry = zin.getNextEntry()) != null) {
-                        ZipEntry _new = new ZipEntry(entry.getName())
-                        _new.setTime(0) //SHOULD be the same time as the main entry, but NOOOO _new.setTime(entry.getTime()) throws DateTimeException, so you get 0, screw you!
-                        zout.putNextEntry(_new)
-                        IOUtils.copy(zin, zout)
-                    }
-                }
-            }
-        }
-    }
-
-    @InputFiles
-    abstract ConfigurableFileCollection getInputJars()
-
-    @OutputFile
-    abstract RegularFileProperty getOutput()
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ObjectTarget.groovy

@@ -1,32 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.transform.EqualsAndHashCode
-
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.Nested
-import org.gradle.api.tasks.Optional
-
-@EqualsAndHashCode
-public class ObjectTarget implements Comparable<ObjectTarget> {
-    @Input
-    String owner
-    
-    @Input
-    String name
-    
-    @Input
-    @Optional
-    String desc
-    
-    @Override
-    String toString() {
-        if (desc == null)
-            return owner + '.' + name
-        return owner + '.' + name + desc
-    }
-    
-    @Override
-    int compareTo(ObjectTarget o) {
-        return toString().compareTo(o.toString())
-    }
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/SetupCheckJarCompatibility.groovy

@@ -1,57 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.artifacts.Dependency
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.Optional
-import org.gradle.api.tasks.OutputFile
-import org.gradle.api.tasks.TaskAction
-
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
-
-abstract class SetupCheckJarCompatibility extends DefaultTask {
-    SetupCheckJarCompatibility() {
-        group = 'jar compatibility'
-        onlyIf {
-            inputVersion.getOrNull() != null
-        }
-        outputs.upToDateWhen { false } // Never up to date, because this setup task should always run
-
-        baseBinPatchesOutput.convention(project.layout.buildDirectory.dir(name).map { it.file('joined.lzma') })
-    }
-
-    @TaskAction
-    void run() {
-        def inputVersion = inputVersion.get()
-        def fmlLibs = project.configurations.detachedConfiguration(project.PACKED_DEPS.collect {
-            def artifactId = it.split(':')[1]
-            return project.dependencies.create("net.minecraftforge:${artifactId}:${inputVersion}")
-        }.toArray(Dependency[]::new))
-
-        project.tasks.named('checkJarCompatibility') {
-            baseLibraries.from(project.provider {
-                fmlLibs.resolvedConfiguration.lenientConfiguration.files
-            })
-        }
-
-        def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile
-        project.rootProject.extensions.download.run {
-            src "https://maven.minecraftforge.net/net/minecraftforge/forge/${inputVersion}/forge-${inputVersion}-userdev.jar"
-            dest baseForgeUserdev
-        }
-
-        def joinedLzma = project.zipTree(baseForgeUserdev).matching { it.include('joined.lzma') }.singleFile
-
-        Files.copy(joinedLzma.toPath(), baseBinPatchesOutput.get().asFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
-    }
-
-    @Input
-    @Optional
-    abstract Property<String> getInputVersion()
-
-    @OutputFile
-    abstract RegularFileProperty getBaseBinPatchesOutput()
-}

buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy

@@ -1,142 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.json.JsonBuilder
-import groovy.json.JsonSlurper
-
-import java.io.File
-import java.security.MessageDigest
-import java.text.SimpleDateFormat
-import java.util.Date
-
-public class Util {
-	static void init() {
-		File.metaClass.sha1 = { ->
-			MessageDigest md = MessageDigest.getInstance('SHA-1')
-			delegate.eachByte 4096, {bytes, size ->
-				md.update(bytes, 0, size)
-			}
-			return md.digest().collect {String.format "%02x", it}.join()
-		}
-        File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
-
-		File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) }
-        File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] }
-        File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() }
-
-		Date.metaClass.iso8601 = { ->
-			def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
-			def result = format.format(delegate)
-			return result[0..21] + ':' + result[22..-1]
-		}
-
-        String.metaClass.rsplit = { String del, int limit = -1 ->
-            def lst = new ArrayList()
-            def x = 0, idx
-            def tmp = delegate
-            while ((idx = tmp.lastIndexOf(del)) != -1 && (limit == -1 || x++ < limit)) {
-                lst.add(0, tmp.substring(idx + del.length(), tmp.length()))
-                tmp = tmp.substring(0, idx)
-            }
-            lst.add(0, tmp)
-            return lst
-        }
-	}
-
-	public static String[] getClasspath(project, libs, artifact) {
-		def ret = []
-		artifactTree(project, artifact).each { key, lib ->
-			libs[lib.name] = lib
-			if (lib.name != artifact)
-				ret.add(lib.name)
-		}
-		return ret
-	}
-
-	public static def getArtifacts(project, config, classifiers) {
-		def ret = [:]
-		config.resolvedConfiguration.resolvedArtifacts.each {
-			def art = [
-				group: it.moduleVersion.id.group,
-				name: it.moduleVersion.id.name,
-				version: it.moduleVersion.id.version,
-				classifier: it.classifier,
-				extension: it.extension,
-				file: it.file
-			]
-			def key = art.group + ':' + art.name
-			def folder = "${art.group.replace('.', '/')}/${art.name}/${art.version}/"
-			def filename = "${art.name}-${art.version}"
-			if (art.classifier != null)
-				filename += "-${art.classifier}"
-			filename += ".${art.extension}"
-			def path = "${folder}${filename}"
-			def url = "https://libraries.minecraft.net/${path}"
-			if (!checkExists(url)) {
-				url = "https://maven.minecraftforge.net/${path}"
-			}
-			ret[key] = [
-				name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"),
-				downloads: [
-					artifact: [
-						path: path,
-						url: url,
-						sha1: sha1(art.file),
-						size: art.file.length()
-					]
-				]
-			]
-		}
-		return ret
-	}
-
-    public static def getMavenPath(task) {
-        def classifier = task.archiveClassifier.get()
-        def dep = "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
-        return "${task.project.group.replace('.', '/')}/${task.project.name}/${task.project.version}/${task.project.name}-${task.project.version}".toString() + (classifier == '' ? '' : '-' + classifier) + '.jar'
-    }
-
-    public static def getMavenDep(task) {
-        def classifier = task.archiveClassifier.get()
-        return "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier)
-    }
-
-	public static def iso8601Now() { new Date().iso8601() }
-
-	public static def sha1(file) {
-		MessageDigest md = MessageDigest.getInstance('SHA-1')
-		file.eachByte 4096, {bytes, size ->
-			md.update(bytes, 0, size)
-		}
-		return md.digest().collect {String.format "%02x", it}.join()
-	}
-
-	private static def artifactTree(project, artifact) {
-		if (!project.ext.has('tree_resolver'))
-			project.ext.tree_resolver = 1
-		def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
-		def dep = project.dependencies.create(artifact)
-		cfg.dependencies.add(dep)
-		def files = cfg.resolve()
-		return getArtifacts(project, cfg, true)
-	}
-
-	private static boolean checkExists(url) {
-		try {
-			def code = new URL(url).openConnection().with {
-				requestMethod = 'HEAD'
-				connect()
-				responseCode
-			}
-			return code == 200
-		} catch (Exception e) {
-			if (e.toString().contains('unable to find valid certification path to requested target'))
-				throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java')
-			throw e
-		}
-	}
-
-    public static String getLatestForgeVersion(mcVersion) {
-        def json = new JsonSlurper().parseText(new URL("https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json").getText("UTF-8"))
-        return json.promos["$mcVersion-latest"]
-    }
-}

client

@@ -0,0 +1 @@
+forge_client/src/net/minecraft/src/forge/

common

@@ -0,0 +1 @@
+forge_common/net/minecraft/src/forge

conf/client.exc

@@ -0,0 +1,228 @@
+net/minecraft/client/Minecraft.func_6257_q()V=org/lwjgl/LWJGLException
+net/minecraft/client/Minecraft.func_6271_a()V=org/lwjgl/LWJGLException
+net/minecraft/src/ChunkLoader.func_812_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/ChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/ChunkLoader.func_815_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_1138_a(Ljava/io/InputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_1139_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_1141_a(Ljava/io/DataInput;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_1143_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/OutputStream;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_35620_b(Lnet/minecraft/src/NBTTagCompound;Ljava/io/File;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_35621_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/File;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_35622_a(Ljava/io/File;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_40591_a(Lnet/minecraft/src/NBTTagCompound;)[B=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_40592_a([B)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/DataWatcher.func_21125_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/DataWatcher.func_21127_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/DataWatcher.func_21128_a(Ljava/io/DataOutputStream;Lnet/minecraft/src/WatchableObject;)V=java/io/IOException
+net/minecraft/src/DataWatcher.func_21131_a(Ljava/io/DataInputStream;)Ljava/util/List;=java/io/IOException
+net/minecraft/src/GuiMultiplayer.func_35328_b(Lnet/minecraft/src/ServerNBTStorage;)V=java/io/IOException
+net/minecraft/src/GuiMultiplayer.func_35336_a(Lnet/minecraft/src/GuiMultiplayer;Lnet/minecraft/src/ServerNBTStorage;)V=java/io/IOException
+net/minecraft/src/IChunkLoader.func_812_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/IChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/IChunkLoader.func_815_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/J_CompactJsonFormatter.func_27328_a(Lnet/minecraft/src/J_JsonNode;Ljava/io/Writer;)V=java/io/IOException
+net/minecraft/src/J_CompactJsonFormatter.func_27329_a(Lnet/minecraft/src/J_JsonRootNode;Ljava/io/Writer;)V=java/io/IOException
+net/minecraft/src/J_JdomParser.func_27366_a(Ljava/io/Reader;)Lnet/minecraft/src/J_JsonRootNode;=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_JdomParser.func_27367_a(Ljava/lang/String;)Lnet/minecraft/src/J_JsonRootNode;=net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_PositionTrackingPushbackReader.func_27333_c()I=java/io/IOException
+net/minecraft/src/J_PositionTrackingPushbackReader.func_27334_a(C)V=java/io/IOException
+net/minecraft/src/J_PositionTrackingPushbackReader.func_27336_b([C)I=java/io/IOException
+net/minecraft/src/J_SajParser.func_27448_l(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)I=java/io/IOException
+net/minecraft/src/J_SajParser.func_27449_c(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_SajParser.func_27450_k(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)I=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27451_b(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27452_i(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_SajParser.func_27453_b(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_SajParser.func_27454_g(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27455_a(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_SajParser.func_27456_e(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException
+net/minecraft/src/J_SajParser.func_27457_j(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27458_d(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27459_a(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27460_c(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27461_h(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException
+net/minecraft/src/J_SajParser.func_27462_f(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
+net/minecraft/src/J_SajParser.func_27463_a(Ljava/io/Reader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/J_SajParser.func_27464_d(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
+net/minecraft/src/NBTBase.func_734_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException
+net/minecraft/src/NBTBase.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_738_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagByte.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagByte.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagByteArray.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagByteArray.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagCompound.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagCompound.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagDouble.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagDouble.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagEnd.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagEnd.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagFloat.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagFloat.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagInt.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagInt.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagList.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagList.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagLong.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagLong.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagShort.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagShort.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagString.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagString.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NetClientHandler.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;I)V=java/net/UnknownHostException,java/io/IOException
+net/minecraft/src/NetworkManager.<init>(Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException
+net/minecraft/src/Packet.func_27048_a(Ljava/io/DataInputStream;I)Ljava/lang/String;=java/io/IOException
+net/minecraft/src/Packet.func_27049_a(Ljava/lang/String;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_324_b(Ljava/io/DataInputStream;Z)Lnet/minecraft/src/Packet;=java/io/IOException
+net/minecraft/src/Packet.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_328_a(Lnet/minecraft/src/Packet;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_40186_c(Ljava/io/DataInputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/Packet.func_40187_b(Ljava/io/DataInputStream;)Lnet/minecraft/src/ItemStack;=java/io/IOException
+net/minecraft/src/Packet.func_40188_a(Lnet/minecraft/src/ItemStack;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_40189_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet0KeepAlive.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet0KeepAlive.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet100OpenWindow.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet100OpenWindow.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet101CloseWindow.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet101CloseWindow.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet102WindowClick.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet102WindowClick.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet103SetSlot.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet103SetSlot.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet104WindowItems.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet104WindowItems.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet105UpdateProgressbar.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet105UpdateProgressbar.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet106Transaction.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet106Transaction.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet107CreativeSetSlot.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet107CreativeSetSlot.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet108EnchantItem.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet108EnchantItem.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet10Flying.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet10Flying.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet11PlayerPosition.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet11PlayerPosition.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet12PlayerLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet12PlayerLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet130UpdateSign.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet130UpdateSign.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet131MapData.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet131MapData.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet13PlayerLookMove.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet13PlayerLookMove.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet14BlockDig.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet14BlockDig.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet15Place.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet15Place.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet16BlockItemSwitch.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet16BlockItemSwitch.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet17Sleep.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet17Sleep.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet18Animation.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet18Animation.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet19EntityAction.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet19EntityAction.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet1Login.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet1Login.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet200Statistic.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet200Statistic.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet201PlayerInfo.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet201PlayerInfo.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet20NamedEntitySpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet20NamedEntitySpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet21PickupSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet21PickupSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet22Collect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet22Collect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet23VehicleSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet23VehicleSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet24MobSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet24MobSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet254ServerPing.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet254ServerPing.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet255KickDisconnect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet255KickDisconnect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet25EntityPainting.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet25EntityPainting.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet26EntityExpOrb.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet26EntityExpOrb.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet27Position.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet27Position.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet28EntityVelocity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet28EntityVelocity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet29DestroyEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet29DestroyEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet2Handshake.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet2Handshake.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet30Entity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet30Entity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet31RelEntityMove.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet31RelEntityMove.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet32EntityLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet32EntityLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet33RelEntityMoveLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet33RelEntityMoveLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet34EntityTeleport.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet34EntityTeleport.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet38EntityStatus.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet38EntityStatus.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet39AttachEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet39AttachEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet3Chat.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet3Chat.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet40EntityMetadata.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet40EntityMetadata.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet41EntityEffect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet41EntityEffect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet42RemoveEntityEffect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet42RemoveEntityEffect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet43Experience.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet43Experience.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet4UpdateTime.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet4UpdateTime.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet50PreChunk.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet50PreChunk.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet51MapChunk.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet51MapChunk.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet52MultiBlockChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet52MultiBlockChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet53BlockChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet53BlockChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet54PlayNoteBlock.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet54PlayNoteBlock.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet5PlayerInventory.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet5PlayerInventory.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet60Explosion.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet60Explosion.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet61DoorChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet61DoorChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet6SpawnPosition.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet6SpawnPosition.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet70Bed.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet70Bed.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet71Weather.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet71Weather.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet7UseEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet7UseEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet8UpdateHealth.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet8UpdateHealth.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet9Respawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet9Respawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/RegionFile.func_22196_b()V=java/io/IOException
+net/minecraft/src/RegionFile.func_22198_a(III)V=java/io/IOException
+net/minecraft/src/RegionFile.func_22200_a(I[BI)V=java/io/IOException
+net/minecraft/src/RegionFile.func_22208_b(III)V=java/io/IOException
+net/minecraft/src/RenderEngine.func_6526_a(Ljava/io/InputStream;)Ljava/awt/image/BufferedImage;=java/io/IOException
+net/minecraft/src/StatsSyncher.func_27410_a(Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException
+net/minecraft/src/StatsSyncher.func_27412_a(Lnet/minecraft/src/StatsSyncher;Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException
+net/minecraft/src/TexturePackBase.func_6485_a(Lnet/minecraft/client/Minecraft;)V=java/io/IOException
+net/minecraft/src/TexturePackCustom.func_6485_a(Lnet/minecraft/client/Minecraft;)V=java/io/IOException
+net/minecraft/src/ThreadDownloadResources.func_1212_a(Ljava/net/URL;Ljava/io/File;J)V=java/io/IOException
+net/minecraft/src/ThreadedChunkLoader.func_40551_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException
+net/minecraft/src/ThreadedChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/ThreadedFileIOBase.func_40566_a()V=java/lang/InterruptedException

conf/mcp.cfg

@@ -0,0 +1,139 @@
+[DEFAULT]
+DirTemp    = temp
+DirSrc     = src
+DirLogs    = logs
+DirBin     = bin
+DirJars    = jars
+DirReobf   = reobf
+DirConf    = conf
+DirRuntime = runtime
+DirLib     = lib
+DirFFOut   = temp/ffout
+
+[CSV]
+Classes = %(DirConf)s/classes.csv
+Methods = %(DirConf)s/methods.csv
+Fields  = %(DirConf)s/fields.csv
+
+[SRGS]
+Client  = %(DirTemp)s/client_rg.srg
+Server  = %(DirTemp)s/server_rg.srg
+
+[JAR]
+DirNatives = %(DirJars)s/bin/natives
+Client     = %(DirJars)s/bin/minecraft.jar
+Server     = %(DirJars)s/minecraft_server.jar
+MD5Client  = 3820d222b95d0b8c520d9596a756a6e6
+MD5Server  = 934b6010999daa1f1b1ccdf4cb77e052
+
+[RETROGUARD]
+Location       = %(DirRuntime)s/bin/retroguard.jar
+RetroConf      = %(DirTemp)s/retroguard.cfg
+RetroReobConf  = %(DirTemp)s/retroguard_ro.cfg
+ClientConf     = %(DirTemp)s/client_rg.cfg
+ServerConf     = %(DirTemp)s/server_rg.cfg
+ClientReobConf = %(DirTemp)s/client_ro.cfg
+ServerReobConf = %(DirTemp)s/server_ro.cfg
+ClientOut      = %(DirTemp)s/minecraft_rg.jar
+ServerOut      = %(DirTemp)s/minecraft_server_rg.jar
+ClientLog      = %(DirLogs)s/client_rg.log
+ServerLog      = %(DirLogs)s/server_rg.log
+ClientDeobLog  = %(DirLogs)s/client_deob.log
+ServerDeobLog  = %(DirLogs)s/server_deob.log
+
+[EXCEPTOR]
+XClientCfg      = %(DirConf)s/client.exc
+XServerCfg      = %(DirConf)s/server.exc
+XClientOut      = %(DirTemp)s/minecraft_exc.jar
+XServerOut      = %(DirTemp)s/minecraft_server_exc.jar
+XClientLog      = %(DirLogs)s/client_exc.log
+XServerLog      = %(DirLogs)s/server_exc.log
+
+[DECOMPILE]
+FFClientConf  = -rbr=0 -dgs=1 -asc=1
+FFServerConf  = -rbr=0 -dgs=1 -asc=1
+FFClientOut   = %(DirFFOut)s/client
+FFServerOut   = %(DirFFOut)s/server
+FFClientSrc   = %(DirFFOut)s/minecraft_exc.jar
+FFServerSrc   = %(DirFFOut)s/minecraft_server_exc.jar
+FFSource      = net
+
+[OUTPUT]
+BinOut     = %(DirTemp)s/bin
+BinClient  = %(DirTemp)s/bin/minecraft
+BinServer  = %(DirTemp)s/bin/minecraft_server
+SrcClient  = %(DirSrc)s/minecraft
+SrcServer  = %(DirSrc)s/minecraft_server
+
+[PACKAGES]
+PkgClient  = net/minecraft/src,net/minecraft/client
+PkgServer  = net/minecraft/src,net/minecraft/server
+
+[PATCHES]
+PatchClient   = %(DirConf)s/patches/minecraft.patch
+PatchServer   = %(DirConf)s/patches/minecraft_server.patch
+PatchTemp     = %(DirTemp)s/temp.patch
+FFPatchClient = %(DirConf)s/patches/minecraft_ff.patch
+FFPatchServer = %(DirConf)s/patches/minecraft_server_ff.patch
+
+[RECOMPILE]
+BinClient       = %(DirBin)s/minecraft
+BinServer       = %(DirBin)s/minecraft_server
+ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
+ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
+ClientFixes     = %(DirConf)s/patches
+
+[REOBF]
+SAFFXClient       = %(DirTemp)s/minecraft.saffx
+SAFFXServer       = %(DirTemp)s/minecraft_server.saffx
+MD5Client         = %(DirTemp)s/client.md5
+MD5Server         = %(DirTemp)s/server.md5
+MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
+MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
+ObfSRGClient      = %(DirTemp)s/client_ro.srg
+ObfSRGServer      = %(DirTemp)s/server_ro.srg
+RecompJarClient   = %(DirTemp)s/client_recomp.jar
+RecompJarServer   = %(DirTemp)s/server_recomp.jar
+ObfJarClient      = %(DirTemp)s/client_reobf.jar
+ObfJarServer      = %(DirTemp)s/server_reobf.jar
+ReobfDirClient    = %(DirReobf)s/minecraft
+ReobfDirServer    = %(DirReobf)s/minecraft_server
+ReobfClientLog    = %(DirLogs)s/client_reob.log
+ReobfServerLog    = %(DirLogs)s/server_reob.log
+FixSound          = minecraft/me.class
+FixStart          = minecraft/Start.class
+NullPkg           = net/minecraft/src
+IgnorePkg         = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml
+
+[GETMODSOURCE]
+OutSRCClient	= modsrc/client
+OutSRCServer	= modsrc/server
+OutSRC			= modsrc
+
+[MCP]
+LogFile           = %(DirLogs)s/mcp.log
+LogFileErr        = %(DirLogs)s/mcperr.log
+
+[COMMANDS]
+Patcher       = %(DirRuntime)s/bin/applydiff.exe
+JadRetro      = %(DirRuntime)s/bin/jadretro.jar
+Fernflower    = %(DirRuntime)s/bin/fernflower.jar
+Jadwin        = %(DirRuntime)s/bin/jad.exe
+Jadlinux      = %(DirRuntime)s/bin/jad.exe
+Jadosx        = %(DirRuntime)s/bin/jad-osx
+Exceptor      = %(DirRuntime)s/bin/exceptor.jar
+CmdRG         = %s -cp {classpath} RetroGuard -searge {conffile}
+CmdRGReobf    = %s -cp {classpath} RetroGuard -notch  {conffile}
+CmdJadretro   = %s -jar {jarjr} {targetdir}
+CmdRecompClt  = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs} {fixes}/*.java
+CmdRecompSrv  = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
+CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
+CmdJadwin     = .\{binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes}
+CmdJadlinux   = wine {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff "{classes}"
+CmdJadosx     = {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes}
+CmdPatchwin   = .\%(Patcher)s --binary -p1 -u -i ..\..\{patchfile} -d {srcdir}
+CmdPatchlinux = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir}
+CmdPatchosx   = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir}
+CmdFernflower = %s -jar {jarff} {conf} {jarin} {jarout}
+CmdExceptor   = %s -jar {jarexc} {input} {output} {conf} {log}

conf/patches/Start.java

@@ -0,0 +1,27 @@
+import java.io.File;
+import java.lang.reflect.Field;
+
+import net.minecraft.client.Minecraft;
+
+public class Start
+{
+	public static void main(String[] args)
+	{
+		try
+		{
+			// set new minecraft data folder to prevent it from using the .minecraft folder
+			// this makes it a portable version
+			Field f = Minecraft.class.getDeclaredField("minecraftDir");
+			Field.setAccessible(new Field[] { f }, true);
+			f.set(null, new File("."));
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			return;
+		}
+
+		// start minecraft game application
+		Minecraft.main(args);
+	}
+}

conf/patches/me.java

@@ -0,0 +1,10 @@
+// this is needed for the sound engine to work with deobfuscated sourcecode without crashing
+
+public class me
+{
+    public static int c(double d)
+    {
+        int i = (int)d;
+        return d >= (double)i ? i : i - 1;
+    }
+}

conf/patches/minecraft_ff.patch

@@ -0,0 +1,109 @@
+diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
+--- minecraft\net\minecraft\client\Minecraft.java	Tue Nov 22 23:21:44 2011
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Wed Nov 23 00:09:14 2011
+@@ -1600,11 +1600,13 @@
+ 
+             this.field_6324_e.func_600_a(var6.field_22395_a + var10, 64, var6.field_22396_c + var8);
+             if(!this.field_6327_b.func_35643_e()) {
++/*
+                while(true) {
+                   if(this.field_6324_e.func_6465_g()) {
+                      continue;
+                   }
+                }
++*/
+             }
+          }
+       }
+diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
+--- minecraft\net\minecraft\src\CodecMus.java	Tue Nov 22 23:21:36 2011
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Wed Nov 23 00:09:14 2011
+@@ -1,5 +1,6 @@
+ package net.minecraft.src;
+ 
++import java.io.IOException;
+ import java.io.InputStream;
+ import net.minecraft.src.MusInputStream;
+ import paulscode.sound.codecs.CodecJOrbis;
+@@ -7,6 +8,11 @@
+ public class CodecMus extends CodecJOrbis {
+ 
+    protected InputStream openInputStream() {
+-      return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
++      try {
++         return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
++      }
++      catch (IOException e) {
++         return null;
++      }
+    }
+ }
+diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
+--- minecraft\net\minecraft\src\ItemMap.java	Tue Nov 22 23:21:24 2011
++++ minecraft_patched\net\minecraft\src\ItemMap.java	Wed Nov 23 00:09:14 2011
+@@ -19,7 +19,6 @@
+    }
+ 
+    public static MapData func_28013_a(short var0, World var1) {
+-      "map_" + var0;
+       MapData var3 = (MapData)var1.func_28103_a(MapData.class, "map_" + var0);
+       if(var3 == null) {
+          int var4 = var1.func_28101_b("map");
+@@ -32,7 +31,6 @@
+    }
+ 
+    public MapData func_28012_a(ItemStack var1, World var2) {
+-      "map_" + var1.func_21181_i();
+       MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21181_i());
+       if(var4 == null) {
+          var1.func_28156_b(var2.func_28101_b("map"));
+diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\net\minecraft\src\MusInputStream.java
+--- minecraft\net\minecraft\src\MusInputStream.java	Tue Nov 22 23:21:24 2011
++++ minecraft_patched\net\minecraft\src\MusInputStream.java	Wed Nov 23 00:09:14 2011
+@@ -1,5 +1,6 @@
+ package net.minecraft.src;
+ 
++import java.io.IOException;
+ import java.io.InputStream;
+ import java.net.URL;
+ import net.minecraft.src.CodecMus;
+@@ -28,7 +29,12 @@
+    }
+ 
+    public int read(byte[] var1, int var2, int var3) {
+-      var3 = this.field_1515_d.read(var1, var2, var3);
++      try {
++         var3 = this.field_1515_d.read(var1, var2, var3);
++      }
++      catch (IOException e) {
++         return 0;
++      }
+ 
+       for(int var4 = 0; var4 < var3; ++var4) {
+          byte var5 = var1[var2 + var4] = (byte)(var1[var2 + var4] ^ this.field_1516_c >> 8);
+diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
+--- minecraft\net\minecraft\src\RenderGlobal.java	Tue Nov 22 23:21:20 2011
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Wed Nov 23 00:10:20 2011
+@@ -1466,7 +1466,7 @@
+          double var15 = this.field_1439_t.field_22009_h.field_611_ak - var2;
+          double var17 = this.field_1439_t.field_22009_h.field_610_al - var4;
+          double var19 = this.field_1439_t.field_22009_h.field_609_am - var6;
+-         Object var21 = null;
++         EntityFX var21 = null;
+          if(var1.equals("hugeexplosion")) {
+             this.field_1439_t.field_6321_h.func_1192_a(var21 = new EntityHugeExplodeFX(this.field_1448_k, var2, var4, var6, var8, var10, var12));
+          } else if(var1.equals("largeexplode")) {
+diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Tue Nov 22 23:21:30 2011
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Wed Nov 23 00:09:14 2011
+@@ -21,7 +21,9 @@
+    }
+ 
+    public void run() {
+-      this.func_40568_b();
++      while (true) {
++         this.func_40568_b();
++      }
+    }
+ 
+    private void func_40568_b() {

conf/patches/minecraft_server_ff.patch

@@ -0,0 +1,26 @@
+diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_patched\net\minecraft\src\ItemMap.java
+--- minecraft_server\net\minecraft\src\ItemMap.java	Tue Nov 22 23:21:56 2011
++++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Wed Nov 23 00:09:45 2011
+@@ -22,7 +22,6 @@
+    }
+ 
+    public MapData func_28023_a(ItemStack var1, World var2) {
+-      "map_" + var1.func_21125_h();
+       MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21125_h());
+       if(var4 == null) {
+          var1.func_28145_b(var2.func_28104_b("map"));
+diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
+diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Tue Nov 22 23:22:10 2011
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Wed Nov 23 00:09:45 2011
+@@ -21,7 +21,9 @@
+    }
+ 
+    public void run() {
+-      this.func_40509_b();
++      while (true) {
++         this.func_40509_b();
++      }
+    }
+ 
+    private void func_40509_b() {

conf/patches/splashes.txt

@@ -0,0 +1 @@
+Now it is YOURCRAFT!

conf/server.exc

@@ -0,0 +1,202 @@
+net/minecraft/server/MinecraftServer.func_6008_d()Z=java/net/UnknownHostException
+net/minecraft/src/ChunkLoader.func_4104_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/ChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/ChunkLoader.func_662_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_40515_a([B)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_40516_a(Lnet/minecraft/src/NBTTagCompound;)[B=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_769_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/OutputStream;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_770_a(Ljava/io/InputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_771_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/CompressedStreamTools.func_774_a(Ljava/io/DataInput;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/DataWatcher.func_21149_a(Ljava/io/DataInputStream;)Ljava/util/List;=java/io/IOException
+net/minecraft/src/DataWatcher.func_21151_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/DataWatcher.func_21152_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/DataWatcher.func_21154_a(Ljava/io/DataOutputStream;Lnet/minecraft/src/WatchableObject;)V=java/io/IOException
+net/minecraft/src/IChunkLoader.func_4104_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/IChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/IChunkLoader.func_662_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_380_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTBase.func_383_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException
+net/minecraft/src/NBTTagByte.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagByte.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagByteArray.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagByteArray.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagCompound.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagCompound.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagDouble.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagDouble.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagEnd.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagEnd.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagFloat.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagFloat.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagInt.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagInt.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagList.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagList.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagLong.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagLong.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagShort.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagShort.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NBTTagString.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
+net/minecraft/src/NBTTagString.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
+net/minecraft/src/NetLoginHandler.<init>(Lnet/minecraft/server/MinecraftServer;Ljava/net/Socket;Ljava/lang/String;)V=java/io/IOException
+net/minecraft/src/NetworkListenThread.<init>(Lnet/minecraft/server/MinecraftServer;Ljava/net/InetAddress;I)V=java/io/IOException
+net/minecraft/src/NetworkManager.<init>(Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException
+net/minecraft/src/Packet.func_27037_a(Ljava/io/DataInputStream;I)Ljava/lang/String;=java/io/IOException
+net/minecraft/src/Packet.func_27038_a(Ljava/lang/String;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_40259_c(Ljava/io/DataInputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
+net/minecraft/src/Packet.func_40260_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_40261_a(Lnet/minecraft/src/ItemStack;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_40262_b(Ljava/io/DataInputStream;)Lnet/minecraft/src/ItemStack;=java/io/IOException
+net/minecraft/src/Packet.func_65_b(Ljava/io/DataInputStream;Z)Lnet/minecraft/src/Packet;=java/io/IOException
+net/minecraft/src/Packet.func_66_a(Lnet/minecraft/src/Packet;Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet0KeepAlive.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet0KeepAlive.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet100OpenWindow.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet100OpenWindow.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet101CloseWindow.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet101CloseWindow.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet102WindowClick.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet102WindowClick.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet103SetSlot.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet103SetSlot.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet104WindowItems.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet104WindowItems.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet105UpdateProgressbar.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet105UpdateProgressbar.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet106Transaction.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet106Transaction.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet107CreativeSetSlot.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet107CreativeSetSlot.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet108EnchantItem.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet108EnchantItem.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet10Flying.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet10Flying.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet11PlayerPosition.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet11PlayerPosition.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet12PlayerLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet12PlayerLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet130UpdateSign.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet130UpdateSign.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet131MapData.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet131MapData.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet13PlayerLookMove.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet13PlayerLookMove.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet14BlockDig.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet14BlockDig.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet15Place.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet15Place.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet16BlockItemSwitch.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet16BlockItemSwitch.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet17Sleep.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet17Sleep.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet18Animation.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet18Animation.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet19EntityAction.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet19EntityAction.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet1Login.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet1Login.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet200Statistic.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet200Statistic.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet201PlayerInfo.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet201PlayerInfo.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet20NamedEntitySpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet20NamedEntitySpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet21PickupSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet21PickupSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet22Collect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet22Collect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet23VehicleSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet23VehicleSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet24MobSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet24MobSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet255KickDisconnect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet255KickDisconnect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet25EntityPainting.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet25EntityPainting.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet26EntityExpOrb.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet26EntityExpOrb.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet27Position.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet27Position.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet28EntityVelocity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet28EntityVelocity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet29DestroyEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet29DestroyEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet2Handshake.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet2Handshake.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet30Entity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet30Entity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet31RelEntityMove.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet31RelEntityMove.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet32EntityLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet32EntityLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet33RelEntityMoveLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet33RelEntityMoveLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet34EntityTeleport.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet34EntityTeleport.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet38EntityStatus.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet38EntityStatus.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet39AttachEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet39AttachEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet3Chat.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet3Chat.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet40EntityMetadata.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet40EntityMetadata.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet41EntityEffect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet41EntityEffect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet42RemoveEntityEffect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet42RemoveEntityEffect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet43Experience.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet43Experience.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet4UpdateTime.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet4UpdateTime.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet50PreChunk.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet50PreChunk.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet51MapChunk.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet51MapChunk.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet52MultiBlockChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet52MultiBlockChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet53BlockChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet53BlockChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet54PlayNoteBlock.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet54PlayNoteBlock.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet5PlayerInventory.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet5PlayerInventory.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet60Explosion.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet60Explosion.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet61DoorChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet61DoorChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet6SpawnPosition.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet6SpawnPosition.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet70Bed.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet70Bed.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet71Weather.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet71Weather.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet7UseEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet7UseEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet8UpdateHealth.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet8UpdateHealth.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/Packet9Respawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
+net/minecraft/src/Packet9Respawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
+net/minecraft/src/RConOutputStream.func_40393_a(I)V=java/io/IOException
+net/minecraft/src/RConOutputStream.func_40394_a(S)V=java/io/IOException
+net/minecraft/src/RConOutputStream.func_40396_a([B)V=java/io/IOException
+net/minecraft/src/RConOutputStream.func_40397_a(Ljava/lang/String;)V=java/io/IOException
+net/minecraft/src/RConThreadClient.func_40453_a(IILjava/lang/String;)V=java/io/IOException
+net/minecraft/src/RConThreadClient.func_40454_e()V=java/io/IOException
+net/minecraft/src/RConThreadClient.func_40455_a(ILjava/lang/String;)V=java/io/IOException
+net/minecraft/src/RConThreadQuery.func_40428_a([BLjava/net/DatagramPacket;)V=java/net/SocketException,java/io/IOException
+net/minecraft/src/RConThreadQuery.func_40430_a(Ljava/net/DatagramPacket;)Z=java/io/IOException
+net/minecraft/src/RConThreadQuery.func_40431_d(Ljava/net/DatagramPacket;)V=java/net/SocketException,java/io/IOException
+net/minecraft/src/RConThreadQuery.func_40434_b(Ljava/net/DatagramPacket;)[B=java/io/IOException
+net/minecraft/src/RegionFile.func_22126_b()V=java/io/IOException
+net/minecraft/src/RegionFile.func_22128_a(III)V=java/io/IOException
+net/minecraft/src/RegionFile.func_22130_a(I[BI)V=java/io/IOException
+net/minecraft/src/RegionFile.func_22138_b(III)V=java/io/IOException
+net/minecraft/src/ThreadedChunkLoader.func_40325_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException
+net/minecraft/src/ThreadedChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
+net/minecraft/src/ThreadedFileIOBase.func_40508_a()V=java/lang/InterruptedException

conf/version.cfg

@@ -0,0 +1,4 @@
+[VERSION]
+MCPVersion = 5.0
+ClientVersion = 1.0.0
+ServerVersion = 1.0.1

docs/CONTRIBUTING.md

@@ -1,18 +0,0 @@
-Contributing to Forge
-=====================
-
-1) Keep patches to Minecraft classes together. If you need a lot of things done, you may either add to relevant forge classes or make a new class. Try not to spread out your patches across multiple disjoint lines, as this makes maintenance of your patches difficult.
-
-2) TODO: Test Mods
-
-3) Follow the code style of the class you're working in (braces on newlines & spaces instead of tabs in Forge classes, inline brackets in patches, etc).
-
-For more information, refer to [the wiki](https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge)
-
-
-Contributor License Agreement
-=============================
-- You grant Forge a license to use your code contributed to the primary codebase (everything **not** under patches) in Forge, under the LGPLv2.1 license.
-- You assign copyright ownership of your contributions to the patches codebase (everything under patches) to Forge, where it will be licensed under the LGPLv2.1 license.
-
-"Forge" is Forge Development LLC, a legally incorporated entity in Oregon, USA.

docs/README.md

@@ -1,68 +0,0 @@
-![Forge Logo](assets/Forge_logo.svg)
-
-MinecraftForge
-=============
-[![Stable Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Stable&prefix=1.19.2-&query=$.promos["1.19.2-recommended"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)](https://files.minecraftforge.net)
-[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=1.19.2-&query=$.promos["1.19.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
-)](https://files.minecraftforge.net) [![Discord](https://img.shields.io/discord/313125603924639766.svg?color=%237289da&label=Discord&logo=discord&logoColor=%237289da)][Discord] [![Support](https://img.shields.io/badge/Patreon-Support-orange.svg?logo=Patreon)](https://www.patreon.com/LexManos)
-
-Forge is a free, open-source modding API all of your favourite mods use!
-
-| Version |    Support    |
-|---------| ------------- |
-| 1.20.x  |    Active     |
-| 1.19.4  |    Legacy     |
-| 1.19.2  |    Legacy     |
-
-* [Download]
-* [Forum]
-* [Discord]
-* [Documentation]
-
-# Installing Forge
-
-Go to [the Forge website](https://files.minecraftforge.net)
- and select the Minecraft version you wish to get Forge for from the list.
-
-You can download the installer for the *Recommended Build* or the
- *Latest build* there. Latest builds may have newer features but may be
- more unstable as a result. The installer will attempt to install Forge
- into your vanilla launcher environment, where you can then create a new
- profile using that version and play the game!
- 
-For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
-
-[Here is a short video from Rorax showing how to install and setup Forge.](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
-
-# Creating Mods
-
-[See the "Getting Started" section in the Forge Documentation](https://docs.minecraftforge.net/en/1.19.2/gettingstarted/).
-
-# Contribute to Forge
-
-If you wish to actually inspect Forge, submit PRs or otherwise work
- with Forge itself, you're in the right place!
-
- [See the guide to setting up a Forge workspace](https://docs.minecraftforge.net/en/1.19.2/forgedev/).
-
-### Pull requests
-
-[See the "Making Changes and Pull Requests" section in the Forge documentation](https://docs.minecraftforge.net/en/1.19.2/forgedev/#making-changes-and-pull-requests).
-
-Please read the contributing guidelines found [here](CONTRIBUTING.md) before making a pull request.
-
-### Contributor License Agreement
-We require all contributors to acknowledge the [Forge Contributor License Agreement](https://cla-assistant.io/MinecraftForge/MinecraftForge). 
-Please ensure you have a valid email address associated with your GitHub account to do this. If you have previously 
- signed it, you should be OK.
-
-#### Donate
-*Forge is a large project with many collaborators working on it around the clock. Forge is and will always remain free 
- to use and modify. However, it costs money to run such a large project as this, so please consider 
- [becoming a patron](https://www.patreon.com/LexManos).*
-
-[Download]: https://files.minecraftforge.net/
-[Forum]: https://forums.minecraftforge.net
-[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
-[Discord]: https://discord.minecraftforge.net
-[Documentation]: https://docs.minecraftforge.net/en/1.19.2/

docs/SUPPORT.md

@@ -1,147 +0,0 @@
-Getting Support Surrounding Forge
-=================================
-
-**If you do not want to read the following wall of text, no matter its relevance for helping get your issue resolved quickly, please refer to the [Forge Forums](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/) for support.**
-
-Before reporting an issue on this repository's bug tracker, please carefully read this document. There are various resources that are more likely to be able to help you with certain kinds of issues. This document provides instructions on how to determine which place best to report to.
-
-*Note: While this guide generally is more geared towards end-user problems, modders should also read it before reporting any issue with Forge in order to ensure it actually is one. This does of course not cover feature suggestions.*
-
-### Contents
-
- 1. [Identifying the Source of a Problem](#identifying-the-source-of-a-problem)
-    1. [Analyzing a Stacktrace](#analyzing-a-stacktrace)
-    2. [Isolating an Issue](#isolating-an-issue)
- 2. [Choosing the Correct Support Channel](#choosing-the-correct-support-channel)
-    1. [Forge Support](#forge-support)
-    2. [Mod Support](#mod-support)
-    3. [Vanilla Support](#vanilla-support)
- 3. [Writing a Helpful Bug Report](#writing-a-helpful-bug-report)
-    1. [Preventing Duplicates and Unnecessary Reports](#preventing-duplicates-and-unnecessary-reports)
-    2. [Required Information](#required-information)
-    3. [Markdown Issue Template](#markdown-issue-template)
-    4. [Waiting for an Issue to Be Resolved](#waiting-for-an-issue-to-be-resolved)
-
-Identifying the Source of a Problem
------------------------------------
-
-You're most likely to get fast and valuable responses to your issues if you report them in the correct place. For this, you need to find the root cause of the problem.
-
-The most important source for this information are the log files Forge creates for every run of the game. You can find them in the `logs` subdirectory of your Minecraft game directory. The most important log file is `latest.log` which contains all of Forge's and any mod's output for `info` of above. `debug.log` contains all the logs in `latest.log` plus the `debug` logs for more detailed debugging.
-
-If you're faced by a crash, consult these logs files first. Near the end of the log should be a section labelled 'Minecraft Crash Report', and after it, one about `a detailed walkthrough of the error, ...`. In these sections, you'll see a bunch of lines that look like
-
-```
-at some.words.related.to.a.mod.MoreWords(MoreWords.java:number)
-```
-
-These lines are the most important part of a crash log, called the stacktrace, because they pinpoint the place in the code where something went irrecoverably wrong. Mod authors usually name their code so that these lines describe what the game was doing when it crashed. The further down one of these lines is, the earlier that piece of code ran, so at the bottom you'll see the place where Minecraft started, and at the top is where it stopped. You should use this information to figure out who to report the bug to.
-
-### Analyzing a Stacktrace
-
-You can generally tell pretty quickly what caused the error at the head of your stacktrace, simply follow these rules:
-
- 1. If you can find the name of a mod in the trace, that mod most likely is the culprit.
-    - Be aware that you may find multiple mods as participants of a crash. In that case, you can either report to both or try to reason (using the names in the stacktrace) about which mod is at fault.
- 2. If you can only find Forge (usually starting with `net.minecraftforge`) alongside Vanilla (usually starting with `net.minecraft`) references, chances are that you have found a bug in Forge. In this case, use one of the various [support channels](#forge-support) listed below.
-    - The occurence of a single call to Forge somewhere in the stacktrace *does not* warrant a report to Forge if there are mods present in the crash report.
- 3. If there's no mention of Forge or a mod, but any Vanilla class, you might have found a Vanilla bug. You should probably still report it via the Forge channels first, however, due the nature of modded environments and the rarity of Vanilla crash bugs.
- 4. Always check whether there's a mention of coremods at the beginning of a crash report. If there is and you can't find any clear culprit, consider reporting to these coremods first, since they are free to change any of the code executed in your environment.
-
-The rules are numbered in decreasing priority, which means that you should always prefer finding a mod in a crash report over directly jumping to conclusions about Forge or even Vanilla.
-
-### Isolating an Issue
-
-A significant step of reporting an issue, after having found the involved parties, is reliably reproducing it to identify potential incompatibilities or weird interactions between mods. If you're unable to pinpoint a bug to a set of mods and just randomly report it to any mod, chances are it won't get much attention and hence not a fix.
-
-Reliable methods of isolating the issue are listed below:
-
- - **Retrace your last steps before the crash/bug occurred.** It might sound too simple, but a big part of reliably reproducing an issue is determining the steps required to trigger it. If you can't exactly remember what you last did, looking at the stacktrace again can also help you a bit, since there are often descriptive names in there which reflect an action you could take, such as using an item or placing a block.
- - **Reduce the number of mod interactions.** You can achieve this in multiple ways. One of them is simply disabling any compatibility layers between involved mods via configuration files. The other one, which takes a little more effort, is actually removing mods from your instance. But don't be afraid, you won't have to remove mods one-by-one if you follow these steps (known as a binary search):
-   1. Move half the mods out of your instance (obviously keep those definitely participating in the issue).
-   2. If the issue persists after another try of reproducing it, repeat from step 1 one by halving the mod list again.
-   3. If the issue does not occur anymore without the other half, repeat from step 1 but instead discard the half you just used and split the other one (plus any definitely required mods).
-   4. Repeat these steps until you can't remove any more mods from your instance without also 'solving' the issue. This set of mods can serve as a basis for your issue report.
-
-Choosing the Correct Support Channel
--------------------------------------
-
-The place you need to report issues to varies depending on the source of the problem. Below you can find a list of support channels you can usually consult for each of the sources listed in the previous section.
-
-Please note that this list has to be considered incomplete as there is a large number of sub-communities within the Minecraft modding world. You should always prefer channels you know and have access to over any of those listed below which would require extra effort on your part.
-
-### Forge Support
-
-If you're certain you've found an issue that is directly caused by Forge, you have the following three platforms available for dealing with it, with decreasing relevance for end-users:
-
- 1. **Forge Forums:** There's a dedicated [Support & Bug Report](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/) section on the Forge forums, which is led by team of moderators and volunteers who will try to deal with your reports as quickly as possible. *As a player you should probably report here first.*
-   - For modders, there also is a separate [Modder Support](http://www.minecraftforge.net/forum/forum/70-modder-support/) section where you can ask all your development-related questions. *You should prefer this section for coding help.*
- 2. **Forge Discord Server:** You can find a lot of help on the official [Discord Server](https://discord.gg/forge), especially smaller issues that you quickly need help with. *Be aware that the channel is more suited towards development questions, so while you may get support there as a player, you should almost always prefer the forums.*
- 3. **Forge Issue Tracker:** If you're absolutely certain that you've found an issue in the Forge codebase (e.g. you're a modder yourself and have analyzed the stacktrace and relevant code), don't refrain from reporting it on this repository's [issue tracker](https://github.com/MinecraftForge/MinecraftForge/issues). *Please do not use the issues as a means of getting coding help. For developers, the IRC and the [official documentation](https://mcforge.readthedocs.io) are the best sources of information.*
-
-### Mod Support
-
-A lot of mods also use GitHub or other source management systems and their integrated issue trackers. The following options will give you the best chances of reporting your issue in the right place:
-
- - **CurseForge:** Many mods are hosted on the [CurseForge platform](https://minecraft.curseforge.com) nowadays. Chances are you already downloaded them from there or as a part of a modpack hosted there. Projects may specify an issue reporting link on their own page, so simply look for it on the mod's project page and you should be directed to the preferred means of error reporting.
- - **Modrinth:** Some modders use [Modrinth](https://modrinth.com/mods) to host their mods, but be mindful that not all mods on this platform are for the Forge modloader.
- - **Searching for a repository directly:** You may need to try and find a repository directly on source control sites. The most common ones are [GitHub](https://github.com), [GitLab](https://gitlab.com), and [BitBucket](https://bitbucket.org). Both come with search capabilities, so simply try to search for the mod's name.
-
-### Vanilla Support
-
-Just like Forge or mods, Mojang has its own issue tracker for Vanilla Minecraft. This official [bug tracker](https://bugs.mojang.com/projects/MC/issues/) has the exclusive purpose of managing any concrete issues with the game's code and functionality. It is *not* a place for requesting any features or getting help with playing the game, similar to the Forge issue tracker.
-
-Writing a Helpful Bug Report
-----------------------------
-
-Now that you've identified the source of your issue and decided on the correct support channel, it's time to actually write your report. Before you actually try to blindly create it, however, you should first check if the problem was noticed or even fixed already.
-
-### Preventing Duplicates and Unnecessary Reports
-Use the target issue tracker's search functionality to look for issues which have descriptions similar to yours, but make sure to also search for already closed issues. If you can find one, verify it is in fact the same (or a very similar issue) and simply comment on it if you have anything else to contribute to the discussion, such as other steps to reproduce it. *Do not create duplicates of an existing issue, since it only puts extra effort on maintainers to recognize and close/mark them.*
-
-Additionally, always check the *latest* changelogs of Forge and participating mods to find out if the bug was already noticed and fixed by the developer. Often the maintainer may only support newer versions of the game, so also check the changelogs for versions of Minecraft you don't actually actively play. If the issue was adressed already, *do not report it*, even if the fix only exists for a newer version of the game, since the developer probably had a good reason to do so. If your issue only exists with versions of a mod that are for very old versions of the game, also refrain from reporting them, considering most modders only support the two latest versions of Minecraft, if at all.
-
-### Required Information
-If you're certain that your issue went unnoticed up until now, you can get to actually writing up the report. Below you can find a list of the *required* information any bug report should contain:
-
- - **Minecraft Version:** Although many developers can deduce the Minecraft version in use from the mod's version, it is still an important piece of information to include, since it helps maintainers more easily decide whether to look into your issue at all or whether to close it right away due to being for an outdated version.
- - **Forge Version:** The Forge API is in constant flux and while breaking changes are limited to major Minecraft updates, new bugs or regressions might creep in during active development or newer versions than a mod was built with might change semantics slightly that manifest themselves for this mod.
- - **Mod Version:** Just like the Forge and Minecraft version, this is crucial for quickly telling where an issue might come from. *If you're reporting an issue caused by Forge that only occurs with a certain mod installed, include this mod here. No mod version is required if it's a pure Forge bug.*
- - **Complete List of Mods:** In order to reliably analyze a bug, developers need the exact same context as you do when trying to find its cause. Hence, you should always include a *full list of mods with their corresponding version* in your report. Note that you should probably only include the ones you found by [isolating the issue](#isolating-an-issue).
- - **Steps to Reproduce:** You should always include a list of steps required to provoke an issue to occur. Without it, developers can only take rough guesses at what might cause the bug. Try to reduce the amount of steps to a bare minimum, to make reproducing the issue easier. If you require a sophisticated setup to get even close to the issue, you might want to consider including your save file in your report.
- - **Full Log:** This is probably the most important part of your bug report. You *always* have to include the full log (`debug.log` from earlier), since it is the only way of telling what has caused an issue in code. *Do not* paste the full log as plain text in your report, but use [GitHub Gist](https://gist.github.com) instead and link to that from your report.
-
-### Markdown Issue Template
-GitHub and BitBucket allow you to use the Markdown format for writing your issues. Below you can find a simple template that you can copy and fill in with your data. `{variables}` are written in braces and are supposed to be replaced by you with the information the variable name indicates. Everything behind two slashes (`//`) has to be interpreted as a comment and should be removed. If you want to include any link, you have to write in the `[title](url)` form. For further information on Markdown, see [this cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
-
-```markdown
-**Minecraft Version:** {mc version}
-
-**Forge Version:** {forge version}
-
-**Mod Version:** {mod version} // Remove this line if you're reporting to Forge and no specific mod is involved
-
-[**Full Log**]({link to gist/pastebin with full log})
-
-**Mods in This Instance:**
-| Name                     | Version     |
-| ------------------------ | ----------- |
-| [{mod 1}]({download 1})  | {version 1} | // The download links are entirely optional
-| {mod 2}                  | {version 2} |
-| {mod 3}                  | {version 3} |
-| ...                      | ...         |
-
-**Steps to Reproduce:**
- 1. Do this
- 2. Then do that
- 3. ...
-```
-
-*Note: The mod list here is formatted as table for easy reading (when displayed) and to look nice in text. Markdown does not care about any alignment of the spaces, so you can simply write individual rows of the table as* `| {mod name} | {version} |` *without having to care about the spacing.*
-
-### Waiting for an Issue to Be Resolved
-After you have written your bug report, it is time to *wait*. Please be *patient* after submitting your issue, since it probably isn't the only one. If there's no response after 5 minutes or even a day of writing it, *do not* try to bump the issue by commenting on it, people *will* read it in due time. The only excuse for bumping a report is if it is a *critical* bug that prevents you from playing the game.
-
-Every project has a different way of dealing with issues, so don't wonder if there's no comment on it, but somebody "labels" it with certain markers. This helps developers to more easily keep track of bugs and priorities. When any further input from you is required, you will be asked specifically. Do not bug anyone through other channels about resolving your issue.
-
-Once your issue is closed, you will know whether it was valid or turned out to be irreproducible. If you included all of the data from above in your report, chances are that the latter won't be the case.

docs/assets/Forge_logo.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="164.072 372.466 294.41 46.56">
-  <g fill="#DFA86A">
-    <path d="M266.16 417.99h10.96v-16.94h17.97v-10.27h-17.97v-7.01h19.06V373.5h-30.02zM337.33 378.7c-2.103-2.057-4.629-3.64-7.51-4.704-2.743-1.015-5.786-1.528-9.041-1.528l-.356.002c-3.362 0-6.503.556-9.338 1.651-2.857 1.106-5.357 2.707-7.434 4.761-2.073 2.052-3.714 4.559-4.877 7.45-1.158 2.876-1.748 6.104-1.748 9.59 0 3.417.59 6.582 1.753 9.403 1.163 2.829 2.807 5.297 4.88 7.329 2.073 2.03 4.572 3.621 7.425 4.724 2.834 1.096 5.975 1.651 9.339 1.651h.023c3.402-.043 6.57-.639 9.42-1.772 2.863-1.142 5.375-2.757 7.465-4.804 2.091-2.051 3.742-4.524 4.91-7.358 1.162-2.823 1.75-5.987 1.75-9.402 0-3.487-.588-6.705-1.748-9.568-1.168-2.874-2.82-5.371-4.913-7.425zm-4.644 16.762c0 1.96-.302 3.782-.896 5.413-.587 1.607-1.42 3.011-2.479 4.167-1.05 1.147-2.335 2.065-3.821 2.728-1.479.656-3.164.99-5.008.99-1.84 0-3.514-.333-4.973-.988-1.47-.662-2.747-1.578-3.799-2.729-1.062-1.156-1.895-2.559-2.479-4.167-.595-1.63-.896-3.451-.896-5.413 0-1.801.298-3.497.887-5.044.584-1.536 1.419-2.894 2.479-4.037 1.048-1.132 2.323-2.03 3.792-2.674 1.465-.642 3.145-.968 4.988-.968 1.848 0 3.539.326 5.025.971 1.481.643 2.766 1.541 3.812 2.671 1.062 1.143 1.896 2.501 2.479 4.036.589 1.548.889 3.245.889 5.044zM376.27 395.65c1.902-2.327 2.867-5.221 2.867-8.603 0-2.614-.508-4.84-1.506-6.613-.997-1.762-2.354-3.188-4.035-4.234-1.603-.995-3.445-1.705-5.482-2.114-1.938-.388-3.969-.583-6.037-.583h-16.021v44.487h10.961v-17.282h2.35l9.447 17.282h13.127l-11.199-18.646c2.262-.728 4.116-1.964 5.528-3.694zm-19.254-12.223h4.426c.844 0 1.73.054 2.636.16.784.094 1.503.283 2.132.568.496.225.888.553 1.193.998.283.415.428 1.031.428 1.836 0 .931-.16 1.643-.459 2.06-.34.472-.771.813-1.32 1.046-.686.289-1.459.477-2.301.554-.975.089-1.963.136-2.938.136h-3.795l-.002-7.358z"/>
-    <path d="M394.82 386.38c1.05-1.132 2.325-2.03 3.793-2.674 1.464-.642 3.144-.968 4.988-.968 1.843 0 3.611.311 5.26.921 1.609.599 2.992 1.449 4.107 2.531l1.314 1.278 8.019-8.105-1.454-1.298c-2.355-2.103-5.066-3.586-8.058-4.407-2.879-.789-5.987-1.189-9.247-1.189-3.361 0-6.503.556-9.339 1.651-2.856 1.106-5.355 2.707-7.431 4.761-2.074 2.052-3.716 4.559-4.88 7.45-1.158 2.876-1.746 6.104-1.746 9.59 0 3.417.59 6.582 1.752 9.403 1.164 2.829 2.807 5.297 4.88 7.329 2.073 2.03 4.572 3.621 7.425 4.724 2.832 1.096 5.975 1.651 9.339 1.651 6.501 0 12.475-1.432 17.751-4.25l.979-.522v-23.814h-19.313v10.27h8.354v6.639c-.871.397-1.834.709-2.881.933-1.5.314-3.127.478-4.83.478-1.841 0-3.514-.333-4.973-.988-1.472-.662-2.748-1.578-3.801-2.729-1.06-1.156-1.893-2.559-2.478-4.167-.595-1.63-.896-3.451-.896-5.413 0-1.801.299-3.497.887-5.044.586-1.54 1.421-2.897 2.479-4.041zM437.69 407.72v-7.36h18.72v-10.27h-18.72v-6.32h19.75V373.5h-30.72v44.49h31.76v-10.27z"/>
-  </g>
-  <path fill="#1E2D41" d="m243.63 379.09-37.842-1.852 46.229-.034v-3.727h-52.125l-.001 7.798v6.201c0 .115-1.52-9.144-1.87-11.734h-4.098v13.029c0 .123-1.753-10.888-1.939-12.264H164.07c1.902 1.648 12.401 10.598 19.865 14.28 3.741 1.846 8.33 1.86 12.414 1.974 2.075.06 4.25.217 5.803 1.754 2.255 2.236 2.758 5.704.814 8.33-1.922 2.594-7.335 3.156-7.335 3.156l-4.509 5.531v6.424h10.251l.319-6.348 8.863-6.285c-.946.757-3.058 2.783-6.229 7.666-.717 1.102-1.275 2.306-1.711 3.49 2.238-1.896 6.84-3.194 12.153-3.194 5.307 0 9.903 1.295 12.146 3.188-.437-1.185-.994-2.385-1.709-3.483-3.172-4.883-5.284-6.909-6.229-7.666l8.863 6.285.32 6.348h9.565v-6.424l-4.507-5.531s-6.675-.425-8.423-3.156c-5.032-7.869 2.115-20.082 18.836-23.756z"/>
-</svg>

fmlcore/build.gradle

@@ -1,73 +0,0 @@
-plugins {
-    id 'com.github.ben-manes.versions'
-    id 'org.javamodularity.moduleplugin' version '1.8.3' apply false
-    id 'org.cadixdev.licenser'
-}
-apply plugin: 'java-library'
-apply plugin: 'jacoco'
-apply plugin: 'org.javamodularity.moduleplugin'
-
-dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) }
-
-dependencies {
-    compileOnly("org.jetbrains:annotations:${JETBRAINS_ANNOTATIONS_VERSION}")
-
-    api("net.minecraftforge:eventbus:${EVENTBUS_VERSION}")
-
-    implementation(project(':fmlloader'))
-    implementation("commons-io:commons-io:${COMMONS_IO_VERSION}")
-}
-
-task sourcesJar(type: Jar) {
-    archiveClassifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-ext {
-    MANIFESTS = [
-        '': [
-            'FMLModType': 'LIBRARY',
-            'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-            'Git-Commit': GIT_INFO.abbreviatedId,
-            'Git-Branch': GIT_INFO.branch,
-            'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}"
-        ] as LinkedHashMap,
-        'net/minecraftforge/fml/loading/': [
-            'Specification-Title':      'FMLLoader',
-            'Specification-Vendor':     'Forge Development LLC',
-            'Specification-Version':    '1',
-            'Implementation-Title':     'FML Loader',
-            'Implementation-Version':   '1.0',
-            'Implementation-Vendor':    'Forge'
-        ] as LinkedHashMap
-    ]
-}
-
-jar.doFirst {
-    MANIFESTS.each { pkg, values ->
-        if (pkg == '')
-            manifest.attributes(values)
-        else
-            manifest.attributes(values, pkg)
-    }
-}
-
-tasks.withType(JavaCompile) {
-    options.compilerArgs << '-Xlint:unchecked'
-}
-
-license {
-    header = rootProject.file('LICENSE-header.txt')
-
-    include 'net/minecraftforge/'
-}
-
-artifacts {
-    archives jar
-    archives sourcesJar
-}
-
-publishing.publications.mavenJava(MavenPublication) {
-    from components.java
-    artifact sourcesJar
-}

fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import cpw.mods.modlauncher.util.ServiceLoaderUtils;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.config.IConfigEvent;
-import net.minecraftforge.fml.loading.FMLLoader;
-
-import java.util.ServiceLoader;
-import java.util.function.Supplier;
-
-public class Bindings {
-    private static final Bindings INSTANCE = new Bindings();
-
-    private final IBindingsProvider provider;
-
-    private Bindings() {
-        final var providers = ServiceLoaderUtils.streamServiceLoader(()->ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class), sce->{}).toList();
-        if (providers.size() != 1) {
-            throw new IllegalStateException("Could not find bindings provider");
-        }
-        this.provider = providers.get(0);
-    }
-
-    public static Supplier<IEventBus> getForgeBus() {
-        return INSTANCE.provider.getForgeBusSupplier();
-    }
-
-    public static Supplier<I18NParser> getMessageParser() {
-        return INSTANCE.provider.getMessageParser();
-    }
-
-    public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
-        return INSTANCE.provider.getConfigConfiguration();
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/CrashReportCallables.java

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.Supplier;
-
-public class CrashReportCallables {
-    private static final List<ISystemReportExtender> crashCallables = Collections.synchronizedList(new ArrayList<>());
-
-    public static void registerCrashCallable(ISystemReportExtender callable)
-    {
-        crashCallables.add(callable);
-    }
-
-    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator) {
-        registerCrashCallable(new ISystemReportExtender() {
-            @Override
-            public String getLabel() {
-                return headerName;
-            }
-            @Override
-            public String get() {
-                return reportGenerator.get();
-            }
-        });
-    }
-
-    public static List<ISystemReportExtender> allCrashCallables() {
-        return List.copyOf(crashCallables);
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/DeferredWorkQueue.java

@@ -1,87 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import static net.minecraftforge.fml.Logging.LOADING;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Supplier;
-
-import com.google.common.base.Stopwatch;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-/**
- * Utility for running code on the main launch thread at the next available
- * opportunity. There is no guaranteed order that work from various mods will be
- * run, but your own work will be run sequentially.
- * <p>
- * <strong>Use of this class after startup is not possible.</strong> At that
- * point, {@code ReentrantBlockableEventLoop} should be used instead.
- * <p>
- * Exceptions from tasks will be handled gracefully, causing a mod loading
- * error. Tasks that take egregiously long times to run will be logged.
- */
-public class DeferredWorkQueue
-{
-    private static final Logger LOGGER = LogManager.getLogger();
-
-    private static final Map<ModLoadingStage, DeferredWorkQueue> workQueues = new HashMap<>();
-
-    private final ConcurrentLinkedDeque<TaskInfo> tasks = new ConcurrentLinkedDeque<>();
-    private final ModLoadingStage modLoadingStage;
-
-    public DeferredWorkQueue(ModLoadingStage modLoadingStage) {
-        this.modLoadingStage = modLoadingStage;
-        workQueues.put(modLoadingStage, this);
-    }
-
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    public static Optional<DeferredWorkQueue> lookup(Optional<ModLoadingStage> parallelClass) {
-        return Optional.ofNullable(workQueues.get(parallelClass.orElse(null)));
-    }
-
-    public void runTasks() {
-        if (tasks.isEmpty()) return;
-        LOGGER.debug(LOADING, "Dispatching synchronous work for work queue {}: {} jobs", modLoadingStage, tasks.size());
-        Stopwatch timer = Stopwatch.createStarted();
-        tasks.forEach(t->makeRunnable(t, Runnable::run));
-        timer.stop();
-        LOGGER.debug(LOADING, "Synchronous work queue completed in {}", timer);
-    }
-
-    private static void makeRunnable(TaskInfo ti, Executor executor) {
-        executor.execute(() -> {
-            Stopwatch timer = Stopwatch.createStarted();
-            ModLoadingContext.get().setActiveContainer(ti.owner);
-            try {
-                ti.task.run();
-            } finally {
-                ModLoadingContext.get().setActiveContainer(null);
-            }
-            timer.stop();
-            if (timer.elapsed(TimeUnit.SECONDS) >= 1) {
-                LOGGER.warn(LOADING, "Mod '{}' took {} to run a deferred task.", ti.owner.getModId(), timer);
-            }
-        });
-    }
-
-    public CompletableFuture<Void> enqueueWork(final ModContainer modInfo, final Runnable work) {
-        return CompletableFuture.runAsync(work, r->tasks.add(new TaskInfo(modInfo, r)));
-    }
-
-    public <T> CompletableFuture<T> enqueueWork(final ModContainer modInfo, final Supplier<T> work) {
-        return CompletableFuture.supplyAsync(work, r->tasks.add(new TaskInfo(modInfo, r)));
-    }
-
-    record TaskInfo(ModContainer owner, Runnable task) {}
-}

fmlcore/src/main/java/net/minecraftforge/fml/DistExecutor.java

@@ -1,262 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.loading.FMLEnvironment;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.Serializable;
-import java.lang.invoke.SerializedLambda;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Objects;
-import java.util.concurrent.Callable;
-import java.util.function.Supplier;
-
-/**
- * Use to execute code conditionally based on sidedness.
- * <ul>
- * <li>When you want to call something on one side and return a result {@link #safeCallWhenOn(Dist, Supplier)}</li>
- * <li>When you want to call one thing on one side, another thing on the other and return a result {@link #safeRunForDist(Supplier, Supplier)}</li>
- * <li>When you want to run something on one side {@link #safeRunWhenOn(Dist, Supplier)}</li>
- * </ul>
- */
-public final class DistExecutor
-{
-    private static final Logger LOGGER = LogManager.getLogger();
-    private DistExecutor() {}
-
-    /**
-     * Run the callable in the supplier only on the specified {@link Dist}.
-     * This method is NOT sided-safe and special care needs to be taken in code using this method that implicit class
-     * loading is not triggered by the Callable.
-     *
-     * This method can cause unexpected ClassNotFound exceptions.
-     *
-     * Use {@link #safeCallWhenOn(Dist, Supplier)} where possible.
-     *
-     * @param dist The dist to run on
-     * @param toRun A supplier of the callable to run (Supplier wrapper to ensure classloading only on the appropriate dist)
-     * @param <T> The return type from the callable
-     * @return The callable's result
-     * @deprecated use {@link #safeCallWhenOn(Dist, Supplier)} instead. This remains for advanced use cases.
-     */
-    @Deprecated
-    public static <T> T callWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
-        return unsafeCallWhenOn(dist, toRun);
-    }
-
-    public static <T> T unsafeCallWhenOn(Dist dist, Supplier<Callable<T>> toRun) {
-        if (dist == FMLEnvironment.dist) {
-            try
-            {
-                return toRun.get().call();
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Call the SafeCallable when on the correct {@link Dist}.
-     *
-     * <strong>The lambda supplied here is required to be a method reference to a method defined in
-     * another class, otherwise an invalid SafeReferent error will be thrown</strong>
-     * @param dist the dist which this will run on
-     * @param toRun the SafeCallable to run and return the result from
-     * @param <T> The type of the SafeCallable
-     * @return the result of the SafeCallable or null if on the wrong side
-     */
-    public static <T> T safeCallWhenOn(Dist dist, Supplier<SafeCallable<T>> toRun) {
-        validateSafeReferent(toRun);
-        return callWhenOn(dist, toRun::get);
-    }
-
-    /**
-     * Runs the supplied Runnable on the speicified side. Same warnings apply as {@link #callWhenOn(Dist, Supplier)}.
-     *
-     * This method can cause unexpected ClassNotFound exceptions.
-     *
-     * @see #callWhenOn(Dist, Supplier)
-     * @param dist Dist to run this code on
-     * @param toRun The code to run
-     * @deprecated use {@link #safeRunWhenOn(Dist, Supplier)} where possible. Advanced uses only.
-     */
-    @Deprecated
-    public static void runWhenOn(Dist dist, Supplier<Runnable> toRun) {
-        unsafeRunWhenOn(dist, toRun);
-    }
-    /**
-     * Runs the supplied Runnable on the speicified side. Same warnings apply as {@link #unsafeCallWhenOn(Dist, Supplier)}.
-     *
-     * This method can cause unexpected ClassNotFoundException problems in common scenarios. Understand the pitfalls of
-     * the way the class verifier works to load classes before using this.
-     *
-     * Use {@link #safeRunWhenOn(Dist, Supplier)} if you can.
-     *
-     * @see #unsafeCallWhenOn(Dist, Supplier)
-     * @param dist Dist to run this code on
-     * @param toRun The code to run
-     */
-    public static void unsafeRunWhenOn(Dist dist, Supplier<Runnable> toRun) {
-        if (dist == FMLEnvironment.dist) {
-            toRun.get().run();
-        }
-    }
-
-    /**
-     * Call the supplied SafeRunnable when on the correct Dist.
-     * @param dist The dist to run on
-     * @param toRun The code to run
-     */
-    public static void safeRunWhenOn(Dist dist, Supplier<SafeRunnable> toRun) {
-        validateSafeReferent(toRun);
-        if (dist == FMLEnvironment.dist)  {
-            toRun.get().run();
-        }
-    }
-    /**
-     * Executes one of the two suppliers, based on which side is active.
-     *
-     * <p>
-     *     Example (replacement for old SidedProxy):<br/>
-     * {@code Proxy p = DistExecutor.runForDist(()->ClientProxy::new, ()->ServerProxy::new);}
-     *
-     * NOTE: the double supplier is required to avoid classloading the secondary target.
-     *
-     * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
-     * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
-     * @param <T> The common type to return
-     * @return The returned instance
-     * @deprecated Use {@link #safeRunForDist(Supplier, Supplier)}
-     */
-    @Deprecated
-    public static <T> T runForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
-        return unsafeRunForDist(clientTarget, serverTarget);
-    }
-
-    /**
-     * Unsafe version of {@link #safeRunForDist(Supplier, Supplier)}. Use only when you know what you're doing
-     * and understand why the verifier can cause unexpected ClassNotFoundException crashes even when code is apparently
-     * not sided. Ensure you test both sides fully to be confident in using this.
-     *
-     * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
-     * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
-     * @param <T> The common type to return
-     * @return The returned instance
-     */
-    public static <T> T unsafeRunForDist(Supplier<Supplier<T>> clientTarget, Supplier<Supplier<T>> serverTarget) {
-        switch (FMLEnvironment.dist)
-        {
-            case CLIENT:
-                return clientTarget.get().get();
-            case DEDICATED_SERVER:
-                return serverTarget.get().get();
-            default:
-                throw new IllegalArgumentException("UNSIDED?");
-        }
-    }
-    /**
-     * Executes one of the two suppliers, based on which side is active.
-     *
-     * <p>
-     *     Example (replacement for old SidedProxy):<br/>
-     * {@code Proxy p = DistExecutor.safeRunForDist(()->ClientProxy::new, ()->ServerProxy::new);}
-     *
-     * NOTE: the double supplier is required to avoid classloading the secondary target.
-     *
-     * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
-     * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
-     * @param <T> The common type to return
-     * @return The returned instance
-     */
-    public static <T> T safeRunForDist(Supplier<SafeSupplier<T>> clientTarget, Supplier<SafeSupplier<T>> serverTarget) {
-        validateSafeReferent(clientTarget);
-        validateSafeReferent(serverTarget);
-        switch (FMLEnvironment.dist)
-        {
-            case CLIENT:
-                return clientTarget.get().get();
-            case DEDICATED_SERVER:
-                return serverTarget.get().get();
-            default:
-                throw new IllegalArgumentException("UNSIDED?");
-        }
-    }
-
-    /**
-     * A safe referent. This will assert that it is being called via a separated class method reference. This will
-     * avoid the common pitfalls of {@link #callWhenOn(Dist, Supplier)} above.
-     *
-     * SafeReferents assert that they are defined as a separate method outside the scope of the calling class.
-     *
-     * <strong>Implementations need to be defined in a separate class to the referring site, with appropriate
-     * visibility to be accessible at the callsite (generally, avoid private methods).</strong>
-     *
-     * <p>
-     * Valid:<br/>
-     *
-     * {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->AnotherClass::clientOnlyMethod);}
-     *
-     * <p>
-     * Invalid:<br/>
-     *
-     * {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->()->Minecraft.getInstance().world);}
-     */
-    public interface SafeReferent {}
-
-    /**
-     * SafeCallable version of {@link SafeReferent}.
-     * @see SafeReferent
-     * @param <T> The return type of the Callable
-     */
-    public interface SafeCallable<T> extends SafeReferent, Callable<T>, Serializable {}
-
-    /**
-     * SafeSupplier version of {@link SafeReferent}
-     * @param <T> The return type of the Supplier
-     */
-    public interface SafeSupplier<T> extends SafeReferent, Supplier<T>, Serializable {}
-
-    /**
-     * SafeRunnable version of {@link SafeReferent}
-     */
-    public interface SafeRunnable extends SafeReferent, Runnable, Serializable {}
-
-    private static final void validateSafeReferent(Supplier<? extends SafeReferent> safeReferentSupplier) {
-        if (FMLEnvironment.production) return;
-        final SafeReferent setter;
-        try {
-            setter = safeReferentSupplier.get();
-        } catch (Exception e) {
-            // Typically a class cast exception, just return out, expected.
-            return;
-        }
-
-        for (Class<?> cl = setter.getClass(); cl != null; cl = cl.getSuperclass()) {
-            try {
-                Method m = cl.getDeclaredMethod("writeReplace");
-                m.setAccessible(true);
-                Object replacement = m.invoke(setter);
-                if (!(replacement instanceof SerializedLambda))
-                    break;// custom interface implementation
-                SerializedLambda l = (SerializedLambda) replacement;
-                if (Objects.equals(l.getCapturingClass(), l.getImplClass())) {
-                    LOGGER.fatal("Detected unsafe referent usage, please view the code at {}",Thread.currentThread().getStackTrace()[3]);
-                    throw new RuntimeException("Unsafe Referent usage found in safe referent method");
-                }
-            } catch (NoSuchMethodException e) {
-            } catch (IllegalAccessException | InvocationTargetException e) {
-                break;
-            }
-        }
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/I18NParser.java

@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-public interface I18NParser {
-    String parseMessage(String i18nMessage, Object... args);
-    String stripControlCodes(String toStrip);
-}

fmlcore/src/main/java/net/minecraftforge/fml/IBindingsProvider.java

@@ -1,17 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.config.IConfigEvent;
-
-import java.util.function.Supplier;
-
-public interface IBindingsProvider {
-    Supplier<IEventBus> getForgeBusSupplier();
-    Supplier<I18NParser> getMessageParser();
-    Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
-}

fmlcore/src/main/java/net/minecraftforge/fml/ICrashCallable.java

@@ -1,5 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-

fmlcore/src/main/java/net/minecraftforge/fml/IExtensionPoint.java

@@ -1,118 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.function.BiPredicate;
-import java.util.function.Supplier;
-
-/**
- * An extension point for a mod container.
- *
- * <p>An extension point can be registered for a mod container using {@link ModContainer#registerExtensionPoint(Class, Supplier)}
- * and retrieved (if present) using {@link ModContainer#getCustomExtension(Class)}. An extension point allows a mod to
- * supply an arbitrary value as a record class to another mod or framework through their mod container class, avoiding
- * the use of {@link InterModComms} or other external frameworks to pass around these values.</p>
- *
- * <p>The usual way to declare an extension point is to implement this interface on a record class, with the type
- * parameter being a reference to the class itself. For example, {@code record MyExtension(...) extends
- * IExtensionPoint<MyExtension>} would declare an extension point which supplies a {@code MyExtension} object. However,
- * there is no hard requirement that an extension point's type parameter must be in reference to itself; the type
- * parameter may reference another record class instead.</p>
- *
- * @param <T> the type of the record which is held by the extension point
- */
-@SuppressWarnings("unused") // Type parameter T
-public interface IExtensionPoint<T extends Record>
-{
-    /**
-     * Extension point for the compatibility display test used on the server selection screen.
-     *
-     * <em>Note: "server" and "client" refers to the {@linkplain net.minecraftforge.api.distmarker.Dist#DEDICATED_SERVER dedicated server}
-     * and {@linkplain net.minecraftforge.api.distmarker.Dist#CLIENT game client} physical distributions, rather than the
-     * {@linkplain LogicalSide logical server and client}.</em>
-     *
-     * <p>The {@link Supplier} provides the local compatibility version, which is sent from the server to the client
-     * for multiplayer connections or stored to disk for the world save. The {@link BiPredicate} accepts the remote
-     * compatibility version and a boolean indicating whether the remote version is from the server or a world save,
-     * where {@code true} means it is from the server and {@code false} means it is from the world save. The return
-     * value of the predicate determines whether the remote version is "compatible" for the purposes of the display test.</p>
-     *
-     * <p>The local compatibility version may be of the value {@link net.minecraftforge.network.NetworkConstants#IGNORESERVERONLY},
-     * in which case clients will ignore the mod's presence if it is present on the server but not on the client.
-     * However, the remote version test predicate must still accept this value as a remote version in order to display
-     * as compatible if the mod is present on the client.</p>
-     *
-     * <p><strong>The compatibility display test does not necessarily indicate the success or failure of an actual
-     * connection attempt.</strong> Factors such as display test extension misconfiguration, truncation of ping data,
-     * difference of registry data or network channels between server and client, and others may cause the result of the
-     * compatibility test to not reflect the actual likelihood of a connection successfully being established between
-     * the server and the client.</p>
-     *
-     * <p>An example declaration of a display test extension registration for a regular mod (requires to be present on
-     * server and client) is as follows:</p>
-     * <pre>{@code
-     * String compatibilityVersion = "1"; // Could be linked with a network channel version or mod version
-     * ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class,
-     *         () -> new IExtensionPoint.DisplayTest(
-     *                 () -> compatibilityVersion,
-     *                 (remoteVersion, isFromServer) -> remoteVersion.equals(compatibilityVersion)
-     *         )
-     * );
-     * }</pre>
-     *
-     * <p>An example declaration of a display test extension registration for a <em>server-side-only</em> mod (does not
-     * require to be present on the client) is as follows:</p>
-     * <pre>{@code
-     * ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class,
-     *         () -> new IExtensionPoint.DisplayTest(
-     *                 // Ignore this mod if not present on the client
-     *                 () -> NetworkConstants.IGNORESERVERONLY,
-     *                 // If present on the client, accept any version if from a server
-     *                 (remoteVersion, isFromServer) -> isFromServer
-     *         )
-     * );
-     * }</pre>
-     *
-     * <p>An example declaration of a display test extension registration for a <em>client-side-only</em> mod (does not
-     * require to be present on the server) is as follows:</p>
-     * <pre>{@code
-     * ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class,
-     *         () -> new IExtensionPoint.DisplayTest(
-     *                 // Send any version from server to client, since we will be accepting any version as well
-     *                 () -> "dQw4w9WgXcQ",
-     *                 // Accept any version on the client, from server or from save
-     *                 (remoteVersion, isFromServer) -> true
-     *         )
-     * );
-     * }</pre>
-     *
-     * @see net.minecraftforge.network.ServerStatusPing
-     * @see net.minecraftforge.client.ForgeHooksClient#processForgeListPingData(net.minecraft.network.protocol.status.ServerStatus, net.minecraft.client.multiplayer.ServerData)
-     */
-    @SuppressWarnings("JavadocReference") // reference to NetworkConstants, ForgeHooksClient
-    record DisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) implements IExtensionPoint<DisplayTest> {
-        public static final String IGNORESERVERONLY = "OHNOES\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31\uD83D\uDE31";
-
-        /**
-         * Ignores any version information coming from the server - use for server only mods
-         */
-        public static final Supplier<DisplayTest> IGNORE_SERVER_VERSION = () -> new DisplayTest(IGNORESERVERONLY, (remoteVersion, isFromServer) -> true);
-
-        /**
-         * Ignores all information and provides no information
-         */
-        public static final Supplier<DisplayTest> IGNORE_ALL_VERSION = () -> new DisplayTest("", (remoteVersion, isFromServer) -> true);
-
-        /**
-         * An optional alternative to {@link #DisplayTest(Supplier, BiPredicate)} which accepts a constant version string
-         * instead of a {@link Supplier}.
-         * <p>Internally, the provided version string is wrapped in a Supplier for you.</p>
-         */
-        public DisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
-            this(() -> version, remoteVersionTest);
-        }
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/IModLoadingState.java

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-/**
- * A mod loading state. During mod loading, the mod loader transitions between states in a defined sorted list of states,
- * grouped into various {@link ModLoadingPhase phases}.
- *
- * @see IModStateProvider
- */
-public interface IModLoadingState {
-    /**
-     * {@return the name of this state}
-     */
-    String name();
-
-    /**
-     * {@return the name of the state immediately previous to this state} This may be a blank name, which indicates this
-     * is either the first mod loading state or an exceptional mod loading state (such as a situation where errors
-     * prevent the loading process from continuing normally).
-     */
-    String previous();
-
-    /**
-     * {@return the mod loading phase this state belongs to} For exceptional mod loading states, this should be
-     * {@link ModLoadingPhase#ERROR}.
-     */
-    ModLoadingPhase phase();
-
-    /**
-     * {@return a function returning a human-friendly message for this state}
-     */
-    Function<ModList, String> message();
-
-    /**
-     * {@return an optional runnable, which runs before starting the transition from this state to the next}
-     * @see #buildTransition(Executor, Executor, Function, Function)
-     */
-    Optional<Consumer<ModList>> inlineRunnable();
-
-    /**
-     * Builds the transition task for this state with a blank pre-sync and post-sync task.
-     *
-     * @param syncExecutor a synchronous executor
-     * @param parallelExecutor a parallel executor
-     * @param <T> a type of event fired on the mod-specific event bus
-     * @return a transition task for this state
-     * @see #buildTransition(Executor, Executor, Function, Function)
-     */
-    default <T extends Event & IModBusEvent>
-    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor) {
-        return buildTransition(syncExecutor, parallelExecutor,
-                e -> CompletableFuture.runAsync(() -> {}, e),
-                e -> CompletableFuture.runAsync(() -> {}, e));
-    }
-
-    /**
-     * Builds the transition task for this state. The pre-sync and post-sync task functions allow the transition builder
-     * to run these tasks on the same executor as the actual event dispatch and pre/post hooks.
-     *
-     * @param syncExecutor a synchronous executor
-     * @param parallelExecutor a parallel executor
-     * @param preSyncTask a function which returns a task to run before event pre-dispatch hook
-     * @param postSyncTask a function which returns a task to run after event post-dispatch hook
-     * @param <T> a type of event fired on the mod-specific event bus
-     * @return a transition task for this state
-     */
-    <T extends Event & IModBusEvent>
-    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor,
-                                                      final Function<Executor, CompletableFuture<Void>> preSyncTask,
-                                                      final Function<Executor, CompletableFuture<Void>> postSyncTask);
-}

fmlcore/src/main/java/net/minecraftforge/fml/IModStateProvider.java

@@ -1,21 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.List;
-
-/**
- * Provides a list of mod loading states which the mod loader may transition between.
- *
- * <p>There may be multiple mod state providers in a single application, where all states from each provider is
- * combined into a single list and ordered.</p>
- */
-public interface IModStateProvider {
-    /**
-     * {@return the list of mod loading states known to this provider}
-     */
-    List<IModLoadingState> getAllStates();
-}

fmlcore/src/main/java/net/minecraftforge/fml/IModStateTransition.java

@@ -1,112 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-@SuppressWarnings("unchecked")
-public interface IModStateTransition {
-    static IModStateTransition buildNoopTransition() {
-        return new NoopTransition();
-    }
-
-    default <T extends Event & IModBusEvent>
-    CompletableFuture<Void> build(final Executor syncExecutor,
-                                  final Executor parallelExecutor,
-                                  final Function<Executor, CompletableFuture<Void>> preSyncTask,
-                                  final Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        List<CompletableFuture<Void>> futures = new ArrayList<>();
-
-        this.eventFunctionStream().get()
-                .map(f -> (EventGenerator<T>) f)
-                .reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, head, ModLoadingStage::currentState, tail))
-                .ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, last, nextModLoadingStage(), null));
-
-        final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
-        final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::completableFutureFromExceptionList);
-        final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
-                .thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
-                .thenApply(r -> {
-                    postSyncTask.apply(syncExecutor);
-                    return null;
-                });
-        return this.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
-    }
-
-    default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
-        return ModLoadingStage::nextState;
-    }
-
-    private <T extends Event & IModBusEvent>
-    EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor,
-                                                             final Executor parallelExecutor,
-                                                             final List<CompletableFuture<Void>> completableFutures,
-                                                             final EventGenerator<T> eventGenerator,
-                                                             final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState,
-                                                             final EventGenerator<T> nextGenerator) {
-        final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
-
-        var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
-        completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator));
-
-        completableFutures.add(ModList.get().futureVisitor(eventGenerator, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
-
-        var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
-        completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));
-
-        return nextGenerator;
-    }
-
-    Supplier<Stream<EventGenerator<?>>> eventFunctionStream();
-    ThreadSelector threadSelector();
-    BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook();
-    BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook();
-
-    interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
-        static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
-            return fn::apply;
-        }
-    }
-}
-
-record NoopTransition() implements IModStateTransition {
-
-    @Override
-    public Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
-        return Stream::of;
-    }
-
-    @Override
-    public ThreadSelector threadSelector() {
-        return ThreadSelector.SYNC;
-    }
-
-    @Override
-    public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
-        return (e, t) -> t.thenApplyAsync(Function.identity(), e);
-    }
-
-    @Override
-    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() {
-        return (t, f)-> CompletableFuture.completedFuture(null);
-    }
-
-    @Override
-    public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() {
-        return (t, f)-> CompletableFuture.completedFuture(null);
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ISystemReportExtender.java

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.function.Supplier;
-
-public interface ISystemReportExtender extends Supplier<String>
-{
-    String getLabel();
-}

fmlcore/src/main/java/net/minecraftforge/fml/InterModComms.java

@@ -1,164 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-
-import java.util.Iterator;
-import java.util.Spliterator;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-public class InterModComms
-{
-    public record IMCMessage(String senderModId, String modId, String method, Supplier<?> messageSupplier) {
-
-        /**
-         * Deprecated: use {@link #senderModId()}
-         * @return The modid of the sender. This is supplied by the caller, or by the active mod container context.
-         * Consider it unreliable.
-         */
-        @Deprecated
-        public final String getSenderModId() {
-            return this.senderModId;
-        }
-
-        /**
-         * Deprecated: use {@link #modId()}
-         * @return The modid being sent to.
-         */
-        @Deprecated
-        public final String getModId() {
-            return this.modId;
-        }
-
-        /**
-         * Deprecated: use {@link #method()}
-         * @return The method being sent to.
-         */
-        @Deprecated
-        public final String getMethod() {
-            return this.method;
-        }
-
-        /**
-         * @param <T> The type of the message.
-         * @return A {@link Supplier} of the message.
-         * Use {@link #messageSupplier()}
-         */
-        @SuppressWarnings("unchecked")
-        @Deprecated
-        public final <T> Supplier<T> getMessageSupplier() {
-            return (Supplier<T>) this.messageSupplier;
-        }
-    }
-
-    private static ConcurrentMap<String, ConcurrentLinkedQueue<IMCMessage>> containerQueues = new ConcurrentHashMap<>();
-
-    /**
-     * Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
-     *
-     * @param modId the mod id to send to
-     * @param method the method name to send
-     * @param thing the thing associated with the method name
-     * @return true if the message was enqueued for sending (the target modid is loaded)
-     */
-    public static boolean sendTo(final String modId, final String method, final Supplier<?> thing) {
-        if (!ModList.get().isLoaded(modId)) return false;
-        containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(ModLoadingContext.get().getActiveContainer().getModId(), modId, method, thing));
-        return true;
-    }
-
-    /**
-     * Send IMC to remote.
-     *
-     * @param senderModId the mod id you are sending from
-     * @param modId the mod id to send to
-     * @param method the method name to send
-     * @param thing the thing associated with the method name
-     * @return true if the message was enqueued for sending (the target modid is loaded)
-     */
-    public static boolean sendTo(final String senderModId, final String modId, final String method, final Supplier<?> thing) {
-        if (!ModList.get().isLoaded(modId)) return false;
-        containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(senderModId, modId, method, thing));
-        return true;
-    }
-
-    /**
-     * Retrieve pending messages for your modid. Use the predicate to filter the method name.
-     *
-     * @param modId the modid you are querying for
-     * @param methodMatcher a predicate for the method you are interested in
-     * @return All messages passing the supplied method predicate
-     */
-    public static Stream<IMCMessage> getMessages(final String modId, final Predicate<String> methodMatcher) {
-        ConcurrentLinkedQueue<IMCMessage> queue = containerQueues.get(modId);
-        if (queue == null) return Stream.empty();
-        return StreamSupport.stream(new QueueFilteringSpliterator(queue, methodMatcher), false);
-    }
-
-    /**
-     * Retrieve all message for your modid.
-     *
-     * @param modId the modid you are querying for
-     * @return All messages
-     */
-    public static Stream<IMCMessage> getMessages(final String modId) {
-        return getMessages(modId, s->Boolean.TRUE);
-    }
-
-    private static class QueueFilteringSpliterator implements Spliterator<IMCMessage>
-    {
-        private final ConcurrentLinkedQueue<IMCMessage> queue;
-        private final Predicate<String> methodFilter;
-        private final Iterator<IMCMessage> iterator;
-
-        public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
-            this.queue = queue;
-            this.iterator = queue.iterator();
-            this.methodFilter = methodFilter;
-        }
-
-        @Override
-        public int characteristics() {
-            return Spliterator.CONCURRENT | Spliterator.NONNULL | Spliterator.ORDERED;
-        }
-
-        @Override
-        public long estimateSize() {
-            return queue.size();
-        }
-
-        @Override
-        public boolean tryAdvance(final Consumer<? super IMCMessage> action)
-        {
-            IMCMessage next;
-            do
-            {
-                if (!iterator.hasNext())
-                {
-                    return false;
-                }
-                next = this.iterator.next();
-            }
-            while (!methodFilter.test(next.method));
-            action.accept(next);
-            this.iterator.remove();
-            return true;
-        }
-
-        @Override
-        public Spliterator<IMCMessage> trySplit() {
-            return null;
-        }
-
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/LoadingFailedException.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class LoadingFailedException extends RuntimeException {
-    private final List<ModLoadingException> loadingExceptions;
-
-    public LoadingFailedException(final List<ModLoadingException> loadingExceptions) {
-        this.loadingExceptions = loadingExceptions;
-    }
-
-    public List<ModLoadingException> getErrors() {
-        return this.loadingExceptions;
-    }
-
-    @Override
-    public String getMessage() {
-        return "Loading errors encountered: " + this.loadingExceptions.stream().map(ModLoadingException::getMessage).collect(Collectors.joining(",\n\t", "[\n\t", "\n]"));
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/Logging.java

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.MarkerManager;
-
-public class Logging
-{
-    // Lots of markers
-    public static final Marker CORE = MarkerManager.getMarker("CORE");
-    public static final Marker LOADING = MarkerManager.getMarker("LOADING");
-    public static final Marker SCAN = MarkerManager.getMarker("SCAN");
-    public static final Marker SPLASH = MarkerManager.getMarker("SPLASH");
-    public static final Marker CAPABILITIES = MarkerManager.getMarker("CAPABILITIES");
-    public static final Marker MODELLOADING = MarkerManager.getMarker("MODELLOADING");
-    public static final Marker FORGEMOD = MarkerManager.getMarker("FORGEMOD").addParents(LOADING);
-
-    // --log CORE:+DEBUG,SCAN:-OFF
-    // forge log debug 5
-
-}

fmlcore/src/main/java/net/minecraftforge/fml/LogicalSide.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.api.distmarker.Dist;
-
-/**
- * A logical side of the Minecraft game.
- * <p>
- * The {@linkplain Dist#CLIENT client distribution} has a copy of the logical client and the logical server, while the
- * {@linkplain Dist#DEDICATED_SERVER dedicated server distribution} only holds
- * the logical server.
- *
- * @see Dist
- */
-public enum LogicalSide
-{
-    /**
-     * The logical client of the Minecraft game, which interfaces with the player's inputs and renders the player's
-     * viewpoint.
-     * <p>
-     * The logical client is only shipped with the client distribution of the game.
-     *
-     * @see Dist#CLIENT
-     */
-    CLIENT,
-    /**
-     * The logical server of the Minecraft game, responsible for connecting to clients and running the simulation logic
-     * on the level.
-     * <p>
-     * The logical server is shipped with both client and dedicated server distributions. The client distribution runs
-     * the logical server for singleplayer mode and LAN play.
-     *
-     * @see Dist#DEDICATED_SERVER
-     */
-    SERVER;
-
-    /**
-     * {@return if this logical side is the server}
-     */
-    public boolean isServer()
-    {
-        return !isClient();
-    }
-
-    /**
-     * {@return if the logical side is the client}
-     */
-    public boolean isClient()
-    {
-        return this == CLIENT;
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModContainer.java

@@ -1,188 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.config.IConfigEvent;
-import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.forgespi.language.IModInfo;
-
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.BiFunction;
-import java.util.function.BiPredicate;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-/**
- * The container that wraps around mods in the system.
- * <p>
- * The philosophy is that individual mod implementation technologies should not
- * impact the actual loading and management of mod code. This class provides
- * a mechanism by which we can wrap actual mod code so that the loader and other
- * facilities can treat mods at arms length.
- * </p>
- *
- * @author cpw
- *
- */
-
-public abstract class ModContainer
-{
-    protected final String modId;
-    protected final String namespace;
-    protected final IModInfo modInfo;
-    protected ModLoadingStage modLoadingStage;
-    protected Supplier<?> contextExtension;
-    protected final Map<ModLoadingStage, Runnable> activityMap = new HashMap<>();
-    protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
-    protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
-
-    public ModContainer(IModInfo info)
-    {
-        this.modId = info.getModId();
-        // TODO: Currently not reading namespace from configuration..
-        this.namespace = this.modId;
-        this.modInfo = info;
-        this.modLoadingStage = ModLoadingStage.CONSTRUCT;
-
-        final String displayTestString = info.getConfig().<String>getConfigElement("displayTest").orElse("MATCH_VERSION"); // missing defaults to DEFAULT type
-        Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
-            case "MATCH_VERSION" -> // default displaytest checks for version string match
-                    () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
-                        (incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
-            case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
-                    IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
-            case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
-                    IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION;
-            case "NONE" -> null; // NO display test at all - use this if you're going to do your own display test
-            default -> // any other value throws an exception
-                    throw new IllegalArgumentException("Invalid displayTest value supplied in mods.toml");
-        };
-        if (displayTestSupplier != null)
-            registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTestSupplier);
-        else
-            extensionPoints.remove(IExtensionPoint.DisplayTest.class);
-    }
-
-    /**
-     * Errored container state, used for filtering. Does nothing.
-     */
-    ModContainer()
-    {
-        this.modLoadingStage = ModLoadingStage.ERROR;
-        modId = "BROKEN";
-        namespace = "BROKEN";
-        modInfo = null;
-    }
-    /**
-     * @return the modid for this mod
-     */
-    public final String getModId()
-    {
-        return modId;
-    }
-
-    /**
-     * @return the resource prefix for the mod
-     */
-    public final String getNamespace()
-    {
-        return namespace;
-    }
-
-    /**
-     * @return The current loading stage for this mod
-     */
-    public ModLoadingStage getCurrentState()
-    {
-        return modLoadingStage;
-    }
-
-    public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler(
-            final ModContainer target,
-            final IModStateTransition.EventGenerator<T> eventGenerator,
-            final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChangeHandler,
-            final Executor executor) {
-        return CompletableFuture
-                .runAsync(() -> {
-                    ModLoadingContext.get().setActiveContainer(target);
-                    target.activityMap.getOrDefault(target.modLoadingStage, ()->{}).run();
-                    target.acceptEvent(eventGenerator.apply(target));
-                }, executor)
-                .whenComplete((mc, exception) -> {
-                    target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
-                    ModLoadingContext.get().setActiveContainer(null);
-                });
-    }
-
-    public IModInfo getModInfo()
-    {
-        return modInfo;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T extends Record> Optional<T> getCustomExtension(Class<? extends IExtensionPoint<T>> point) {
-        return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
-    }
-
-    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension)
-    {
-        extensionPoints.put(point, extension);
-    }
-
-    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
-        registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> displayTest);
-    }
-
-    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
-        registerExtensionPoint(IExtensionPoint.DisplayTest.class, displayTest);
-    }
-
-    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
-        registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
-    }
-
-    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
-        registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
-    }
-
-    public void addConfig(final ModConfig modConfig) {
-       configs.put(modConfig.getType(), modConfig);
-    }
-
-    public void dispatchConfigEvent(IConfigEvent event) {
-        configHandler.ifPresent(configHandler->configHandler.accept(event));
-    }
-
-    /**
-     * Does this mod match the supplied mod?
-     *
-     * @param mod to compare
-     * @return if the mod matches
-     */
-    public abstract boolean matches(Object mod);
-
-    /**
-     * @return the mod object instance
-     */
-    public abstract Object getMod();
-
-    /**
-     * Accept an arbitrary event for processing by the mod. Probably posted to an event bus in the lower level container.
-     * @param e Event to accept
-     */
-    protected <T extends Event & IModBusEvent> void acceptEvent(T e) {}
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModList.java

@@ -1,237 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.forgespi.language.IModFileInfo;
-import net.minecraftforge.forgespi.language.IModInfo;
-import net.minecraftforge.forgespi.language.ModFileScanData;
-import net.minecraftforge.fml.loading.moddiscovery.ModFile;
-import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
-import net.minecraftforge.forgespi.locating.IModFile;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ForkJoinWorkerThread;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Master list of all mods - game-side version. This is classloaded in the game scope and
- * can dispatch game level events as a result.
- */
-public class ModList
-{
-    private static Logger LOGGER = LogManager.getLogger();
-    private static ModList INSTANCE;
-    private final List<IModFileInfo> modFiles;
-    private final List<IModInfo> sortedList;
-    private final Map<String, ModFileInfo> fileById;
-    private List<ModContainer> mods;
-    private Map<String, ModContainer> indexedMods;
-    private List<ModFileScanData> modFileScanData;
-    private List<ModContainer> sortedContainers;
-
-    private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
-    {
-        this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).map(ModFileInfo.class::cast).collect(Collectors.toList());
-        this.sortedList = sortedList.stream().
-                map(ModInfo.class::cast).
-                collect(Collectors.toList());
-        this.fileById = this.modFiles.stream().map(IModFileInfo::getMods).flatMap(Collection::stream).
-                map(ModInfo.class::cast).
-                collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
-        CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
-    }
-
-    private String getModContainerState(String modId) {
-        return getModContainerById(modId).map(ModContainer::getCurrentState).map(Object::toString).orElse("NONE");
-    }
-
-    private String fileToLine(IModFile mf) {
-        return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
-                mf.getModInfos().get(0).getDisplayName(),
-                mf.getModInfos().get(0).getModId(),
-                mf.getModInfos().get(0).getVersion(),
-                getModContainerState(mf.getModInfos().get(0).getModId()),
-                ((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
-    }
-    private String crashReport() {
-        return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
-    }
-
-    public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList)
-    {
-        INSTANCE = new ModList(modFiles, sortedList);
-        return INSTANCE;
-    }
-
-    public static ModList get() {
-        return INSTANCE;
-    }
-
-    private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
-        ForkJoinWorkerThread thread = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
-        thread.setName("modloading-worker-" + thread.getPoolIndex());
-        // The default sets it to the SystemClassloader, so copy the current one.
-        thread.setContextClassLoader(Thread.currentThread().getContextClassLoader());
-        return thread;
-    }
-
-    public List<IModFileInfo> getModFiles()
-    {
-        return modFiles;
-    }
-
-    public IModFileInfo getModFileById(String modid)
-    {
-        return this.fileById.get(modid);
-    }
-
-    <T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor(
-            final IModStateTransition.EventGenerator<T> eventGenerator,
-            final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChange) {
-        return executor -> gather(
-                this.mods.stream()
-                .map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, stateChange, executor))
-                .collect(Collectors.toList()))
-            .thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
-    }
-    static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
-        if (t.stream().noneMatch(e->e.getValue()!=null)) {
-            return CompletableFuture.completedFuture(null);
-        } else {
-            final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).collect(Collectors.toList());
-            CompletableFuture<Void> cf = new CompletableFuture<>();
-            final RuntimeException accumulator = new RuntimeException();
-            cf.completeExceptionally(accumulator);
-            throwables.forEach(exception -> {
-                if (exception instanceof CompletionException) {
-                    exception = exception.getCause();
-                }
-                if (exception.getSuppressed().length!=0) {
-                    Arrays.stream(exception.getSuppressed()).forEach(accumulator::addSuppressed);
-                } else {
-                    accumulator.addSuppressed(exception);
-                }
-            });
-            return cf;
-        }
-    }
-
-    static <V> CompletableFuture<List<Map.Entry<V, Throwable>>> gather(List<? extends CompletableFuture<? extends V>> futures) {
-        List<Map.Entry<V, Throwable>> list = new ArrayList<>(futures.size());
-        CompletableFuture<?>[] results = new CompletableFuture[futures.size()];
-        futures.forEach(future -> {
-            int i = list.size();
-            list.add(null);
-            results[i] = future.whenComplete((result, exception) -> list.set(i, new AbstractMap.SimpleImmutableEntry<>(result, exception)));
-        });
-        return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
-    }
-
-    void setLoadedMods(final List<ModContainer> modContainers)
-    {
-        this.mods = modContainers;
-        this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList();
-        this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> Optional<T> getModObjectById(String modId)
-    {
-        return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
-    }
-
-    public Optional<? extends ModContainer> getModContainerById(String modId)
-    {
-        return Optional.ofNullable(this.indexedMods.get(modId));
-    }
-
-    public Optional<? extends ModContainer> getModContainerByObject(Object obj)
-    {
-        return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
-    }
-
-    public List<IModInfo> getMods()
-    {
-        return this.sortedList;
-    }
-
-    public boolean isLoaded(String modTarget)
-    {
-        return this.indexedMods.containsKey(modTarget);
-    }
-
-    public int size()
-    {
-        return mods.size();
-    }
-
-    public List<ModFileScanData> getAllScanData()
-    {
-        if (modFileScanData == null)
-        {
-            modFileScanData = this.sortedList.stream().
-                    map(IModInfo::getOwningFile).
-                    filter(Objects::nonNull).
-                    map(IModFileInfo::getFile).
-                    distinct().
-                    map(IModFile::getScanResult).
-                    collect(Collectors.toList());
-        }
-        return modFileScanData;
-
-    }
-
-    public void forEachModFile(Consumer<IModFile> fileConsumer)
-    {
-        modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
-    }
-
-    public <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) {
-        return modFiles.stream().map(IModFileInfo::getFile).map(function);
-    }
-
-    public void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) {
-        indexedMods.forEach(modContainerConsumer);
-    }
-
-    public void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
-        this.sortedContainers.forEach(containerConsumer);
-    }
-
-    public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
-        return indexedMods.values().stream().map(function);
-    }
-
-    private static class UncaughtModLoadingException extends ModLoadingException {
-        public UncaughtModLoadingException(ModLoadingStage stage, Throwable originalException) {
-            super(null, stage, "fml.modloading.uncaughterror", originalException);
-        }
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java

@@ -1,351 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import com.google.common.collect.ImmutableList;
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.LoadingModList;
-import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
-import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
-import net.minecraftforge.fml.loading.progress.StartupMessageManager;
-import net.minecraftforge.forgespi.language.IModInfo;
-import net.minecraftforge.forgespi.language.IModLanguageProvider;
-import net.minecraftforge.forgespi.locating.ForgeFeature;
-import net.minecraftforge.forgespi.locating.IModFile;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.Executor;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static net.minecraftforge.fml.Logging.CORE;
-import static net.minecraftforge.fml.Logging.LOADING;
-
-/**
- * Loads mods.
- *
- * Dispatch cycle is seen in {@code #loadMods()} and {@code #finishMods()}
- *
- * Overall sequence for loadMods is:
- * <dl>
- *     <dt>CONSTRUCT</dt>
- *     <dd>Constructs the mod instance. Mods can typically setup basic environment such as Event listeners
- *     and Configuration specifications here.</dd>
- *     <dt>Automated dispatches</dt>
- *     <dd>Dispatches automated elements : {@code net.minecraftforge.fml.common.Mod.EventBusSubscriber},
- *     {@code net.minecraftforge.event.RegistryEvent}, {@code net.minecraftforge.common.capabilities.CapabilityInject}
- *     and others</dd>
- *     <dt>CONFIG_LOAD</dt>
- *     <dd>Dispatches ConfigLoadEvent to mods</dd>
- *     <dt>COMMON_SETUP</dt>
- *     <dd>Dispatches {@code net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent} to mods</dd>
- *     <dt>SIDED_SETUP</dt>
- *     <dd>Dispatches {@code net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent} or
- *     {@code net.minecraftforge.fml.event.lifecycle.FMLDedicatedServerSetupEvent} to mods</dd>
- * </dl>
- *
- * Overall sequence for finishMods is:
- * <dl>
- *     <dt>ENQUEUE_IMC</dt>
- *     <dd>Dispatches {@code net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent} to mods,
- *     for enqueuing {@link InterModComms} messages for other mods to receive subsequently</dd>
- *     <dt>PROCESS_IMC</dt>
- *     <dd>Dispatches {@code net.minecraftforge.fml.event.lifecycle.InterModProcessEvent} to mods,
- *     for processing {@link InterModComms} messages received from other mods prior to this event</dd>
- *     <dt>COMPLETE</dt>
- *     <dd>Dispatches {@code net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent} to mods,
- *     and completes the mod loading sequence.</dd>
- * </dl>
- */
-public class ModLoader
-{
-    private static final Logger LOGGER = LogManager.getLogger();
-    private static ModLoader INSTANCE;
-    private final LoadingModList loadingModList;
-
-    private final List<ModLoadingException> loadingExceptions;
-    private final List<ModLoadingWarning> loadingWarnings;
-    private final ModStateManager stateManager;
-    private boolean loadingStateValid;
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private final Optional<Consumer<String>> statusConsumer = StartupMessageManager.modLoaderConsumer();
-    private ModList modList;
-
-    private ModLoader()
-    {
-        INSTANCE = this;
-        this.loadingModList = FMLLoader.getLoadingModList();
-        this.loadingExceptions = FMLLoader.getLoadingModList().getErrors().stream()
-                .flatMap(ModLoadingException::fromEarlyException)
-                .collect(Collectors.toList());
-        this.loadingWarnings = FMLLoader.getLoadingModList().getBrokenFiles().stream()
-                .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
-                .collect(Collectors.toList());
-        FMLLoader.getLoadingModList().getModFiles().stream()
-                .filter(ModFileInfo::missingLicense)
-                .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(thisModInfo -> this.loadingExceptions.stream().map(ModLoadingException::getModInfo).anyMatch(otherInfo -> otherInfo == thisModInfo))) //Ignore files where any other mod already encountered an error
-                .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
-                .forEach(this.loadingExceptions::add);
-        this.stateManager = new ModStateManager();
-        CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
-        CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
-        CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
-        CrashReportCallables.registerCrashCallable("ModLauncher services", this::computeModLauncherServiceList);
-        CrashReportCallables.registerCrashCallable("FML Language Providers", this::computeLanguageList);
-    }
-
-    private String computeLanguageList() {
-        return "\n"+FMLLoader.getLanguageLoadingProvider().applyForEach(lp->lp.name() +"@"+ lp.getClass().getPackage().getImplementationVersion()).collect(Collectors.joining("\n\t\t", "\t\t", ""));
-    }
-
-    private String computeModLauncherServiceList() {
-        final List<Map<String, String>> mods = FMLLoader.modLauncherModList();
-        return "\n"+mods.stream().map(mod->mod.getOrDefault("file","nofile")+
-                " "+mod.getOrDefault("name", "missing")+
-                " "+mod.getOrDefault("type","NOTYPE")+
-                " "+mod.getOrDefault("description", "")).
-                collect(Collectors.joining("\n\t\t","\t\t",""));
-    }
-
-    public static ModLoader get()
-    {
-        return INSTANCE == null ? INSTANCE = new ModLoader() : INSTANCE;
-    }
-
-    /**
-     * Run on the primary starting thread by ClientModLoader and ServerModLoader
-     * @param syncExecutor An executor to run tasks on the main thread
-     * @param parallelExecutor An executor to run tasks on a parallel loading thread pool
-     * @param periodicTask Optional periodic task to perform on the main thread while other activities run
-     */
-    public void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        ForgeFeature.registerFeature("java_version", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.SERVER, System.getProperty("java.version")));
-        loadingStateValid = true;
-        statusConsumer.ifPresent(c->c.accept("Waiting for scan to complete"));
-        FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
-        statusConsumer.ifPresent(c->c.accept("Loading mods"));
-        final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
-                loadingModList.getMods());
-        if (!this.loadingExceptions.isEmpty()) {
-            LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.get(0));
-            modList.setLoadedMods(Collections.emptyList());
-            loadingStateValid = false;
-            throw new LoadingFailedException(loadingExceptions);
-        }
-        statusConsumer.ifPresent(c->c.accept("Validating features"));
-        List<? extends ForgeFeature.Bound> failedBounds = loadingModList.getMods().stream()
-                .map(ModInfo::getForgeFeatures)
-                .flatMap(Collection::stream)
-                .filter(bound -> !ForgeFeature.testFeature(FMLEnvironment.dist, bound))
-                .toList();
-
-        if (!failedBounds.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to validate feature bounds for mods");
-            modList.setLoadedMods(Collections.emptyList());
-            loadingStateValid = false;
-            throw new LoadingFailedException(failedBounds.stream()
-                    .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb.featureName(), fb.featureBound(), ForgeFeature.featureValue(fb)))
-                    .toList());
-        }
-
-        statusConsumer.ifPresent(c->c.accept("Building Mod List"));
-        final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
-                .map(ModFileInfo::getFile)
-                .map(this::buildMods)
-                .<ModContainer>mapMulti(Iterable::forEach)
-                .toList();
-        if (!loadingExceptions.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.get(0));
-            modList.setLoadedMods(Collections.emptyList());
-            loadingStateValid = false;
-            throw new LoadingFailedException(loadingExceptions);
-        }
-        modList.setLoadedMods(modContainers);
-        this.modList = modList;
-        statusConsumer.ifPresent(c->c.accept("Dispatching gathering events"));
-        stateManager.getStates(ModLoadingPhase.GATHER).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
-        statusConsumer.ifPresent(c->c.accept("Gathering phase complete"));
-    }
-
-    public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        statusConsumer.ifPresent(c->c.accept("Performing load phase"));
-        stateManager.getStates(ModLoadingPhase.LOAD).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
-        statusConsumer.ifPresent(c->c.accept("Mod setup complete"));
-    }
-
-    public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        statusConsumer.ifPresent(c->c.accept("Performing completion phase"));
-        stateManager.getStates(ModLoadingPhase.COMPLETE).forEach(mls->dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask));
-        statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
-    }
-
-    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker) {
-        if (!isLoadingStateValid()) {
-            LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
-            return;
-        }
-        statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
-        state.inlineRunnable().ifPresent(a->a.accept(this.modList));
-        state.buildTransition(syncExecutor, parallelExecutor).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
-    }
-
-    private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, Function<Executor, CompletableFuture<Void>> preSyncTask, Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        if (!isLoadingStateValid()) {
-            LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
-            return;
-        }
-        statusConsumer.ifPresent(c->c.accept(state.message().apply(this.modList)));
-        state.inlineRunnable().ifPresent(a->a.accept(this.modList));
-        state.buildTransition(syncExecutor, parallelExecutor, preSyncTask, postSyncTask).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t));
-    }
-
-    private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
-        while (!transition.isDone()) {
-            syncExecutor.drive(ticker);
-        }
-        try {
-            transition.join();
-        } catch (CompletionException e) {
-            loadingStateValid = false;
-            Throwable t = e.getCause();
-            final List<Throwable> notModLoading = Arrays.stream(t.getSuppressed())
-                    .filter(obj -> !(obj instanceof ModLoadingException))
-                    .collect(Collectors.toList());
-            if (!notModLoading.isEmpty()) {
-                LOGGER.fatal("Encountered non-modloading exceptions!", e);
-                throw e;
-            }
-
-            final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
-                    .filter(ModLoadingException.class::isInstance)
-                    .map(ModLoadingException.class::cast)
-                    .collect(Collectors.toList());
-            LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
-            throw new LoadingFailedException(modLoadingExceptions);
-        }
-    }
-
-    private List<ModContainer> buildMods(final IModFile modFile)
-    {
-        final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
-
-        LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
-        final List<ModContainer> containers = modFile.getScanResult().getTargets()
-                .entrySet()
-                .stream()
-                .map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        if (containers.size() != modInfoMap.size()) {
-            LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
-                    modFile.getFilePath(),
-                    containers.size(), containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().collect(Collectors.toList()),
-                    modInfoMap.size(), modInfoMap.values().stream().map(IModInfo::getModId).sorted().collect(Collectors.toList()));
-            loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
-        }
-        // remove errored mod containers
-        return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).collect(Collectors.toList());
-    }
-
-    private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
-        try {
-            final String modId = idToProviderEntry.getKey();
-            final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
-            IModInfo info = Optional.ofNullable(modInfoMap.get(modId)).
-                    // throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
-                    orElseThrow(()->new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingmetadata", null, modId));
-            return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
-        } catch (ModLoadingException mle) {
-            // exceptions are caught and added to the error list for later handling
-            loadingExceptions.add(mle);
-            // return an errored container instance here, because we tried and failed building a container.
-            return new ErroredModContainer();
-        }
-    }
-
-    /**
-     * @return If the current mod loading state is valid. Use if you interact with vanilla systems directly during loading
-     * and don't want to cause extraneous crashes due to trying to do things that aren't possible in a "broken load"
-     */
-    public static boolean isLoadingStateValid() {
-        return get().loadingStateValid;
-    }
-
-    public <T extends Event & IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
-            return;
-        }
-        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(generator.apply(mc)));
-    }
-
-    public <T extends Event & IModBusEvent> void postEvent(T e) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return;
-        }
-        ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
-    }
-    public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return;
-        }
-        ModList.get().forEachModInOrder(mc -> {
-            pre.accept(mc, e);
-            mc.acceptEvent(e);
-            post.accept(mc, e);
-        });
-    }
-
-    public List<ModLoadingWarning> getWarnings()
-    {
-        return ImmutableList.copyOf(this.loadingWarnings);
-    }
-
-    public void addWarning(ModLoadingWarning warning)
-    {
-        this.loadingWarnings.add(warning);
-    }
-
-    private static boolean runningDataGen = false;
-
-    public static boolean isDataGenRunning () {
-        return runningDataGen;
-    }
-
-    private static class ErroredModContainer extends ModContainer {
-        public ErroredModContainer() {
-            super();
-        }
-
-        @Override
-        public boolean matches(final Object mod) {
-            return false;
-        }
-
-        @Override
-        public Object getMod() {
-            return null;
-        }
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java

@@ -1,119 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import com.mojang.logging.LogUtils;
-import net.minecraftforge.fml.config.IConfigSpec;
-import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.loading.FMLLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.function.BiPredicate;
-import java.util.function.Supplier;
-
-public class ModLoadingContext
-{
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
-    private Object languageExtension;
-    private ModLoadingStage stage;
-
-    public static ModLoadingContext get() {
-        return context.get();
-    }
-
-    private ModContainer activeContainer;
-
-    public void setActiveContainer(final ModContainer container) {
-        this.activeContainer = container;
-        this.languageExtension = container == null ? null : container.contextExtension.get();
-    }
-
-    public ModContainer getActiveContainer() {
-        return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
-    }
-
-    public String getActiveNamespace() {
-        return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
-    }
-
-    /**
-     * Register an {@link IExtensionPoint} with the mod container.
-     * @param point The extension point to register
-     * @param extension An extension operator
-     * @param <T> The type signature of the extension operator
-     */
-    public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
-        getActiveContainer().registerExtensionPoint(point, extension);
-    }
-
-    /**
-     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
-     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)}.</p>
-     * @param displayTest The {@link IExtensionPoint.DisplayTest} to register
-     */
-    public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
-        getActiveContainer().registerDisplayTest(() -> displayTest);
-    }
-
-    /**
-     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
-     * <p>A shorthand for registering a DisplayTest supplier with {@link #registerExtensionPoint(Class, Supplier)}.</p>
-     * @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
-     */
-    public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
-        getActiveContainer().registerDisplayTest(displayTest);
-    }
-
-    /**
-     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
-     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
-     * creates the DisplayTest instance for you using the provided parameters.</p>
-     * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
-     */
-    public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
-        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
-    }
-
-    /**
-     * Register a {@link IExtensionPoint.DisplayTest} with the mod container.
-     * <p>A shorthand for registering a DisplayTest with {@link #registerExtensionPoint(Class, Supplier)} that also
-     * creates the DisplayTest instance for you using the provided parameters.</p>
-     * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
-     */
-    public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
-        getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
-    }
-
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
-        if (spec.isEmpty())
-        {
-            // This handles the case where a mod tries to register a config, without any options configured inside it.
-            LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getActiveContainer().getModId());
-            return;
-        }
-
-        getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer()));
-    }
-
-    public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
-        if (spec.isEmpty())
-        {
-            // This handles the case where a mod tries to register a config, without any options configured inside it.
-            LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getActiveContainer().getModId(), fileName);
-            return;
-        }
-
-        getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName));
-    }
-
-
-    @SuppressWarnings("unchecked")
-    public <T> T extension() {
-        return (T)languageExtension;
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingException.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import com.google.common.collect.Streams;
-import net.minecraftforge.fml.loading.EarlyLoadingException;
-import net.minecraftforge.forgespi.language.IModInfo;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
-/**
- * General purpose mod loading error message
- */
-public class ModLoadingException extends RuntimeException
-{
-    private static final long serialVersionUID = 2048947398536935507L;
-    /**
-     * Mod Info for mod with issue
-     */
-    private final IModInfo modInfo;
-    /**
-     * The stage where this error was encountered
-     */
-    private final ModLoadingStage errorStage;
-
-    /**
-     * I18N message to use for display
-     */
-    private final String i18nMessage;
-
-    /**
-     * Context for message display
-     */
-    private final List<Object> context;
-
-    public ModLoadingException(final IModInfo modInfo, final ModLoadingStage errorStage, final String i18nMessage, final Throwable originalException, Object... context) {
-        super("Mod Loading Exception", originalException);
-        this.modInfo = modInfo;
-        this.errorStage = errorStage;
-        this.i18nMessage = i18nMessage;
-        this.context = Arrays.asList(context);
-    }
-
-    static Stream<ModLoadingException> fromEarlyException(final EarlyLoadingException e) {
-        return e.getAllData().stream().map(ed->new ModLoadingException(ed.getModInfo(), ModLoadingStage.VALIDATE, ed.getI18message(), e.getCause(), ed.getArgs()));
-    }
-
-    public String getI18NMessage() {
-        return i18nMessage;
-    }
-
-    public Object[] getContext() {
-        return context.toArray();
-    }
-
-    public String formatToString() {
-        return Bindings.getMessageParser().get().parseMessage(i18nMessage, Streams.concat(Stream.of(modInfo, errorStage, getCause()), context.stream()).toArray());
-    }
-
-    @Override
-    public String getMessage() {
-        return formatToString();
-    }
-
-    public IModInfo getModInfo() {
-        return modInfo;
-    }
-    public String getCleanMessage() {
-        return Bindings.getMessageParser().get().stripControlCodes(formatToString());
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingPhase.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-/**
- * Phases of mod loading, for grouping mod loading states.
- */
-public enum ModLoadingPhase {
-    /**
-     * Special phase for exceptional situations and error handling, where mod loading cannot continue normally.
-     *
-     * <p>There is conventionally only one state with this phase.</p>
-     */
-    ERROR, // Special state for error handling
-    /**
-     * Phase for discovering and gathering mods for loading.
-     */
-    GATHER,
-    /**
-     * Phase for the loading of mods found from mod discovery.
-     *
-     * @see #GATHER
-     */
-    LOAD,
-    /**
-     * Phase after mod loading has completed, for post-loading tasks.
-     *
-     * @see #LOAD
-     */
-    COMPLETE,
-    /**
-     * Marker phase for the last state in the full mod loading process.
-     */
-    DONE
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingStage.java

@@ -1,87 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-/**
- * Mod loading stage of mod containers during the mod loading process. These will have a corresponding {@link ModLoadingState}
- * in the basic mod loading process provided by FML.
- *
- * <p>Each mod loading stage has a global {@link DeferredWorkQueue}, which is populated during the execution of the state
- * associated with this stage and emptied at the end of the state's execution.</p>
- */
-public enum ModLoadingStage
-{
-    /**
-     * Special stage for exceptional situations and error handling.
-     */
-    ERROR,
-    /**
-     * Validation of the mod list.
-     * TODO: figure out where this is used and why this exists instead of CONSTRUCT being the first normal stage
-     */
-    VALIDATE,
-    /**
-     * Default stage of mod containers after construction.
-     */
-    CONSTRUCT,
-    /**
-     * Common (non-side-specific) setup and initialization.
-     */
-    COMMON_SETUP,
-    /**
-     * Side-specific setup and initialization.
-     *
-     * @see net.minecraftforge.api.distmarker.Dist
-     */
-    SIDED_SETUP,
-    /**
-     * Stage for enqueuing {@link net.minecraftforge.fml.InterModComms} messages for later processing.
-     */
-    ENQUEUE_IMC,
-    /**
-     * Stage for processing received messages though {@link net.minecraftforge.fml.InterModComms}.
-     */
-    PROCESS_IMC,
-    /**
-     * Marks the completion of mod loading for this container.
-     */
-    COMPLETE,
-    /**
-     * Marks the completion of the full mod loading process.
-     */
-    DONE;
-
-    private final DeferredWorkQueue deferredWorkQueue;
-
-    ModLoadingStage() {
-        deferredWorkQueue = new DeferredWorkQueue(this);
-    }
-
-    /**
-     * {@return the next stage after this stage, or {@link #ERROR} if the exception is not {@code null}}
-     *
-     * @param exception the exception that occurred during this stage, may be {@code null}
-     */
-    ModLoadingStage nextState(Throwable exception) {
-        return exception != null ? ERROR : values()[this.ordinal()+1];
-    }
-
-    /**
-     * {@return this stage, or {@link #ERROR} if the exception is not {@code null}}
-     *
-     * @param exception the exception that occurred during this stage, may be {@code null}
-     */
-    public ModLoadingStage currentState(Throwable exception) {
-        return exception != null ? ERROR : this;
-    }
-
-    /**
-     * {@return the deferred work queue for this stage}
-     */
-    public DeferredWorkQueue getDeferredWorkQueue() {
-        return deferredWorkQueue;
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingState.java

@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.event.IModBusEvent;
-
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-/**
- * Implementation of the {@link IModLoadingState} interface.
- *
- * @param name           the name of this state
- * @param previous       the name of the state immediately previous to this state
- * @param message        a function returning a human-friendly message for this state
- * @param phase          the mod loading phase this state belongs to
- * @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
- * @param transition     optional state transition information
- */
-public record ModLoadingState(String name, String previous,
-                              Function<ModList, String> message,
-                              ModLoadingPhase phase,
-                              Optional<Consumer<ModList>> inlineRunnable,
-                              Optional<IModStateTransition> transition) implements IModLoadingState {
-    @Override
-    public <T extends Event & IModBusEvent>
-    Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor,
-                                                      final Function<Executor, CompletableFuture<Void>> preSyncTask,
-                                                      final Function<Executor, CompletableFuture<Void>> postSyncTask) {
-        return transition.map(t -> t.build(syncExecutor, parallelExecutor, preSyncTask, postSyncTask));
-    }
-
-    /**
-     * {@return an empty mod loading state} The mod loading state has a blank human-readable message, no inline runnable,
-     * and no state transition information.
-     *
-     * @param name     the name of the state
-     * @param previous the name of the immediately previous state to this state
-     * @param phase    the mod loading phase the state belongs to
-     */
-    public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
-        return new ModLoadingState(name, previous, ml -> "", phase, Optional.empty(), Optional.empty());
-    }
-
-    /**
-     * Returns a mod loading state with state transition information and a default human-friendly message of
-     * {@code Processing transition [name]}.
-     *
-     * @param name       the name of the state
-     * @param previous   the name of the immediately previous state to this state
-     * @param phase      the mod loading phase the state belongs to
-     * @param transition the state transition information
-     * @return a mod loading state with state transition information and a default message
-     */
-    public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
-                                                 final IModStateTransition transition) {
-        return new ModLoadingState(name, previous, ml -> "Processing transition " + name, phase, Optional.empty(), Optional.of(transition));
-    }
-
-    /**
-     * Returns a mod loading state with state transition information and a custom human-friendly message function.
-     *
-     * @param name       the name of the state
-     * @param previous   the name of the immediately previous state to this state
-     * @param message    a function returning a human-friendly message for this state
-     * @param phase      the mod loading phase the state belongs to
-     * @param transition the state transition information
-     * @return a mod loading state with state transition information and a custom message
-     */
-    public static ModLoadingState withTransition(final String name, final String previous,
-                                                 final Function<ModList, String> message, final ModLoadingPhase phase,
-                                                 final IModStateTransition transition) {
-        return new ModLoadingState(name, previous, message, phase, Optional.empty(), Optional.of(transition));
-    }
-
-    /**
-     * Returns a mod loading state with an inline runnable and a default human-friendly message of {@code Processing
-     * work [name]}.
-     *
-     * @param name     the name of the state
-     * @param previous the name of the immediately previous state to this state
-     * @param phase    the mod loading phase the state belongs to
-     * @param inline   an optional runnable, which runs before starting the transition from this state to the next
-     * @return a mod loading state with an inline runnable and default message
-     */
-    public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
-                                             final Consumer<ModList> inline) {
-        return new ModLoadingState(name, previous, ml -> "Processing work " + name, phase, Optional.of(inline), Optional.empty());
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingWarning.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import com.google.common.collect.Streams;
-import net.minecraftforge.forgespi.language.IModInfo;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
-public class ModLoadingWarning
-{
-    /**
-     * Mod Info for mod with warning
-     */
-    private final IModInfo modInfo;
-    /**
-     * The stage where this warning was encountered
-     */
-    private final ModLoadingStage warningStage;
-
-    /**
-     * I18N message to use for display
-     */
-    private final String i18nMessage;
-
-    /**
-     * Context for message display
-     */
-    private final List<Object> context;
-
-    public ModLoadingWarning(final IModInfo modInfo, final ModLoadingStage warningStage, final String i18nMessage, Object... context) {
-        this.modInfo = modInfo;
-        this.warningStage = warningStage;
-        this.i18nMessage = i18nMessage;
-        this.context = Arrays.asList(context);
-    }
-
-    public String formatToString() {
-        return Bindings.getMessageParser().get().parseMessage(i18nMessage, Streams.concat(Stream.of(modInfo, warningStage), context.stream()).toArray());
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModStateManager.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import com.google.common.graph.GraphBuilder;
-import cpw.mods.modlauncher.util.ServiceLoaderUtils;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.toposort.TopologicalSort;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-@SuppressWarnings("UnstableApiUsage")
-public class ModStateManager {
-    static ModStateManager INSTANCE;
-    private final EnumMap<ModLoadingPhase, List<IModLoadingState>> stateMap;
-
-    public ModStateManager() {
-        INSTANCE = this;
-        final var sp = ServiceLoader.load(FMLLoader.getGameLayer(), IModStateProvider.class);
-        this.stateMap = ServiceLoaderUtils.streamWithErrorHandling(sp, sce->{})
-                .map(IModStateProvider::getAllStates)
-                .<IModLoadingState>mapMulti(Iterable::forEach)
-                .collect(Collectors.groupingBy(IModLoadingState::phase, ()->new EnumMap<>(ModLoadingPhase.class), Collectors.toUnmodifiableList()));
-    }
-
-    public List<IModLoadingState> getStates(final ModLoadingPhase phase) {
-        var nodes = stateMap.get(phase);
-        var lookup = nodes.stream().collect(Collectors.toMap(IModLoadingState::name, Function.identity()));
-
-        var graph = GraphBuilder.directed().allowsSelfLoops(false).<IModLoadingState>build();
-        var dummy = ModLoadingState.empty("", "", phase);
-        nodes.forEach(graph::addNode);
-        graph.addNode(dummy);
-        nodes.forEach(n->graph.putEdge(lookup.getOrDefault(n.previous(), dummy), n));
-        return TopologicalSort.topologicalSort(graph, Comparator.comparingInt(nodes::indexOf)).stream().filter(st->st!=dummy).toList();
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ModWorkManager.java

@@ -1,111 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.fml.loading.FMLConfig;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.concurrent.*;
-import java.util.concurrent.locks.LockSupport;
-
-import static net.minecraftforge.fml.Logging.LOADING;
-
-public class ModWorkManager {
-    private static final Logger LOGGER = LogManager.getLogger();
-    private static final long PARK_TIME = TimeUnit.MILLISECONDS.toNanos(1);
-    public interface DrivenExecutor extends Executor {
-        boolean selfDriven();
-        boolean driveOne();
-
-        default void drive(Runnable ticker) {
-            if (!selfDriven()) {
-                while (driveOne()) {
-                    ticker.run();
-                }
-            } else {
-                // park for a bit so other threads can schedule
-                LockSupport.parkNanos(PARK_TIME);
-            }
-        }
-    }
-    private static class SyncExecutor implements DrivenExecutor {
-        private ConcurrentLinkedDeque<Runnable> tasks = new ConcurrentLinkedDeque<>();
-
-        @Override
-        public boolean driveOne() {
-            final Runnable task = tasks.pollFirst();
-            if (task != null) {
-                task.run();
-            }
-            return task != null;
-        }
-
-        @Override
-        public boolean selfDriven() {
-            return false;
-        }
-
-        @Override
-        public void execute(final Runnable command) {
-            tasks.addLast(command);
-        }
-    }
-
-    private static class WrappingExecutor implements DrivenExecutor {
-        private final Executor wrapped;
-
-        public WrappingExecutor(final Executor executor) {
-            this.wrapped = executor;
-        }
-
-        @Override
-        public boolean selfDriven() {
-            return true;
-        }
-
-        @Override
-        public boolean driveOne() {
-            return false;
-        }
-
-        @Override
-        public void execute(final Runnable command) {
-            wrapped.execute(command);
-        }
-    }
-
-    private static SyncExecutor syncExecutor;
-
-    public static DrivenExecutor syncExecutor() {
-        if (syncExecutor == null)
-            syncExecutor = new SyncExecutor();
-        return syncExecutor;
-    }
-
-    public static DrivenExecutor wrappedExecutor(Executor executor) {
-        return new WrappingExecutor(executor);
-    }
-
-    private static ForkJoinPool parallelThreadPool;
-    public static Executor parallelExecutor() {
-        if (parallelThreadPool == null) {
-            final int loadingThreadCount = FMLConfig.loadingThreadCount();
-            LOGGER.debug(LOADING, "Using {} threads for parallel mod-loading", loadingThreadCount);
-            parallelThreadPool = new ForkJoinPool(loadingThreadCount, ModWorkManager::newForkJoinWorkerThread, null, false);
-        }
-        return parallelThreadPool;
-    }
-
-    private static ForkJoinWorkerThread newForkJoinWorkerThread(ForkJoinPool pool) {
-        ForkJoinWorkerThread thread = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
-        thread.setName("modloading-worker-" + thread.getPoolIndex());
-        // The default sets it to the SystemClassloader, so copy the current one.
-        thread.setContextClassLoader(Thread.currentThread().getContextClassLoader());
-        return thread;
-    }
-
-}

fmlcore/src/main/java/net/minecraftforge/fml/OptionalMod.java

@@ -1,227 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-
-public final class OptionalMod<T>
-{
-    private final String modId;
-    private T value;
-    private boolean searched;
-
-    public static <M> OptionalMod<M> of(final String modId) {
-        return new OptionalMod<>(modId);
-    }
-
-    private static OptionalMod<?> EMPTY = new OptionalMod<>(true);
-    private static <T> OptionalMod<T> empty() {
-        @SuppressWarnings("unchecked")
-        OptionalMod<T> t = (OptionalMod<T>) EMPTY;
-        return t;
-    }
-
-    private OptionalMod(boolean searched) {
-        this.searched = searched;
-        this.modId = "";
-    }
-
-    private OptionalMod(String modId)
-    {
-        this.modId = modId;
-    }
-
-    private T getValue()
-    {
-        if (!searched) {
-            this.value = ModList.get().<T>getModObjectById(this.modId).orElse(null);
-            searched = true;
-        }
-        return this.value;
-    }
-
-    /**
-     * If a mod is present in this {@code OptionalMod}, returns the value,
-     * otherwise throws {@code NoSuchElementException}.
-     *
-     * @return the modobject held by this {@code OptionalMod}
-     * @throws NoSuchElementException if there is no modobject present
-     *
-     * @see Optional#isPresent()
-     */
-    public T get() {
-        if (getValue() == null) {
-            throw new NoSuchElementException("No value present");
-        }
-        return getValue();
-    }
-
-    public String getModId() {
-        return this.modId;
-    }
-
-    /**
-     * Return {@code true} if there is a mod object present, otherwise {@code false}.
-     *
-     * @return {@code true} if there is a mod object present, otherwise {@code false}
-     */
-    public boolean isPresent() {
-        return getValue() != null;
-    }
-
-    /**
-     * If a mod object is present, invoke the specified consumer with the object,
-     * otherwise do nothing.
-     *
-     * @param consumer block to be executed if a mod object is present
-     * @throws NullPointerException if mod object is present and {@code consumer} is
-     * null
-     */
-    public void ifPresent(Consumer<? super T> consumer) {
-        if (getValue() != null)
-            consumer.accept(getValue());
-    }
-
-    /**
-     * If a mod object is present, and the mod object matches the given predicate,
-     * return an {@code OptionalMod} describing the value, otherwise return an
-     * empty {@code OptionalMod}.
-     *
-     * @param predicate a predicate to apply to the mod object, if present
-     * @return an {@code OptionalMod} describing the value of this {@code OptionalMod}
-     * if a mod object is present and the mod object matches the given predicate,
-     * otherwise an empty {@code OptionalMod}
-     * @throws NullPointerException if the predicate is null
-     */
-    public OptionalMod<T> filter(Predicate<? super T> predicate) {
-        Objects.requireNonNull(predicate);
-        if (!isPresent())
-            return this;
-        else
-            return predicate.test(getValue()) ? this : empty();
-    }
-
-    /**
-     * If a mod object is present, apply the provided mapping function to it,
-     * and if the result is non-null, return an {@code Optional} describing the
-     * result.  Otherwise return an empty {@code Optional}.
-     *
-     * @apiNote This method supports post-processing on optional values, without
-     * the need to explicitly check for a return status.
-     *
-     * @param <U> The type of the result of the mapping function
-     * @param mapper a mapping function to apply to the mod object, if present
-     * @return an {@code Optional} describing the result of applying a mapping
-     * function to the mod object of this {@code OptionalMod}, if a mod object is present,
-     * otherwise an empty {@code Optional}
-     * @throws NullPointerException if the mapping function is null
-     */
-    public<U> Optional<U> map(Function<? super T, ? extends U> mapper) {
-        Objects.requireNonNull(mapper);
-        if (!isPresent())
-            return Optional.empty();
-        else {
-            return Optional.ofNullable(mapper.apply(getValue()));
-        }
-    }
-
-    /**
-     * If a value is present, apply the provided {@code Optional}-bearing
-     * mapping function to it, return that result, otherwise return an empty
-     * {@code Optional}.  This method is similar to {@link #map(Function)},
-     * but the provided mapper is one whose result is already an {@code Optional},
-     * and if invoked, {@code flatMap} does not wrap it with an additional
-     * {@code Optional}.
-     *
-     * @param <U> The type parameter to the {@code Optional} returned by
-     * @param mapper a mapping function to apply to the mod object, if present
-     *           the mapping function
-     * @return the result of applying an {@code Optional}-bearing mapping
-     * function to the value of this {@code Optional}, if a value is present,
-     * otherwise an empty {@code Optional}
-     * @throws NullPointerException if the mapping function is null or returns
-     * a null result
-     */
-    public<U> Optional<U> flatMap(Function<? super T, Optional<U>> mapper) {
-        Objects.requireNonNull(mapper);
-        if (!isPresent())
-            return Optional.empty();
-        else {
-            return Objects.requireNonNull(mapper.apply(getValue()));
-        }
-    }
-
-    /**
-     * Return the mod object if present, otherwise return {@code other}.
-     *
-     * @param other the mod object to be returned if there is no mod object present, may
-     * be null
-     * @return the mod object, if present, otherwise {@code other}
-     */
-    public T orElse(T other) {
-        return getValue() != null ? getValue() : other;
-    }
-
-    /**
-     * Return the mod object if present, otherwise invoke {@code other} and return
-     * the result of that invocation.
-     *
-     * @param other a {@code Supplier} whose result is returned if no mod object
-     * is present
-     * @return the mod object if present otherwise the result of {@code other.get()}
-     * @throws NullPointerException if mod object is not present and {@code other} is
-     * null
-     */
-    public T orElseGet(Supplier<? extends T> other) {
-        return getValue() != null ? getValue() : other.get();
-    }
-
-    /**
-     * Return the contained mod object, if present, otherwise throw an exception
-     * to be created by the provided supplier.
-     *
-     * @apiNote A method reference to the exception constructor with an empty
-     * argument list can be used as the supplier. For example,
-     * {@code IllegalStateException::new}
-     *
-     * @param <X> Type of the exception to be thrown
-     * @param exceptionSupplier The supplier which will return the exception to
-     * be thrown
-     * @return the present mod object
-     * @throws X if there is no mod object present
-     * @throws NullPointerException if no mod object is present and
-     * {@code exceptionSupplier} is null
-     */
-    public <X extends Throwable> T orElseThrow(Supplier<? extends X> exceptionSupplier) throws X {
-        if (getValue() != null) {
-            return getValue();
-        } else {
-            throw exceptionSupplier.get();
-        }
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) return true;
-        if (obj instanceof OptionalMod) {
-            return Objects.equals(((OptionalMod)obj).modId, modId);
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hashCode(modId);
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/StartupMessageManager.java

@@ -1,23 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-
-public class StartupMessageManager {
-    public static void addModMessage(final String message) {
-        net.minecraftforge.fml.loading.progress.StartupMessageManager.addModMessage(message);
-    }
-
-    public static Optional<Consumer<String>> modLoaderConsumer() {
-        return net.minecraftforge.fml.loading.progress.StartupMessageManager.modLoaderConsumer();
-    }
-
-    public static Optional<Consumer<String>> mcLoaderConsumer() {
-        return net.minecraftforge.fml.loading.progress.StartupMessageManager.mcLoaderConsumer();
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/ThreadSelector.java

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import java.util.concurrent.Executor;
-import java.util.function.BinaryOperator;
-
-public enum ThreadSelector implements BinaryOperator<Executor> {
-    SYNC((sync, parallel) -> sync),
-    PARALLEL((sync, parallel) -> parallel);
-
-    private final BinaryOperator<Executor> selector;
-
-    ThreadSelector(final BinaryOperator<Executor> selector) {
-        this.selector = selector;
-    }
-
-    @Override
-    public Executor apply(final Executor sync, final Executor parallel) {
-        return this.selector.apply(sync, parallel);
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java

@@ -1,284 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import com.google.gson.Gson;
-import net.minecraftforge.fml.loading.FMLConfig;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.forgespi.language.IModInfo;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.maven.artifact.versioning.ComparableVersion;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-import java.util.zip.GZIPInputStream;
-
-import static net.minecraftforge.fml.VersionChecker.Status.*;
-
-public class VersionChecker
-{
-    private static final Logger LOGGER = LogManager.getLogger();
-    private static final int MAX_HTTP_REDIRECTS = Integer.getInteger("http.maxRedirects", 20);
-    private static final int HTTP_TIMEOUT_SECS = Integer.getInteger("http.timeoutSecs", 15);
-
-    public enum Status
-    {
-        PENDING(),
-        FAILED(),
-        UP_TO_DATE(),
-        OUTDATED(3, true),
-        AHEAD(),
-        BETA(),
-        BETA_OUTDATED(6, true);
-
-        final int sheetOffset;
-        final boolean draw, animated;
-
-        Status()
-        {
-            this(0, false, false);
-        }
-
-        Status(int sheetOffset)
-        {
-            this(sheetOffset, true, false);
-        }
-
-        Status(int sheetOffset, boolean animated)
-        {
-            this(sheetOffset, true, animated);
-        }
-
-        Status(int sheetOffset, boolean draw, boolean animated)
-        {
-            this.sheetOffset = sheetOffset;
-            this.draw = draw;
-            this.animated = animated;
-        }
-
-        public int getSheetOffset()
-        {
-            return sheetOffset;
-        }
-
-        public boolean shouldDraw()
-        {
-            return draw;
-        }
-
-        public boolean isAnimated()
-        {
-            return animated;
-        }
-
-    }
-
-    public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
-
-    public static void startVersionCheck()
-    {
-        new Thread("Forge Version Check")
-        {
-            private HttpClient client;
-
-            @Override
-            public void run()
-            {
-                if (!FMLConfig.runVersionCheck())
-                {
-                    LOGGER.info("Global Forge version check system disabled, no further processing.");
-                    return;
-                }
-
-                client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS)).build();
-                gatherMods().forEach(this::process);
-            }
-
-            /**
-             * Returns the response body as a String for the given URL while following redirects
-             */
-            private String openUrlString(URL url, IModInfo mod) throws IOException, URISyntaxException, InterruptedException {
-                URL currentUrl = url;
-
-                final StringBuilder sb = new StringBuilder();
-                sb.append("Java-http-client/").append(System.getProperty("java.version")).append(' ');
-                sb.append("MinecraftForge/").append(FMLLoader.versionInfo().mcAndForgeVersion()).append(' ');
-                sb.append(mod.getModId()).append('/').append(mod.getVersion());
-                final String userAgent = sb.toString();
-
-                for (int redirects = 0; redirects < MAX_HTTP_REDIRECTS; redirects++)
-                {
-                    var request = HttpRequest.newBuilder()
-                            .uri(currentUrl.toURI())
-                            .timeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS))
-                            .setHeader("Accept-Encoding", "gzip")
-                            .setHeader("User-Agent", userAgent)
-                            .GET()
-                            .build();
-
-                    final HttpResponse<InputStream> response = client.send(request, HttpResponse.BodyHandlers.ofInputStream());
-
-                    int responseCode = response.statusCode();
-                    if (responseCode >= 300 && responseCode <= 399)
-                    {
-                        String newLocation = response.headers().firstValue("Location")
-                                .orElseThrow(() -> new IOException("Got a 3xx response code but Location header was null while trying to fetch " + url));
-                        currentUrl = new URL(currentUrl, newLocation);
-                        continue;
-                    }
-
-                    final boolean isGzipEncoded = response.headers().firstValue("Content-Encoding").orElse("").equals("gzip");
-
-                    final String bodyStr;
-                    try (InputStream inStream = isGzipEncoded ? new GZIPInputStream(response.body()) : response.body())
-                    {
-                        try (var bufferedReader = new BufferedReader(new InputStreamReader(inStream)))
-                        {
-                            bodyStr = bufferedReader.lines().collect(Collectors.joining("\n"));
-                        }
-                    }
-                    return bodyStr;
-                }
-                throw new IOException("Too many redirects while trying to fetch " + url);
-            }
-
-            private void process(IModInfo mod)
-            {
-                Status status = PENDING;
-                ComparableVersion target = null;
-                Map<ComparableVersion, String> changes = null;
-                String display_url = null;
-                try
-                {
-                    if (mod.getUpdateURL().isEmpty()) return;
-                    URL url = mod.getUpdateURL().get();
-                    LOGGER.info("[{}] Starting version check at {}", mod.getModId(), url.toString());
-
-                    String data = openUrlString(url, mod);
-
-                    LOGGER.debug("[{}] Received version check data:\n{}", mod.getModId(), data);
-
-
-                    @SuppressWarnings("unchecked")
-                    Map<String, Object> json = new Gson().fromJson(data, Map.class);
-                    @SuppressWarnings("unchecked")
-                    Map<String, String> promos = (Map<String, String>)json.get("promos");
-                    display_url = (String)json.get("homepage");
-
-                    var mcVersion = FMLLoader.versionInfo().mcVersion();
-                    String rec = promos.get(mcVersion + "-recommended");
-                    String lat = promos.get(mcVersion + "-latest");
-                    ComparableVersion current = new ComparableVersion(mod.getVersion().toString());
-
-                    if (rec != null)
-                    {
-                        ComparableVersion recommended = new ComparableVersion(rec);
-                        int diff = recommended.compareTo(current);
-
-                        if (diff == 0)
-                            status = UP_TO_DATE;
-                        else if (diff < 0)
-                        {
-                            status = AHEAD;
-                            if (lat != null)
-                            {
-                                ComparableVersion latest = new ComparableVersion(lat);
-                                if (current.compareTo(latest) < 0)
-                                {
-                                    status = OUTDATED;
-                                    target = latest;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            status = OUTDATED;
-                            target = recommended;
-                        }
-                    }
-                    else if (lat != null)
-                    {
-                        ComparableVersion latest = new ComparableVersion(lat);
-                        if (current.compareTo(latest) < 0)
-                            status = BETA_OUTDATED;
-                        else
-                            status = BETA;
-                        target = latest;
-                    }
-                    else
-                        status = BETA;
-
-                    LOGGER.info("[{}] Found status: {} Current: {} Target: {}", mod.getModId(), status, current, target);
-
-                    changes = new LinkedHashMap<>();
-                    @SuppressWarnings("unchecked")
-                    Map<String, String> tmp = (Map<String, String>)json.get(mcVersion);
-                    if (tmp != null)
-                    {
-                        List<ComparableVersion> ordered = new ArrayList<>();
-                        for (String key : tmp.keySet())
-                        {
-                            ComparableVersion ver = new ComparableVersion(key);
-                            if (ver.compareTo(current) > 0 && (target == null || ver.compareTo(target) < 1))
-                            {
-                                ordered.add(ver);
-                            }
-                        }
-                        Collections.sort(ordered);
-
-                        for (ComparableVersion ver : ordered)
-                        {
-                            changes.put(ver, tmp.get(ver.toString()));
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    LOGGER.warn("Failed to process update information", e);
-                    status = FAILED;
-                }
-                results.put(mod, new CheckResult(status, target, changes, display_url));
-            }
-        }.start();
-    }
-
-    // Gather a list of mods that have opted in to this update system by providing a URL.
-    private static List<IModInfo> gatherMods()
-    {
-        List<IModInfo> ret = new LinkedList<>();
-        for (IModInfo info : ModList.get().getMods()) {
-            if (info.getUpdateURL().isPresent())
-                ret.add(info);
-        }
-        return ret;
-    }
-
-    private static Map<IModInfo, CheckResult> results = new ConcurrentHashMap<>();
-    private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);
-
-    public static CheckResult getResult(IModInfo mod)
-    {
-        return results.getOrDefault(mod, PENDING_CHECK);
-    }
-
-}

fmlcore/src/main/java/net/minecraftforge/fml/config/ConfigFileTypeHandler.java

@@ -1,159 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.config;
-
-import com.electronwill.nightconfig.core.ConfigFormat;
-import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-import com.electronwill.nightconfig.core.file.FileWatcher;
-import com.electronwill.nightconfig.core.io.ParsingException;
-import com.electronwill.nightconfig.core.io.WritingMode;
-import com.mojang.logging.LogUtils;
-import net.minecraftforge.fml.loading.FMLConfig;
-import net.minecraftforge.fml.loading.FMLPaths;
-import org.apache.commons.io.FilenameUtils;
-import org.slf4j.Logger;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.function.Function;
-
-import static net.minecraftforge.fml.config.ConfigTracker.CONFIG;
-
-public class ConfigFileTypeHandler {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    static ConfigFileTypeHandler TOML = new ConfigFileTypeHandler();
-    private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.defaultConfigPath());
-
-    public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
-        return (c) -> {
-            final Path configPath = configBasePath.resolve(c.getFileName());
-            final CommentedFileConfig configData = CommentedFileConfig.builder(configPath).sync().
-                    preserveInsertionOrder().
-                    autosave().
-                    onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
-                    writingMode(WritingMode.REPLACE).
-                    build();
-            LOGGER.debug(CONFIG, "Built TOML config for {}", configPath.toString());
-            try
-            {
-                configData.load();
-            }
-            catch (ParsingException ex)
-            {
-                throw new ConfigLoadingException(c, ex);
-            }
-            LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString());
-            try {
-                FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
-                LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
-            } catch (IOException e) {
-                throw new RuntimeException("Couldn't watch config file", e);
-            }
-            return configData;
-        };
-    }
-
-    public void unload(Path configBasePath, ModConfig config) {
-        Path configPath = configBasePath.resolve(config.getFileName());
-        try {
-            FileWatcher.defaultInstance().removeWatch(configBasePath.resolve(config.getFileName()));
-        } catch (RuntimeException e) {
-            LOGGER.error("Failed to remove config {} from tracker!", configPath.toString(), e);
-        }
-    }
-
-    private boolean setupConfigFile(final ModConfig modConfig, final Path file, final ConfigFormat<?> conf) throws IOException {
-        Files.createDirectories(file.getParent());
-        Path p = defaultConfigPath.resolve(modConfig.getFileName());
-        if (Files.exists(p)) {
-            LOGGER.info(CONFIG, "Loading default config file from path {}", p);
-            Files.copy(p, file);
-        } else {
-            Files.createFile(file);
-            conf.initEmptyFile(file);
-        }
-        return true;
-    }
-
-    public static void backUpConfig(final CommentedFileConfig commentedFileConfig)
-    {
-        backUpConfig(commentedFileConfig, 5); //TODO: Think of a way for mods to set their own preference (include a sanity check as well, no disk stuffing)
-    }
-
-    public static void backUpConfig(final CommentedFileConfig commentedFileConfig, final int maxBackups)
-    {
-        Path bakFileLocation = commentedFileConfig.getNioPath().getParent();
-        String bakFileName = FilenameUtils.removeExtension(commentedFileConfig.getFile().getName());
-        String bakFileExtension = FilenameUtils.getExtension(commentedFileConfig.getFile().getName()) + ".bak";
-        Path bakFile = bakFileLocation.resolve(bakFileName + "-1" + "." + bakFileExtension);
-        try
-        {
-            for(int i = maxBackups; i > 0; i--)
-            {
-                Path oldBak = bakFileLocation.resolve(bakFileName + "-" + i + "." + bakFileExtension);
-                if(Files.exists(oldBak))
-                {
-                    if(i >= maxBackups)
-                        Files.delete(oldBak);
-                    else
-                        Files.move(oldBak, bakFileLocation.resolve(bakFileName + "-" + (i + 1) + "." + bakFileExtension));
-                }
-            }
-            Files.copy(commentedFileConfig.getNioPath(), bakFile);
-        }
-        catch (IOException exception)
-        {
-            LOGGER.warn(CONFIG, "Failed to back up config file {}", commentedFileConfig.getNioPath(), exception);
-        }
-    }
-
-    private static class ConfigWatcher implements Runnable {
-        private final ModConfig modConfig;
-        private final CommentedFileConfig commentedFileConfig;
-        private final ClassLoader realClassLoader;
-
-        ConfigWatcher(final ModConfig modConfig, final CommentedFileConfig commentedFileConfig, final ClassLoader classLoader) {
-            this.modConfig = modConfig;
-            this.commentedFileConfig = commentedFileConfig;
-            this.realClassLoader = classLoader;
-        }
-
-        @Override
-        public void run() {
-            // Force the regular classloader onto the special thread
-            Thread.currentThread().setContextClassLoader(realClassLoader);
-            if (!this.modConfig.getSpec().isCorrecting()) {
-                try
-                {
-                    this.commentedFileConfig.load();
-                    if(!this.modConfig.getSpec().isCorrect(commentedFileConfig))
-                    {
-                        LOGGER.warn(CONFIG, "Configuration file {} is not correct. Correcting", commentedFileConfig.getFile().getAbsolutePath());
-                        ConfigFileTypeHandler.backUpConfig(commentedFileConfig);
-                        this.modConfig.getSpec().correct(commentedFileConfig);
-                        commentedFileConfig.save();
-                    }
-                }
-                catch (ParsingException ex)
-                {
-                    throw new ConfigLoadingException(modConfig, ex);
-                }
-                LOGGER.debug(CONFIG, "Config file {} changed, sending notifies", this.modConfig.getFileName());
-                this.modConfig.getSpec().afterReload();
-                this.modConfig.fireEvent(IConfigEvent.reloading(this.modConfig));
-            }
-        }
-    }
-
-    private static class ConfigLoadingException extends RuntimeException
-    {
-        public ConfigLoadingException(ModConfig config, Exception cause)
-        {
-            super("Failed loading config file " + config.getFileName() + " of type " + config.getType() + " for modid " + config.getModId(), cause);
-        }
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/config/ConfigTracker.java

@@ -1,96 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.config;
-
-import com.electronwill.nightconfig.core.CommentedConfig;
-import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-import com.mojang.logging.LogUtils;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
-
-import java.nio.file.Path;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class ConfigTracker {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    static final Marker CONFIG = MarkerFactory.getMarker("CONFIG");
-    public static final ConfigTracker INSTANCE = new ConfigTracker();
-    private final ConcurrentHashMap<String, ModConfig> fileMap;
-    private final EnumMap<ModConfig.Type, Set<ModConfig>> configSets;
-    private final ConcurrentHashMap<String, Map<ModConfig.Type, ModConfig>> configsByMod;
-
-    private ConfigTracker() {
-        this.fileMap = new ConcurrentHashMap<>();
-        this.configSets = new EnumMap<>(ModConfig.Type.class);
-        this.configsByMod = new ConcurrentHashMap<>();
-        this.configSets.put(ModConfig.Type.CLIENT, Collections.synchronizedSet(new LinkedHashSet<>()));
-        this.configSets.put(ModConfig.Type.COMMON, Collections.synchronizedSet(new LinkedHashSet<>()));
-//        this.configSets.put(ModConfig.Type.PLAYER, new ConcurrentSkipListSet<>());
-        this.configSets.put(ModConfig.Type.SERVER, Collections.synchronizedSet(new LinkedHashSet<>()));
-    }
-
-    void trackConfig(final ModConfig config) {
-        if (this.fileMap.containsKey(config.getFileName())) {
-            LOGGER.error(CONFIG,"Detected config file conflict {} between {} and {}", config.getFileName(), this.fileMap.get(config.getFileName()).getModId(), config.getModId());
-            throw new RuntimeException("Config conflict detected!");
-        }
-        this.fileMap.put(config.getFileName(), config);
-        this.configSets.get(config.getType()).add(config);
-        this.configsByMod.computeIfAbsent(config.getModId(), (k)->new EnumMap<>(ModConfig.Type.class)).put(config.getType(), config);
-        LOGGER.debug(CONFIG, "Config file {} for {} tracking", config.getFileName(), config.getModId());
-    }
-
-    public void loadConfigs(ModConfig.Type type, Path configBasePath) {
-        LOGGER.debug(CONFIG, "Loading configs type {}", type);
-        this.configSets.get(type).forEach(config -> openConfig(config, configBasePath));
-    }
-
-    public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
-        LOGGER.debug(CONFIG, "Unloading configs type {}", type);
-        this.configSets.get(type).forEach(config -> closeConfig(config, configBasePath));
-    }
-
-    private void openConfig(final ModConfig config, final Path configBasePath) {
-        LOGGER.trace(CONFIG, "Loading config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
-        final CommentedFileConfig configData = config.getHandler().reader(configBasePath).apply(config);
-        config.setConfigData(configData);
-        config.fireEvent(IConfigEvent.loading(config));
-        config.save();
-    }
-
-    private void closeConfig(final ModConfig config, final Path configBasePath) {
-        if (config.getConfigData() != null) {
-            LOGGER.trace(CONFIG, "Closing config file type {} at {} for {}", config.getType(), config.getFileName(), config.getModId());
-            config.save();
-            config.getHandler().unload(configBasePath, config);
-            config.setConfigData(null);
-        }
-    }
-
-    public void loadDefaultServerConfigs() {
-        configSets.get(ModConfig.Type.SERVER).forEach(modConfig -> {
-            final CommentedConfig commentedConfig = CommentedConfig.inMemory();
-            modConfig.getSpec().correct(commentedConfig);
-            modConfig.setConfigData(commentedConfig);
-            modConfig.fireEvent(IConfigEvent.loading(modConfig));
-        });
-    }
-
-    public String getConfigFileName(String modId, ModConfig.Type type) {
-        return Optional.ofNullable(configsByMod.getOrDefault(modId, Collections.emptyMap()).getOrDefault(type, null)).
-                map(ModConfig::getFullPath).map(Object::toString).orElse(null);
-    }
-
-    public Map<ModConfig.Type, Set<ModConfig>> configSets() {
-        return configSets;
-    }
-
-    public ConcurrentHashMap<String, ModConfig> fileMap() {
-        return fileMap;
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/config/IConfigEvent.java

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.config;
-
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.Bindings;
-
-import java.util.function.Function;
-
-public interface IConfigEvent {
-    record ConfigConfig(Function<ModConfig, IConfigEvent> loading, Function<ModConfig, IConfigEvent> reloading) {}
-    ConfigConfig CONFIGCONFIG = Bindings.getConfigConfiguration().get();
-
-    static IConfigEvent reloading(ModConfig modConfig) {
-        return CONFIGCONFIG.reloading().apply(modConfig);
-    }
-    static IConfigEvent loading(ModConfig modConfig) {
-        return CONFIGCONFIG.loading().apply(modConfig);
-    }
-    ModConfig getConfig();
-
-    @SuppressWarnings("unchecked")
-    default <T extends Event & IConfigEvent> T self() {
-        return (T) this;
-    }
-}

fmlcore/src/main/java/net/minecraftforge/fml/config/IConfigSpec.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml.config;
-
-import com.electronwill.nightconfig.core.CommentedConfig;
-import com.electronwill.nightconfig.core.UnmodifiableConfig;
-
-public interface IConfigSpec<T extends IConfigSpec<T>> extends UnmodifiableConfig {
-    @SuppressWarnings("unchecked")
-    default T self() {
-        return (T) this;
-    }
-
-    void acceptConfig(CommentedConfig data);
-
-    boolean isCorrecting();
-
-    boolean isCorrect(CommentedConfig commentedFileConfig);
-
-    int correct(CommentedConfig commentedFileConfig);
-
-    void afterReload();
-}