First functional release under reobfuscation.

Fix AT, Fix exc. Almost works now!
Kill old patches and add rejects to ignore file.
2026-11-14 01:04:24 +00:00 · 2013-12-12 18:01:09 -05:00 · 2013-12-12 01:39:30 -05:00 · 2013-12-11 20:39:15 -08:00 · 2013-12-11 23:03:30 -05:00 · 2013-12-11 22:58:46 -05:00
3359 changed files with 97391 additions and 163241 deletions
@@ -3,9 +3,7 @@
 *.patch text eol=lf
 *.java text eol=lf
 *.gradle text eol=crlf
-**/MANIFEST.MF text eol=crlf
 *.png binary
-*.gif binary
 *.exe binary
 *.dll binary
 *.jar binary
@@ -13,15 +11,4 @@
 *.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
-
-# We force eclipse to use unix line endings
-ide/eclipse/template/.settings/*.prefs text eol=lf
-
+*.py text eol=lf
@@ -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..minecraftforge.net/ -->
@@ -1,27 +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/ -->
-<!-- You can also use the discord for support, https://discord.minecraftforge.net/ -->
-
-**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:**
@@ -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.
@@ -1,16 +0,0 @@
-name: 'Comment actions'
-
-on: issue_comment
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/comment_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}
@@ -1,16 +0,0 @@
-name: 'Issue actions'
-
-on: issues
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/issue_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}
@@ -1,28 +0,0 @@
-name: Publish
-
-on:
-  push:
-    branches: [ '26.2' ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
-    with:
-      java: 21
-      gradle_setup: './gradlew setup'
-      gradle_tasks: 'build publish'
-      artifact_name: 'forge'
-    secrets:
-      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-      PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
-      PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
-      PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
-      MAVEN_USER: ${{ secrets.MAVEN_USER }}
-      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-      SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
-      SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
-      SIGN_KEYSTORE_PASSWORD: ${{ secrets.SIGN_KEYSTORE_PASSWORD }}
-      SIGN_KEYSTORE_DATA: ${{ secrets.SIGN_KEYSTORE_DATA }}
@@ -1,13 +0,0 @@
-name: 'PR Review'
-
-on: pull_request_review
-
-jobs:
-  upload_payload:
-    name: Upload payload
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/upload-artifact@v4 # Payload artifact is consumed in Actionable
-        with:
-          name: payload
-          path: ${{ github.event_path }}
@@ -1,13 +0,0 @@
-name: 'PR Review Comment'
-
-on: pull_request_review_comment
-
-jobs:
-  upload_payload:
-    name: Upload payload
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/upload-artifact@v4 # Payload artifact is consumed in Actionable
-        with:
-          name: payload
-          path: ${{ github.event_path }}
@@ -1,20 +0,0 @@
-name: 'Pull Request Review Comment actions'
-
-on:
-  workflow_run:
-    workflows: [PR Review Comment]
-    types:
-      - completed
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/pr_review_comment_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}
@@ -1,20 +0,0 @@
-name: 'Pull Request Review actions'
-
-on:
-  workflow_run:
-    workflows: [PR Review]
-    types:
-      - completed
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/pr_review_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}
@@ -1,18 +0,0 @@
-name: 'Pull Request actions'
-
-on:
-  pull_request_target:
-    types: [assigned, unassigned, labeled, unlabeled, opened, edited, closed, reopened, synchronize, converted_to_draft, ready_for_review, locked, unlocked, review_requested, review_request_removed, auto_merge_enabled, auto_merge_disabled]
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/pr_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}
@@ -1,16 +0,0 @@
-name: 'Push actions'
-
-on: push
-
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  discussions: write
-
-jobs:
-  labels:
-    uses: MinecraftForge/SharedActions/.github/workflows/push_actions.yml@main
-    secrets:
-      GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
-      GH_APP_NAME: ${{ secrets.GH_APP_NAME }}
@@ -1,49 +1,21 @@
 #eclipse
-**/bin
-**/.settings
-**/.classpath
-*.project
-
-#In case people make their workspace in the repo
-/eclipse/
+/bin
+/.settings
+/.classpath

 #idea
 /.idea
-/*/out
-/classes
 *.iml

-# We however WANT the ide folder as it has tempaltes/configs for developing Forge.
-!ide/**
-
 #gradle
 /build
+/buildSrc
 /.gradle
-/*/build
-/*/.gradle
-
-# Projects repo, either ignore it, or ignore patches.
-/projects/mcp/
-/projects/clean/
-/projects/forge/

 #occupational hazards
-/projects/**/build/
-/projects/**/out/
-/projects/**/run/
-/projects/**/*.launch
+/eclipse/
 /repo/
-src/*/generated/**/.cache/

-# Generated by gradle every import
-**/src/main/resources/META-INF/MANIFEST.MF
-/fmlloader/src/main/resources/forge_version.json

-/ForgeRoot.ipr
-/ForgeRoot.iws
-
-# APT stuff
-/*/.gitignore
-/*/.factorypath
-/*/.apt_generated/
-/fmlcore/logs/
+#Patch reject
+*.rej
@@ -0,0 +1,27 @@
+This is Forge Mod Loader.
+
+You can find the source code at all times at https://github.com/MinecraftForge/FML
+
+This minecraft mod is a clean open source implementation of a mod loader for
+minecraft servers, minecraft bukkit servers, and minecraft clients.
+
+The code is authored by cpw.
+
+It (partially) implements API defined by the client side ModLoader, authored by Risugami.
+http://www.minecraftforum.net/topic/75440-
+
+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.
+
@@ -1,31 +1,18 @@
-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.
+This minecraft mod, Forge Mod Loader, including all parts herein except as noted below,
+is licensed under the GNU LGPL v2.1 or later.

-Homepage: http://minecraftforge.net/
-          https://github.com/MinecraftForge/MinecraftForge
-          
+Homepage: https://github.com/MinecraftForge/FML

-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.
+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.

-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.
+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.


 === MCP Data ===
@@ -39,29 +26,14 @@ I grant permission for some parts of FML to be redistributed outside the terms o
 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)
+License is granted to redistribute the runtime patcher code (common/cpw/mods/fml/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)
+License is granted to redistribute the ASM transformer code (common/cpw/mods/fml/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.
-
-This software includes the Monocraft font from https://github.com/IdreesInc/Monocraft/ for use in the early loading
-display.
-=========================================================================
-
+========

                  GNU LESSER GENERAL PUBLIC LICENSE
                       Version 2.1, February 1999
@@ -71,10 +43,6 @@ display.
 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
@@ -120,7 +88,7 @@ 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
@@ -176,7 +144,7 @@ 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

@@ -223,7 +191,7 @@ 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
@@ -281,7 +249,7 @@ 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.
@@ -332,7 +300,7 @@ Library will still fall under Section 6.)
 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
@@ -394,7 +362,7 @@ 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
@@ -435,7 +403,7 @@ 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
@@ -487,7 +455,7 @@ 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
@@ -1,2 +0,0 @@
-Copyright (c) Forge Development LLC and contributors
-SPDX-License-Identifier: LGPL-2.1-only
@@ -0,0 +1,117 @@
+This is Forge Mod Loader, or FML for short, by cpw.
+
+More information can be found at https://github.com/MinecraftForge/FML/wiki
+
+It is a clean reimplementation of a mod loading system for client, server and
+bukkit use, incorporating API implementations of client side ModLoader by
+Risugami.
+
+It can be installed on its own, or as part of Minecraft Forge.
+
+----------------------
+About Forge Mod Loader
+----------------------
+
+Environments and compatibility
+==============================
+FML covers the three main environments: client, server and bukkit. All
+environments share the main mod loading code base, with additional varying hooks
+based on the specific environment. Compatibility is almost 100% with all 
+ModLoader based mods- any mod with any difficulty (unless noted below) should
+be reported as a ticket to the github, please.
+
+Client side mods should be 100% compatible with ModLoader. The only exception is
+Optifine, however new versions of optifine are compatible. There are some very
+visible changes to the client when FML is installed.
+
+Server side mods are mostly compatible with previous MLMP based incarnations,
+however, this compatibility is not guaranteed. Most mods have adapted to FML 
+and MLMP is not assured and will cause errors. Ask your mod author to update
+to FML.
+
+Bukkit side modding is an adaptation of the server side mod code to the bukkit
+environment. Mods need to be recompiled against the bukkit decompilation to work
+however there are guides and tools in development to make this process easier.
+Consult mcportcentral.co.za for more information.
+
+Minecraft Forge in all cases bundles FML as it's modloading technology of choice
+because FML is open source, freely distributable, and can be easily updated by
+contributors through github.
+
+Notable integrations
+====================
+Optifine has FML compatibility. It varies from Optifine release to release, however
+in general it will work well alongside an FML or 
+Minecraft Forge installation. FML will detect and ensure the good operation of
+Optifine (you can see it in your client as an additional data line on the 
+bottom left).
+
+Client notes
+============
+FML does provide a standard pattern for mods to provide HD textures. This is why
+optifine needed integration code. FML supports HD texture packs
+up to 128x resolution.
+
+Mod information
+===============
+FML exposes the mod information through a mod list visible on the main screen as
+well as some small branding enhancements. For full data mods need to provide an
+information file. This file is a standard format so hopefully tools providing
+launch capabilities can also leverage this content.
+
+-------------------------------
+Binary installation information
+-------------------------------
+If you have downloaded a binary zip file you can install it as follows (client
+or server):
+
+Installation
+============
+To install on a server, simply execute the FML or Forge jar file, with a copy of
+minecraft_server.jar placed in the same directory. FML will launch it's patched
+copy.
+
+To install on a client, FIRST delete META-INF from the minecraft.jar file, then
+copy the contents of the FML or Forge jar file into it. FML and Forge provide 
+their own META-INF data which should *not* be deleted.
+
+Forge Installation
+==================
+This code also ships as a part of Minecraft Forge. You do not need to install it
+separately from your Minecraft Forge installation. Minecraft Forge contains the
+exact same code as this. Generally, you should not install FML if you are also
+installing Minecraft Forge.
+
+-------------------------------------------
+Source installation information for modders
+-------------------------------------------
+This code follows the Minecraft Forge installation methodology. It will apply
+some small patches to your MCP extracted source code, giving you and it access 
+to some of the data and functions you need to build a successful mod.
+
+Note also that the patches are built against "unrenamed" MCP source code- this
+means that you will not be able to read them directly against normal code.
+
+Source pack installation information:
+
+Standalone source installation
+==============================
+
+To install this source code for development purposes, extract this zip file 
+into an mcp installation containing vanilla jars only. It should create a new
+folder "fml" inside that installation.
+
+Be sure that you have both vanilla client jars, and the vanilla server jar installed
+as per the MCP install instructions. Both are required for FML to run properly.
+
+Once extracted, run the install.sh or install.bat script provided from the fml
+directory. It should decompile and patch your MCP source code for the client
+and server.
+
+Forge source installation
+=========================
+MinecraftForge ships with this code and installs it as part of the forge
+installation process, no further action is required on your part.
+
+For reference this is version @MAJOR@.@MINOR@.@REV@.@BUILD@ of FML
+for Minecraft version @MCVERSION@.
@@ -1,57 +1,110 @@
-import net.minecraftforge.forge.tasks.*
-import net.minecraftforge.gradleutils.PomUtils
-
-plugins {
-    id 'net.minecraftforge.licenser' version '1.0.1'
-    id 'com.github.ben-manes.versions' version '0.46.0'
-    id 'net.minecraftforge.gradleutils' version '[2.6.4,2.7)'
-    id 'eclipse'
-    id 'de.undercouch.download' version '5.4.0'
-    id 'net.minecraftforge.gradle.patcher' version '[6.0.51,6.2)' apply false
-    id 'net.minecraftforge.gradle.mcp' version '[6.0.51,6.2)' apply false
-    id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
-    //id 'org.barfuin.gradle.taskinfo' version '3.0.1'
-}
-
-Util.init() //Init all our extension methods!
-
-ext {
-    VERSION = gitversion.getMCTagOffsetBranch(MC_VERSION)
-    FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1)
-}
-
-changelog {
-    from '65.0'
-}
-
-tasks.register('setup') {
-    dependsOn ':forge:extractMapped'
-    if (findProject(':clean'))
-        dependsOn ':clean:extractMapped'
-}
-
-tasks.register('doChecks') {
-    dependsOn ':forge:checkJarCompatibility'
-    dependsOn ':forge:publish'
-}
-
-project(':mcp') {
-    apply plugin: 'net.minecraftforge.gradle.mcp'
-    mcp {
-        config MC_VERSION + '-' + MCP_VERSION
-        pipeline = 'joined'
-    }
+buildscript {
    repositories {
+        mavenCentral()
        mavenLocal()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.1-SNAPSHOT'
    }
 }

-if (System.env.TEAMCITY_VERSION) {
-    //Only setup the CI environment if and only if the environment variables are set.
-    tasks.named('configureTeamCity').configure {
-        doLast {
-            println "##teamcity[buildNumber '${project(':forge').version}']"
-            println "##teamcity[setParameter name='env.PUBLISHED_JAVA_ARTIFACT_VERSION' value='${project(':forge').version}']"
+import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
+
+apply plugin: 'maven'
+apply plugin: 'fmldev'
+
+repositories {
+    flatDir {
+        name "fileRepo"
+        dirs "repo"
+    }
+}
+
+minecraft {
+    version = '1.7.2'
+    mcpVersion = '9.01-pre'
+    fmlDir = projectDir.getAbsolutePath();
+    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
+    installerVersion = "1.4"
+}
+
+group = 'cpw.mods'
+version = getVersionFromGit(getProject())
+
+jenkins {
+    job = 'fml'
+}
+
+uploadArchives {
+    repositories {
+        if (project.hasProperty("filesmaven")) {
+            logger.info('Publishing to files server')
+            
+            mavenDeployer {
+                configuration = configurations.deployerJars
+
+                repository(url: project.filesmaven.url) {
+                    authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
+                }
+
+                pom {
+                    groupId = project.group
+                    version = project.version
+                    artifactId = project.archivesBaseName
+                    project {
+                        name project.archivesBaseName
+                        packaging 'jar'
+                        description 'ForgeModLoader'
+                        url 'https://github.com/MinecraftForge/FML'
+
+                        scm {
+                            url 'https://github.com/MinecraftForge/FML'
+                            connection 'scm:git:git://github.com/MinecraftForge/FML.git'
+                            developerConnection 'scm:git:[email protected]:MinecraftForge/FML.git'
+                        }
+
+                        issueManagement {
+                            system 'github'
+                            url 'https://github.com/MinecraftForge/FML/issues'
+                        }
+
+                        licenses {
+                            license {
+                                name 'GNU Lesser Public License (LGPL), Version 2.1'
+                                url 'http://www.gnu.org/licenses/lgpl-2.1.txt'
+                                distribution 'repo'
+                            }
+                        }
+
+                        developers {
+                            developer {
+                                id 'cpw'
+                                name 'cpw'
+                                roles { role 'developer' }
+                            }
+                            developer {
+                                id 'LexManos'
+                                name 'Lex Manos'
+                                roles { role 'developer' }
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            logger.info('Publishing to repo folder')
+            
+            mavenDeployer {
+                repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
+            }
        }
    }
 }
@@ -1,3 +0,0 @@
-/.gradle/
-/build/
-/out/
@@ -1,14 +0,0 @@
-repositories {
-    maven { url = 'https://maven.minecraftforge.net/' }
-    mavenCentral()
-}
-
-dependencies {
-    implementation 'org.ow2.asm:asm:9.9.1'
-    implementation 'org.ow2.asm:asm-tree:9.9.1'
-    implementation 'net.minecraftforge:srgutils:0.6.2'
-    implementation 'net.minecraftforge:JarJarMetadata:0.3.27'
-    implementation 'commons-io:commons-io:2.13.0'
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r'
-}
@@ -1,67 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.tasks.*
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.tasks.bundling.AbstractArchiveTask
-
-import java.util.zip.ZipFile
-
-abstract class BundleList extends DefaultTask {
-    @InputFiles abstract ConfigurableFileCollection getConfig()
-    @InputFile abstract RegularFileProperty getServerBundle()
-    @OutputFile abstract RegularFileProperty getOutput()
-
-    BundleList() {
-        config.setFrom(project.configurations.installer)
-        output.convention(project.layout.buildDirectory.file("$name/output.list"))
-        configure {
-            dependsOn(project.tasks.universalJar)
-            inputs.file(project.tasks.universalJar.archiveFile)
-            dependsOn(project.tasks.applyServerBinPatches)
-            inputs.file(project.tasks.applyServerBinPatches.output)
-        }
-    }
-    
-    @TaskAction
-    void run() {
-        def entries = [:] as TreeMap
-        def resolved = project.configurations.installer.resolvedConfiguration.resolvedArtifacts
-        for (def dep : resolved) {
-            def info = Util.getMavenInfoFromDep(dep)
-            //println("$dep.file.sha1\t$info.name\t$info.path")
-            entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path")
-        }
-
-        var packed = (AbstractArchiveTask) project.tasks.universalJar
-        var info = Util.getMavenInfoFromTask(packed)
-        def file = packed.archiveFile.get().asFile
-        entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
-
-        var classifier = 'server'
-        var genned = project.tasks.applyServerBinPatches
-        info = Util.getMavenInfoFromTask(genned, classifier)
-        file = genned.output.get().asFile
-        entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path")
-        
-        try (def zip = new ZipFile(serverBundle.get().asFile)) {
-            def entry = zip.getEntry('META-INF/libraries.list')
-            def data = zip.getInputStream(entry).text.split('\n')
-            for (def line : data) {
-                def (sha, artifact, path) = line.split('\t')
-                def (group, name, other) = artifact.split(':', 3)
-                //println("Group: $group Name: $name")
-                def key = "$group:$name"
-                if (other.indexOf(':') != -1){
-                    key += ':' + other.split(':', 2)[1]
-                    //println("\tKey: $key")
-                }
-                if (!entries.containsKey(key))
-                    entries.put(key, line)
-            }
-        }
-        
-        output.get().asFile.text = entries.values().join('\n')
-    }
-}
@@ -1,52 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.json.JsonBuilder
-import groovy.transform.CompileStatic
-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.tree.ClassNode
-import org.objectweb.asm.tree.FieldNode
-import org.objectweb.asm.tree.MethodNode
-
-@CompileStatic
-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()
-
-        var outputFile = output.get().asFile
-        if (outputFile.exists())
-            outputFile.delete()
-
-        pre()
-
-        Util.processClassNodes(jar.get().asFile, this.&process)
-
-        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()
-}
@@ -1,48 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.transform.CompileStatic
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Internal
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.tree.ClassNode
-import org.objectweb.asm.tree.MethodNode
-
-@CompileStatic
-abstract class BytecodePredicateFinder extends BytecodeFinder {
-
-    @Internal
-    abstract Property<Closure<Boolean>> getPredicate()
-
-    private final Map<String, List<String>> matches = new TreeMap<>(Comparator.naturalOrder())
-
-    @Override
-    protected process(ClassNode parent, MethodNode node) {
-        for (final current : node.instructions) {
-            if (predicate.get().call(parent, node, current)) {
-                var methods = matches.compute(parent.name, { k, v -> v ?: new ArrayList<>() })
-
-                // only add non-synthetic methods
-                if ((node.access & Opcodes.ACC_SYNTHETIC) == 0) {
-                    methods.add(node.name + node.desc)
-                }
-
-                return
-            }
-        }
-    }
-
-    @Internal
-    @Override
-    protected Object getData() {
-        var array = new ArrayList<Object>()
-        matches.forEach { c, m ->
-            {
-                array.add(
-                        'class': c,
-                        'methods': m
-                )
-            }
-        }
-        return array ?: { throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.') }()
-    }
-}
@@ -1,97 +0,0 @@
-package net.minecraftforge.forge.tasks;
-
-import groovy.transform.CompileDynamic;
-import groovy.transform.CompileStatic;
-
-import java.util.Properties;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.TreeSet;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.Reader;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * Eclipse config files are literally just java properties, with the header cleaned up.
- * https://github.com/eclipse/buildship/blob/5b2c7fca7fa86cd74d71b3c099c7b1559eba038e/org.eclipse.buildship.core/src/main/java/org/eclipse/buildship/core/internal/configuration/PreferenceStore.java#L238
- *
- * This does the same thing, as well as sorting alphabetically.
- * It also ignores all comments. We can add them latter if someone cares.
- */
-@CompileStatic
-public class CleanProperties extends Properties {
-    private static final long serialVersionUID = 1L;
-    private static final String LINE_SEP = System.getProperty("line.separator");
-    private static final String UNIX_LINE_SEP = "\n";
-    private static final Charset ENCODING = StandardCharsets.UTF_8;
-
-    public CleanProperties load(File input) throws IOException {
-        if (input.exists()) {
-            try (Reader is = new InputStreamReader(new FileInputStream(input), ENCODING)) {
-                super.load(is);
-            }
-        }
-        return this;
-    }
-
-    public void store(File out) throws IOException {
-        if (!out.getParentFile().exists())
-            out.getParentFile().mkdirs();
-
-        try (OutputStream os = new FileOutputStream(out)) {
-            store(os, null);
-        }
-    }
-
-    @Override
-    public synchronized Enumeration<Object> keys() {
-        Set<Object> ret = new TreeSet<>();
-        for (Enumeration<?> e = super.keys(); e.hasMoreElements();)
-            ret.add(e.nextElement());
-        return Collections.enumeration(ret);
-    }
-
-    @CompileDynamic
-    @Override
-    public Set<Map.Entry<Object, Object>> entrySet() {
-        Set<Map.Entry<Object, Object>> ret = new TreeSet<>((l, r) -> ((String)l.getKey()).compareTo((String)r.getKey()));
-        ret.addAll(super.entrySet());
-        return ret;
-    }
-
-    @Override
-    public void store(OutputStream out, String comments) throws IOException {
-        out.write(clean().getBytes(ENCODING));
-        out.flush();
-    }
-
-    @Override
-    public void store(Writer out, String comments) throws IOException {
-        out.write(clean());
-        out.flush();
-    }
-
-    private String clean() throws IOException {
-        ByteArrayOutputStream tmp = new ByteArrayOutputStream();
-        try {
-            super.store(tmp, null);
-        } finally {
-            tmp.close();
-        }
-
-        String ret = tmp.toString(ENCODING).replace(LINE_SEP, UNIX_LINE_SEP);
-        ret = ret.substring(ret.indexOf(UNIX_LINE_SEP) + 1);
-        return ret;
-    }
-}
@@ -1,33 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.transform.stc.FirstParam
-
-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, @DelegatesTo(value = FirstParam, strategy = Closure.DELEGATE_FIRST) Closure cl) {
-        cl.delegate = obj
-        cl.resolveStrategy = Closure.DELEGATE_FIRST
-        cl()
-        return obj
-    }
-}
@@ -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
-        var libraries = new ArrayList<String>()
-
-		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 != 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 != target.sha1()) {
-						throw new IllegalStateException("Failed to download ${art.url} to ${target.canonicalPath} SHA Mismatch")
-					}
-				}
-			}
-		}
-        Files.write(librariesOutput.get().asFile.toPath(), libraries)
-    }
-}
@@ -1,28 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.transform.CompileStatic
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.*
-
-import java.util.zip.ZipFile
-
-@CompileStatic
-abstract class ExtractFile extends DefaultTask {
-    @InputFile abstract RegularFileProperty getInput()
-    @Input abstract Property<String> getTarget()
-    @OutputFile abstract RegularFileProperty getOutput()
-
-    @TaskAction
-    protected void exec() {
-        var zip = new ZipFile(input.get().asFile);
-        var entry = zip.getEntry(target.get())
-        if (entry == null)
-            throw new IllegalStateException(input.get().asFile.absolutePath + " does not contain " + target.get())
-        var stream = zip.getInputStream(entry)
-        output.get().asFile.withOutputStream { out ->
-            stream.transferTo(out)
-        }
-    }
-}
@@ -1,101 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.transform.CompileStatic
-import groovy.transform.EqualsAndHashCode
-
-import org.gradle.api.tasks.*
-import org.objectweb.asm.tree.AbstractInsnNode
-import org.objectweb.asm.tree.ClassNode
-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) {
-        AbstractInsnNode 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
-    }
-
-    @CompileStatic
-    @EqualsAndHashCode(excludes = ['replacement', 'blacklist'])
-    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(String owner, String name, String desc) {
-            if (blacklist === null)
-                blacklist = new HashSet<>()
-            blacklist.add(new ObjectTarget(owner: owner, name: name, desc: desc))
-        }
-        def blacklist(String owner) {
-            blacklist(owner, '', '')
-        }
-    }
-    
-    void 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)
-        })
-    }
-}
@@ -1,49 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-import groovy.transform.CompileStatic
-import groovy.transform.TupleConstructor
-
-@CompileStatic
-@TupleConstructor
-final class InheritanceData implements Annotatable {
-    String name
-    int access
-    String superName
-    List<String> interfaces = []
-    Map<String, Method> methods = [:]
-    Map<String, Field> fields = [:]
-    List<Annotation> annotations = []
-
-    @TupleConstructor
-    static final class Method implements Annotatable {
-        int access
-        String override
-        List<Annotation> annotations = []
-    }
-
-    @TupleConstructor
-    static final class Field implements Annotatable {
-        int access
-        String desc
-        List<Annotation> annotations = []
-    }
-
-    @TupleConstructor
-    static final class Annotation {
-        String desc
-    }
-
-    private static final Gson GSON = new Gson()
-    static Map<String, InheritanceData> parse(File file) {
-        try (final reader = file.newReader()) {
-            return GSON.fromJson(reader, new TypeToken<Map<String, InheritanceData>>() {})
-        }
-    }
-}
-
-@CompileStatic
-interface Annotatable {
-    List<InheritanceData.Annotation> getAnnotations()
-}
@@ -1,158 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import org.gradle.api.file.DuplicatesStrategy
-import org.gradle.api.tasks.bundling.AbstractArchiveTask
-import org.gradle.api.tasks.bundling.Zip
-import org.gradle.api.tasks.*
-import org.gradle.api.DefaultTask
-import org.gradle.api.provider.Property
-import groovy.json.JsonSlurper
-
-abstract class InstallerJar extends Zip {
-    @Input @Optional abstract Property<Boolean> getFat()
-    @Input @Optional abstract Property<Boolean> getOffline()
-
-    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'))
-        fat.convention(false)
-        offline.convention(false)
-
-        def installerJson = project.tasks.installerJson
-        def launcherJson = project.tasks.launcherJson
-        def downloadInstaller = project.tasks.downloadInstaller
-
-        dependsOn(installerJson, launcherJson, downloadInstaller, project.configurations.installer)
-        from(installerJson, launcherJson)
-
-        from(project.rootProject.file('/src/main/resources/url.png'))
-        project.afterEvaluate {
-            from(project.zipTree(downloadInstaller.output)) {
-                duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-            }
-            
-            if (fat.get() || offline.get()) {
-                def cfg = project.tasks.register(name + "Config", Configure)
-                cfg.get().configure {
-                    parent = this
-                    dependsOn(project.tasks.installerJson, project.tasks.launcherJson)
-                }
-                dependsOn(cfg)
-            } else {
-                // Things we ALWAYS bundle, this just the server shim jar, because the installer spec only says to extract the file. 
-                // I should make it allow downloads but thats a spec break, and this is just a ~14KB jar
-                [
-                    project.tasks.serverShimJar // Server bootstrap executable jar
-                ].forEach { AbstractArchiveTask packed ->
-                    def path = Util.getMavenInfoFromTask(packed).path
-                    from(packed) {
-                        rename { "maven/$path" }
-                    }
-                }
-            }
-        }
-    }
-    
-    static abstract class Configure extends DefaultTask {
-        public Zip parent
-        private int count = 0;
-        
-        @TaskAction
-        protected void exec() {
-            def deps = [:] as java.util.TreeMap
-            
-            // Gather all things that need downloading
-            [
-                project.tasks.installerJson, 
-                project.tasks.launcherJson
-            ].each { task ->
-                def json = task.output.get().asFile.json
-                json.libraries.each { lib -> 
-                    if (lib.downloads?.artifact?.url !== null && !lib.downloads.artifact.url.isEmpty())
-                        deps.put(lib.name, lib.downloads.artifact)
-                }
-            }
-            
-            // First find things we build in this project.
-            [
-                project.tasks.universalJar, // Forge runtime code
-                project.tasks.serverShimJar // Shim jar for dedicated server
-            ].forEach { AbstractArchiveTask packed ->
-                def name = Util.getMavenInfoFromTask(packed).name
-                def info = deps.remove(name)
-                if (info !== null) {
-                    println("Adding: $packed.path $name")
-                    parent.from(packed) {
-                        rename { "maven/$info.path" }
-                    }
-                }
-            }
-            
-            // Find any artifacts from the 'installer' config
-            // This config specifies the runtime files we intend for the interaller to have.
-            // And are typically what we would be developing and testing alongside Forge. 
-            // So we may have local modified versions
-            def cfg = project.configurations.installer
-            while (cfg != null) {
-                //println('')
-                def resolved = cfg.resolvedConfiguration.resolvedArtifacts
-                int found = 0
-                for (def dep : resolved) {
-                    def name = Util.getMavenInfoFromDep(dep).name
-                    def info = deps.remove(name)
-                    if (info == null) {
-                        //println("Skipping: $name")
-                        continue
-                    }
-                    //println("-$name")
-                    found++
-                    addFile(dep.file, info)
-                }
-                
-                if (deps.isEmpty()) {
-                    cfg = null
-                    continue
-                }
-                
-                // Prevent infinite loops if something fucky happens
-                if (found == 0)
-                    throw new IllegalStateException("Failed to find any installer dependencies") 
-                
-                def seen = [] as Set
-                cfg = project.configurations.detachedConfiguration()
-                cfg.transitive = false
-                for (def key : deps.keySet()) {
-                    def (group, artifact, other) = key.split(':', 3)
-                    // Only resolve unique group:artifact so we don't get version overrides
-                    if (seen.add(group + ':' + artifact)) {
-                        //println("+$key")
-                        cfg.dependencies.add(project.dependencies.create(key))
-                    }
-                }
-            }
-        }
-        
-        void addFile(file, info) {
-            boolean pack = parent.offline.get() || info.url.isEmpty()
-            
-            // If it's a offline jar just always pack
-            if (!pack) {
-                try {
-                    var remote = new URL("${info.url}.sha1").getText('UTF-8')
-                    pack = info.sha1 != remote
-                } catch (FileNotFoundException e) {
-                    pack = !info.url.startsWith('https://libraries.minecraft.net/')
-                    // Oh noes its not there!
-                }
-            }
-            
-            if (pack) {
-                println("Adding: $file.absolutePath")
-                parent.from(file) {
-                    rename { "maven/$info.path" }
-                }
-            }
-        }
-    }
-}
@@ -1,73 +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 org.gradle.api.tasks.bundling.AbstractArchiveTask
-
-import java.nio.file.Files
-
-abstract class InstallerJson extends DefaultTask {
-    @OutputFile abstract RegularFileProperty getOutput()
-    @InputFiles abstract ConfigurableFileCollection getInput()
-    @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() {
-        launcherJsonName.convention('/version.json')
-        logo.convention('/big_logo.png')
-        mirrors.convention('https://files.minecraftforge.net/mirrors-2.0.json')
-        welcome.convention("Welcome to the ${project.name.capitalize()} installer.")
-        output.convention(project.layout.buildDirectory.file('libs/install_profile.json'))
-        
-        project.afterEvaluate {
-            [
-                project.tasks.universalJar,
-                project.tasks.serverShimJar
-            ].forEach { packed ->
-                dependsOn(packed)
-                input.from packed.archiveFile
-            }
-        }
-    }
-
-    @TaskAction
-    protected void exec() {
-        def libs = libraries
-        [
-            project.tasks.universalJar,
-            project.tasks.serverShimJar
-        ].forEach { AbstractArchiveTask packed ->
-            def info = Util.getMavenInfoFromTask(packed)
-            libs.put(info.name, [
-                name: info.name,
-                downloads: [
-                    artifact: [
-                        path: info.path,
-                        url: "https://maven.minecraftforge.net/$info.path",
-                        sha1: packed.archiveFile.get().asFile.sha1(),
-                        size: packed.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())
-    }
-}
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.forge.tasks;
-
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.minecraftforge.jarjar.metadata.ContainedJarIdentifier;
-import net.minecraftforge.jarjar.metadata.ContainedJarMetadata;
-import net.minecraftforge.jarjar.metadata.ContainedVersion;
-import net.minecraftforge.jarjar.metadata.Metadata;
-import net.minecraftforge.jarjar.metadata.MetadataIOHandler;
-import net.minecraftforge.jarjar.metadata.json.ArtifactVersionSerializer;
-import net.minecraftforge.jarjar.metadata.json.ContainedJarIdentifierSerializer;
-import net.minecraftforge.jarjar.metadata.json.ContainedJarMetadataSerializer;
-import net.minecraftforge.jarjar.metadata.json.ContainedVersionSerializer;
-import net.minecraftforge.jarjar.metadata.json.MetadataSerializer;
-import net.minecraftforge.jarjar.metadata.json.VersionRangeSerializer;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.codehaus.groovy.runtime.InvokerHelper;
-import org.gradle.api.Action;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.artifacts.ConfigurationContainer;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.ExternalModuleDependency;
-import org.gradle.api.artifacts.FileCollectionDependency;
-import org.gradle.api.artifacts.MinimalExternalModuleDependency;
-import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.artifacts.ModuleIdentifier;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.ResolvedArtifact;
-import org.gradle.api.file.ProjectLayout;
-import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.provider.Provider;
-import org.gradle.api.provider.SetProperty;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.OutputFile;
-import org.gradle.api.tasks.TaskAction;
-
-import javax.inject.Inject;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serial;
-import java.io.Serializable;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.zip.ZipFile;
-
-// TODO SUPER SUPER SUPER UGLY, CLEAN UP IN FORGEDEV 7
-@Deprecated(forRemoval = true) // Will be moved to JarJar plugin in ForgeDev 7
-public abstract class JarJarMetadataOptions extends DefaultTask {
-    private static final Gson GSON = new GsonBuilder()
-        .registerTypeAdapter(VersionRange.class, new VersionRangeSerializer())
-        .registerTypeAdapter(ArtifactVersion.class, new ArtifactVersionSerializer())
-        .registerTypeAdapter(DefaultArtifactVersion.class, new ArtifactVersionSerializer())
-        .registerTypeAdapter(ContainedJarIdentifier.class, new ContainedJarIdentifierSerializer())
-        .registerTypeAdapter(ContainedJarMetadata.class, new ContainedJarMetadataSerializer())
-        .registerTypeAdapter(ContainedVersion.class, new ContainedVersionSerializer())
-        .registerTypeAdapter(Metadata.class, new MetadataSerializer())
-        .setPrettyPrinting()
-        .create();
-
-    protected abstract @Input SetProperty<ResolvedDependencyInfoImpl> getResolvedDependencies();
-
-    protected abstract @OutputFile RegularFileProperty getMetadataFile();
-
-    protected abstract @Inject ProjectLayout getLayout();
-
-    // NOTE: I'm not adding a non-provider version. please just use the version catalog entries for now.
-    public void add(Provider<MinimalExternalModuleDependency> dependency, Action<? super ResolvedDependencyInfo> action) {
-        this.getResolvedDependencies().add(dependency.map(d -> {
-            var ret = ResolvedDependencyInfoImpl.from(this.getProject().getConfigurations(), d);
-            action.execute(ret);
-            return ret;
-        }));
-    }
-
-    @Inject
-    public JarJarMetadataOptions() {
-        this.getMetadataFile().convention(this.getLayout().getBuildDirectory().file(this.getName() + "/options.json"));
-    }
-
-    @TaskAction
-    protected void exec() {
-        record ForgeLocaterOptions(String resource, String layer, String id, List<ContainedJarMetadata> deps, ContainedJarMetadata meta, boolean nested) { }
-
-        var resolved = this.getResolvedDependencies().get();
-        var jars = new ArrayList<ForgeLocaterOptions>(resolved.size());
-        for (var dependency : resolved) {
-            var deps = new ArrayList<ContainedJarMetadata>();
-            try (var zip = new ZipFile(dependency.artifact)) {
-                var entry = zip.getEntry("META-INF/jarjar/metadata.json");
-                if (entry != null) {
-                    try (var stream = zip.getInputStream(entry)) {
-                        var meta = MetadataIOHandler.fromStream(stream).orElse(null);
-                        if (meta == null)
-                            throw new IllegalStateException("Corrupt metadata.json in " + dependency.artifact.getAbsolutePath());
-                        for (var dep : meta.jars())
-                            deps.add(new ContainedJarMetadata(dep.identifier(), dep.version(), "", dep.isObfuscated()));
-                    }
-                }
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-            jars.add(new ForgeLocaterOptions(
-                dependency.resource,
-                dependency.layer,
-                dependency.identifier,
-                deps,
-                new ContainedJarMetadata(
-                    new ContainedJarIdentifier(validateGroup(dependency), dependency.module.getName()),
-                    new ContainedVersion(null, parseVersion(dependency)),
-                    Objects.requireNonNull(dependency.path, "Dependency path is unspecified: " + dependency.asString),
-                    false
-                ),
-                dependency.nested
-            ));
-        }
-
-        try {
-            record Meta(List<ForgeLocaterOptions> options){}
-
-            Files.writeString(
-                this.getMetadataFile().getAsFile().get().toPath(),
-                GSON.toJson(new Meta(jars), Meta.class)
-            );
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private String validateGroup(ResolvedDependencyInfoImpl dependency) {
-        try {
-            return Objects.requireNonNull(dependency.module.getGroup());
-        } catch (NullPointerException e) {
-            throw new IllegalArgumentException("Module dependency has no group: " + dependency.asString, e);
-        }
-    }
-
-    private ArtifactVersion parseVersion(ResolvedDependencyInfoImpl resolved) {
-        try {
-            return VersionRange.createFromVersionSpec(Objects.requireNonNull(resolved.version)).getRecommendedVersion();
-        } catch (InvalidVersionSpecificationException e) {
-            throw new IllegalArgumentException("Version is invalid for: " + resolved.asString, e);
-        } catch (NullPointerException e) {
-            throw new IllegalArgumentException("Version is unspecified for: " + resolved.asString, e);
-        }
-    }
-
-    private VersionRange parseVersionRange(ResolvedDependencyInfoImpl dependency) {
-        if (dependency.hasManuallySpecifiedRange) {
-            try {
-                return VersionRange.createFromVersionSpec(dependency.versionRange);
-            } catch (InvalidVersionSpecificationException e) {
-                throw new IllegalArgumentException("Version is invalid for: " + dependency.asString, e);
-            }
-        } else {
-            try {
-                return VersionRange.createFromVersionSpec("[%s,)".formatted(Objects.requireNonNull(dependency.versionRange)));
-            } catch (InvalidVersionSpecificationException e) {
-                throw new IllegalArgumentException("Version range is invalid for: " + dependency.asString, e);
-            } catch (NullPointerException e) {
-                throw new IllegalArgumentException("Version is unspecified for: " + dependency.asString, e);
-            }
-        }
-    }
-
-    public interface ResolvedDependencyInfo {
-        void containedJarMetadata(Action<? super ContainedJarMetadataInfo> action);
-
-        void setResource(String resource);
-
-        void setLayer(String layer);
-
-        void setId(String identifier);
-
-        void setNested(boolean nested);
-
-        interface ContainedJarMetadataInfo {
-            void setGroup(String group);
-
-            void setName(String name);
-
-            void setPath(String version);
-        }
-    }
-
-    static final class ResolvedDependencyInfoImpl implements ResolvedDependencyInfo, ResolvedDependencyInfo.ContainedJarMetadataInfo, Serializable {
-        private static final @Serial long serialVersionUID = -7577318115877822993L;
-
-        final MinimalModuleVersionIdentifier module;
-        final String version;
-        String versionRange;
-        boolean hasManuallySpecifiedRange;
-        boolean nested;
-        final File artifact;
-        String path;
-        String resource;
-        String layer;
-        String identifier;
-        final String asString;
-
-        public ResolvedDependencyInfoImpl(MinimalModuleVersionIdentifier module, String version, File artifact, String asString) {
-            this.module = module;
-            this.version = version;
-            this.artifact = artifact;
-            this.asString = asString;
-        }
-
-        @Override
-        public void containedJarMetadata(Action<? super ContainedJarMetadataInfo> action) {
-            action.execute(this);
-        }
-
-        @Override
-        public void setGroup(String group) {
-            this.module.group = group;
-        }
-
-        @Override
-        public void setName(String name) {
-            this.module.name = name;
-        }
-
-        @Override
-        public void setPath(String path) {
-            this.path = path;
-        }
-
-        @Override
-        public void setResource(String resource) {
-            this.resource = resource;
-        }
-
-        @Override
-        public void setLayer(String layer) {
-            this.layer = layer;
-        }
-
-        @Override
-        public void setId(String identifier) {
-            this.identifier = identifier;
-        }
-
-        @Override
-		public void setNested(boolean nested) {
-			this.nested = nested;
-		}
-
-        static Set<File> getFiles(Set<ResolvedDependencyInfoImpl> resolvedDependencies) {
-            var ret = new HashSet<File>(resolvedDependencies.size());
-            for (var dependency : resolvedDependencies) {
-                ret.add(dependency.artifact);
-            }
-            return ret;
-        }
-
-        static ResolvedDependencyInfoImpl from(ConfigurationContainer configurations, Dependency dependency) {
-            var group = dependency.getGroup();
-            var name = dependency.getName();
-            var version = dependency.getVersion();
-
-            if (dependency instanceof FileCollectionDependency filesDependency) {
-                File artifact;
-                try {
-                    artifact = filesDependency.getFiles().getSingleFile();
-                } catch (IllegalStateException e) {
-                    // TODO fileCollectionDependencyIsNotSingleFile
-                    throw e;
-                }
-
-                return new ResolvedDependencyInfoImpl(
-                    new MinimalModuleVersionIdentifier(group, name, version),
-                    version,
-                    artifact,
-                    filesDependency.toString()
-                );
-            } else if (dependency instanceof ModuleDependency moduleDependency) {
-                moduleDependency = moduleDependency.copy();
-                if (moduleDependency instanceof ExternalModuleDependency externalModuleDependency) {
-                    externalModuleDependency.version(v -> v.strictly(version.toString()));
-                }
-
-                var detachedConfiguration = configurations.detachedConfiguration(moduleDependency);
-                detachedConfiguration.setTransitive(false);
-
-                ResolvedDependencyInfoImpl ret = null;
-                for (var artifact : detachedConfiguration.getResolvedConfiguration().getFirstLevelModuleDependencies().iterator().next().getModuleArtifacts()) {
-                    var fileName = getFileName(artifact);
-                    if (!fileName.endsWith(".jar"))
-                        continue;
-
-                    if (ret != null)
-                        throw new IllegalArgumentException("Module dependency has too many Jar artifacts: " + moduleDependency);
-
-                    ret = new ResolvedDependencyInfoImpl(
-                        new MinimalModuleVersionIdentifier(group, name, artifact.getModuleVersion().getId().getVersion()),
-                        version,
-                        artifact.getFile(),
-                        moduleDependency.toString()
-                    );
-                }
-                if (ret == null)
-                    throw new IllegalArgumentException("Module dependency has no Jar artifacts: " + moduleDependency);
-
-                return ret;
-            } else {
-                throw new IllegalArgumentException("Unsupported dependency type: " + dependency.getClass().getName() + " -- " + dependency);
-            }
-        }
-
-        private static String getFileName(ResolvedArtifact artifact) {
-            try {
-                return InvokerHelper.getProperty(artifact.getId(), "fileName").toString();
-            } catch (Throwable e) {
-                // NOTE: Why not just use this to begin with?
-                // ComponentArtifactIdentifier can have a getFileName() method, which doesn't necessarily resolve the file itself.
-                // This allows us to get the name of the file to be used without asking Gradle to download the file.
-                // So, if a file is not a JAR file, we can check the name without actually downloading it.
-                return artifact.getFile().getName();
-            }
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (obj == this) return true;
-            if (obj == null || obj.getClass() != this.getClass()) return false;
-            var that = (ResolvedDependencyInfoImpl) obj;
-            return Objects.equals(this.module, that.module) &&
-                Objects.equals(this.version, that.version) &&
-                Objects.equals(this.versionRange, that.versionRange) &&
-                Objects.equals(this.artifact, that.artifact);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(module, version, versionRange, artifact);
-        }
-
-        @Override
-        public String toString() {
-            return "ResolvedDependencyInfo[" +
-                "module=" + module + ", " +
-                "fixedVersion=" + version + ", " +
-                "versionRange=" + versionRange + ", " +
-                "artifact=" + artifact + ']';
-        }
-
-        static final class MinimalModuleVersionIdentifier implements ModuleIdentifier, ModuleVersionIdentifier {
-            private static final @Serial long serialVersionUID = -955346236759069739L;
-
-            private String group;
-            private String name;
-            private final String version;
-
-            @Inject
-            public MinimalModuleVersionIdentifier(String group, String name, String version) {
-                this.group = group;
-                this.name = name;
-                this.version = version;
-            }
-
-            @Override
-            public ModuleIdentifier getModule() {
-                return this;
-            }
-
-            @Override
-            public String getGroup() {
-                return this.group;
-            }
-
-            @Override
-            public String getName() {
-                return this.name;
-            }
-
-            @Override
-            public String getVersion() {
-                return this.version;
-            }
-
-            @Override
-            public boolean equals(Object obj) {
-                return this == obj || obj instanceof MinimalModuleVersionIdentifier o
-                    && Objects.equals(this.group, o.group)
-                    && Objects.equals(this.name, o.name)
-                    && Objects.equals(this.version, o.version);
-            }
-
-            @Override
-            public int hashCode() {
-                return Objects.hash(group, name, version);
-            }
-
-            @Override
-            public String toString() {
-                return "MinimalModuleVersionIdentifier[" +
-                    "group=" + group + ", " +
-                    "name=" + name + ", " +
-                    "version=" + version + ']';
-            }
-        }
-    }
-}
@@ -1,94 +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 org.gradle.api.tasks.bundling.AbstractArchiveTask
-
-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<>()
-
-    LauncherJson() {
-        output.convention(project.layout.buildDirectory.file('libs/version.json'))
-
-        dependsOn(project.tasks.universalJar)
-        input.from(project.tasks.universalJar.archiveFile)
-        input.from(project.configurations.installer)
-        configure {
-            def mc    = project.rootProject.ext.MC_VERSION
-            def forge = project.rootProject.ext.FORGE_VERSION
-            def timestamp = iso8601Now()
-            json.putAll([
-                _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/"
-                ],
-                id: "$mc-$project.name-$forge",
-                time: timestamp,
-                releaseTime: timestamp,
-                inheritsFrom: mc,
-                type: 'release',
-                logging: [:],
-                mainClass: '',
-                libraries: []
-            ] as LinkedHashMap)
-            
-            [
-                project.tasks.universalJar
-            ].forEach { packed ->
-                dependsOn(packed)
-                input.from packed.archiveFile
-            }
-            
-            def patched = project.tasks.applyClientBinPatches
-            dependsOn(patched)
-            input.from patched.output
-        }
-    }
-
-    @TaskAction
-    protected void exec() {
-        var packed = (AbstractArchiveTask) project.tasks.universalJar
-        def info = Util.getMavenInfoFromTask(packed)
-        json.libraries.add([
-            name: info.name,
-            downloads: [
-                artifact: [
-                    path: info.path,
-                    url: "https://maven.minecraftforge.net/$info.path",
-                    sha1: packed.archiveFile.get().asFile.sha1(),
-                    size: packed.archiveFile.get().asFile.length()
-                ]
-            ]
-        ])
-
-        var classifier = 'client'
-        var genned = project.tasks.applyClientBinPatches
-        info = Util.getMavenInfoFromTask(genned, classifier)
-        json.libraries.add([
-            name: info.name,
-            downloads: [
-                artifact: [
-                    path: info.path,
-                    url: "",
-                    sha1: genned.output.get().asFile.sha1(),
-                    size: genned.output.get().asFile.length()
-                ]
-            ]
-        ])
-
-        json.libraries.addAll(getArtifacts(project.configurations.installer).values())
-        Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString())
-    }
-}
@@ -1,46 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.transform.CompileStatic
-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
-
-@CompileStatic
-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))) {
-                    ZipEntry 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()
-}
@@ -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() <=> o.toString()
-    }
-}
@@ -1,47 +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 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()
-}
@@ -1,74 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-import groovy.transform.CompileStatic
-import org.eclipse.jgit.api.Git
-
-import javax.annotation.Nullable
-import java.util.stream.Collectors
-
-@CompileStatic
-class TeamcityRequests {
-    public static final Gson GSON = new Gson()
-
-    @Nullable
-    static <T> T jsonRequest(TypeToken<T> clazz, String url) throws Exception {
-        final HttpURLConnection conn = (HttpURLConnection) URI.create(url).toURL().openConnection()
-        conn.setRequestProperty('Accept', 'application/json')
-        conn.setReadTimeout(5 * 1000)
-        conn.setConnectTimeout(5 * 1000)
-        conn.connect()
-
-        if (conn.responseCode !== 200) {
-            return null
-        }
-
-        try (final InputStream is = conn.getInputStream()) {
-            GSON.fromJson(new InputStreamReader(is), clazz.getType())
-        }
-    }
-
-    @Nullable
-    static Map<String, Build> buildsByCommit() throws IOException {
-        final Map<String, Build> builds = [:]
-        jsonRequest(new TypeToken<Builds>() {}, 'https://teamcity.minecraftforge.net/guestAuth/app/rest/builds?fields=build:(revisions,number)&locator=buildType:(id:MinecraftForge_MinecraftForge_MinecraftForge_MinecraftForge__Build),defaultFilter:false,count:300,status:SUCCESS')
-                ?.build?.forEach {
-            it.revisions.revision.each { rev -> builds[rev.version] = it }
-        }
-        return builds
-    }
-
-    @Nullable
-    static String attemptFindBase(File gitPath) {
-        try (final git = Git.open(gitPath)) {
-            final Map<String, Build> buildByCommit = buildsByCommit()
-            for (final commit in git.log().setMaxCount(100).call()) {
-                // Find the first commit which was built on CI
-                final build = buildByCommit[commit.id.name]
-                if (build) {
-                    return build.number
-                }
-            }
-        } catch (Exception ignored) {}
-        return null
-    }
-
-    static final class Builds {
-        public List<Build> build
-    }
-
-    static final class Build {
-        public String number
-        public Revisions revisions
-    }
-
-    static final class Revisions {
-        public int count
-        public List<Revision> revision
-    }
-
-    static final class Revision {
-        public String version
-    }
-}
@@ -1,230 +0,0 @@
-package net.minecraftforge.forge.tasks
-
-import groovy.json.JsonBuilder
-import groovy.json.JsonSlurper
-import groovy.transform.CompileStatic
-import groovy.transform.stc.ClosureParams
-import groovy.transform.stc.SimpleType
-import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.api.artifacts.Configuration
-import org.gradle.api.artifacts.ResolvedArtifact
-import org.gradle.api.tasks.bundling.AbstractArchiveTask
-import org.objectweb.asm.ClassReader
-import org.objectweb.asm.Opcodes
-import org.objectweb.asm.tree.ClassNode
-
-import java.net.http.HttpClient
-import java.net.http.HttpRequest
-import java.net.http.HttpResponse
-import java.security.MessageDigest
-import java.text.SimpleDateFormat
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.Semaphore
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-
-final class Util {
-    public static final int ASM_LEVEL = Opcodes.ASM9
-    private static final HttpClient HTTP = HttpClient.newBuilder().build()
-
-    static void init() {
-        File.metaClass.sha1 = { ->
-            MessageDigest md = MessageDigest.getInstance('SHA-1')
-            delegate.eachByte(4096) { byte[] bytes, int size ->
-                md.update(bytes, 0, size)
-            }
-            return md.digest().collect(this.&toHex).join('')
-        }
-        File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() }
-        File.metaClass.sha256 = { ->
-            MessageDigest md = MessageDigest.getInstance('SHA-256')
-            delegate.eachByte(4096) { byte[] bytes, int size ->
-                md.update(bytes, 0, size)
-            }
-            return md.digest().collect(this.&toHex).join('')
-        }
-        File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() }
-
-        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 = { ->
-            var format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
-            var result = format.format(delegate)
-            return result[0..21] + ':' + result[22..-1]
-        }
-
-        String.metaClass.rsplit = { String del, int limit = -1 ->
-            var lst = new ArrayList<String>()
-            int x = 0
-            int idx
-            String 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
-        }
-    }
-
-    static String[] getClasspath(Project project, Map libs, String artifact) {
-        def ret = []
-        artifactTree(project, artifact).each { key, lib ->
-            libs[lib.name] = lib
-            if (lib.name != artifact)
-                ret.add(lib.name)
-        }
-        return ret
-    }
-
-    @CompileStatic
-    static Map getArtifacts(Configuration config) {
-        var ret = [:]
-        var semaphore = new Semaphore(1, true)
-        config.resolvedConfiguration.resolvedArtifacts.parallelStream().forEachOrdered(dep -> {
-            var info = getMavenInfoFromDep(dep)
-            var domain = 'libraries.minecraft.net'
-            var url = "https://$domain/$info.path"
-            if (!checkExists(url))
-                url.values[0] = 'maven.minecraftforge.net'
-
-            var sha1 = sha1(dep.file)
-
-            semaphore.acquire()
-            ret[info.key] = [
-                name: info.name,
-                downloads: [
-                    artifact: [
-                        path: info.path,
-                        url: url.toString(),
-                        sha1: sha1,
-                        size: dep.file.length()
-                    ]
-                ]
-            ]
-            semaphore.release()
-        })
-        return ret
-    }
-
-    @CompileStatic
-    static Map getMavenInfoFromDep(ResolvedArtifact dep) {
-        return getMavenInfoFromMap([
-            group: dep.moduleVersion.id.group,
-            name: dep.moduleVersion.id.name,
-            version: dep.moduleVersion.id.version,
-            classifier: dep.classifier,
-            extension: dep.extension
-        ])
-    }
-
-    @CompileStatic
-    static Map getMavenInfoFromTask(AbstractArchiveTask task) {
-        return getMavenInfoFromMap([
-            group: task.project.group.toString(),
-            name: task.project.name,
-            version: task.project.version.toString(),
-            classifier: task.archiveClassifier.get(),
-            extension: task.archiveExtension.get()
-        ])
-    }
-
-    @CompileStatic
-    static Map getMavenInfoFromTask(Task task, String classifier) {
-        return getMavenInfoFromMap([
-            group: task.project.group.toString(),
-            name: task.project.name,
-            version: task.project.version.toString(),
-            classifier: classifier,
-            extension: 'jar'
-        ])
-    }
-
-    @CompileStatic
-    private static Map getMavenInfoFromMap(Map<String, String> art) {
-        var key = "$art.group:$art.name"
-        var name = "$art.group:$art.name:$art.version"
-        var path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version"
-        if (art.classifier !== null) {
-            name += ":$art.classifier"
-            path += "-$art.classifier"
-        }
-        if ('jar' != art.extension) {
-            name += "@$art.extension"
-            path += ".$art.extension"
-        } else {
-            path += ".jar"
-        }
-        return [
-            key: key.toString(),
-            name: name.toString(),
-            path: path.toString(),
-            art: art
-        ]
-    }
-
-    static String iso8601Now() { new Date().iso8601() }
-
-    @CompileStatic
-    static String sha1(File file) {
-        MessageDigest md = MessageDigest.getInstance('SHA-1')
-        file.eachByte(4096) { byte[] bytes, int size ->
-            md.update(bytes, 0, size)
-        }
-        return md.digest().collect(this.&toHex).join('')
-    }
-
-    @CompileStatic
-    private static String toHex(byte bite) {
-        return String.format('%02x', bite)
-    }
-
-    private static Map artifactTree(Project project, String artifact, boolean transitive = true) {
-        if (!project.ext.has('tree_resolver'))
-            project.ext.tree_resolver = 1
-        def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++)
-        cfg.transitive = transitive
-        def dep = project.dependencies.create(artifact)
-        cfg.dependencies.add(dep)
-        def files = cfg.resolve()
-        return getArtifacts(cfg)
-    }
-
-    @CompileStatic
-    static boolean checkExists(String url) {
-        try {
-            return HTTP.send(HttpRequest.newBuilder(new URI(url))
-                    .method('HEAD', HttpRequest.BodyPublishers.noBody()).build(), HttpResponse.BodyHandlers.discarding()
-            ).statusCode() === 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
-        }
-    }
-
-    static String getLatestForgeVersion(String mcVersion) {
-        final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8'))
-        final ver = json.promos["$mcVersion-latest"]
-        ver === null ? null : (mcVersion + '-' + ver)
-    }
-
-    @CompileStatic
-    static void processClassNodes(File file, @ClosureParams(value = SimpleType, options = 'org.objectweb.asm.tree.ClassNode') Closure process) {
-        file.withInputStream { i ->
-            new ZipInputStream(i).withCloseable { zin ->
-                ZipEntry zein
-                while ((zein = zin.nextEntry) !== null) {
-                    if (zein.name.endsWith('.class')) {
-                        var node = new ClassNode(ASM_LEVEL)
-                        new ClassReader(zin).accept(node, 0)
-                        process(node)
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.forge.tasks
-
-import groovy.transform.CompileStatic
-import net.minecraftforge.srgutils.MinecraftVersion
-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.InputFile
-import org.gradle.api.tasks.TaskAction
-import org.objectweb.asm.tree.AnnotationNode
-import org.objectweb.asm.tree.ClassNode
-
-abstract class ValidateDeprecations extends DefaultTask {
-    @InputFile
-    abstract RegularFileProperty getInput()
-
-    @Input
-    abstract Property<String> getMcVersion()
-
-    ValidateDeprecations() {
-        this.onlyIf { !System.env.TEAMCITY_VERSION }
-    }
-
-    @TaskAction
-    protected void exec() {
-        var mcVer = MinecraftVersion.from(mcVersion.get())
-        List<String> errors = []
-
-        Util.processClassNodes(input.get().asFile) {
-            processNode(mcVer, errors, it)
-        }
-
-        if (!errors.isEmpty()) {
-            errors.forEach {
-                this.logger.error("Deprecated ${it[0]} is marked for removal in ${it[1]} but is not yet removed")
-            }
-            throw new IllegalStateException("Found deprecated members marked for removal but not yet removed in ${mcVer}; see log for details")
-        }
-    }
-
-    protected processNode(MinecraftVersion mcVer, List<String> errors, ClassNode node) {
-        node.visibleAnnotations?.each { annotation ->
-            ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
-                "class ${node.name}"
-            }
-        }
-        node.fields?.each { field ->
-            field.visibleAnnotations?.each { annotation ->
-                ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
-                    "field ${node.name}#${field.name}"
-                }
-            }
-        }
-        node.methods?.each { method ->
-            method.visibleAnnotations?.each { annotation ->
-                ValidateDeprecations.processAnnotations(annotation, mcVer, errors) {
-                    "method ${node.name}#${method.name}${method.desc}"
-                }
-            }
-        }
-    }
-
-    private static void processAnnotations(AnnotationNode annotation, MinecraftVersion mcVer, List<String> errors, Closure<String> context) {
-        def values = annotation.values
-        if (values === null)
-            return
-        int forRemoval = values.indexOf('forRemoval')
-        int since = values.indexOf('since')
-        if (annotation.desc == 'Ljava/lang/Deprecated;' && forRemoval !== -1 && since !== -1 && values.size() >= 4 && values[forRemoval + 1] === true) {
-            def oldVersion = MinecraftVersion.from(values[since + 1])
-            int[] split = ValidateDeprecations.splitDots(oldVersion.toString())
-            if (split.length < 2)
-                return
-            def removeVersion = MinecraftVersion.from("${split[0]}.${split[1] + 1}")
-            if (removeVersion <= mcVer)
-                errors.add([context(), removeVersion])
-        }
-    }
-
-    @CompileStatic
-    private static int[] splitDots(String version) {
-        String[] pts = version.split('\\.')
-        int[] values = new int[pts.length]
-        for (int x = 0; x < pts.length; x++)
-            values[x] = Integer.parseInt(pts[x])
-        return values
-    }
-}
@@ -1,282 +0,0 @@
-package net.minecraftforge.forge.tasks.checks
-
-import groovy.transform.CompileStatic
-import groovy.transform.TupleConstructor
-import net.minecraftforge.forge.tasks.InheritanceData
-import net.minecraftforge.srgutils.IMappingFile
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFile
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.Optional
-import org.objectweb.asm.Opcodes
-
-@CompileStatic
-abstract class CheckATs extends CheckTask {
-
-    @InputFile abstract RegularFileProperty getInheritance()
-    @InputFiles abstract ConfigurableFileCollection getAts()
-
-    @Override
-    void check(Reporter reporter, boolean fix) {
-        final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
-
-        ats.each {
-            final lines = process(it, reporter, inheritance)
-            if (fix) {
-                it.text = joinBack(lines, inheritance).join('\n')
-            }
-        }
-    }
-
-    private static TreeMap<String, ATParser.Entry> process(File file, Reporter reporter, Map<String, InheritanceData> inheritance) {
-        final TreeMap<String, ATParser.Entry> lines = ATParser.parse(file.readLines(), reporter)
-        final Map<String, ATParser.Entry> constructorGroups = [:]
-
-        final itr = lines.entrySet().iterator()
-        final toRemove = []
-        while (itr.hasNext()) {
-            final next = itr.next()
-            String key = next.key
-            final entry = next.value
-            if (entry === null) continue
-
-            final binaryName = entry.cls.replaceAll('\\.', '/')
-
-            // Process Groups, this will remove any entries outside the group that is covered by the group
-            if (entry.group) {
-                final jcls = inheritance[binaryName]
-                if (jcls === null) {
-                    itr.remove()
-                    reporter.report("Invalid group: $key")
-                } else if ('*' == entry.desc) {
-                    if (!jcls.fields) {
-                        itr.remove()
-                        reporter.report("Invalid group, class has no fields: $key")
-                    } else {
-                        jcls.fields.each { field, value ->
-                            final fkey = entry.cls + ' ' + field
-                            if (accessLevel(value.access) < accessStr(entry.modifier)) {
-                                if (lines.containsKey(fkey)) {
-                                    toRemove.add(fkey)
-                                } else if (!entry.existing.contains(fkey)) {
-                                    reporter.report("Missing group entry: $fkey")
-                                }
-                                entry.children.add(fkey)
-                            } else if (lines.containsKey(fkey)) {
-                                toRemove.add(fkey)
-                                reporter.report("Found invalid group entry: $fkey")
-                            }
-                        }
-                        entry.existing.findAll { it !in entry.children }.each { println('Removed: ' + it) }
-                    }
-                } else if ('*()' == entry.desc) {
-                    if (!jcls.methods) {
-                        itr.remove()
-                        reporter.report("Invalid group, class has no methods: $key")
-                    } else {
-                        jcls.methods.each { mtd, value ->
-                            if (mtd.startsWith('<clinit>') || mtd.startsWith('lambda$')) return
-                            key = entry.cls + ' ' + mtd.replace(' ', '')
-                            if (accessLevel(value.access) < accessStr(entry.modifier)) {
-                                if (lines.containsKey(key)) {
-                                    toRemove.add(key)
-                                } else if (!entry.existing.contains(key)) {
-                                    reporter.report("Missing group entry: $key")
-                                }
-                                entry.children.add(key)
-                            } else if (lines.containsKey(key)) {
-                                toRemove.add(key)
-                                reporter.report("Found invalid group entry: $key")
-                            }
-                        }
-                        entry.existing.findAll { it !in entry.children }.each { println('Removed: ' + it) }
-                    }
-                } else if ('<init>' == entry.desc) { //Make all public non-abstract subclasses
-                    constructorGroups.put(binaryName, entry)
-                }
-            }
-
-            // Process normal lines, remove invalid and remove narrowing
-            else {
-                def jcls = inheritance.get(binaryName)
-                if (jcls === null) {
-                    itr.remove()
-                    reporter.report("Invalid: $key")
-                } else if (entry.desc == '') {
-                    if (accessLevel(jcls.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
-                        itr.remove()
-                        reporter.report("Invalid Narrowing: $key")
-                    }
-                } else if (!entry.desc.contains('(')) {
-                    if (!jcls.fields || !jcls.fields.containsKey(entry.desc)) {
-                        itr.remove()
-                        reporter.report("Invalid: $key")
-                    } else {
-                        final value = jcls.fields[entry.desc]
-                        if (accessLevel(value.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
-                            itr.remove()
-                            reporter.report("Invalid Narrowing: $key - ${entry.comment}")
-                        }
-                    }
-                } else {
-                    final jdesc = entry.desc.replace('(', ' (')
-                    if (!jcls.methods || !jcls.methods.containsKey(jdesc)) {
-                        itr.remove()
-                        reporter.report("Invalid: $key")
-                    } else {
-                        final value = jcls.methods[jdesc]
-                        if (accessLevel(value.access) > accessStr(entry.modifier) && (entry.comment === null || !entry.comment.startsWith('#force '))) {
-                            itr.remove()
-                            reporter.report("Invalid Narrowing: $key")
-                        }
-                    }
-                }
-            }
-        }
-
-        inheritance.each { tcls, value ->
-            if (!value.methods || ((value.access & Opcodes.ACC_ABSTRACT) !== 0)) return
-            String parent = tcls
-            while (parent !== null) {
-                constructorGroups[parent]?.tap { entry ->
-                    value.methods.each { mtd, v ->
-                        if (mtd.startsWith('<init>')) {
-                            final child = tcls.replaceAll('/', '\\.') + ' ' + mtd.replace(' ', '')
-                            if (accessLevel(v.access) < 3) {
-                                if (lines.containsKey(child)) {
-                                    toRemove.add(child)
-                                } else if (child !in entry.existing) {
-                                    reporter.report("Missing group entry: $child")
-                                }
-                                entry.children.add(child)
-                            } else if (lines.containsKey(child)) {
-                                toRemove.add(child)
-                                reporter.report("Found invalid group entry: $child")
-                            }
-                        }
-                    }
-                }
-                parent = inheritance[parent]?.superName
-            }
-        }
-        constructorGroups.values().each { entry -> entry.existing.findAll { it !in entry.children }.each{  reporter.report("Found invalid group entry: $it") } }
-
-        toRemove.each(lines.&remove)
-
-        return lines
-    }
-
-    private static List<String> joinBack(TreeMap<String, ATParser.Entry> lines, Map<String, InheritanceData> inheritance) {
-        final data = [] as List<String>
-        lines.each { key, value ->
-            if (!value.group) {
-                def comment = null //value.comment
-                data.add(value.modifier + ' ' + key + (comment ? ' ' + comment : ''))
-            } else {
-                data.add(('#group ' + value.modifier + ' ' + key + ' ' + (value.comment ?: '')).trim())
-                value.children.each {
-                    final line = value.modifier + ' ' + it
-                    final entry = ATParser.parseEntry(line)
-                    final comment = null //entry.comment
-                    data.add(line + (comment ? ' ' + comment : ''))
-                }
-                data.add('#endgroup')
-            }
-        }
-        return data
-    }
-
-    static int accessStr(String 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
-        }
-    }
-
-    static int accessLevel(int 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
-    }
-}
-
-@CompileStatic
-class ATParser {
-    static TreeMap<String, Entry> parse(List<String> lines, CheckTask.Reporter reporter) {
-        TreeMap<String, Entry> outLines = new TreeMap<>()
-        Entry group = null
-        for (final line : lines) {
-            if (line.isEmpty()) continue
-            if (line.startsWith('#group ')) {
-                final entry = parseEntry(line.substring(7))
-
-                if (entry.desc != '*' && entry.desc != '*()' && entry.desc != '<init>') {
-                    reporter.report("Invalid group: $line", false)
-                }
-
-                entry.group = true
-                entry.children = []
-                entry.existing = []
-
-                group = entry
-
-                if (outLines.containsKey(entry.key)) {
-                    reporter.report("Duplicate group: $line", false)
-                }
-
-                outLines[entry.key] = group
-            } else if (group !== null) {
-                if (line.startsWith('#endgroup')) {
-                    group = null
-                } else {
-                    final key = parseEntry(line).key
-                    group.existing.add(key)
-                }
-            } else if (line.startsWith('#endgroup')) {
-                reporter.report("Invalid group ending: $line", false)
-            } else if (line.startsWith('#')) {
-                //Nom
-            } else {
-                final entry = parseEntry(line)
-                if (outLines.containsKey(entry.key)) {
-                    reporter.report("Found duplicate: $line")
-                    continue
-                }
-                outLines[entry.key] = entry
-            }
-        }
-        return outLines
-    }
-
-    static Entry parseEntry(String line) {
-        final idx = line.indexOf('#')
-        final String comment = idx === -1 ? null : line.substring(idx)
-        if (idx !== -1) line = line.substring(0, idx - 1)
-        final data = (line.trim() + '     ').split(' ', -1)
-    	data[1] = data[1].replaceAll('/', '.') // Convert to Source names, internal names are fine by spec, but not supported by old AST based AT implementations.
-        new Entry(data[0], data[1], data[2], comment)
-    }
-
-    @TupleConstructor
-    static final class Entry {
-        String modifier, cls, desc, comment
-
-        Set<String> existing
-        TreeSet<String> children
-        boolean group = false
-
-        @Lazy
-        String key = {cls + (desc.isEmpty() ? '' : ' ' + desc)}()
-
-        Object getAt(String key) {
-            return getProperty(key)
-        }
-    }
-}
@@ -1,95 +0,0 @@
-package net.minecraftforge.forge.tasks.checks
-
-import net.minecraftforge.forge.tasks.Util
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.InputFiles
-import org.objectweb.asm.ClassReader
-import org.objectweb.asm.ClassVisitor
-import org.objectweb.asm.MethodVisitor
-import org.objectweb.asm.Type
-
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-
-abstract class CheckExcs extends CheckTask {
-
-    @InputFile abstract RegularFileProperty getBinary()
-    @InputFiles abstract ConfigurableFileCollection getExcs()
-
-    @Override
-    void check(Reporter reporter, boolean fix) {
-        final Set<String> known = []
-        collectKnown(known)
-
-        excs.each { f ->
-            final lines = []
-            f.eachLine { line ->
-                int idx = line.indexOf('#')
-                if (idx === 0 || line.isEmpty()) {
-                    return
-                }
-
-                if (idx !== -1) line = line.substring(0, idx - 1)
-
-                if (!line.contains('=')) {
-                    reporter.report("Invalid: $line")
-                    return
-                }
-
-                def (String key, String value) = line.split('=', 2)
-                if (!known.contains(key)) {
-                    reporter.report("Unknown: $line")
-                    return
-                }
-
-                String desc = key.split('\\.', 2)[1]
-                if (!desc.contains('(')) {
-                    reporter.report("Invalid: $line")
-                    return
-                }
-                desc = '(' + desc.split('\\(', 2)[1]
-
-                def (exceptions, String args) = value.contains('|') ? value.split('|', 2) : [value, '']
-
-                if (args.split(',').length !== Type.getArgumentTypes(desc).length) {
-                    reporter.report("Invalid: $line")
-                    return
-                }
-                lines.add(line)
-
-                return
-            }
-
-            if (fix) f.text = lines.sort().join('\n')
-        }
-    }
-
-    private void collectKnown(Collection<String> known) {
-        binary.get().asFile.withInputStream { i ->
-            new ZipInputStream(i).withCloseable { zin ->
-                final visitor = new ClassVisitor(Util.ASM_LEVEL) {
-                    private String cls
-                    @Override
-                    void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-                        this.cls = name
-                    }
-
-                    @Override
-                    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)
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,11 +0,0 @@
-package net.minecraftforge.forge.tasks.checks
-
-import groovy.transform.CompileStatic
-
-@CompileStatic
-enum CheckMode {
-    CHECK,
-    FIX
-
-    CheckMode() {}
-}
@@ -1,182 +0,0 @@
-package net.minecraftforge.forge.tasks.checks
-
-import groovy.transform.CompileStatic
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.ListProperty
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.Optional
-
-import java.nio.file.Files
-import java.nio.file.Path
-import java.util.regex.Pattern
-
-@CompileStatic
-abstract class CheckPatches extends CheckTask {
-
-    private static final Pattern HUNK_START_PATTERN = Pattern.compile('^@@ -[0-9,]* \\+[0-9,_]* @@$')
-    private static final Pattern WHITESPACE_PATTERN = Pattern.compile('^[+\\-]\\s*$')
-    private static final Pattern IMPORT_PATTERN = Pattern.compile('^[+\\-]\\s*import.*')
-    private static final Pattern FIELD_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^=;]*)(=.*)?;\\s*$')
-    private static final Pattern METHOD_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final)?([^(]*)[(]([^)]*)?[)]\\s*[{]\\s*$')
-    private static final Pattern CLASS_PATTERN = Pattern.compile('^[+\\-][\\s]*((public|protected|private)[\\s]*)?(static[\\s]*)?(final[\\s]*)?(class|interface)([^{]*)[{]\\s*$')
-    private static final Map<String, Integer> ACCESS_MAP = [private: 0, protected: 2, public: 3].tap { it.put(null, 1) }
-
-    @InputDirectory abstract DirectoryProperty getPatchDir()
-    @Input @Optional abstract ListProperty<String> getPatchesWithS2SArtifact()
-
-    @Override
-    void check(Reporter reporter, boolean fix) {
-        final patchDir = getPatchDir().get().asFile.toPath()
-        Files.walk(patchDir).withCloseable {
-            it.filter(Files.&isRegularFile).forEach { path ->
-                final String relativeName = patchDir.relativize(path).toString()
-                verifyPatch(path, reporter, fix, relativeName, patchesWithS2SArtifact.get().contains(relativeName.replace('\\', '/')))
-            }
-        }
-    }
-    
-    static boolean accessChange(String previous, String current) {
-        //return ACCESS_MAP[previous] < ACCESS_MAP[current]
-        return previous != current
-    }
-
-    void verifyPatch(Path patch, Reporter reporter, boolean fix, String patchPath, boolean hasS2SArtifact) {
-        int oldFixedErrors = reporter.fixed.size()
-
-        final lines = Files.readAllLines(patch)
-
-        int hunksStart = 0
-        boolean onlyWhiteSpace = false
-
-        final List<String> newLines = []
-
-        // First two lines are file name ++/-- and we do not care
-        newLines.add(lines[0] + '\n')
-        newLines.add(lines[1] + '\n')
-
-        int i
-        for (i = 2; i < lines.size(); ++i) {
-            def line = lines[i]
-            newLines.add(line + '\n')
-
-            if (HUNK_START_PATTERN.matcher(line).find()) {
-                if (onlyWhiteSpace) {
-                    if (!hasS2SArtifact)
-                        reporter.report("Patch contains only white space hunk starting at line ${hunksStart + 1}, file: $patchPath")
-                    int toRemove = i - hunksStart
-                    while (toRemove-- > 0)
-                        newLines.remove(newLines.size() - 1)
-                }
-                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 == 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
-                            (accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
-                        reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
-                    }
-
-                    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
-                            (accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
-                        reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
-                    }
-
-                    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
-                            (accessChange(pMatcher.group(2), cMatcher.group(2)) || pMatcher.group(4) != cMatcher.group(4))) {
-                        reporter.report("Patch contains access changes or final removal at line ${i + 1}, file: $patchPath", false)
-                    }
-                }
-
-                if (line.charAt(0) == (char)'-' && i + 1 < lines.size()) {
-                    final nextLine = lines[i + 1]
-                    if (nextLine.charAt(0) == (char)'+') {
-                        final nextTrim = nextLine.substring(1).replaceAll("\\s", "")
-                        final currTrim = line.substring(1).replaceAll("\\s", "")
-
-                        if (nextTrim == currTrim) {
-                            prefixChange = true
-                        }
-                    }
-                }
-
-                final isWhiteSpaceChange = WHITESPACE_PATTERN.matcher(line).find()
-
-                if (!prefixChange && !isWhiteSpaceChange) {
-                    onlyWhiteSpace = hasS2SArtifact && IMPORT_PATTERN.matcher(line).find()
-                } else if (isWhiteSpaceChange) {
-                    final prevLineChange = prevLine.startsWithAny('+','-')
-                    final nextLineChange = i + 1 < lines.size() && lines[i + 1].startsWithAny('+','-')
-
-                    if (!prevLineChange && !nextLineChange) {
-                        reporter.report("Patch contains white space change in valid hunk at line ${i + 1}, file: $patchPath \n$prevLine\n$line\n${lines[i+1]}", false)
-                    }
-                }
-
-                if (line.contains('\t')) {
-                    reporter.report("Patch contains tabs on line ${i + 1}, file: $patchPath")
-                    line = line.replaceAll('\t', '    ')
-                    newLines.remove(newLines.size() - 1)
-                    newLines.add(line + '\n')
-                }
-
-                if (IMPORT_PATTERN.matcher(line).find() && !hasS2SArtifact) {
-                    reporter.report("Patch contains import change on line ${i + 1}, file: $patchPath", false)
-                }
-            }
-        }
-
-        if (onlyWhiteSpace) {
-            if (!hasS2SArtifact)
-                reporter.report("Patch contains only white space hunk starting at line ${hunksStart + 1}, file: $patchPath")
-            def toRemove = i - hunksStart;
-            while (toRemove-- > 0)
-                newLines.remove(newLines.size() - 1)
-        }
-
-        if ((reporter.fixed.size() > oldFixedErrors && fix) || hasS2SArtifact) {
-            if (newLines.size() <= 2) {
-                logger.lifecycle("Patch is now empty removing, file: {}", patchPath)
-                Files.delete(patch)
-            }
-            else {
-                if (!hasS2SArtifact)
-                    logger.lifecycle("*** Updating patch file. Please run setup then genPatches again. ***")
-                Files.newBufferedWriter(patch).withCloseable {
-                    newLines.each { l -> it.write(l) }
-                }
-            }
-        }
-    }
-}
@@ -1,110 +0,0 @@
-package net.minecraftforge.forge.tasks.checks
-
-import groovy.transform.CompileStatic
-import net.minecraftforge.forge.tasks.Annotatable
-import net.minecraftforge.forge.tasks.InheritanceData
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.tasks.InputFile
-import org.gradle.api.tasks.InputFiles
-
-@CompileStatic
-abstract class CheckSAS extends CheckTask {
-
-    @InputFile abstract RegularFileProperty getInheritance()
-    @InputFiles abstract ConfigurableFileCollection getSass()
-
-    @Override
-    void check(Reporter reporter, boolean fix) {
-        final inheritance = InheritanceData.parse(this.inheritance.get().asFile)
-
-        sass.each { f ->
-            final lines = []
-            f.eachLine { line ->
-                if (line[0] == '\t') return // Skip any tabbed lines, those are ones we add
-                final 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)
-                final spl = (line.trim().replace('(', ' (') + '     ').split(' ', -1)
-                def (String cls, String name, String desc) = [spl[0], spl[1], spl[2]]
-                cls = cls.replaceAll('\\.', '/')
-
-                if (inheritance[cls] === null) {
-                    reporter.report("Invalid: $line")
-                } else if (name.isEmpty()) { //Class SAS
-                    final toAdd = []
-                    final clsSided = isSided(inheritance[cls])
-                    boolean 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)
-                            }
-						}
-                    } */
-
-                    final clsInh = inheritance[cls]
-                    if (clsInh.methods) {
-                        for (entry in clsInh.methods) {
-                            if (isSided(entry.value)) {
-                                sided = true
-                                toAdd.add('\t' + cls + ' ' + entry.key.replaceAll(' ', ''))
-                                findChildMethods(inheritance, cls, entry.key).each { lines.add('\t' + it) }
-                                findChildMethods(inheritance, cls, entry.key).each { println(line + ' -- ' + it) }
-                            } else if (clsSided) {
-                                findChildMethods(inheritance, cls, entry.key).each { lines.add('\t' + it) }
-                                findChildMethods(inheritance, cls, entry.key).each { println(line + ' -- ' + it) }
-                            }
-                        }
-                    }
-
-                    if (sided) {
-                        lines.add(cls + (comment == null ? '' : ' ' + comment))
-                        lines.addAll(toAdd.sort())
-                    } else {
-                        reporter.report("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 */
-                    reporter.report("Invalid: $line")
-                } else { // Methods
-                    final clsInh = inheritance[cls]
-                    if (clsInh.methods === null || !isSided(clsInh.methods[name + ' ' + desc]))
-                        reporter.report("Invalid: $line")
-                    else {
-                        lines.add(cls + ' ' + name + desc + (comment == null ? '' : ' ' + comment))
-                        findChildMethods(inheritance, cls, name + ' ' + desc).each { println(line + ' -- ' + it) }
-                        findChildMethods(inheritance, cls, name + ' ' + desc).each { lines.add('\t' + it) }
-                    }
-                }
-            }
-
-            if (fix) f.text = lines.join('\n')
-        }
-    }
-
-    protected static boolean isSided(Annotatable annotatable) {
-        if (annotatable === null) return false
-        for (ann in annotatable.annotations) {
-            if ('Lnet/minecraftforge/api/distmarker/OnlyIn;' == ann.desc)
-                return true
-        }
-        return false
-    }
-    
-    protected static findChildMethods(Map<String, InheritanceData> json, String cls, String 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
-    }
-}
@@ -1,114 +0,0 @@
-package net.minecraftforge.forge.tasks.checks
-
-import groovy.transform.CompileStatic
-import groovy.transform.stc.ClosureParams
-import groovy.transform.stc.ThirdParam
-import net.minecraftforge.forge.tasks.Util
-import org.gradle.api.Action
-import org.gradle.api.DefaultTask
-import org.gradle.api.logging.LogLevel
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.TaskAction
-import org.gradle.api.tasks.TaskContainer
-import org.gradle.api.tasks.VerificationTask
-
-@CompileStatic
-abstract class CheckTask extends DefaultTask implements VerificationTask {
-    @Input
-    abstract Property<CheckMode> getMode()
-
-    private boolean ignoreFailures = false
-
-    @Input
-    @Override
-    boolean getIgnoreFailures() {
-        return ignoreFailures
-    }
-
-    @Override
-    void setIgnoreFailures(boolean ignoreFailures) {
-        this.ignoreFailures = ignoreFailures
-    }
-
-    @TaskAction
-    void run() {
-        Util.init()
-
-        boolean doFix = getMode().get() === CheckMode.FIX
-        final Reporter reporter = new Reporter(doFix)
-        check(reporter, doFix)
-
-        if (reporter.messages) {
-            if (getMode().get() === CheckMode.CHECK) {
-                logger.error("Check task '{}' found errors:\n{}", name, reporter.messages.join('\n'))
-                if (!ignoreFailures) {
-                    throw new IllegalArgumentException("${reporter.messages.size()} errors were found!")
-                }
-            } else {
-                if (logger.isEnabled(LogLevel.DEBUG)) {
-                    logger.warn("Check task '{}' found {} errors and fixed {}:\n{}", name, reporter.messages.size(), reporter.fixed.size(), reporter.fixed.join('\n'))
-                } else {
-                    logger.warn("Check task '{}' found {} errors and fixed {}.", name, reporter.messages.size(), reporter.fixed.size())
-                }
-
-                if (reporter.notFixed) {
-                    logger.error('{} errors could not be fixed:\n{}', reporter.notFixed.size(), reporter.notFixed.join('\n'))
-                    if (!ignoreFailures) {
-                        throw new IllegalArgumentException("${reporter.notFixed.size()} errors which cannot be fixed were found!")
-                    }
-                }
-            }
-        }
-    }
-
-    abstract void check(Reporter reporter, boolean fix)
-
-    @CompileStatic
-    static final class Reporter {
-        final boolean trackFixed
-        Reporter(boolean trackFixed) {
-            this.trackFixed = trackFixed
-        }
-
-        public final List<String> messages = []
-
-        public final List<String> fixed = []
-        public final List<String> notFixed = []
-
-        void report(String message, boolean canBeFixed = true) {
-            messages.add(message)
-
-            if (trackFixed) {
-                if (canBeFixed) {
-                    fixed.add(message)
-                } else {
-                    notFixed.add(message)
-                }
-            }
-        }
-    }
-
-    static <T extends CheckTask> void registerTask(TaskContainer tasks, String taskName, @DelegatesTo.Target('type') Class<T> clazz,
-                                                   @DelegatesTo(genericTypeIndex = 0, target = 'type')
-                                                   @ClosureParams(ThirdParam.FirstGenericType) Closure configuration) {
-        taskName = taskName.capitalize()
-        tasks.register("check$taskName", clazz) { CheckTask task ->
-            def castedTask = task as T
-            configuration.setDelegate(castedTask)
-            configuration.call(castedTask)
-            castedTask.mode.set(CheckMode.CHECK)
-            castedTask.group = 'checks'
-        }
-        tasks.named('checkAll').configure { it.dependsOn("check$taskName") }
-
-        tasks.register("checkAndFix$taskName", clazz) { CheckTask task ->
-            def castedTask = task as T
-            configuration.setDelegate(castedTask)
-            configuration.call(castedTask)
-            castedTask.mode.set(CheckMode.FIX)
-            castedTask.group = 'checks'
-        }
-        tasks.named('checkAllAndFix').configure { it.dependsOn("checkAndFix$taskName") }
-    }
-}
@@ -1,73 +0,0 @@
-plugins {
-    id 'java-library'
-    id 'net.minecraftforge.gradle.patcher'
-}
-
-evaluationDependsOn(':mcp')
-
-repositories {
-    mavenCentral()
-    maven gradleutils.forgeMaven
-    maven gradleutils.minecraftLibsMaven
-}
-    
-java.toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
-
-dependencies {
-	implementation(libs.forgespi)
-}
-
-patcher {
-	parent = project(':mcp')
-	mcVersion = MC_VERSION
-	patchedSrc = file('src/main/java')
-
-	mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
-
-	runs {
-		clean_client {
-			client true
-			taskName 'clean_client'
-			ideaModule "${rootProject.name}.${project.name}.main"
-
-			main 'net.minecraft.client.main.Main'
-			workingDirectory project.file('run/client')
-
-			args '--gameDir', '.'
-			args '--version', MC_VERSION
-			args '--assetsDir', downloadAssets.output
-			args '--assetIndex', '{asset_index}'
-			args '--accessToken', '0'
-		}
-
-		clean_server {
-			client false
-			taskName 'clean_server'
-			ideaModule "${rootProject.name}.${project.name}.main"
-
-			main 'net.minecraft.server.Main'
-			workingDirectory project.file('run/server')
-		}
-	}
-}
-
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-    options.warnings = false // Shutup deprecated for removal warnings
-}
-
-eclipse.classpath.file.whenMerged {
-	// Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase
-	def src = entries.find { it.path == 'src/main/java' }
-    if (src == null) throw new IllegalStateException("You must run `setup` task before importing")
-    src.entryAttributes['ignore_optional_problems'] = 'true'
-}
-
-tasks.named('genPatches').configure {
-    onlyIf { false }
-}
-
-tasks.named('extractRangeMap').configure {
-    onlyIf { false }
-    tool = 'net.minecraftforge:Srg2Source:8.1.0:fatjar'
-}
@@ -1,89 +0,0 @@
-import net.minecraftforge.forge.tasks.CleanProperties
-
-apply plugin: 'eclipse'
-apply plugin: 'idea'
-apply plugin: 'net.minecraftforge.gradleutils'
-
-group = 'net.minecraftforge'
-version = VERSION
-println("Version: $version")
-
-repositories {
-    mavenCentral()
-    maven gradleutils.forgeMaven
-    maven gradleutils.minecraftLibsMaven
-    //mavenLocal()
-}
-
-tasks.withType(Javadoc).configureEach {
-    options.tags = [
-        'apiNote:a:<em>API Note:</em>',
-        'implSpec:a:<em>Implementation Requirements:</em>',
-        'implNote:a:<em>Implementation Note:</em>'
-    ]
-    options.addStringOption('Xdoclint:all,-missing', '-public')
-}
-
-// We need to write the manifest to the binary file so we have properly versioned packaged at dev time.
-tasks.register('writeManifest') {
-    doLast {
-        if (plugins.findPlugin('net.minecraftforge.gradle.patcher')) // Forge project
-            universalJar.manifest.writeTo(rootProject.file('src/main/resources/META-INF/MANIFEST.MF'))
-        else
-            jar.manifest.writeTo(project.file('src/main/resources/META-INF/MANIFEST.MF'))
-    }
-}
-
-tasks.register('generateResources') {
-    dependsOn('writeManifest')
-}
-
-tasks.named('processResources') {
-    dependsOn(generateResources)
-}
-
-// Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build.
-tasks.withType(JavaCompile).configureEach {
-    dependsOn 'generateResources'
-    dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
-    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-    options.warnings = false // Shutup deprecated for removal warnings
-    options.forkOptions.jvmArgs += '-Xmx6G' // Needed to make compiling faster, and not run out of heap space in some cases.
-}
-
-// Merge the resources and classes into the same directory. We'll need to split them at runtime because
-// Minecraft and Forge are in the same sourceSet as they are inter dependent.. for now..
-sourceSets.each {
-    def dir = layout.buildDirectory.dir("classes/java/$it.name")
-    it.output.resourcesDir = dir
-    it.java.destinationDirectory = dir
-}
-
-tasks.register('copyEclipseSettings') {
-    doLast {
-        rootProject.fileTree('ide/eclipse/template/.settings/').matching { include '**/*.prefs' }.each { file ->
-            def target = project.file('.settings/' + file.name)
-            def temp = new CleanProperties().load(file)
-            def exst = new CleanProperties().load(target)
-            exst.put('eclipse.preferences.version', '1')
-            exst.putAll(temp)
-            exst.store(target)
-        }
-    }
-}
-
-// TODO: [Gradle][IntelliJ] Auto trigger these tasks on import.
-eclipse {
-    // Run everytime eclipse builds the code
-    //autoBuildTasks writeManifest
-    // Run when importing the project
-    synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
-}
-
-idea {
-    module {
-        // IntelliJ IDEA does not do this by itself anymore...
-        downloadJavadoc = true
-        downloadSources = true
-    }
-}
@@ -0,0 +1,19 @@
+# Artistic Style format configuration
+# see http://astyle.sourceforge.net/astyle.html
+
+style=allman
+
+add-brackets
+break-closing-brackets
+
+indent-switches
+
+max-instatement-indent=40
+
+pad-oper
+pad-header
+unpad-paren
+
+break-blocks
+
+delete-empty-lines
@@ -0,0 +1,165 @@
+[DEFAULT]
+DirTemp    = temp
+DirSrc     = src
+DirLogs    = logs
+DirBin     = bin
+DirJars    = jars
+DirReobf   = reobf
+DirConf    = conf
+DirRuntime = runtime
+DirLib     = lib
+DirTempSrc = temp/src
+DirTempCls = temp/cls
+DirTempBin = temp/bin
+DirModSrc  = modsrc
+DirEclipse = eclipse
+
+[CSV]
+Classes = %(DirConf)s/classes.csv
+Methods = %(DirConf)s/methods.csv
+Fields  = %(DirConf)s/fields.csv
+Params  = %(DirConf)s/params.csv
+NewIds  = %(DirConf)s/newids.csv
+
+[SRGS]
+ConfClient     = %(DirConf)s/client.srg
+ConfServer     = %(DirConf)s/server.srg
+Client         = %(DirTemp)s/client_rg.srg
+Server         = %(DirTemp)s/server_rg.srg
+DeobfClient    = %(DirTemp)s/client_deobf.srg
+DeobfServer    = %(DirTemp)s/server_deobf.srg
+ReobfClient    = %(DirTemp)s/client_ro.srg
+ReobfServer    = %(DirTemp)s/server_ro.srg
+ReobfClientSrg = %(DirTemp)s/client_ro_srg.srg
+ReobfServerSrg = %(DirTemp)s/server_ro_srg.srg
+
+[JAR]
+DirNatives = %(DirJars)s/bin/natives
+Client     = %(DirJars)s/bin/minecraft.jar
+Server     = %(DirJars)s/minecraft_server.jar
+LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
+MD5Client  = 7a304554fdea879a799efe6eaedd8c95
+MD5Server  = c48168f463e935262ea65b702f175153
+
+[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
+NullPkg        = net/minecraft/src
+
+[EXCEPTOR]
+XClientJson     = %(DirConf)s/exceptor.json
+XServerJson     = %(DirConf)s/exceptor.json
+XClientCfg      = %(DirConf)s/joined.exc
+XServerCfg      = %(DirConf)s/joined.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]
+ClsClientTemp = %(DirTempCls)s/minecraft
+ClsServerTemp = %(DirTempCls)s/minecraft_server
+SrcClientTemp = %(DirTempSrc)s/minecraft
+SrcServerTemp = %(DirTempSrc)s/minecraft_server
+FFSource      = net
+FFClientIn    = %(DirTemp)s/minecraft_ff_in.jar
+FFServerIn    = %(DirTemp)s/minecraft_server_ff_in.jar
+
+[OUTPUT]
+BinClientTemp = %(DirTempBin)s/minecraft
+BinServerTemp = %(DirTempBin)s/minecraft_server
+SrcClient  = %(DirSrc)s/minecraft
+SrcServer  = %(DirSrc)s/minecraft_server
+TestClient = net/minecraft/client/main/Main
+TestServer = net/minecraft/server/MinecraftServer
+
+[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
+PatchClient_osx = %(DirConf)s/patches/minecraft_osx.patch
+PatchServer_osx = %(DirConf)s/patches/minecraft_server_osx.patch
+
+[RECOMPILE]
+BinClient       = %(DirBin)s/minecraft
+BinServer       = %(DirBin)s/minecraft_server
+LogClient       = %(DirLogs)s/client_compile.log
+LogServer       = %(DirLogs)s/server_compile.log
+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
+FixStart        = Start
+IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax,argo,gnu,io/netty
+
+[REOBF]
+MD5Client         = %(DirTemp)s/client.md5
+MD5Server         = %(DirTemp)s/server.md5
+MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
+MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
+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
+ClientRoLog       = %(DirLogs)s/client_ro.log
+ServerRoLog       = %(DirLogs)s/server_ro.log
+ReobfClientLog    = %(DirLogs)s/client_reob.log
+ReobfServerLog    = %(DirLogs)s/server_reob.log
+
+[GETMODSOURCE]
+OutSRCClient      = %(DirModSrc)s/minecraft
+OutSRCServer      = %(DirModSrc)s/minecraft_server
+
+[MCP]
+LogFile           = %(DirLogs)s/mcp.log
+LogFileErr        = %(DirLogs)s/mcperr.log
+UpdateUrl         = http://mcp.ocean-labs.de/files/mcprolling_{version}/
+IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
+RGIndex           = 145000
+ParamIndex        = 45000
+
+[ASTYLE]
+AstyleConfig  = %(DirConf)s/astyle.cfg
+
+[COMMANDS]
+Wine          = wine
+Patcher_win   = %(DirRuntime)s/bin/applydiff.exe
+Patcher_linux = patch
+Patcher_osx   = patch
+Jad_win       = %(DirRuntime)s/bin/jad.exe
+Jad_osx       = %(DirRuntime)s/bin/jad-osx
+AStyle_win    = %(DirRuntime)s/bin/astyle.exe
+AStyle_linux  = astyle
+AStyle_osx    = %(DirRuntime)s/bin/astyle-osx
+JadRetro      = %(DirRuntime)s/bin/jadretro.jar
+Fernflower    = %(DirRuntime)s/bin/fernflower.jar
+Exceptor      = %(DirRuntime)s/bin/mcinjector.jar
+SpecialSource = %(DirRuntime)s/bin/specialsource.jar
+CmdPatch      = %s -p1 -u -i {patchfile} -d {srcdir}
+CmdJad        = %s -b -d {outdir} -dead -o -r -s .java -stat -ff {classes}
+CmdAStyle     = %s --suffix=none --quiet --options={conffile} {classes}
+CmdRG         = %s -cp "{classpath}" RetroGuard -searge {conffile}
+CmdRGReobf    = %s -cp "{classpath}" RetroGuard -notch {conffile}
+CmdSS         = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -m {mapfile} --kill-source
+CmdSSReobf    = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -r -m {mapfile} -d {identifier} -e %s
+CmdJadretro   = %s -jar %s {targetdir}
+CmdFernflower = %s -jar %s -din=1 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
+CmdExceptor   = %s -jar %s --jarIn {input} --jarOut {output} --mapIn {conf} --log {log} --jsonIn {json} --applyMarkers
+CmdRecomp     = %s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdRecompScala = %s -encoding UTF-8 -deprecation -target:jvm-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
@@ -0,0 +1,114 @@
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.Arrays;
+
+import joptsimple.ArgumentAcceptingOptionSpec;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.main.Main;
+
+public class Start
+{
+    public static void main(String[] args) throws Exception
+    {
+        int userIndex = -1;
+        int passIndex = -1;
+        int sessIndex = -1;
+        int versIndex = -1;
+
+        for( int x = 0; x < args.length; x++)
+        {
+            if (args[x].equals("--username"))      userIndex = x + 1;
+            else if (args[x].equals("--password")) passIndex = x + 1;
+            else if (args[x].equals("--session"))  sessIndex = x + 1;
+            else if (args[x].equals("--version"))  versIndex = x + 1;
+        }
+
+        if (userIndex != 0-1 && passIndex != -1 && sessIndex == -1)
+        {
+            String[] session = getSession(args[userIndex], args[passIndex]);
+            if (session != null)
+            {
+                args[userIndex] = session[0];
+                args = concat(args, new String[]{"--session", session[1]});
+            }
+        }
+        
+        //Kill the password if its there so it isn't printed to the console.
+        if (passIndex != -1)
+        {
+            args[passIndex-1] = "no_password_for_joo";
+            args[passIndex] = "no_password_for_joo";
+        }
+
+        if (versIndex == -1)
+        {
+            args = concat(args, new String[]{ "--version", "fml_mcp" });
+        }
+
+        Main.main(args);
+    }
+    
+    private static String[] getSession(String username, String password) throws UnsupportedEncodingException
+    {
+        String parameters = "http://login.minecraft.net/?user=" + URLEncoder.encode(username, "UTF-8") +
+                "&password=" + URLEncoder.encode(password, "UTF-8") +
+                "&version=" + 13;
+        String result = openUrl(parameters);
+        
+        if (result == null)
+        {
+            System.out.println("Can't connect to minecraft.net");
+            return null;
+        }
+        
+        if (!result.contains(":"))
+        {
+            System.out.println("Login Failed: " + result);
+            return null;
+        }
+        String[] values = result.split(":");
+        return new String[]{ values[2].trim(), values[3].trim() };
+    }
+
+    private static String openUrl(String addr)
+    {
+        try
+        {
+            URL url = new URL(addr);
+            java.io.InputStream is;
+            is = url.openConnection().getInputStream();
+            java.io.BufferedReader reader = new java.io.BufferedReader(new java.io.InputStreamReader(is));
+            String buf = "";
+            String line = null;
+
+            while ((line = reader.readLine()) != null)
+            {
+                buf += "\n" + line;
+            }
+
+            reader.close();
+            return buf;
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+    
+    private static <T> T[] concat(T[] first, T[] second)
+    {
+        T[] result = Arrays.copyOf(first, first.length + second.length);
+        System.arraycopy(second, 0, result, first.length, second.length);
+        return result;
+    }
+}
@@ -0,0 +1,22 @@
+diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
+--- minecraft\net\minecraft\client\Minecraft.java
+++ minecraft_patched\net\minecraft\client\Minecraft.java
+@@ -695,9 +695,7 @@
+ 
+       while(true) {
+          try {
+-            if(!this.field_71425_J) {
+-               break;
+-            }
+            while(this.field_71425_J) {
+ 
+             if(!this.field_71434_R || this.field_71433_S == null) {
+                try {
+@@ -711,6 +709,7 @@
+             }
+ 
+             this.func_71377_b(this.field_71433_S);
+          }
+          } catch (MinecraftError var12) {
+             break;
+          } catch (ReportedException var13) {
@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
+--- minecraft\net\minecraft\client\Minecraft.java
+++ minecraft_patched\net\minecraft\client\Minecraft.java
+@@ -695,7 +695,7 @@
+ 
+       while(true) {
+          try {
+-            if(this.field_71425_J) {
+            while(this.field_71425_J) {
+                if(!this.field_71434_R || this.field_71433_S == null) {
+                   try {
+                      this.func_71411_J();
@@ -0,0 +1,21 @@
+diff -r -U 3 minecraft\net\minecraft\client\gui\FontRenderer.java minecraft_patched\net\minecraft\client\gui\FontRenderer.java
+--- minecraft\net\minecraft\client\gui\FontRenderer.java
+++ minecraft_patched\net\minecraft\client\gui\FontRenderer.java
+@@ -581,8 +581,6 @@
+          case 10:
+             --var5;
+             break;
+-         case 32:
+-            var6 = var5;
+          case 167:
+             if(var5 < var3 - 1) {
+                ++var5;
+@@ -596,6 +594,8 @@
+                }
+             }
+             break;
+         case 32:
+             var6 = var5;
+          default:
+             var4 += this.func_78263_a(var8);
+             if(var7) {
@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\client\network\NetHandlerHandshakeMemory.java minecraft_patched\net\minecraft\client\network\NetHandlerHandshakeMemory.java
+--- minecraft\net\minecraft\client\network\NetHandlerHandshakeMemory.java
+++ minecraft_patched\net\minecraft\client\network\NetHandlerHandshakeMemory.java
+@@ -31,6 +31,7 @@
+       switch(NetHandlerHandshakeMemory.SwitchEnumConnectionState.field_151263_a[p_147232_2_.ordinal()]) {
+       case 1:
+          this.field_147384_b.func_150719_a(new NetHandlerLoginServer(this.field_147385_a, this.field_147384_b));
+         break;
+       case 2:
+          throw new UnsupportedOperationException("NYI");
+       default:
@@ -0,0 +1,23 @@
+diff -r -U 3 minecraft\net\minecraft\client\particle\EffectRenderer.java minecraft_patched\net\minecraft\client\particle\EffectRenderer.java
+--- minecraft\net\minecraft\client\particle\EffectRenderer.java
+++ minecraft_patched\net\minecraft\client\particle\EffectRenderer.java
+@@ -53,7 +53,8 @@
+    }
+ 
+    public void func_78868_a() {
+-      for(final int var1 = 0; var1 < 4; ++var1) {
+      for(int var11 = 0; var11 < 4; ++var11) {
+         final int var1 = var11;
+          for(int var2 = 0; var2 < this.field_78876_b[var1].size(); ++var2) {
+             final EntityFX var3 = (EntityFX)this.field_78876_b[var1].get(var2);
+ 
+@@ -99,7 +100,8 @@
+       EntityFX.field_70554_ao = p_78874_1_.field_70137_T + (p_78874_1_.field_70163_u - p_78874_1_.field_70137_T) * (double)p_78874_2_;
+       EntityFX.field_70555_ap = p_78874_1_.field_70136_U + (p_78874_1_.field_70161_v - p_78874_1_.field_70136_U) * (double)p_78874_2_;
+ 
+-      for(final int var8 = 0; var8 < 3; ++var8) {
+      for(int var88 = 0; var88 < 3; ++var88) {
+         final int var8 = var88;
+          if(!this.field_78876_b[var8].isEmpty()) {
+             switch(var8) {
+             case 0:
@@ -0,0 +1,33 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\RenderBlocks.java minecraft_patched\net\minecraft\client\renderer\RenderBlocks.java
+--- minecraft\net\minecraft\client\renderer\RenderBlocks.java
+++ minecraft_patched\net\minecraft\client\renderer\RenderBlocks.java
+@@ -1929,16 +1929,16 @@
+       float var24 = (float)(p_147788_2_ + 1);
+       float var25 = (float)(p_147788_4_ + 0);
+       float var26 = (float)(p_147788_4_ + 1);
+-      boolean var27 = false;
+      int var27 = 0;
+       if((var19 || var20) && !var21 && !var22) {
+-         var27 = true;
+         var27 = 1;
+       }
+ 
+       if((var21 || var22) && !var20 && !var19) {
+-         var27 = true;
+         var27 = 2;
+       }
+ 
+-      if(!var27) {
+      if(var27 == 0) {
+          int var28 = 0;
+          int var29 = 0;
+          int var30 = 16;
+@@ -1985,7 +1985,7 @@
+          var5.func_78374_a((double)var24, (double)p_147788_3_ + 0.015625D, (double)var25, (double)var9.func_94214_a((double)var30), (double)var9.func_94207_b((double)var29));
+          var5.func_78374_a((double)var23, (double)p_147788_3_ + 0.015625D, (double)var25, (double)var9.func_94214_a((double)var28), (double)var9.func_94207_b((double)var29));
+          var5.func_78374_a((double)var23, (double)p_147788_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var28), (double)var9.func_94207_b((double)var31));
+-      } else if(var27) {
+      } else if(var27 == 1) {
+          var5.func_78374_a((double)var24, (double)p_147788_3_ + 0.015625D, (double)var26, (double)var8.func_94212_f(), (double)var8.func_94210_h());
+          var5.func_78374_a((double)var24, (double)p_147788_3_ + 0.015625D, (double)var25, (double)var8.func_94212_f(), (double)var8.func_94206_g());
+          var5.func_78374_a((double)var23, (double)p_147788_3_ + 0.015625D, (double)var25, (double)var8.func_94209_e(), (double)var8.func_94206_g());
@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\RenderGlobal.java minecraft_patched\net\minecraft\client\renderer\RenderGlobal.java
+--- minecraft\net\minecraft\client\renderer\RenderGlobal.java
+++ minecraft_patched\net\minecraft\client\renderer\RenderGlobal.java
+@@ -1566,7 +1566,7 @@
+          double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
+          double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
+          double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
+-         Object var21 = null;
+         EntityFX var21 = null;
+          if(p_72726_1_.equals("hugeexplosion")) {
+             this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
+          } else if(p_72726_1_.equals("largeexplode")) {
@@ -0,0 +1,30 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\texture\TextureManager.java minecraft_patched\net\minecraft\client\renderer\texture\TextureManager.java
+--- minecraft\net\minecraft\client\renderer\texture\TextureManager.java
+++ minecraft_patched\net\minecraft\client\renderer\texture\TextureManager.java
+@@ -72,13 +72,14 @@
+ 
+    public boolean func_110579_a(ResourceLocation p_110579_1_, final ITextureObject p_110579_2_) {
+       boolean var3 = true;
+-
+      ITextureObject p_110579_2_2 = p_110579_2_;
+      
+       try {
+          ((ITextureObject)p_110579_2_).func_110551_a(this.field_110582_d);
+       } catch (IOException var8) {
+          field_147646_a.warn("Failed to load texture: " + p_110579_1_, var8);
+-         p_110579_2_ = TextureUtil.field_111001_a;
+-         this.field_110585_a.put(p_110579_1_, p_110579_2_);
+         p_110579_2_2 = TextureUtil.field_111001_a;
+         this.field_110585_a.put(p_110579_1_, p_110579_2_2);
+          var3 = false;
+       } catch (Throwable var9) {
+          CrashReport var5 = CrashReport.func_85055_a(var9, "Registering texture");
+@@ -95,7 +96,7 @@
+          throw new ReportedException(var5);
+       }
+ 
+-      this.field_110585_a.put(p_110579_1_, p_110579_2_);
+      this.field_110585_a.put(p_110579_1_, p_110579_2_2);
+       return var3;
+    }
+ 
@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\resources\FolderResourcePack.java minecraft_patched\net\minecraft\client\resources\FolderResourcePack.java
+--- minecraft\net\minecraft\client\resources\FolderResourcePack.java
+++ minecraft_patched\net\minecraft\client\resources\FolderResourcePack.java
+@@ -31,7 +31,7 @@
+       HashSet var1 = Sets.newHashSet();
+       File var2 = new File(this.field_110597_b, "assets/");
+       if(var2.isDirectory()) {
+-         File[] var3 = var2.listFiles(DirectoryFileFilter.DIRECTORY);
+         File[] var3 = var2.listFiles((java.io.FileFilter)DirectoryFileFilter.DIRECTORY);
+          int var4 = var3.length;
+ 
+          for(int var5 = 0; var5 < var4; ++var5) {
@@ -0,0 +1,34 @@
+diff -r -U 3 minecraft\net\minecraft\inventory\ContainerPlayer.java minecraft_patched\net\minecraft\inventory\ContainerPlayer.java
+--- minecraft\net\minecraft\inventory\ContainerPlayer.java
+++ minecraft_patched\net\minecraft\inventory\ContainerPlayer.java
+@@ -29,7 +29,7 @@
+       this.field_82862_h = p_i1819_3_;
+       this.func_75146_a(new SlotCrafting(p_i1819_1_.field_70458_d, this.field_75181_e, this.field_75179_f, 0, 144, 36));
+ 
+-      final int var4;
+      int var4;
+       int var5;
+       for(var4 = 0; var4 < 2; ++var4) {
+          for(var5 = 0; var5 < 2; ++var5) {
+@@ -38,6 +38,7 @@
+       }
+ 
+       for(var4 = 0; var4 < 4; ++var4) {
+         final int var44 = var4;
+          this.func_75146_a(new Slot(p_i1819_1_, p_i1819_1_.func_70302_i_() - 1 - var4, 8, 8 + var4 * 18) {
+ 
+             private static final String __OBFID = "CL_00001755";
+@@ -46,11 +47,11 @@
+                return 1;
+             }
+             public boolean func_75214_a(ItemStack p_75214_1_) {
+-               return p_75214_1_ == null?false:(p_75214_1_.func_77973_b() instanceof ItemArmor?((ItemArmor)p_75214_1_.func_77973_b()).field_77881_a == var4:(p_75214_1_.func_77973_b() != Item.func_150898_a(Blocks.field_150423_aK) && p_75214_1_.func_77973_b() != Items.field_151144_bL?false:var4 == 0));
+               return p_75214_1_ == null?false:(p_75214_1_.func_77973_b() instanceof ItemArmor?((ItemArmor)p_75214_1_.func_77973_b()).field_77881_a == var44:(p_75214_1_.func_77973_b() != Item.func_150898_a(Blocks.field_150423_aK) && p_75214_1_.func_77973_b() != Items.field_151144_bL?false:var44 == 0));
+             }
+             @SideOnly(Side.CLIENT)
+             public IIcon func_75212_b() {
+-               return ItemArmor.func_94602_b(var4);
+               return ItemArmor.func_94602_b(var44);
+             }
+          });
+       }
@@ -0,0 +1,14 @@
+diff -r -U 3 minecraft\net\minecraft\network\PacketBuffer.java minecraft_patched\net\minecraft\network\PacketBuffer.java
+--- minecraft\net\minecraft\network\PacketBuffer.java
+++ minecraft_patched\net\minecraft\network\PacketBuffer.java
+@@ -713,10 +713,4 @@
+    public boolean release(int p_release_1_) {
+       return this.field_150794_a.release(p_release_1_);
+    }
+-
+-   // $FF: synthetic method
+-   // $FF: bridge method
+-   public int compareTo(Object p_compareTo_1_) {
+-      return this.compareTo((ByteBuf)p_compareTo_1_);
+-   }
+ }
@@ -0,0 +1,13 @@
+diff -r -U 3 minecraft_server\net\minecraft\server\dedicated\DedicatedServer.java minecraft_server_patched\net\minecraft\server\dedicated\DedicatedServer.java
+--- minecraft_server\net\minecraft\server\dedicated\DedicatedServer.java
+++ minecraft_server_patched\net\minecraft\server\dedicated\DedicatedServer.java
+@@ -261,7 +261,7 @@
+       System.exit(0);
+    }
+ 
+-   protected void func_71190_q() {
+   public void func_71190_q() {
+       super.func_71190_q();
+       this.func_71333_ah();
+    }
+
@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\server\integrated\IntegratedServer.java minecraft_patched\net\minecraft\server\integrated\IntegratedServer.java
+--- minecraft\net\minecraft\server\integrated\IntegratedServer.java
+++ minecraft_patched\net\minecraft\server\integrated\IntegratedServer.java
+@@ -95,7 +95,7 @@
+       return true;
+    }
+ 
+-   protected void func_71217_p() {
+   public void func_71217_p() {
+       boolean var1 = this.field_71348_o;
+       this.field_71348_o = Minecraft.func_71410_x().func_147114_u() != null && Minecraft.func_71410_x().func_147113_T();
+       if(!var1 && this.field_71348_o) {
@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\world\storage\ThreadedFileIOBase.java minecraft_patched\net\minecraft\world\storage\ThreadedFileIOBase.java
+--- minecraft\net\minecraft\world\storage\ThreadedFileIOBase.java
+++ minecraft_patched\net\minecraft\world\storage\ThreadedFileIOBase.java
+@@ -21,6 +21,7 @@
+    }
+ 
+    public void run() {
+     while(true)
+       this.func_75736_b();
+    }
+ 
@@ -0,0 +1,4 @@
+[VERSION]
+MCPVersion = 9.01-alpha
+ClientVersion = 1.7.2
+ServerVersion = 1.7.2
@@ -1,20 +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][Wiki].
-
-
-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.
-
-[Wiki]: https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge
@@ -1,103 +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=26.1.2-&query=$.promos["26.1.2-latest"]&color=brightgreen&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtc3RhciBmYS13LTE4IiBhcmlhLWhpZGRlbj0idHJ1ZSIgZGF0YS1pY29uPSJzdGFyIiBkYXRhLXByZWZpeD0iZmFzIiBmb2N1c2FibGU9ImZhbHNlIiByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMjU5LjMgMTcuOEwxOTQgMTUwLjIgNDcuOSAxNzEuNWMtMjYuMiAzLjgtMzYuNyAzNi4xLTE3LjcgNTQuNmwxMDUuNyAxMDMtMjUgMTQ1LjVjLTQuNSAyNi4zIDIzLjIgNDYgNDYuNCAzMy43TDI4OCA0MzkuNmwxMzAuNyA2OC43YzIzLjIgMTIuMiA1MC45LTcuNCA0Ni40LTMzLjdsLTI1LTE0NS41IDEwNS43LTEwM2MxOS0xOC41IDguNS01MC44LTE3LjctNTQuNkwzODIgMTUwLjIgMzE2LjcgMTcuOGMtMTEuNy0yMy42LTQ1LjYtMjMuOS01Ny40IDB6IiBmaWxsPSJ3aGl0ZSIvPgo8L3N2Zz4K)][Download]
-[![Latest Release](https://img.shields.io/badge/dynamic/json?url=https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json&label=Latest&prefix=26.2-&query=$.promos["26.2-latest"]&color=blue&logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBjbGFzcz0ic3ZnLWlubGluZS0tZmEgZmEtYnVnIGZhLXctMTYiIGFyaWEtaGlkZGVuPSJ0cnVlIiBkYXRhLWljb249ImJ1ZyIgZGF0YS1wcmVmaXg9ImZhcyIgZm9jdXNhYmxlPSJmYWxzZSIgcm9sZT0iaW1nIiB2aWV3Qm94PSIwIDAgNTEyIDUxMiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTUxMS45ODggMjg4LjljLS40NzggMTcuNDMtMTUuMjE3IDMxLjEtMzIuNjUzIDMxLjFINDI0djE2YzAgMjEuODY0LTQuODgyIDQyLjU4NC0xMy42IDYxLjE0NWw2MC4yMjggNjAuMjI4YzEyLjQ5NiAxMi40OTcgMTIuNDk2IDMyLjc1OCAwIDQ1LjI1NS0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDBsLTU0LjczNi01NC43MzZDMzQ1Ljg4NiA0NjcuOTY1IDMxNC4zNTEgNDgwIDI4MCA0ODBWMjM2YzAtNi42MjctNS4zNzMtMTItMTItMTJoLTI0Yy02LjYyNyAwLTEyIDUuMzczLTEyIDEydjI0NGMtMzQuMzUxIDAtNjUuODg2LTEyLjAzNS05MC42MzYtMzIuMTA4bC01NC43MzYgNTQuNzM2Yy0xMi40OTggMTIuNDk3LTMyLjc1OSAxMi40OTYtNDUuMjU2IDAtMTIuNDk2LTEyLjQ5Ny0xMi40OTYtMzIuNzU4IDAtNDUuMjU1bDYwLjIyOC02MC4yMjhDOTIuODgyIDM3OC41ODQgODggMzU3Ljg2NCA4OCAzMzZ2LTE2SDMyLjY2NkMxNS4yMyAzMjAgLjQ5MSAzMDYuMzMuMDEzIDI4OC45LS40ODQgMjcwLjgxNiAxNC4wMjggMjU2IDMyIDI1Nmg1NnYtNTguNzQ1bC00Ni42MjgtNDYuNjI4Yy0xMi40OTYtMTIuNDk3LTEyLjQ5Ni0zMi43NTggMC00NS4yNTUgMTIuNDk4LTEyLjQ5NyAzMi43NTgtMTIuNDk3IDQ1LjI1NiAwTDE0MS4yNTUgMTYwaDIyOS40ODlsNTQuNjI3LTU0LjYyN2MxMi40OTgtMTIuNDk3IDMyLjc1OC0xMi40OTcgNDUuMjU2IDAgMTIuNDk2IDEyLjQ5NyAxMi40OTYgMzIuNzU4IDAgNDUuMjU1TDQyNCAxOTcuMjU1VjI1Nmg1NmMxNy45NzIgMCAzMi40ODQgMTQuODE2IDMxLjk4OCAzMi45ek0yNTcgMGMtNjEuODU2IDAtMTEyIDUwLjE0NC0xMTIgMTEyaDIyNEMzNjkgNTAuMTQ0IDMxOC44NTYgMCAyNTcgMHoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo=
-)][Download] [![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)][Patreon]
-
-Forge is a free, open-source modding API all of your favourite mods use!
-
-| Version      | Support                     |
-|--------------|-----------------------------|
-| All versions | [Supported][Support-Policy] |
-
-* [Download]
-* [Forum]
-* [Discord]
-* [Documentation]
-
-# Installing Forge
-
-Go to [the Forge website][Download]
- 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].
-
-## Required Java Versions
-
-We require the version of Java that Minecraft requires, which is currently:
-
-| Minecraft        | Java              |
-|------------------|-------------------|
-| 26.1+            | [25][Adoptium-25] |
-| 1.20.6 - 1.21.11 | [21][Adoptium-21] |
-| 1.18 - 1.20.4    | [17][Adoptium-17] |
-| 1.17.1           | [16][Adoptium-16] |
-| 1.16.5-          | [8][Adoptium-8]   |
-
-**If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
-
-# Creating Mods
-
-[See the "Getting Started" section in the Forge Documentation][Getting-Started].
-
-# 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][ForgeDev].
-
-### Pull requests
-
-[See the "Making Changes and Pull Requests" section in the Forge documentation][Pull-Requests].
-
-Please read the contributing guidelines found [here][Contributing] before making a pull request.
-
-### Contributor License Agreement
-We require all contributors to acknowledge the [Forge Contributor License Agreement][CLA]. 
-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][Patreon].*
-
-### Thanks
-[![YourKit](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com/)
-
-YourKit for providing us accesss to their [YourKit Java Profiler] which helps identify bottlenecks and places for improvment.
-
-[Contributing]: ./CONTRIBUTING.md
-[CLA]: https://cla-assistant.io/MinecraftForge/MinecraftForge
-
-[Download]: https://files.minecraftforge.net/
-
-[Adoptium-25]: https://adoptium.net/temurin/releases/?version=25
-[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
-[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
-[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
-[Adoptium-8]: https://adoptium.net/temurin/releases/?version=8
-[Jarfix]: https://johann.loefflmann.net/en/software/jarfix/index.html
-
-[Forum]: https://forums.minecraftforge.net/
-[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
-[Support-Policy]: https://forums.minecraftforge.net/topic/144690-new-tiered-support-policy
-
-[Discord]: https://discord.minecraftforge.net/
-
-[Documentation]: https://docs.minecraftforge.net/
-[Getting-Started]: https://docs.minecraftforge.net/en/latest/gettingstarted/
-[ForgeDev]: https://docs.minecraftforge.net/en/latest/forgedev/
-[Pull-Requests]: https://docs.minecraftforge.net/en/latest/forgedev/#making-changes-and-pull-requests
-
-[Patreon]: https://www.patreon.com/LexManos
-[YourKit Java Profiler]: https://www.yourkit.com/java/profiler/
@@ -1,154 +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][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 occurrence 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][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][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][Discord], 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][Documentation] 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 addressed 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 unreproducible. If you included all of the data from above in your report, chances are that the latter won't be the case.
-
-[Bug-Reports]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
-[Modder-Support]: https://forums.minecraftforge.net/forum/70-modder-support/
-
-[Discord]: https://discord.minecraftforge.net/
-
-[Documentation]: https://docs.minecraftforge.net/
@@ -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>
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-for file in $(find repo | grep --invert-match -e md5 -e sha | grep -e .jar -e .zip); do
-    file_path=$(realpath $file)
-    file_name=$(basename $file)
-    
-    echo "$file_name"
-    files=$(unzip -l $file | awk '{print $4}')
-    for f in $files; do
-        out="_actual/$file_name/$f"
-        parent=$(dirname "$out")
-        echo $out
-        
-        if [ ! -d "$parent" ]; then
-            mkdir -p "$parent"
-        fi
-            
-        if [[ $f == *.class ]]; then
-            javap -v -p jar:file://$file_path!/$f | tail -n +4 >$out.txt
-        elif [[ $f != */ && $f != "Name" && $f != "----" ]]; then
-            unzip -o -q $file $f -d _actual/$file_name
-        fi
-    done
-done
@@ -1,68 +0,0 @@
-import net.minecraftforge.gradleutils.PomUtils
-
-plugins {
-    id 'java-library'
-    id 'maven-publish'
-    id 'net.minecraftforge.licenser'
-    id 'net.minecraftforge.gradleutils'
-}
-
-apply from: rootProject.file('build_shared.gradle')
-
-dependencies {
-    compileOnly(libs.jetbrains.annotations)
-
-    api(libs.eventbus)
-    annotationProcessor(libs.eventbus.validator)
-
-    implementation(project(':fmlloader'))
-    implementation(libs.commons.io)
-}
-
-java {
-    toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION)
-    withSourcesJar()
-}
-
-tasks.named('jar', Jar).configure {
-    manifest {
-        attributes([
-            'Automatic-Module-Name': 'net.minecraftforge.fmlcore',
-            'FMLModType': 'LIBRARY'
-        ] as LinkedHashMap)
-        attributes([
-            'Specification-Title':      'FML',
-            'Specification-Vendor':     'Forge Development LLC',
-            'Specification-Version':    '1',
-            'Implementation-Title':     'FML',
-            'Implementation-Version':   '1.0',
-            'Implementation-Vendor':    'Forge Development LLC'
-        ] as LinkedHashMap, 'net/minecraftforge/fml/')
-    }
-}
-
-tasks.withType(JavaCompile).configureEach {
-    options.compilerArgs << '-Xlint:-unchecked'
-}
-
-license {
-    header = rootProject.file('LICENSE-header.txt')
-}
-
-publishing {
-    publications.register('mavenJava', MavenPublication).configure {
-        from components.java
-        artifactId = 'fmlcore'
-        pom {
-            name = project.name
-            description = 'Modifactions to Minecraft to enable mod developers.'
-            url = 'https://github.com/MinecraftForge/MinecraftForge'
-            PomUtils.setGitHubDetails(pom, 'MinecraftForge')
-            license PomUtils.Licenses.LGPLv2_1
-        }
-    }
-    
-    repositories {
-        maven gradleutils.publishingForgeMaven
-    }
-}
@@ -1,43 +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.bus.BusGroup;
-import net.minecraftforge.fml.config.IConfigEvent;
-import net.minecraftforge.fml.loading.FMLLoader;
-
-import java.util.ServiceConfigurationError;
-import java.util.ServiceLoader;
-import java.util.function.Supplier;
-
-/**
- * Used to allow access to certain things from the game layer
- */
-public class Bindings {
-    private Bindings() {}
-
-    /**
-     * The provider of the bindings
-     * @implNote May also throw a {@link ServiceConfigurationError}
-     */
-    private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class)
-            .findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
-
-    /**
-     * @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
-     */
-    public static Supplier<BusGroup> getForgeBus() {
-        return PROVIDER.getForgeBusSupplier();
-    }
-
-    public static Supplier<I18NParser> getMessageParser() {
-        return PROVIDER.getMessageParser();
-    }
-
-    public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
-        return PROVIDER.getConfigConfiguration();
-    }
-}
@@ -1,82 +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 org.slf4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.function.BooleanSupplier;
-import java.util.function.Supplier;
-
-public class CrashReportCallables {
-    private static final Logger LOGGER = LogUtils.getLogger();
-    private static final List<ISystemReportExtender> crashCallables = Collections.synchronizedList(new ArrayList<>());
-
-    /**
-     * Register a custom {@link ISystemReportExtender}
-     */
-    public static void registerCrashCallable(ISystemReportExtender callable) {
-        crashCallables.add(callable);
-    }
-
-    /**
-     * Register a {@link ISystemReportExtender system report extender} with the given header name and content
-     * generator, which will always be appended to the system report
-     * @param headerName The name of the system report entry
-     * @param reportGenerator The report generator to be called when a crash report is built
-     */
-    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();
-            }
-        });
-    }
-
-    /**
-     * Register a {@link ISystemReportExtender system report extender} with the given header name and content
-     * generator, which will only be appended to the system report when the given {@link BooleanSupplier} returns true
-     * @param headerName The name of the system report entry
-     * @param reportGenerator The report generator to be called when a crash report is built
-     * @param active The supplier of the flag to be checked when a crash report is built
-     */
-    public static void registerCrashCallable(String headerName, Supplier<String> reportGenerator, BooleanSupplier active) {
-        registerCrashCallable(new ISystemReportExtender() {
-            @Override
-            public String getLabel() {
-                return headerName;
-            }
-
-            @Override
-            public String get() {
-                return reportGenerator.get();
-            }
-
-            @Override
-            public boolean isActive() {
-                try {
-                    return active.getAsBoolean();
-                } catch (Throwable t) {
-                    LOGGER.warn("CrashCallable '{}' threw an exception while checking the active flag, disabling", headerName, t);
-                    return false;
-                }
-            }
-        });
-    }
-
-    public static List<ISystemReportExtender> allCrashCallables() {
-        return List.copyOf(crashCallables);
-    }
-}
@@ -1,128 +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.CompletionException;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-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());
-        RuntimeException aggregate = new RuntimeException();
-        Stopwatch timer = Stopwatch.createStarted();
-        for (TaskInfo t : tasks) {
-            makeRunnable(t, Runnable::run, aggregate);
-        }
-        timer.stop();
-        if (aggregate.getSuppressed().length > 0) {
-            LOGGER.fatal(
-                    LOADING,
-                    "Synchronous work queue completed exceptionally in {}, see suppressed exceptions for details:",
-                    timer,
-                    aggregate
-            );
-            throw aggregate;
-        } else {
-            LOGGER.debug(LOADING, "Synchronous work queue completed in {}", timer);
-        }
-    }
-
-    private static void makeRunnable(TaskInfo ti, Executor executor, RuntimeException aggregate) {
-        executor.execute(() -> {
-            Stopwatch timer = Stopwatch.createStarted();
-            ModLoadingContext.get().setActiveContainer(ti.owner);
-            try {
-                ti.future.exceptionally(t -> captureException(ti.owner.getModId(), aggregate, t));
-                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);
-            }
-        });
-    }
-
-    private static <T> T captureException(String modId, RuntimeException aggregate, Throwable throwable) {
-        if (throwable instanceof CompletionException ce) {
-            throwable = ce.getCause();
-        }
-        aggregate.addSuppressed(throwable);
-        LOGGER.error("Mod '{}' encountered an error in a deferred task:", modId, throwable);
-        return null;
-    }
-
-    public CompletableFuture<Void> enqueueWork(final ModContainer modInfo, final Runnable work) {
-        return enqueueWork(modInfo, taskInfo -> CompletableFuture.runAsync(work, r -> taskInfo.task = r));
-    }
-
-    public <T> CompletableFuture<T> enqueueWork(final ModContainer modInfo, final Supplier<T> work) {
-        return enqueueWork(modInfo, taskInfo -> CompletableFuture.supplyAsync(work, r -> taskInfo.task = r));
-    }
-
-    private <T> CompletableFuture<T> enqueueWork(final ModContainer modInfo, Function<TaskInfo, CompletableFuture<T>> futureGen) {
-        TaskInfo taskInfo = new TaskInfo(modInfo);
-        CompletableFuture<T> future = futureGen.apply(taskInfo);
-        taskInfo.future = future;
-        tasks.add(taskInfo);
-        return future;
-    }
-
-    private static final class TaskInfo {
-        private final ModContainer owner;
-        private Runnable task;
-        private CompletableFuture<?> future;
-
-        private TaskInfo(ModContainer owner) {
-            this.owner = owner;
-        }
-    }
-}
@@ -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);
-}
@@ -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.bus.BusGroup;
-import net.minecraftforge.fml.config.IConfigEvent;
-
-import java.util.function.Supplier;
-
-public interface IBindingsProvider {
-    Supplier<BusGroup> getForgeBusSupplier();
-    Supplier<I18NParser> getMessageParser();
-    Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration();
-}
@@ -1,5 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
@@ -1,121 +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
-// TODO: Complete re-write, this hasnt actually be used in a generic way by mods and we could make it a lot simpler.
-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 DisplayTest#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 = "SERVER_ONLY";
-
-        /**
-         * 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
-         * <p>Note: If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or
-         * Open to LAN), consider setting {@code clientSideOnly=true} in the root of your mods.toml.</p>
-         */
-        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);
-        }
-    }
-}
@@ -1,99 +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.progress.ProgressMeter;
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.Function;
-import java.util.function.IntSupplier;
-import java.util.function.Supplier;
-
-/**
- * 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
- */
-@NullMarked
-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}
-     */
-    Supplier<String> message();
-
-    /**
-     * @return a function that computes the size of this transition based on the size of the modlist.
-     * Used to compute progress.
-     */
-    default IntSupplier size() {
-        return ModList::size;
-    }
-
-    /**
-     * {@return an optional runnable, which runs before starting the transition from this state to the next}
-     * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
-     */
-    @Nullable Runnable 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 progressBar      a progress meter for tracking progress
-     * @return a transition task for this state
-     * @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
-     */
-    default @Nullable CompletableFuture<Void> buildTransition(
-        final Executor syncExecutor,
-        final Executor parallelExecutor,
-        final ProgressMeter progressBar
-    ) {
-        return buildTransition(syncExecutor, parallelExecutor, progressBar,
-            _ -> CompletableFuture.completedFuture(null),
-            _ -> CompletableFuture.completedFuture(null)
-        );
-    }
-
-    /**
-     * 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 progressBar      a progress meter for tracking progress
-     * @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
-     * @return a transition task for this state
-     */
-    @Nullable CompletableFuture<Void> buildTransition(final Executor syncExecutor,
-                                                      final Executor parallelExecutor,
-                                                      final ProgressMeter progressBar,
-                                                      final Function<Executor, CompletableFuture<Void>> preSyncTask,
-                                                      final Function<Executor, CompletableFuture<Void>> postSyncTask);
-}
@@ -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();
-}
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.minecraftforge.fml;
-
-import net.minecraftforge.fml.event.IModBusEvent;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-import net.minecraftforge.fml.loading.progress.ProgressMeter;
-import org.jetbrains.annotations.Nullable;
-
-public interface IModStateTransition {
-    static IModStateTransition buildNoopTransition() {
-        return ModStateTransitionHelper.NOOP;
-    }
-
-    default CompletableFuture<Void> build(
-        final String name,
-        final Executor syncExecutor,
-        final Executor parallelExecutor,
-        final ProgressMeter progressBar,
-        final Function<Executor, CompletableFuture<Void>> preSyncTask,
-        final Function<Executor, CompletableFuture<Void>> postSyncTask
-    ) {
-        return ModStateTransitionHelper.build(this, name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
-    }
-
-    default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
-        return ModLoadingStage::nextState;
-    }
-
-    @Nullable
-    default <T extends IModBusEvent> EventGenerator<T> eventFunction() {
-        return null;
-    }
-
-    ThreadSelector threadSelector();
-    BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
-
-    interface EventGenerator<T extends IModBusEvent> extends Function<ModContainer, T> {
-        static <FN extends IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
-            return fn::apply;
-        }
-    }
-}
@@ -1,16 +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();
-
-    default boolean isActive() {
-        return true;
-    }
-}
@@ -1,117 +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.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-public final class InterModComms {
-    public record IMCMessage(String senderModId, String modId, String method, Supplier<?> messageSupplier) {}
-
-    private static final ConcurrentHashMap<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.isLoaded(modId)) return false;
-        containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
-                .add(new IMCMessage(ModLoadingContext.get().getContainer().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.isLoaded(modId)) return false;
-        containerQueues.computeIfAbsent(modId, _ -> 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, _ -> true);
-    }
-
-    private record QueueFilteringSpliterator(
-            ConcurrentLinkedQueue<IMCMessage> queue,
-            Predicate<String> methodFilter,
-            Iterator<IMCMessage> iterator
-    ) implements Spliterator<IMCMessage> {
-
-        public QueueFilteringSpliterator(final ConcurrentLinkedQueue<IMCMessage> queue, final Predicate<String> methodFilter) {
-            this(queue, methodFilter, queue.iterator());
-        }
-
-        @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;
-        }
-    }
-}
@@ -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]"));
-    }
-}
@@ -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
-
-}
@@ -1,54 +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;
-    }
-}
@@ -1,163 +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.bus.BusGroup;
-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.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.BiPredicate;
-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>
- */
-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 EnumMap<>(ModLoadingStage.class);
-    protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
-    protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
-    final Set<ModContainer> dependencies = new HashSet<>();
-
-    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")
-                .orElseGet(() -> info.getOwningFile().isClientSideOnly() ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
-        Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
-            case "MATCH_VERSION" -> // default displaytest checks for version string match
-                    () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
-                        (incoming, _) -> 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 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) {}
-
-    /**
-     * 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();
-
-    /**
-     * @return the mod bus group for this specific mod, or null if there is none.
-     *         Leave null if you use {@link BusGroup#DEFAULT} for your mod lifecycle events.
-     */
-    public BusGroup getModBusGroup() {
-        return null;
-    }
-
-    /**
-     * 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 IModBusEvent> void acceptEvent(T e) {}
-}
@@ -1,160 +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.LoadingModList;
-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.forgespi.locating.IModFile;
-
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.BiConsumer;
-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 final class ModList {
-    private ModList() {}
-
-    private static final List<IModFileInfo> MOD_FILES;
-    private static final List<IModInfo> SORTED_LIST;
-    private static final Map<String, IModFileInfo> FILE_BY_ID;
-    private static List<ModContainer> mods;
-    private static Map<String, ModContainer> indexedMods;
-    private static List<ModContainer> sortedContainers;
-
-    static {
-        var loadingModFiles = LoadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList();
-        var loadingSortedList = LoadingModList.getMods();
-
-        var modFileInfos = MOD_FILES = loadingModFiles.stream().map(ModFile::getModFileInfo).toList();
-        SORTED_LIST = loadingSortedList.stream().map(IModInfo.class::cast).toList();
-        var byId = new HashMap<String, IModFileInfo>();
-        for (var file : modFileInfos) {
-            for (var mod : file.getMods())
-                byId.put(mod.getModId(), mod.getOwningFile());
-        }
-        FILE_BY_ID = Map.copyOf(byId);
-        CrashReportCallables.registerCrashCallable("Mod List", ModList::crashReport);
-    }
-
-    private static String getModContainerState(String modId) {
-        return getModContainerById(modId).map(ModContainer::getCurrentState).map(Object::toString).orElse("NONE");
-    }
-
-    private static String fileToLine(IModFile mf) {
-        var mainMod = mf.getModInfos().getFirst();
-        return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
-                mainMod.getDisplayName(),
-                mainMod.getModId(),
-                mainMod.getVersion(),
-                getModContainerState(mainMod.getModId()),
-                ((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
-    }
-
-    private static String crashReport() {
-        return "\n" + applyForEachModFile(ModList::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
-    }
-
-    public static void init() {}
-
-    public static List<IModFileInfo> getModFiles() {
-        return MOD_FILES;
-    }
-
-    public static IModFileInfo getModFileById(String modid) {
-        return FILE_BY_ID.get(modid);
-    }
-
-    static void setLoadedMods(final List<ModContainer> modContainers) {
-        mods = modContainers;
-        sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> SORTED_LIST.indexOf(c.getModInfo()))).toList();
-        indexedMods = modContainers.stream().collect(Collectors.toUnmodifiableMap(ModContainer::getModId, Function.identity()));
-    }
-
-    static void clearLoadedMods() {
-        mods = List.of();
-        indexedMods = Map.of();
-        sortedContainers = List.of();
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> Optional<T> getModObjectById(String modId) {
-        return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
-    }
-
-    public static Optional<? extends ModContainer> getModContainerById(String modId) {
-        return Optional.ofNullable(indexedMods.get(modId));
-    }
-
-    public static Optional<? extends ModContainer> getModContainerByObject(Object obj) {
-        return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
-    }
-
-    public static List<IModInfo> getMods() {
-        return SORTED_LIST;
-    }
-
-    public static boolean isLoaded(String modTarget) {
-        return indexedMods.containsKey(modTarget);
-    }
-
-    public static int size() {
-        return mods.size();
-    }
-
-    public static List<ModFileScanData> getAllScanData() {
-        final class LazyInit {
-            private LazyInit() {}
-            private static final List<ModFileScanData> MOD_FILE_SCAN_DATA = SORTED_LIST.stream()
-                    .map(IModInfo::getOwningFile)
-                    .filter(Objects::nonNull)
-                    .map(IModFileInfo::getFile)
-                    .distinct()
-                    .map(IModFile::getScanResult)
-                    .toList();
-        }
-        return LazyInit.MOD_FILE_SCAN_DATA;
-    }
-
-    public static void forEachModFile(Consumer<IModFile> fileConsumer) {
-        MOD_FILES.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
-    }
-
-    public static <T> Stream<T> applyForEachModFile(Function<IModFile, T> function) {
-        return MOD_FILES.stream().map(IModFileInfo::getFile).map(function);
-    }
-
-    public static void forEachModContainer(BiConsumer<String, ModContainer> modContainerConsumer) {
-        indexedMods.forEach(modContainerConsumer);
-    }
-
-    public static void forEachModInOrder(Consumer<ModContainer> containerConsumer) {
-        sortedContainers.forEach(containerConsumer);
-    }
-
-    public static List<ModContainer> getLoadedMods() {
-        return sortedContainers;
-    }
-
-    public static <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
-        return indexedMods.values().stream().map(function);
-    }
-}
@@ -1,428 +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.bus.BusGroup;
-import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.*;
-import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
-import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.fml.loading.progress.ProgressMeter;
-import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
-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.*;
-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 final class ModLoader {
-    private ModLoader() {}
-
-    private static final Logger LOGGER = LogManager.getLogger();
-    private static final ArrayList<ModLoadingException> LOADING_EXCEPTIONS = new ArrayList<>();
-    private static final ArrayList<ModLoadingWarning> LOADING_WARNINGS = new ArrayList<>();
-    private static final Consumer<String> STATUS_CONSUMER = StartupNotificationManager.modLoaderConsumer().orElse(_ -> {});
-    private static final HashSet<IModLoadingState> COMPLETED_STATES = new HashSet<>();
-    private static boolean loadingStateValid;
-
-    private static String computeLanguageList() {
-        return "\n" + LanguageLoadingProvider
-                .applyForEach(lp -> lp.name() + '@' + lp.getClass().getPackage().getImplementationVersion())
-                .collect(Collectors.joining("\n\t\t", "\t\t", ""));
-    }
-
-    private static 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",""));
-    }
-
-    /**
-     * 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 static void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        var loadingExceptions = LoadingModList.getErrors().stream()
-                .flatMap(ModLoadingException::fromEarlyException)
-                .toList();
-        ModLoader.LOADING_EXCEPTIONS.addAll(loadingExceptions);
-        LOADING_WARNINGS.addAll(LoadingModList.getBrokenFiles().stream()
-                .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
-                .toList());
-        Set<IModInfo> erroredModInfos;
-        if (loadingExceptions.isEmpty()) {
-            erroredModInfos = Collections.emptySet();
-        } else {
-            erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
-            erroredModInfos.addAll(loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
-        }
-        LoadingModList.getModFiles().stream()
-                .filter(ModFileInfo::missingLicense)
-                .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
-                .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
-                .forEach(LOADING_EXCEPTIONS::add);
-        CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
-        CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
-        CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
-        CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
-        CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
-
-        ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version")));
-        ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion()));
-        loadingStateValid = true;
-        FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
-        if (!LOADING_EXCEPTIONS.isEmpty()) {
-            LOGGER.fatal(CORE, "Error during pre-loading phase", LOADING_EXCEPTIONS.getFirst());
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-            ModList.clearLoadedMods();
-            loadingStateValid = false;
-            throw new LoadingFailedException(LOADING_EXCEPTIONS);
-        }
-        var failedBounds = new ArrayList<ForgeFeature.Bound>();
-        for (var mod : LoadingModList.getMods()) {
-            for (var feature : mod.getForgeFeatures()) {
-                if (!ForgeFeature.testFeature(FMLEnvironment.dist, feature))
-                    failedBounds.add(feature);
-            }
-        }
-
-        if (!failedBounds.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-            ModList.clearLoadedMods();
-            loadingStateValid = false;
-            throw new LoadingFailedException(failedBounds.stream()
-                    .map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, ForgeFeature.featureValue(fb)))
-                    .toList());
-        }
-
-        final var modContainers = new HashMap<String, ModContainer>();
-        for (var file : LoadingModList.getModFiles()) {
-            var containers = buildMods(file.getFile());
-            for (var container : containers)
-                modContainers.put(container.getModId(), container);
-        }
-
-        if (!LOADING_EXCEPTIONS.isEmpty()) {
-            LOGGER.fatal(CORE, "Failed to initialize mod containers", LOADING_EXCEPTIONS.getFirst());
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-            ModList.clearLoadedMods();
-            loadingStateValid = false;
-            throw new LoadingFailedException(LOADING_EXCEPTIONS);
-        }
-
-        // Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
-        for (var mod : modContainers.values()) {
-            for (var dep : mod.getModInfo().getDependencies()) {
-                var target = modContainers.get(dep.getModId());
-                if (target == null)
-                    continue;
-
-                switch (dep.getOrdering()) {
-                    case AFTER:
-                        mod.dependencies.add(target);
-                        break;
-                    case BEFORE:
-                        target.dependencies.add(mod);
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
-        ModList.setLoadedMods(modContainers.values().stream().toList());
-        var stateList = ModStateManager.getStates(ModLoadingPhase.GATHER);
-        var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
-        for (IModLoadingState mls : stateList) {
-            dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
-        }
-        progress.complete();
-    }
-
-    public static void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        var stateList = ModStateManager.getStates(ModLoadingPhase.LOAD);
-        var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
-        for (IModLoadingState mls : stateList) {
-            dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
-        }
-        progress.complete();
-    }
-
-    public static void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
-        var stateList = ModStateManager.getStates(ModLoadingPhase.COMPLETE);
-        var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
-        for (IModLoadingState mls : stateList) {
-            dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
-        }
-
-        var modBusGroups = Set.of(
-                ModList.getLoadedMods().stream()
-                        .map(ModContainer::getModBusGroup)
-                        .filter(Objects::nonNull)
-                        .toArray(BusGroup[]::new)
-        );
-        for (var modBusGroup : modBusGroups) {
-            parallelExecutor.execute(modBusGroup::trim);
-        }
-        parallelExecutor.execute(BusGroup.DEFAULT::trim);
-
-        STATUS_CONSUMER.accept("Mod loading complete - %d mods loaded".formatted(ModList.size()));
-        progress.complete();
-    }
-
-    private static void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
-        if (!isLoadingStateValid()) {
-            LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
-            return;
-        }
-        progressBar.label(progressBar.name() + " working");
-        syncExecutor.drive(ticker);
-
-        var inlineRunnable = state.inlineRunnable();
-        if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker);
-
-        var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar);
-        if (transition != null) waitForTransition(state, syncExecutor, ticker, transition);
-
-        COMPLETED_STATES.add(state);
-    }
-
-    private static void handleInlineTransition(final Runnable transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
-        var pb = StartupMessageManager.addProgressBar("State transition " + state.name() + " running", 0);
-        syncExecutor.drive(ticker);
-        transition.run();
-        syncExecutor.drive(ticker);
-        pb.complete();
-        syncExecutor.drive(ticker);
-    }
-
-    private static 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();
-            boolean hasNotModLoadingEx = Arrays.stream(t.getSuppressed())
-                    .anyMatch(obj -> !(obj instanceof ModLoadingException));
-            if (hasNotModLoadingEx) {
-                LOGGER.fatal("Encountered non-modloading exceptions!", e);
-                STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-                throw e;
-            }
-
-            final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
-                    .filter(ModLoadingException.class::isInstance)
-                    .map(ModLoadingException.class::cast)
-                    .toList();
-            LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
-            STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
-            throw new LoadingFailedException(modLoadingExceptions);
-        }
-    }
-
-    private static List<ModContainer> buildMods(final IModFile modFile) {
-        final Map<String, IModInfo> modInfoMap = new HashMap<>();
-        for (var mod : modFile.getModFileInfo().getMods())
-            modInfoMap.put(mod.getModId(), mod);
-
-        LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
-        final List<ModContainer> containers = new ArrayList<>();
-        for (var entry : modFile.getScanResult().getTargets().entrySet()) {
-            var container = buildModContainerFromTOML(modFile, modInfoMap, entry.getKey(), entry.getValue());
-            if (container != null)
-                containers.add(container);
-        }
-
-        if (containers.size() != modInfoMap.size()) {
-            var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
-            var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
-
-            LOGGER.fatal(LOADING, "File {} constructed {} mods: {}, but had {} mods specified: {}",
-                    modFile.getFilePath(),
-                    containers.size(), containerIds,
-                    modInfoMap.size(), modIds);
-
-            var missingClasses = new ArrayList<>(modIds);
-            missingClasses.removeAll(containerIds);
-            LOGGER.fatal(LOADING, "The following classes are missing, but are reported in the mods.toml: {}", missingClasses);
-
-            var missingMods = new ArrayList<>(containerIds);
-            missingMods.removeAll(modIds);
-            LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
-
-            LOADING_EXCEPTIONS.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).toList();
-    }
-
-    private static ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
-        final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
-    ) {
-        try {
-            IModInfo info = modInfoMap.get(modId);
-            // throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
-            if (info == null)
-                throw 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
-            LOADING_EXCEPTIONS.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 loadingStateValid;
-    }
-
-    public static boolean hasCompletedState(IModLoadingState state) {
-        return COMPLETED_STATES.contains(state);
-    }
-
-    public static <T extends IModBusEvent> void runEventGenerator(Function<ModContainer, T> generator) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
-            return;
-        }
-        for (var mod : ModList.getLoadedMods())
-            mod.acceptEvent(generator.apply(mod));
-    }
-
-    public static <T extends IModBusEvent> void postEvent(T e) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return;
-        }
-        for (var mod : ModList.getLoadedMods())
-            mod.acceptEvent(e);
-    }
-
-    public static <T extends IModBusEvent> T postEventWithReturn(T e) {
-        if (!loadingStateValid) {
-            LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
-            return e;
-        }
-        for (var mod : ModList.getLoadedMods())
-            mod.acceptEvent(e);
-        return e;
-    }
-
-    @SuppressWarnings("removal")
-    public static <T extends IModBusEvent> void postEventWrapContainerInModOrder(T event) {
-        postEventWithWrapInModOrder(event,
-            (mc, _) -> ModLoadingContext.get().setActiveContainer(mc),
-            (_, _) -> ModLoadingContext.get().setActiveContainer(null)
-        );
-    }
-
-    public static <T extends 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;
-        }
-        for (var mod : ModList.getLoadedMods()) {
-            pre.accept(mod, e);
-            mod.acceptEvent(e);
-            post.accept(mod, e);
-        }
-    }
-
-    public static List<ModLoadingWarning> getWarnings() {
-        return List.copyOf(LOADING_WARNINGS);
-    }
-
-    public static void addWarning(ModLoadingWarning warning) {
-        LOADING_WARNINGS.add(warning);
-    }
-
-    private static boolean runningDataGen = false;
-
-    public static boolean isDataGenRunning () {
-        return runningDataGen;
-    }
-
-    private static final class ErroredModContainer extends ModContainer {
-        public ErroredModContainer() {
-            super();
-        }
-
-        @Override
-        public boolean matches(final Object mod) {
-            return false;
-        }
-
-        @Override
-        public Object getMod() {
-            return null;
-        }
-    }
-}
@@ -1,126 +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 org.slf4j.Logger;
-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 ModContainer activeContainer;
-    private Object languageExtension;
-
-    /**
-     * @deprecated Use the context provided by your language loader in your mod's constructor. Example for Java mods: {@snippet :
-     * @Mod("examplemod")
-     * public final class ExampleMod {
-     *      public ExampleMod(FMLJavaModLoadingContext context) {
-     *           // Use context from the param instead of FMLJavaModLoadingContext.get() or ModLoadingContext.get()
-     *      }
-     * }}
-     */
-    @Deprecated(forRemoval = true, since="1.21.1")
-    public static ModLoadingContext get() {
-        return context.get();
-    }
-
-    void setActiveContainer(final ModContainer container) {
-        this.activeContainer = container;
-        this.languageExtension = container == null ? null : container.contextExtension.get();
-    }
-
-    /**
-     * @deprecated Going to be moved to ForgeHooks for Internal use.
-     */
-    @Deprecated(forRemoval = true, since="1.21.1")
-    public String getActiveNamespace() {
-        return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
-    }
-
-    public ModContainer getContainer() {
-        return activeContainer == null
-                ? ModList.getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!"))
-                : activeContainer;
-    }
-
-    /**
-     * 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) {
-        getContainer().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) {
-        getContainer().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) {
-        getContainer().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) {
-        getContainer().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) {
-        getContainer().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, getContainer().getModId());
-            return;
-        }
-
-        getContainer().addConfig(new ModConfig(type, spec, getContainer()));
-    }
-
-    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, getContainer().getModId(), fileName);
-            return;
-        }
-
-        getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T extension() {
-        return (T)languageExtension;
-    }
-}